[ptxdist] [PATCH 1/5] apache2: remove initV artefact

[ptxdist] [PATCH 1/5] apache2: remove initV artefact

[Juergen Borleis]

The corresponding package is gone since commit
 6da485b4940906d50b48da7e6e26e84629cdf142
 "apache2: remove after on year in staging"

Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
---
 projectroot/etc/init.d/apache2 | 44 ----------------------------------
 1 file changed, 44 deletions(-)
 delete mode 100644 projectroot/etc/init.d/apache2

diff --git a/projectroot/etc/init.d/apache2 b/projectroot/etc/init.d/apache2
deleted file mode 100644
index a8cf04f..0000000
--- a/projectroot/etc/init.d/apache2
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-#
-# /etc/init.d/apache2
-#
-NAME=apache2
-
-#
-# This is an workaround, if the path targets into a ramfs
-#
-mkdir -p @LOGPATH@
-
-case "$1" in
-    start)
-	echo -n "Starting $NAME: "
-	if /usr/sbin/apache2 -f @APACHECONFIG@ -k start; then
-	    echo "Done"
-	else
-	    echo "Failed"
-	fi
-	;;
-
-    stop)
-	echo -n "Stopping $NAME: "
-	if /usr/sbin/apache2 -f @APACHECONFIG@ -k stop; then
-	    echo "Done"
-	else
-	    echo "Failed"
-	fi
-	;;
-
-    restart)
-	echo -n "Restarting $NAME: "
-	if /usr/sbin/apache2 -f @APACHECONFIG@ -k restart; then
-            echo "Done"
-        else
-	    echo "Failed"
-        fi
-        ;;
-
-    *)
-        echo "Usage: /etc/init.d/$NAME {start|stop|restart}"
-        exit 1
-        ;;
-esac
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH 2/5] php: reanimate PHP as PHP8

[Juergen Borleis]

PHP5 is gone with commit f356f581e17a9474bdc01dbe3907f96558101609
  "php5: remove old package"

Let's try now with PHP8 instead and a minimal feature set due to limited
test options. The remaining features can be extended on demand.

Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
---
 projectroot/etc/{php5 => php8}/php.ini |   0
 rules/php8.in                          |  72 +++++++++++++++
 rules/php8.make                        | 123 +++++++++++++++++++++++++
 3 files changed, 195 insertions(+)
 rename projectroot/etc/{php5 => php8}/php.ini (100%)
 create mode 100644 rules/php8.in
 create mode 100644 rules/php8.make

