From dd2b2326a0682a5fbcdd3476054c21921d85b3c0 Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Sep 09 2015 13:58:51 +0000 Subject: Update to 1.27 and remove upstreamed patch --- diff --git a/.gitignore b/.gitignore index a849aa3..0e70af1 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ Term-ReadLine-Gnu-1.19.tar.gz /Term-ReadLine-Gnu-1.24.tar.gz /Term-ReadLine-Gnu-1.25.tar.gz /Term-ReadLine-Gnu-1.26.tar.gz +/Term-ReadLine-Gnu-1.27.tar.gz diff --git a/Term-ReadLine-Gnu-1.26-Propagete-PerlIO_return_value_from_STORE.patch b/Term-ReadLine-Gnu-1.26-Propagete-PerlIO_return_value_from_STORE.patch deleted file mode 100644 index 28af1e3..0000000 --- a/Term-ReadLine-Gnu-1.26-Propagete-PerlIO_return_value_from_STORE.patch +++ /dev/null @@ -1,120 +0,0 @@ -From rt-cpan-org-return@perl.org Sat Feb 14 15:55:27 2015 -Return-Path: rt-cpan-org-return@perl.org -Received: from zmta01.collab.prod.int.phx2.redhat.com (LHLO - zmta01.collab.prod.int.phx2.redhat.com) (10.5.81.8) by - zmail14.collab.prod.int.phx2.redhat.com with LMTP; Sat, 14 Feb 2015 - 09:55:26 -0500 (EST) -Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) - by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id E1D8A18201D - for ; Sat, 14 Feb 2015 09:55:26 -0500 (EST) -Received: from mx1.redhat.com (ext-mx15.extmail.prod.ext.phx2.redhat.com [10.5.110.20]) - by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t1EEtQUx006072 - for ; Sat, 14 Feb 2015 09:55:26 -0500 -Received: from rtcpan.develooper.com (rtcpan.develooper.com [207.171.7.181]) - by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t1EEtPNd031234 - for ; Sat, 14 Feb 2015 09:55:25 -0500 -Received: by rtcpan.develooper.com (Postfix, from userid 536) - id 87E12A8D; Sat, 14 Feb 2015 06:55:25 -0800 (PST) -Precedence: normal -Subject: [rt.cpan.org #101078] causes debugger to exit immediately on 5.21.7 -From: "Hiroo_HAYASHI via RT" -Reply-To: bug-Term-ReadLine-Gnu@rt.cpan.org -In-Reply-To: -References: - - - -Message-ID: -X-RT-Loop-Prevention: rt.cpan.org -RT-Ticket: rt.cpan.org #101078 -Managed-BY: RT 4.0.18 (http://www.bestpractical.com/rt/) -RT-Originator: HAYASHI@cpan.org -CC: ppisar@redhat.com, TONYC@cpan.org -MIME-Version: 1.0 -Content-Transfer-Encoding: 8bit -Content-Type: text/plain; charset="utf-8" -X-RT-Original-Encoding: utf-8 -Date: Sat, 14 Feb 2015 09:55:25 -0500 -X-RedHat-Spam-Score: -1.9 (BAYES_00,SPF_PASS,URIBL_BLOCKED) 207.171.7.181 rtcpan.develooper.com 207.171.7.181 rtcpan.develooper.com -X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 -X-Scanned-By: MIMEDefang 2.68 on 10.5.110.20 -Status: RO -Content-Length: 2065 -Lines: 75 - - - -Hi, - -Thank you for your report. - -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. - -=================================================================== ---- Gnu.pm (revision 481) -+++ Gnu.pm (working copy) -@@ -725,9 +725,8 @@ - } 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($FH, $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); -=================================================================== ---- Gnu.xs (revision 481) -+++ Gnu.xs (working copy) -@@ -3138,7 +3138,7 @@ - } - } - --void -+PerlIO * - _rl_store_iostream(stream, id) - PerlIO *stream - int id -@@ -3148,9 +3148,11 @@ - 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 -@@ -3167,11 +3169,14 @@ - 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 */ - - - - - diff --git a/perl-Term-ReadLine-Gnu.spec b/perl-Term-ReadLine-Gnu.spec index ffba3b9..24be3c8 100644 --- a/perl-Term-ReadLine-Gnu.spec +++ b/perl-Term-ReadLine-Gnu.spec @@ -1,12 +1,10 @@ Name: perl-Term-ReadLine-Gnu -Version: 1.26 -Release: 4%{?dist} +Version: 1.27 +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, bug #1189459, CPAN RT#101078 -Patch0: Term-ReadLine-Gnu-1.26-Propagete-PerlIO_return_value_from_STORE.patch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: ncurses-devel BuildRequires: readline-devel >= 2.1 @@ -22,7 +20,6 @@ An implementation of Term::ReadLine using the GNU Readline/History Library. %prep %setup -q -n Term-ReadLine-Gnu-%{version} -%patch0 -p0 %build @@ -62,6 +59,10 @@ expect -c ' %changelog +* Wed Sep 09 2015 Emmanuel Seyman - 1.27-1 +- Update to 1.27 +- Remove upstreamed patch + * Thu Jun 18 2015 Fedora Release Engineering - 1.26-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 16997f9..8b1912d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0792d93dc22608132c94928121d51482 Term-ReadLine-Gnu-1.26.tar.gz +2c1a0acf42b2aeac11362906929a81db Term-ReadLine-Gnu-1.27.tar.gz