From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail.kamstrup.com ([93.167.225.188]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1W6dPZ-0002ea-1B for ptxdist@pengutronix.de; Fri, 24 Jan 2014 10:50:54 +0100 From: Bruno Thomsen Date: Fri, 24 Jan 2014 10:50:44 +0100 Message-ID: <1390557044-7239-1-git-send-email-bth@kamstrup.dk> In-Reply-To: References: MIME-Version: 1.0 Subject: [ptxdist] [PATCHv2 1/1] php: version bump 5.3.10 -> 5.4.24 Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de Cc: Bruno Thomsen php: version bump 5.3.10 -> 5.4.24 Fix compiling of PHP with sqlite3 support on ptxdist 2012.04.0. Fixes a lot of security flaws and bugs. Changelog: http://www.php.net/ChangeLog-5.php#5.4.24 PHP: Removal of curl-wrappers. This feature has been marked as experimental for years and never turned to stable. Most people using it just do so by accident. This experimental feature should be moved in a new PECL extension for improvements until it gets stable. https://wiki.php.net/rfc/curl-wrappers-removal-rfc --- ...make-it-possible-to-force-cross-compiling.patch | 35 -------------------- patches/php-5.3.10/series | 4 --- rules/php5.make | 10 +++--- 3 files changed, 6 insertions(+), 43 deletions(-) delete mode 100644 patches/php-5.3.10/0001-HACK-make-it-possible-to-force-cross-compiling.patch delete mode 100644 patches/php-5.3.10/series diff --git a/patches/php-5.3.10/0001-HACK-make-it-possible-to-force-cross-compiling.patch b/patches/php-5.3.10/0001-HACK-make-it-possible-to-force-cross-compiling.patch deleted file mode 100644 index 931f9b0..0000000 --- a/patches/php-5.3.10/0001-HACK-make-it-possible-to-force-cross-compiling.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Michael Olbrich -Date: Sat, 27 Oct 2012 11:37:38 +0200 -Subject: [PATCH] HACK: make it possible to force cross-compiling - -configure checks for cross-compiling by running a simple program. -This returns the wrong result when build and host architecture are -the same. -This patch makes it possible to force cross-compiling. It hacks -configure because it cannot be regenerated. - -Signed-off-by: Michael Olbrich ---- - configure | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/configure b/configure -index 0900d02..ca0dec0 100755 ---- a/configure -+++ b/configure -@@ -2377,6 +2377,7 @@ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' - ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - cross_compiling=$ac_cv_prog_cc_cross - -+if test -z "$ac_cv_prog_cc_cross"; then - cat > conftest.$ac_ext << EOF - - #line 2383 "configure" -@@ -2398,6 +2399,7 @@ else - ac_cv_prog_cc_works=no - fi - rm -fr conftest* -+fi - ac_ext=c - # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. - ac_cpp='$CPP $CPPFLAGS' diff --git a/patches/php-5.3.10/series b/patches/php-5.3.10/series deleted file mode 100644 index bad412b..0000000 --- a/patches/php-5.3.10/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-HACK-make-it-possible-to-force-cross-compiling.patch -# 92e34182fd5e0535892f282141ab5993 - git-ptx-patches magic diff --git a/rules/php5.make b/rules/php5.make index b24cd33..ad3e216 100644 --- a/rules/php5.make +++ b/rules/php5.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_PHP5) += php5 # # Paths and names # -PHP5_VERSION := 5.3.10 -PHP5_MD5 := 816259e5ca7d0a7e943e56a3bb32b17f +PHP5_VERSION := 5.4.24 +PHP5_MD5 := acef880cc808b85e216897ee88187ee1 PHP5 := php-$(PHP5_VERSION) PHP5_SUFFIX := tar.bz2 PHP5_SOURCE := $(SRCDIR)/$(PHP5).$(PHP5_SUFFIX) @@ -222,8 +222,7 @@ endif ifdef PTXCONF_PHP5_EXT_CURL PHP5_AUTOCONF += \ - --with-curl=$(SYSROOT)/usr \ - --with-curl-wrappers + --with-curl=$(SYSROOT)/usr else PHP5_AUTOCONF += --without-curl endif @@ -250,6 +249,9 @@ endif ifdef PTXCONF_PHP5_EXT_SQLITE3 PHP5_AUTOCONF += --with-sqlite3=$(PTXDIST_SYSROOT_TARGET)/usr --with-pdo-sqlite +# broken config system: sqlite3 (local copy) uses it +# but it is only linked to if used by external dependencies +PHP5_CONF_ENV += PHP_LDFLAGS=-ldl else PHP5_AUTOCONF += --without-sqlite3 --without-pdo-sqlite endif -- 1.7.9.5 -- ptxdist mailing list ptxdist@pengutronix.de