diff --git a/projectroot/etc/php5/php.ini b/projectroot/etc/php8/php.ini
similarity index 100%
rename from projectroot/etc/php5/php.ini
rename to projectroot/etc/php8/php.ini
diff --git a/rules/php8.in b/rules/php8.in
new file mode 100644
index 0000000..a3b498e
--- /dev/null
+++ b/rules/php8.in
@@ -0,0 +1,72 @@
+## SECTION=scripting_languages
+# php6 configuration
+
+menuconfig PHP8
+	tristate
+	prompt "php8                          "
+	select GLIBC_M
+	help
+	  PHP, which stands for "PHP: Hypertext Preprocessor" is a widely-used
+	  general-purpose scripting language that is especially suited for web
+	  development and can be embedded into HTML.
+
+if PHP8
+
+config PHP8_INI
+	bool
+	prompt "install /etc/php8/php.ini"
+	default y
+	help
+	  Installs (if present) the
+	  "./projectroot/etc/php8/php.ini" file from your
+	  workspace, otherwise a generic one from the ptxdist
+	  directory.
+
+# ----------------------------------------------------------------------------
+# SAPI Modules (add more on demand)
+# ----------------------------------------------------------------------------
+
+choice
+	prompt "SAPI Module"
+	default PHP8_SAPI_NONE
+	help
+	  Select one of the SAP (Server Application Programming) Interfaces to
+	  be supported at run-time. It is possible to select no SAP interface
+	  here, then your PHP supports a command line interface (CLI) only.
+
+config PHP8_SAPI_CGI
+	bool
+	prompt "cgi"
+	help
+	  Build standard CGI version of PHP.
+
+config PHP8_SAPI_NONE
+	bool
+	prompt "none"
+	select PHP8_SAPI_CLI
+	help
+	  This forces a command line interface variant only.
+
+endchoice
+
+config PHP8_SESSION
+	bool
+	prompt "session support"
+	default y
+	help
+	  A session is a way to store information to be used across multiple
+	  pages. The information is stored locally only.
+
+config PHP8_SAPI_CLI
+	bool
+	prompt "cli"
+	help
+	  Build command line interface (CLI) version of PHP
+
+config PHP8_DEUBG
+	bool
+	prompt "Build debug variant"
+	help
+	  Enable this entry to build a debug variant (no optimization)
+
+endif
diff --git a/rules/php8.make b/rules/php8.make
new file mode 100644
index 0000000..2f0e254
--- /dev/null
+++ b/rules/php8.make
@@ -0,0 +1,123 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2006-2008 by Robert Schwebel
+#               2009, 2012 by Marc Kleine-Budde <mkl@pengutronix.de>
+#               2015 by Bruno Thomsen <bth@kamstrup.com>
+#               2021 by Juergen Borleis <jbe@pengutronix.de>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_PHP8) += php8
+
+#
+# Paths and names
+#
+PHP8_VERSION	:= 8.0.9
+PHP8_MD5	:= 68a8cae879bb66425f6cfb11d94ceb02
+PHP8		:= php-$(PHP8_VERSION)
+PHP8_SUFFIX	:= tar.xz
+PHP8_SOURCE	:= $(SRCDIR)/$(PHP8).$(PHP8_SUFFIX)
+PHP8_DIR	:= $(BUILDDIR)/$(PHP8)
+
+#
+# Note: older releases are moved to the 'museum', but the 'de.php.net'
+# response with a HTML file instead of the archive. So, try the 'museum'
+# URL first
+#
+PHP8_URL := \
+	http://museum.php.net/php8/$(PHP8).$(PHP8_SUFFIX) \
+	http://de.php.net/distributions/$(PHP8).$(PHP8_SUFFIX)
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+PHP8_CONF_ENV := \
+	$(CROSS_ENV) \
+	ac_cv_prog_cc_cross=yes \
+	ac_cv_c_bigendian_php=$(call ptx/yesno, PTXCONF_ENDIAN_BIG)
+
+#
+# autoconf
+#
+PHP8_AUTOCONF := \
+	$(CROSS_AUTOCONF_USR) \
+	--with-config-file-path=/etc/php8 \
+	--without-iconv \
+	--disable-phpdbg \
+	--with-libdir=/usr/$(CROSS_LIB_DIR) \
+	--disable-opcache \
+	--disable-zend-signals
+
+# ----------------------------------------------------------------------------
+# Network options
+# ----------------------------------------------------------------------------
+
+ifndef PTXCONF_GLOBAL_IPV6
+PHP8_AUTOCONF += --disable-ipv6
+endif
+
+# ----------------------------------------------------------------------------
+# One of the "Server Application Programming Interfaces"
+# ----------------------------------------------------------------------------
+
+ifndef PTXCONF_PHP8_SAPI_CGI
+PHP8_AUTOCONF += \
+	--disable-cgi
+endif
+
+# ----------------------------------------------------------------------------
+# Generic configurations
+# ----------------------------------------------------------------------------
+
+ifndef PTXCONF_PHP8_SAPI_CLI
+PHP8_AUTOCONF += --disable-cli
+endif
+
+ifdef PTXCONF_PHP8_DEUBG
+PHP8_AUTOCONF += --enable-debug
+endif
+
+# ----------------------------------------------------------------------------
+# Extensions
+# ----------------------------------------------------------------------------
+
+# Please extend on demand...
+PHP8_AUTOCONF += --disable-all \
+	--$(call ptx/endis, PTXCONF_PHP8_SESSION)-session
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/php8.targetinstall:
+	@$(call targetinfo)
+
+	@$(call install_init, php8)
+	@$(call install_fixup, php8,PRIORITY,optional)
+	@$(call install_fixup, php8,SECTION,base)
+	@$(call install_fixup, php8,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
+	@$(call install_fixup, php8,DESCRIPTION,missing)
+
+ifdef PTXCONF_PHP8_SAPI_CLI
+	@$(call install_copy, php8, 0, 0, 0755, -, /usr/bin/php)
+endif
+
+ifdef PTXCONF_PHP8_SAPI_CGI
+	@$(call install_copy, php8, 0, 0, 0755, -, /usr/bin/php-cgi)
+endif
+
+ifdef PTXCONF_PHP8_INI
+	@$(call install_alternative, php8, 0, 0, 0644, /etc/php8/php.ini)
+endif
+
+	@$(call install_finish, php8)
+
+	@$(call touch)
+
+# vim: syntax=make
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH 3/5] lighttpd: reenable PHP support via "fast cgi"

