[Pkg-php-commits] [php/debian-sid] Refreshed 006-debian_quirks.patch
Ondřej Surý
ondrej at sury.org
Fri Jan 8 13:50:24 UTC 2010
---
debian/patches/006-debian_quirks.patch | 68 ++++++++++++++++----------------
1 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/debian/patches/006-debian_quirks.patch b/debian/patches/006-debian_quirks.patch
index 4d050b5..6ec8620 100644
--- a/debian/patches/006-debian_quirks.patch
+++ b/debian/patches/006-debian_quirks.patch
@@ -1,6 +1,6 @@
---- php.orig/configure.in
-+++ php/configure.in
-@@ -991,7 +991,7 @@ if test "$PHP_CLI" = "no"; then
+--- a/configure.in
++++ b/configure.in
+@@ -987,7 +987,7 @@ if test "$PHP_CLI" = "no"; then
fi
PHP_ARG_WITH(pear, [whether to install PEAR],
@@ -9,7 +9,7 @@
--without-pear Do not install PEAR], DEFAULT, yes)
if test "$PHP_PEAR" != "no"; then
-@@ -1025,7 +1025,7 @@ dnl
+@@ -1021,7 +1021,7 @@ dnl
if test "$PHP_PEAR" = "DEFAULT" || test "$PHP_PEAR" = "yes"; then
case $PHP_LAYOUT in
GNU) PEAR_INSTALLDIR=$datadir/pear;;
@@ -18,7 +18,7 @@
esac
fi
-@@ -1080,12 +1080,12 @@ test "$program_suffix" = "NONE" && progr
+@@ -1076,12 +1076,12 @@ test "$program_suffix" = "NONE" && progr
case $libdir in
'${exec_prefix}/lib')
@@ -33,7 +33,7 @@
;;
esac
-@@ -1150,7 +1150,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfd
+@@ -1147,7 +1147,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"`
@@ -42,8 +42,8 @@
exec_prefix=$old_exec_prefix
libdir=$old_libdir
---- php.orig/ext/ext_skel
-+++ php/ext/ext_skel
+--- a/ext/ext_skel
++++ b/ext/ext_skel
@@ -70,7 +70,7 @@ if test -d "$extname" ; then
fi
@@ -53,9 +53,9 @@
fi
## convert skel_dir to full path
---- php.orig/ext/session/session.c
-+++ php/ext/session/session.c
-@@ -684,11 +684,11 @@ static PHP_INI_MH(OnUpdateSaveDir) /* {{
+--- a/ext/session/session.c
++++ b/ext/session/session.c
+@@ -678,11 +678,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)
@@ -69,8 +69,8 @@
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)
---- php.orig/php.ini-dist
-+++ php/php.ini-dist
+--- a/php.ini-dist
++++ b/php.ini-dist
@@ -471,7 +471,7 @@ default_mimetype = "text/html"
;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -89,7 +89,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
-@@ -601,58 +601,6 @@ default_socket_timeout = 60
+@@ -604,58 +604,6 @@ default_socket_timeout = 60
; extension_dir directive above.
@@ -148,7 +148,7 @@
;;;;;;;;;;;;;;;;;;;
; Module Settings ;
;;;;;;;;;;;;;;;;;;;
-@@ -989,7 +937,7 @@ session.save_handler = files
+@@ -992,7 +940,7 @@ session.save_handler = files
;
; where MODE is the octal representation of the mode. Note that this
; does not overwrite the process's umask.
@@ -157,7 +157,7 @@
; Whether to use cookies.
session.use_cookies = 1
-@@ -1027,7 +975,12 @@ session.serialize_handler = php
+@@ -1030,7 +978,12 @@ session.serialize_handler = php
; e.g. 1/100 means there is a 1% chance that the GC process starts
; on each request.
@@ -171,8 +171,8 @@
session.gc_divisor = 100
; After this number of seconds, stored data will be seen as 'garbage' and
---- php.orig/php.ini-recommended
-+++ php/php.ini-recommended
+--- a/php.ini-recommended
++++ b/php.ini-recommended
@@ -522,7 +522,7 @@ default_mimetype = "text/html"
;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -191,7 +191,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
-@@ -652,58 +652,6 @@ default_socket_timeout = 60
+@@ -655,58 +655,6 @@ default_socket_timeout = 60
; extension_dir directive above.
@@ -250,7 +250,7 @@
;;;;;;;;;;;;;;;;;;;
; Module Settings ;
;;;;;;;;;;;;;;;;;;;
-@@ -1040,7 +988,7 @@ session.save_handler = files
+@@ -1043,7 +991,7 @@ session.save_handler = files
;
; where MODE is the octal representation of the mode. Note that this
; does not overwrite the process's umask.
@@ -259,7 +259,7 @@
; Whether to use cookies.
session.use_cookies = 1
-@@ -1078,7 +1026,12 @@ session.serialize_handler = php
+@@ -1081,7 +1029,12 @@ session.serialize_handler = php
; e.g. 1/100 means there is a 1% chance that the GC process starts
; on each request.
@@ -273,8 +273,8 @@
session.gc_divisor = 1000
; After this number of seconds, stored data will be seen as 'garbage' and
---- php.orig/sapi/caudium/config.m4
-+++ php/sapi/caudium/config.m4
+--- a/sapi/caudium/config.m4
++++ b/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
@@ -297,10 +297,10 @@
RESULT=" *** Pike binary used: $PIKE
*** Pike include dir(s) used: $PIKE_INCLUDE_DIR
*** Pike version: $PIKE_VERSION"
---- php.orig/sapi/cli/php.1.in
-+++ php/sapi/cli/php.1.in
-@@ -306,13 +306,14 @@ Shows configuration for extension
- .B name
+--- a/sapi/cli/php.1.in
++++ b/sapi/cli/php.1.in
+@@ -309,13 +309,14 @@ Shows configuration for extension
+ Show configuration file names
.SH FILES
.TP 15
-.B php\-cli.ini
@@ -318,9 +318,9 @@
+The configuration file for the version of PHP that apache2 uses.
.SH EXAMPLES
.TP 5
- \fIphp -r 'echo "Hello World\\n";'\fP
---- php.orig/scripts/Makefile.frag
-+++ php/scripts/Makefile.frag
+ \fIphp \-r 'echo "Hello World\\n";'\fP
+--- a/scripts/Makefile.frag
++++ b/scripts/Makefile.frag
@@ -3,8 +3,8 @@
# Build environment install
#
@@ -332,8 +332,8 @@
BUILD_FILES = \
scripts/phpize.m4 \
---- php.orig/scripts/php-config.in
-+++ php/scripts/php-config.in
+--- a/scripts/php-config.in
++++ b/scripts/php-config.in
@@ -5,8 +5,8 @@ prefix="@prefix@"
exec_prefix="@exec_prefix@"
version="@PHP_VERSION@"
@@ -345,8 +345,8 @@
ldflags="@PHP_LDFLAGS@"
libs="@EXTRA_LIBS@"
extension_dir='@EXTENSION_DIR@'
---- php.orig/scripts/phpize.in
-+++ php/scripts/phpize.in
+--- a/scripts/phpize.in
++++ b/scripts/phpize.in
@@ -3,8 +3,8 @@
# Variable declaration
prefix='@prefix@'
--
1.6.3.3
More information about the Pkg-php-commits
mailing list