[Pkg-php-commits] [php/debian-sid] quilt refresh 7 files in debian/patches

Sean Finney seanius at debian.org
Sun Feb 7 23:17:14 UTC 2010


---
 debian/patches/001-libtool_fixes.patch        |    2 +-
 debian/patches/002-static_openssl.patch       |    2 +-
 debian/patches/004-ldap_fix.patch             |    4 ++--
 debian/patches/017-pread_pwrite_disable.patch |    4 ++--
 debian/patches/036-fd_setsize_fix.patch       |    4 ++--
 debian/patches/libedit_is_editline.patch      |    2 +-
 debian/patches/use_embedded_timezonedb.patch  |    2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/debian/patches/001-libtool_fixes.patch b/debian/patches/001-libtool_fixes.patch
index 38f83c7..072882a 100644
--- a/debian/patches/001-libtool_fixes.patch
+++ b/debian/patches/001-libtool_fixes.patch
@@ -12,7 +12,7 @@
  
 --- php.orig/configure.in
 +++ php/configure.in
-@@ -1362,9 +1362,6 @@ AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [],
+@@ -1354,9 +1354,6 @@ AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [],
  ])
  AC_PROG_LIBTOOL
  
diff --git a/debian/patches/002-static_openssl.patch b/debian/patches/002-static_openssl.patch
index 5b21dae..5477aed 100644
--- a/debian/patches/002-static_openssl.patch
+++ b/debian/patches/002-static_openssl.patch
@@ -1,6 +1,6 @@
 --- php.orig/acinclude.m4
 +++ php/acinclude.m4
-@@ -2370,9 +2370,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
+@@ -2373,9 +2373,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
  
      PHP_ADD_INCLUDE($OPENSSL_INCDIR)
    
diff --git a/debian/patches/004-ldap_fix.patch b/debian/patches/004-ldap_fix.patch
index c5d5714..67008d1 100644
--- a/debian/patches/004-ldap_fix.patch
+++ b/debian/patches/004-ldap_fix.patch
@@ -1,6 +1,6 @@
 --- php.orig/ext/ldap/ldap.c
 +++ php/ext/ldap/ldap.c
-@@ -1236,7 +1236,7 @@ PHP_FUNCTION(ldap_explode_dn)
+@@ -1237,7 +1237,7 @@ PHP_FUNCTION(ldap_explode_dn)
  	}
  
  	i=0;
@@ -9,7 +9,7 @@
  	count = i;
  
  	array_init(return_value);
-@@ -1246,7 +1246,8 @@ PHP_FUNCTION(ldap_explode_dn)
+@@ -1247,7 +1247,8 @@ PHP_FUNCTION(ldap_explode_dn)
  		add_index_string(return_value, i, ldap_value[i], 1);
  	}
  
diff --git a/debian/patches/017-pread_pwrite_disable.patch b/debian/patches/017-pread_pwrite_disable.patch
index 757c676..779bf35 100644
--- a/debian/patches/017-pread_pwrite_disable.patch
+++ b/debian/patches/017-pread_pwrite_disable.patch
@@ -1,6 +1,6 @@
 --- php.orig/acinclude.m4
 +++ php/acinclude.m4
-@@ -1216,7 +1216,7 @@ $1
+@@ -1219,7 +1219,7 @@ $1
      }
  
    ],[
@@ -9,7 +9,7 @@
    ],[
      ac_cv_pwrite=no
    ],[
-@@ -1245,7 +1245,7 @@ $1
+@@ -1248,7 +1248,7 @@ $1
      exit(0);
      }
    ],[
diff --git a/debian/patches/036-fd_setsize_fix.patch b/debian/patches/036-fd_setsize_fix.patch
index aa13ee9..59f7d8c 100644
--- a/debian/patches/036-fd_setsize_fix.patch
+++ b/debian/patches/036-fd_setsize_fix.patch
@@ -1,6 +1,6 @@
 --- php.orig/ext/sockets/sockets.c
 +++ php/ext/sockets/sockets.c
-@@ -705,6 +705,7 @@ static int php_sock_array_to_fd_set(zval
+@@ -708,6 +708,7 @@ static int php_sock_array_to_fd_set(zval
  
  		php_sock = (php_socket*) zend_fetch_resource(element TSRMLS_CC, -1, le_socket_name, NULL, 1, le_socket);
  		if (!php_sock) continue; /* If element is not a resource, skip it */
@@ -10,7 +10,7 @@
  		if (php_sock->bsd_socket > *max_fd) {
 --- php.orig/ext/standard/streamsfuncs.c
 +++ php/ext/standard/streamsfuncs.c
-@@ -605,6 +605,9 @@ static int stream_array_to_fd_set(zval *
+@@ -612,6 +612,9 @@ static int stream_array_to_fd_set(zval *
  		 * is not displayed.
  		 * */
  		if (SUCCESS == php_stream_cast(stream, PHP_STREAM_AS_FD_FOR_SELECT | PHP_STREAM_CAST_INTERNAL, (void*)&this_fd, 1) && this_fd >= 0) {
diff --git a/debian/patches/libedit_is_editline.patch b/debian/patches/libedit_is_editline.patch
index f34c39b..b08e6dc 100644
--- a/debian/patches/libedit_is_editline.patch
+++ b/debian/patches/libedit_is_editline.patch
@@ -1,6 +1,6 @@
 --- php.orig/ext/readline/config.m4
 +++ php/ext/readline/config.m4
-@@ -64,7 +64,7 @@ if test "$PHP_READLINE" && test "$PHP_RE
+@@ -55,7 +55,7 @@ if test "$PHP_READLINE" && test "$PHP_RE
  elif test "$PHP_LIBEDIT" != "no"; then
  
    for i in $PHP_LIBEDIT /usr/local /usr; do
diff --git a/debian/patches/use_embedded_timezonedb.patch b/debian/patches/use_embedded_timezonedb.patch
index 275b54b..efc9299 100644
--- a/debian/patches/use_embedded_timezonedb.patch
+++ b/debian/patches/use_embedded_timezonedb.patch
@@ -293,7 +293,7 @@ r1: initial revision
 +
 --- php.orig/ext/date/php_date.c
 +++ php/ext/date/php_date.c
-@@ -829,6 +829,11 @@ static char* guess_timezone(const timeli
+@@ -847,6 +847,11 @@ static char* guess_timezone(const timeli
  	if (DATEG(default_timezone) && (strlen(DATEG(default_timezone)) > 0) && timelib_timezone_id_is_valid(DATEG(default_timezone), tzdb)) {
  		return DATEG(default_timezone);
  	}
-- 
1.6.3.3





More information about the Pkg-php-commits mailing list