[Juergen Borleis]

With PHP8 at hand, the lighttpd's "fast cgi" feature can be used again.

Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
---
 rules/lighttpd.in | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rules/lighttpd.in b/rules/lighttpd.in
index 1f853c7..aecdcc0 100644
--- a/rules/lighttpd.in
+++ b/rules/lighttpd.in
@@ -18,6 +18,7 @@ menuconfig LIGHTTPD
 	select LIBMEMCACHED		if LIGHTTPD_MEMCACHED
 	select LUA			if LIGHTTPD_LUA
 	select LUA_INSTALL_LIBLUA	if LIGHTTPD_LUA
+	select PHP8			if LIGHTTPD_MOD_FASTCGI_PHP && RUNTIME
 	select BUSYBOX_START_STOP_DAEMON			if LIGHTTPD_STARTSCRIPT
 	select BUSYBOX_FEATURE_START_STOP_DAEMON_FANCY		if LIGHTTPD_STARTSCRIPT
 	select BUSYBOX_FEATURE_START_STOP_DAEMON_LONG_OPTIONS	if LIGHTTPD_STARTSCRIPT
@@ -146,12 +147,14 @@ if LIGHTTPD_MOD_FASTCGI
 
 config LIGHTTPD_MOD_FASTCGI_PHP
 	bool
-	depends on BROKEN
 	prompt "setup php handling with fastcgi"
 	help
 	  Enables the necessary packages and configuration files
 	  to enable PHP support in lighttpd
 
+comment "PHP CGI SAPI must be enabled"
+	depends on LIGHTTPD_MOD_FASTCGI_PHP && !PHP8_SAPI_CGI
+
 endif
 
 config LIGHTTPD_MOD_MAGNET
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH 4/5] openvpn: still allow initV support

[Juergen Borleis]

Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
---
 rules/openvpn.make | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/rules/openvpn.make b/rules/openvpn.make
index 46cca64..d5f2b81 100644
--- a/rules/openvpn.make
+++ b/rules/openvpn.make
@@ -43,8 +43,11 @@ OPENVPN_CONF_ENV	:= \
 	IFCONFIG=/usr/sbin/ifconfig \
 	IPROUTE=/usr/sbin/ip \
 	NETSTAT=/usr/bin/netstat \
-	ROUTE=/usr/sbin/route \
-	SYSTEMD_ASK_PASSWORD=/usr/bin/systemd-ask-password
+	ROUTE=/usr/sbin/route
+
+ifdef PTXCONF_OPENVPN_SYSTEMD
+OPENVPN_CONF_ENV += SYSTEMD_ASK_PASSWORD=/usr/bin/systemd-ask-password
+endif
 
 #
 # autoconf
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH 5/5] openvpn: version bump 2.4.6 -> 2.5.3

[Juergen Borleis]

Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
---
 rules/openvpn.make | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/rules/openvpn.make b/rules/openvpn.make
index d5f2b81..0d7e71f 100644
--- a/rules/openvpn.make
+++ b/rules/openvpn.make
@@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_OPENVPN) += openvpn
 #
 # Paths and names
 #
-OPENVPN_VERSION		:= 2.4.6
-OPENVPN_MD5		:= 3a1f3f63bdaede443b4df49957df9405
+OPENVPN_VERSION		:= 2.5.3
+OPENVPN_MD5		:= a51827cd3ac60fae5a7add77a8d3080d
 OPENVPN			:= openvpn-$(OPENVPN_VERSION)
 OPENVPN_SUFFIX		:= tar.xz
