Attachment 251877 Details for Bug 280134 – fbring rc script in-line with the rest of the ports collection

[patch] fbring rc script in-line with the rest of the ports collection

php_fpm_rc.diff (text/plain), 4.33 KB, created by Alexander Leidinger on 2024-07-05 07:54:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Leidinger

Created: 2024-07-05 07:54:58 UTC

Size: 4.33 KB

patch

obsolete

>diff --git UPDATING UPDATING
>index 6f7d93fd151..2f0d87b57b3 100644
>--- UPDATING
>+++ UPDATING
>@@ -5,6 +5,22 @@ they are unavoidable.
> You should get into the habit of checking this file for changes each time
> you update your ports collection, before attempting any port upgrades.
> 
>+202407xx:
>+  AFFECTS: lang/php81, lang/php82, lang/php83
>+  AUTHOR: netchildFreeBSD.org
>+
>+  The start scripts of php-fpm have been renamed to php_fpm for improved
>+  compatibility with other parts of the system. The automatic start at boot
>+  (rc.conf variable settings) is not affected, but if you have some other
>+  automatism you may want to change
>+    ".../etc/rc.d/php-fpm" to ".../etc/rc.d/php_fpm"
>+  or
>+    "service php-fpm ..." to "service php_fpm ..."
>+
>+  If you have custom start scripts which depend upon php-fpm, you need to
>+  change the REQUIRE lines in them from "php-fpm" to "php_fpm".
>+
>+
> 20240704:
>   AFFECTS: net/xrdp and x11-drivers/xorgxrdp
>   AUTHOR: meta@FreeBSD.org
>diff --git lang/php81/Makefile lang/php81/Makefile
>index 750403b7109..bade73f706f 100644
>--- lang/php81/Makefile
>+++ lang/php81/Makefile
>@@ -79,7 +79,7 @@ FPM_CONFIGURE_ON=	--enable-fpm \
> 			--with-fpm-group=${WWWGRP} \
> 			--with-fpm-user=${WWWOWN}
> FPM_VARS=		PHP_SAPI+=fpm \
>-			USE_RC_SUBR+=php-fpm
>+			USE_RC_SUBR+=php_fpm
> IPV6_CONFIGURE_OFF=	--disable-ipv6
> LINKTHR_LIBS=		-lpthread
> MYSQLND_CONFIGURE_ON=	--enable-mysqlnd
>diff --git lang/php81/files/php_fpm.in lang/php81/files/php_fpm.in
>index 9f753ea485e..12253b537b2 100644
>--- lang/php81/files/php_fpm.in
>+++ lang/php81/files/php_fpm.in
>@@ -1,14 +1,14 @@
> #!/bin/sh
> 
>-# PROVIDE: php-fpm
>+# PROVIDE: php_fpm
> # REQUIRE: LOGIN
> # KEYWORD: shutdown
> 
> #
> # Add the following line to /etc/rc.conf to enable php-fpm:
>-# php-fpm_enable (bool):        Set to "NO" by default.
>+# php_fpm_enable (bool):        Set to "NO" by default.
> #                               Set it to "YES" to enable php-fpm
>-# php-fpm_profiles (str):       Set to "" by default.
>+# php_fpm_profiles (str):       Set to "" by default.
> #                               Define your profiles here.
> # php_fpm_pid_prefix (str):     Set to "" by default.
> #                               When using profiles manually assign value to "php_fpm_"
>diff --git lang/php82/Makefile lang/php82/Makefile
>index 5d3f58f61ef..41830ac43a5 100644
>--- lang/php82/Makefile
>+++ lang/php82/Makefile
>@@ -76,7 +76,7 @@ FPM_CONFIGURE_ON=	--enable-fpm \
> 			--with-fpm-group=${WWWGRP} \
> 			--with-fpm-user=${WWWOWN}
> FPM_VARS=		PHP_SAPI+=fpm \
>-			USE_RC_SUBR+=php-fpm
>+			USE_RC_SUBR+=php_fpm
> IPV6_CONFIGURE_OFF=	--disable-ipv6
> LINKTHR_LIBS=		-lpthread
> MYSQLND_CONFIGURE_ON=	--enable-mysqlnd
>diff --git lang/php82/files/php_fpm.in lang/php82/files/php_fpm.in
>index c234856b0e5..2701fe29e28 100644
>--- lang/php82/files/php_fpm.in
>+++ lang/php82/files/php_fpm.in
>@@ -1,6 +1,6 @@
> #!/bin/sh
> 
>-# PROVIDE: php-fpm
>+# PROVIDE: php_fpm
> # REQUIRE: LOGIN
> # KEYWORD: shutdown
> 
>@@ -19,6 +19,8 @@ restart_precmd="php_fpm_checkconfig"
> reload_precmd="php_fpm_checkconfig"
> configtest_cmd="php_fpm_checkconfig"
> 
>+: ${php_fpm_svcj_options:="net_basic"}
>+
> load_rc_config "$name"
> 
> : ${php_fpm_enable="NO"}
>diff --git lang/php83/Makefile lang/php83/Makefile
>index ba09317b3de..76d9cb2cdc1 100644
>--- lang/php83/Makefile
>+++ lang/php83/Makefile
>@@ -76,7 +76,7 @@ FPM_CONFIGURE_ON=	--enable-fpm \
> 			--with-fpm-group=${WWWGRP} \
> 			--with-fpm-user=${WWWOWN}
> FPM_VARS=		PHP_SAPI+=fpm \
>-			USE_RC_SUBR+=php-fpm
>+			USE_RC_SUBR+=php_fpm
> IPV6_CONFIGURE_OFF=	--disable-ipv6
> LINKTHR_LIBS=		-lpthread
> NOASLR_USES=	elfctl
>diff --git lang/php83/files/php_fpm.in lang/php83/files/php_fpm.in
>index 9f753ea485e..12253b537b2 100644
>--- lang/php83/files/php_fpm.in
>+++ lang/php83/files/php_fpm.in
>@@ -1,14 +1,14 @@
> #!/bin/sh
> 
>-# PROVIDE: php-fpm
>+# PROVIDE: php_fpm
> # REQUIRE: LOGIN
> # KEYWORD: shutdown
> 
> #
> # Add the following line to /etc/rc.conf to enable php-fpm:
>-# php-fpm_enable (bool):        Set to "NO" by default.
>+# php_fpm_enable (bool):        Set to "NO" by default.
> #                               Set it to "YES" to enable php-fpm
>-# php-fpm_profiles (str):       Set to "" by default.
>+# php_fpm_profiles (str):       Set to "" by default.
> #                               Define your profiles here.
> # php_fpm_pid_prefix (str):     Set to "" by default.
> #                               When using profiles manually assign value to "php_fpm_"

Actions: View | Diff

Attachments on bug 280134: 251877