From c7a91683bca120f410664c1474271bc51ee36769 Mon Sep 17 00:00:00 2001 From: Kevin Lockwood Date: Mon, 23 Dec 2024 16:37:49 -0800 Subject: [PATCH] Update perl-IPC-Run3 to version 0.049-1 - Remove unnecessary patch --- ...-RT-52317-Calling-run3-garbles-STDIN.patch | 134 ------------------ .../perl-IPC-Run3.signatures.json | 4 +- .../perl-IPC-Run3/perl-IPC-Run3.spec | 19 ++- cgmanifest.json | 4 +- 4 files changed, 13 insertions(+), 148 deletions(-) delete mode 100644 SPECS-EXTENDED/perl-IPC-Run3/0001-test-and-fix-for-RT-52317-Calling-run3-garbles-STDIN.patch diff --git a/SPECS-EXTENDED/perl-IPC-Run3/0001-test-and-fix-for-RT-52317-Calling-run3-garbles-STDIN.patch b/SPECS-EXTENDED/perl-IPC-Run3/0001-test-and-fix-for-RT-52317-Calling-run3-garbles-STDIN.patch deleted file mode 100644 index fedc11d0767..00000000000 --- a/SPECS-EXTENDED/perl-IPC-Run3/0001-test-and-fix-for-RT-52317-Calling-run3-garbles-STDIN.patch +++ /dev/null @@ -1,134 +0,0 @@ -From 8ebe48760cfdc78fbf4fc46413dde9470121b99e Mon Sep 17 00:00:00 2001 -From: Roderich Schupp -Date: Sun, 29 Sep 2013 18:12:03 +0200 -Subject: [PATCH 5/5] test and fix for RT #52317: Calling run3 garbles STDIN - ---- - lib/IPC/Run3.pm | 26 ++++++------------------- - t/preserve_stdin.t | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 63 insertions(+), 20 deletions(-) - create mode 100644 t/preserve_stdin.t - -diff --git a/lib/IPC/Run3.pm b/lib/IPC/Run3.pm -index 12c9d8a..777e290 100644 ---- a/lib/IPC/Run3.pm -+++ b/lib/IPC/Run3.pm -@@ -363,14 +363,12 @@ sub run3 { - $options if defined $stderr; - - # this should make perl close these on exceptions --# local *STDIN_SAVE; -+ local *STDIN_SAVE; - local *STDOUT_SAVE; - local *STDERR_SAVE; - -- my $saved_fd0 = dup( 0 ) if defined $in_fh; -- --# open STDIN_SAVE, "<&STDIN"# or croak "run3(): $! saving STDIN" --# if defined $in_fh; -+ open STDIN_SAVE, "<&STDIN" or croak "run3(): $! saving STDIN" -+ if defined $in_fh; - open STDOUT_SAVE, ">&STDOUT" or croak "run3(): $! saving STDOUT" - if defined $out_fh; - open STDERR_SAVE, ">&STDERR" or croak "run3(): $! saving STDERR" -@@ -378,17 +376,10 @@ sub run3 { - - my $errno; - my $ok = eval { -- # The open() call here seems to not force fd 0 in some cases; -- # I ran in to trouble when using this in VCP, not sure why. -- # the dup2() seems to work. -- dup2( fileno $in_fh, 0 ) --# open STDIN, "<&=" . fileno $in_fh -+ open STDIN, "<&=" . fileno $in_fh - or croak "run3(): $! redirecting STDIN" - if defined $in_fh; - --# close $in_fh or croak "$! closing STDIN temp file" --# if ref $stdin; -- - open STDOUT, ">&" . fileno $out_fh - or croak "run3(): $! redirecting STDOUT" - if defined $out_fh; -@@ -428,13 +419,8 @@ sub run3 { - - my @errs; - -- if ( defined $saved_fd0 ) { -- dup2( $saved_fd0, 0 ); -- POSIX::close( $saved_fd0 ); -- } -- --# open STDIN, "<&STDIN_SAVE"# or push @errs, "run3(): $! restoring STDIN" --# if defined $in_fh; -+ open STDIN, "<&STDIN_SAVE" or push @errs, "run3(): $! restoring STDIN" -+ if defined $in_fh; - open STDOUT, ">&STDOUT_SAVE" or push @errs, "run3(): $! restoring STDOUT" - if defined $out_fh; - open STDERR, ">&STDERR_SAVE" or push @errs, "run3(): $! restoring STDERR" -diff --git a/t/preserve_stdin.t b/t/preserve_stdin.t -new file mode 100644 -index 0000000..8e090ee ---- /dev/null -+++ b/t/preserve_stdin.t -@@ -0,0 +1,57 @@ -+#!perl -w -+ -+## test whether reading from STDIN is preserved when -+## run3 is called in between reads -+ -+use Test::More; -+use IPC::Run3; -+use File::Temp qw(tempfile); -+use strict; -+ -+# call run3 at different lines (problems might manifest itself -+# on different lines, probably due to different buffering of input) -+my @check_at = (5, 10, 50, 100, 200, 500); -+plan tests => @check_at * 3; -+ -+# create a test file for input containing 1000 lines -+my $nlines = 1000; -+my @exp_lines; -+my ($fh, $file) = tempfile(UNLINK => 1); -+for (my $i = 1; $i <= $nlines; $i++) -+{ -+ my $line = "this is line $i"; -+ push @exp_lines, $line; -+ print $fh $line, "\n"; -+} -+close $fh; -+ -+ -+my ( $in, $out, $err ); -+ -+foreach my $n (@check_at) -+{ -+ my $nread = 0; -+ my $unexpected; -+ open STDIN, "<", $file or die "can't open file $file: $!"; -+ while () -+ { -+ chomp; -+ $unexpected = qq[line $nread: expected "$exp_lines[$nread]", got "$_"\n] -+ unless $exp_lines[$nread] eq $_ || $unexpected; -+ $nread++; -+ -+ if ($nread == $n) -+ { -+ $in = "checking at line $n"; -+ run3 [ $^X, '-e', 'print uc $_ while <>' ], \$in, \$out, \$err; -+ die "command failed" unless $? == 0; -+ is($out, uc $in); -+ } -+ } -+ close STDIN; -+ -+ is($nread, $nlines, "STDIN was read completely"); -+ ok(!$unexpected, "STDIN as expected") or diag($unexpected); -+} -+ -+ --- -1.8.5.3 - diff --git a/SPECS-EXTENDED/perl-IPC-Run3/perl-IPC-Run3.signatures.json b/SPECS-EXTENDED/perl-IPC-Run3/perl-IPC-Run3.signatures.json index f7b94f01683..eaf3dca841b 100644 --- a/SPECS-EXTENDED/perl-IPC-Run3/perl-IPC-Run3.signatures.json +++ b/SPECS-EXTENDED/perl-IPC-Run3/perl-IPC-Run3.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "perl-IPC-Run3-0.048.tar.gz": "3d81c3cc1b5cff69cca9361e2c6e38df0352251ae7b41e2ff3febc850e463565" + "perl-IPC-Run3-0.049.tar.gz": "9d048ae7b9ae63871bae976ba01e081d887392d904e5d48b04e22d35ed22011a" } -} +} \ No newline at end of file diff --git a/SPECS-EXTENDED/perl-IPC-Run3/perl-IPC-Run3.spec b/SPECS-EXTENDED/perl-IPC-Run3/perl-IPC-Run3.spec index 2dc270dc516..a5fedbb244c 100644 --- a/SPECS-EXTENDED/perl-IPC-Run3/perl-IPC-Run3.spec +++ b/SPECS-EXTENDED/perl-IPC-Run3/perl-IPC-Run3.spec @@ -1,6 +1,6 @@ Name: perl-IPC-Run3 -Version: 0.048 -Release: 19%{?dist} +Version: 0.049 +Release: 1%{?dist} Summary: Run a subprocess in batch mode License: GPL+ or Artistic or BSD Vendor: Microsoft Corporation @@ -27,11 +27,6 @@ BuildRequires: perl(Test::Pod::Coverage) BuildRequires: perl(Test::Pod) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -# RHBZ #1062267 / https://rt.cpan.org/Public/Bug/Display.html?id=52317 -# Patch from -# https://github.com/rschupp/IPC-Run3/commit/8ebe48760cfdc78fbf4fc46413dde9470121b99e -Patch0: 0001-test-and-fix-for-RT-52317-Calling-run3-garbles-STDIN.patch - %description This module allows you to run a subprocess and redirect stdin, stdout, and/or stderr to files and perl data structures. It aims to satisfy 99% of @@ -39,10 +34,9 @@ the need for using system, qx, and open3 with a simple, extremely Perlish API and none of the bloat and rarely used features of IPC::Run. %prep -%setup -q -n IPC-Run3-%{version} -%patch 0 -p1 +%autosetup -n IPC-Run3-%{version} -# Perms in tarballs are broken +# Perms in tarballs are broken find -type f -exec chmod -x {} \; %build @@ -63,6 +57,11 @@ make test RELEASE_TESTING=1 %{_mandir}/man3/* %changelog +* Mon Dec 23 2024 Kevin Lockwood - 0.049-1 +- Update to 0.049 +- License verified +- No longer apply 0001-test-and-fix-for-RT-52317-Calling-run3-garbles-STDIN.patch + * Fri Oct 15 2021 Pawel Winogrodzki - 0.048-19 - Initial CBL-Mariner import from Fedora 32 (license: MIT). diff --git a/cgmanifest.json b/cgmanifest.json index e724680b882..7db00d4eecf 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -17933,8 +17933,8 @@ "type": "other", "other": { "name": "perl-IPC-Run3", - "version": "0.048", - "downloadUrl": "https://cpan.metacpan.org/authors/id/R/RJ/RJBS/IPC-Run3-0.048.tar.gz" + "version": "0.049", + "downloadUrl": "https://cpan.metacpan.org/authors/id/R/RJ/RJBS/IPC-Run3-0.049.tar.gz" } } },