eseyman pushed to perl-Term-ReadLine-Gnu (master). "Re-add patch that was in fact not upstreamed"

[notifications at fedoraproject.org]

From 306c7f4d8ec4484bb34d671d36670b25ec847d7f Mon Sep 17 00:00:00 2001
From: Emmanuel Seyman <emmanuel at seyman.fr>
Date: Wed, 9 Sep 2015 23:56:21 +0200
Subject: Re-add patch that was in fact not upstreamed


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
new file mode 100644
index 0000000..8daf3bb
--- /dev/null
+++ b/Term-ReadLine-Gnu-1.26-Propagete-PerlIO_return_value_from_STORE.patch
@@ -0,0 +1,49 @@
+--- Gnu.pm.orig
++++ 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);
+--- ./Gnu.xs.orig
++++ ./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,10 +3178,11 @@ _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));
+ 	}
+ 
+ #if 0 /* not used since 1.26 */
diff --git a/perl-Term-ReadLine-Gnu.spec b/perl-Term-ReadLine-Gnu.spec
index 24be3c8..52f2271 100644
--- a/perl-Term-ReadLine-Gnu.spec
+++ b/perl-Term-ReadLine-Gnu.spec
@@ -1,10 +1,11 @@
 Name:           perl-Term-ReadLine-Gnu
 Version:        1.27
-Release:        1%{?dist}
+Release:        2%{?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
+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
@@ -20,7 +21,7 @@ An implementation of Term::ReadLine using the GNU Readline/History Library.
 
 %prep
 %setup -q -n Term-ReadLine-Gnu-%{version}
-
+%patch0
 
 %build
 # Fix permissions and shebang paths at one shot
@@ -59,6 +60,9 @@ expect -c '
 
 
 %changelog
+* Wed Sep 09 2015 Emmanuel Seyman <emmanuel at seyman.fr> - 1.27-2
+- Re-add patch that was in fact not upstreamed
+
 * Wed Sep 09 2015 Emmanuel Seyman <emmanuel at seyman.fr> - 1.27-1
 - Update to 1.27
 - Remove upstreamed patch
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/perl-Term-ReadLine-Gnu.git/commit/?h=master&id=306c7f4d8ec4484bb34d671d36670b25ec847d7f