Compare commits

...

No commits in common. 'c9' and 'i8c-stream-5.24' have entirely different histories.

2
.gitignore vendored

@ -1 +1 @@
SOURCES/Filter-Simple-0.94.tar.gz
SOURCES/Filter-Simple-0.91.tar.gz

@ -1 +1 @@
3a014fa2187ff4ec5cc626126dfb0cea92b0fbb2 SOURCES/Filter-Simple-0.94.tar.gz
a89562327c3b0cc054573c7bf71825102032a3dc SOURCES/Filter-Simple-0.91.tar.gz

@ -0,0 +1,40 @@
From ae5f5addc848a6e80707f625db58cbb9a633aea7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Wed, 6 May 2015 10:10:46 +0200
Subject: [PATCH] Upgrade to 0.92
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Petr Písař <ppisar@redhat.com>
---
lib/Filter/Simple.pm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/Filter/Simple.pm b/lib/Filter/Simple.pm
index 4b15e55..8212919 100644
--- a/lib/Filter/Simple.pm
+++ b/lib/Filter/Simple.pm
@@ -4,7 +4,7 @@ use Text::Balanced ':ALL';
use vars qw{ $VERSION @EXPORT };
-$VERSION = '0.91';
+$VERSION = '0.92';
use Filter::Util::Call;
use Carp;
@@ -119,8 +119,8 @@ sub gen_std_filter_for {
}
if ($type =~ /^code/) {
my $count = 0;
- local $placeholder = qr/\Q$;\E(\C{4})\Q$;\E/;
- my $extractor = qr/\Q$;\E(\C{4})\Q$;\E/;
+ local $placeholder = qr/\Q$;\E(.{4})\Q$;\E/s;
+ my $extractor = qr/\Q$;\E(.{4})\Q$;\E/s;
$_ = join "",
map { ref $_ ? $;.pack('N',$count++).$; : $_ }
@components;
--
2.1.0

@ -1,54 +0,0 @@
From 593fb3d6c0fcff266729d1d497d931e7e3ad9a83 Mon Sep 17 00:00:00 2001
From: Jitka Plesnikova <jplesnik@redhat.com>
Date: Thu, 24 May 2018 10:20:55 +0200
Subject: [PATCH] Upgrade to 0.95
---
lib/Filter/Simple.pm | 6 ++----
t/no.t | 13 +++++++++++++
2 files changed, 15 insertions(+), 4 deletions(-)
create mode 100644 t/no.t
diff --git a/lib/Filter/Simple.pm b/lib/Filter/Simple.pm
index 082fe95..1dcf3c8 100644
--- a/lib/Filter/Simple.pm
+++ b/lib/Filter/Simple.pm
@@ -2,14 +2,12 @@ package Filter::Simple;
use Text::Balanced ':ALL';
-use vars qw{ $VERSION @EXPORT };
-
-$VERSION = '0.94';
+our $VERSION = '0.95';
use Filter::Util::Call;
use Carp;
-@EXPORT = qw( FILTER FILTER_ONLY );
+our @EXPORT = qw( FILTER FILTER_ONLY );
sub import {
diff --git a/t/no.t b/t/no.t
new file mode 100644
index 0000000..8980eae
--- /dev/null
+++ b/t/no.t
@@ -0,0 +1,13 @@
+BEGIN {
+ unshift @INC, 't/lib/';
+}
+
+print "1..2\n";
+
+use Filter::Simple::FilterTest qr/ok/ => "not ok", pass => "fail";
+no Filter::Simple::FilterTest;
+
+sub pass { print "ok ", $_[0], "\n" }
+
+print "ok 1\n";
+("pa"."ss")->(2);
--
2.14.3

@ -1,87 +0,0 @@
From 4ba21b30b81c9f775932674d4c29f1b81e15bfa2 Mon Sep 17 00:00:00 2001
From: Jitka Plesnikova <jplesnik@redhat.com>
Date: Tue, 21 Apr 2020 09:01:47 +0200
Subject: [PATCH] Upgrade to 0.96
---
lib/Filter/Simple.pm | 3 ++-
t/filter_only.t | 19 ++++++++++++++++++-
t/lib/Filter/Simple/ExeNoComments.pm | 11 +++++++++++
3 files changed, 31 insertions(+), 2 deletions(-)
create mode 100644 t/lib/Filter/Simple/ExeNoComments.pm
diff --git a/lib/Filter/Simple.pm b/lib/Filter/Simple.pm
index 1dcf3c8..924c2ae 100644
--- a/lib/Filter/Simple.pm
+++ b/lib/Filter/Simple.pm
@@ -2,7 +2,7 @@ package Filter::Simple;
use Text::Balanced ':ALL';
-our $VERSION = '0.95';
+our $VERSION = '0.96';
use Filter::Util::Call;
use Carp;
@@ -70,6 +70,7 @@ my %extractor_for = (
my %selector_for = (
all => sub { my ($t)=@_; sub{ $_=$$_; $t->(@_); $_} },
executable=> sub { my ($t)=@_; sub{ref() ? $_=$$_ : $t->(@_); $_} },
+ executable_no_comments=> sub { my ($t)=@_; sub{ref() ? $_=$$_ : $t->(@_); $_} },
quotelike => sub { my ($t)=@_; sub{ref() && do{$_=$$_; $t->(@_)}; $_} },
regex => sub { my ($t)=@_;
sub{ref() or return $_;
diff --git a/t/filter_only.t b/t/filter_only.t
index 57f1086..cd86707 100644
--- a/t/filter_only.t
+++ b/t/filter_only.t
@@ -4,7 +4,7 @@ BEGIN {
use Filter::Simple::FilterOnlyTest qr/not ok/ => "ok",
"bad" => "ok", fail => "die";
-print "1..9\n";
+print "1..11\n";
sub fail { print "ok ", $_[0], "\n" }
sub ok { print "ok ", $_[0], "\n" }
@@ -41,3 +41,20 @@ print "ok 8\n";
print "not " unless "bad" =~ /bad/;
print "ok 9\n";
+
+use Filter::Simple::ExeNoComments;
+
+=for us
+
+shromplex
+
+=cut
+
+# shromplex
+
+# test the difference from code*
+my $x = "ABC";
+
+print $x eq "TEST" ? "" : "not ", "ok 10 # check strings processed\n";
+
+print "ok 11 # executable_no_comments\n";
diff --git a/t/lib/Filter/Simple/ExeNoComments.pm b/t/lib/Filter/Simple/ExeNoComments.pm
new file mode 100644
index 0000000..3eaa454
--- /dev/null
+++ b/t/lib/Filter/Simple/ExeNoComments.pm
@@ -0,0 +1,11 @@
+package Filter::Simple::ExeNoComments;
+
+use Filter::Simple;
+
+FILTER_ONLY
+ executable_no_comments => sub {
+ $_ =~ /shromplex/ and die "We wants no shromplexes!";
+ s/ABC/TEST/g;
+ };
+
+1;
--
2.21.1

@ -1,20 +1,18 @@
%global base_version 0.94
%global base_version 0.91
Name: perl-Filter-Simple
Version: 0.96
Release: 460%{?dist}
Version: 0.92
Release: 366%{?dist}
Summary: Simplified Perl source filtering
License: GPL+ or Artistic
URL: https://metacpan.org/release/Filter-Simple
Source0: https://cpan.metacpan.org/authors/id/S/SM/SMUELLER/Filter-Simple-%{base_version}.tar.gz
Group: Development/Libraries
URL: http://search.cpan.org/dist/Filter-Simple/
Source0: http://www.cpan.org/authors/id/S/SM/SMUELLER/Filter-Simple-%{base_version}.tar.gz
# Unbundled from perl 5.21.11
Patch0: Filter-Simple-0.91-Upgrade-to-0.92.patch
BuildArch: noarch
# Unbundled from perl 5.28.0-RC1
Patch0: Filter-Simple-0.94-Upgrade-to-0.95.patch
# Unbundled from perl 5.32.0
Patch1: Filter-Simple-0.94-Upgrade-to-0.96.patch
BuildRequires: make
BuildRequires: perl
BuildRequires: perl-generators
BuildRequires: perl-interpreter
BuildRequires: perl(ExtUtils::MakeMaker) >= 6.76
BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(strict)
# Run-time:
BuildRequires: perl(Carp)
@ -39,14 +37,14 @@ Filter::Util::Call; one that is sufficient for most common cases.
%prep
%setup -q -n Filter-Simple-%{base_version}
%patch0 -p1
%patch1 -p1
%build
perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1
perl Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}
%install
make pure_install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
%{_fixperms} $RPM_BUILD_ROOT/*
%check
@ -58,57 +56,8 @@ make test
%{_mandir}/man3/*
%changelog
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.96-460
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.96-459
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.96-458
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.96-457
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Jun 22 2020 Jitka Plesnikova <jplesnik@redhat.com> - 0.96-456
- Upgrade to 0.96 as provided in perl-5.32.0
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.95-440
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.95-439
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu May 30 2019 Jitka Plesnikova <jplesnik@redhat.com> - 0.95-438
- Increase release to favour standalone package
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.95-418
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.95-417
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Jun 27 2018 Jitka Plesnikova <jplesnik@redhat.com> - 0.95-416
- Increase release to favour standalone package
* Thu May 24 2018 Jitka Plesnikova <jplesnik@redhat.com> - 0.95-1
- Upgrade to 0.95 as provided in perl-5.28.0-RC1
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.94-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Thu Aug 10 2017 Petr Pisar <ppisar@redhat.com> - 0.94-1
- 0.94 bump
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.93-394
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Sat Jun 03 2017 Jitka Plesnikova <jplesnik@redhat.com> - 0.93-393
- Perl 5.26 rebuild
* Thu May 11 2017 Petr Pisar <ppisar@redhat.com> - 0.93-1
- Upgrade to 0.93 as provided in perl-5.25.12
* Sun Dec 10 2023 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 0.92-366
- Rebuilt for MSVSphere 8.8
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.92-366
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild

Loading…
Cancel
Save