From a047dac4011048501bd12cfd4e04a581a613e1ee Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Feb 14 2020 20:49:20 +0000 Subject: Update to 1.31, dropping our patch in the process --- diff --git a/.gitignore b/.gitignore index a45b8de..78e7d6d 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ Term-ReadLine-Gnu-1.19.tar.gz /Term-ReadLine-Gnu-1.26.tar.gz /Term-ReadLine-Gnu-1.27.tar.gz /Term-ReadLine-Gnu-1.28.tar.gz +/Term-ReadLine-Gnu-1.31.tar.gz diff --git a/Term-ReadLine-Gnu-1.27-Propagete-PerlIO_return_value_from_STORE.patch b/Term-ReadLine-Gnu-1.27-Propagete-PerlIO_return_value_from_STORE.patch deleted file mode 100644 index 1143efb..0000000 --- a/Term-ReadLine-Gnu-1.27-Propagete-PerlIO_return_value_from_STORE.patch +++ /dev/null @@ -1,89 +0,0 @@ -From a70e0540b53a137a8b30cd4c2426c33e2c8e9720 Mon Sep 17 00:00:00 2001 -From: HAYASHI -Date: Wed, 23 Sep 2015 12:22:23 +0200 -Subject: [PATCH] Propagete PerlIO return value from STORE -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -On Thu, 12 Feb 2015 14:52:48 GMT, ppisar wrote: -> Dne Čt 12.úno.2015 09:51:59, ppisar napsal(a): -> > I found this change causing a dead-lock in Debug-Client-0.29 tests -> > (see ). I don't -> > know which party is more guilty, but I observe that perl debugger does -> > not emit "DB<1>" prompt if it is run from the Debug-Client's test, so -> > it does not process client "c" command and everything halts. -> -> I should note that I use perl 5.20.1. - -Here is a fix. I don't know why 1.26 fails or why this works. - -Petr Pisar: Patch for 1.26 ported to 1.27. - -CPAN RT#101078 - -Signed-off-by: Petr Písař ---- - Gnu.pm | 3 +-- - Gnu.xs | 9 +++++++-- - 2 files changed, 8 insertions(+), 4 deletions(-) - -diff --git a/Gnu.pm b/Gnu.pm -index 4701589..298d567 100644 ---- a/Gnu.pm -+++ b/Gnu.pm -@@ -734,9 +734,8 @@ sub STORE { - } elsif ($type eq 'F') { - return _rl_store_function($value, $id); - } elsif ($type eq 'IO') { -- my $FH = $value; - # Pass filehandles to the GNU Readline Library -- _rl_store_iostream($value, $id); -+ my $FH = _rl_store_iostream($value, $id); - # pop stdio layer pushed by PerlIO_findFILE(). - # https://rt.cpan.org/Ticket/Display.html?id=59832 - my @layers = PerlIO::get_layers($FH); -diff --git a/Gnu.xs b/Gnu.xs -index cb91a2c..5bf0845 100644 ---- a/Gnu.xs -+++ b/Gnu.xs -@@ -3147,7 +3147,7 @@ _rl_fetch_int(id) - } - } - --void -+PerlIO * - _rl_store_iostream(stream, id) - PerlIO *stream - int id -@@ -3157,9 +3157,11 @@ _rl_store_iostream(stream, id) - switch (id) { - case 0: - rl_instream = PerlIO_findFILE(stream); -+ RETVAL = stream; - break; - case 1: - rl_outstream = PerlIO_findFILE(stream); -+ RETVAL = stream; - #ifdef __CYGWIN__ - { - /* Cygwin b20.1 library converts NL to CR-NL -@@ -3176,11 +3178,14 @@ _rl_store_iostream(stream, id) - break; - default: - warn("Gnu.xs:_rl_store_iostream: Illegal `id' value: `%d'", id); -+ XSRETURN_UNDEF; - break; - } - PerlIO_debug("TRG:store_iostream id %d fd %d\n", -- id, PerlIO_fileno(stream)); -+ id, PerlIO_fileno(RETVAL)); - } -+ OUTPUT: -+ RETVAL - - #if 0 /* not used since 1.26 */ - --- -2.4.3 - diff --git a/perl-Term-ReadLine-Gnu.spec b/perl-Term-ReadLine-Gnu.spec index ecce49a..6623e80 100644 --- a/perl-Term-ReadLine-Gnu.spec +++ b/perl-Term-ReadLine-Gnu.spec @@ -1,12 +1,11 @@ Name: perl-Term-ReadLine-Gnu -Version: 1.28 -Release: 3%{?dist} +Version: 1.31 +Release: 1%{?dist} Summary: Perl extension for the GNU Readline/History Library License: GPL+ or Artistic URL: http://search.cpan.org/dist/Term-ReadLine-Gnu/ Source0: http://www.cpan.org/authors/id/H/HA/HAYASHI/Term-ReadLine-Gnu-%{version}.tar.gz -# Fix regression with Debug::Client, bugs #1189459, #1264742, CPAN RT#101078 -Patch0: Term-ReadLine-Gnu-1.27-Propagete-PerlIO_return_value_from_STORE.patch + BuildRequires: coreutils BuildRequires: findutils BuildRequires: make @@ -14,7 +13,7 @@ BuildRequires: ncurses-devel BuildRequires: perl BuildRequires: perl-devel BuildRequires: perl(Config) -BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(ExtUtils::MakeMaker) >= 6.76 BuildRequires: perl(Getopt::Long) BuildRequires: perl(strict) BuildRequires: readline-devel >= 2.1 @@ -32,6 +31,7 @@ BuildRequires: perl(warnings) BuildRequires: expect BuildRequires: perl(Term::ReadLine) BuildRequires: perl(Test) +BuildRequires: perl(open) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %{?perl_default_filter} @@ -42,23 +42,17 @@ An implementation of Term::ReadLine using the GNU Readline/History Library. %prep %setup -q -n Term-ReadLine-Gnu-%{version} -%patch0 -p1 %build # Fix permissions and shebang paths at one shot find . -type f -exec chmod 0664 '{}' \; \ -exec sed 's,^#! */usr/local,#!%{_prefix},' -i '{}' \; -%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" +%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" NO_PACKLIST=1 make %{?_smp_mflags} %install -make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT - -find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; -find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \; -find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; - +make pure_install DESTDIR=$RPM_BUILD_ROOT %{_fixperms} $RPM_BUILD_ROOT %check @@ -81,6 +75,11 @@ expect -c ' %changelog +* Mon Mar 07 2016 Emmanuel Seyman - 1.31-1 +- Update to 1.31, dropping no-longer-needed patch +- Use DESTDIR instead of PERL_INSTALL_ROOT +- Pass NO_PACKLIST to Makefile.PL + * Thu Feb 04 2016 Fedora Release Engineering - 1.28-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 6ff69e7..63cb96f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bde05818d8f8c73c5c5b8a60c28f2662 Term-ReadLine-Gnu-1.28.tar.gz +1f659d9ca65db69391c59f52a876a52d Term-ReadLine-Gnu-1.31.tar.gz