[Pkg-php-commits] r1179 - in php5/branches/lenny/debian: . patches
Sean Finney
seanius at alioth.debian.org
Sat Dec 6 16:20:17 UTC 2008
tags 438120 pending
tags 447174 pending
tags 469081 pending
tags 471104 pending
thanks
Author: seanius
Date: 2008-12-06 16:20:16 +0000 (Sat, 06 Dec 2008)
New Revision: 1179
Added:
php5/branches/lenny/debian/README.source
php5/branches/lenny/debian/libapache2-mod-php5filter.conf
php5/branches/lenny/debian/libapache2-mod-php5filter.dirs
php5/branches/lenny/debian/libapache2-mod-php5filter.load
php5/branches/lenny/debian/libapache2-mod-php5filter.postinst
php5/branches/lenny/debian/libapache2-mod-php5filter.prerm
php5/branches/lenny/debian/patches/force_libmysqlclient_r.patch
php5/branches/lenny/debian/patches/manpage_spelling.patch
php5/branches/lenny/debian/patches/use_embedded_timezonedb.patch
php5/branches/lenny/debian/php-pear.dirs
php5/branches/lenny/debian/suhosin_patch.watch
Modified:
php5/branches/lenny/debian/NEWS
php5/branches/lenny/debian/changelog
php5/branches/lenny/debian/compat
php5/branches/lenny/debian/copyright.header
php5/branches/lenny/debian/patches/001-libtool_fixes.patch
php5/branches/lenny/debian/patches/002-static_openssl.patch
php5/branches/lenny/debian/patches/004-ldap_fix.patch
php5/branches/lenny/debian/patches/006-debian_quirks.patch
php5/branches/lenny/debian/patches/013-force_getaddrinfo.patch
php5/branches/lenny/debian/patches/017-pread_pwrite_disable.patch
php5/branches/lenny/debian/patches/019-z_off_t_as_long.patch
php5/branches/lenny/debian/patches/029-php.ini_paranoid.patch
php5/branches/lenny/debian/patches/034-apache2_umask_fix.patch
php5/branches/lenny/debian/patches/036-fd_setsize_fix.patch
php5/branches/lenny/debian/patches/043-recode_size_t.patch
php5/branches/lenny/debian/patches/044-strtod_arm_fix.patch
php5/branches/lenny/debian/patches/045-exif_nesting_level.patch
php5/branches/lenny/debian/patches/047-zts_with_dl.patch
php5/branches/lenny/debian/patches/052-phpinfo_no_configure.patch
php5/branches/lenny/debian/patches/053-extension_api.patch
php5/branches/lenny/debian/patches/056-mime_magic_liberal.patch
php5/branches/lenny/debian/patches/057-no_apache_installed.patch
php5/branches/lenny/debian/patches/100-recode_is_shared.patch
php5/branches/lenny/debian/patches/101-sqlite_is_shared.patch
php5/branches/lenny/debian/patches/107-reflection_is_ext.patch
php5/branches/lenny/debian/patches/108-64_bit_datetime.patch
php5/branches/lenny/debian/patches/112-proc_open.patch
php5/branches/lenny/debian/patches/113-php.ini_securitynotes.patch
php5/branches/lenny/debian/patches/disable_dl_by_default.patch
php5/branches/lenny/debian/patches/fix_broken_upstream_tests.patch
php5/branches/lenny/debian/patches/libdb_is_-ldb
php5/branches/lenny/debian/patches/suhosin.patch
php5/branches/lenny/debian/php5-common.dirs
php5/branches/lenny/debian/php5.lintian-overrides
php5/branches/lenny/debian/rules
php5/branches/lenny/debian/watch
Log:
i hate svn. the last merge was incomplete.
Modified: php5/branches/lenny/debian/NEWS
===================================================================
--- php5/branches/lenny/debian/NEWS 2008-12-06 14:01:05 UTC (rev 1178)
+++ php5/branches/lenny/debian/NEWS 2008-12-06 16:20:16 UTC (rev 1179)
@@ -23,7 +23,7 @@
php5 (5.2.3-2) unstable; urgency=low
- The suhosin patch is now enabled by default!
+ The Suhosin patch is now enabled by default!
For more information, see
<http://www.hardened-php.net/suhosin/index.html>.
Copied: php5/branches/lenny/debian/README.source (from rev 1178, php5/trunk/debian/README.source)
===================================================================
--- php5/branches/lenny/debian/README.source (rev 0)
+++ php5/branches/lenny/debian/README.source 2008-12-06 16:20:16 UTC (rev 1179)
@@ -0,0 +1,8 @@
+
+ == Generation of the php5-dbg package Depends ==
+
+ The following command can be used to generate a heuristic list of packages
+the php5-dbg package probably needs to Depend on:
+dh_testdir && egrep '^Package' debian/control | cut '-d ' -f2 | \
+ egrep -v '(^php5|dbg|dev|common|pear)$' | tr "\n" "|" | sed 's/|$//' |\
+ sed -r 's/([^|]+)(\||$)/ \1 (= ${binary:Version}) \2/g'; echo
Modified: php5/branches/lenny/debian/changelog
===================================================================
--- php5/branches/lenny/debian/changelog 2008-12-06 14:01:05 UTC (rev 1178)
+++ php5/branches/lenny/debian/changelog 2008-12-06 16:20:16 UTC (rev 1179)
@@ -92,8 +92,6 @@
* tzdb-nofree_ents_ifnotzdata.patch: avoid free'ing ents when the tz dir does
not exist (Closes: #483461)
-php5 (5.2.6-1) unstable; urgency=medium
-
[ Sean Finney ]
* Fix for CVE-2008-2829: unsafe usage of deprecated imap functions
Patch: CVE-2008-2829.patch
@@ -103,6 +101,40 @@
* Rename the apache2 filter module to libphp5filter.so, to prevent
conflicting filenames for symbols in the debug package.
+ -- Sean Finney <seanius at debian.org> Thu, 03 Jul 2008 08:14:45 +0200
+
+php5 (5.2.6-1) unstable; urgency=medium
+
+ * New upstream release. Fixes several security issues of unknown impact:
+ + possible stack buffer overflow in the FastCGI SAPI
+ + integer overflow in printf()
+ + unknown issue CVE-2008-0599
+ + a safe_mode bypass in cURL
+ + incomplete multibyte chars inside escapeshellcmd()
+
+ [ Sean Finney ]
+ * New patch (use_embedded_timezonedb.patch) allows us to default to
+ using the system provided timezone database instead of the one bundled
+ with PHP. Many thanks to Joe Orten from Red Hat for the patch!
+ (closes: #447174, #471104).
+ * Updated the Suhosin patch to v0.9.6 (5.2.6).
+ * New patch: force_libmysqlclient_r.patch, forcing the build system
+ to link against the threadsafe libmysqlclient without having to enable
+ the other zts features in php. This is required since the apr libraries
+ are now linking against this as well and mysql exports the same symbols
+ from both libraries. Thanks to Stefan Fritsch (closes: #469081).
+ * Massaged/updated various other patches in debian/patches
+ * Update copyright information to have information about non-trivial
+ patches worthy of copyright attributions, and update information about
+ current debian maintainers.
+ * Add some useful quilt settings in debian/rules to lower the amount of
+ noise in future quilt updates.
+ * Now building a php5 apache2 module with filter-module support in a new
+ libapache2-mod-php5filter package (closes: #438120).
+
+ [ Thijs Kinkhorst ]
+ * Checked for policy 3.7.3, no changes.
+
[ Raphael Geissert ]
* Build a php5-dbg package with the debug symbols of the SAPIs & extensions
+ Bump debhelper dependency to >= 5 as dh_strip behaves differently.
@@ -157,8 +189,12 @@
- get rid of usr/share/php/data/Structures_Graph/LICENSE in php-pear
* Move /usr/share/php/docs to /usr/share/doc/pear-php/PEAR (Closes: #331034)
- -- Sean Finney <seanius at debian.org> Thu, 03 Jul 2008 08:14:45 +0200
+ [ Steve Langasek ]
+ * Step down from the PHP maintenance team, removing myself from uploaders.
+ So long, and thanks for all the fish!
+ -- Sean Finney <seanius at debian.org> Sun, 04 May 2008 21:15:47 +0200
+
php5 (5.2.5-3+lenny2) testing-security; urgency=low
* Security upload for testing to bypass current blockage in unstable.
Modified: php5/branches/lenny/debian/compat
===================================================================
--- php5/branches/lenny/debian/compat 2008-12-06 14:01:05 UTC (rev 1178)
+++ php5/branches/lenny/debian/compat 2008-12-06 16:20:16 UTC (rev 1179)
@@ -1 +1 @@
-4
+5
Modified: php5/branches/lenny/debian/copyright.header
===================================================================
--- php5/branches/lenny/debian/copyright.header 2008-12-06 14:01:05 UTC (rev 1178)
+++ php5/branches/lenny/debian/copyright.header 2008-12-06 16:20:16 UTC (rev 1179)
@@ -1,16 +1,29 @@
This package was debianized by Gergely Madarasz <gorgo at sztaki.hu> on
Tue, 16 Nov 1999 19:33:42 +0100.
-The last maintainer was Petr Cech <cech at debian.org>, who did a LOT of
-work on these packages.
+Previous maintainers of the package also include:
+ Petr Cech <cech at debian.org>, who did a LOT of work on these packages.
+ Adam Conrad <adconrad at 0c3.net>, who got a significant chunk of input and
+ help from Steve Langasek <vorlon at debian.org> and
+ Andres Salomon <dilinger at debian.org>.
+
+The current maintainers can be contacted via the debian php packaging list:
+ pkg-php-maint at lists.alioth.debian.org
-The current maintainer is Adam Conrad <adconrad at 0c3.net>, who gets a
-significant chunk of input and help from Steve Langasek <vorlon at debian.org>
-and Andres Salomon <dilinger at debian.org>.
-
It was downloaded from www.php.net/version5/downloads
Changes: removed ext/dbase dir (non-free)
+Noteworthy/non-trivial patches:
+ patch: suhosin.patch
+ contributor: http://www.hardened-php.net/
+ copyright © 2006-2007 Stefan Esser <sesser at hardened-php.net>
+ may be used/modified/redistributed under the terms of PHP itself
+
+ patch: use_embedded_timezonedb.patch
+ contributor: Joe Orton <jorton at redhat.com>
+ copyright © 2008 Red Hat, Inc.
+ may be used/modified/redistributed under the terms of PHP itself
+
Upstream Authors: The PHP group for PHP5, Andi Gutmans and Zeev Suraski
for libzend
@@ -27,4 +40,3 @@
Two different licences apply to this package, one for PHP5, the other for
libzend. Both licences are shown here below.
-
Copied: php5/branches/lenny/debian/libapache2-mod-php5filter.conf (from rev 1178, php5/trunk/debian/libapache2-mod-php5filter.conf)
===================================================================
--- php5/branches/lenny/debian/libapache2-mod-php5filter.conf (rev 0)
+++ php5/branches/lenny/debian/libapache2-mod-php5filter.conf 2008-12-06 16:20:16 UTC (rev 1179)
@@ -0,0 +1,4 @@
+<IfModule mod_php5.c>
+ AddInputFilter PHP php phtml php3
+ AddOutputFilter PHP php phtml php3
+</IfModule>
Copied: php5/branches/lenny/debian/libapache2-mod-php5filter.dirs (from rev 1178, php5/trunk/debian/libapache2-mod-php5filter.dirs)
===================================================================
--- php5/branches/lenny/debian/libapache2-mod-php5filter.dirs (rev 0)
+++ php5/branches/lenny/debian/libapache2-mod-php5filter.dirs 2008-12-06 16:20:16 UTC (rev 1179)
@@ -0,0 +1,3 @@
+/etc/apache2/mods-available
+/etc/php5/apache2filter
+/usr/lib/apache2/modules
Copied: php5/branches/lenny/debian/libapache2-mod-php5filter.load (from rev 1178, php5/trunk/debian/libapache2-mod-php5filter.load)
===================================================================
--- php5/branches/lenny/debian/libapache2-mod-php5filter.load (rev 0)
+++ php5/branches/lenny/debian/libapache2-mod-php5filter.load 2008-12-06 16:20:16 UTC (rev 1179)
@@ -0,0 +1 @@
+LoadModule php5_module /usr/lib/apache2/modules/libphp5filter.so
Copied: php5/branches/lenny/debian/libapache2-mod-php5filter.postinst (from rev 1178, php5/trunk/debian/libapache2-mod-php5filter.postinst)
===================================================================
--- php5/branches/lenny/debian/libapache2-mod-php5filter.postinst (rev 0)
+++ php5/branches/lenny/debian/libapache2-mod-php5filter.postinst 2008-12-06 16:20:16 UTC (rev 1179)
@@ -0,0 +1,43 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#
+
+if [ "$1" != "configure" ]; then
+ exit 0
+fi
+
+phpini="/etc/php5/apache2filter/php.ini"
+
+ucf /usr/share/php5/php.ini-dist $phpini
+
+reload_apache()
+{
+ if apache2ctl configtest 2>/dev/null; then
+ invoke-rc.d apache2 force-reload || true
+ else
+ echo "Your apache2 configuration is broken, so we're not restarting it for you."
+ fi
+}
+
+if [ -n "$2" ]; then
+ # recover the previous state
+ if [ -e /etc/php5/apache2filter/.start ]; then
+ a2enmod php5filter >/dev/null || true
+ fi
+# we're upgrading. test if we're enabled, and if so, restart to reload the module.
+ if [ -e /etc/apache2/mods-enabled/php5filter.load ]; then
+ reload_apache
+ fi
+ exit 0
+fi
+
+if [ -e /etc/apache2/apache2.conf ]; then
+# Enable the module, but hide a2enmod's misleading message about apachectl
+# and force-reload the thing ourselves.
+ a2enmod php5filter >/dev/null || true
+ reload_apache
+fi
+
+exit 0
Copied: php5/branches/lenny/debian/libapache2-mod-php5filter.prerm (from rev 1178, php5/trunk/debian/libapache2-mod-php5filter.prerm)
===================================================================
--- php5/branches/lenny/debian/libapache2-mod-php5filter.prerm (rev 0)
+++ php5/branches/lenny/debian/libapache2-mod-php5filter.prerm 2008-12-06 16:20:16 UTC (rev 1179)
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#
+
+if [ "$1" != "remove" -a "$1" != "purge" ]; then
+ exit 0
+fi
+
+if [ -e /etc/apache2/apache2.conf ]; then
+ if [ -e /etc/apache2/mods-enabled/php5.load ]; then
+ # set a flag to remember the original state
+ # useful when reinstalling the same version.
+ touch /etc/php5/apache2filter/.start
+ fi
+ a2dismod php5filter || true
+fi
+
+exit 0
Modified: php5/branches/lenny/debian/patches/001-libtool_fixes.patch
===================================================================
--- php5/branches/lenny/debian/patches/001-libtool_fixes.patch 2008-12-06 14:01:05 UTC (rev 1178)
+++ php5/branches/lenny/debian/patches/001-libtool_fixes.patch 2008-12-06 16:20:16 UTC (rev 1179)
@@ -1,8 +1,8 @@
-Index: php5-5.2.4/TSRM/configure.in
+Index: php5-5.2.6/TSRM/configure.in
===================================================================
---- php5-5.2.4.orig/TSRM/configure.in 2007-09-10 20:45:24.000000000 +0200
-+++ php5-5.2.4/TSRM/configure.in 2007-09-10 20:45:26.000000000 +0200
-@@ -13,9 +13,6 @@
+--- php5-5.2.6.orig/TSRM/configure.in
++++ php5-5.2.6/TSRM/configure.in
+@@ -13,9 +13,6 @@ TSRM_BASIC_CHECKS
TSRM_THREADS_CHECKS
AM_PROG_LIBTOOL
@@ -12,11 +12,11 @@
dnl TSRM_PTHREAD
-Index: php5-5.2.4/configure.in
+Index: php5-5.2.6/configure.in
===================================================================
---- php5-5.2.4.orig/configure.in 2007-09-10 20:45:24.000000000 +0200
-+++ php5-5.2.4/configure.in 2007-09-10 20:45:26.000000000 +0200
-@@ -1256,9 +1256,6 @@
+--- php5-5.2.6.orig/configure.in
++++ php5-5.2.6/configure.in
+@@ -1256,9 +1256,6 @@ AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [AC
AC_DEFUN([AC_PROG_CXX], [])])
AC_PROG_LIBTOOL
Modified: php5/branches/lenny/debian/patches/002-static_openssl.patch
===================================================================
--- php5/branches/lenny/debian/patches/002-static_openssl.patch 2008-12-06 14:01:05 UTC (rev 1178)
+++ php5/branches/lenny/debian/patches/002-static_openssl.patch 2008-12-06 16:20:16 UTC (rev 1179)
@@ -1,8 +1,8 @@
-Index: php5-5.2.4/acinclude.m4
+Index: php5-5.2.6/acinclude.m4
===================================================================
---- php5-5.2.4.orig/acinclude.m4 2007-09-10 20:45:23.000000000 +0200
-+++ php5-5.2.4/acinclude.m4 2007-09-10 20:45:32.000000000 +0200
-@@ -2364,9 +2364,7 @@
+--- php5-5.2.6.orig/acinclude.m4
++++ php5-5.2.6/acinclude.m4
+@@ -2364,9 +2364,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
PHP_ADD_INCLUDE($OPENSSL_INCDIR)
Modified: php5/branches/lenny/debian/patches/004-ldap_fix.patch
===================================================================
--- php5/branches/lenny/debian/patches/004-ldap_fix.patch 2008-12-06 14:01:05 UTC (rev 1178)
+++ php5/branches/lenny/debian/patches/004-ldap_fix.patch 2008-12-06 16:20:16 UTC (rev 1179)
@@ -1,8 +1,8 @@
-Index: php5-5.2.4/ext/ldap/ldap.c
+Index: php5-5.2.6/ext/ldap/ldap.c
===================================================================
---- php5-5.2.4.orig/ext/ldap/ldap.c 2007-09-10 20:45:23.000000000 +0200
-+++ php5-5.2.4/ext/ldap/ldap.c 2007-09-10 20:45:39.000000000 +0200
-@@ -1334,7 +1334,7 @@
+--- php5-5.2.6.orig/ext/ldap/ldap.c
++++ php5-5.2.6/ext/ldap/ldap.c
+@@ -1334,7 +1334,7 @@ PHP_FUNCTION(ldap_explode_dn)
}
i=0;
@@ -11,7 +11,7 @@
count = i;
array_init(return_value);
-@@ -1344,7 +1344,8 @@
+@@ -1344,7 +1344,8 @@ PHP_FUNCTION(ldap_explode_dn)
add_index_string(return_value, i, ldap_value[i], 1);
}
Modified: php5/branches/lenny/debian/patches/006-debian_quirks.patch
===================================================================
--- php5/branches/lenny/debian/patches/006-debian_quirks.patch 2008-12-06 14:01:05 UTC (rev 1178)
+++ php5/branches/lenny/debian/patches/006-debian_quirks.patch 2008-12-06 16:20:16 UTC (rev 1179)
@@ -1,8 +1,8 @@
-Index: php5-5.2.4/configure.in
+Index: php5-5.2.6/configure.in
===================================================================
---- php5-5.2.4.orig/configure.in 2007-09-10 20:45:26.000000000 +0200
-+++ php5-5.2.4/configure.in 2007-09-11 00:23:54.000000000 +0200
-@@ -934,7 +934,7 @@
+--- php5-5.2.6.orig/configure.in
++++ php5-5.2.6/configure.in
+@@ -934,7 +934,7 @@ if test "$PHP_CLI" = "no"; then
fi
PHP_ARG_WITH(pear, [whether to install PEAR],
@@ -11,7 +11,7 @@
--without-pear Do not install PEAR], DEFAULT, yes)
if test "$PHP_PEAR" != "no"; then
-@@ -968,7 +968,7 @@
+@@ -968,7 +968,7 @@ dnl
if test "$PHP_PEAR" = "DEFAULT" || test "$PHP_PEAR" = "yes"; then
case $PHP_LAYOUT in
GNU) PEAR_INSTALLDIR=$datadir/pear;;
@@ -20,7 +20,7 @@
esac
fi
-@@ -1023,12 +1023,12 @@
+@@ -1023,12 +1023,12 @@ test "$program_suffix" = "NONE" && progr
case $libdir in
'${exec_prefix}/lib')
@@ -35,7 +35,7 @@
;;
*) ;;
esac
-@@ -1094,7 +1094,7 @@
+@@ -1094,7 +1094,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfd
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"`
@@ -44,11 +44,11 @@
exec_prefix=$old_exec_prefix
libdir=$old_libdir
-Index: php5-5.2.4/ext/ext_skel
+Index: php5-5.2.6/ext/ext_skel
===================================================================
---- php5-5.2.4.orig/ext/ext_skel 2004-05-16 14:10:35.000000000 +0200
-+++ php5-5.2.4/ext/ext_skel 2007-09-11 00:23:54.000000000 +0200
-@@ -70,7 +70,7 @@
+--- php5-5.2.6.orig/ext/ext_skel
++++ php5-5.2.6/ext/ext_skel
+@@ -70,7 +70,7 @@ if test -d "$extname" ; then
fi
if test -z "$skel_dir"; then
@@ -57,11 +57,11 @@
fi
## convert skel_dir to full path
-Index: php5-5.2.4/ext/session/session.c
+Index: php5-5.2.6/ext/session/session.c
===================================================================
---- php5-5.2.4.orig/ext/session/session.c 2007-08-03 03:16:40.000000000 +0200
-+++ php5-5.2.4/ext/session/session.c 2007-09-11 00:23:54.000000000 +0200
-@@ -181,11 +181,11 @@
+--- php5-5.2.6.orig/ext/session/session.c
++++ php5-5.2.6/ext/session/session.c
+@@ -181,11 +181,11 @@ static PHP_INI_MH(OnUpdateSaveDir)
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)
@@ -75,11 +75,11 @@
STD_PHP_INI_ENTRY("session.gc_divisor", "100", PHP_INI_ALL, OnUpdateLong, gc_divisor, php_ps_globals, ps_globals)
STD_PHP_INI_ENTRY("session.gc_maxlifetime", "1440", PHP_INI_ALL, OnUpdateLong, gc_maxlifetime, php_ps_globals, ps_globals)
PHP_INI_ENTRY("session.serialize_handler", "php", PHP_INI_ALL, OnUpdateSerializer)
-Index: php5-5.2.4/php.ini-dist
+Index: php5-5.2.6/php.ini-dist
===================================================================
---- php5-5.2.4.orig/php.ini-dist 2007-08-22 01:24:18.000000000 +0200
-+++ php5-5.2.4/php.ini-dist 2007-09-11 00:23:54.000000000 +0200
-@@ -466,7 +466,7 @@
+--- php5-5.2.6.orig/php.ini-dist
++++ php5-5.2.6/php.ini-dist
+@@ -466,7 +466,7 @@ default_mimetype = "text/html"
;;;;;;;;;;;;;;;;;;;;;;;;;
; UNIX: "/path1:/path2"
@@ -88,7 +88,7 @@
;
; Windows: "\path1;\path2"
;include_path = ".;c:\php\includes"
-@@ -483,7 +483,7 @@
+@@ -483,7 +483,7 @@ doc_root =
user_dir =
; Directory in which the loadable extensions (modules) reside.
@@ -97,7 +97,7 @@
; 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
-@@ -596,58 +596,6 @@
+@@ -596,58 +596,6 @@ default_socket_timeout = 60
; extension_dir directive above.
@@ -156,7 +156,7 @@
;;;;;;;;;;;;;;;;;;;
; Module Settings ;
;;;;;;;;;;;;;;;;;;;
-@@ -988,7 +936,7 @@
+@@ -988,7 +936,7 @@ session.save_handler = files
;
; where MODE is the octal representation of the mode. Note that this
; does not overwrite the process's umask.
@@ -165,23 +165,25 @@
; Whether to use cookies.
session.use_cookies = 1
-@@ -1026,7 +974,10 @@
+@@ -1026,7 +974,12 @@ session.serialize_handler = php
; e.g. 1/100 means there is a 1% chance that the GC process starts
; on each request.
-session.gc_probability = 1
+; This is disabled in the Debian packages, due to the strict permissions
+; on /var/lib/php5. Instead of setting this here, see the cronjob at
-+; /etc/cron.d/php5, which uses the session.gc_maxlifetime setting below
++; /etc/cron.d/php5, which uses the session.gc_maxlifetime setting below.
++; php scripts using their own session.save_path should make sure garbage
++; collection is enabled by setting session.gc_probability
+;session.gc_probability = 0
session.gc_divisor = 100
; After this number of seconds, stored data will be seen as 'garbage' and
-Index: php5-5.2.4/php.ini-recommended
+Index: php5-5.2.6/php.ini-recommended
===================================================================
---- php5-5.2.4.orig/php.ini-recommended 2007-08-22 01:24:18.000000000 +0200
-+++ php5-5.2.4/php.ini-recommended 2007-09-11 00:23:54.000000000 +0200
-@@ -516,7 +516,7 @@
+--- php5-5.2.6.orig/php.ini-recommended
++++ php5-5.2.6/php.ini-recommended
+@@ -516,7 +516,7 @@ default_mimetype = "text/html"
;;;;;;;;;;;;;;;;;;;;;;;;;
; UNIX: "/path1:/path2"
@@ -190,7 +192,7 @@
;
; Windows: "\path1;\path2"
;include_path = ".;c:\php\includes"
-@@ -533,7 +533,7 @@
+@@ -533,7 +533,7 @@ doc_root =
user_dir =
; Directory in which the loadable extensions (modules) reside.
@@ -199,7 +201,7 @@
; 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
-@@ -646,58 +646,6 @@
+@@ -646,58 +646,6 @@ default_socket_timeout = 60
; extension_dir directive above.
@@ -258,7 +260,7 @@
;;;;;;;;;;;;;;;;;;;
; Module Settings ;
;;;;;;;;;;;;;;;;;;;
-@@ -1038,7 +986,7 @@
+@@ -1038,7 +986,7 @@ session.save_handler = files
;
; where MODE is the octal representation of the mode. Note that this
; does not overwrite the process's umask.
@@ -267,23 +269,25 @@
; Whether to use cookies.
session.use_cookies = 1
-@@ -1076,7 +1024,10 @@
+@@ -1076,7 +1024,12 @@ session.serialize_handler = php
; e.g. 1/100 means there is a 1% chance that the GC process starts
; on each request.
-session.gc_probability = 1
+; This is disabled in the Debian packages, due to the strict permissions
+; on /var/lib/php5. Instead of setting this here, see the cronjob at
-+; /etc/cron.d/php5, which uses the session.gc_maxlifetime setting below
++; /etc/cron.d/php5, which uses the session.gc_maxlifetime setting below.
++; php scripts using their own session.save_path should make sure garbage
++; collection is enabled by setting session.gc_probability
+;session.gc_probability = 0
session.gc_divisor = 1000
; After this number of seconds, stored data will be seen as 'garbage' and
-Index: php5-5.2.4/sapi/caudium/config.m4
+Index: php5-5.2.6/sapi/caudium/config.m4
===================================================================
---- php5-5.2.4.orig/sapi/caudium/config.m4 2007-07-12 01:20:36.000000000 +0200
-+++ php5-5.2.4/sapi/caudium/config.m4 2007-09-11 00:23:54.000000000 +0200
-@@ -26,8 +26,8 @@
+--- php5-5.2.6.orig/sapi/caudium/config.m4
++++ php5-5.2.6/sapi/caudium/config.m4
+@@ -26,8 +26,8 @@ if test "$PHP_CAUDIUM" != "no"; then
AC_MSG_ERROR([Could not find a pike in $PHP_CAUDIUM/bin/])
fi
if $PIKE -e 'float v; int rel;sscanf(version(), "Pike v%f release %d", v, rel);v += rel/10000.0; if(v < 7.0268) exit(1); exit(0);'; then
@@ -294,7 +298,7 @@
if test -z "$PIKE_INCLUDE_DIR" || test -z "$PIKE_MODULE_DIR"; then
AC_MSG_ERROR(Failed to figure out Pike module and include directories)
fi
-@@ -84,7 +84,9 @@
+@@ -84,7 +84,9 @@ if test "$PHP_CAUDIUM" != "no"; then
PIKE_VERSION=`$PIKE -e 'string v; int rel;sscanf(version(), "Pike v%s release %d", v, rel); write(v+"."+rel);'`
AC_DEFINE(HAVE_CAUDIUM,1,[Whether to compile with Caudium support])
PHP_SELECT_SAPI(caudium, shared, caudium.c)
@@ -305,11 +309,11 @@
RESULT=" *** Pike binary used: $PIKE
*** Pike include dir(s) used: $PIKE_INCLUDE_DIR
*** Pike version: $PIKE_VERSION"
-Index: php5-5.2.4/sapi/cli/php.1.in
+Index: php5-5.2.6/sapi/cli/php.1.in
===================================================================
---- php5-5.2.4.orig/sapi/cli/php.1.in 2007-04-23 22:54:22.000000000 +0200
-+++ php5-5.2.4/sapi/cli/php.1.in 2007-09-11 00:23:54.000000000 +0200
-@@ -306,13 +306,14 @@
+--- php5-5.2.6.orig/sapi/cli/php.1.in
++++ php5-5.2.6/sapi/cli/php.1.in
+@@ -306,13 +306,14 @@ Shows configuration for extension
.B name
.SH FILES
.TP 15
@@ -329,10 +333,10 @@
.SH EXAMPLES
.TP 5
\fIphp -r 'echo "Hello World\\n";'\fP
-Index: php5-5.2.4/scripts/Makefile.frag
+Index: php5-5.2.6/scripts/Makefile.frag
===================================================================
---- php5-5.2.4.orig/scripts/Makefile.frag 2005-11-22 00:08:02.000000000 +0100
-+++ php5-5.2.4/scripts/Makefile.frag 2007-09-11 00:23:54.000000000 +0200
+--- php5-5.2.6.orig/scripts/Makefile.frag
++++ php5-5.2.6/scripts/Makefile.frag
@@ -3,8 +3,8 @@
# Build environment install
#
@@ -344,11 +348,11 @@
BUILD_FILES = \
scripts/phpize.m4 \
-Index: php5-5.2.4/scripts/php-config.in
+Index: php5-5.2.6/scripts/php-config.in
===================================================================
---- php5-5.2.4.orig/scripts/php-config.in 2007-08-24 13:44:10.000000000 +0200
-+++ php5-5.2.4/scripts/php-config.in 2007-09-11 00:23:54.000000000 +0200
-@@ -5,8 +5,8 @@
+--- php5-5.2.6.orig/scripts/php-config.in
++++ php5-5.2.6/scripts/php-config.in
+@@ -5,8 +5,8 @@ prefix="@prefix@"
exec_prefix="@exec_prefix@"
version="@PHP_VERSION@"
vernum="@PHP_VERSION_ID@"
@@ -359,10 +363,10 @@
ldflags="@PHP_LDFLAGS@"
libs="@EXTRA_LIBS@"
extension_dir='@EXTENSION_DIR@'
-Index: php5-5.2.4/scripts/phpize.in
+Index: php5-5.2.6/scripts/phpize.in
===================================================================
---- php5-5.2.4.orig/scripts/phpize.in 2007-06-29 03:10:35.000000000 +0200
-+++ php5-5.2.4/scripts/phpize.in 2007-09-11 00:23:54.000000000 +0200
+--- php5-5.2.6.orig/scripts/phpize.in
++++ php5-5.2.6/scripts/phpize.in
@@ -3,8 +3,8 @@
# Variable declaration
prefix='@prefix@'
Modified: php5/branches/lenny/debian/patches/013-force_getaddrinfo.patch
===================================================================
--- php5/branches/lenny/debian/patches/013-force_getaddrinfo.patch 2008-12-06 14:01:05 UTC (rev 1178)
+++ php5/branches/lenny/debian/patches/013-force_getaddrinfo.patch 2008-12-06 16:20:16 UTC (rev 1179)
@@ -1,8 +1,8 @@
-Index: php5-5.2.4/configure.in
+Index: php5-5.2.6/configure.in
===================================================================
---- php5-5.2.4.orig/configure.in 2007-09-11 00:23:54.000000000 +0200
-+++ php5-5.2.4/configure.in 2007-09-11 00:24:00.000000000 +0200
-@@ -557,50 +557,50 @@
+--- php5-5.2.6.orig/configure.in
++++ php5-5.2.6/configure.in
+@@ -557,50 +557,50 @@ vsnprintf \
dnl Check for getaddrinfo, should be a better way, but...
dnl Also check for working getaddrinfo
Modified: php5/branches/lenny/debian/patches/017-pread_pwrite_disable.patch
===================================================================
--- php5/branches/lenny/debian/patches/017-pread_pwrite_disable.patch 2008-12-06 14:01:05 UTC (rev 1178)
+++ php5/branches/lenny/debian/patches/017-pread_pwrite_disable.patch 2008-12-06 16:20:16 UTC (rev 1179)
@@ -1,8 +1,8 @@
-Index: php5-5.2.4/acinclude.m4
+Index: php5-5.2.6/acinclude.m4
===================================================================
---- php5-5.2.4.orig/acinclude.m4 2007-09-10 20:45:32.000000000 +0200
-+++ php5-5.2.4/acinclude.m4 2007-09-11 00:24:05.000000000 +0200
-@@ -1210,7 +1210,7 @@
+--- php5-5.2.6.orig/acinclude.m4
++++ php5-5.2.6/acinclude.m4
+@@ -1210,7 +1210,7 @@ $1
}
],[
@@ -11,7 +11,7 @@
],[
ac_cv_pwrite=no
],[
-@@ -1239,7 +1239,7 @@
+@@ -1239,7 +1239,7 @@ $1
exit(0);
}
],[
Modified: php5/branches/lenny/debian/patches/019-z_off_t_as_long.patch
===================================================================
--- php5/branches/lenny/debian/patches/019-z_off_t_as_long.patch 2008-12-06 14:01:05 UTC (rev 1178)
+++ php5/branches/lenny/debian/patches/019-z_off_t_as_long.patch 2008-12-06 16:20:16 UTC (rev 1179)
@@ -1,7 +1,7 @@
-Index: php5-5.2.0/ext/zlib/zconf.h
+Index: php5-5.2.6/ext/zlib/zconf.h
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ php5-5.2.0/ext/zlib/zconf.h 2007-03-18 22:58:40.000000000 +0100
+--- /dev/null
++++ php5-5.2.6/ext/zlib/zconf.h
@@ -0,0 +1,326 @@
+/* zconf.h -- configuration of the zlib compression library
+ * Copyright (C) 1995-2003 Jean-loup Gailly.
@@ -329,10 +329,10 @@
+#endif
+
+#endif /* ZCONF_H */
-Index: php5-5.2.0/ext/zlib/zlib.h
+Index: php5-5.2.6/ext/zlib/zlib.h
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ php5-5.2.0/ext/zlib/zlib.h 2007-03-18 22:58:40.000000000 +0100
+--- /dev/null
++++ php5-5.2.6/ext/zlib/zlib.h
@@ -0,0 +1,1200 @@
+/* zlib.h -- interface of the 'zlib' general purpose compression library
+ version 1.2.1.1, January 9th, 2004
Modified: php5/branches/lenny/debian/patches/029-php.ini_paranoid.patch
===================================================================
--- php5/branches/lenny/debian/patches/029-php.ini_paranoid.patch 2008-12-06 14:01:05 UTC (rev 1178)
+++ php5/branches/lenny/debian/patches/029-php.ini_paranoid.patch 2008-12-06 16:20:16 UTC (rev 1179)
@@ -1,15 +1,67 @@
-Index: php5-5.2.0/php.ini-paranoid
+Index: php5-5.2.6/php.ini-paranoid
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ php5-5.2.0/php.ini-paranoid 2007-03-18 22:58:41.000000000 +0100
-@@ -0,0 +1,1195 @@
+--- /dev/null
++++ php5-5.2.6/php.ini-paranoid
+@@ -0,0 +1,1504 @@
+[PHP]
+
++;;;;;;;;;;;
++; WARNING ;
++;;;;;;;;;;;
++; This file enables many features in the PHP configuration that will
++; break applications that rely on this. Make sure you test applications
++; with this configuration file before enabling it on production.
++
+;;;;;;;;;;;;;;;;;;;
++; About php.ini ;
++;;;;;;;;;;;;;;;;;;;
++; This file controls many aspects of PHP's behavior. In order for PHP to
++; read it, it must be named 'php.ini'. PHP looks for it in the current
++; working directory, in the path designated by the environment variable
++; PHPRC, and in the path that was defined in compile time (in that order).
++; Under Windows, the compile-time path is the Windows directory. The
++; path in which the php.ini file is looked for can be overridden using
++; the -c argument in command line mode.
++;
++; The syntax of the file is extremely simple. Whitespace and Lines
++; beginning with a semicolon are silently ignored (as you probably guessed).
++; Section headers (e.g. [Foo]) are also silently ignored, even though
++; they might mean something in the future.
++;
++; Directives are specified using the following syntax:
++; directive = value
++; Directive names are *case sensitive* - foo=bar is different from FOO=bar.
++;
++; The value can be a string, a number, a PHP constant (e.g. E_ALL or M_PI), one
++; of the INI constants (On, Off, True, False, Yes, No and None) or an expression
++; (e.g. E_ALL & ~E_NOTICE), or a quoted string ("foo").
++;
++; Expressions in the INI file are limited to bitwise operators and parentheses:
++; | bitwise OR
++; & bitwise AND
++; ~ bitwise NOT
++; ! boolean NOT
++;
++; Boolean flags can be turned on using the values 1, On, True or Yes.
++; They can be turned off using the values 0, Off, False or No.
++;
++; An empty string can be denoted by simply not writing anything after the equal
++; sign, or by using the None keyword:
++;
++; foo = ; sets foo to an empty string
++; foo = none ; sets foo to an empty string
++; foo = "none" ; sets foo to the string 'none'
++;
++; If you use constants in your value, and these constants belong to a
++; dynamically loaded extension (either a PHP extension or a Zend extension),
++; you may only use these constants *after* the line that loads the extension.
++;
++;
++;;;;;;;;;;;;;;;;;;;
+; About this file ;
+;;;;;;;;;;;;;;;;;;;
+;
-+; This is the paranoid, PHP 4-style version of the php.ini-dist file. It
++; This is the paranoid, PHP version of the php.ini-dist file. It
+; sets some non standard settings, that make PHP more efficient, more secure
+; in a very paranoid way. Note that these security settings will make some
+; applications not work properly.
@@ -31,21 +83,39 @@
+; This file is different from the php.ini-dist file in the fact that it features
+; different values for several directives, in order to improve performance, while
+; possibly breaking compatibility with the standard out-of-the-box behavior of
-+; PHP 3. Please make sure you read what's different, and modify your scripts
++; PHP 3. Please make sure you read what's different, and modify your scripts
+; accordingly, if you decide to use this file instead.
+;
++; Notice that the paranoid configuration file might not be fully up-to-date
++; with the latest variables available so the diff will catch both the changes
++; to the default variable values as well as the variables that are missing in
++; the paranoid configuration file)
++;
++; This version was generated using the version 5.2.4-2 as a basis.
++;
++; Debian users can find the differences between both configurations might
++; be found by running:
++;
++; $ diff -u /usr/share/doc/php5-common/examples/php.ini-dist \
++ /usr/share/doc/php5-common/examples/php.ini-paranoid |less
++;
++;
++; This is a (not complete) list of some of the changes introduced in this file:
++;
+; - safe_mode = On [Security, Performance loss]
+; Do UID checks when opening files. Enabling safe_mode also enables
+; other functions related to this mode. For more information read:
+; http://www.php.net/features.safe-mode
-+; Worthwhile reading, however, is also
++;
++; However, this feature by itself cannot be relied on to protect all applications.
++; It is worthwhile reading also:
+; http://ilia.ws/archives/18_PHPs_safe_mode_or_how_not_to_implement_security.html
+; Bottomline: Do not trust that safe_mode will drive all your security vulnerabilities
+; away.
+;
-+; - safe_mode_protected_env_vars = LD_LIBRARY_PATH PATH [Security]
++; - safe_mode_protected_env_vars = LD_LIBRARY_PATH, PATH [Security]
+; Environment variables that users will not be able to modify through
-+; putenv()
++; putenv(). PATH is added so that scripts cannot overwrite it
+;
+; - open_basedir = /var/www/:/usr/lib/php4/ [Security, Performance loss]
+; Limits the files that PHP can access to the directories specified.
@@ -75,18 +145,12 @@
+; investigation or when using automatic tools to produce reports or
+; generate alarms based on the syslog information.
+;
-+; - register_globals = Off [Security, Performance]
-+; Global variables are no longer registered for input data (POST, GET, cookies,
-+; environment and other server variables). Instead of using $foo, you must use
-+; you can use $_REQUEST["foo"] (includes any variable that arrives through the
-+; request, namely, POST, GET and cookie variables), or use one of the specific
-+; $_GET["foo"], $_POST["foo"], $_COOKIE["foo"] or $_FILES["foo"], depending
-+; on where the input originates. Also, you can look at the
-+; import_request_variables() function.
-+; Note that register_globals is going to be depracated (i.e., turned off by
-+; default) in the next version of PHP, because it often leads to security bugs.
-+; Read http://php.net/manual/en/security.registerglobals.php for further
-+; information.
++; - error_reporting = E_ALL [Code Cleanliness, Security(?)]
++; By default, PHP surpresses errors of type E_NOTICE. These error messages
++; are emitted for non-critical errors, but that could be a symptom of a bigger
++; problem. Most notably, this will cause error messages about the use
++; of uninitialized variables to be displayed.
++;
+; - display_errors = Off [Security]
+; With this directive set to off, errors that occur during the execution of
+; scripts will no longer be displayed as a part of the script output, and thus,
@@ -105,22 +169,43 @@
+; writes, and sometimes less packets sent on the wire, which can often lead to
+; better performance. The gain this directive actually yields greatly depends
+; on which Web server you're working with, and what kind of scripts you're using.
++; - register_globals = Off [Security, Performance]
++; Global variables are no longer registered for input data (POST, GET, cookies,
++; environment and other server variables). Instead of using $foo, you must use
++; you can use $_REQUEST["foo"] (includes any variable that arrives through the
++; request, namely, POST, GET and cookie variables), or use one of the specific
++; $_GET["foo"], $_POST["foo"], $_COOKIE["foo"] or $_FILES["foo"], depending
++; on where the input originates. Also, you can look at the
++; import_request_variables() function.
++; Note that register_globals is deprecated in PHP 6.0, because it often
++; leads to security bugs.
++; Read http://php.net/manual/en/security.registerglobals.php for further
++; information.
++; Also notice that applications should not rely on this feature being turned Off
++; to remain secure.
++; - register_long_arrays = Off [Performance]
++; Disables registration of HTTP_GET_VARS
+; - register_argc_argv = Off [Performance]
+; Disables registration of the somewhat redundant $argv and $argc global
+; variables.
-+; - magic_quotes_gpc = On [Security]
++; - include_path = "/usr/share/php" [Security]
++; Only files under /usr can be included, this prevents applications from
++; including files from the same directory they are running in.
++; - magic_quotes_gpc = On [Security]
+; Input data is escaped with slashes so that applications that do
+; not use addslashes() are not so easily subjected to SQL injection
+; when talking to SQL databases.
++; This features is deprecated in PHP 6.0, applications should be fixed to
++; prevent SQL injection attacks through input data and not rely on this feature.
++; - magic_quotes_runtime = On [Security]
++; Quotes in data returned from functions that access external data sources (such as
++; databases) are escapted with a backslash.
++; This features is deprecated in PHP 6.0, applications should be fixed to
++; prevent SQL injection attacks through input data and not rely on this feature.
+;
-+; - variables_order = "GPCS" [Performance]
++; - variables_order = "GPCS" [Performance]
+; The environment variables are not hashed into the $HTTP_ENV_VARS[]. To access
+; environment variables, you can use getenv() instead.
-+; - error_reporting = E_ALL [Code Cleanliness, Security(?)]
-+; By default, PHP surpresses errors of type E_NOTICE. These error messages
-+; are emitted for non-critical errors, but that could be a symptom of a bigger
-+; problem. Most notably, this will cause error messages about the use
-+; of uninitialized variables to be displayed.
+; - allow_call_time_pass_reference = Off [Code cleanliness]
+; It's not possible to decide to force a variable to be passed by reference
+; when calling a function. The PHP 4 style to do this is by making the
@@ -139,6 +224,37 @@
+; worms/tools that use it to scan and propagate through badly written
+; applications (in conjuntion with other unsafe features)
+; http://myhost/myapplication.php?include=http://roguesever/rogueapp.php
++;
++; - session.save_path = /var/lib/php5 [Security]
++; This is defined to a non-world readable directory so users cannot
++; hihack sessions of other users by getting a list of the files.
++;
++; Notice that on on shared servers on a per application basis, otherwise
++; other users would be able to get access to other applications' data by
++; setting a proper session id in a different application. If session paths
++; are not shared sessions of one application will be invalid on another.
++; For more information see:
++; http://php.net/manual/en/ref.session.php#ini.session.save-path
++; and
++; http://php.net/manual/en/function.session-save-path.php
++; - session.cookie_secure = 1 [Security]
++; Cookies will only be sent through secure (SSL) connections.
++; - session.use_only_cookies = 1 [Security]
++; Session ids are not allowed in URLs which make it more difficult for
++; cross site scripting (XSS) attacks to be succesfull and also has the
++; advantaged that session ids will not be stored in the server's logs making
++; them vulnerable to reuse by people with access to the server logs.
++; - session.cookie_httponly = 1 [Security]
++; Cookies can only be set through the HTTP protocol, JavaScript can not
++; modify them, making applications less vulnerable to XSS attacks. This is
++; not supported, however, by all browsers.
++; - session.hash_function = 1 [Security, Performance loss]
++; Use SHA-1 instead of MD5 which is not (yet) broken but there are some known
++; attacks. Slight performance loss as it takes more time to compute.
++;
++;
++; This file is maintained by Javier Fernandez-Sanguino <jfs at debian.org>
++; please forward him any suggestions or changes you believe might be appropiate
+
+
+;;;;;;;;;;;;;;;;;;;;
@@ -148,7 +264,10 @@
+; Enable the PHP scripting language engine under Apache.
+engine = On
+
-+; Allow the <? tag. Otherwise, only <?php and <script> tags are recognized.
++; Enable compatibility mode with Zend Engine 1 (PHP 4.x)
++zend.ze1_compatibility_mode = Off
++
++; Allow the <? tag. Otherwise, only <?php and <script> tags are recognized.
+; NOTE: Using short tags should be avoided when developing applications or
+; libraries that are meant for redistribution, or deployment on PHP
+; servers which are not under your control, because short tags may not
@@ -160,7 +279,7 @@
+asp_tags = Off
+
+; The number of significant digits displayed in floating point numbers.
-+precision = 14
++precision = 12
+
+; Enforce year 2000 compliance (will cause problems with non-compliant browsers)
+y2k_compliance = On
@@ -184,17 +303,19 @@
+; is doing.
+; Note: You cannot use both "mb_output_handler" with "ob_iconv_handler"
+; and you cannot use both "ob_gzhandler" and "zlib.output_compression".
++; Note: output_handler must be empty if this is set 'On' !!!!
++; Instead you must use zlib.output_handler.
+;output_handler =
+
+; Transparent output compression using the zlib library
+; Valid values for this option are 'off', 'on', or a specific buffer size
+; to be used for compression (default is 4KB)
+; Note: Resulting chunk size may vary due to nature of compression. PHP
-+; outputs chunks that are few handreds bytes each as a result of compression.
-+; If you want larger chunk size for better performence, enable output_buffering
-+; also.
-+; Note: output_handler must be empty if this is set 'On' !!!!
-+; Instead you must use zlib.output_handler.
++; outputs chunks that are few hundreds bytes each as a result of
++; compression. If you prefer a larger chunk size for better
++; performance, enable output_buffering in addition.
++; Note: You need to use zlib.output_handler instead of the standard
++; output_handler, or otherwise the output will be corrupted.
+zlib.output_compression = Off
+
+; You cannot specify additional output handlers if zlib.output_compression
@@ -211,10 +332,10 @@
+
+; The unserialize callback function will be called (with the undefined class'
+; name as parameter), if the unserializer finds an undefined class
-+; which should be instanciated.
++; which should be instantiated.
+; A warning appears if the specified function is not defined, or if the
+; function doesn't include/implement the missing class.
-+; So only set this entry, if you really want to implement such a
++; So only set this entry, if you really want to implement such a
+; callback-function.
+unserialize_callback_func=
+
@@ -237,6 +358,16 @@
+;
+; Safe Mode
+;
++; Notice that with this mode on PHP will not create new files in
++; directories which have different owner than the owner of the script. This
++; typically applies to /tmp, so contrary to Unix intuition, you will not be able
++; to create new files there (even if the /tmp rights are set correctly).
++;
++; NOTE: this is considered a "broken" security measure.
++; Applications relying on this feature will not recieve full
++; support by the security team. For more information please
++; see /usr/share/doc/php5-common/README.Debian.security
++;
+safe_mode = On
+
+; By default, Safe Mode does a UID compare check when
@@ -277,16 +408,24 @@
+; *NOT* affected by whether Safe Mode is turned On or Off.
+;
+; In Debian, the WebRoot is /var/www/ so we limit file operations to it.
++;
++; NOTE: this is considered a "broken" security measure.
++; Applications relying on this feature will not recieve full
++; support by the security team. For more information please
++; see /usr/share/doc/php5-common/README.Debian.security
+open_basedir = /var/www/:/usr/lib/php4/
+
+; This directive allows you to disable certain functions for security reasons.
+; It receives a comma-delimited list of function names. This directive is
+; *NOT* affected by whether Safe Mode is turned On or Off.
+;
-+; Note: The list of functions disabled here might break some applications
-+; however, they are considered dangerous and often subverted by attackers
-+; remotely
-+disable_functions = dl, phpinfo, system, mail, include, shell_exec, exec, escapeshellarg, escapeshellcmd, passthru, proc_close, proc_open, proc_get_status, proc_nice, proc_open, proc_terminate, popen, pclose, chown, disk_free_space, disk_total_space, diskfreespace, fileinode, max_execution_time, set_time_limit,highlight_file, show_source
++; Notes:
++; - The list of functions disabled here might break some applications
++; however, they are considered dangerous and often subverted by attackers
++; remotely.
++; - 'include' is not in the list, if your applications do not depend on it
++; make sure you add it here too.
++disable_functions = dl, phpinfo, system, mail, shell_exec, exec, escapeshellarg, escapeshellcmd, passthru, proc_close, proc_open, proc_get_status, proc_nice, proc_open, proc_terminate, popen, pclose, chown, disk_free_space, disk_total_space, diskfreespace, fileinode, max_execution_time, set_time_limit, highlight_file, show_source
+
+; This directive allows you to disable certain classes for security reasons.
+; It receives a comma-delimited list of class names. This directive is
@@ -294,7 +433,7 @@
+disable_classes =
+
+; Colors for Syntax Highlighting mode. Anything that's acceptable in
-+; <font color="??????"> would work.
++; <span style="color: ???????"> would work.
+;highlight.string = #DD0000
+;highlight.comment = #FF9900
+;highlight.keyword = #007700
@@ -302,7 +441,21 @@
+;highlight.default = #0000BB
+;highlight.html = #000000
+
++; If enabled, the request will be allowed to complete even if the user aborts
++; the request. Consider enabling it if executing long request, which may end up
++; being interrupted by the user or a browser timing out.
++; ignore_user_abort = On
+
++; Determines the size of the realpath cache to be used by PHP. This value should
++; be increased on systems where PHP opens many files to reflect the quantity of
++; the file operations performed.
++; realpath_cache_size=16k
++
++; Duration of time, in seconds for which to cache realpath information for a given
++; file or directory. For systems with rarely changing files, consider increasing this
++; value.
++; realpath_cache_ttl=120
++
+;
+; Misc
+;
@@ -319,6 +472,7 @@
+
+max_execution_time = 30 ; Maximum execution time of each script, in seconds
+max_input_time = 60 ; Maximum amount of time each script may spend parsing request data
++max_input_nesting_level = 64 ; Maximum input variable nesting level
+memory_limit = 8M ; Maximum amount of memory a script may consume (8MB)
+
+
@@ -328,8 +482,9 @@
+
+; error_reporting is a bit-field. Or each number up to get desired error
+; reporting level
-+; E_ALL - All errors and warnings
++; E_ALL - All errors and warnings (doesn't include E_STRICT)
+; E_ERROR - fatal run-time errors
++; E_RECOVERABLE_ERROR - almost fatal run-time errors
+; E_WARNING - run-time warnings (non-fatal errors)
+; E_PARSE - compile-time parse errors
+; E_NOTICE - run-time notices (these are warnings which often result
@@ -337,6 +492,9 @@
+; intentional (e.g., using an uninitialized variable and
+; relying on the fact it's automatically initialized to an
+; empty string)
++; E_STRICT - run-time notices, enable to have PHP suggest changes
++; to your code which will ensure the best interoperability
++; and forward compatibility of your code
+; E_CORE_ERROR - fatal errors that occur during PHP's initial startup
+; E_CORE_WARNING - warnings (non-fatal errors) that occur during PHP's
+; initial startup
@@ -348,13 +506,17 @@
+;
+; Examples:
+;
-+; - Show all errors, except for notices
++; - Show all errors, except for notices and coding standards warnings
+;
+;error_reporting = E_ALL & ~E_NOTICE
+;
++; - Show all errors, except for notices
++;
++;error_reporting = E_ALL & ~E_NOTICE | E_STRICT
++;
+; - Show only errors
+;
-+;error_reporting = E_COMPILE_ERROR|E_ERROR|E_CORE_ERROR
++;error_reporting = E_COMPILE_ERROR|E_RECOVERABLE_ERROR|E_ERROR|E_CORE_ERROR
+;
+; - Show all errors
+;
@@ -365,6 +527,13 @@
+; instead (see below). Keeping display_errors enabled on a production web site
+; may reveal security information to end users, such as file paths on your Web
+; server, your database schema or other information.
++;
++; possible values for display_errors:
++;
++; Off - Do not display any errors
++; stderr - Display errors to STDERR (affects only CGI/CLI binaries!)
++; stdout (On) - Display errors to STDOUT
++;
+display_errors = Off
+
+; Even when display_errors is on, errors that occur during PHP's startup
@@ -387,7 +556,7 @@
+
+; Ignore source of message when ignoring repeated messages. When this setting
+; is On you will not log errors with repeated messages from different files or
-+; sourcelines.
++; source lines.
+ignore_repeated_source = Off
+
+; If this parameter is set to Off, then memory leaks will not be shown (on
@@ -395,10 +564,13 @@
+; error reporting includes E_WARNING in the allowed list
+report_memleaks = On
+
++;report_zend_debug = 0
++
+; Store the last error/warning message in $php_errormsg (boolean).
+track_errors = Off
+
+; Disable the inclusion of HTML tags in error messages.
++; Note: Never use this feature for production boxes.
+html_errors = Off
+
+; If html_errors is set On PHP produces clickable error messages that direct
@@ -407,6 +579,7 @@
+; and change docref_root to the base URL of your local copy including the
+; leading '/'. You must also specify the file extension being used including
+; the dot.
++; Note: Never use this feature for production boxes.
+;docref_root = "/phpmanual/"
+;docref_ext = .html
+
@@ -453,27 +626,45 @@
+; You should do your best to write your scripts so that they do not require
+; register_globals to be on; Using form variables as globals can easily lead
+; to possible security problems, if the code is not very well thought of.
++
++; NOTE: applications relying on this feature will not recieve full
++; support by the security team. For more information please
++; see /usr/share/doc/php5-common/README.Debian.security
++;
+register_globals = Off
+
++; Whether or not to register the old-style input arrays, HTTP_GET_VARS
++; and friends. If you're not using them, it's recommended to turn them off,
++; for performance reasons.
++register_long_arrays = Off
++
+; This directive tells PHP whether to declare the argv&argc variables (that
+; would contain the GET information). If you don't use these variables, you
+; should turn it off for increased performance.
+register_argc_argv = Off
+
++; When enabled, the SERVER and ENV variables are created when they're first
++; used (Just In Time) instead of when the script starts. If these variables
++; are not used within a script, having this directive on will result in a
++; performance gain. The PHP directives register_globals, register_long_arrays,
++; and register_argc_argv must be disabled for this directive to have any affect.
++auto_globals_jit = On
++
+; Maximum size of POST data that PHP will accept.
+post_max_size = 8M
+
-+; This directive is deprecated. Use variables_order instead.
-+gpc_order = "GPC"
-+
+; Magic quotes
+;
+
+; Magic quotes for incoming GET/POST/Cookie data.
++; Note: This feature is deprecated in PHP 6.0. Applications should not rely
++; on this feature to prevent security attacks.
+magic_quotes_gpc = On
+
+; Magic quotes for runtime-generated data, e.g. data from SQL, from exec(), etc.
-+magic_quotes_runtime = Off
++; Note: This feature is deprecated in PHP 6.0. Applications should not rely
++; on this feature to prevent security attacks.
++magic_quotes_runtime = On
+
+; Use Sybase-style magic quotes (escape ' with '' instead of \').
+magic_quotes_sybase = Off
@@ -490,7 +681,7 @@
+default_mimetype = "text/html"
+;default_charset = "iso-8859-1"
+
-+; Always populate the $HTTP_RAW_POST_DATA variable.
++; Always populate the $HTTP_RAW_POST_DATA variable.
+;always_populate_raw_post_data = On
+
+
@@ -499,8 +690,14 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;
+
+; UNIX: "/path1:/path2"
-+;include_path = ".:/php/includes"
-+;
++; Note (paranoid):
++; - '.' (the default) is not allowed here, applications that rely on it
++; need to be modified
++; - /usr is allowed, but files there should be protected against being
++; overwritten by mounting the filesystem read-only and should be
++; monitored with a system integrity check tool.
++include_path = "/usr/share/php"
++
+; Windows: "\path1;\path2"
+;include_path = ".;c:\php\includes"
+
@@ -511,18 +708,18 @@
+; cgi.force_redirect configuration below
+doc_root =
+
-+; The directory under which PHP opens the script using /~usernamem used only
++; The directory under which PHP opens the script using /~username used only
+; if nonempty.
+user_dir =
+
+; Directory in which the loadable extensions (modules) reside.
-+extension_dir = "./"
++; extension_dir = "./"
+
+; 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
+; disabled on them.
+;
-+; The dl function also introduces security issues.
++; NOTE: this is a potential security hole and is disabled by default in debian
+enable_dl = Off
+
+; cgi.force_redirect is necessary to provide security running PHP as a CGI under
@@ -535,7 +732,7 @@
+; every request.
+; cgi.nph = 1
+
-+; if cgi.force_redirect is turned on, and you are not running under Apache or Netscape
++; if cgi.force_redirect is turned on, and you are not running under Apache or Netscape
+; (iPlanet) web servers, you MAY need to set an environment variable name that PHP
+; will look for to know it is OK to continue execution. Setting this variable MAY
+; cause security issues, KNOW WHAT YOU ARE DOING FIRST.
@@ -545,9 +742,9 @@
+; previous behaviour was to set PATH_TRANSLATED to SCRIPT_FILENAME, and to not grok
+; what PATH_INFO is. For more information on PATH_INFO, see the cgi specs. Setting
+; this to 1 will cause PHP CGI to fix it's paths to conform to the spec. A setting
-+; of zero causes PHP to behave as before. Default is zero. You should fix your scripts
++; of zero causes PHP to behave as before. Default is 1. You should fix your scripts
+; to use SCRIPT_FILENAME rather than PATH_TRANSLATED.
-+; cgi.fix_pathinfo=1
++cgi.fix_pathinfo=1
+
+; FastCGI under IIS (on WINNT based OS) supports the ability to impersonate
+; security tokens of the calling client. This allows IIS to define the
@@ -556,6 +753,9 @@
+; Set to 1 if running under IIS. Default is zero.
+; fastcgi.impersonate = 1;
+
++; Disable logging through FastCGI connection
++; fastcgi.logging = 0
++
+; cgi.rfc2616_headers configuration option tells PHP what type of headers to
+; use when sending HTTP response code. If it's set 0 PHP sends Status: header that
+; is supported by Apache. When this option is set to 1 PHP will send
@@ -573,7 +773,11 @@
+
+; Temporary directory for HTTP uploaded files (will use system default if not
+; specified).
-+;upload_tmp_dir =
++;
++; Note: If enabled above you have to create this directory and set appropiate
++; permissions. The default (/tmp) is insecure since other users might be able
++; to access upload files or make symlink tricks.
++upload_tmp_dir = /var/lib/php5/uploads
+
+; Maximum allowed size for uploaded files.
+upload_max_filesize = 2M
@@ -592,11 +796,14 @@
+; http://myhost/myapplication.php?include=http://roguesever/rogueapp.php
+allow_url_fopen = Off
+
++; Whether to allow include/require to open URLs (like http:// or ftp://) as files.
++allow_url_include = Off
++
+; Define the anonymous ftp password (your email address)
+;from="john at doe.com"
+
-+; Define the user agent for php to send
-+;user_agent="PHP"
++; Define the User-Agent string
++; user_agent="PHP"
+
+; Default timeout for socket based streams (seconds)
+default_socket_timeout = 60
@@ -631,59 +838,46 @@
+; extension_dir directive above.
+
+
-+;Windows Extensions
-+;Note that MySQL and ODBC support is now built in, so no dll is needed for it.
-+;
-+;extension=php_bz2.dll
-+;extension=php_cpdf.dll
-+;extension=php_crack.dll
-+;extension=php_curl.dll
-+;extension=php_db.dll
-+;extension=php_dba.dll
-+;extension=php_dbase.dll
-+;extension=php_dbx.dll
-+;extension=php_domxml.dll
-+;extension=php_exif.dll
-+;extension=php_fdf.dll
-+;extension=php_filepro.dll
-+;extension=php_gd2.dll
-+;extension=php_gettext.dll
-+;extension=php_hyperwave.dll
-+;extension=php_iconv.dll
-+;extension=php_ifx.dll
-+;extension=php_iisfunc.dll
-+;extension=php_imap.dll
-+;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
-+;extension=php_ming.dll
-+;extension=php_mssql.dll
-+;extension=php_msql.dll
-+;extension=php_oci8.dll
-+;extension=php_openssl.dll
-+;extension=php_oracle.dll
-+;extension=php_pdf.dll
-+;extension=php_pgsql.dll
-+;extension=php_printer.dll
-+;extension=php_shmop.dll
-+;extension=php_snmp.dll
-+;extension=php_sockets.dll
-+;extension=php_sybase_ct.dll
-+;extension=php_w32api.dll
-+;extension=php_xmlrpc.dll
-+;extension=php_xslt.dll
-+;extension=php_yaz.dll
-+;extension=php_zip.dll
-+
-+
+;;;;;;;;;;;;;;;;;;;
+; Module Settings ;
+;;;;;;;;;;;;;;;;;;;
+
++[Date]
++; Defines the default timezone used by the date functions
++;date.timezone =
++
++;date.default_latitude = 31.7667
++;date.default_longitude = 35.2333
++
++;date.sunrise_zenith = 90.583333
++;date.sunset_zenith = 90.583333
++
++[filter]
++;filter.default = unsafe_raw
++;filter.default_flags =
++
++[iconv]
++;iconv.input_encoding = ISO-8859-1
++;iconv.internal_encoding = ISO-8859-1
++;iconv.output_encoding = ISO-8859-1
++
++[sqlite]
++;sqlite.assoc_case = 0
++
++[xmlrpc]
++;xmlrpc_error_number = 0
++;xmlrpc_errors = 0
++
++[Pcre]
++;PCRE library backtracking limit.
++;pcre.backtrack_limit=100000
++
++;PCRE library recursion limit.
++;Please note that if you set this value to a high number you may consume all
++;the available process stack and eventually crash PHP (due to reaching the
++;stack size limit imposed by the Operating System).
++;pcre.recursion_limit=100000
++
+[Syslog]
+; Whether or not to define the various syslog variables (e.g. $LOG_PID,
+; $LOG_CRON, etc.). Turning it off is a good idea performance-wise. In
@@ -701,14 +895,21 @@
+; For Unix only. You may supply arguments as well (default: "sendmail -t -i").
+;sendmail_path =
+
-+[Java]
-+;java.class.path = .\php_java.jar
-+;java.home = c:\jdk
-+;java.library = c:\jdk\jre\bin\hotspot\jvm.dll
-+;java.library.path = .\
++; Force the addition of the specified parameters to be passed as extra parameters
++; to the sendmail binary. These parameters will always replace the value of
++; the 5th parameter to mail(), even in safe mode.
++;mail.force_extra_parameters =
+
+[SQL]
-+sql.safe_mode = On
++; This configuration directive is unrelated to safe_mode.
++; If enabled, connections to databases (like mysql_connect() or mysql_pconnect())
++; will ignore the arguments provided (which include username and password) and
++; will attempt to connect always using default values. These default values
++; are typically host=localhost, user=the script owner,password=empty password.
++;
++; Note (paranoid): This is disabled as it is not actually a security measure, unless
++; you want script to not have users and passwords hardcoded in them.
++sql.safe_mode = Off
+
+[ODBC]
+;odbc.default_db = Not yet implemented
@@ -725,16 +926,16 @@
+odbc.max_persistent = -1
+
+; Maximum number of links (persistent + non-persistent). -1 means no limit.
-+odbc.max_links = -1
++odbc.max_links = -1
+
+; Handling of LONG fields. Returns number of bytes to variables. 0 means
+; passthru.
-+odbc.defaultlrl = 4096
++odbc.defaultlrl = 4096
+
+; Handling of binary data. 0 means passthru, 1 return as is, 2 convert to char.
+; See the documentation on odbc_binmode and odbc_longreadlen for an explanation
+; of uodbc.defaultlrl and uodbc.defaultbinmode
-+odbc.defaultbinmode = 1
++odbc.defaultbinmode = 1
+
+[MySQL]
+; Allow or prevent persistent links.
@@ -776,6 +977,37 @@
+; SQL-Errors will be displayed.
+mysql.trace_mode = Off
+
++[MySQLi]
++
++; Maximum number of links. -1 means no limit.
++mysqli.max_links = -1
++
++; Default port number for mysqli_connect(). If unset, mysqli_connect() will use
++; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the
++; compile-time value defined MYSQL_PORT (in that order). Win32 will only look
++; at MYSQL_PORT.
++mysqli.default_port = 3306
++
++; Default socket name for local MySQL connects. If empty, uses the built-in
++; MySQL defaults.
++mysqli.default_socket =
++
++; Default host for mysql_connect() (doesn't apply in safe mode).
++mysqli.default_host =
++
++; Default user for mysql_connect() (doesn't apply in safe mode).
++mysqli.default_user =
++
++; Default password for mysqli_connect() (doesn't apply in safe mode).
++; Note that this is generally a *bad* idea to store passwords in this file.
++; *Any* user with PHP access can run 'echo get_cfg_var("mysqli.default_pw")
++; and reveal this password! And of course, any users with read access to this
++; file will be able to reveal the password as well.
++mysqli.default_pw =
++
++; Allow or prevent reconnect
++mysqli.reconnect = Off
++
+[mSQL]
+; Allow or prevent persistent links.
+msql.allow_persistent = On
@@ -786,11 +1018,42 @@
+; Maximum number of links (persistent+non persistent). -1 means no limit.
+msql.max_links = -1
+
++[OCI8]
++; enables privileged connections using external credentials (OCI_SYSOPER, OCI_SYSDBA)
++;oci8.privileged_connect = Off
++
++; Connection: The maximum number of persistent OCI8 connections per
++; process. Using -1 means no limit.
++;oci8.max_persistent = -1
++
++; Connection: The maximum number of seconds a process is allowed to
++; maintain an idle persistent connection. Using -1 means idle
++; persistent connections will be maintained forever.
++;oci8.persistent_timeout = -1
++
++; Connection: The number of seconds that must pass before issuing a
++; ping during oci_pconnect() to check the connection validity. When
++; set to 0, each oci_pconnect() will cause a ping. Using -1 disables
++; pings completely.
++;oci8.ping_interval = 60
++
++; Tuning: This option enables statement caching, and specifies how
++; many statements to cache. Using 0 disables statement caching.
++;oci8.statement_cache_size = 20
++
++; Tuning: Enables statement prefetching and sets the default number of
++; rows that will be fetched automatically after statement execution.
++;oci8.default_prefetch = 10
++
++; Compatibility. Using On means oci_close() will not close
++; oci_connect() and oci_new_connect() connections.
++;oci8.old_oci_close_semantics = Off
++
+[PostgresSQL]
+; Allow or prevent persistent links.
+pgsql.allow_persistent = On
+
-+; Detect broken persistent links always with pg_pconnect().
++; Detect broken persistent links always with pg_pconnect().
+; Auto reset feature requires a little overheads.
+pgsql.auto_reset_persistent = Off
+
@@ -826,7 +1089,7 @@
+; Minimum message severity to display.
+sybase.min_message_severity = 10
+
-+; Compatability mode with old versions of PHP 3.0.
++; Compatibility mode with old versions of PHP 3.0.
+; If on, this will cause PHP to automatically assign types to results according
+; to their Sybase type, instead of treating them all as strings. This
+; compatibility mode will probably not stay around forever, so try applying
@@ -849,16 +1112,6 @@
+; Minimum client message severity to display.
+sybct.min_client_severity = 10
+
-+[dbx]
-+; returned column names can be converted for compatibility reasons
-+; possible values for dbx.colnames_case are
-+; "unchanged" (default, if not set)
-+; "lowercase"
-+; "uppercase"
-+; the recommended default is either upper- or lowercase, but
-+; unchanged is currently set for backwards compatibility
-+dbx.colnames_case = "lowercase"
-+
+[bcmath]
+; Number of decimal digits for all bcmath functions.
+bcmath.scale = 0
@@ -908,16 +1161,62 @@
+session.save_handler = files
+
+; Argument passed to save_handler. In the case of files, this is the path
-+; where data files are stored. Note: Windows users have to change this
++; where data files are stored. Note: Windows users have to change this
+; variable in order to use PHP's session functions.
-+;session.save_path = /tmp
++;
++; As of PHP 4.0.1, you can define the path as:
++;
++; session.save_path = "N;/path"
++;
++; where N is an integer. Instead of storing all the session files in
++; /path, what this will do is use subdirectories N-levels deep, and
++; store the session data in those directories. This is useful if you
++; or your OS have problems with lots of files in one directory, and is
++; a more efficient layout for servers that handle lots of sessions.
++;
++; NOTE 1: PHP will not create this directory structure automatically.
++; You can use the script in the ext/session dir for that purpose.
++; NOTE 2: See the section on garbage collection below if you choose to
++; use subdirectories for session storage
++;
++; The file storage module creates files using mode 600 by default.
++; You can change that by using
++;
++; session.save_path = "N;MODE;/path"
++;
++; where MODE is the octal representation of the mode. Note that this
++; does not overwrite the process's umask.
++session.save_path = /var/lib/php5
+
++; Substring to check each HTTP Referer for. If the Referer was sent by the
++; client and the substring was not found, the embedded session id will be marked
++; as invalid. Defaults to the empty string.
++; Note (paranoid): to prevent some XSS attacks should be defined to the server's URI
++; session.referer_check =
++
++
++; Path to an external resource (file) which will be used as an additional
++; entropy source in the session id creation process.
++; Note (paranoid): /dev/urandom is not fully random but if /dev/random is used
++; the entropy pool could be exhaused by constantly asking for session ids and
++; would compromise other applications relying on randomness
++session.entropy_file = "/dev/urandom"
++
++; Number of bytes which will be read from the file specified above.
++; Defaults to 0 (disabled).
++session.entropy_length = 6
++
+; Whether to use cookies.
+session.use_cookies = 1
+
++; If this option is enabled cookies are only sent through secure (SSL)
++; connections and, consequently, are more difficult to intercept.
++; (disabled by default)
++session.cookie_secure = 1
++
+; This option enables administrators to make their users invulnerable to
-+; attacks which involve passing session ids in URLs; defaults to 0.
-+; session.use_only_cookies = 1
++; attacks which involve passing session ids in URLs; defaults to 1 (since PHP 6.0).
++session.use_only_cookies = 1
+
+; Name of the session (used as cookie name).
+session.name = PHPSESSID
@@ -929,11 +1228,17 @@
+session.cookie_lifetime = 0
+
+; The path for which the cookie is valid.
++; Note (paranoid): Applications should restrict the path where the cookie
++; is valid through use of session_set_cookie_params().
+session.cookie_path = /
+
+; The domain for which the cookie is valid.
++; Note (paranoid): Make sure you configure this for your site
+session.cookie_domain =
+
++; Whether or not to add the httpOnly flag to the cookie, which makes it inaccessible to browser scripting languages such as JavaScript.
++session.cookie_httponly = 1
++
+; Handler used to serialize data. php is the standard serializer of PHP.
+session.serialize_handler = php
+
@@ -943,13 +1248,24 @@
+; e.g. 1/100 means there is a 1% chance that the GC process starts
+; on each request.
+
-+session.gc_probability = 1
-+session.gc_divisor = 1000
++; This is disabled in the Debian packages, due to the strict permissions
++; on /var/lib/php5. Instead of setting this here, see the cronjob at
++; /etc/cron.d/php5, which uses the session.gc_maxlifetime setting below
++;session.gc_probability = 0
++session.gc_divisor = 100
+
+; After this number of seconds, stored data will be seen as 'garbage' and
+; cleaned up by the garbage collection process.
+session.gc_maxlifetime = 1440
+
++; NOTE: If you are using the subdirectory option for storing session files
++; (see session.save_path above), then garbage collection does *not*
++; happen automatically. You will need to do your own garbage
++; collection through a shell script, cron entry, or some other method.
++; For example, the following script would is the equivalent of
++; setting session.gc_maxlifetime to 1440 (1440 seconds = 24 minutes):
++; cd /path/to/sessions; find -cmin +24 | xargs rm
++
+; PHP 4.2 and less have an undocumented feature/bug that allows you to
+; to initialize a session variable in the global scope, albeit register_globals
+; is disabled. PHP 4.3 and later will warn you, if this feature is used.
@@ -974,7 +1290,7 @@
+
+;session.entropy_file = /dev/urandom
+
-+; Set to {nocache,private,public,} to determine HTTP caching aspects.
++; Set to {nocache,private,public,} to determine HTTP caching aspects
+; or leave this empty to avoid sending anti-caching headers.
+session.cache_limiter = nocache
+
@@ -987,17 +1303,32 @@
+; - User may send URL contains active session ID
+; to other person via. email/irc/etc.
+; - URL that contains active session ID may be stored
-+; in publically accessible computer.
++; in publically accessible computer.
+; - User may access your site with the same session ID
+; always using URL stored in browser's history or bookmarks.
+session.use_trans_sid = 0
+
++; Select a hash function
++; 0: MD5 (128 bits)
++; 1: SHA-1 (160 bits)
++; Note (paranoic): Set to SHA-1 since there are known attacks against MD5
++; although the algorithm is not yet broken)
++session.hash_function = 1
++
++; Define how many bits are stored in each character when converting
++; the binary hash data to something readable.
++;
++; 4 bits: 0-9, a-f
++; 5 bits: 0-9, a-v
++; 6 bits: 0-9, a-z, A-Z, "-", ","
++session.hash_bits_per_character = 4
++
+; The URL rewriter will look for URLs in a defined set of HTML tags.
+; form/fieldset are special; if you include them here, the rewriter will
+; add a hidden <input> field with the info which is otherwise appended
+; to URLs. If you want XHTML conformity, remove the form entry.
+; Note that all valid entries require a "=", even if no value follows.
-+url_rewriter.tags = "a=href,area=href,frame=src,input=src,form=fakeentry"
++url_rewriter.tags = "a=href,area=href,frame=src,input=src,form=fakeentry,fieldset="
+
+[MSSQL]
+; Allow or prevent persistent links.
@@ -1015,7 +1346,7 @@
+; Minimum message severity to display.
+mssql.min_message_severity = 10
+
-+; Compatability mode with old versions of PHP 3.0.
++; Compatibility mode with old versions of PHP 3.0.
+mssql.compatability_mode = Off
+
+; Connect timeout
@@ -1041,9 +1372,16 @@
+; Use NT authentication when connecting to the server
+mssql.secure_connection = On
+
-+; Specify max number of processes. Default = 25
-+;mssql.max_procs = 25
++; Specify max number of processes. -1 = library default
++; msdlib defaults to 25
++; FreeTDS defaults to 4096
++;mssql.max_procs = -1
+
++; Specify client character set.
++; If empty or not set the client charset from freetds.comf is used
++; This is only used when compiled with FreeTDS
++;mssql.charset = "ISO-8859-1"
++
+[Assertion]
+; Assert(expr); active by default.
+;assert.active = On
@@ -1061,66 +1399,18 @@
+; error_reporting(0) around the eval().
+;assert.quiet_eval = 0
+
-+[Ingres II]
-+; Allow or prevent persistent links.
-+ingres.allow_persistent = On
-+
-+; Maximum number of persistent links. -1 means no limit.
-+ingres.max_persistent = -1
-+
-+; Maximum number of links, including persistents. -1 means no limit.
-+ingres.max_links = -1
-+
-+; Default database (format: [node_id::]dbname[/srv_class]).
-+ingres.default_database =
-+
-+; Default user.
-+ingres.default_user =
-+
-+; Default password.
-+ingres.default_password =
-+
-+[Verisign Payflow Pro]
-+; Default Payflow Pro server.
-+pfpro.defaulthost = "test-payflow.verisign.com"
-+
-+; Default port to connect to.
-+pfpro.defaultport = 443
-+
-+; Default timeout in seconds.
-+pfpro.defaulttimeout = 30
-+
-+; Default proxy IP address (if required).
-+;pfpro.proxyaddress =
-+
-+; Default proxy port.
-+;pfpro.proxyport =
-+
-+; Default proxy logon.
-+;pfpro.proxylogon =
-+
-+; Default proxy password.
-+;pfpro.proxypassword =
-+
-+[Sockets]
-+; Use the system read() function instead of the php_read() wrapper.
-+sockets.use_system_read = On
-+
-+[com]
++[COM]
+; path to a file containing GUIDs, IIDs or filenames of files with TypeLibs
-+;com.typelib_file =
++;com.typelib_file =
+; allow Distributed-COM calls
+;com.allow_dcom = true
+; autoregister constants of a components typlib on com_load()
+;com.autoregister_typelib = true
+; register constants casesensitive
+;com.autoregister_casesensitive = false
-+; show warnings on duplicate constat registrations
++; show warnings on duplicate constant registrations
+;com.autoregister_verbose = true
+
-+[Printer]
-+;printer.default_printer = ""
-+
+[mbstring]
+; language for internal character representation.
+;mbstring.language = Japanese
@@ -1137,7 +1427,7 @@
+; registered as output buffer to function
+;mbstring.http_output = SJIS
+
-+; enable automatic encoding translation accoding to
++; enable automatic encoding translation according to
+; mbstring.internal_encoding setting. Input chars are
+; converted to internal encoding by setting this to On.
+; Note: Do _not_ use automatic encoding translation for
@@ -1145,7 +1435,7 @@
+;mbstring.encoding_translation = Off
+
+; automatic encoding detection order.
-+; auto means
++; auto means
+;mbstring.detect_order = auto
+
+; substitute_character used when character cannot be converted
@@ -1165,7 +1455,8 @@
+[FrontBase]
+;fbsql.allow_persistent = On
+;fbsql.autocommit = On
-+;fbsql.default_database =
++;fbsql.show_timestamp_decimals = Off
++;fbsql.default_database =
+;fbsql.default_database_password =
+;fbsql.default_host =
+;fbsql.default_password =
@@ -1175,26 +1466,44 @@
+;fbsql.max_links = 128
+;fbsql.max_persistent = -1
+;fbsql.max_results = 128
-+;fbsql.batchSize = 1000
+
-+[Crack]
-+; Modify the setting below to match the directory location of the cracklib
-+; dictionary files. Include the base filename, but not the file extension.
-+; crack.default_dictionary = "c:\php\lib\cracklib_dict"
++[gd]
++; Tell the jpeg decode to libjpeg warnings and try to create
++; a gd image. The warning will then be displayed as notices
++; disabled by default
++;gd.jpeg_ignore_warning = 0
+
+[exif]
-+; Exif UNICODE user comments are handled as UCS-2BE/UCS-2LE and JIS as JIS.
++; Exif UNICODE user comments are handled as UCS-2BE/UCS-2LE and JIS as JIS.
+; With mbstring support this will automatically be converted into the encoding
-+; given by corresponding encode setting. When empty mbstring.internal_encoding
-+; is used. For the decode settings you can distinguish between motorola and
++; given by corresponding encode setting. When empty mbstring.internal_encoding
++; is used. For the decode settings you can distinguish between motorola and
+; intel byte order. A decode setting cannot be empty.
+;exif.encode_unicode = ISO-8859-15
+;exif.decode_unicode_motorola = UCS-2BE
+;exif.decode_unicode_intel = UCS-2LE
-+;exif.encode_jis =
++;exif.encode_jis =
+;exif.decode_jis_motorola = JIS
+;exif.decode_jis_intel = JIS
+
++[Tidy]
++; The path to a default tidy configuration file to use when using tidy
++;tidy.default_config = /usr/local/lib/php/default.tcfg
++
++; Should tidy clean and repair output automatically?
++; WARNING: Do not use this option if you are generating non-html content
++; such as dynamic images
++tidy.clean_output = Off
++
++[soap]
++; Enables or disables WSDL caching feature.
++soap.wsdl_cache_enabled=1
++; Sets the directory name where SOAP extension will put cache files.
++soap.wsdl_cache_dir="/var/lib/php5/soap-cache"
++; (time to live) Sets the number of second while cached file will be used
++; instead of original one.
++soap.wsdl_cache_ttl=86400
++
+; Local Variables:
+; tab-width: 4
+; End:
Modified: php5/branches/lenny/debian/patches/034-apache2_umask_fix.patch
===================================================================
--- php5/branches/lenny/debian/patches/034-apache2_umask_fix.patch 2008-12-06 14:01:05 UTC (rev 1178)
+++ php5/branches/lenny/debian/patches/034-apache2_umask_fix.patch 2008-12-06 16:20:16 UTC (rev 1179)
@@ -1,11 +1,11 @@
Save and restore umask across requests correctly.
-Index: php5-5.2.4/sapi/apache2handler/sapi_apache2.c
+Index: php5-5.2.6/sapi/apache2handler/sapi_apache2.c
===================================================================
---- php5-5.2.4.orig/sapi/apache2handler/sapi_apache2.c 2007-06-28 19:23:07.000000000 +0200
-+++ php5-5.2.4/sapi/apache2handler/sapi_apache2.c 2007-09-11 00:24:16.000000000 +0200
-@@ -434,6 +434,19 @@
+--- php5-5.2.6.orig/sapi/apache2handler/sapi_apache2.c
++++ php5-5.2.6/sapi/apache2handler/sapi_apache2.c
+@@ -432,6 +432,19 @@ static apr_status_t php_server_context_c
return APR_SUCCESS;
}
@@ -25,7 +25,7 @@
static int php_apache_request_ctor(request_rec *r, php_struct *ctx TSRMLS_DC)
{
char *content_length;
-@@ -622,6 +635,8 @@
+@@ -620,6 +633,8 @@ zend_first_try {
} else {
zend_file_handle zfd;
@@ -34,7 +34,7 @@
zfd.type = ZEND_HANDLE_FILENAME;
zfd.filename = (char *) r->filename;
zfd.free_filename = 0;
-@@ -633,6 +648,9 @@
+@@ -631,6 +646,9 @@ zend_first_try {
zend_execute_scripts(ZEND_INCLUDE TSRMLS_CC, NULL, 1, &zfd);
}
Modified: php5/branches/lenny/debian/patches/036-fd_setsize_fix.patch
===================================================================
--- php5/branches/lenny/debian/patches/036-fd_setsize_fix.patch 2008-12-06 14:01:05 UTC (rev 1178)
+++ php5/branches/lenny/debian/patches/036-fd_setsize_fix.patch 2008-12-06 16:20:16 UTC (rev 1179)
@@ -1,8 +1,8 @@
-Index: php5-5.2.4/ext/sockets/sockets.c
+Index: php5-5.2.6/ext/sockets/sockets.c
===================================================================
---- php5-5.2.4.orig/ext/sockets/sockets.c 2007-07-24 13:35:08.000000000 +0200
-+++ php5-5.2.4/ext/sockets/sockets.c 2007-09-11 00:24:23.000000000 +0200
-@@ -566,6 +566,7 @@
+--- php5-5.2.6.orig/ext/sockets/sockets.c
++++ php5-5.2.6/ext/sockets/sockets.c
+@@ -566,6 +566,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,11 +10,11 @@
PHP_SAFE_FD_SET(php_sock->bsd_socket, fds);
if (php_sock->bsd_socket > *max_fd) {
-Index: php5-5.2.4/ext/standard/streamsfuncs.c
+Index: php5-5.2.6/ext/standard/streamsfuncs.c
===================================================================
---- php5-5.2.4.orig/ext/standard/streamsfuncs.c 2007-07-09 19:27:24.000000000 +0200
-+++ php5-5.2.4/ext/standard/streamsfuncs.c 2007-09-11 00:24:23.000000000 +0200
-@@ -592,6 +592,9 @@
+--- php5-5.2.6.orig/ext/standard/streamsfuncs.c
++++ php5-5.2.6/ext/standard/streamsfuncs.c
+@@ -592,6 +592,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) {
Modified: php5/branches/lenny/debian/patches/043-recode_size_t.patch
===================================================================
--- php5/branches/lenny/debian/patches/043-recode_size_t.patch 2008-12-06 14:01:05 UTC (rev 1178)
+++ php5/branches/lenny/debian/patches/043-recode_size_t.patch 2008-12-06 16:20:16 UTC (rev 1179)
@@ -1,8 +1,8 @@
-Index: php5-5.2.5/ext/recode/recode.c
+Index: php5-5.2.6/ext/recode/recode.c
===================================================================
---- php5-5.2.5.orig/ext/recode/recode.c 2007-06-22 02:02:15.000000000 +0200
-+++ php5-5.2.5/ext/recode/recode.c 2008-02-21 00:46:54.000000000 +0100
-@@ -136,7 +136,7 @@
+--- php5-5.2.6.orig/ext/recode/recode.c
++++ php5-5.2.6/ext/recode/recode.c
+@@ -136,7 +136,7 @@ PHP_FUNCTION(recode_string)
int req_len, str_len;
char *req, *str;
Modified: php5/branches/lenny/debian/patches/044-strtod_arm_fix.patch
===================================================================
--- php5/branches/lenny/debian/patches/044-strtod_arm_fix.patch 2008-12-06 14:01:05 UTC (rev 1178)
+++ php5/branches/lenny/debian/patches/044-strtod_arm_fix.patch 2008-12-06 16:20:16 UTC (rev 1179)
@@ -1,8 +1,8 @@
-Index: php5-5.2.4/Zend/zend_strtod.c
+Index: php5-5.2.6/Zend/zend_strtod.c
===================================================================
---- php5-5.2.4.orig/Zend/zend_strtod.c 2007-07-23 18:17:10.000000000 +0200
-+++ php5-5.2.4/Zend/zend_strtod.c 2007-09-11 00:26:29.000000000 +0200
-@@ -142,14 +142,25 @@
+--- php5-5.2.6.orig/Zend/zend_strtod.c
++++ php5-5.2.6/Zend/zend_strtod.c
+@@ -152,14 +152,25 @@ typedef unsigned long int uint32_t;
#define IEEE_LITTLE_ENDIAN
#endif
@@ -35,7 +35,7 @@
#endif
#ifdef __vax__
-@@ -256,8 +267,7 @@
+@@ -266,8 +277,7 @@ BEGIN_EXTERN_C()
#if defined(IEEE_LITTLE_ENDIAN) + defined(IEEE_BIG_ENDIAN) + defined(VAX) + \
defined(IBM) != 1
@@ -45,7 +45,7 @@
#endif
typedef union {
-@@ -277,7 +287,7 @@
+@@ -287,7 +297,7 @@ BEGIN_EXTERN_C()
* An alternative that might be better on some machines is
* #define Storeinc(a,b,c) (*a++ = b << 16 | c & 0xffff)
*/
Modified: php5/branches/lenny/debian/patches/045-exif_nesting_level.patch
===================================================================
--- php5/branches/lenny/debian/patches/045-exif_nesting_level.patch 2008-12-06 14:01:05 UTC (rev 1178)
+++ php5/branches/lenny/debian/patches/045-exif_nesting_level.patch 2008-12-06 16:20:16 UTC (rev 1179)
@@ -1,8 +1,8 @@
-Index: php5-5.2.2/ext/exif/exif.c
+Index: php5-5.2.6/ext/exif/exif.c
===================================================================
---- php5-5.2.2.orig/ext/exif/exif.c 2007-02-27 04:04:40.000000000 +0100
-+++ php5-5.2.2/ext/exif/exif.c 2007-05-04 17:42:23.000000000 +0200
-@@ -99,7 +99,7 @@
+--- php5-5.2.6.orig/ext/exif/exif.c
++++ php5-5.2.6/ext/exif/exif.c
+@@ -99,7 +99,7 @@ typedef unsigned char uchar;
#define EFREE_IF(ptr) if (ptr) efree(ptr)
Modified: php5/branches/lenny/debian/patches/047-zts_with_dl.patch
===================================================================
--- php5/branches/lenny/debian/patches/047-zts_with_dl.patch 2008-12-06 14:01:05 UTC (rev 1178)
+++ php5/branches/lenny/debian/patches/047-zts_with_dl.patch 2008-12-06 16:20:16 UTC (rev 1179)
@@ -1,8 +1,8 @@
-Index: php5-5.2.2/ext/standard/dl.c
+Index: php5-5.2.6/ext/standard/dl.c
===================================================================
---- php5-5.2.2.orig/ext/standard/dl.c 2007-02-23 01:37:35.000000000 +0100
-+++ php5-5.2.2/ext/standard/dl.c 2007-05-04 17:42:34.000000000 +0200
-@@ -76,12 +76,7 @@
+--- php5-5.2.6.orig/ext/standard/dl.c
++++ php5-5.2.6/ext/standard/dl.c
+@@ -81,12 +81,7 @@ PHP_FUNCTION(dl)
if ((strncmp(sapi_module.name, "cgi", 3)!=0) &&
(strcmp(sapi_module.name, "cli")!=0) &&
(strncmp(sapi_module.name, "embed", 5)!=0)) {
Modified: php5/branches/lenny/debian/patches/052-phpinfo_no_configure.patch
===================================================================
--- php5/branches/lenny/debian/patches/052-phpinfo_no_configure.patch 2008-12-06 14:01:05 UTC (rev 1178)
+++ php5/branches/lenny/debian/patches/052-phpinfo_no_configure.patch 2008-12-06 16:20:16 UTC (rev 1179)
@@ -1,8 +1,8 @@
-Index: php-5.2.4/ext/standard/info.c
+Index: php5-5.2.6/ext/standard/info.c
===================================================================
---- php-5.2.4.orig/ext/standard/info.c
-+++ php-5.2.4/ext/standard/info.c
-@@ -461,7 +461,7 @@
+--- php5-5.2.6.orig/ext/standard/info.c
++++ php5-5.2.6/ext/standard/info.c
+@@ -486,7 +486,7 @@ PHPAPI void php_print_info(int flag TSRM
php_info_print_table_start();
php_info_print_table_row(2, "System", php_uname );
php_info_print_table_row(2, "Build Date", __DATE__ " " __TIME__ );
@@ -11,11 +11,11 @@
php_info_print_table_row(2, "Configure Command", CONFIGURE_COMMAND );
#endif
if (sapi_module.pretty_name) {
-Index: php-5.2.4/ext/standard/tests/general_functions/phpinfo.phpt
+Index: php5-5.2.6/ext/standard/tests/general_functions/phpinfo.phpt
===================================================================
---- php-5.2.4.orig/ext/standard/tests/general_functions/phpinfo.phpt
-+++ php-5.2.4/ext/standard/tests/general_functions/phpinfo.phpt
-@@ -20,7 +20,6 @@
+--- php5-5.2.6.orig/ext/standard/tests/general_functions/phpinfo.phpt
++++ php5-5.2.6/ext/standard/tests/general_functions/phpinfo.phpt
+@@ -20,7 +20,6 @@ PHP Version => %s
System => %s
Build Date => %s
Modified: php5/branches/lenny/debian/patches/053-extension_api.patch
===================================================================
--- php5/branches/lenny/debian/patches/053-extension_api.patch 2008-12-06 14:01:05 UTC (rev 1178)
+++ php5/branches/lenny/debian/patches/053-extension_api.patch 2008-12-06 16:20:16 UTC (rev 1179)
@@ -1,8 +1,8 @@
-Index: php5-5.2.4/configure.in
+Index: php5-5.2.6/configure.in
===================================================================
---- php5-5.2.4.orig/configure.in 2007-09-11 00:24:00.000000000 +0200
-+++ php5-5.2.4/configure.in 2007-09-11 00:40:32.000000000 +0200
-@@ -1048,8 +1048,13 @@
+--- php5-5.2.6.orig/configure.in
++++ php5-5.2.6/configure.in
+@@ -1048,8 +1048,13 @@ dnl Build extension directory path
ZEND_MODULE_API_NO=`$EGREP '#define ZEND_MODULE_API_NO ' $srcdir/Zend/zend_modules.h|$SED 's/#define ZEND_MODULE_API_NO //'`
@@ -17,7 +17,7 @@
if test "$oldstyleextdir" = "yes"; then
if test "$PHP_DEBUG" = "1"; then
part1=debug
-@@ -1193,6 +1198,7 @@
+@@ -1193,6 +1198,7 @@ PHP_SUBST(CXX)
PHP_SUBST(CXXFLAGS)
PHP_SUBST(CXXFLAGS_CLEAN)
PHP_SUBST_OLD(DEBUG_CFLAGS)
@@ -25,11 +25,11 @@
PHP_SUBST_OLD(EXTENSION_DIR)
PHP_SUBST_OLD(EXTRA_LDFLAGS)
PHP_SUBST_OLD(EXTRA_LDFLAGS_PROGRAM)
-Index: php5-5.2.4/scripts/php-config.in
+Index: php5-5.2.6/scripts/php-config.in
===================================================================
---- php5-5.2.4.orig/scripts/php-config.in 2007-09-11 00:23:54.000000000 +0200
-+++ php5-5.2.4/scripts/php-config.in 2007-09-11 00:41:21.000000000 +0200
-@@ -17,6 +17,7 @@
+--- php5-5.2.6.orig/scripts/php-config.in
++++ php5-5.2.6/scripts/php-config.in
+@@ -17,6 +17,7 @@ php_cli_binary=NONE
php_cgi_binary=NONE
configure_options="@CONFIGURE_OPTIONS@"
php_sapis="@PHP_INSTALLED_SAPIS@"
@@ -37,7 +37,7 @@
# Set php_cli_binary and php_cgi_binary if available
for sapi in $php_sapis; do
-@@ -55,6 +56,8 @@
+@@ -55,6 +56,8 @@ case "$1" in
echo $include_dir;;
--php-binary)
echo $php_binary;;
@@ -46,7 +46,7 @@
--php-sapis)
echo $php_sapis;;
--configure-options)
-@@ -75,6 +78,7 @@
+@@ -75,6 +78,7 @@ Options:
--include-dir [$include_dir]
--php-binary [$php_binary]
--php-sapis [$php_sapis]
Modified: php5/branches/lenny/debian/patches/056-mime_magic_liberal.patch
===================================================================
--- php5/branches/lenny/debian/patches/056-mime_magic_liberal.patch 2008-12-06 14:01:05 UTC (rev 1178)
+++ php5/branches/lenny/debian/patches/056-mime_magic_liberal.patch 2008-12-06 16:20:16 UTC (rev 1179)
@@ -1,8 +1,8 @@
-Index: php5-5.2.2/ext/mime_magic/mime_magic.c
+Index: php5-5.2.6/ext/mime_magic/mime_magic.c
===================================================================
---- php5-5.2.2.orig/ext/mime_magic/mime_magic.c 2007-02-15 01:05:42.000000000 +0100
-+++ php5-5.2.2/ext/mime_magic/mime_magic.c 2007-05-04 17:42:41.000000000 +0200
-@@ -501,7 +501,7 @@
+--- php5-5.2.6.orig/ext/mime_magic/mime_magic.c
++++ php5-5.2.6/ext/mime_magic/mime_magic.c
+@@ -501,7 +501,7 @@ static int is_valid_mimetype(char *p, in
} while (*(++p) != '/');
++p;
do {
@@ -11,7 +11,7 @@
return 0;
}
} while (*(++p));
-@@ -634,6 +634,15 @@
+@@ -634,6 +634,15 @@ static int parse(char *l, int lineno)
else if (strncmp(l, "string", NSTRING) == 0) {
m->type = STRING;
l += NSTRING;
@@ -27,7 +27,7 @@
}
else if (strncmp(l, "date", NDATE) == 0) {
m->type = DATE;
-@@ -727,7 +736,7 @@
+@@ -727,7 +736,7 @@ static int parse(char *l, int lineno)
if (!is_valid_mimetype(l, strlen(l))) {
if(MIME_MAGIC_G(debug))
php_error_docref("http://www.php.net/mime_magic" TSRMLS_CC, E_WARNING, ": (%s:%d) '%s' is not a valid mimetype, entry skipped", MIME_MAGIC_G(magicfile), lineno, l);
Modified: php5/branches/lenny/debian/patches/057-no_apache_installed.patch
===================================================================
--- php5/branches/lenny/debian/patches/057-no_apache_installed.patch 2008-12-06 14:01:05 UTC (rev 1178)
+++ php5/branches/lenny/debian/patches/057-no_apache_installed.patch 2008-12-06 16:20:16 UTC (rev 1179)
@@ -1,8 +1,8 @@
-Index: php5-5.2.4/sapi/apache2handler/config.m4
+Index: php5-5.2.6/sapi/apache2handler/config.m4
===================================================================
---- php5-5.2.4.orig/sapi/apache2handler/config.m4 2007-07-12 01:20:36.000000000 +0200
-+++ php5-5.2.4/sapi/apache2handler/config.m4 2007-09-11 00:41:45.000000000 +0200
-@@ -59,13 +59,13 @@
+--- php5-5.2.6.orig/sapi/apache2handler/config.m4
++++ php5-5.2.6/sapi/apache2handler/config.m4
+@@ -59,13 +59,13 @@ if test "$PHP_APXS2" != "no"; then
APACHE_CFLAGS="$APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $APR_CFLAGS $APU_CFLAGS"
@@ -23,11 +23,11 @@
APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
if test -z `$APXS -q SYSCONFDIR`; then
-Index: php5-5.2.4/sapi/apache/config.m4
+Index: php5-5.2.6/sapi/apache/config.m4
===================================================================
---- php5-5.2.4.orig/sapi/apache/config.m4 2007-07-12 01:20:36.000000000 +0200
-+++ php5-5.2.4/sapi/apache/config.m4 2007-09-11 00:41:45.000000000 +0200
-@@ -56,11 +56,11 @@
+--- php5-5.2.6.orig/sapi/apache/config.m4
++++ php5-5.2.6/sapi/apache/config.m4
+@@ -56,11 +56,11 @@ if test "$PHP_APXS" != "no"; then
APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET`
APACHE_INCLUDE=-I$APXS_INCLUDEDIR
@@ -44,11 +44,11 @@
for flag in $APXS_CFLAGS; do
case $flag in
-Index: php5-5.2.4/sapi/apache2filter/config.m4
+Index: php5-5.2.6/sapi/apache2filter/config.m4
===================================================================
---- php5-5.2.4.orig/sapi/apache2filter/config.m4 2007-07-12 01:20:36.000000000 +0200
-+++ php5-5.2.4/sapi/apache2filter/config.m4 2007-09-11 00:41:45.000000000 +0200
-@@ -60,13 +60,13 @@
+--- php5-5.2.6.orig/sapi/apache2filter/config.m4
++++ php5-5.2.6/sapi/apache2filter/config.m4
+@@ -60,13 +60,13 @@ if test "$PHP_APXS2FILTER" != "no"; then
APACHE_CFLAGS="$APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $APR_CFLAGS $APU_CFLAGS"
@@ -69,11 +69,11 @@
APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
if test -z `$APXS -q SYSCONFDIR`; then
-Index: php5-5.2.4/sapi/apache_hooks/config.m4
+Index: php5-5.2.6/sapi/apache_hooks/config.m4
===================================================================
---- php5-5.2.4.orig/sapi/apache_hooks/config.m4 2007-07-12 01:20:36.000000000 +0200
-+++ php5-5.2.4/sapi/apache_hooks/config.m4 2007-09-11 00:41:45.000000000 +0200
-@@ -57,11 +57,11 @@
+--- php5-5.2.6.orig/sapi/apache_hooks/config.m4
++++ php5-5.2.6/sapi/apache_hooks/config.m4
+@@ -57,11 +57,11 @@ if test "$PHP_APACHE_HOOKS" != "no"; the
APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET`
APACHE_INCLUDE=-I$APXS_INCLUDEDIR
Modified: php5/branches/lenny/debian/patches/100-recode_is_shared.patch
===================================================================
--- php5/branches/lenny/debian/patches/100-recode_is_shared.patch 2008-12-06 14:01:05 UTC (rev 1178)
+++ php5/branches/lenny/debian/patches/100-recode_is_shared.patch 2008-12-06 16:20:16 UTC (rev 1179)
@@ -1,8 +1,8 @@
-Index: php5-5.2.0/ext/recode/config9.m4
+Index: php5-5.2.6/ext/recode/config9.m4
===================================================================
---- php5-5.2.0.orig/ext/recode/config9.m4 2007-03-18 22:56:59.000000000 +0100
-+++ php5-5.2.0/ext/recode/config9.m4 2007-03-18 22:58:44.000000000 +0100
-@@ -8,6 +8,6 @@
+--- php5-5.2.6.orig/ext/recode/config9.m4
++++ php5-5.2.6/ext/recode/config9.m4
+@@ -8,6 +8,6 @@ if test "$PHP_RECODE" != "no"; then
test "$PHP_MYSQL" != "no" && recode_conflict="$recode_conflict mysql"
if test -n "$recode_conflict"; then
Modified: php5/branches/lenny/debian/patches/101-sqlite_is_shared.patch
===================================================================
--- php5/branches/lenny/debian/patches/101-sqlite_is_shared.patch 2008-12-06 14:01:05 UTC (rev 1178)
+++ php5/branches/lenny/debian/patches/101-sqlite_is_shared.patch 2008-12-06 16:20:16 UTC (rev 1179)
@@ -1,8 +1,8 @@
-Index: php5-5.2.4/ext/sqlite/config.m4
+Index: php5-5.2.6/ext/sqlite/config.m4
===================================================================
---- php5-5.2.4.orig/ext/sqlite/config.m4 2007-07-03 19:25:35.000000000 +0200
-+++ php5-5.2.4/ext/sqlite/config.m4 2007-09-11 00:41:52.000000000 +0200
-@@ -84,7 +84,7 @@
+--- php5-5.2.6.orig/ext/sqlite/config.m4
++++ php5-5.2.6/ext/sqlite/config.m4
+@@ -84,7 +84,7 @@ if test "$PHP_SQLITE" != "no"; then
])
SQLITE_MODULE_TYPE=external
PHP_SQLITE_CFLAGS=$pdo_inc_path
Modified: php5/branches/lenny/debian/patches/107-reflection_is_ext.patch
===================================================================
--- php5/branches/lenny/debian/patches/107-reflection_is_ext.patch 2008-12-06 14:01:05 UTC (rev 1178)
+++ php5/branches/lenny/debian/patches/107-reflection_is_ext.patch 2008-12-06 16:20:16 UTC (rev 1179)
@@ -1,8 +1,8 @@
-Index: php5-5.2.0/ext/reflection/config.m4
+Index: php5-5.2.6/ext/reflection/config.m4
===================================================================
---- php5-5.2.0.orig/ext/reflection/config.m4 2007-03-18 22:56:59.000000000 +0100
-+++ php5-5.2.0/ext/reflection/config.m4 2007-03-18 22:58:44.000000000 +0100
-@@ -2,7 +2,7 @@
+--- php5-5.2.6.orig/ext/reflection/config.m4
++++ php5-5.2.6/ext/reflection/config.m4
+@@ -2,7 +2,7 @@ dnl $Id: config.m4,v 1.4.2.3.2.1 2006/08
dnl config.m4 for extension reflection
PHP_ARG_ENABLE(reflection, whether to enable reflection support,
Modified: php5/branches/lenny/debian/patches/108-64_bit_datetime.patch
===================================================================
--- php5/branches/lenny/debian/patches/108-64_bit_datetime.patch 2008-12-06 14:01:05 UTC (rev 1178)
+++ php5/branches/lenny/debian/patches/108-64_bit_datetime.patch 2008-12-06 16:20:16 UTC (rev 1179)
@@ -1,10 +1,10 @@
-Index: php5-5.2.4/ext/standard/datetime.c
+Index: php5-5.2.6/ext/standard/datetime.c
===================================================================
---- php5-5.2.4.orig/ext/standard/datetime.c 2007-06-07 10:59:00.000000000 +0200
-+++ php5-5.2.4/ext/standard/datetime.c 2007-09-11 00:41:58.000000000 +0200
+--- php5-5.2.6.orig/ext/standard/datetime.c
++++ php5-5.2.6/ext/standard/datetime.c
@@ -20,6 +20,9 @@
- /* $Id: datetime.c,v 1.134.2.2.2.4 2007/06/07 08:59:00 tony2001 Exp $ */
+ /* $Id: datetime.c,v 1.134.2.2.2.5 2007/12/31 07:20:12 sebastian Exp $ */
+#define _XOPEN_SOURCE /* needed to get strptime() declared */
+#define _BSD_SOURCE /* needed to get ulong declared */
Modified: php5/branches/lenny/debian/patches/112-proc_open.patch
===================================================================
--- php5/branches/lenny/debian/patches/112-proc_open.patch 2008-12-06 14:01:05 UTC (rev 1178)
+++ php5/branches/lenny/debian/patches/112-proc_open.patch 2008-12-06 16:20:16 UTC (rev 1179)
@@ -1,7 +1,7 @@
-Index: php5-5.2.0/ext/standard/proc_open.c
+Index: php5-5.2.6/ext/standard/proc_open.c
===================================================================
---- php5-5.2.0.orig/ext/standard/proc_open.c 2007-03-18 22:56:59.000000000 +0100
-+++ php5-5.2.0/ext/standard/proc_open.c 2007-03-18 22:58:45.000000000 +0100
+--- php5-5.2.6.orig/ext/standard/proc_open.c
++++ php5-5.2.6/ext/standard/proc_open.c
@@ -61,7 +61,7 @@
* */
#ifdef PHP_CAN_SUPPORT_PROC_OPEN
Modified: php5/branches/lenny/debian/patches/113-php.ini_securitynotes.patch
===================================================================
--- php5/branches/lenny/debian/patches/113-php.ini_securitynotes.patch 2008-12-06 14:01:05 UTC (rev 1178)
+++ php5/branches/lenny/debian/patches/113-php.ini_securitynotes.patch 2008-12-06 16:20:16 UTC (rev 1179)
@@ -1,8 +1,8 @@
-Index: php5-5.2.4/php.ini-dist
+Index: php5-5.2.6/php.ini-dist
===================================================================
---- php5-5.2.4.orig/php.ini-dist 2007-09-11 00:23:54.000000000 +0200
-+++ php5-5.2.4/php.ini-dist 2007-09-11 00:42:09.000000000 +0200
-@@ -166,6 +166,11 @@
+--- php5-5.2.6.orig/php.ini-dist
++++ php5-5.2.6/php.ini-dist
+@@ -166,6 +166,11 @@ allow_call_time_pass_reference = On
;
; Safe Mode
;
@@ -14,7 +14,7 @@
safe_mode = Off
; By default, Safe Mode does a UID compare check when
-@@ -202,6 +207,13 @@
+@@ -202,6 +207,13 @@ safe_mode_protected_env_vars = LD_LIBRAR
; and below. This directive makes most sense if used in a per-directory
; or per-virtualhost web server configuration file. This directive is
; *NOT* affected by whether Safe Mode is turned On or Off.
@@ -28,7 +28,7 @@
;open_basedir =
; This directive allows you to disable certain functions for security reasons.
-@@ -411,6 +423,11 @@
+@@ -411,6 +423,11 @@ variables_order = "EGPCS"
; You should do your best to write your scripts so that they do not require
; register_globals to be on; Using form variables as globals can easily lead
; to possible security problems, if the code is not very well thought of.
Modified: php5/branches/lenny/debian/patches/disable_dl_by_default.patch
===================================================================
--- php5/branches/lenny/debian/patches/disable_dl_by_default.patch 2008-12-06 14:01:05 UTC (rev 1178)
+++ php5/branches/lenny/debian/patches/disable_dl_by_default.patch 2008-12-06 16:20:16 UTC (rev 1179)
@@ -1,8 +1,8 @@
-Index: php5-5.2.4/php.ini-dist
+Index: php5-5.2.6/php.ini-dist
===================================================================
---- php5-5.2.4.orig/php.ini-dist 2007-09-11 00:42:09.000000000 +0200
-+++ php5-5.2.4/php.ini-dist 2007-09-11 00:42:13.000000000 +0200
-@@ -505,7 +505,8 @@
+--- php5-5.2.6.orig/php.ini-dist
++++ php5-5.2.6/php.ini-dist
+@@ -505,7 +505,8 @@ user_dir =
; 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
; disabled on them.
@@ -12,11 +12,11 @@
; cgi.force_redirect is necessary to provide security running PHP as a CGI under
; most web servers. Left undefined, PHP turns this on by default. You can
-Index: php5-5.2.4/php.ini-recommended
+Index: php5-5.2.6/php.ini-recommended
===================================================================
---- php5-5.2.4.orig/php.ini-recommended 2007-09-11 00:23:54.000000000 +0200
-+++ php5-5.2.4/php.ini-recommended 2007-09-11 00:42:13.000000000 +0200
-@@ -538,7 +538,9 @@
+--- php5-5.2.6.orig/php.ini-recommended
++++ php5-5.2.6/php.ini-recommended
+@@ -538,7 +538,9 @@ user_dir =
; 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
; disabled on them.
Modified: php5/branches/lenny/debian/patches/fix_broken_upstream_tests.patch
===================================================================
--- php5/branches/lenny/debian/patches/fix_broken_upstream_tests.patch 2008-12-06 14:01:05 UTC (rev 1178)
+++ php5/branches/lenny/debian/patches/fix_broken_upstream_tests.patch 2008-12-06 16:20:16 UTC (rev 1179)
@@ -1,8 +1,8 @@
-Index: php5-5.2.5/tests/basic/bug20539.phpt
+Index: php5-5.2.6/tests/basic/bug20539.phpt
===================================================================
---- php5-5.2.5.orig/tests/basic/bug20539.phpt 2005-07-08 09:48:57.000000000 +0200
-+++ php5-5.2.5/tests/basic/bug20539.phpt 2007-11-13 23:45:03.000000000 +0100
-@@ -3,6 +3,7 @@
+--- php5-5.2.6.orig/tests/basic/bug20539.phpt
++++ php5-5.2.6/tests/basic/bug20539.phpt
+@@ -3,6 +3,7 @@ Bug #20539 (PHP CLI Segmentation Fault)
--INI--
session.auto_start=1
session.save_handler=files
@@ -10,11 +10,11 @@
--FILE--
<?php
print "good :)\n";
-Index: php5-5.2.5/ext/soap/tests/server009.phpt
+Index: php5-5.2.6/ext/soap/tests/server009.phpt
===================================================================
---- php5-5.2.5.orig/ext/soap/tests/server009.phpt 2007-05-07 20:45:01.000000000 +0200
-+++ php5-5.2.5/ext/soap/tests/server009.phpt 2007-11-13 23:45:03.000000000 +0100
-@@ -7,6 +7,10 @@
+--- php5-5.2.6.orig/ext/soap/tests/server009.phpt
++++ php5-5.2.6/ext/soap/tests/server009.phpt
+@@ -7,6 +7,10 @@ SOAP Server 9: setclass and setpersisten
die('skip this test needs session extension');
}
?>
@@ -25,10 +25,10 @@
--FILE--
<?php
class foo {
-Index: php5-5.2.5/ext/standard/tests/general_functions/phpinfo.phpt
+Index: php5-5.2.6/ext/standard/tests/general_functions/phpinfo.phpt
===================================================================
---- php5-5.2.5.orig/ext/standard/tests/general_functions/phpinfo.phpt 2007-11-13 23:36:17.000000000 +0100
-+++ php5-5.2.5/ext/standard/tests/general_functions/phpinfo.phpt 2007-11-13 23:45:03.000000000 +0100
+--- php5-5.2.6.orig/ext/standard/tests/general_functions/phpinfo.phpt
++++ php5-5.2.6/ext/standard/tests/general_functions/phpinfo.phpt
@@ -1,5 +1,7 @@
--TEST--
phpinfo()
@@ -37,19 +37,19 @@
--FILE--
<?php
var_dump(phpinfo());
-@@ -24,6 +26,7 @@
+@@ -24,6 +26,7 @@ Server API => Command Line Interface
Virtual Directory Support => %s
Configuration File (php.ini) Path => %s
- Loaded Configuration File => %s
+ Loaded Configuration File => %a
+Scan this dir for additional .ini files => %s
PHP API => %d
PHP Extension => %d
Zend Extension => %d
-Index: php5-5.2.5/ext/standard/tests/strings/moneyformat.phpt
+Index: php5-5.2.6/ext/standard/tests/strings/moneyformat.phpt
===================================================================
---- php5-5.2.5.orig/ext/standard/tests/strings/moneyformat.phpt 2007-06-06 19:46:17.000000000 +0200
-+++ php5-5.2.5/ext/standard/tests/strings/moneyformat.phpt 2007-11-13 23:45:03.000000000 +0100
-@@ -5,6 +5,8 @@
+--- php5-5.2.6.orig/ext/standard/tests/strings/moneyformat.phpt
++++ php5-5.2.6/ext/standard/tests/strings/moneyformat.phpt
+@@ -5,6 +5,8 @@ money_format test
if (!function_exists('money_format') || !function_exists('setlocale')) {
die("SKIP money_format - not supported\n");
}
Copied: php5/branches/lenny/debian/patches/force_libmysqlclient_r.patch (from rev 1178, php5/trunk/debian/patches/force_libmysqlclient_r.patch)
===================================================================
--- php5/branches/lenny/debian/patches/force_libmysqlclient_r.patch (rev 0)
+++ php5/branches/lenny/debian/patches/force_libmysqlclient_r.patch 2008-12-06 16:20:16 UTC (rev 1179)
@@ -0,0 +1,39 @@
+Index: php5-5.2.5/ext/mysql/config.m4
+===================================================================
+--- php5-5.2.5.orig/ext/mysql/config.m4 2008-03-01 21:03:07.000000000 +0100
++++ php5-5.2.5/ext/mysql/config.m4 2008-03-01 21:03:36.000000000 +0100
+@@ -86,7 +86,7 @@
+ Note that the MySQL client library is not bundled anymore!])
+ fi
+
+- if test "$enable_maintainer_zts" = "yes"; then
++ if true || test "$enable_maintainer_zts" = "yes"; then
+ MYSQL_LIBNAME=mysqlclient_r
+ else
+ MYSQL_LIBNAME=mysqlclient
+Index: php5-5.2.5/ext/mysqli/config.m4
+===================================================================
+--- php5-5.2.5.orig/ext/mysqli/config.m4 2008-03-01 21:03:07.000000000 +0100
++++ php5-5.2.5/ext/mysqli/config.m4 2008-03-01 21:03:58.000000000 +0100
+@@ -26,7 +26,7 @@
+ if test "$PHP_EMBEDDED_MYSQLI" = "yes"; then
+ AC_DEFINE(HAVE_EMBEDDED_MYSQLI, 1, [embedded MySQL support enabled])
+ MYSQL_LIB_CFG='--libmysqld-libs'
+- elif test "$enable_maintainer_zts" = "yes"; then
++ elif true || test "$enable_maintainer_zts" = "yes"; then
+ MYSQL_LIB_CFG='--libs_r'
+ MYSQL_LIB_NAME='mysqlclient_r'
+ else
+Index: php5-5.2.5/ext/pdo_mysql/config.m4
+===================================================================
+--- php5-5.2.5.orig/ext/pdo_mysql/config.m4 2008-03-01 21:03:07.000000000 +0100
++++ php5-5.2.5/ext/pdo_mysql/config.m4 2008-03-01 21:03:50.000000000 +0100
+@@ -58,7 +58,7 @@
+ if test "x$SED" = "x"; then
+ AC_PATH_PROG(SED, sed)
+ fi
+- if test "$enable_maintainer_zts" = "yes"; then
++ if true || test "$enable_maintainer_zts" = "yes"; then
+ PDO_MYSQL_LIBNAME=mysqlclient_r
+ PDO_MYSQL_LIBS=`$PDO_MYSQL_CONFIG --libs_r | $SED -e "s/'//g"`
+ else
Modified: php5/branches/lenny/debian/patches/libdb_is_-ldb
===================================================================
--- php5/branches/lenny/debian/patches/libdb_is_-ldb 2008-12-06 14:01:05 UTC (rev 1178)
+++ php5/branches/lenny/debian/patches/libdb_is_-ldb 2008-12-06 16:20:16 UTC (rev 1179)
@@ -1,13 +1,13 @@
-Index: php5-5.2.5/ext/dba/config.m4
+Index: php5-5.2.6/ext/dba/config.m4
===================================================================
---- php5-5.2.5.orig/ext/dba/config.m4
-+++ php5-5.2.5/ext/dba/config.m4
-@@ -301,7 +301,7 @@
+--- php5-5.2.6.orig/ext/dba/config.m4
++++ php5-5.2.6/ext/dba/config.m4
+@@ -306,7 +306,7 @@ if test "$PHP_DB4" != "no"; then
break
fi
done
-- PHP_DBA_DB_CHECK(4, db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
-+ PHP_DBA_DB_CHECK(4, db db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
+- PHP_DBA_DB_CHECK(4, db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
++ PHP_DBA_DB_CHECK(4, db db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
fi
PHP_DBA_STD_RESULT(db4,Berkeley DB4)
Copied: php5/branches/lenny/debian/patches/manpage_spelling.patch (from rev 1178, php5/trunk/debian/patches/manpage_spelling.patch)
===================================================================
--- php5/branches/lenny/debian/patches/manpage_spelling.patch (rev 0)
+++ php5/branches/lenny/debian/patches/manpage_spelling.patch 2008-12-06 16:20:16 UTC (rev 1179)
@@ -0,0 +1,31 @@
+Index: php5-5.2.6/sapi/cli/php.1.in
+===================================================================
+--- php5-5.2.6.orig/sapi/cli/php.1.in
++++ php5-5.2.6/sapi/cli/php.1.in
+@@ -69,7 +69,7 @@ specified by \-F to be executed.
+ You can access the input line by \fB$argn\fP. While processing the input lines
+ .B $argi
+ contains the number of the actual line being processed. Further more
+-the paramters \-B and \-E can be used to execute
++the parameters \-B and \-E can be used to execute
+ .IR code
+ (see \-r) before and
+ after all input lines have been processed respectively. Notice that the
+@@ -316,7 +316,7 @@ The configuration file for the CGI versi
+ The configuration file for the version of PHP that apache2 uses.
+ .SH EXAMPLES
+ .TP 5
+-\fIphp -r 'echo "Hello World\\n";'\fP
++\fIphp \-r 'echo "Hello World\\n";'\fP
+ This command simply writes the text "Hello World" to standard out.
+ .TP
+ \fIphp \-r 'print_r(gd_info());'\fP
+@@ -340,7 +340,7 @@ configuration information. If you then c
+ Using this PHP command you can count the lines being input.
+ .TP
+ \fIphp \-R '@$l+=count(file($argn));' \-E 'echo "Lines:$l\\n";'\fP
+-In this example PHP expects each input line beeing a file. It counts all lines
++In this example PHP expects each input line being a file. It counts all lines
+ of the files specified by each input line and shows the summarized result.
+ You may combine this with tools like find and change the php scriptlet.
+ .TP
Modified: php5/branches/lenny/debian/patches/suhosin.patch
===================================================================
--- php5/branches/lenny/debian/patches/suhosin.patch 2008-12-06 14:01:05 UTC (rev 1178)
+++ php5/branches/lenny/debian/patches/suhosin.patch 2008-12-06 16:20:16 UTC (rev 1179)
@@ -1,8 +1,13 @@
-Index: php5-5.2.5/TSRM/TSRM.h
+suhosin hardening patch
+Copyright © 2006-2007 Stefan Esser <sesser at hardened-php.net>
+Suhosin is licensed under the PHP License Version 3.01
+downloaded from http://www.hardened-php.net/suhosin/download.html
+modified to not patch autofoo output scripts (configure/Makefile.in/etc)
+Index: php5-5.2.6/TSRM/TSRM.h
===================================================================
---- php5-5.2.5.orig/TSRM/TSRM.h
-+++ php5-5.2.5/TSRM/TSRM.h
-@@ -38,6 +38,13 @@
+--- php5-5.2.6.orig/TSRM/TSRM.h
++++ php5-5.2.6/TSRM/TSRM.h
+@@ -38,6 +38,13 @@ typedef long tsrm_intptr_t;
typedef unsigned long tsrm_uintptr_t;
#endif
@@ -16,7 +21,7 @@
/* Only compile multi-threading functions if we're in ZTS mode */
#ifdef ZTS
-@@ -93,6 +100,7 @@
+@@ -93,6 +100,7 @@ typedef void (*ts_allocate_dtor)(void *,
#define THREAD_HASH_OF(thr,ts) (unsigned long)thr%(unsigned long)ts
@@ -24,11 +29,11 @@
#ifdef __cplusplus
extern "C" {
#endif
-Index: php5-5.2.5/TSRM/tsrm_virtual_cwd.c
+Index: php5-5.2.6/TSRM/tsrm_virtual_cwd.c
===================================================================
---- php5-5.2.5.orig/TSRM/tsrm_virtual_cwd.c
-+++ php5-5.2.5/TSRM/tsrm_virtual_cwd.c
-@@ -273,6 +273,178 @@
+--- php5-5.2.6.orig/TSRM/tsrm_virtual_cwd.c
++++ php5-5.2.6/TSRM/tsrm_virtual_cwd.c
+@@ -273,6 +273,178 @@ static char *tsrm_strndup(const char *s,
}
/* }}} */
@@ -207,11 +212,11 @@
CWD_API void virtual_cwd_startup(void) /* {{{ */
{
char cwd[MAXPATHLEN];
-Index: php5-5.2.5/TSRM/tsrm_virtual_cwd.h
+Index: php5-5.2.6/TSRM/tsrm_virtual_cwd.h
===================================================================
---- php5-5.2.5.orig/TSRM/tsrm_virtual_cwd.h
-+++ php5-5.2.5/TSRM/tsrm_virtual_cwd.h
-@@ -139,6 +139,22 @@
+--- php5-5.2.6.orig/TSRM/tsrm_virtual_cwd.h
++++ php5-5.2.6/TSRM/tsrm_virtual_cwd.h
+@@ -139,6 +139,22 @@ typedef struct _cwd_state {
typedef int (*verify_path_func)(const cwd_state *);
@@ -234,11 +239,11 @@
CWD_API void virtual_cwd_startup(void);
CWD_API void virtual_cwd_shutdown(void);
CWD_API char *virtual_getcwd_ex(size_t *length TSRMLS_DC);
-Index: php5-5.2.5/Zend/Makefile.am
+Index: php5-5.2.6/Zend/Makefile.am
===================================================================
---- php5-5.2.5.orig/Zend/Makefile.am
-+++ php5-5.2.5/Zend/Makefile.am
-@@ -17,7 +17,7 @@
+--- php5-5.2.6.orig/Zend/Makefile.am
++++ php5-5.2.6/Zend/Makefile.am
+@@ -17,7 +17,7 @@ libZend_la_SOURCES=\
zend_objects_API.c zend_ts_hash.c zend_stream.c \
zend_default_classes.c \
zend_iterators.c zend_interfaces.c zend_exceptions.c \
@@ -247,11 +252,41 @@
libZend_la_LDFLAGS =
libZend_la_LIBADD = @ZEND_EXTRA_LIBS@
-Index: php5-5.2.5/Zend/zend.c
+Index: php5-5.2.6/Zend/Zend.dsp
===================================================================
---- php5-5.2.5.orig/Zend/zend.c
-+++ php5-5.2.5/Zend/zend.c
-@@ -57,7 +57,9 @@
+--- php5-5.2.6.orig/Zend/Zend.dsp
++++ php5-5.2.6/Zend/Zend.dsp
+@@ -239,6 +239,10 @@ SOURCE=.\zend_strtod.c
+ # End Source File
+ # Begin Source File
+
++SOURCE=.\zend_canary.c
++# End Source File
++# Begin Source File
++
+ SOURCE=.\zend_ts_hash.c
+ # End Source File
+ # Begin Source File
+Index: php5-5.2.6/Zend/ZendTS.dsp
+===================================================================
+--- php5-5.2.6.orig/Zend/ZendTS.dsp
++++ php5-5.2.6/Zend/ZendTS.dsp
+@@ -273,6 +273,10 @@ SOURCE=.\zend_strtod.c
+ # End Source File
+ # Begin Source File
+
++SOURCE=.\zend_canary.c
++# End Source File
++# Begin Source File
++
+ SOURCE=.\zend_ts_hash.c
+ # End Source File
+ # Begin Source File
+Index: php5-5.2.6/Zend/zend.c
+===================================================================
+--- php5-5.2.6.orig/Zend/zend.c
++++ php5-5.2.6/Zend/zend.c
+@@ -57,7 +57,9 @@ ZEND_API void (*zend_ticks_function)(int
ZEND_API void (*zend_error_cb)(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args);
int (*zend_vspprintf)(char **pbuf, size_t max_len, const char *format, va_list ap);
ZEND_API char *(*zend_getenv)(char *name, size_t name_len TSRMLS_DC);
@@ -262,7 +297,7 @@
void (*zend_on_timeout)(int seconds TSRMLS_DC);
static void (*zend_message_dispatcher_p)(long message, void *data);
-@@ -74,9 +76,88 @@
+@@ -74,9 +76,88 @@ static ZEND_INI_MH(OnUpdateErrorReportin
return SUCCESS;
}
@@ -351,11 +386,11 @@
STD_ZEND_INI_BOOLEAN("zend.ze1_compatibility_mode", "0", ZEND_INI_ALL, OnUpdateBool, ze1_compatibility_mode, zend_executor_globals, executor_globals)
#ifdef ZEND_MULTIBYTE
STD_ZEND_INI_BOOLEAN("detect_unicode", "1", ZEND_INI_ALL, OnUpdateBool, detect_unicode, zend_compiler_globals, compiler_globals)
-Index: php5-5.2.5/Zend/zend.h
+Index: php5-5.2.6/Zend/zend.h
===================================================================
---- php5-5.2.5.orig/Zend/zend.h
-+++ php5-5.2.5/Zend/zend.h
-@@ -520,6 +520,9 @@
+--- php5-5.2.6.orig/Zend/zend.h
++++ php5-5.2.6/Zend/zend.h
+@@ -532,6 +532,9 @@ extern void (*zend_on_timeout)(int secon
extern ZEND_API int (*zend_stream_open_function)(const char *filename, zend_file_handle *handle TSRMLS_DC);
extern int (*zend_vspprintf)(char **pbuf, size_t max_len, const char *format, va_list ap);
extern ZEND_API char *(*zend_getenv)(char *name, size_t name_len TSRMLS_DC);
@@ -365,7 +400,7 @@
ZEND_API void zend_error(int type, const char *format, ...) ZEND_ATTRIBUTE_FORMAT(printf, 2, 3);
-@@ -651,6 +654,13 @@
+@@ -663,6 +666,13 @@ END_EXTERN_C()
#include "zend_operators.h"
#include "zend_variables.h"
@@ -379,11 +414,11 @@
#endif /* ZEND_H */
/*
-Index: php5-5.2.5/Zend/zend_alloc.c
+Index: php5-5.2.6/Zend/zend_alloc.c
===================================================================
---- php5-5.2.5.orig/Zend/zend_alloc.c
-+++ php5-5.2.5/Zend/zend_alloc.c
-@@ -311,13 +311,26 @@
+--- php5-5.2.6.orig/Zend/zend_alloc.c
++++ php5-5.2.6/Zend/zend_alloc.c
+@@ -311,13 +311,26 @@ static const zend_mm_mem_handlers mem_ha
#define MEM_BLOCK_GUARD 0x2A8FCC84
#define MEM_BLOCK_LEAK 0x6C5E8F2D
@@ -412,7 +447,7 @@
} zend_mm_block_info;
#if ZEND_DEBUG
-@@ -423,6 +436,9 @@
+@@ -423,6 +436,9 @@ struct _zend_mm_heap {
int miss;
} cache_stat[ZEND_MM_NUM_BUCKETS+1];
#endif
@@ -422,7 +457,7 @@
};
#define ZEND_MM_SMALL_FREE_BUCKET(heap, index) \
-@@ -512,15 +528,15 @@
+@@ -512,15 +528,15 @@ static unsigned int _zend_mm_cookie = 0;
#define ZEND_MM_ALIGNED_SIZE(size) ((size + ZEND_MM_ALIGNMENT - 1) & ZEND_MM_ALIGNMENT_MASK)
#define ZEND_MM_ALIGNED_HEADER_SIZE ZEND_MM_ALIGNED_SIZE(sizeof(zend_mm_block))
#define ZEND_MM_ALIGNED_FREE_HEADER_SIZE ZEND_MM_ALIGNED_SIZE(sizeof(zend_mm_small_free_block))
@@ -441,7 +476,7 @@
#define ZEND_MM_BUCKET_INDEX(true_size) ((true_size>>ZEND_MM_ALIGNMENT_LOG2)-(ZEND_MM_ALIGNED_MIN_HEADER_SIZE>>ZEND_MM_ALIGNMENT_LOG2))
-@@ -582,6 +598,48 @@
+@@ -582,6 +598,48 @@ static unsigned int _zend_mm_cookie = 0;
#endif
@@ -490,7 +525,7 @@
#if ZEND_MM_HEAP_PROTECTION
-@@ -780,6 +838,12 @@
+@@ -790,6 +848,12 @@ static inline void zend_mm_remove_from_f
if (EXPECTED(prev == mm_block)) {
zend_mm_free_block **rp, **cp;
@@ -503,7 +538,7 @@
#if ZEND_MM_SAFE_UNLINKING
if (UNEXPECTED(next != mm_block)) {
zend_mm_panic("zend_mm_heap corrupted");
-@@ -818,6 +882,12 @@
+@@ -828,6 +892,12 @@ subst_block:
}
} else {
@@ -516,7 +551,7 @@
#if ZEND_MM_SAFE_UNLINKING
if (UNEXPECTED(prev->next_free_block != mm_block) || UNEXPECTED(next->prev_free_block != mm_block)) {
zend_mm_panic("zend_mm_heap corrupted");
-@@ -865,6 +935,11 @@
+@@ -875,6 +945,11 @@ static inline void zend_mm_init(zend_mm_
heap->large_free_buckets[i] = NULL;
}
heap->rest_buckets[0] = heap->rest_buckets[1] = ZEND_MM_REST_BUCKET(heap);
@@ -528,7 +563,7 @@
}
static void zend_mm_del_segment(zend_mm_heap *heap, zend_mm_segment *segment)
-@@ -1755,6 +1830,11 @@
+@@ -1766,6 +1841,11 @@ static void *_zend_mm_alloc_int(zend_mm_
best_fit = heap->cache[index];
heap->cache[index] = best_fit->prev_free_block;
heap->cached -= true_size;
@@ -540,7 +575,7 @@
ZEND_MM_CHECK_MAGIC(best_fit, MEM_BLOCK_CACHED);
ZEND_MM_SET_DEBUG_INFO(best_fit, size, 1, 0);
return ZEND_MM_DATA_OF(best_fit);
-@@ -1889,6 +1969,12 @@
+@@ -1905,6 +1985,12 @@ zend_mm_finished_searching_for_block:
ZEND_MM_SET_DEBUG_INFO(best_fit, size, 1, 1);
@@ -553,7 +588,7 @@
heap->size += true_size;
if (heap->peak < heap->size) {
heap->peak = heap->size;
-@@ -1912,6 +1998,9 @@
+@@ -1928,6 +2014,9 @@ static void _zend_mm_free_int(zend_mm_he
mm_block = ZEND_MM_HEADER_OF(p);
size = ZEND_MM_BLOCK_SIZE(mm_block);
@@ -563,7 +598,7 @@
ZEND_MM_CHECK_PROTECTION(mm_block);
#if ZEND_DEBUG || ZEND_MM_HEAP_PROTECTION
-@@ -1974,6 +2063,9 @@
+@@ -1990,6 +2079,9 @@ static void *_zend_mm_realloc_int(zend_m
mm_block = ZEND_MM_HEADER_OF(p);
true_size = ZEND_MM_TRUE_SIZE(size);
orig_size = ZEND_MM_BLOCK_SIZE(mm_block);
@@ -573,7 +608,7 @@
ZEND_MM_CHECK_PROTECTION(mm_block);
if (UNEXPECTED(true_size < size)) {
-@@ -2005,6 +2097,11 @@
+@@ -2021,6 +2113,11 @@ static void *_zend_mm_realloc_int(zend_m
HANDLE_UNBLOCK_INTERRUPTIONS();
}
ZEND_MM_SET_DEBUG_INFO(mm_block, size, 0, 0);
@@ -585,7 +620,7 @@
return p;
}
-@@ -2024,13 +2121,18 @@
+@@ -2040,13 +2137,18 @@ static void *_zend_mm_realloc_int(zend_m
heap->cache[index] = best_fit->prev_free_block;
ZEND_MM_CHECK_MAGIC(best_fit, MEM_BLOCK_CACHED);
ZEND_MM_SET_DEBUG_INFO(best_fit, size, 1, 0);
@@ -605,7 +640,7 @@
#endif
heap->cached -= true_size - orig_size;
-@@ -2088,6 +2190,11 @@
+@@ -2104,6 +2206,11 @@ static void *_zend_mm_realloc_int(zend_m
if (heap->peak < heap->size) {
heap->peak = heap->size;
}
@@ -617,7 +652,7 @@
HANDLE_UNBLOCK_INTERRUPTIONS();
return p;
} else if (ZEND_MM_IS_FIRST_BLOCK(mm_block) &&
-@@ -2191,6 +2298,11 @@
+@@ -2207,6 +2314,11 @@ out_of_memory:
}
HANDLE_UNBLOCK_INTERRUPTIONS();
@@ -629,7 +664,7 @@
return ZEND_MM_DATA_OF(mm_block);
}
-@@ -2198,7 +2310,7 @@
+@@ -2214,7 +2326,7 @@ out_of_memory:
#if ZEND_DEBUG || ZEND_MM_HEAP_PROTECTION
memcpy(ptr, p, mm_block->debug.size);
#else
@@ -638,7 +673,7 @@
#endif
_zend_mm_free_int(heap, p ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
return ptr;
-@@ -2441,6 +2553,17 @@
+@@ -2477,6 +2589,17 @@ ZEND_API void shutdown_memory_manager(in
zend_mm_shutdown(AG(mm_heap), full_shutdown, silent);
}
@@ -656,11 +691,11 @@
static void alloc_globals_ctor(zend_alloc_globals *alloc_globals TSRMLS_DC)
{
char *tmp;
-Index: php5-5.2.5/Zend/zend_alloc.h
+Index: php5-5.2.6/Zend/zend_alloc.h
===================================================================
---- php5-5.2.5.orig/Zend/zend_alloc.h
-+++ php5-5.2.5/Zend/zend_alloc.h
-@@ -128,6 +128,9 @@
+--- php5-5.2.6.orig/Zend/zend_alloc.h
++++ php5-5.2.6/Zend/zend_alloc.h
+@@ -128,6 +128,9 @@ ZEND_API int zend_set_memory_limit(size_
ZEND_API void start_memory_manager(TSRMLS_D);
ZEND_API void shutdown_memory_manager(int silent, int full_shutdown TSRMLS_DC);
@@ -670,10 +705,10 @@
ZEND_API int is_zend_mm(TSRMLS_D);
#if ZEND_DEBUG
-Index: php5-5.2.5/Zend/zend_canary.c
+Index: php5-5.2.6/Zend/zend_canary.c
===================================================================
--- /dev/null
-+++ php5-5.2.5/Zend/zend_canary.c
++++ php5-5.2.6/Zend/zend_canary.c
@@ -0,0 +1,64 @@
+/*
+ +----------------------------------------------------------------------+
@@ -739,11 +774,11 @@
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */
-Index: php5-5.2.5/Zend/zend_compile.c
+Index: php5-5.2.6/Zend/zend_compile.c
===================================================================
---- php5-5.2.5.orig/Zend/zend_compile.c
-+++ php5-5.2.5/Zend/zend_compile.c
-@@ -54,7 +54,6 @@
+--- php5-5.2.6.orig/Zend/zend_compile.c
++++ php5-5.2.6/Zend/zend_compile.c
+@@ -54,7 +54,6 @@ static void zend_duplicate_property_info
property_info->name = zend_strndup(property_info->name, property_info->name_length);
}
@@ -751,7 +786,7 @@
static void zend_destroy_property_info(zend_property_info *property_info)
{
efree(property_info->name);
-@@ -68,6 +67,10 @@
+@@ -68,6 +67,10 @@ static void zend_destroy_property_info_i
{
free(property_info->name);
}
@@ -762,11 +797,11 @@
static void build_runtime_defined_function_key(zval *result, char *name, int name_length TSRMLS_DC)
{
-Index: php5-5.2.5/Zend/zend_compile.h
+Index: php5-5.2.6/Zend/zend_compile.h
===================================================================
---- php5-5.2.5.orig/Zend/zend_compile.h
-+++ php5-5.2.5/Zend/zend_compile.h
-@@ -564,6 +564,11 @@
+--- php5-5.2.6.orig/Zend/zend_compile.h
++++ php5-5.2.6/Zend/zend_compile.h
+@@ -564,6 +564,11 @@ ZEND_API int zend_auto_global_disable_ji
int zendlex(znode *zendlval TSRMLS_DC);
@@ -778,7 +813,7 @@
/* BEGIN: OPCODES */
#include "zend_vm_opcodes.h"
-@@ -686,6 +691,7 @@
+@@ -686,6 +691,7 @@ int zendlex(znode *zendlval TSRMLS_DC);
#define ZEND_RETURNS_FUNCTION 1<<0
@@ -786,11 +821,11 @@
END_EXTERN_C()
#define ZEND_CLONE_FUNC_NAME "__clone"
-Index: php5-5.2.5/Zend/zend_constants.c
+Index: php5-5.2.6/Zend/zend_constants.c
===================================================================
---- php5-5.2.5.orig/Zend/zend_constants.c
-+++ php5-5.2.5/Zend/zend_constants.c
-@@ -110,6 +110,75 @@
+--- php5-5.2.6.orig/Zend/zend_constants.c
++++ php5-5.2.6/Zend/zend_constants.c
+@@ -110,6 +110,75 @@ void zend_register_standard_constants(TS
REGISTER_MAIN_LONG_CONSTANT("E_USER_NOTICE", E_USER_NOTICE, CONST_PERSISTENT | CONST_CS);
REGISTER_MAIN_LONG_CONSTANT("E_ALL", E_ALL, CONST_PERSISTENT | CONST_CS);
@@ -866,10 +901,10 @@
/* true/false constants */
{
-Index: php5-5.2.5/Zend/zend_errors.h
+Index: php5-5.2.6/Zend/zend_errors.h
===================================================================
---- php5-5.2.5.orig/Zend/zend_errors.h
-+++ php5-5.2.5/Zend/zend_errors.h
+--- php5-5.2.6.orig/Zend/zend_errors.h
++++ php5-5.2.6/Zend/zend_errors.h
@@ -39,6 +39,20 @@
#define E_ALL (E_ERROR | E_WARNING | E_PARSE | E_NOTICE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_USER_ERROR | E_USER_WARNING | E_USER_NOTICE | E_RECOVERABLE_ERROR)
#define E_CORE (E_CORE_ERROR | E_CORE_WARNING)
@@ -891,19 +926,19 @@
#endif /* ZEND_ERRORS_H */
/*
-Index: php5-5.2.5/Zend/zend_hash.c
+Index: php5-5.2.6/Zend/zend_hash.c
===================================================================
---- php5-5.2.5.orig/Zend/zend_hash.c
-+++ php5-5.2.5/Zend/zend_hash.c
+--- php5-5.2.6.orig/Zend/zend_hash.c
++++ php5-5.2.6/Zend/zend_hash.c
@@ -20,6 +20,7 @@
- /* $Id: zend_hash.c,v 1.121.2.4.2.8 2007/07/24 18:28:39 dmitry Exp $ */
+ /* $Id: zend_hash.c,v 1.121.2.4.2.9 2007/12/31 07:20:02 sebastian Exp $ */
#include "zend.h"
+#include "zend_compile.h"
#define CONNECT_TO_BUCKET_DLLIST(element, list_head) \
(element)->pNext = (list_head); \
-@@ -132,7 +133,189 @@
+@@ -132,7 +133,189 @@ ZEND_API ulong zend_hash_func(char *arKe
(p)->pDataPtr=NULL; \
}
@@ -1093,7 +1128,7 @@
ZEND_API int _zend_hash_init(HashTable *ht, uint nSize, hash_func_t pHashFunction, dtor_func_t pDestructor, zend_bool persistent ZEND_FILE_LINE_DC)
{
-@@ -153,6 +336,7 @@
+@@ -153,6 +336,7 @@ ZEND_API int _zend_hash_init(HashTable *
ht->nTableMask = ht->nTableSize - 1;
ht->pDestructor = pDestructor;
@@ -1101,7 +1136,7 @@
ht->arBuckets = NULL;
ht->pListHead = NULL;
ht->pListTail = NULL;
-@@ -230,6 +414,8 @@
+@@ -230,6 +414,8 @@ ZEND_API int _zend_hash_add_or_update(Ha
return FAILURE;
}
#endif
@@ -1110,7 +1145,7 @@
if (ht->pDestructor) {
ht->pDestructor(p->pData);
}
-@@ -295,6 +481,7 @@
+@@ -295,6 +481,7 @@ ZEND_API int _zend_hash_quick_add_or_upd
return FAILURE;
}
#endif
@@ -1118,7 +1153,7 @@
if (ht->pDestructor) {
ht->pDestructor(p->pData);
}
-@@ -370,6 +557,7 @@
+@@ -370,6 +557,7 @@ ZEND_API int _zend_hash_index_update_or_
return FAILURE;
}
#endif
@@ -1126,7 +1161,7 @@
if (ht->pDestructor) {
ht->pDestructor(p->pData);
}
-@@ -493,6 +681,7 @@
+@@ -493,6 +681,7 @@ ZEND_API int zend_hash_del_key_or_index(
if (ht->pInternalPointer == p) {
ht->pInternalPointer = p->pListNext;
}
@@ -1134,7 +1169,7 @@
if (ht->pDestructor) {
ht->pDestructor(p->pData);
}
-@@ -518,6 +707,8 @@
+@@ -518,6 +707,8 @@ ZEND_API void zend_hash_destroy(HashTabl
SET_INCONSISTENT(HT_IS_DESTROYING);
@@ -1143,7 +1178,7 @@
p = ht->pListHead;
while (p != NULL) {
q = p;
-@@ -544,6 +735,8 @@
+@@ -544,6 +735,8 @@ ZEND_API void zend_hash_clean(HashTable
SET_INCONSISTENT(HT_CLEANING);
@@ -1152,7 +1187,7 @@
p = ht->pListHead;
while (p != NULL) {
q = p;
-@@ -607,6 +800,7 @@
+@@ -607,6 +800,7 @@ static Bucket *zend_hash_apply_deleter(H
ht->nNumOfElements--;
HANDLE_UNBLOCK_INTERRUPTIONS();
@@ -1160,10 +1195,10 @@
if (ht->pDestructor) {
ht->pDestructor(p->pData);
}
-Index: php5-5.2.5/Zend/zend_llist.c
+Index: php5-5.2.6/Zend/zend_llist.c
===================================================================
---- php5-5.2.5.orig/Zend/zend_llist.c
-+++ php5-5.2.5/Zend/zend_llist.c
+--- php5-5.2.6.orig/Zend/zend_llist.c
++++ php5-5.2.6/Zend/zend_llist.c
@@ -23,6 +23,184 @@
#include "zend_llist.h"
#include "zend_qsort.h"
@@ -1349,7 +1384,7 @@
ZEND_API void zend_llist_init(zend_llist *l, size_t size, llist_dtor_func_t dtor, unsigned char persistent)
{
l->head = NULL;
-@@ -30,6 +208,7 @@
+@@ -30,6 +208,7 @@ ZEND_API void zend_llist_init(zend_llist
l->count = 0;
l->size = size;
l->dtor = dtor;
@@ -1357,7 +1392,7 @@
l->persistent = persistent;
}
-@@ -81,6 +260,7 @@
+@@ -81,6 +260,7 @@ ZEND_API void zend_llist_prepend_element
} else {\
(l)->tail = (current)->prev;\
}\
@@ -1365,7 +1400,7 @@
if ((l)->dtor) {\
(l)->dtor((current)->data);\
}\
-@@ -108,6 +288,7 @@
+@@ -108,6 +288,7 @@ ZEND_API void zend_llist_destroy(zend_ll
{
zend_llist_element *current=l->head, *next;
@@ -1373,7 +1408,7 @@
while (current) {
next = current->next;
if (l->dtor) {
-@@ -133,6 +314,7 @@
+@@ -133,6 +314,7 @@ ZEND_API void *zend_llist_remove_tail(ze
zend_llist_element *old_tail;
void *data;
@@ -1381,11 +1416,11 @@
if ((old_tail = l->tail)) {
if (old_tail->prev) {
old_tail->prev->next = NULL;
-Index: php5-5.2.5/configure.in
+Index: php5-5.2.6/configure.in
===================================================================
---- php5-5.2.5.orig/configure.in
-+++ php5-5.2.5/configure.in
-@@ -227,6 +227,7 @@
+--- php5-5.2.6.orig/configure.in
++++ php5-5.2.6/configure.in
+@@ -227,6 +227,7 @@ sinclude(Zend/Zend.m4)
sinclude(TSRM/threads.m4)
sinclude(TSRM/tsrm.m4)
@@ -1393,7 +1428,7 @@
divert(2)
-@@ -1304,7 +1305,7 @@
+@@ -1304,7 +1305,7 @@ PHP_ADD_SOURCES(main, main.c snprintf.c
php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \
strlcat.c mergesort.c reentrancy.c php_variables.c php_ticks.c \
network.c php_open_temporary_file.c php_logos.c \
@@ -1402,7 +1437,7 @@
PHP_ADD_SOURCES(main/streams, streams.c cast.c memory.c filter.c \
plain_wrapper.c userspace.c transports.c xp_socket.c mmap.c)
-@@ -1330,7 +1331,7 @@
+@@ -1330,7 +1331,7 @@ PHP_ADD_SOURCES(Zend, \
zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \
zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c \
zend_ini.c zend_qsort.c zend_multibyte.c zend_ts_hash.c zend_stream.c \
@@ -1411,11 +1446,11 @@
if test -r "$abs_srcdir/Zend/zend_objects.c"; then
PHP_ADD_SOURCES(Zend, zend_objects.c zend_object_handlers.c zend_objects_API.c \
-Index: php5-5.2.5/ext/standard/basic_functions.c
+Index: php5-5.2.6/ext/standard/basic_functions.c
===================================================================
---- php5-5.2.5.orig/ext/standard/basic_functions.c
-+++ php5-5.2.5/ext/standard/basic_functions.c
-@@ -3575,7 +3575,9 @@
+--- php5-5.2.6.orig/ext/standard/basic_functions.c
++++ php5-5.2.6/ext/standard/basic_functions.c
+@@ -3575,7 +3575,9 @@ zend_function_entry basic_functions[] =
PHP_FALIAS(socket_get_status, stream_get_meta_data, arginfo_stream_get_meta_data)
#if (!defined(__BEOS__) && !defined(NETWARE) && HAVE_REALPATH) || defined(ZTS)
@@ -1426,11 +1461,11 @@
#endif
#ifdef HAVE_FNMATCH
-Index: php5-5.2.5/ext/standard/dl.c
+Index: php5-5.2.6/ext/standard/dl.c
===================================================================
---- php5-5.2.5.orig/ext/standard/dl.c
-+++ php5-5.2.5/ext/standard/dl.c
-@@ -241,6 +241,19 @@
+--- php5-5.2.6.orig/ext/standard/dl.c
++++ php5-5.2.6/ext/standard/dl.c
+@@ -241,6 +241,19 @@ void php_dl(zval *file, int type, zval *
RETURN_FALSE;
}
}
@@ -1450,11 +1485,11 @@
RETURN_TRUE;
}
/* }}} */
-Index: php5-5.2.5/ext/standard/file.c
+Index: php5-5.2.6/ext/standard/file.c
===================================================================
---- php5-5.2.5.orig/ext/standard/file.c
-+++ php5-5.2.5/ext/standard/file.c
-@@ -2361,7 +2361,7 @@
+--- php5-5.2.6.orig/ext/standard/file.c
++++ php5-5.2.6/ext/standard/file.c
+@@ -2372,7 +2372,7 @@ out:
#if (!defined(__BEOS__) && !defined(NETWARE) && HAVE_REALPATH) || defined(ZTS)
/* {{{ proto string realpath(string path)
Return the resolved path */
@@ -1463,11 +1498,11 @@
{
zval **path;
char resolved_path_buff[MAXPATHLEN];
-Index: php5-5.2.5/ext/standard/file.h
+Index: php5-5.2.6/ext/standard/file.h
===================================================================
---- php5-5.2.5.orig/ext/standard/file.h
-+++ php5-5.2.5/ext/standard/file.h
-@@ -61,7 +61,7 @@
+--- php5-5.2.6.orig/ext/standard/file.h
++++ php5-5.2.6/ext/standard/file.h
+@@ -61,7 +61,7 @@ PHP_FUNCTION(flock);
PHP_FUNCTION(fd_set);
PHP_FUNCTION(fd_isset);
#if (!defined(__BEOS__) && !defined(NETWARE) && HAVE_REALPATH) || defined(ZTS)
@@ -1476,11 +1511,11 @@
#endif
#ifdef HAVE_FNMATCH
PHP_FUNCTION(fnmatch);
-Index: php5-5.2.5/ext/standard/info.c
+Index: php5-5.2.6/ext/standard/info.c
===================================================================
---- php5-5.2.5.orig/ext/standard/info.c
-+++ php5-5.2.5/ext/standard/info.c
-@@ -627,6 +627,31 @@
+--- php5-5.2.6.orig/ext/standard/info.c
++++ php5-5.2.6/ext/standard/info.c
+@@ -652,6 +652,31 @@ PHPAPI void php_print_info(int flag TSRM
php_info_print_table_end();
@@ -1512,11 +1547,11 @@
/* Zend Engine */
php_info_print_box_start(0);
if (expose_php && !sapi_module.phpinfo_as_text) {
-Index: php5-5.2.5/ext/standard/syslog.c
+Index: php5-5.2.6/ext/standard/syslog.c
===================================================================
---- php5-5.2.5.orig/ext/standard/syslog.c
-+++ php5-5.2.5/ext/standard/syslog.c
-@@ -42,6 +42,7 @@
+--- php5-5.2.6.orig/ext/standard/syslog.c
++++ php5-5.2.6/ext/standard/syslog.c
+@@ -42,6 +42,7 @@ static void start_syslog(TSRMLS_D);
*/
PHP_MINIT_FUNCTION(syslog)
{
@@ -1524,7 +1559,7 @@
/* error levels */
REGISTER_LONG_CONSTANT("LOG_EMERG", LOG_EMERG, CONST_CS | CONST_PERSISTENT); /* system unusable */
REGISTER_LONG_CONSTANT("LOG_ALERT", LOG_ALERT, CONST_CS | CONST_PERSISTENT); /* immediate action required */
-@@ -97,6 +98,7 @@
+@@ -97,6 +98,7 @@ PHP_MINIT_FUNCTION(syslog)
/* AIX doesn't have LOG_PERROR */
REGISTER_LONG_CONSTANT("LOG_PERROR", LOG_PERROR, CONST_CS | CONST_PERSISTENT); /*log to stderr*/
#endif
@@ -1532,11 +1567,11 @@
BG(syslog_device)=NULL;
return SUCCESS;
-Index: php5-5.2.5/main/fopen_wrappers.c
+Index: php5-5.2.6/main/fopen_wrappers.c
===================================================================
---- php5-5.2.5.orig/main/fopen_wrappers.c
-+++ php5-5.2.5/main/fopen_wrappers.c
-@@ -110,7 +110,7 @@
+--- php5-5.2.6.orig/main/fopen_wrappers.c
++++ php5-5.2.6/main/fopen_wrappers.c
+@@ -110,7 +110,7 @@ PHPAPI int php_check_specific_open_based
/* normalize and expand path */
if (expand_filepath(path, resolved_name TSRMLS_CC) == NULL) {
@@ -1545,7 +1580,7 @@
}
path_len = strlen(resolved_name);
-@@ -179,6 +179,12 @@
+@@ -182,6 +182,12 @@ PHPAPI int php_check_specific_open_based
}
}
@@ -1558,7 +1593,7 @@
/* Check the path */
#if defined(PHP_WIN32) || defined(NETWARE)
if (strncasecmp(resolved_basedir, resolved_name, resolved_basedir_len) == 0) {
-@@ -202,7 +208,7 @@
+@@ -205,7 +211,7 @@ PHPAPI int php_check_specific_open_based
}
} else {
/* Unable to resolve the real path, return -1 */
@@ -1567,7 +1602,7 @@
}
}
/* }}} */
-@@ -221,22 +227,44 @@
+@@ -224,22 +230,44 @@ PHPAPI int php_check_open_basedir_ex(con
char *pathbuf;
char *ptr;
char *end;
@@ -1613,11 +1648,11 @@
ptr = end;
}
-Index: php5-5.2.5/main/main.c
+Index: php5-5.2.6/main/main.c
===================================================================
---- php5-5.2.5.orig/main/main.c
-+++ php5-5.2.5/main/main.c
-@@ -88,6 +88,9 @@
+--- php5-5.2.6.orig/main/main.c
++++ php5-5.2.6/main/main.c
+@@ -89,6 +89,9 @@
#include "SAPI.h"
#include "rfc1867.h"
@@ -1627,7 +1662,7 @@
/* }}} */
#ifndef ZTS
-@@ -1369,7 +1372,7 @@
+@@ -1370,7 +1373,7 @@ void php_request_shutdown_for_exec(void
/* used to close fd's in the 3..255 range here, but it's problematic
*/
@@ -1636,7 +1671,7 @@
}
/* }}} */
-@@ -1410,6 +1413,9 @@
+@@ -1411,6 +1414,9 @@ void php_request_shutdown_for_hook(void
zend_try {
shutdown_memory_manager(CG(unclean_shutdown), 0 TSRMLS_CC);
@@ -1646,7 +1681,7 @@
} zend_end_try();
zend_try {
-@@ -1502,6 +1508,9 @@
+@@ -1503,6 +1509,9 @@ void php_request_shutdown(void *dummy)
/* 11. Free Willy (here be crashes) */
zend_try {
shutdown_memory_manager(CG(unclean_shutdown) || !report_memleaks, 0 TSRMLS_CC);
@@ -1656,7 +1691,7 @@
} zend_end_try();
/* 12. Reset max_execution_time */
-@@ -1661,6 +1670,9 @@
+@@ -1662,6 +1671,9 @@ int php_module_startup(sapi_module_struc
#ifdef ZTS
tsrm_ls = ts_resource(0);
#endif
@@ -1666,7 +1701,7 @@
module_shutdown = 0;
module_startup = 1;
-@@ -1790,6 +1802,10 @@
+@@ -1791,6 +1803,10 @@ int php_module_startup(sapi_module_struc
REGISTER_MAIN_STRINGL_CONSTANT("PHP_CONFIG_FILE_PATH", PHP_CONFIG_FILE_PATH, strlen(PHP_CONFIG_FILE_PATH), CONST_PERSISTENT | CONST_CS);
REGISTER_MAIN_STRINGL_CONSTANT("PHP_CONFIG_FILE_SCAN_DIR", PHP_CONFIG_FILE_SCAN_DIR, sizeof(PHP_CONFIG_FILE_SCAN_DIR)-1, CONST_PERSISTENT | CONST_CS);
REGISTER_MAIN_STRINGL_CONSTANT("PHP_SHLIB_SUFFIX", PHP_SHLIB_SUFFIX, sizeof(PHP_SHLIB_SUFFIX)-1, CONST_PERSISTENT | CONST_CS);
@@ -1677,7 +1712,7 @@
REGISTER_MAIN_STRINGL_CONSTANT("PHP_EOL", PHP_EOL, sizeof(PHP_EOL)-1, CONST_PERSISTENT | CONST_CS);
REGISTER_MAIN_LONG_CONSTANT("PHP_INT_MAX", LONG_MAX, CONST_PERSISTENT | CONST_CS);
REGISTER_MAIN_LONG_CONSTANT("PHP_INT_SIZE", sizeof(long), CONST_PERSISTENT | CONST_CS);
-@@ -1839,7 +1855,9 @@
+@@ -1840,7 +1856,9 @@ int php_module_startup(sapi_module_struc
module_startup = 0;
shutdown_memory_manager(1, 0 TSRMLS_CC);
@@ -1688,7 +1723,7 @@
/* we're done */
return SUCCESS;
}
-@@ -1898,6 +1916,9 @@
+@@ -1899,6 +1917,9 @@ void php_module_shutdown(TSRMLS_D)
#ifndef ZTS
zend_ini_shutdown(TSRMLS_C);
shutdown_memory_manager(CG(unclean_shutdown), 1 TSRMLS_CC);
@@ -1698,10 +1733,10 @@
core_globals_dtor(&core_globals TSRMLS_CC);
#else
zend_ini_global_shutdown(TSRMLS_C);
-Index: php5-5.2.5/main/php.h
+Index: php5-5.2.6/main/php.h
===================================================================
---- php5-5.2.5.orig/main/php.h
-+++ php5-5.2.5/main/php.h
+--- php5-5.2.6.orig/main/php.h
++++ php5-5.2.6/main/php.h
@@ -40,6 +40,13 @@
#undef sprintf
#define sprintf php_sprintf
@@ -1716,7 +1751,7 @@
/* PHP's DEBUG value must match Zend's ZEND_DEBUG value */
#undef PHP_DEBUG
#define PHP_DEBUG ZEND_DEBUG
-@@ -448,6 +455,10 @@
+@@ -448,6 +455,10 @@ END_EXTERN_C()
#endif
#endif /* !XtOffsetOf */
@@ -1727,11 +1762,11 @@
#endif
/*
-Index: php5-5.2.5/main/php_logos.c
+Index: php5-5.2.6/main/php_logos.c
===================================================================
---- php5-5.2.5.orig/main/php_logos.c
-+++ php5-5.2.5/main/php_logos.c
-@@ -50,6 +50,10 @@
+--- php5-5.2.6.orig/main/php_logos.c
++++ php5-5.2.6/main/php_logos.c
+@@ -50,6 +50,10 @@ PHPAPI int php_unregister_info_logo(char
return zend_hash_del(&phpinfo_logo_hash, logo_string, strlen(logo_string));
}
@@ -1742,7 +1777,7 @@
int php_init_info_logos(void)
{
if(zend_hash_init(&phpinfo_logo_hash, 0, NULL, NULL, 1)==FAILURE)
-@@ -58,6 +62,9 @@
+@@ -58,6 +62,9 @@ int php_init_info_logos(void)
php_register_info_logo(PHP_LOGO_GUID , "image/gif", php_logo , sizeof(php_logo));
php_register_info_logo(PHP_EGG_LOGO_GUID, "image/gif", php_egg_logo, sizeof(php_egg_logo));
php_register_info_logo(ZEND_LOGO_GUID , "image/gif", zend_logo , sizeof(zend_logo));
@@ -1752,11 +1787,11 @@
return SUCCESS;
}
-Index: php5-5.2.5/main/snprintf.c
+Index: php5-5.2.6/main/snprintf.c
===================================================================
---- php5-5.2.5.orig/main/snprintf.c
-+++ php5-5.2.5/main/snprintf.c
-@@ -1080,7 +1080,11 @@
+--- php5-5.2.6.orig/main/snprintf.c
++++ php5-5.2.6/main/snprintf.c
+@@ -1080,7 +1080,11 @@ static int format_converter(register buf
case 'n':
@@ -1768,11 +1803,11 @@
goto skip_output;
/*
-Index: php5-5.2.5/main/spprintf.c
+Index: php5-5.2.6/main/spprintf.c
===================================================================
---- php5-5.2.5.orig/main/spprintf.c
-+++ php5-5.2.5/main/spprintf.c
-@@ -673,7 +673,11 @@
+--- php5-5.2.6.orig/main/spprintf.c
++++ php5-5.2.6/main/spprintf.c
+@@ -673,7 +673,11 @@ static void xbuf_format_converter(smart_
case 'n':
@@ -1784,10 +1819,10 @@
goto skip_output;
/*
-Index: php5-5.2.5/main/suhosin_globals.h
+Index: php5-5.2.6/main/suhosin_globals.h
===================================================================
--- /dev/null
-+++ php5-5.2.5/main/suhosin_globals.h
++++ php5-5.2.6/main/suhosin_globals.h
@@ -0,0 +1,61 @@
+/*
+ +----------------------------------------------------------------------+
@@ -1850,10 +1885,10 @@
+ * c-basic-offset: 4
+ * End:
+ */
-Index: php5-5.2.5/main/suhosin_logo.h
+Index: php5-5.2.6/main/suhosin_logo.h
===================================================================
--- /dev/null
-+++ php5-5.2.5/main/suhosin_logo.h
++++ php5-5.2.6/main/suhosin_logo.h
@@ -0,0 +1,178 @@
+static unsigned char suhosin_logo[] =
+ "\xff\xd8\xff\xe0\x00\x10\x4a\x46\x49\x46\x00\x01\x01\x01\x00\x48"
@@ -2033,10 +2068,10 @@
+ "\x21\xb6\x99\x69\xbc\x25\xb6\xdb\x6d\x18\xc2\x10\xda\x12\x94\xa1"
+ "\x38\xc2\x53\x8c\x63\x18\xc7\x9d\xbe\x7f\xff\xd9"
+ ;
-Index: php5-5.2.5/main/suhosin_patch.c
+Index: php5-5.2.6/main/suhosin_patch.c
===================================================================
--- /dev/null
-+++ php5-5.2.5/main/suhosin_patch.c
++++ php5-5.2.6/main/suhosin_patch.c
@@ -0,0 +1,380 @@
+/*
+ +----------------------------------------------------------------------+
@@ -2418,10 +2453,10 @@
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */
-Index: php5-5.2.5/main/suhosin_patch.h
+Index: php5-5.2.6/main/suhosin_patch.h
===================================================================
--- /dev/null
-+++ php5-5.2.5/main/suhosin_patch.h
++++ php5-5.2.6/main/suhosin_patch.h
@@ -0,0 +1,40 @@
+/*
+ +----------------------------------------------------------------------+
@@ -2463,10 +2498,10 @@
+ * c-basic-offset: 4
+ * End:
+ */
-Index: php5-5.2.5/main/suhosin_patch.m4
+Index: php5-5.2.6/main/suhosin_patch.m4
===================================================================
--- /dev/null
-+++ php5-5.2.5/main/suhosin_patch.m4
++++ php5-5.2.6/main/suhosin_patch.m4
@@ -0,0 +1,8 @@
+dnl
+dnl $Id: suhosin_patch.m4,v 1.1 2004/11/14 13:24:24 ionic Exp $
@@ -2476,11 +2511,11 @@
+
+AC_DEFINE(SUHOSIN_PATCH, 1, [Suhosin Patch])
+
-Index: php5-5.2.5/sapi/apache/mod_php5.c
+Index: php5-5.2.6/sapi/apache/mod_php5.c
===================================================================
---- php5-5.2.5.orig/sapi/apache/mod_php5.c
-+++ php5-5.2.5/sapi/apache/mod_php5.c
-@@ -951,7 +951,11 @@
+--- php5-5.2.6.orig/sapi/apache/mod_php5.c
++++ php5-5.2.6/sapi/apache/mod_php5.c
+@@ -951,7 +951,11 @@ static void php_init_handler(server_rec
{
TSRMLS_FETCH();
if (PG(expose_php)) {
@@ -2492,11 +2527,11 @@
}
}
#endif
-Index: php5-5.2.5/sapi/apache2filter/sapi_apache2.c
+Index: php5-5.2.6/sapi/apache2filter/sapi_apache2.c
===================================================================
---- php5-5.2.5.orig/sapi/apache2filter/sapi_apache2.c
-+++ php5-5.2.5/sapi/apache2filter/sapi_apache2.c
-@@ -562,7 +562,11 @@
+--- php5-5.2.6.orig/sapi/apache2filter/sapi_apache2.c
++++ php5-5.2.6/sapi/apache2filter/sapi_apache2.c
+@@ -562,7 +562,11 @@ static void php_apache_add_version(apr_p
{
TSRMLS_FETCH();
if (PG(expose_php)) {
@@ -2508,11 +2543,11 @@
}
}
-Index: php5-5.2.5/sapi/apache2handler/sapi_apache2.c
+Index: php5-5.2.6/sapi/apache2handler/sapi_apache2.c
===================================================================
---- php5-5.2.5.orig/sapi/apache2handler/sapi_apache2.c
-+++ php5-5.2.5/sapi/apache2handler/sapi_apache2.c
-@@ -372,7 +372,11 @@
+--- php5-5.2.6.orig/sapi/apache2handler/sapi_apache2.c
++++ php5-5.2.6/sapi/apache2handler/sapi_apache2.c
+@@ -370,7 +370,11 @@ static void php_apache_add_version(apr_p
{
TSRMLS_FETCH();
if (PG(expose_php)) {
@@ -2524,48 +2559,70 @@
}
}
-Index: php5-5.2.5/sapi/cgi/cgi_main.c
+Index: php5-5.2.6/sapi/cgi/cgi_main.c
===================================================================
---- php5-5.2.5.orig/sapi/cgi/cgi_main.c
-+++ php5-5.2.5/sapi/cgi/cgi_main.c
-@@ -1720,11 +1720,19 @@
+--- php5-5.2.6.orig/sapi/cgi/cgi_main.c
++++ php5-5.2.6/sapi/cgi/cgi_main.c
+@@ -1726,11 +1726,19 @@ consult the installation file that came
SG(headers_sent) = 1;
SG(request_info).no_headers = 1;
}
+#if SUHOSIN_PATCH
+#if ZEND_DEBUG
-+ php_printf("PHP %s with Suhosin-Patch %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2007 The PHP Group\n%s", PHP_VERSION, SUHOSIN_PATCH_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
++ php_printf("PHP %s with Suhosin-Patch %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2008 The PHP Group\n%s", PHP_VERSION, SUHOSIN_PATCH_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
+#else
-+ php_printf("PHP %s with Suhosin-Patch %s (%s) (built: %s %s)\nCopyright (c) 1997-2007 The PHP Group\n%s", PHP_VERSION, SUHOSIN_PATCH_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
++ php_printf("PHP %s with Suhosin-Patch %s (%s) (built: %s %s)\nCopyright (c) 1997-2008 The PHP Group\n%s", PHP_VERSION, SUHOSIN_PATCH_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
+#endif
+#else
#if ZEND_DEBUG
- php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2007 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
+ php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2008 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
#else
- php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2007 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
+ php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2008 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
#endif
+#endif
php_request_shutdown((void *) 0);
exit_status = 0;
goto out;
-Index: php5-5.2.5/sapi/cli/php_cli.c
+Index: php5-5.2.6/sapi/cli/php_cli.c
===================================================================
---- php5-5.2.5.orig/sapi/cli/php_cli.c
-+++ php5-5.2.5/sapi/cli/php_cli.c
-@@ -779,8 +779,14 @@
+--- php5-5.2.6.orig/sapi/cli/php_cli.c
++++ php5-5.2.6/sapi/cli/php_cli.c
+@@ -779,8 +779,14 @@ int main(int argc, char *argv[])
}
request_started = 1;
-- php_printf("PHP %s (%s) (built: %s %s) %s\nCopyright (c) 1997-2007 The PHP Group\n%s",
+- php_printf("PHP %s (%s) (built: %s %s) %s\nCopyright (c) 1997-2008 The PHP Group\n%s",
- PHP_VERSION, sapi_module.name, __DATE__, __TIME__,
+#if SUHOSIN_PATCH
-+ php_printf("PHP %s with Suhosin-Patch %s (%s) (built: %s %s) %s\nCopyright (c) 1997-2007 The PHP Group\n%s",
++ php_printf("PHP %s with Suhosin-Patch %s (%s) (built: %s %s) %s\nCopyright (c) 1997-2008 The PHP Group\n%s",
+ PHP_VERSION, SUHOSIN_PATCH_VERSION,
+#else
-+ php_printf("PHP %s (%s) (built: %s %s) %s\nCopyright (c) 1997-2007 The PHP Group\n%s",
++ php_printf("PHP %s (%s) (built: %s %s) %s\nCopyright (c) 1997-2008 The PHP Group\n%s",
+ PHP_VERSION,
+#endif
+ sapi_module.name, __DATE__, __TIME__,
#if ZEND_DEBUG && defined(HAVE_GCOV)
"(DEBUG GCOV)",
#elif ZEND_DEBUG
+Index: php5-5.2.6/win32/build/config.w32
+===================================================================
+--- php5-5.2.6.orig/win32/build/config.w32
++++ php5-5.2.6/win32/build/config.w32
+@@ -299,7 +299,7 @@ ADD_SOURCES("Zend", "zend_language_parse
+ zend_sprintf.c zend_ini.c zend_qsort.c zend_multibyte.c zend_ts_hash.c \
+ zend_stream.c zend_iterators.c zend_interfaces.c zend_objects.c \
+ zend_object_handlers.c zend_objects_API.c \
+- zend_default_classes.c zend_execute.c zend_strtod.c");
++ zend_default_classes.c zend_execute.c zend_strtod.c zend_canary.c");
+
+ ADD_SOURCES("main", "main.c snprintf.c spprintf.c safe_mode.c fopen_wrappers.c \
+ php_scandir.c php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \
+@@ -344,6 +344,8 @@ if (PHP_ZEND_MULTIBYTE == "yes") {
+ AC_DEFINE('HAVE_USLEEP', 1);
+ AC_DEFINE('HAVE_STRCOLL', 1);
+
++AC_DEFINE('SUHOSIN_PATCH', 1);
++
+ /* For snapshot builders, where can we find the additional
+ * files that make up the snapshot template? */
+ ARG_WITH("snapshot-template", "Path to snapshot builder template dir", "no");
Copied: php5/branches/lenny/debian/patches/use_embedded_timezonedb.patch (from rev 1178, php5/trunk/debian/patches/use_embedded_timezonedb.patch)
===================================================================
--- php5/branches/lenny/debian/patches/use_embedded_timezonedb.patch (rev 0)
+++ php5/branches/lenny/debian/patches/use_embedded_timezonedb.patch 2008-12-06 16:20:16 UTC (rev 1179)
@@ -0,0 +1,307 @@
+
+Add support for use of the system timezone database, rather
+than embedding a copy. Discussed upstream but was not desired.
+
+History:
+r4: added "System/Localtime" tzname which uses /etc/localtime
+r3: fix a crash if /usr/share/zoneinfo doesn't exist (Raphael Geissert)
+r2: add filesystem trawl to set up name alias index
+r1: initial revision
+
+--- php-5.2.6/ext/date/lib/parse_tz.c.systzdata
++++ php-5.2.6/ext/date/lib/parse_tz.c
+@@ -20,6 +20,16 @@
+
+ #include "timelib.h"
+
++#ifdef HAVE_SYSTEM_TZDATA
++#include <sys/mman.h>
++#include <sys/stat.h>
++#include <limits.h>
++#include <fcntl.h>
++#include <unistd.h>
++
++#include "php_scandir.h"
++#endif
++
+ #include <stdio.h>
+
+ #ifdef HAVE_LOCALE_H
+@@ -31,7 +41,10 @@
+ #else
+ #include <strings.h>
+ #endif
++
++#ifndef HAVE_SYSTEM_TZDATA
+ #include "timezonedb.h"
++#endif
+
+ #if (defined(__APPLE__) || defined(__APPLE_CC__)) && (defined(__BIG_ENDIAN__) || defined(__LITTLE_ENDIAN__))
+ # if defined(__LITTLE_ENDIAN__)
+@@ -206,6 +219,211 @@ void timelib_dump_tzinfo(timelib_tzinfo
+ }
+ }
+
++#ifdef HAVE_SYSTEM_TZDATA
++
++#ifdef HAVE_SYSTEM_TZDATA_PREFIX
++#define ZONEINFO_PREFIX HAVE_SYSTEM_TZDATA_PREFIX
++#else
++#define ZONEINFO_PREFIX "/usr/share/zoneinfo"
++#endif
++
++#define SYSTEM_TZFILE "/etc/localtime"
++
++static const timelib_tzdb *timezonedb_system = NULL;
++
++/* Filter out some non-tzdata files and the posix/right databases, if
++ * present. */
++static int index_filter(const struct dirent *ent)
++{
++ return strcmp(ent->d_name, ".") != 0
++ && strcmp(ent->d_name, "..") != 0
++ && strcmp(ent->d_name, "posix") != 0
++ && strcmp(ent->d_name, "posixrules") != 0
++ && strcmp(ent->d_name, "right") != 0
++ && strstr(ent->d_name, ".tab") == NULL;
++}
++
++/* Create the zone identifier index by trawling the filesystem. */
++static void create_zone_index(timelib_tzdb *db)
++{
++ size_t dirstack_size, dirstack_top;
++ size_t index_size, index_next;
++ timelib_tzdb_index_entry *db_index;
++ char **dirstack;
++
++ /* LIFO stack to hold directory entries to scan; each slot is a
++ * directory name relative to the zoneinfo prefix. */
++ dirstack_size = 32;
++ dirstack = malloc(dirstack_size * sizeof *dirstack);
++ dirstack_top = 1;
++ dirstack[0] = strdup("");
++
++ /* Index array. */
++ index_size = 64;
++ db_index = malloc(index_size * sizeof *db_index);
++ index_next = 0;
++
++ do {
++ struct dirent **ents;
++ char name[PATH_MAX], *top;
++ int count;
++
++ /* Pop the top stack entry, and iterate through its contents. */
++ top = dirstack[--dirstack_top];
++ snprintf(name, sizeof name, ZONEINFO_PREFIX "/%s", top);
++
++ count = php_scandir(name, &ents, index_filter, php_alphasort);
++
++ while (count > 0) {
++ struct stat st;
++ const char *leaf = ents[count - 1]->d_name;
++
++ snprintf(name, sizeof name, ZONEINFO_PREFIX "/%s/%s",
++ top, leaf);
++
++ if (strlen(name) && stat(name, &st) == 0) {
++ /* Name, relative to the zoneinfo prefix. */
++ const char *root = top;
++
++ if (root[0] == '/') root++;
++
++ snprintf(name, sizeof name, "%s%s%s", root,
++ *root ? "/": "", leaf);
++
++ if (S_ISDIR(st.st_mode)) {
++ if (dirstack_top == dirstack_size) {
++ dirstack_size *= 2;
++ dirstack = realloc(dirstack,
++ dirstack_size * sizeof *dirstack);
++ }
++ dirstack[dirstack_top++] = strdup(name);
++ }
++ else {
++ if (index_next == index_size) {
++ index_size *= 2;
++ db_index = realloc(db_index,
++ index_size * sizeof *db_index);
++ }
++
++ db_index[index_next].id = strdup(name);
++ db_index[index_next++].pos = 0;
++ }
++ }
++
++ free(ents[--count]);
++ }
++
++ if (count != -1) free(ents);
++ free(top);
++ } while (dirstack_top);
++
++ db->index = db_index;
++ db->index_size = index_next;
++
++ free(dirstack);
++}
++
++/* Return the mmap()ed tzfile if found, else NULL. On success, the
++ * length of the mapped data is placed in *length. */
++static char *map_tzfile(const char *timezone, size_t *length)
++{
++ char fname[PATH_MAX];
++ const char *fn;
++ struct stat st;
++ char *p;
++ int fd;
++
++ if (strcmp(timezone, TIMELIB_SYSTEM_TZID) == 0) {
++ fn = SYSTEM_TZFILE;
++ }
++ else {
++ if (strstr(timezone, "..") != NULL) {
++ return NULL;
++ }
++
++ snprintf(fname, sizeof fname, ZONEINFO_PREFIX "/%s", timezone);
++ fn = fname;
++ }
++
++ fd = open(fn, O_RDONLY);
++ if (fd == -1) {
++ return NULL;
++ } else if (fstat(fd, &st) != 0 || st.st_size < 21) {
++ close(fd);
++ return NULL;
++ }
++
++ *length = st.st_size;
++ p = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0);
++ close(fd);
++
++ return p != MAP_FAILED ? p : NULL;
++}
++
++const timelib_tzdb *timelib_builtin_db(void)
++{
++ if (timezonedb_system == NULL) {
++ timelib_tzdb *tmp = malloc(sizeof *tmp);
++
++ tmp->version = "0.system";
++ tmp->data = NULL;
++ create_zone_index(tmp);
++ timezonedb_system = tmp;
++ }
++
++ return timezonedb_system;
++}
++
++const timelib_tzdb_index_entry *timelib_timezone_builtin_identifiers_list(int *count)
++{
++ *count = timezonedb_system->index_size;
++ return timezonedb_system->index;
++}
++
++int timelib_timezone_id_is_valid(char *timezone, const timelib_tzdb *tzdb)
++{
++ char fname[PATH_MAX];
++ const char *fn;
++
++ if (strcmp(timezone, TIMELIB_SYSTEM_TZID) == 0) {
++ fn = SYSTEM_TZFILE;
++ }
++ else {
++ if (strstr(timezone, "..") != NULL) {
++ return 0;
++ }
++
++ snprintf(fname, sizeof fname, ZONEINFO_PREFIX "/%s", timezone);
++ fn = fname;
++ }
++
++ return access(fn, R_OK) == 0 ? 1 : 0;
++}
++
++timelib_tzinfo *timelib_parse_tzfile(char *timezone, const timelib_tzdb *tzdb)
++{
++ char *tzf, *orig;
++ timelib_tzinfo *tmp;
++ size_t len;
++
++ orig = map_tzfile(timezone, &len);
++ if (orig == NULL) {
++ return NULL;
++ }
++
++ tmp = timelib_tzinfo_ctor(timezone);
++
++ tzf = orig + 20;
++ read_header(&tzf, tmp);
++ read_transistions(&tzf, tmp);
++ read_types(&tzf, tmp);
++
++ munmap(orig, len);
++
++ return tmp;
++}
++#else /* !HAVE_SYSTEM_TZDATA */
++
+ static int seek_to_tz_position(const unsigned char **tzf, char *timezone, const timelib_tzdb *tzdb)
+ {
+ int left = 0, right = tzdb->index_size - 1;
+@@ -279,6 +497,7 @@ timelib_tzinfo *timelib_parse_tzfile(cha
+
+ return tmp;
+ }
++#endif
+
+ static ttinfo* fetch_timezone_offset(timelib_tzinfo *tz, timelib_sll ts, timelib_sll *transition_time)
+ {
+--- php-5.2.6/ext/date/lib/timelib.h.systzdata
++++ php-5.2.6/ext/date/lib/timelib.h
+@@ -31,6 +31,10 @@
+
+ #define TIMELIB_SPECIAL_WEEKDAY 0x01
+
++#ifdef HAVE_SYSTEM_TZDATA
++#define TIMELIB_SYSTEM_TZID "System/Localtime"
++#endif
++
+ #ifndef LONG_MAX
+ #define LONG_MAX 2147483647L
+ #endif
+--- php-5.2.6/ext/date/lib/timelib.m4.systzdata
++++ php-5.2.6/ext/date/lib/timelib.m4
+@@ -78,3 +78,17 @@ stdlib.h
+
+ dnl Check for strtoll, atoll
+ AC_CHECK_FUNCS(strtoll atoll strftime)
++
++PHP_ARG_WITH(system-tzdata, for use of system timezone data,
++[ --with-system-tzdata[=DIR] to specify use of system timezone data],
++no, no)
++
++if test "$PHP_SYSTEM_TZDATA" != "no"; then
++ AC_DEFINE(HAVE_SYSTEM_TZDATA, 1, [Define if system timezone data is used])
++
++ if test "$PHP_SYSTEM_TZDATA" != "yes"; then
++ AC_DEFINE_UNQUOTED(HAVE_SYSTEM_TZDATA_PREFIX, "$PHP_SYSTEM_TZDATA",
++ [Define for location of system timezone data])
++ fi
++fi
++
+--- php-5.2.6/ext/date/php_date.c.systzdata
++++ php-5.2.6/ext/date/php_date.c
+@@ -584,6 +584,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);
+ }
++#ifdef TIMELIB_SYSTEM_TZID
++ if (timelib_timezone_id_is_valid(TIMELIB_SYSTEM_TZID, tzdb)) {
++ return TIMELIB_SYSTEM_TZID;
++ }
++#endif
+ #if HAVE_TM_ZONE
+ /* Try to guess timezone from system information */
+ {
Copied: php5/branches/lenny/debian/php-pear.dirs (from rev 1178, php5/trunk/debian/php-pear.dirs)
===================================================================
--- php5/branches/lenny/debian/php-pear.dirs (rev 0)
+++ php5/branches/lenny/debian/php-pear.dirs 2008-12-06 16:20:16 UTC (rev 1179)
@@ -0,0 +1 @@
+/usr/share/doc/php-pear/PEAR
Modified: php5/branches/lenny/debian/php5-common.dirs
===================================================================
--- php5/branches/lenny/debian/php5-common.dirs 2008-12-06 14:01:05 UTC (rev 1178)
+++ php5/branches/lenny/debian/php5-common.dirs 2008-12-06 16:20:16 UTC (rev 1179)
@@ -1,7 +1,6 @@
/usr/lib/php5/libexec
/usr/share/lintian/overrides
/usr/share/doc/php5-common/examples
-/usr/share/doc/php5-common/PEAR
/usr/share/php5
/var/lib/php5
/usr/lib/php5
Modified: php5/branches/lenny/debian/php5.lintian-overrides
===================================================================
--- php5/branches/lenny/debian/php5.lintian-overrides 2008-12-06 14:01:05 UTC (rev 1178)
+++ php5/branches/lenny/debian/php5.lintian-overrides 2008-12-06 16:20:16 UTC (rev 1179)
@@ -1 +1,2 @@
php5-common: non-standard-dir-perm var/lib/php5/ 1733 != 0755
+php5-common: package-contains-empty-directory usr/lib/php5/libexec/
Modified: php5/branches/lenny/debian/rules
===================================================================
--- php5/branches/lenny/debian/rules 2008-12-06 14:01:05 UTC (rev 1178)
+++ php5/branches/lenny/debian/rules 2008-12-06 16:20:16 UTC (rev 1179)
@@ -18,12 +18,16 @@
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
PHP5_SOURCE_VERSION = $(shell dpkg-parsechangelog | grep ^Version | sed "s/Version: //")
PHP5_UPSTREAM_VERSION = $(shell echo $(PHP5_SOURCE_VERSION) | sed -e "s/-.*//" -e "s/.*://")
PHP5_DEBIAN_REVISION = $(shell echo $(PHP5_SOURCE_VERSION) | sed "s/.*-//")
+# specify some options to our patch system
+QUILT_DIFF_OPTS=-p
+QUILT_NO_DIFF_TIMESTAMPS=1
+export QUILT_DIFF_OPTS QUILT_NO_DIFF_TIMESTAMPS
PROG_SENDMAIL = /usr/sbin/sendmail
CFLAGS += -O2 -Wall -fsigned-char -fno-strict-aliasing
@@ -43,10 +47,6 @@
CFLAGS += -gstabs
endif
-ifneq (nostrip, $(findstring nostrip, $(DEB_BUILD_OPTIONS)))
- install_strip = -s
-endif
-
# Old magic.mime location:
ifeq ($(wildcard /usr/share/misc/file/magic.mime), /usr/share/misc/file/magic.mime)
MAGIC_MIME = /usr/share/misc/file/magic.mime
@@ -57,7 +57,7 @@
endif
# only enable interbase support for i386/amd64/powerpc/sparc
-ifneq (,$(filter $(DEB_BUILD_ARCH),amd64 i386 powerpc sparc))
+ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 powerpc sparc))
IBFLAGS=--with-interbase=shared,/usr \
--with-pdo-firebird=shared,/usr
endif
@@ -102,7 +102,8 @@
--enable-soap \
--enable-zip \
--with-mime-magic=$(MAGIC_MIME) \
- --with-exec-dir=/usr/lib/php5/libexec
+ --with-exec-dir=/usr/lib/php5/libexec \
+ --with-system-tzdata
BUILTIN_EXTENSION_CHECK=$$e=get_loaded_extensions(); natcasesort($$e); \
$$s="The following extensions are built in:"; \
@@ -137,7 +138,7 @@
endif
cat test-results.txt
-build: build-apache2-stamp build-cgi-stamp build-cli-stamp build-pear-stamp test-results.txt
+build: build-apache2-stamp build-apache2filter-stamp build-cgi-stamp build-cli-stamp build-pear-stamp test-results.txt
build-apache2-stamp: configure-apache2-stamp
dh_testdir
@@ -145,6 +146,12 @@
touch build-apache2-stamp
+build-apache2filter-stamp: configure-apache2filter-stamp
+ dh_testdir
+ cd apache2filter-build && $(MAKE)
+
+ touch build-apache2filter-stamp
+
build-cli-stamp: configure-cli-stamp
dh_testdir
cd cli-build && $(MAKE)
@@ -171,7 +178,8 @@
build-pear-stamp: build-cgi-stamp
dh_testdir
-mkdir pear-build
- cd cgi-build && make install-pear PHP_PEAR_PHP_BIN=/usr/bin/php PHP_PEAR_INSTALL_DIR=/usr/share/php PHP_PEAR_SYSCONF_DIR=/etc/pear PHP_PEAR_SIG_BIN=/usr/bin/gpg INSTALL_ROOT=$(CURDIR)/pear-build
+ -mkdir pear-build-download
+ cd cgi-build && PHP_PEAR_DOWNLOAD_DIR=$(CURDIR)/pear-build-download $(MAKE) install-pear PHP_PEAR_PHP_BIN=/usr/bin/php PHP_PEAR_INSTALL_DIR=/usr/share/php PHP_PEAR_SYSCONF_DIR=/etc/pear PHP_PEAR_SIG_BIN=/usr/bin/gpg INSTALL_ROOT=$(CURDIR)/pear-build
sed -i -e 's/-d output_buffering=1 -d open_basedir="" -d safe_mode=0/-d output_buffering=1 -d open_basedir="" -d safe_mode=0 -d memory_limit="-1"/' \
$(CURDIR)/pear-build/usr/bin/pear && \
sed -i -e 's/-d output_buffering=1 -d safe_mode=0/-d output_buffering=1 -d open_basedir="" -d safe_mode=0 -d memory_limit="-1"/' \
@@ -181,7 +189,7 @@
$(CURDIR)/pear-build/usr/bin/peardev
touch build-pear-stamp
-configure: configure-apache2-stamp configure-cli-stamp configure-cgi-stamp
+configure: configure-apache2-stamp configure-apache2filter-stamp configure-cli-stamp configure-cgi-stamp
configure-apache2-stamp: prepared-stamp
dh_testdir
@@ -237,6 +245,27 @@
Zend/
touch configure-apache2-stamp
+configure-apache2filter-stamp: prepared-stamp
+ dh_testdir
+ if [ -d apache2filter-build ]; then rm -rf apache2filter-build; fi
+ -mkdir apache2filter-build
+ cd apache2filter-build && \
+ CFLAGS="$(CFLAGS)" PROG_SENDMAIL="$(PROG_SENDMAIL)" ../configure \
+ --prefix=/usr --with-apxs2filter=/usr/bin/apxs2 \
+ --with-config-file-path=/etc/php5/apache2filter \
+ --with-config-file-scan-dir=/etc/php5/apache2filter/conf.d \
+ $(COMMON_CONFIG) \
+ --without-mm \
+ --disable-pdo \
+ --without-mysql --without-sybase-ct --without-mssql \
+ --without-sqlite
+ cd apache2filter-build && \
+ cp ../Zend/zend_ini_scanner.c ../Zend/zend_language_scanner.c \
+ ../Zend/zend_ini_parser.h ../Zend/zend_language_parser.h \
+ ../Zend/zend_ini_parser.c ../Zend/zend_language_parser.c \
+ Zend/
+ touch configure-apache2filter-stamp
+
configure-cgi-stamp: prepared-stamp
dh_testdir
if [ -d cgi-build ]; then rm -rf cgi-build; fi
@@ -286,14 +315,16 @@
rm -f configure-apache2-stamp build-apache2-stamp
+ rm -f configure-apache2filter-stamp build-apache2filter-stamp
rm -f configure-cgi-stamp build-cgi-stamp
rm -f configure-cli-stamp build-cli-stamp
rm -f build-pear-stamp
rm -f install-stamp
rm -rf apache2-build
+ rm -rf apache2filter-build
rm -rf cgi-build
rm -rf cli-build
- rm -rf pear-build
+ rm -rf pear-build pear-build-download
rm -f debian/copyright
rm -f test-results.txt
dh_clean
@@ -301,7 +332,7 @@
cat debian/modulelist | while read package extname dsoname; do \
rm -f debian/php5-$$package.postinst; \
done
- for sapi in libapache2-mod-php5 php5-cgi php5-cli; do \
+ for sapi in libapache2-mod-php5 libapache2-mod-php5filter php5-cgi php5-cli; do \
for cruft in postrm links; do \
rm -f debian/$${sapi}.$${cruft}; \
done; \
@@ -343,14 +374,14 @@
cp test-results.txt debian/php5-common/usr/share/doc/php5-common/
# install the apache modules' files
- cd apache2-build && make install-headers install-build install-modules install-programs INSTALL_ROOT=$(CURDIR)/debian/libapache2-mod-php5
+ cd apache2-build && $(MAKE) install-headers install-build install-modules install-programs INSTALL_ROOT=$(CURDIR)/debian/libapache2-mod-php5
# remove netware and win32 headers that we don't want
cd debian/libapache2-mod-php5/usr/include/php5/ && \
- rm -f TSRM/readdir.h \
- TSRM/tsrm_config.{nw,w32}.h \
- TSRM/tsrm_{nw,win32}.h \
- Zend/zend_config.{nw,w32}.h \
- main/config.{nw,w32}.h \
+ $(RM) TSRM/readdir.h \
+ TSRM/tsrm_config.nw.h TSRM/tsrm_config.w32.h\
+ TSRM/tsrm_nw.h TSRM/tsrm_win32.h\
+ Zend/zend_config.nw.h Zend/zend_config.w32.h\
+ main/config.nw.h main/config.w32.h\
main/win95nt.h
# install PEAR
@@ -374,10 +405,11 @@
$(RM) -r debian/php-pear/usr/share/php/doc; \
ln -s ../doc/php-pear/PEAR debian/php-pear/usr/share/php/doc; \
}
+
# install extensions
ext=`./debian/libapache2-mod-php5/usr/bin/php-config --extension-dir`;\
- for i in libapache2-mod-php5 php5-cgi php5-cli; do \
+ for i in libapache2-mod-php5 libapache2-mod-php5filter php5-cgi php5-cli; do \
mkdir -p debian/$$i/$${ext}; \
done; \
cat debian/modulelist debian/extramodulelist | while read package extname dsoname; do \
@@ -385,7 +417,7 @@
mkdir -p debian/php5-$$package$${ext}; \
chrpath debian/libapache2-mod-php5/$${ext}/$$dsoname.so; \
chrpath -d debian/libapache2-mod-php5/$${ext}/$$dsoname.so; \
- install ${install_strip} -m 644 -o root -g root \
+ install -m 644 -o root -g root \
debian/libapache2-mod-php5/$${ext}/$$dsoname.so \
debian/php5-$$package$${ext}/$$dsoname.so; \
rm debian/libapache2-mod-php5/$${ext}/$$dsoname.so; \
@@ -405,6 +437,9 @@
rm -rf debian/libapache2-mod-php5/usr/lib/php5/build/ \
debian/libapache2-mod-php5/usr/include/ \
debian/libapache2-mod-php5/usr/bin/
+ rm -rf debian/libapache2-mod-php5filter/usr/lib/php5/build/ \
+ debian/libapache2-mod-php5filter/usr/include/ \
+ debian/libapache2-mod-php5filter/usr/bin/
for i in Makefile.global acinclude.m4 mkdep.awk phpize.m4 scan_makefile_in.awk; do \
chmod 644 debian/php5-dev/usr/lib/php5/build/$$i; \
done
@@ -501,12 +536,13 @@
# likewise, for the different sapi implementations
for tmpl in postrm links; do \
- for sapi in apache2 cgi cli; do \
+ for sapi in apache2 apache2filter cgi cli; do \
sed -e "s/@sapi@/$$sapi/g" \
< debian/php5-sapi.$$tmpl \
> debian/php5-$${sapi}.$$tmpl; \
done; \
mv debian/php5-apache2.$$tmpl debian/libapache2-mod-php5.$$tmpl; \
+ mv debian/php5-apache2filter.$$tmpl debian/libapache2-mod-php5filter.$$tmpl; \
done
cat debian/copyright.header LICENSE Zend/LICENSE > debian/copyright
@@ -517,24 +553,21 @@
ln -s php5-common debian/php5-$$package/usr/share/doc/php5-$$package; \
done
- for package in php5-dev php5-cgi php5-cli libapache2-mod-php5; do \
+ for package in php5-dbg php5-dev php5-cgi php5-cli libapache2-mod-php5 libapache2-mod-php5filter; do \
rm -rf debian/$$package/usr/share/doc/$$package; \
ln -s php5-common debian/$$package/usr/share/doc/$$package; \
done
dh_installcron -pphp5-common --name=php5
dh_installchangelogs -pphp5-common NEWS
- dh_strip -s
+ dh_strip -s --dbg-package=php5-dbg
dh_link -s
dh_compress -s -Xphp.ini
dh_fixperms -s -X /var/lib/php5
- mkdir -p debian/php5-common/usr/share/linda/overrides
- echo "Tag: non-standard-dir-perm" >> debian/php5-common/usr/share/linda/overrides/php5-common
- echo "Data: /var/lib/php5.*" >> debian/php5-common/usr/share/linda/overrides/php5-common
dh_installdeb -s
dh_shlibdeps -s
phpapi=`./debian/php5-dev/usr/bin/php-config5 --phpapi`; \
- for i in libapache2-mod-php5 php5-cgi php5-cli; do \
+ for i in libapache2-mod-php5 libapache2-mod-php5filter php5-cgi php5-cli; do \
echo "php:Provides=phpapi-$${phpapi}" >> debian/$$i.substvars; \
done; \
cat debian/modulelist | while read package extname dsoname; do \
@@ -548,9 +581,12 @@
for i in apache2; do \
"$$i"-build/sapi/cli/php -n -r '$(BUILTIN_EXTENSION_CHECK)' \
>> debian/lib"$$i"-mod-php5.substvars; \
+ "$$i"-build/sapi/cli/php -n -r '$(BUILTIN_EXTENSION_CHECK)' \
+ >> debian/lib"$$i"-mod-php5filter.substvars; \
done
echo "apache2:Depends=apache2-mpm-prefork (>> 2.0.52) | apache2-mpm-itk, apache2.2-common" >>debian/libapache2-mod-php5.substvars
+ echo "apache2:Depends=apache2-mpm-prefork (>> 2.0.52) | apache2-mpm-itk, apache2.2-common" >>debian/libapache2-mod-php5filter.substvars
dh_gencontrol -s
dh_md5sums -s
dh_builddeb -s
Copied: php5/branches/lenny/debian/suhosin_patch.watch (from rev 1178, php5/trunk/debian/suhosin_patch.watch)
===================================================================
--- php5/branches/lenny/debian/suhosin_patch.watch (rev 0)
+++ php5/branches/lenny/debian/suhosin_patch.watch 2008-12-06 16:20:16 UTC (rev 1179)
@@ -0,0 +1,7 @@
+# Check for new versions with:
+# uscan --watchfile debian/suhosin_patch.watch --package suhosin-patch
+# don't forget to update the version in this file when updating the patch!
+version=3
+
+http://www.hardened-php.net/suhosin/download.html \
+ http://download.suhosin.org/suhosin-patch-(.*)\.patch\.gz 5.2.6-0.9.6.2
Modified: php5/branches/lenny/debian/watch
===================================================================
--- php5/branches/lenny/debian/watch 2008-12-06 14:01:05 UTC (rev 1178)
+++ php5/branches/lenny/debian/watch 2008-12-06 16:20:16 UTC (rev 1179)
@@ -1,2 +1,4 @@
-version=2
+version=3
+opts=downloadurlmangle=s#/a/#/this/#,\
+filenamemangle=s#/get/(php-(5\.[0-9\.]*)\.tar\.gz)/.*#$1# \
http://www.php.net/downloads.php /get/php-(5\.[0-9\.]*)\.tar\.gz/from/a/mirror
More information about the Pkg-php-commits
mailing list