-OPENVPN_URL		:= http://swupdate.openvpn.org/community/releases/$(OPENVPN).$(OPENVPN_SUFFIX)
+OPENVPN_URL		:= https://swupdate.openvpn.org/community/releases/$(OPENVPN).$(OPENVPN_SUFFIX)
 OPENVPN_SOURCE		:= $(SRCDIR)/$(OPENVPN).$(OPENVPN_SUFFIX)
 OPENVPN_DIR		:= $(BUILDDIR)/$(OPENVPN)
 OPENVPN_LICENSE		:= GPL-2.0-only WITH openvpn-openssl-exception AND BSD-2-Clause AND BSD-3-Clause
@@ -58,10 +58,8 @@ OPENVPN_CONF_OPT	:= \
 	--$(call ptx/endis, PTXCONF_OPENVPN_LZO)-lzo \
 	--disable-lz4 \
 	--disable-comp-stub \
-	--enable-crypto \
 	--enable-ofb-cfb \
 	--disable-x509-alt-username \
-	--enable-server \
 	--disable-plugins \
 	--enable-management \
 	--disable-pkcs11 \
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [PATCH 2/5] php: reanimate PHP as PHP8

[Gieseler, Christian]

Hi,
> -----Ursprüngliche Nachricht-----
> Von: ptxdist <ptxdist-bounces@pengutronix.de> Im Auftrag von Juergen
> Borleis
> Gesendet: Donnerstag, 12. August 2021 12:40
> An: ptxdist@pengutronix.de
> Betreff: [ptxdist] [PATCH 2/5] php: reanimate PHP as PHP8
> 
> PHP5 is gone with commit f356f581e17a9474bdc01dbe3907f96558101609
>   "php5: remove old package"
> 
> Let's try now with PHP8 instead and a minimal feature set due to limited test
> options. The remaining features can be extended on demand.
> 
> Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
> ---
>  projectroot/etc/{php5 => php8}/php.ini |   0
>  rules/php8.in                          |  72 +++++++++++++++
>  rules/php8.make                        | 123 +++++++++++++++++++++++++
>  3 files changed, 195 insertions(+)
>  rename projectroot/etc/{php5 => php8}/php.ini (100%)  create mode
> 100644 rules/php8.in  create mode 100644 rules/php8.make
> 
> diff --git a/projectroot/etc/php5/php.ini b/projectroot/etc/php8/php.ini
> similarity index 100% rename from projectroot/etc/php5/php.ini rename to
> projectroot/etc/php8/php.ini diff --git a/rules/php8.in b/rules/php8.in new
> file mode 100644 index 0000000..a3b498e
> --- /dev/null
> +++ b/rules/php8.in
> @@ -0,0 +1,72 @@
> +## SECTION=scripting_languages
> +# php6 configuration
This is probably a typo and should be php8 instead of php6.

BR,
Christian

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [PATCH 2/5] php: reanimate PHP as PHP8

[Juergen Borleis]

Hi Christian,

Am Donnerstag, den 12.08.2021, 11:15 +0000 schrieb Gieseler, Christian:
> […]
> > --- /dev/null
> > +++ b/rules/php8.in
> > @@ -0,0 +1,72 @@
> > +## SECTION=scripting_languages
> > +# php6 configuration
> This is probably a typo and should be php8 instead of php6.

:-) Ups, yes. I think Michael should fix it while committing the patch (instead
of sending a v2).

jb

-- 
Pengutronix e.K.                       | Juergen Borleis             |
Steuerwalder Str. 21                   | https://www.pengutronix.de/ |
31137 Hildesheim, Germany              | Phone: +49-5121-206917-128  |
Amtsgericht Hildesheim, HRA 2686       | Fax:   +49-5121-206917-9    |


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [PATCH 2/5] php: reanimate PHP as PHP8

[Michael Olbrich]

