up to 5.3.26. fixes CVE-2013-2110

[packages/php.git] / php-libtool.patch

diff --git a/php-libtool.patch b/php-libtool.patch
index 2c940091ffadf46259a504b1ddc52cf7ce3328fa..f9713d808e36cefd94bf442e9e1ebef78278d5e5 100644 (file)
--- a/php-libtool.patch
+++ b/php-libtool.patch
@@ -1,12 +1,31 @@
-diff -urN php-4.0.5.org/configure.in php-4.0.5/configure.in
---- php-4.0.5.org/configure.in Thu May 10 23:24:29 2001
-+++ php-4.0.5/configure.in     Thu May 10 23:29:29 2001
-@@ -113,7 +113,7 @@
+--- php-5.4.6/scripts/phpize.in~       2012-08-23 03:02:42.000000000 +0300
++++ php-5.4.6/scripts/phpize.in        2012-08-23 10:16:37.011306948 +0300
+@@ -6,10 +6,16 @@
+ exec_prefix="`eval echo @exec_prefix@`"
+ phpdir="`eval echo @libdir@`/php/build"
+ includedir="`eval echo @includedir@`/php"
++aclocaldir="$prefix/share/aclocal"
+ builddir="`pwd`"
+ SED="@SED@"
  
- AM_PROG_CC_STDC
- 
--AC_PROG_RANLIB
-+AC_PROG_LIBTOOL
- AC_PROG_CC_C_O
- AC_PROG_LN_S
+-FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4"
++FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool"
++if [ -f "$aclocaldir/ltsugar.m4" ]; then
++    LIBTOOL_FILES="libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4"
++else
++    LIBTOOL_FILES="libtool.m4"
++fi
+ FILES="acinclude.m4 Makefile.global config.sub config.guess ltmain.sh run-tests*.php"
+ CLEAN_FILES="$FILES *.o *.lo *.la .deps .libs/ build/ include/ modules/ install-sh \
+       mkinstalldirs missing config.nice config.sub config.guess configure configure.in \
+@@ -145,8 +151,9 @@ phpize_copy_files()
+   test -d build || mkdir build
+  
+   (cd "$phpdir" && cp $FILES_BUILD "$builddir"/build)
++  (cd "$aclocaldir" && cp $LIBTOOL_FILES "$builddir"/build)
+   (cd "$phpdir" && cp $FILES "$builddir")
+-  (cd "$builddir" && cat acinclude.m4 ./build/libtool.m4 > aclocal.m4)
++  (cd "$builddir/build" && cat ../acinclude.m4 $LIBTOOL_FILES > ../aclocal.m4)
+ }
  
+ phpize_replace_prefix()