git: 009668d53824 - main - security/shibboleth-idp: Include jetty pid configuration file post-jetty update

From: Ryan Steinmetz <zi_at_FreeBSD.org>
Date: Wed, 03 Jul 2024 17:16:48 UTC
The branch main has been updated by zi:

URL: https://cgit.FreeBSD.org/ports/commit/?id=009668d538243d5ea95efce550ec1ed7b5c881dc

commit 009668d538243d5ea95efce550ec1ed7b5c881dc
Author:     Ryan Steinmetz <zi@FreeBSD.org>
AuthorDate: 2024-07-03 17:14:57 +0000
Commit:     Ryan Steinmetz <zi@FreeBSD.org>
CommitDate: 2024-07-03 17:16:18 +0000

    security/shibboleth-idp: Include jetty pid configuration file post-jetty update
    
    - Bump PORTREVISION
---
 security/shibboleth-idp/Makefile               | 4 +++-
 security/shibboleth-idp/files/jetty-pid.xml.in | 8 ++++++++
 security/shibboleth-idp/pkg-plist              | 1 +
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/security/shibboleth-idp/Makefile b/security/shibboleth-idp/Makefile
index 25be6c209f97..12bcdcb8c0c2 100644
--- a/security/shibboleth-idp/Makefile
+++ b/security/shibboleth-idp/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	shibboleth
 PORTVERSION=	4.3.3
+PORTREVISION=	1
 CATEGORIES=	security www
 MASTER_SITES=	http://shibboleth.net/downloads/identity-provider/${PORTVERSION}/ \
 		http://shibboleth.net/downloads/identity-provider/latest4/${PORTVERSION}/ \
@@ -37,7 +38,7 @@ RUNDIR=		/var/run/${PORTNAME}
 USERS=		${SHIBUSER}
 GROUPS=		${SHIBGROUP}
 
-SUB_FILES=	shibboleth
+SUB_FILES=	shibboleth jetty-pid.xml
 
 SUB_LIST+=	SHIBUSER=${SHIBUSER} SHIBGROUP=${SHIBGROUP} \
 		RUNDIR=${RUNDIR} LOGDIR=${LOGDIR}
@@ -59,6 +60,7 @@ do-install:
 .for jar in logback-classic-${LOGBACKVER}.jar logback-core-${LOGBACKVER}.jar
 	${INSTALL_DATA} ${DISTDIR}/${jar} ${STAGEDIR}${WWWDIR}/lib/logging
 .endfor
+	${INSTALL_DATA} ${WRKDIR}/jetty-pid.xml ${STAGEDIR}${WWWDIR}/etc
 	${INSTALL_DATA} ${WRKDIR}/shibboleth ${STAGEDIR}${ETCDIR}/shibboleth-idp
 	${INSTALL_DATA} ${FILESDIR}/index.html ${STAGEDIR}${EXAMPLESDIR}/index.html
 	${INSTALL_SCRIPT} ${FILESDIR}/shibboleth-idp.sh ${STAGEDIR}${PREFIX}/sbin
diff --git a/security/shibboleth-idp/files/jetty-pid.xml.in b/security/shibboleth-idp/files/jetty-pid.xml.in
new file mode 100644
index 000000000000..131fa38dc338
--- /dev/null
+++ b/security/shibboleth-idp/files/jetty-pid.xml.in
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
+
+<Configure>
+  <Call class="org.eclipse.jetty.util.PidFile" name="create">
+    <Arg name="file"><Property name="jetty.pid" default="%%RUNDIR%%/shibboleth.pid"/></Arg>
+  </Call>
+</Configure>
diff --git a/security/shibboleth-idp/pkg-plist b/security/shibboleth-idp/pkg-plist
index 5e98a77e1601..ed38e20aef23 100644
--- a/security/shibboleth-idp/pkg-plist
+++ b/security/shibboleth-idp/pkg-plist
@@ -255,6 +255,7 @@
 @sample %%EXAMPLESDIR%%/start.d/start.ini %%WWWDIR%%/start.d/start.ini
 @sample %%EXAMPLESDIR%%/webapps/idp.xml %%WWWDIR%%/webapps/idp.xml
 @sample %%EXAMPLESDIR%%/webapps/static.xml %%WWWDIR%%/webapps/static.xml
+%%WWWDIR%%/etc/jetty-pid.xml
 %%WWWDIR%%/lib/logging/logback-classic-%%LOGBACKVER%%.jar
 %%WWWDIR%%/lib/logging/logback-core-%%LOGBACKVER%%.jar
 @dir %%WWWDIR%%/conf