git: 3b31bc73620b - main - security/shibboleth-sp: allow configuring the www_group

From: Palle Girgensohn <girgen_at_FreeBSD.org>
Date: Thu, 19 Sep 2024 09:40:41 UTC
The branch main has been updated by girgen:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3b31bc73620b2a7a0dc2e26d81b326d0eeebb551

commit 3b31bc73620b2a7a0dc2e26d81b326d0eeebb551
Author:     Palle Girgensohn <girgen@FreeBSD.org>
AuthorDate: 2024-09-19 09:37:17 +0000
Commit:     Palle Girgensohn <girgen@FreeBSD.org>
CommitDate: 2024-09-19 09:39:47 +0000

    security/shibboleth-sp: allow configuring the www_group
    
    If you reconfigured your apache httpd to use a non-standard group, set
    the rc variable shibboleth_www_group to correspond to that group, and
    you will get correct rights for the unix domain socket that mod_shib
    uses to communicate with the shibboleth daemon.
---
 security/shibboleth-sp/Makefile               | 2 +-
 security/shibboleth-sp/files/shibboleth-sp.in | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/security/shibboleth-sp/Makefile b/security/shibboleth-sp/Makefile
index 6f7cd3f1f9dd..90a4c0c3e2dd 100644
--- a/security/shibboleth-sp/Makefile
+++ b/security/shibboleth-sp/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	shibboleth-sp
 PORTVERSION=	3.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security www
 MASTER_SITES=	http://shibboleth.net/downloads/service-provider/${PORTVERSION}/
 
diff --git a/security/shibboleth-sp/files/shibboleth-sp.in b/security/shibboleth-sp/files/shibboleth-sp.in
index 5979c6f440ed..aa6b6af005e8 100644
--- a/security/shibboleth-sp/files/shibboleth-sp.in
+++ b/security/shibboleth-sp/files/shibboleth-sp.in
@@ -21,7 +21,7 @@ keygen_cmd="shibboleth_sp_keygen"
 
 shibboleth_sp_usr=%%SHIBD_USER%%
 shibboleth_sp_group=%%SHIBD_GROUP%%
-www_group=%%WWWGRP%%
+: ${shibboleth_www_group:=%%WWWGRP%%}
 
 load_rc_config $name
 
@@ -43,7 +43,7 @@ shibboleth_sp_configtest() {
 	chmod 755 /var/cache
 	install -d -o ${shibboleth_sp_usr} -g ${shibboleth_sp_group} /var/log/shibboleth
 	install -d -o ${shibboleth_sp_usr} -g ${shibboleth_sp_group} /var/cache/shibboleth
-	install -d -o ${shibboleth_sp_usr} -g ${www_group} -m 750 /var/run/shibboleth
+	install -d -o ${shibboleth_sp_usr} -g ${shibboleth_www_group} -m 750 /var/run/shibboleth
 	${command} ${shibboleth_sp_flags} -u ${shibboleth_sp_usr} -g ${shibboleth_sp_group} -t
 }