From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1jTnKo-0007Fz-Sa for ptxdist@pengutronix.de; Wed, 29 Apr 2020 16:05:11 +0200 Received: by mail-wr1-x434.google.com with SMTP id x18so2705840wrq.2 for ; Wed, 29 Apr 2020 07:05:10 -0700 (PDT) From: Bruno Thomsen Date: Wed, 29 Apr 2020 16:04:52 +0200 Message-Id: <20200429140452.23348-2-bruno.thomsen@gmail.com> In-Reply-To: <20200429140452.23348-1-bruno.thomsen@gmail.com> References: <20200429140452.23348-1-bruno.thomsen@gmail.com> MIME-Version: 1.0 Subject: [ptxdist] [PATCH 2/2] php5: move away from staging List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ptxdist-bounces@pengutronix.de Sender: "ptxdist" To: ptxdist@pengutronix.de Cc: Bruno Thomsen , bth@kamstrup.com 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 --- 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