[Pkg-php-commits] r1106 - php5/trunk/debian/patches

[Raphael Geissert]

Author: atomo64-guest
Date: 2008-06-30 23:05:50 +0000 (Mon, 30 Jun 2008)
New Revision: 1106

Added:
   php5/trunk/debian/patches/libedit_is_editline.patch
Removed:
   php5/trunk/debian/patches/027-readline_is_editline.patch
Modified:
   php5/trunk/debian/patches/series
Log:
Drop 027-readline_is_editline.patch in favor of libedit_is_editline.patch
libedit is still bogus, though


Deleted: php5/trunk/debian/patches/027-readline_is_editline.patch
===================================================================
--- php5/trunk/debian/patches/027-readline_is_editline.patch	2008-06-30 20:10:33 UTC (rev 1105)
+++ php5/trunk/debian/patches/027-readline_is_editline.patch	2008-06-30 23:05:50 UTC (rev 1106)
@@ -1,38 +0,0 @@
-Index: php5-5.2.6/ext/readline/config.m4
-===================================================================
---- php5-5.2.6.orig/ext/readline/config.m4
-+++ php5-5.2.6/ext/readline/config.m4
-@@ -12,7 +12,7 @@ fi
- 
- if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then
-   for i in $PHP_READLINE /usr/local /usr; do
--    test -f $i/include/readline/readline.h && READLINE_DIR=$i && break
-+    test -f $i/include/editline/readline.h && READLINE_DIR=$i && break
-   done
- 
-   if test -z "$READLINE_DIR"; then
-@@ -64,7 +64,7 @@ if test "$PHP_READLINE" && test "$PHP_RE
- elif test "$PHP_LIBEDIT" != "no"; then
- 
-   for i in $PHP_LIBEDIT /usr/local /usr; do
--    test -f $i/include/readline/readline.h && LIBEDIT_DIR=$i && break
-+    test -f $i/include/editline/readline.h && LIBEDIT_DIR=$i && break
-   done
- 
-   if test -z "$LIBEDIT_DIR"; then
-Index: php5-5.2.6/ext/readline/readline.c
-===================================================================
---- php5-5.2.6.orig/ext/readline/readline.c
-+++ php5-5.2.6/ext/readline/readline.c
-@@ -33,9 +33,9 @@
- #define rl_completion_matches completion_matches
- #endif
- 
--#include <readline/readline.h>
-+#include <editline/readline.h>
- #ifndef HAVE_LIBEDIT
--#include <readline/history.h>
-+#include <editline/history.h>
- #endif
- 
- PHP_FUNCTION(readline);

Added: php5/trunk/debian/patches/libedit_is_editline.patch
===================================================================
--- php5/trunk/debian/patches/libedit_is_editline.patch	                        (rev 0)
+++ php5/trunk/debian/patches/libedit_is_editline.patch	2008-06-30 23:05:50 UTC (rev 1106)
@@ -0,0 +1,29 @@
+Index: php5-5.2.6/ext/readline/config.m4
+===================================================================
+--- php5-5.2.6.orig/ext/readline/config.m4
++++ php5-5.2.6/ext/readline/config.m4
+@@ -64,7 +64,7 @@ if test "$PHP_READLINE" && test "$PHP_RE
+ elif test "$PHP_LIBEDIT" != "no"; then
+ 
+   for i in $PHP_LIBEDIT /usr/local /usr; do
+-    test -f $i/include/readline/readline.h && LIBEDIT_DIR=$i && break
++    test -f $i/include/editline/readline.h && LIBEDIT_DIR=$i && break
+   done
+ 
+   if test -z "$LIBEDIT_DIR"; then
+Index: php5-5.2.6/ext/readline/readline.c
+===================================================================
+--- php5-5.2.6.orig/ext/readline/readline.c
++++ php5-5.2.6/ext/readline/readline.c
+@@ -33,8 +33,10 @@
+ #define rl_completion_matches completion_matches
+ #endif
+ 
++#ifdef HAVE_LIBEDIT
++#include <editline/readline.h>
++#else
+ #include <readline/readline.h>
+-#ifndef HAVE_LIBEDIT
+ #include <readline/history.h>
+ #endif
+ 

Modified: php5/trunk/debian/patches/series
===================================================================
--- php5/trunk/debian/patches/series	2008-06-30 20:10:33 UTC (rev 1105)
+++ php5/trunk/debian/patches/series	2008-06-30 23:05:50 UTC (rev 1106)
@@ -5,7 +5,6 @@
 013-force_getaddrinfo.patch
 017-pread_pwrite_disable.patch
 019-z_off_t_as_long.patch
-027-readline_is_editline.patch
 029-php.ini_paranoid.patch
 033-we_WANT_libtool.patch
 034-apache2_umask_fix.patch
@@ -33,3 +32,4 @@
 force_libmysqlclient_r.patch
 tzdb-nofree_ents_ifnotzdata.patch
 CVE-2008-2829.patch
+libedit_is_editline.patch