Re: [ptxdist] [PATCH 2/2] php: version bump 5.3.10 -> 5.4.24

[Michael Olbrich <m.olbrich@pengutronix.de>]

On Tue, Jan 21, 2014 at 04:34:05PM +0100, Bruno Thomsen wrote:
> Fixes a lot of security flaws and bugs.
> 
> Changelog:
> http://www.php.net/ChangeLog-5.php#5.4.24
> 
> Old HACK patch removed since it cannot be applied on configure script.

"cannot be applied" is a bad reason. The correct one in this case is "is no
longer needed".

Also, I get "configure: error: unrecognized options: --with-curl-wrappers"
when I try to build it with everything enabled.

Michael

> Signed-off-by: Bruno Thomsen <bth@kamstrup.dk>
> ---
>  ...make-it-possible-to-force-cross-compiling.patch |   35 --------------------
>  patches/php-5.3.10/series                          |    4 ---
>  rules/php5.make                                    |    4 +--
>  3 files changed, 2 insertions(+), 41 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 <m.olbrich@pengutronix.de>
> -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 <m.olbrich@pengutronix.de>
> ----
> - 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 f66a664..3e0f4de 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)
> -- 
> 1.7.9.5
> 
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de