[libterm-readline-gnu-perl] 03/12: Refresh patches.

gregor herrmann gregoa at debian.org
Mon Oct 26 16:15:27 UTC 2015


This is an automated email from the git hooks/post-receive script.

gregoa pushed a commit to branch master
in repository libterm-readline-gnu-perl.

commit 94d86a906fbc89f92d6ff15a78ad09837103a08c
Author: gregor herrmann <gregoa at debian.org>
Date:   Mon Oct 26 16:21:26 2015 +0100

    Refresh patches.
---
 debian/patches/20new.patch       | 4 ++--
 debian/patches/30outstream.patch | 8 ++++----
 debian/patches/40terminfo.patch  | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/patches/20new.patch b/debian/patches/20new.patch
index 6711ce1..77e80f8 100644
--- a/debian/patches/20new.patch
+++ b/debian/patches/20new.patch
@@ -3,7 +3,7 @@
 # DP: (#204362, patch by Nicolas Bertolissio)
 --- a/Gnu.pm
 +++ b/Gnu.pm
-@@ -220,7 +220,7 @@
+@@ -224,7 +224,7 @@
  
  sub ReadLine { 'Term::ReadLine::Gnu'; }
  
@@ -12,7 +12,7 @@
  
  returns the handle for subsequent calls to following functions.
  Argument is the name of the application.  Optionally can be followed
-@@ -234,6 +234,7 @@
+@@ -238,6 +238,7 @@
      my $this = shift;		# Package
      my $class = ref($this) || $this;
  
diff --git a/debian/patches/30outstream.patch b/debian/patches/30outstream.patch
index 3b591fc..0c4a8c9 100644
--- a/debian/patches/30outstream.patch
+++ b/debian/patches/30outstream.patch
@@ -2,9 +2,9 @@
 # DP: Fix SIGSEGV after "|" command. (#236018)
 --- a/Gnu.xs
 +++ b/Gnu.xs
-@@ -3166,6 +3166,12 @@
- 	      PerlIO_releaseFILE(outstreamPIO, rl_outstream);
- #endif
+@@ -3160,6 +3160,12 @@
+ 	    break;
+ 	  case 1:
  	    rl_outstream = PerlIO_findFILE(stream);
 +	    /*
 +	     * Debian-specific addition fixing a segfault with "PERLIO=stdio"
@@ -12,6 +12,6 @@
 +	     */
 +	    if (!rl_outstream)
 +	      rl_outstream = stdout;
- 	    RETVAL = outstreamPIO = stream;
  #ifdef __CYGWIN__
  	    {
+ 	      /* Cygwin b20.1 library converts NL to CR-NL
diff --git a/debian/patches/40terminfo.patch b/debian/patches/40terminfo.patch
index 61394c3..d6c392f 100644
--- a/debian/patches/40terminfo.patch
+++ b/debian/patches/40terminfo.patch
@@ -7,7 +7,7 @@ Last-Update: 2011-10-07
 
 --- a/Makefile.PL
 +++ b/Makefile.PL
-@@ -65,11 +65,12 @@
+@@ -82,11 +82,12 @@
      my $PREFER_CURSES = $Config{osname} eq 'aix' || $Config{osname} eq 'hpux'
  			|| $Config{osname} eq 'cygwin';
      my $TERMCAP_LIB = (! $PREFER_CURSES && &search_lib('-ltermcap'))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libterm-readline-gnu-perl.git



More information about the Pkg-perl-cvs-commits mailing list