From: Bruno Thomsen <bth@kamstrup.dk>
To: ptxdist@pengutronix.de
Cc: Bruno Thomsen <bth@kamstrup.dk>
Subject: [ptxdist] [PATCH 2/2] php: version bump 5.3.10 -> 5.4.24
Date: Tue, 21 Jan 2014 16:34:05 +0100 [thread overview]
Message-ID: <1390318445-32467-3-git-send-email-bth@kamstrup.dk> (raw)
In-Reply-To: <1390318445-32467-1-git-send-email-bth@kamstrup.dk>
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.
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
next prev parent reply other threads:[~2014-01-21 15:35 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <bth@kamstrup.dk>
2014-01-17 13:49 ` [ptxdist] [PATCH] openssl: version bump 1.0.0k -> 1.0.1e Bruno Thomsen
2014-01-17 14:09 ` Jürgen Beisert
2014-01-17 15:18 ` Bruno Thomsen
2014-01-20 10:45 ` Michael Olbrich
2014-01-23 16:53 ` Michael Olbrich
2014-01-21 15:34 ` [ptxdist] [PATCH 0/2] php: version bump 5.3.10 -> 5.4.24 Bruno Thomsen
2014-01-21 15:34 ` [ptxdist] [PATCH 1/2] Fix compiling of PHP with sqlite3 support on ptxdist 2012.04.0 Bruno Thomsen
2014-01-21 15:34 ` Bruno Thomsen [this message]
2014-01-23 16:31 ` [ptxdist] [PATCH 2/2] php: version bump 5.3.10 -> 5.4.24 Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1390318445-32467-3-git-send-email-bth@kamstrup.dk \
--to=bth@kamstrup.dk \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox