Sun Aug 29 17:49:44 2021 UTC ()
php-fpm: let the RC script work unprivileged

This takes advantage of the introduction of the SYSCONFBASE variable.
Tested on NetBSD/amd64, macOS/amd64.

Bumps PKGREVISION.


(khorben)
diff -r1.35 -r1.36 pkgsrc/www/php-fpm/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/www/php-fpm/files/php_fpm.sh
cvs diff -r1.35 -r1.36 pkgsrc/www/php-fpm/Makefile (expand / switch to unified diff)

--- pkgsrc/www/php-fpm/Makefile 2021/04/21 11:42:55 1.35
+++ pkgsrc/www/php-fpm/Makefile 2021/08/29 17:49:44 1.36
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.35 2021/04/21 11:42:55 adam Exp $ 1# $NetBSD: Makefile,v 1.36 2021/08/29 17:49:44 khorben Exp $
2 2
3PKGNAME= ${PHP_PKG_PREFIX}-fpm-${PHP_VERSION} 3PKGNAME= ${PHP_PKG_PREFIX}-fpm-${PHP_VERSION}
4PKGREVISION= 6 4PKGREVISION= 7
5 5
6HOMEPAGE= https://php-fpm.org/ 6HOMEPAGE= https://php-fpm.org/
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8COMMENT= FPM interface for ${PKG_PHP} 8COMMENT= FPM interface for ${PKG_PHP}
9LICENSE= 2-clause-bsd 9LICENSE= 2-clause-bsd
10 10
11USE_TOOLS+= pkg-config 11USE_TOOLS+= pkg-config
12 12
13LIBTOOL_OVERRIDE= # empty 13LIBTOOL_OVERRIDE= # empty
14 14
15.include "../../mk/bsd.prefs.mk" 15.include "../../mk/bsd.prefs.mk"
16 16
17FPM_USER?= fpm 17FPM_USER?= fpm
cvs diff -r1.1.1.1 -r1.2 pkgsrc/www/php-fpm/files/php_fpm.sh (expand / switch to unified diff)

--- pkgsrc/www/php-fpm/files/php_fpm.sh 2012/02/22 10:43:42 1.1.1.1
+++ pkgsrc/www/php-fpm/files/php_fpm.sh 2021/08/29 17:49:44 1.2
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1#!@RCD_SCRIPTS_SHELL@ 1#!@RCD_SCRIPTS_SHELL@
2# 2#
3# $NetBSD: php_fpm.sh,v 1.1.1.1 2012/02/22 10:43:42 fhajny Exp $ 3# $NetBSD: php_fpm.sh,v 1.2 2021/08/29 17:49:44 khorben Exp $
4# 4#
5# PROVIDE: php_fpm 5# PROVIDE: php_fpm
6# REQUIRE: DAEMON 6# REQUIRE: DAEMON
7 7
8. /etc/rc.subr 8. @SYSCONFBASE@/rc.subr
9 9
10name="php_fpm" 10name="php_fpm"
11rcvar=${name} 11rcvar=${name}
12command="@PREFIX@/sbin/php-fpm" 12command="@PREFIX@/sbin/php-fpm"
13required_files="@PKG_SYSCONFDIR@/php-fpm.conf" 13required_files="@PKG_SYSCONFDIR@/php-fpm.conf"
14pidfile="@VARBASE@/run/php-fpm.pid" 14pidfile="@VARBASE@/run/php-fpm.pid"
15sig_reload="USR2" 15sig_reload="USR2"
16extra_commands="reload" 16extra_commands="reload"
17 17
18load_rc_config $name 18load_rc_config $name
19run_rc_command "$1" 19run_rc_command "$1"