On Thu, Aug 12, 2021 at 12:40:12PM +0200, Juergen Borleis wrote:
> PHP5 is gone with commit f356f581e17a9474bdc01dbe3907f96558101609
>   "php5: remove old package"
> 
> Let's try now with PHP8 instead and a minimal feature set due to limited
> test options. The remaining features can be extended on demand.
> 
> Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
> ---
>  projectroot/etc/{php5 => php8}/php.ini |   0
>  rules/php8.in                          |  72 +++++++++++++++
>  rules/php8.make                        | 123 +++++++++++++++++++++++++
>  3 files changed, 195 insertions(+)
>  rename projectroot/etc/{php5 => php8}/php.ini (100%)
>  create mode 100644 rules/php8.in
>  create mode 100644 rules/php8.make
> 
> diff --git a/projectroot/etc/php5/php.ini b/projectroot/etc/php8/php.ini
> similarity index 100%
> rename from projectroot/etc/php5/php.ini
> rename to projectroot/etc/php8/php.ini
> diff --git a/rules/php8.in b/rules/php8.in
> new file mode 100644
> index 0000000..a3b498e
> --- /dev/null
> +++ b/rules/php8.in
> @@ -0,0 +1,72 @@
> +## SECTION=scripting_languages
> +# php6 configuration
> +
> +menuconfig PHP8
> +	tristate
> +	prompt "php8                          "
> +	select GLIBC_M
> +	help
> +	  PHP, which stands for "PHP: Hypertext Preprocessor" is a widely-used
> +	  general-purpose scripting language that is especially suited for web
> +	  development and can be embedded into HTML.
> +
> +if PHP8
> +
> +config PHP8_INI
> +	bool
> +	prompt "install /etc/php8/php.ini"
> +	default y
> +	help
> +	  Installs (if present) the
> +	  "./projectroot/etc/php8/php.ini" file from your
> +	  workspace, otherwise a generic one from the ptxdist
> +	  directory.

No option for this please.

> +
> +# ----------------------------------------------------------------------------
> +# SAPI Modules (add more on demand)
> +# ----------------------------------------------------------------------------
> +
> +choice
> +	prompt "SAPI Module"
> +	default PHP8_SAPI_NONE
> +	help
> +	  Select one of the SAP (Server Application Programming) Interfaces to
> +	  be supported at run-time. It is possible to select no SAP interface
> +	  here, then your PHP supports a command line interface (CLI) only.
> +
> +config PHP8_SAPI_CGI
> +	bool
> +	prompt "cgi"
> +	help
> +	  Build standard CGI version of PHP.
> +
> +config PHP8_SAPI_NONE
> +	bool
> +	prompt "none"
> +	select PHP8_SAPI_CLI
> +	help
> +	  This forces a command line interface variant only.
> +
> +endchoice
> +
> +config PHP8_SESSION
> +	bool
> +	prompt "session support"
> +	default y
> +	help
> +	  A session is a way to store information to be used across multiple
> +	  pages. The information is stored locally only.
> +
> +config PHP8_SAPI_CLI
> +	bool
> +	prompt "cli"
> +	help
> +	  Build command line interface (CLI) version of PHP
> +
> +config PHP8_DEUBG
> +	bool
> +	prompt "Build debug variant"
> +	help
> +	  Enable this entry to build a debug variant (no optimization)

Drop the debug option. We don't have this for other packages either.

> +
> +endif
> diff --git a/rules/php8.make b/rules/php8.make
> new file mode 100644
> index 0000000..2f0e254
> --- /dev/null
> +++ b/rules/php8.make
> @@ -0,0 +1,123 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2006-2008 by Robert Schwebel
> +#               2009, 2012 by Marc Kleine-Budde <mkl@pengutronix.de>
> +#               2015 by Bruno Thomsen <bth@kamstrup.com>
> +#               2021 by Juergen Borleis <jbe@pengutronix.de>
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_PHP8) += php8
> +
> +#
> +# Paths and names
> +#
> +PHP8_VERSION	:= 8.0.9
> +PHP8_MD5	:= 68a8cae879bb66425f6cfb11d94ceb02
> +PHP8		:= php-$(PHP8_VERSION)
> +PHP8_SUFFIX	:= tar.xz
> +PHP8_SOURCE	:= $(SRCDIR)/$(PHP8).$(PHP8_SUFFIX)
> +PHP8_DIR	:= $(BUILDDIR)/$(PHP8)
> +
> +#
> +# Note: older releases are moved to the 'museum', but the 'de.php.net'
> +# response with a HTML file instead of the archive. So, try the 'museum'
> +# URL first
> +#
> +PHP8_URL := \
> +	http://museum.php.net/php8/$(PHP8).$(PHP8_SUFFIX) \
> +	http://de.php.net/distributions/$(PHP8).$(PHP8_SUFFIX)
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +PHP8_CONF_ENV := \
> +	$(CROSS_ENV) \
> +	ac_cv_prog_cc_cross=yes \
> +	ac_cv_c_bigendian_php=$(call ptx/yesno, PTXCONF_ENDIAN_BIG)
> +
> +#
> +# autoconf
> +#
> +PHP8_AUTOCONF := \
> +	$(CROSS_AUTOCONF_USR) \
> +	--with-config-file-path=/etc/php8 \
> +	--without-iconv \
> +	--disable-phpdbg \
> +	--with-libdir=/usr/$(CROSS_LIB_DIR) \
> +	--disable-opcache \
> +	--disable-zend-signals
> +

