From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from enterprise02.smtp.diehl.com ([193.201.238.220]) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1dpYSv-0002TI-Kr for ptxdist@pengutronix.de; Wed, 06 Sep 2017 13:25:53 +0200 From: Thorsten LIEPERT Date: Wed, 6 Sep 2017 11:25:40 +0000 Message-ID: MIME-Version: 1.0 Content-Language: en-US Subject: [ptxdist] [PATCH] php5: version bump to 5.6.31 List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: multipart/mixed; boundary="===============0581804586==" Errors-To: ptxdist-bounces@pengutronix.de Sender: "ptxdist" To: "ptxdist@pengutronix.de" --===============0581804586== Content-Type: multipart/signed; boundary="Apple-Mail=_1603B031-3886-4E4F-BDC5-671900F14EC1"; protocol="application/pgp-signature"; micalg=pgp-sha512 Content-Language: en-US --Apple-Mail=_1603B031-3886-4E4F-BDC5-671900F14EC1 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Signed-off-by: Thorsten Liepert --- .../0001-Fix-dl-cross-compiling-issue.patch | 62 ++++++++++++++ ...0002-Fix-strcasestr-cross-compiling-issue.patch | 96 +++++++++++++++++= +++++ patches/php-5.6.31/series | 4 + rules/php5.make | 14 ++-- 4 files changed, 170 insertions(+), 6 deletions(-) create mode 100644 patches/php-5.6.31/0001-Fix-dl-cross-compiling-issue.p= atch create mode 100644 patches/php-5.6.31/0002-Fix-strcasestr-cross-compiling= -issue.patch create mode 100755 patches/php-5.6.31/series diff --git a/patches/php-5.6.31/0001-Fix-dl-cross-compiling-issue.patch b= /patches/php-5.6.31/0001-Fix-dl-cross-compiling-issue.patch new file mode 100644 index 000000000..ff1391f37 --- /dev/null +++ b/patches/php-5.6.31/0001-Fix-dl-cross-compiling-issue.patch @@ -0,0 +1,62 @@ +diff -u --recursive php-5.6.27-vanilla/configure.in php-5.6.27/configure= .in +--- php-5.6.27-vanilla/configure.in 2015-02-26 22:10:51.865487530 -0500 ++++ php-5.6.27/configure.in 2015-02-26 22:29:59.043102135 -0500 +@@ -453,7 +453,10 @@ + PHP_CHECK_FUNC(gethostbyaddr, nsl) + PHP_CHECK_FUNC(yp_get_default_domain, nsl) + +-PHP_CHECK_FUNC(dlopen, dl) ++PHP_ADD_LIBRARY(dl) ++PHP_DEF_HAVE(dlopen) ++PHP_DEF_HAVE(libdl) ++ac_cv_func_dlopen=3Dyes + if test "$ac_cv_func_dlopen" =3D "yes"; then + AC_DEFINE(HAVE_LIBDL, 1, [ ]) + fi +diff -u --recursive php-5.6.27-vanilla/ext/fileinfo/config.m4 php-5.6.27= /ext/fileinfo/config.m4 +--- php-5.6.27-vanilla/ext/fileinfo/config.m4 2015-02-26 22:10:51.639487= 135 -0500 ++++ php-5.6.27/ext/fileinfo/config.m4 2015-02-26 22:22:47.645609128 -050= 0 +@@ -46,6 +46,10 @@ + AC_MSG_RESULT(no) + AC_MSG_NOTICE(using libmagic strcasestr implementation) + libmagic_sources=3D"$libmagic_sources libmagic/strcasestr.c" ++ ],[ ++ dnl cross-compiling; assume not present ++ AC_MSG_NOTICE(using libmagic strcasestr implementation) ++ libmagic_sources=3D"$libmagic_sources libmagic/strcasestr.c" + ]) + + PHP_NEW_EXTENSION(fileinfo, fileinfo.c $libmagic_sources, $ext_shared= ,,-I@ext_srcdir@/libmagic) +diff -u --recursive php-5.6.27-vanilla/ext/opcache/config.m4 php-5.6.27/= ext/opcache/config.m4 +--- php-5.6.27-vanilla/ext/opcache/config.m4 2015-02-26 22:10:51.7904873= 99 -0500 ++++ php-5.6.27/ext/opcache/config.m4 2015-02-26 22:34:19.240414394 -0500 +@@ -341,7 +341,14 @@ + flock_type=3Dlinux + AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type]) + AC_MSG_RESULT("yes") +-], AC_MSG_RESULT("no") ) ++], [ ++ AC_MSG_RESULT("no") ++], [ ++ dnl cross-compiling; assume Linux ++ flock_type=3Dlinux ++ AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type]) ++ AC_MSG_RESULT("yes") ++]) + + AC_MSG_CHECKING("whether flock struct is BSD ordered") + AC_TRY_RUN([ +@@ -357,7 +364,12 @@ + flock_type=3Dbsd + AC_DEFINE([HAVE_FLOCK_BSD], [], [Struct flock is BSD-type]) + AC_MSG_RESULT("yes") +-], AC_MSG_RESULT("no") ) ++], [ ++ AC_MSG_RESULT("no") ++], [ ++ dnl cross-compiling; assume Linux ++ AC_MSG_RESULT("no") ++]) + + if test "$flock_type" =3D "unknown"; then + AC_MSG_ERROR([Don't know how to define struct flock on this system[,] = set --enable-opcache=3Dno]) diff --git a/patches/php-5.6.31/0002-Fix-strcasestr-cross-compiling-issue= .patch b/patches/php-5.6.31/0002-Fix-strcasestr-cross-compiling-issue.pat= ch new file mode 100644 index 000000000..4b6791c54 --- /dev/null +++ b/patches/php-5.6.31/0002-Fix-strcasestr-cross-compiling-issue.patch @@ -0,0 +1,96 @@ +Index: php-5.6.27/configure +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +--- php-5.6.27.orig/configure 2016-09-15 21:43:51.000000000 +0000 ++++ php-5.6.27/configure 2016-09-22 11:46:15.811307808 +0000 +@@ -36580,10 +36580,9 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strcasestr" >&5 + $as_echo_n "checking for strcasestr... " >&6; } + if test "$cross_compiling" =3D yes; then : +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $=3F "cannot run test program while cross compiling +-See \`config.log' for more details" "$LINENO" 5 ; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: cannot run test program whil= e cross compiling, assume true" >&5 ++$as_echo_n "cannot run test program while cross compiling, assume true"= >&6; } ++ PHP_FILEINFO_STRCASESTR_SUPPORT=3D"yes" + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +@@ -36615,7 +36614,10 @@ + + _ACEOF + if ac_fn_c_try_run "$LINENO"; then : ++ PHP_FILEINFO_STRCASESTR_SUPPORT=3D"yes" ++fi + ++if test "$PHP_FILEINFO_STRCASESTR_SUPPORT" !=3D "no"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + +@@ -109867,7 +109869,7 @@ + + if test $supports_anon_versioning =3D yes; then + archive_expsym_cmds=3D'$echo "{ global:" > $output_objdir/$libname.v= er~ +- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libna= me.ver~ ++ cat $export_symbols | sed -e "s/\(.*\)/'"$ac_symprfx"'\1;/" >> $outpu= t_objdir/$libname.ver~ + $echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_fl= ags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$lib= name.ver -o $lib' + fi +@@ -110721,7 +110723,7 @@ + sys_lib_search_path_spec=3D"/lib /usr/lib /usr/local/lib" + fi + need_lib_prefix=3Dunknown +-hardcode_into_libs=3Dno ++hardcode_into_libs=3D"no" + + # when you set need_version to no, make sure it does not cause -set_ver= sion + # flags to be left without arguments +@@ -112259,16 +112261,16 @@ + hardcode_action=3D$hardcode_action + + # Whether we should hardcode library paths into libraries. +-hardcode_into_libs=3D$hardcode_into_libs ++hardcode_into_libs=3D"no" + + # Flag to hardcode \$libdir into a binary during linking. + # This must work even if \$libdir does not exist. +-hardcode_libdir_flag_spec=3D$lt_hardcode_libdir_flag_spec ++hardcode_libdir_flag_spec=3D"" + + # If ld is used when linking, flag to hardcode \$libdir into + # a binary during linking. This must work even if \$libdir does + # not exist. +-hardcode_libdir_flag_spec_ld=3D$lt_hardcode_libdir_flag_spec_ld ++hardcode_libdir_flag_spec_ld=3D"" + + # Whether we need a single -rpath flag with a separated argument. + hardcode_libdir_separator=3D$lt_hardcode_libdir_separator +@@ -114355,7 +114357,7 @@ + sys_lib_dlsearch_path_spec=3D"/lib /usr/lib" + + need_lib_prefix=3Dunknown +-hardcode_into_libs=3Dno ++hardcode_into_libs=3D"no" + + # when you set need_version to no, make sure it does not cause -set_ver= sion + # flags to be left without arguments +@@ -115283,16 +115285,16 @@ + hardcode_action=3D$hardcode_action_CXX + + # Whether we should hardcode library paths into libraries. +-hardcode_into_libs=3D$hardcode_into_libs ++hardcode_into_libs=3D"no" + + # Flag to hardcode \$libdir into a binary during linking. + # This must work even if \$libdir does not exist. +-hardcode_libdir_flag_spec=3D$lt_hardcode_libdir_flag_spec_CXX ++hardcode_libdir_flag_spec=3D"" + + # If ld is used when linking, flag to hardcode \$libdir into + # a binary during linking. This must work even if \$libdir does + # not exist. +-hardcode_libdir_flag_spec_ld=3D$lt_hardcode_libdir_flag_spec_ld_CXX ++hardcode_libdir_flag_spec_ld=3D"" + + # Whether we need a single -rpath flag with a separated argument. + hardcode_libdir_separator=3D$lt_hardcode_libdir_separator_CXX diff --git a/patches/php-5.6.31/series b/patches/php-5.6.31/series new file mode 100755 index 000000000..6f3edba51 --- /dev/null +++ b/patches/php-5.6.31/series @@ -0,0 +1,4 @@ +#tag:base --start-number 1 +#tag:debian --start-number 1 +0001-Fix-dl-cross-compiling-issue.patch +0002-Fix-strcasestr-cross-compiling-issue.patch diff --git a/rules/php5.make b/rules/php5.make index cc9dc8e10..df4e92390 100644 --- a/rules/php5.make +++ b/rules/php5.make @@ -18,12 +18,13 @@ PACKAGES-$(PTXCONF_PHP5) +=3D php5 # # Paths and names # -PHP5_VERSION :=3D 5.5.30 -PHP5_MD5 :=3D ef6d848756ea9d19b7a7e1a9d824d7c1 -PHP5 :=3D php-$(PHP5_VERSION) -PHP5_SUFFIX :=3D tar.xz -PHP5_SOURCE :=3D $(SRCDIR)/$(PHP5).$(PHP5_SUFFIX) -PHP5_DIR :=3D $(BUILDDIR)/$(PHP5) +PHP5_VERSION :=3D 5.6.31 +PHP5_MD5 :=3D b3e6f548a7a47e9917279d50889b9a4a +PHP5 :=3D php-$(PHP5_VERSION) +PHP5_SUFFIX :=3D tar.xz +PHP5_SOURCE :=3D $(SRCDIR)/$(PHP5).$(PHP5_SUFFIX) +PHP5_DIR :=3D $(BUILDDIR)/$(PHP5) +PHP5_LICENSE :=3D PHP License # # Note: older releases are moved to the 'museum', but the 'de.php.net' @@ -48,6 +49,7 @@ PHP5_CONF_ENV :=3D \ # PHP5_AUTOCONF :=3D \ $(CROSS_AUTOCONF_USR) \ + --target=3D \ --disable-phar \ --with-config-file-path=3D/etc/php5 \ --enable-opcache=3Dno \ -- 2.13.0 Diehl AKO Stiftung & Co. KG, Pfannerstra=C3=9Fe 75-83, 88239 Wangen im Al= lg=C3=A4u Bereichsvorstand: Dipl.-Ing. Michael Siedentop (Sprecher), Josef Fellner = (Mitglied) Sitz der Gesellschaft: Wangen i.A. =E2=80=93 Registergericht: Amtsgericht= Ulm HRA 620609 =E2=80=93 Pers=C3=B6nlich haftende Gesellschafterin: Dieh= l Verwaltungs-Stiftung =E2=80=93 Sitz: N=C3=BCrnberg =E2=80=93 Registerge= richt: Amtsgericht N=C3=BCrnberg HRA 11756 =E2=80=93 Vorstand: Dr.-Ing. E.h. Thomas Diehl (=E2=80=A0) (Vorsitzender), Herr Dip= l.-Wirtsch.-Ing. Wolfgang Weggen (stellvertretender Vorsitzender), Dipl.-= Kfm. Claus G=C3=BCnther, Dipl.-Kfm. Frank Gutzeit, Dr.-Ing. Heinrich Schu= nk, Dr.-Ing. Michael Siedentop , Dipl.-Kfm. Dr.-Ing. Martin Sommer, Dipl.= -Ing. (FH) Rainer von Borstel, Vorsitzender des Aufsichtsrates: Dr. Klaus= Maier _________________________________________________________________________= __________________________ Der Inhalt der vorstehenden E-Mail ist nicht rechtlich bindend. Diese E-M= ail enthaelt vertrauliche und/oder rechtlich geschuetzte Informationen. Informieren Sie uns bitte, wenn Sie diese E-Mail faelschlicherweise erhal= ten haben. Bitte loeschen Sie in diesem Fall die Nachricht. Jede unerlaub= te Form der Reproduktion, Bekanntgabe, Aenderung, Verteilung und/oder Pub= likation dieser E-Mail ist strengstens untersagt. The contents of the above mentioned e-mail is not legally binding. This e= -mail contains confidential and/or legally protected information. Please = inform us if you have received this e-mail by mistake and delete it in su= ch a case. Each unauthorized reproduction, disclosure, alteration, distri= bution and/or publication of this e-mail is strictly prohibited. --Apple-Mail=_1603B031-3886-4E4F-BDC5-671900F14EC1 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="signature.asc" Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Message signed with OpenPGP -----BEGIN PGP SIGNATURE----- iQIcBAEBCgAGBQJZr9szAAoJELUrTw2gWs0yCsYQAIPYyTJpnMKquC1mUBpF1DWN S2F1t/f6jeNE4IwcPg88VNZDkGrQYM6gW0lxytdWGcltYo1gI/IAS/EVkru62hYK Xq+N2NA8X5fldJdPjPoPjEyeBkQXe6ZXhLOJgsygrsA7e2Og9XSXm4KU8S9lBVX8 UlYlxXJoY/1jLIeAv+2j5lClBU9iUhzMOadp7RxHpRUYgfdd3pBTdU30Ks6TGo4t QoiN+xkU+mG5GbcP1SDRonrnzQfvhAn6TOIBK2id/IwNZpuRS8bx33hSB06RsQ3q tI7FZmgtun27isd+hoR/50W7AI3kz/BI6V2bz4ZAcUjpQTCGfqOgCFzY6yBN+7lW Z2E02rO9B+W/54DFzrBYRz4AjCO04VcQ1laTMd3CAFXB6hXTx46AjCyesD78OxuF Uz2yoIfgVq1pwqL00PIbZH6FDGbxU+/UcTrQFY7zkiMbxvpAtw3YwTGr57vcQKqN J7eBvSqTSbVzgxC+taqrl6GribzDSL7Enx3f+qZ2vSs8GX97Hd9ioDOnc0DB2et2 eHgN/hfrZ6xPZdBcmeU4AoqoYJIzDZVtJ5W6ot++I62l9LnjHkhZJypuvw7ACeGq 7xUJY6gjiQmgDCZ8acWSGhpHQWn5/nkqwJEqAVIkSQnBJpoxParv6Y4bkaKRJsOo K0R1Ac0Zi56wmsohbZUe =Zb4f -----END PGP SIGNATURE----- --Apple-Mail=_1603B031-3886-4E4F-BDC5-671900F14EC1-- --===============0581804586== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KcHR4ZGlzdCBt YWlsaW5nIGxpc3QKcHR4ZGlzdEBwZW5ndXRyb25peC5kZQ== --===============0581804586==--