4 changed files with 71 additions and 73 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/IPC-System-Simple-1.30.tar.gz
+SOURCES/IPC-System-Simple-1.25.tar.gz
--- a/.perl-IPC-System-Simple.metadata
+++ b/.perl-IPC-System-Simple.metadata
@ -1 +1 @@
-535263c7f8097de96663e65ed4e9e171982e0235 SOURCES/IPC-System-Simple-1.30.tar.gz
+fb50f4f27407c81bb884073bd9bc5cf75f4841f1 SOURCES/IPC-System-Simple-1.25.tar.gz
--- a/SOURCES/IPC-System-Simple-1.25-Use-exucatable-name-as-a-source-of-taintedness.patch
+++ b/SOURCES/IPC-System-Simple-1.25-Use-exucatable-name-as-a-source-of-taintedness.patch
@ -0,0 +1,37 @@
+From ff8028c4d95425faa5b0705b8ed8c84b1112c7e4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Wed, 2 Aug 2017 17:29:13 +0200
+Subject: [PATCH] Use exucatable name as a source of taintedness
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Test::Simple >= 1.302065 injects variables into the environment. These
+are not tainted and caused a random t/07_taint.t test failures.
+
+This patch fixes it by using executable name $0 instead.
+
+https://github.com/pjf/ipc-system-simple/issues/21
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ t/07_taint.t | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/t/07_taint.t b/t/07_taint.t
+index 49cee12..be449cd 100644
+--- a/t/07_taint.t
+++ b/t/07_taint.t
+@@ -17,8 +17,8 @@ use_ok("IPC::System::Simple","run","capture");
+ 
+ chdir("t");     # Ignore return, since we may already be in t/
+ 
+-my $taint = $ENV{(keys(%ENV))[0]} . "foo";	# ."foo" to avoid zero length
+-ok(tainted($taint),"Sanity - ENV vars are tainted");
+my $taint = $0 . "foo";	# ."foo" to avoid zero length
+ok(tainted($taint),"Sanity - executable name is tainted");
+ 
+ my $evil_zero = 1 - (length($taint) / length($taint));
+ 
+-- 
+2.9.4
+
--- a/SPECS/perl-IPC-System-Simple.spec
+++ b/SPECS/perl-IPC-System-Simple.spec
@ -6,20 +6,23 @@
 %endif

 Name:		perl-IPC-System-Simple
-Version:	1.30
-Release:	6%{?dist}
+Version:	1.25
+Release:	17%{?dist}
 License:	GPL+ or Artistic
 Summary:	Run commands simply, with detailed diagnostics
-URL:		https://metacpan.org/release/IPC-System-Simple
-Source0:	https://cpan.metacpan.org/modules/by-module/IPC/IPC-System-Simple-%{version}.tar.gz
+URL:		http://search.cpan.org/dist/IPC-System-Simple
+Source0:	http://search.cpan.org/CPAN/authors/id/P/PJ/PJF/IPC-System-Simple-%{version}.tar.gz
+# Fix random test failures with Test-Simple 1.302065, proposed to upstream,
+# <https://github.com/pjf/ipc-system-simple/issues/21>
+Patch0:     IPC-System-Simple-1.25-Use-exucatable-name-as-a-source-of-taintedness.patch
 BuildArch:	noarch
 # Module Build
 BuildRequires:	coreutils
 BuildRequires:	findutils
 BuildRequires:	make
-BuildRequires:	perl-generators
 BuildRequires:	perl-interpreter
-BuildRequires:	perl(ExtUtils::MakeMaker)
+BuildRequires:	perl-generators
+BuildRequires:	perl(ExtUtils::MakeMaker) >= 6.30
 # Module Runtime
 BuildRequires:	perl(Carp)
 BuildRequires:	perl(Config)
@ -39,6 +42,18 @@ BuildRequires:	perl(Test::More)
 # Optional Tests
 BuildRequires:	perl(BSD::Resource)
 BuildRequires:	perl(Test::NoWarnings)
+# Author Tests
+%if !%{defined perl_bootstrap}
+# Break build-cycle: perl-IPC-System-Simple → perl-Test-Perl-Critic
+# → perl-Perl-Critic → perl-PPI → perl-IO-All → perl-File-MimeInfo
+# → perl-File-BaseDir → perl-IPC-System-Simple
+BuildRequires:	perl(English)
+BuildRequires:	perl(Test::Perl::Critic)
+%endif
+# Release Tests (wants Test::Pod 1.41 but EL-6 doesn't have it)
+BuildRequires:	perl(Pod::Coverage::TrustPod)
+BuildRequires:	perl(Test::Pod)
+BuildRequires:	perl(Test::Pod::Coverage) >= 1.08
 %endif
 # Dependencies
 Requires:	perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
@ -58,6 +73,7 @@ return a zero exit value), or die with rich diagnostic messages.

 %prep
 %setup -q -n IPC-System-Simple-%{version}
+%patch0 -p1

 # Avoid doc-file dependencies
 chmod -c -x examples/*.pl
@ -72,79 +88,24 @@ find %{buildroot} -type f -name .packlist -delete
 %{_fixperms} -c %{buildroot}

 %check
-make test
+make test \
+%if %{with perl_IPC_System_Simple_enables_optional_test}
+	TEST_AUTHOR=1 \
+	%{!?perl_bootstrap:AUTHOR_TESTING=1} \
+	RELEASE_TESTING=1
+%endif

 %files
+%if 0%{?_licensedir:1}
 %license LICENSE
+%else
+%doc LICENSE
+%endif
 %doc Changes README examples/
 %{perl_vendorlib}/IPC/
 %{_mandir}/man3/IPC::System::Simple.3*

 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.30-6
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.30-5
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.30-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.30-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jun 23 2020 Jitka Plesnikova <jplesnik@redhat.com> - 1.30-2
- Perl 5.32 rebuild
-
-* Tue Mar 24 2020 Paul Howarth <paul@city-fan.org> - 1.30-1
- Update to 1.30
-  - On MSWin32, make Win32::Process a prerequisite
-
-* Sun Mar 22 2020 Paul Howarth <paul@city-fan.org> - 1.29-1
- Update to 1.29
-  - Improved handling of shell commands on Windows, which should get us closer
-    to resolving Win32-related issues; there should be no change of
-    functionality on Unix-like platforms
-  - Better workaround for bug in perl-5.8.9 (GH#23)
-  - Add t/args.t
-  - Modify t/win32.t
-  - Added Travis and AppVeyor configuration files
-  - Eliminated use of Dist::Zilla for build, using older, but more reliable and
-    better understood (by maintainer) ExtUtils::MakeMaker-based configuration
-  - Move author testing to xt/ directory
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.26-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Sat Jan 25 2020 Paul Howarth <paul@city-fan.org> - 1.26-1
- Update to 1.26
-  - BUILD: Update FAIL_POSIX warning message (GH#28)
-  - TEST: t/07_taint.t: Use executable name as source of taintedness (GH#21)
-  - OTHER: Typographic corrections (CPAN RT#60211, CPAN RT#86403)
-  - Add Travis configuration
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.25-24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sun Jun 02 2019 Jitka Plesnikova <jplesnik@redhat.com> - 1.25-23
- Perl 5.30 re-rebuild of bootstrapped packages
-
-* Fri May 31 2019 Jitka Plesnikova <jplesnik@redhat.com> - 1.25-22
- Perl 5.30 rebuild
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.25-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.25-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Sun Jul 01 2018 Jitka Plesnikova <jplesnik@redhat.com> - 1.25-19
- Perl 5.28 re-rebuild of bootstrapped packages
-
-* Thu Jun 28 2018 Jitka Plesnikova <jplesnik@redhat.com> - 1.25-18
- Perl 5.28 rebuild
-
 * Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.25-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild