Commit 8add4075 authored by Adam Conrad's avatar Adam Conrad Committed by Mark A. Hershberger

Imported Debian patch 5.0.5-1

parent 5c067bb9
php5 (5.0.5-1) unstable; urgency=low
* New upstream release, adjust patch offsets and fuzz, and drop patches:
- Drop 009-snmp-int-sizes.patch, finally fixed upstream.
- Drop 051-gcc-4.0.patch, fixed differently upstream.
- Drop 102-php_streams.patch, fixed upstream.
- Drop 103-catch_segv.patch, also fixed upstream.
* Distribute the shiny new manpages for php-config and phpize.
-- Adam Conrad <adconrad@0c3.net> Mon, 12 Sep 2005 02:29:24 +1000
php5 (5.0.4-4) unstable; urgency=low
* Ondřej Surý <ondrej@sury.org>:
- Add patch from CVS to fix regression in PHP 5.0.4, where file related
functions all stop reading at 2,000,000 bytes (closes: #321930)
* Adam Conrad <adconrad@0c3.net>:
- Enable support for gdbm files in the dba handler; half the base system
already appears to depend on libgdm, so we can't make things worse.
- Add another patch from CVS to fix a segfault in the catch/throw
handler under interesting nesting cases (closes: #322507)
- Rebuild against libsnmp9-dev for new libsnmp SOVER (closes: #327107)
-- Adam Conrad <adconrad@0c3.net> Thu, 8 Sep 2005 00:36:36 +1000
php5 (5.0.4-3) unstable; urgency=low
* And fix the module/extension API situation one last time, this time
......
......@@ -3,7 +3,7 @@ Section: web
Priority: optional
Maintainer: Debian PHP Maintainers <pkg-php-maint@lists.alioth.debian.org>
Uploaders: Adam Conrad <adconrad@0c3.net>, Steve Langasek <vorlon@debian.org>, Andres Salomon <dilinger@debian.org>, Jeroen van Wolffelaar <jeroen@wolffelaar.nl>, Ondřej Surý <ondrej@debian.org>
Build-Depends: apache-dev (>= 1.3.23), apache2-prefork-dev (>= 2.0.53-3), autoconf, automake1.4, bison, chrpath, debhelper (>= 3), flex (>= 2.5.4), freetds-dev, po-debconf, libbz2-dev (>= 1.0.0), libcurl3-dev, libdb4.2-dev, libexpat1-dev (>= 1.95.2-2.1), libfreetype6-dev, libgcrypt11-dev, libgd2-xpm-dev (>= 2.0.28-3), libjpeg62-dev, libkrb5-dev, libldap2-dev, libmhash-dev (>= 0.8.8), libmysqlclient12-dev, libncurses5-dev, libpam0g-dev, libpcre3-dev (>= 4.3-1), libpng12-dev, libpq-dev | postgresql-dev, librecode-dev, libsnmp5-dev, libsqlite0-dev, libssl-dev (>= 0.9.6), libt1-dev, libtool (>= 1.4.2-4), libwrap0-dev, libxmltok1-dev, libxml2-dev (>= 2.4.14), libxslt1-dev (>= 1.0.18), re2c, unixodbc-dev, zlib1g-dev (>= 1.0.9)
Build-Depends: apache-dev (>= 1.3.23), apache2-prefork-dev (>= 2.0.53-3), autoconf, automake1.4, bison, chrpath, debhelper (>= 3), flex (>= 2.5.4), freetds-dev, po-debconf, libbz2-dev (>= 1.0.0), libcurl3-dev, libdb4.2-dev, libexpat1-dev (>= 1.95.2-2.1), libfreetype6-dev, libgcrypt11-dev, libgd2-xpm-dev (>= 2.0.28-3), libgdbm-dev, libjpeg62-dev, libkrb5-dev, libldap2-dev, libmhash-dev (>= 0.8.8), libmysqlclient12-dev, libncurses5-dev, libpam0g-dev, libpcre3-dev (>= 4.3-1), libpng12-dev, libpq-dev | postgresql-dev, librecode-dev, libsnmp9-dev | libsnmp-dev, libsqlite0-dev, libssl-dev (>= 0.9.6), libt1-dev, libtool (>= 1.4.2-4), libwrap0-dev, libxmltok1-dev, libxml2-dev (>= 2.4.14), libxslt1-dev (>= 1.0.18), re2c, unixodbc-dev, zlib1g-dev (>= 1.0.9)
Build-Conflicts: bind-dev
Standards-Version: 3.6.2
......
......@@ -36,7 +36,7 @@ diff -urN php4-4.3.4.orig/acinclude.m4 php4-4.3.4/acinclude.m4
diff -urN php4-4.3.4.orig/configure.in php4-4.3.4/configure.in
--- php4-4.3.4.orig/configure.in 2003-11-02 17:15:05.000000000 -0500
+++ php4-4.3.4/configure.in 2004-02-16 01:00:52.000000000 -0500
@@ -1216,9 +1216,6 @@
@@ -1238,9 +1238,6 @@
LDFLAGS="$LDFLAGS $PHP_AIX_LDFLAGS"
AC_PROG_LIBTOOL
......
diff -urN php4-4.3.4.orig/acinclude.m4 php4-4.3.4/acinclude.m4
--- php4-4.3.4.orig/acinclude.m4 2004-02-16 01:01:22.000000000 -0500
+++ php4-4.3.4/acinclude.m4 2004-02-16 01:03:12.000000000 -0500
@@ -1751,9 +1751,7 @@
@@ -1777,9 +1777,7 @@
PHP_ADD_INCLUDE($OPENSSL_INCDIR)
......
--- php4-4.3.4.orig/ext/ldap/ldap.c
+++ php4-4.3.4/ext/ldap/ldap.c
@@ -1255,7 +1255,7 @@
@@ -1353,7 +1353,7 @@
}
i=0;
......@@ -9,7 +9,7 @@
count = i;
array_init(return_value);
@@ -1265,7 +1265,8 @@
@@ -1363,7 +1363,8 @@
add_index_string(return_value, i, ldap_value[i], 1);
}
......
diff -uNr php-5.0.4.orig/configure.in php-5.0.4/configure.in
--- php-5.0.4.orig/configure.in 2005-03-30 23:43:12.000000000 +0200
+++ php-5.0.4/configure.in 2005-04-27 11:15:29.276399240 +0200
@@ -918,7 +918,7 @@
@@ -929,7 +929,7 @@
fi
PHP_ARG_WITH(pear, [whether to install PEAR],
......@@ -10,7 +10,7 @@ diff -uNr php-5.0.4.orig/configure.in php-5.0.4/configure.in
--without-pear Do not install PEAR], DEFAULT, yes)
if test "$PHP_PEAR" != "no"; then
@@ -954,7 +954,7 @@
@@ -965,7 +965,7 @@
if test "$PHP_PEAR" = "DEFAULT" || test "$PHP_PEAR" = "yes"; then
case $PHP_LAYOUT in
GNU) PEAR_INSTALLDIR=$datadir/pear;;
......@@ -19,7 +19,7 @@ diff -uNr php-5.0.4.orig/configure.in php-5.0.4/configure.in
esac
fi
@@ -1008,12 +1008,12 @@
@@ -1019,12 +1019,12 @@
case $libdir in
'${exec_prefix}/lib')
......@@ -34,7 +34,7 @@ diff -uNr php-5.0.4.orig/configure.in php-5.0.4/configure.in
;;
*) ;;
esac
@@ -1070,7 +1070,7 @@
@@ -1081,7 +1081,7 @@
EXPANDED_DATADIR=$datadir
EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"`
EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"`
......@@ -58,11 +58,11 @@ diff -uNr php-5.0.4.orig/ext/ext_skel php-5.0.4/ext/ext_skel
diff -uNr php-5.0.4.orig/ext/session/session.c php-5.0.4/ext/session/session.c
--- php-5.0.4.orig/ext/session/session.c 2005-03-24 01:17:53.000000000 +0100
+++ php-5.0.4/ext/session/session.c 2005-04-27 11:14:32.923966112 +0200
@@ -137,11 +137,11 @@
@@ -151,11 +151,11 @@
PHP_INI_BEGIN()
STD_PHP_INI_BOOLEAN("session.bug_compat_42", "1", PHP_INI_ALL, OnUpdateBool, bug_compat, php_ps_globals, ps_globals)
STD_PHP_INI_BOOLEAN("session.bug_compat_warn", "1", PHP_INI_ALL, OnUpdateBool, bug_compat_warn, php_ps_globals, ps_globals)
- STD_PHP_INI_ENTRY("session.save_path", "", PHP_INI_ALL, OnUpdateString, save_path, php_ps_globals, ps_globals)
- STD_PHP_INI_ENTRY("session.save_path", "", PHP_INI_ALL, OnUpdateSaveDir,save_path, php_ps_globals, ps_globals)
+ STD_PHP_INI_ENTRY("session.save_path", "/var/lib/php5", PHP_INI_ALL, OnUpdateString, save_path, php_ps_globals, ps_globals)
STD_PHP_INI_ENTRY("session.name", "PHPSESSID", PHP_INI_ALL, OnUpdateString, session_name, php_ps_globals, ps_globals)
PHP_INI_ENTRY("session.save_handler", "files", PHP_INI_ALL, OnUpdateSaveHandler)
......@@ -91,7 +91,7 @@ diff -uNr php-5.0.4.orig/pear/Makefile.frag php-5.0.4/pear/Makefile.frag
diff -uNr php-5.0.4.orig/php.ini-dist php-5.0.4/php.ini-dist
--- php-5.0.4.orig/php.ini-dist 2005-03-01 01:25:09.000000000 +0100
+++ php-5.0.4/php.ini-dist 2005-04-27 11:14:32.929965200 +0200
@@ -430,7 +430,7 @@
@@ -437,7 +437,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;
; UNIX: "/path1:/path2"
......@@ -100,7 +100,7 @@ diff -uNr php-5.0.4.orig/php.ini-dist php-5.0.4/php.ini-dist
;
; Windows: "\path1;\path2"
;include_path = ".;c:\php\includes"
@@ -447,7 +447,7 @@
@@ -454,7 +454,7 @@
user_dir =
; Directory in which the loadable extensions (modules) reside.
......@@ -109,7 +109,7 @@ diff -uNr php-5.0.4.orig/php.ini-dist php-5.0.4/php.ini-dist
; Whether or not to enable the dl() function. The dl() function does NOT work
; properly in multithreaded servers, such as IIS or Zeus, and is automatically
@@ -546,51 +546,10 @@
@@ -556,51 +556,10 @@
; extension_dir directive above.
......@@ -117,6 +117,7 @@ diff -uNr php-5.0.4.orig/php.ini-dist php-5.0.4/php.ini-dist
-;Note that ODBC support is built in, so no dll is needed for it.
-;
-
-;extension=php_mbstring.dll
-;extension=php_bz2.dll
-;extension=php_cpdf.dll
-;extension=php_curl.dll
......@@ -134,7 +135,6 @@ diff -uNr php-5.0.4.orig/php.ini-dist php-5.0.4/php.ini-dist
-;extension=php_interbase.dll
-;extension=php_java.dll
-;extension=php_ldap.dll
-;extension=php_mbstring.dll
-;extension=php_mcrypt.dll
-;extension=php_mhash.dll
-;extension=php_mime_magic.dll
......@@ -164,7 +164,7 @@ diff -uNr php-5.0.4.orig/php.ini-dist php-5.0.4/php.ini-dist
;;;;;;;;;;;;;;;;;;;
; Module Settings ;
@@ -875,7 +834,7 @@
@@ -885,7 +844,7 @@
;
; where MODE is the octal representation of the mode. Note that this
; does not overwrite the process's umask.
......@@ -173,7 +173,7 @@ diff -uNr php-5.0.4.orig/php.ini-dist php-5.0.4/php.ini-dist
; Whether to use cookies.
session.use_cookies = 1
@@ -908,7 +867,10 @@
@@ -918,7 +877,10 @@
; e.g. 1/100 means there is a 1% chance that the GC process starts
; on each request.
......@@ -188,7 +188,7 @@ diff -uNr php-5.0.4.orig/php.ini-dist php-5.0.4/php.ini-dist
diff -uNr php-5.0.4.orig/php.ini-recommended php-5.0.4/php.ini-recommended
--- php-5.0.4.orig/php.ini-recommended 2005-03-01 01:25:09.000000000 +0100
+++ php-5.0.4/php.ini-recommended 2005-04-27 11:14:32.930965048 +0200
@@ -488,7 +488,7 @@
@@ -495,7 +495,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;
; UNIX: "/path1:/path2"
......@@ -197,7 +197,7 @@ diff -uNr php-5.0.4.orig/php.ini-recommended php-5.0.4/php.ini-recommended
;
; Windows: "\path1;\path2"
;include_path = ".;c:\php\includes"
@@ -505,7 +505,7 @@
@@ -512,7 +512,7 @@
user_dir =
; Directory in which the loadable extensions (modules) reside.
......@@ -206,7 +206,7 @@ diff -uNr php-5.0.4.orig/php.ini-recommended php-5.0.4/php.ini-recommended
; Whether or not to enable the dl() function. The dl() function does NOT work
; properly in multithreaded servers, such as IIS or Zeus, and is automatically
@@ -603,52 +603,10 @@
@@ -613,52 +613,10 @@
; needs to go here. Specify the location of the extension with the
; extension_dir directive above.
......@@ -216,6 +216,7 @@ diff -uNr php-5.0.4.orig/php.ini-recommended php-5.0.4/php.ini-recommended
-;Note that ODBC support is built in, so no dll is needed for it.
-;
-
-;extension=php_mbstring.dll
-;extension=php_bz2.dll
-;extension=php_cpdf.dll
-;extension=php_curl.dll
......@@ -233,7 +234,6 @@ diff -uNr php-5.0.4.orig/php.ini-recommended php-5.0.4/php.ini-recommended
-;extension=php_interbase.dll
-;extension=php_java.dll
-;extension=php_ldap.dll
-;extension=php_mbstring.dll
-;extension=php_mcrypt.dll
-;extension=php_mhash.dll
-;extension=php_mime_magic.dll
......@@ -262,7 +262,7 @@ diff -uNr php-5.0.4.orig/php.ini-recommended php-5.0.4/php.ini-recommended
;;;;;;;;;;;;;;;;;;;
; Module Settings ;
@@ -933,7 +891,7 @@
@@ -943,7 +901,7 @@
;
; where MODE is the octal representation of the mode. Note that this
; does not overwrite the process's umask.
......@@ -271,7 +271,7 @@ diff -uNr php-5.0.4.orig/php.ini-recommended php-5.0.4/php.ini-recommended
; Whether to use cookies.
session.use_cookies = 1
@@ -966,7 +924,10 @@
@@ -976,7 +934,10 @@
; e.g. 1/100 means there is a 1% chance that the GC process starts
; on each request.
......@@ -342,7 +342,7 @@ diff -uNr php-5.0.4.orig/scripts/Makefile.frag php-5.0.4/scripts/Makefile.frag
#
-phpincludedir = $(includedir)/php
-phpbuilddir = $(prefix)/lib/php/build
-phpbuilddir = $(libdir)/build
+phpincludedir = $(includedir)/php5
+phpbuilddir = $(prefix)/lib/php5/build
......@@ -363,12 +363,12 @@ diff -uNr php-5.0.4.orig/scripts/php-config.in php-5.0.4/scripts/php-config.in
diff -uNr php-5.0.4.orig/scripts/phpize.in php-5.0.4/scripts/phpize.in
--- php-5.0.4.orig/scripts/phpize.in 2005-01-25 13:54:57.000000000 +0100
+++ php-5.0.4/scripts/phpize.in 2005-04-27 11:14:32.943963072 +0200
@@ -2,8 +2,8 @@
@@ -3,8 +3,8 @@
# Variable declaration
prefix='@prefix@'
-phpdir="$prefix/lib/php/build"
-includedir="$prefix/include/php"
exec_prefix="`eval echo @exec_prefix@`"
-phpdir="`eval echo @libdir@`/build"
-includedir="`eval echo @includedir@`/php"
+phpdir="$prefix/lib/php5/build"
+includedir="$prefix/include/php5"
builddir="`pwd`"
......
--- php4-4.3.4.orig/ext/snmp/snmp.c
+++ php4-4.3.4/ext/snmp/snmp.c
@@ -352,9 +352,9 @@
struct snmp_pdu *pdu=NULL, *response;
struct variable_list *vars;
oid name[MAX_NAME_LEN];
- int name_length;
+ size_t name_length;
oid root[MAX_NAME_LEN];
- int rootlen = 0;
+ size_t rootlen = 0;
int gotroot = 0;
int status, count;
char buf[2048];
--- php4-4.3.10/configure.in 2004-12-15 17:00:57.000000000 -0700
+++ php4-4.3.10/configure.in 2004-12-15 17:03:30.000000000 -0700
@@ -570,50 +570,50 @@
@@ -581,50 +581,50 @@
dnl Check for getaddrinfo, should be a better way, but...
dnl Also check for working getaddrinfo
......
--- php4-4.3.10/build/build2.mk.orig 2005-02-06 00:49:53.000000000 -0700
+++ php4-4.3.10/build/build2.mk 2005-02-06 00:51:58.000000000 -0700
@@ -52,6 +52,11 @@
@@ -55,6 +55,11 @@
aclocal.m4: configure.in acinclude.m4
@echo rebuilding $@
......
......@@ -3,7 +3,7 @@ Save and restore umask across requests correctly.
--- php-4.3.10/sapi/apache2handler/sapi_apache2.c.umask
+++ php-4.3.10/sapi/apache2handler/sapi_apache2.c
@@ -402,6 +402,19 @@
@@ -395,6 +395,19 @@
return APR_SUCCESS;
}
......@@ -23,7 +23,7 @@ Save and restore umask across requests correctly.
static int php_apache_request_ctor(request_rec *r, php_struct *ctx TSRMLS_DC)
{
char *content_type;
@@ -546,6 +559,8 @@
@@ -545,6 +558,8 @@
} else {
zend_file_handle zfd;
......@@ -32,7 +32,7 @@ Save and restore umask across requests correctly.
zfd.type = ZEND_HANDLE_FILENAME;
zfd.filename = (char *) r->filename;
zfd.free_filename = 0;
@@ -556,6 +571,9 @@
@@ -555,6 +570,9 @@
} else {
zend_execute_scripts(ZEND_INCLUDE TSRMLS_CC, NULL, 1, &zfd);
}
......
diff -urN php-5.0.4.orig/ext/sockets/sockets.c php-5.0.4/ext/sockets/sockets.c
--- php-5.0.4.orig/ext/sockets/sockets.c 2005-02-15 00:44:31.000000000 +0100
+++ php-5.0.4/ext/sockets/sockets.c 2005-04-10 17:32:15.851738072 +0200
@@ -531,6 +531,7 @@
@@ -540,6 +540,7 @@
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 */
......
--- php4-4.3.10/ext/snmp/snmp.c 2005-03-23 00:32:06.000000000 -0700
+++ php4-4.3.10/ext/snmp/snmp.c 2005-03-23 00:30:18.000000000 -0700
@@ -215,7 +215,9 @@
@@ -214,7 +214,9 @@
*/
PHP_MSHUTDOWN_FUNCTION(snmp)
{
......
--- php4/ext/xmlrpc/libxmlrpc/xml_element.c
+++ php4/ext/xmlrpc/libxmlrpc/xml_element.c
@@ -189,7 +189,7 @@
Q_Destroy(&root->children);
Q_Destroy(&root->attrs);
- my_free((char*)root->name);
+ my_free(root->name);
simplestring_free(&root->text);
my_free(root);
}
--- php4-4.3.11/ext/standard/info.c.orig 2005-07-10 06:23:11.000000000 +1000
+++ php4-4.3.11/ext/standard/info.c 2005-07-10 06:23:33.000000000 +1000
@@ -424,7 +424,7 @@
@@ -441,7 +441,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "System", php_uname );
php_info_print_table_row(2, "Build Date", __DATE__ " " __TIME__ );
......
diff -ur php-5.0.4/configure.in php5-5.0.4/configure.in
--- php-5.0.4/configure.in 2005-03-31 07:43:12.000000000 +1000
+++ php5-5.0.4/configure.in 2005-07-31 02:35:46.000000000 +1000
@@ -1033,8 +1033,10 @@
@@ -1044,8 +1044,10 @@
ZEND_MODULE_API_NO=`egrep '#define ZEND_MODULE_API_NO ' $srcdir/Zend/zend_modules.h|sed 's/#define ZEND_MODULE_API_NO //'`
......@@ -13,7 +13,7 @@ diff -ur php-5.0.4/configure.in php5-5.0.4/configure.in
if test "$oldstyleextdir" = "yes"; then
if test "$PHP_DEBUG" = "1"; then
part1=debug
@@ -1154,6 +1156,7 @@
@@ -1176,6 +1178,7 @@
PHP_SUBST(CXXFLAGS_CLEAN)
PHP_SUBST(CXX_PHP_COMPILE)
PHP_SUBST_OLD(DEBUG_CFLAGS)
......
usr/bin/php-config
usr/bin/phpize
usr/share/man/man1/php-config.1
usr/share/man/man1/phpize.1
usr/include
usr/lib/php5/build
......@@ -10,7 +10,8 @@ fi
for i in php-config phpize; do
update-alternatives \
--install /usr/bin/"$i" $i /usr/bin/"$i"5 50
--install /usr/bin/"$i" $i /usr/bin/"$i"5 50 \
--slave /usr/share/man/man1/"$i".1.gz "$i".1.gz /usr/share/man/man1/"$i"5.1.gz
done
exit 0
......@@ -43,6 +43,7 @@ else
endif
COMMON_CONFIG= --build=$(PHP5_BUILD_GNU_TYPE)-gnu --host=$(PHP5_HOST_GNU_TYPE)-gnu \
--mandir=/usr/share/man \
--enable-memory-limit \
--disable-debug \
--with-regex=php \
......@@ -61,6 +62,7 @@ COMMON_CONFIG= --build=$(PHP5_BUILD_GNU_TYPE)-gnu --host=$(PHP5_HOST_GNU_TYPE)-
--with-bz2 \
--enable-ctype \
--with-db4 \
--with-gdbm=/usr \
--with-iconv \
--enable-exif \
--enable-filepro \
......@@ -357,6 +359,7 @@ install: build
# make php-dev stuff versioned
for i in php-config phpize; do \
mv debian/php5-dev/usr/bin/$$i debian/php5-dev/usr/bin/"$$i"5; \
mv debian/php5-dev/usr/share/man/man1/"$$i".1 debian/php5-dev/usr/share/man/man1/"$$i"5.1; \
done
# install common files
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment