[ptxdist] [PATCH 1/2] php5: version bump to 5.6.40

[ptxdist] [PATCH 1/2] php5: version bump to 5.6.40

[Bruno Thomsen]

This is currently the last 5.x release of php, so this
version bump just closes known CVEs[1], and allow a little
extra time to migrate existing application to php 7.x.

Disabled fileinfo feature[2] as configure now contains a compile
check for existence of strcasestr. This fails as the cross
compiled binary cannot run on host arch.
This has an open upstream php bug[3].

New configuration parameters are default disabled.

[1] https://www.php.net/ChangeLog-5.php
[2] https://www.php.net/manual/en/book.fileinfo.php
[3] https://bugs.php.net/bug.php?id=69132

Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
---
 rules/php5.make | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/rules/php5.make b/rules/php5.make
index 74b2658f3..d2e80c009 100644
--- a/rules/php5.make
+++ b/rules/php5.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_PHP5) += php5
 #
 # Paths and names
 #
-PHP5_VERSION	:= 5.5.30
-PHP5_MD5	:= ef6d848756ea9d19b7a7e1a9d824d7c1
+PHP5_VERSION	:= 5.6.40
+PHP5_MD5	:= c7dde3afb16ce7b761abf2805125d372
 PHP5		:= php-$(PHP5_VERSION)
 PHP5_SUFFIX	:= tar.xz
 PHP5_SOURCE	:= $(SRCDIR)/$(PHP5).$(PHP5_SUFFIX)
@@ -49,6 +49,7 @@ PHP5_AUTOCONF := \
 	--disable-phar \
 	--with-config-file-path=/etc/php5 \
 	--enable-opcache=no \
+	--disable-fileinfo \
 	--without-xmlrpc \
 	--without-iconv
 
-- 
2.25.4


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 2/2] php5: move away from staging

[Bruno Thomsen]

This reverts commit 5f0f21033a19780828e8052724e893f129552116.

php5 has been updated to 5.6.40 so known CVEs has been resolved
and allows a little extra php7 migration time.

Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
---
 rules/cups.in     | 1 -
 rules/lighttpd.in | 1 -
 rules/php5.in     | 8 +-------
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/rules/cups.in b/rules/cups.in
index 2b78ea5be..d2f8e67bd 100644
--- a/rules/cups.in
+++ b/rules/cups.in
@@ -60,7 +60,6 @@ config CUPS_PERL
 	bool "enable Perl support for web interface"
 
 config CUPS_PHP
-	depends on STAGING
 	bool "enable PHP support for web interface"
 
 if CUPS_PHP
diff --git a/rules/lighttpd.in b/rules/lighttpd.in
index 0e1dde14d..a8a06f06d 100644
--- a/rules/lighttpd.in
+++ b/rules/lighttpd.in
@@ -140,7 +140,6 @@ if LIGHTTPD_MOD_FASTCGI
 
 config LIGHTTPD_MOD_FASTCGI_PHP
 	bool
-	depends on STAGING
 	prompt "setup php handling with fastcgi"
 	help
 	  Enables the necessary packages and configuration files
diff --git a/rules/php5.in b/rules/php5.in
index f937f4e6b..c8bb79eda 100644
--- a/rules/php5.in
+++ b/rules/php5.in
@@ -1,6 +1,4 @@
-## SECTION=staging
-## old section:
-### SECTION=scripting_languages
+## SECTION=scripting_languages
 # php5 configuration
 
 menuconfig PHP5
@@ -19,10 +17,6 @@ menuconfig PHP5
 	select SQLITE		if PHP5_EXT_SQLITE3
 	select ZLIB		if PHP5_EXT_ZLIB
 	select OPENSSL		if PHP5_EXT_OPENSSL
-	help
-	  STAGING: remove in ptxdist-2021.05.0
-	  Old version that need to be updated. Fails to build with gcc >= 9.x on
-	  on some architectures (AArch64).
 
 if PHP5
 
-- 
2.25.4


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 2/2] php5: move away from staging

[Bruno Thomsen]

>  menuconfig PHP5
> @@ -19,10 +17,6 @@ menuconfig PHP5
>         select SQLITE           if PHP5_EXT_SQLITE3
>         select ZLIB             if PHP5_EXT_ZLIB
>         select OPENSSL          if PHP5_EXT_OPENSSL
> -       help
> -         STAGING: remove in ptxdist-2021.05.0
> -         Old version that need to be updated. Fails to build with gcc >= 9.x on
> -         on some architectures (AArch64).

Forgot to add that it compiles with gcc from the following toolchains:

arm-v5te-linux-gnueabi/gcc-7.3.1-glibc-2.27-binutils-2.30-kernel-4.15-sanitized
arm-v7a-linux-gnueabihf/gcc-9.2.1-clang-8.0.1-glibc-2.30-binutils-2.32-kernel-5.0-sanitized

I have not tested with an AArch64.

/Bruno

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 2/2] php5: move away from staging

[Michael Olbrich]

On Wed, Apr 29, 2020 at 04:29:25PM +0200, Bruno Thomsen wrote:
> >  menuconfig PHP5
> > @@ -19,10 +17,6 @@ menuconfig PHP5
> >         select SQLITE           if PHP5_EXT_SQLITE3
> >         select ZLIB             if PHP5_EXT_ZLIB
> >         select OPENSSL          if PHP5_EXT_OPENSSL
> > -       help
> > -         STAGING: remove in ptxdist-2021.05.0
> > -         Old version that need to be updated. Fails to build with gcc >= 9.x on
> > -         on some architectures (AArch64).
> 
> Forgot to add that it compiles with gcc from the following toolchains:
> 
> arm-v5te-linux-gnueabi/gcc-7.3.1-glibc-2.27-binutils-2.30-kernel-4.15-sanitized
> arm-v7a-linux-gnueabihf/gcc-9.2.1-clang-8.0.1-glibc-2.30-binutils-2.32-kernel-5.0-sanitized
> 
> I have not tested with an AArch64.

It still fails to build. So I'm not quite sure what I should to with this.
I just moved this to staging when it broke. But now I checked upstream and
I noticed, that php5 has been discontinued for more than one year. So I
think this should remain in staging, but I suppose I could apply the first
patch, so that at least the last release is available.

Regards,
Michael

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 2/2] php5: move away from staging

[Bruno Thomsen]

Den tor. 7. maj 2020 kl. 10.06 skrev Michael Olbrich <m.olbrich@pengutronix.de>:
> > > -       help
> > > -         STAGING: remove in ptxdist-2021.05.0
> > > -         Old version that need to be updated. Fails to build with gcc >= 9.x on
> > > -         on some architectures (AArch64).
> >
> > Forgot to add that it compiles with gcc from the following toolchains:
> >
> > arm-v5te-linux-gnueabi/gcc-7.3.1-glibc-2.27-binutils-2.30-kernel-4.15-sanitized
> > arm-v7a-linux-gnueabihf/gcc-9.2.1-clang-8.0.1-glibc-2.30-binutils-2.32-kernel-5.0-sanitized
> >
> > I have not tested with an AArch64.
>
> It still fails to build. So I'm not quite sure what I should to with this.
> I just moved this to staging when it broke. But now I checked upstream and
> I noticed, that php5 has been discontinued for more than one year. So I
> think this should remain in staging, but I suppose I could apply the first
> patch, so that at least the last release is available.

Okay sound good. Let's keep it in staging and just close known CVEs
with version bump.

Bruno

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [APPLIED] php5: version bump to 5.6.40

[Michael Olbrich]

Thanks, applied as b25a2c03696015f0b3432f19909165c37f8b82f5.

Michael

[sent from post-receive hook]

On Tue, 19 May 2020 14:23:35 +0200, Bruno Thomsen <bruno.thomsen@gmail.com> wrote:
> This is currently the last 5.x release of php, so this
> version bump just closes known CVEs[1], and allow a little
> extra time to migrate existing application to php 7.x.
> 
> Disabled fileinfo feature[2] as configure now contains a compile
> check for existence of strcasestr. This fails as the cross
> compiled binary cannot run on host arch.
> This has an open upstream php bug[3].
> 
> New configuration parameters are default disabled.
> 
> [1] https://www.php.net/ChangeLog-5.php
> [2] https://www.php.net/manual/en/book.fileinfo.php
> [3] https://bugs.php.net/bug.php?id=69132
> 
> Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> Message-Id: <20200429140452.23348-1-bruno.thomsen@gmail.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/php5.make b/rules/php5.make
> index 74b2658f3589..d2e80c009e37 100644
> --- a/rules/php5.make
> +++ b/rules/php5.make
> @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_PHP5) += php5
>  #
>  # Paths and names
>  #
> -PHP5_VERSION	:= 5.5.30
> -PHP5_MD5	:= ef6d848756ea9d19b7a7e1a9d824d7c1
> +PHP5_VERSION	:= 5.6.40
> +PHP5_MD5	:= c7dde3afb16ce7b761abf2805125d372
>  PHP5		:= php-$(PHP5_VERSION)
>  PHP5_SUFFIX	:= tar.xz
>  PHP5_SOURCE	:= $(SRCDIR)/$(PHP5).$(PHP5_SUFFIX)
> @@ -49,6 +49,7 @@ PHP5_AUTOCONF := \
>  	--disable-phar \
>  	--with-config-file-path=/etc/php5 \
>  	--enable-opcache=no \
> +	--disable-fileinfo \
>  	--without-xmlrpc \
>  	--without-iconv
>  

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de