In general, I'd like to add all options here, correctly ordered. This way,
configure_helper.py can work.

> +# ----------------------------------------------------------------------------
> +# Network options
> +# ----------------------------------------------------------------------------
> +
> +ifndef PTXCONF_GLOBAL_IPV6
> +PHP8_AUTOCONF += --disable-ipv6
> +endif

Is --enable-ipv6 broken?

> +
> +# ----------------------------------------------------------------------------
> +# One of the "Server Application Programming Interfaces"
> +# ----------------------------------------------------------------------------
> +
> +ifndef PTXCONF_PHP8_SAPI_CGI
> +PHP8_AUTOCONF += \
> +	--disable-cgi
> +endif

Same here.

> +
> +# ----------------------------------------------------------------------------
> +# Generic configurations
> +# ----------------------------------------------------------------------------
> +
> +ifndef PTXCONF_PHP8_SAPI_CLI
> +PHP8_AUTOCONF += --disable-cli
> +endif

And here.

Michael

> +
> +ifdef PTXCONF_PHP8_DEUBG
> +PHP8_AUTOCONF += --enable-debug
> +endif
> +
> +# ----------------------------------------------------------------------------
> +# Extensions
> +# ----------------------------------------------------------------------------
> +
> +# Please extend on demand...
> +PHP8_AUTOCONF += --disable-all \
> +	--$(call ptx/endis, PTXCONF_PHP8_SESSION)-session
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/php8.targetinstall:
> +	@$(call targetinfo)
> +
> +	@$(call install_init, php8)
> +	@$(call install_fixup, php8,PRIORITY,optional)
> +	@$(call install_fixup, php8,SECTION,base)
> +	@$(call install_fixup, php8,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
> +	@$(call install_fixup, php8,DESCRIPTION,missing)
> +
> +ifdef PTXCONF_PHP8_SAPI_CLI
> +	@$(call install_copy, php8, 0, 0, 0755, -, /usr/bin/php)
> +endif
> +
> +ifdef PTXCONF_PHP8_SAPI_CGI
> +	@$(call install_copy, php8, 0, 0, 0755, -, /usr/bin/php-cgi)
> +endif
> +
> +ifdef PTXCONF_PHP8_INI
> +	@$(call install_alternative, php8, 0, 0, 0644, /etc/php8/php.ini)
> +endif
> +
> +	@$(call install_finish, php8)
> +
> +	@$(call touch)
> +
> +# vim: syntax=make
> -- 
> 2.20.1
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
> 

-- 
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
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [PATCH 2/5] php: reanimate PHP as PHP8

[Michael Olbrich]

On Thu, Aug 12, 2021 at 12:40:12PM +0200, Juergen Borleis wrote:
> PHP5 is gone with commit f356f581e17a9474bdc01dbe3907f96558101609
>   "php5: remove old package"
> 
> Let's try now with PHP8 instead and a minimal feature set due to limited
> test options. The remaining features can be extended on demand.
> 
> Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
> ---
>  projectroot/etc/{php5 => php8}/php.ini |   0
>  rules/php8.in                          |  72 +++++++++++++++
>  rules/php8.make                        | 123 +++++++++++++++++++++++++
>  3 files changed, 195 insertions(+)
>  rename projectroot/etc/{php5 => php8}/php.ini (100%)
>  create mode 100644 rules/php8.in
>  create mode 100644 rules/php8.make
> 
> diff --git a/projectroot/etc/php5/php.ini b/projectroot/etc/php8/php.ini
> similarity index 100%
> rename from projectroot/etc/php5/php.ini
> rename to projectroot/etc/php8/php.ini
> diff --git a/rules/php8.in b/rules/php8.in
> new file mode 100644
> index 0000000..a3b498e
> --- /dev/null
> +++ b/rules/php8.in
> @@ -0,0 +1,72 @@
> +## SECTION=scripting_languages
> +# php6 configuration
> +
> +menuconfig PHP8
> +	tristate
> +	prompt "php8                          "
> +	select GLIBC_M
> +	help
> +	  PHP, which stands for "PHP: Hypertext Preprocessor" is a widely-used
> +	  general-purpose scripting language that is especially suited for web
> +	  development and can be embedded into HTML.
> +
> +if PHP8
> +
> +config PHP8_INI
> +	bool
> +	prompt "install /etc/php8/php.ini"
> +	default y
> +	help
> +	  Installs (if present) the
> +	  "./projectroot/etc/php8/php.ini" file from your
> +	  workspace, otherwise a generic one from the ptxdist
> +	  directory.
> +
> +# ----------------------------------------------------------------------------
> +# SAPI Modules (add more on demand)
> +# ----------------------------------------------------------------------------
> +
> +choice
> +	prompt "SAPI Module"
> +	default PHP8_SAPI_NONE
> +	help
> +	  Select one of the SAP (Server Application Programming) Interfaces to
> +	  be supported at run-time. It is possible to select no SAP interface
> +	  here, then your PHP supports a command line interface (CLI) only.

This this mean, we can only build one or no SAPI? Not multiple?

Michael

> +
> +config PHP8_SAPI_CGI
> +	bool
> +	prompt "cgi"
> +	help
> +	  Build standard CGI version of PHP.
> +
> +config PHP8_SAPI_NONE
> +	bool
> +	prompt "none"
> +	select PHP8_SAPI_CLI
> +	help
> +	  This forces a command line interface variant only.
> +
> +endchoice
> +
> +config PHP8_SESSION
> +	bool
> +	prompt "session support"
> +	default y
> +	help
> +	  A session is a way to store information to be used across multiple
> +	  pages. The information is stored locally only.
> +
> +config PHP8_SAPI_CLI
> +	bool
> +	prompt "cli"
> +	help
> +	  Build command line interface (CLI) version of PHP
> +
> +config PHP8_DEUBG
> +	bool
> +	prompt "Build debug variant"
> +	help
> +	  Enable this entry to build a debug variant (no optimization)
> +
> +endif
> diff --git a/rules/php8.make b/rules/php8.make
> new file mode 100644
> index 0000000..2f0e254
> --- /dev/null
> +++ b/rules/php8.make
> @@ -0,0 +1,123 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2006-2008 by Robert Schwebel
> +#               2009, 2012 by Marc Kleine-Budde <mkl@pengutronix.de>
> +#               2015 by Bruno Thomsen <bth@kamstrup.com>
> +#               2021 by Juergen Borleis <jbe@pengutronix.de>
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_PHP8) += php8
> +
> +#
> +# Paths and names
> +#
> +PHP8_VERSION	:= 8.0.9
> +PHP8_MD5	:= 68a8cae879bb66425f6cfb11d94ceb02
> +PHP8		:= php-$(PHP8_VERSION)
> +PHP8_SUFFIX	:= tar.xz
> +PHP8_SOURCE	:= $(SRCDIR)/$(PHP8).$(PHP8_SUFFIX)
> +PHP8_DIR	:= $(BUILDDIR)/$(PHP8)
> +
> +#
> +# Note: older releases are moved to the 'museum', but the 'de.php.net'
> +# response with a HTML file instead of the archive. So, try the 'museum'
> +# URL first
> +#
> +PHP8_URL := \
> +	http://museum.php.net/php8/$(PHP8).$(PHP8_SUFFIX) \
> +	http://de.php.net/distributions/$(PHP8).$(PHP8_SUFFIX)
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +PHP8_CONF_ENV := \
> +	$(CROSS_ENV) \
> +	ac_cv_prog_cc_cross=yes \
> +	ac_cv_c_bigendian_php=$(call ptx/yesno, PTXCONF_ENDIAN_BIG)
> +
> +#
> +# autoconf
> +#
> +PHP8_AUTOCONF := \
> +	$(CROSS_AUTOCONF_USR) \
> +	--with-config-file-path=/etc/php8 \
> +	--without-iconv \
> +	--disable-phpdbg \
> +	--with-libdir=/usr/$(CROSS_LIB_DIR) \
> +	--disable-opcache \
> +	--disable-zend-signals
> +
> +# ----------------------------------------------------------------------------
> +# Network options
> +# ----------------------------------------------------------------------------
> +
> +ifndef PTXCONF_GLOBAL_IPV6
> +PHP8_AUTOCONF += --disable-ipv6
> +endif
> +
> +# ----------------------------------------------------------------------------
> +# One of the "Server Application Programming Interfaces"
> +# ----------------------------------------------------------------------------
> +
> +ifndef PTXCONF_PHP8_SAPI_CGI
> +PHP8_AUTOCONF += \
> +	--disable-cgi
> +endif
> +
> +# ----------------------------------------------------------------------------
> +# Generic configurations
> +# ----------------------------------------------------------------------------
> +
> +ifndef PTXCONF_PHP8_SAPI_CLI
> +PHP8_AUTOCONF += --disable-cli
> +endif
> +
> +ifdef PTXCONF_PHP8_DEUBG
> +PHP8_AUTOCONF += --enable-debug
> +endif
> +
> +# ----------------------------------------------------------------------------
> +# Extensions
> +# ----------------------------------------------------------------------------
> +
> +# Please extend on demand...
> +PHP8_AUTOCONF += --disable-all \
> +	--$(call ptx/endis, PTXCONF_PHP8_SESSION)-session
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/php8.targetinstall:
> +	@$(call targetinfo)
> +
> +	@$(call install_init, php8)
> +	@$(call install_fixup, php8,PRIORITY,optional)
> +	@$(call install_fixup, php8,SECTION,base)
> +	@$(call install_fixup, php8,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
> +	@$(call install_fixup, php8,DESCRIPTION,missing)
> +
> +ifdef PTXCONF_PHP8_SAPI_CLI
> +	@$(call install_copy, php8, 0, 0, 0755, -, /usr/bin/php)
> +endif
> +
> +ifdef PTXCONF_PHP8_SAPI_CGI
> +	@$(call install_copy, php8, 0, 0, 0755, -, /usr/bin/php-cgi)
> +endif
> +
> +ifdef PTXCONF_PHP8_INI
> +	@$(call install_alternative, php8, 0, 0, 0644, /etc/php8/php.ini)
> +endif
> +
> +	@$(call install_finish, php8)
> +
> +	@$(call touch)
> +
> +# vim: syntax=make
> -- 
> 2.20.1
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
> 

-- 
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
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [PATCH 4/5] openvpn: still allow initV support

[Michael Olbrich]

On Thu, Aug 12, 2021 at 12:40:14PM +0200, Juergen Borleis wrote:
> Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
> ---
>  rules/openvpn.make | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/rules/openvpn.make b/rules/openvpn.make
> index 46cca64..d5f2b81 100644
> --- a/rules/openvpn.make
> +++ b/rules/openvpn.make
> @@ -43,8 +43,11 @@ OPENVPN_CONF_ENV	:= \
>  	IFCONFIG=/usr/sbin/ifconfig \
>  	IPROUTE=/usr/sbin/ip \
>  	NETSTAT=/usr/bin/netstat \
> -	ROUTE=/usr/sbin/route \
> -	SYSTEMD_ASK_PASSWORD=/usr/bin/systemd-ask-password
> +	ROUTE=/usr/sbin/route
> +
> +ifdef PTXCONF_OPENVPN_SYSTEMD
> +OPENVPN_CONF_ENV += SYSTEMD_ASK_PASSWORD=/usr/bin/systemd-ask-password
> +endif

What's the difference between not specifying SYSTEMD_ASK_PASSWORD and
/usr/bin/systemd-ask-password missing?

In other words, what happens if we build with
SYSTEMD_ASK_PASSWORD=/usr/bin/systemd-ask-password and systemd is not
actually used?

Will it try to find it at build-time anyways? Does it work differently at
runtime if no program is configured?

Michael

>  
>  #
>  # autoconf
> -- 
> 2.20.1
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
> 

-- 
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
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de