Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-1.6.git;a=commitdiff;h=f3a08c4584b89c098f30f7bee939bbaa825c62ed
commit f3a08c4584b89c098f30f7bee939bbaa825c62ed Author: CSÉCSY László <[email protected]> Date: Tue Jul 24 09:26:27 2012 +0200 php-5.3.15-1fermus1-x86_64 secfix verbump, backport of e09c653 & deps closes #4714 in -stable diff --git a/source/devel/php/FrugalBuild b/source/devel/php/FrugalBuild index 3600c4f..c9b9ed6 100644 --- a/source/devel/php/FrugalBuild +++ b/source/devel/php/FrugalBuild @@ -4,7 +4,7 @@ # Contributor: Miklos Vajna <[email protected]> pkgname=php -pkgver=5.3.13 +pkgver=5.3.15 pkgrel=1fermus1 pkgdesc="A widely-used general-purpose scripting language" url="http://www.php.net"; @@ -145,8 +145,8 @@ build() Fln /usr/share/libtool/config/ltmain.sh /usr/lib/php/build/ltmain.sh Fln /usr/share/aclocal/libtool.m4 /usr/lib/php/build/libtool.m4 } -sha1sums=('7701dec7b4ca751b0aadbb71c7611b87067299e3' \ - '722bbafd5c309b0a89ba4a57f062af44fc500368' \ +sha1sums=('e9f5e1c42c62bfe80a6a360c40839fc4018b7c32' \ + 'c99534745f4dee26446c9e6f42e35a0c85ce961b' \ '9249ca52e57a3069befe20311fd02fc8bee7aeef' \ '0850ef23512a02e8460dc36f08f453d148dcd9df' \ '40ae88f0721e02a2c75de76be342c51c85bf734d' \ diff --git a/source/devel/php/autoconf_259.patch b/source/devel/php/autoconf_259.patch index b135fc4..3838eee 100644 --- a/source/devel/php/autoconf_259.patch +++ b/source/devel/php/autoconf_259.patch @@ -1,6 +1,7 @@ -diff -up php-5.3.8/build/buildcheck.sh.aconf259 php-5.3.8/build/buildcheck.sh ---- php-5.3.8/build/buildcheck.sh.aconf259 2011-05-18 21:55:34.000000000 +0200 -+++ php-5.3.8/build/buildcheck.sh 2011-08-23 13:43:08.977271533 +0200 +diff --git a/build/buildcheck.sh b/build/buildcheck.sh +index de16264..4b05c28 100755 +--- a/build/buildcheck.sh ++++ b/build/buildcheck.sh @@ -28,33 +28,23 @@ if test -z "$PHP_AUTOCONF"; then PHP_AUTOCONF='autoconf' fi @@ -40,11 +41,12 @@ diff -up php-5.3.8/build/buildcheck.sh.aconf259 php-5.3.8/build/buildcheck.sh if test "$1" = "2" -a "$2" -ge "50"; then ./vcsclean -diff -up php-5.3.8/configure.in.aconf259 php-5.3.8/configure.in ---- php-5.3.8/configure.in.aconf259 2011-08-23 13:43:08.971271521 +0200 -+++ php-5.3.8/configure.in 2011-08-23 13:43:34.264326174 +0200 +diff --git a/configure.in b/configure.in +index f48ce4f..6851512 100644 +--- a/configure.in ++++ b/configure.in @@ -1,28 +1,6 @@ - ## $Id: configure.in 315343 2011-08-23 08:56:29Z johannes $ -*- autoconf -*- + ## $Id$ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. -divert(1) @@ -78,13 +80,13 @@ diff -up php-5.3.8/configure.in.aconf259 php-5.3.8/configure.in -AC_PREREQ(2.13) +AC_PREREQ(2.59) - AC_INIT(README.SVN-RULES) + AC_INIT(README.GIT-RULES) +ifdef([AC_PRESERVE_HELP_ORDER], [AC_PRESERVE_HELP_ORDER], []) + PHP_CONFIG_NICE(config.nice) -@@ -292,14 +272,6 @@ sinclude(TSRM/threads.m4) +@@ -290,14 +270,6 @@ sinclude(TSRM/threads.m4) sinclude(TSRM/tsrm.m4) @@ -99,7 +101,7 @@ diff -up php-5.3.8/configure.in.aconf259 php-5.3.8/configure.in dnl . dnl ------------------------------------------------------------------------- -@@ -331,13 +303,6 @@ if test "$enable_maintainer_zts" = "yes" +@@ -329,13 +301,6 @@ if test "$enable_maintainer_zts" = "yes"; then PTHREADS_FLAGS fi @@ -113,7 +115,7 @@ diff -up php-5.3.8/configure.in.aconf259 php-5.3.8/configure.in dnl Starting system checks. dnl ------------------------------------------------------------------------- -@@ -677,10 +642,6 @@ if test "x$php_crypt_r" = "x1"; then +@@ -683,10 +648,6 @@ if test "x$php_crypt_r" = "x1"; then PHP_CRYPT_R_STYLE fi @@ -124,7 +126,7 @@ diff -up php-5.3.8/configure.in.aconf259 php-5.3.8/configure.in dnl General settings. dnl ------------------------------------------------------------------------- PHP_CONFIGURE_PART(General settings) -@@ -918,11 +879,6 @@ else +@@ -924,11 +885,6 @@ else AC_MSG_RESULT([using system default]) fi @@ -136,11 +138,12 @@ diff -up php-5.3.8/configure.in.aconf259 php-5.3.8/configure.in dnl Extension configuration. dnl ------------------------------------------------------------------------- -diff -up php-5.3.8/ext/standard/config.m4.aconf259 php-5.3.8/ext/standard/config.m4 ---- php-5.3.8/ext/standard/config.m4.aconf259 2010-06-17 12:22:03.000000000 +0200 -+++ php-5.3.8/ext/standard/config.m4 2011-08-23 13:43:08.979271537 +0200 +diff --git a/ext/standard/config.m4 b/ext/standard/config.m4 +index e28c351..c33ae1e 100644 +--- a/ext/standard/config.m4 ++++ b/ext/standard/config.m4 @@ -1,7 +1,5 @@ - dnl $Id: config.m4 300511 2010-06-17 10:22:03Z pajoye $ -*- autoconf -*- + dnl $Id$ -*- autoconf -*- -divert(3)dnl - @@ -156,9 +159,10 @@ diff -up php-5.3.8/ext/standard/config.m4.aconf259 php-5.3.8/ext/standard/config dnl dnl Check if there is a support means of creating a new process dnl and defining which handles it receives -diff -up php-5.3.8/scripts/php-config.in.aconf259 php-5.3.8/scripts/php-config.in ---- php-5.3.8/scripts/php-config.in.aconf259 2011-04-18 13:13:37.000000000 +0200 -+++ php-5.3.8/scripts/php-config.in 2011-08-23 13:43:08.980271540 +0200 +diff --git a/scripts/php-config.in b/scripts/php-config.in +index 13c25f2..d6c62cc 100644 +--- a/scripts/php-config.in ++++ b/scripts/php-config.in @@ -2,6 +2,7 @@ SED="@SED@" @@ -167,20 +171,22 @@ diff -up php-5.3.8/scripts/php-config.in.aconf259 php-5.3.8/scripts/php-config.i exec_prefix="@exec_prefix@" version="@PHP_VERSION@" vernum="@PHP_VERSION_ID@" -diff -up php-5.3.8/scripts/phpize.in.aconf259 php-5.3.8/scripts/phpize.in ---- php-5.3.8/scripts/phpize.in.aconf259 2011-08-23 13:43:08.968271513 +0200 -+++ php-5.3.8/scripts/phpize.in 2011-08-23 13:43:08.981271543 +0200 +diff --git a/scripts/phpize.in b/scripts/phpize.in +index 40ccc77..43cd8d3 100644 +--- a/scripts/phpize.in ++++ b/scripts/phpize.in @@ -2,6 +2,7 @@ # Variable declaration prefix='@prefix@' +datarootdir='@datarootdir@' exec_prefix="`eval echo @exec_prefix@`" - phpdir="@libdir@/php/build" + phpdir="`eval echo @libdir@`/build" includedir="`eval echo @includedir@`/php" -diff -up php-5.3.8/scripts/phpize.m4.aconf259 php-5.3.8/scripts/phpize.m4 ---- php-5.3.8/scripts/phpize.m4.aconf259 2010-11-02 10:58:08.000000000 +0100 -+++ php-5.3.8/scripts/phpize.m4 2011-08-23 13:43:08.982271545 +0200 +diff --git a/scripts/phpize.m4 b/scripts/phpize.m4 +index e3a30a5..d745ca7 100644 +--- a/scripts/phpize.m4 ++++ b/scripts/phpize.m4 @@ -1,9 +1,8 @@ dnl This file becomes configure.in for self-contained extensions.
_______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
