git: 2ac708de544e - main - security/shibboleth-idp: Update to 5.1.4

From: Ryan Steinmetz <zi_at_FreeBSD.org>
Date: Fri, 20 Jun 2025 15:01:01 UTC
The branch main has been updated by zi:

URL: https://cgit.FreeBSD.org/ports/commit/?id=2ac708de544e2fb326a3ea8c6b6a94e58ae909a6

commit 2ac708de544e2fb326a3ea8c6b6a94e58ae909a6
Author:     Ryan Steinmetz <zi@FreeBSD.org>
AuthorDate: 2025-06-20 15:00:57 +0000
Commit:     Ryan Steinmetz <zi@FreeBSD.org>
CommitDate: 2025-06-20 15:00:57 +0000

    security/shibboleth-idp: Update to 5.1.4
---
 security/shibboleth-idp/Makefile                |  6 ++--
 security/shibboleth-idp/distinfo                |  6 ++--
 security/shibboleth-idp/files/shibboleth-idp.in |  5 +++
 security/shibboleth-idp/pkg-plist               | 42 ++++++++++++-------------
 4 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/security/shibboleth-idp/Makefile b/security/shibboleth-idp/Makefile
index 0c4eeeb6e329..f2ac1111ad69 100644
--- a/security/shibboleth-idp/Makefile
+++ b/security/shibboleth-idp/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	shibboleth
-PORTVERSION=	5.1.3
-PORTREVISION=	1
+PORTVERSION=	5.1.4
 CATEGORIES=	security www
 MASTER_SITES=	http://shibboleth.net/downloads/identity-provider/${PORTVERSION}/ \
 		http://shibboleth.net/downloads/identity-provider/latest5/${PORTVERSION}/ \
@@ -31,6 +30,7 @@ NO_ARCH=	yes
 NO_BUILD=	yes
 
 LOGBACKVER=	1.5.6
+SHIBVER=	9.1.4
 SHIBUSER=	shibd
 SHIBGROUP=	shibd
 LOGDIR=		/var/log/${PORTNAME}
@@ -43,7 +43,7 @@ SUB_FILES=	shibboleth jetty-pid.xml
 SUB_LIST+=	SHIBUSER=${SHIBUSER} SHIBGROUP=${SHIBGROUP} \
 		RUNDIR=${RUNDIR} LOGDIR=${LOGDIR}
 PLIST_SUB+=	SHIBUSER=${SHIBUSER} SHIBGROUP=${SHIBGROUP} \
-		RUNDIR=${RUNDIR} LOGDIR=${LOGDIR} \
+		RUNDIR=${RUNDIR} LOGDIR=${LOGDIR} SHIBVER=${SHIBVER} \
 		LOGBACKVER=${LOGBACKVER} PORTVERSION=${PORTVERSION}
 
 do-install:
diff --git a/security/shibboleth-idp/distinfo b/security/shibboleth-idp/distinfo
index 6ba4a2165721..3e9d2dd36d62 100644
--- a/security/shibboleth-idp/distinfo
+++ b/security/shibboleth-idp/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1725384814
-SHA256 (shibboleth-identity-provider-5.1.3.tar.gz) = cc72f0b15fda49b43bdd38cef3bdc62cbe01684b59c3d024b5de1ffdba42206e
-SIZE (shibboleth-identity-provider-5.1.3.tar.gz) = 44250595
+TIMESTAMP = 1750430454
+SHA256 (shibboleth-identity-provider-5.1.4.tar.gz) = 824e9e151cf003e05e3f8855ec21cacba24de070454ef3da2da813fe13cc96eb
+SIZE (shibboleth-identity-provider-5.1.4.tar.gz) = 44358580
 SHA256 (logback-classic-1.5.6.jar) = 6115c6cac5ed1d9db810d14f2f7f4dd6a9f21f0acbba8016e4daaca2ba0f5eb8
 SIZE (logback-classic-1.5.6.jar) = 293697
 SHA256 (logback-core-1.5.6.jar) = 898c7d120199f37e1acc8118d97ab15a4d02b0e72e27ba9f05843cb374e160c6
diff --git a/security/shibboleth-idp/files/shibboleth-idp.in b/security/shibboleth-idp/files/shibboleth-idp.in
index e0b425e5eeb4..c7326a6bdae6 100644
--- a/security/shibboleth-idp/files/shibboleth-idp.in
+++ b/security/shibboleth-idp/files/shibboleth-idp.in
@@ -19,6 +19,7 @@ command="%%PREFIX%%/sbin/shibboleth-idp.sh"
 command_args="start"
 extra_commands="idpstatus initupgrade"
 start_precmd="shibboleth_idp_start_precmd"
+idpstatus_cmd="shibboleth_idp_status"
 initupgrade_cmd="shibboleth_idp_initupgrade"
 
 # set defaults
@@ -89,4 +90,8 @@ shibboleth_idp_initupgrade() {
     /usr/bin/sed -i'.bak' -e "s|idp.scope = example.org|idp.scope=${shibboleth_idp_scope}|g" %%WWWDIR%%/conf/idp.properties
 }
 
+shibboleth_idp_status() {
+    /usr/bin/fetch -qo - http://127.0.0.1:8080/idp/status
+}
+
 run_rc_command "$1"
diff --git a/security/shibboleth-idp/pkg-plist b/security/shibboleth-idp/pkg-plist
index f5b2937279d1..67791f4737be 100644
--- a/security/shibboleth-idp/pkg-plist
+++ b/security/shibboleth-idp/pkg-plist
@@ -12,7 +12,7 @@ sbin/shibboleth-idp.sh
 %%DATADIR%%/bin/lib/idp-cli-%%PORTVERSION%%.jar
 %%DATADIR%%/bin/lib/idp-installer-%%PORTVERSION%%.jar
 %%DATADIR%%/bin/lib/jcommander-1.81.jar
-%%DATADIR%%/bin/lib/shib-cli-9.1.3.jar
+%%DATADIR%%/bin/lib/shib-cli-%%SHIBVER%%.jar
 @comment %%DATADIR%%/credentials/.gitkeep
 %%DATADIR%%/doc/BC-LICENSE.txt
 %%DATADIR%%/doc/CREDITS.txt
@@ -83,8 +83,8 @@ sbin/shibboleth-idp.sh
 %%DATADIR%%/webapp/WEB-INF/lib/metrics-core-4.2.26.jar
 %%DATADIR%%/webapp/WEB-INF/lib/metrics-json-4.2.26.jar
 %%DATADIR%%/webapp/WEB-INF/lib/metrics-jvm-4.2.26.jar
-%%DATADIR%%/webapp/WEB-INF/lib/micrometer-commons-1.12.8.jar
-%%DATADIR%%/webapp/WEB-INF/lib/micrometer-observation-1.12.8.jar
+%%DATADIR%%/webapp/WEB-INF/lib/micrometer-commons-1.12.12.jar
+%%DATADIR%%/webapp/WEB-INF/lib/micrometer-observation-1.12.12.jar
 %%DATADIR%%/webapp/WEB-INF/lib/netty-buffer-4.1.108.Final.jar
 %%DATADIR%%/webapp/WEB-INF/lib/netty-codec-4.1.108.Final.jar
 %%DATADIR%%/webapp/WEB-INF/lib/netty-common-4.1.108.Final.jar
@@ -126,34 +126,34 @@ sbin/shibboleth-idp.sh
 %%DATADIR%%/webapp/WEB-INF/lib/shib-metadata-api-%%PORTVERSION%%.jar
 %%DATADIR%%/webapp/WEB-INF/lib/shib-metadata-impl-%%PORTVERSION%%.jar
 %%DATADIR%%/webapp/WEB-INF/lib/shib-metadata-spring-%%PORTVERSION%%.jar
-%%DATADIR%%/webapp/WEB-INF/lib/shib-networking-9.1.3.jar
-%%DATADIR%%/webapp/WEB-INF/lib/shib-networking-spring-9.1.3.jar
+%%DATADIR%%/webapp/WEB-INF/lib/shib-networking-%%SHIBVER%%.jar
+%%DATADIR%%/webapp/WEB-INF/lib/shib-networking-spring-%%SHIBVER%%.jar
 %%DATADIR%%/webapp/WEB-INF/lib/shib-profile-api-%%PORTVERSION%%.jar
 %%DATADIR%%/webapp/WEB-INF/lib/shib-profile-impl-%%PORTVERSION%%.jar
 %%DATADIR%%/webapp/WEB-INF/lib/shib-saml-attribute-api-%%PORTVERSION%%.jar
 %%DATADIR%%/webapp/WEB-INF/lib/shib-saml-attribute-impl-%%PORTVERSION%%.jar
 %%DATADIR%%/webapp/WEB-INF/lib/shib-saml-profile-api-%%PORTVERSION%%.jar
-%%DATADIR%%/webapp/WEB-INF/lib/shib-security-9.1.3.jar
-%%DATADIR%%/webapp/WEB-INF/lib/shib-security-spring-9.1.3.jar
-%%DATADIR%%/webapp/WEB-INF/lib/shib-service-9.1.3.jar
-%%DATADIR%%/webapp/WEB-INF/lib/shib-spring-9.1.3.jar
-%%DATADIR%%/webapp/WEB-INF/lib/shib-support-9.1.3.jar
-%%DATADIR%%/webapp/WEB-INF/lib/shib-velocity-9.1.3.jar
-%%DATADIR%%/webapp/WEB-INF/lib/shib-velocity-spring-9.1.3.jar
+%%DATADIR%%/webapp/WEB-INF/lib/shib-security-%%SHIBVER%%.jar
+%%DATADIR%%/webapp/WEB-INF/lib/shib-security-spring-%%SHIBVER%%.jar
+%%DATADIR%%/webapp/WEB-INF/lib/shib-service-%%SHIBVER%%.jar
+%%DATADIR%%/webapp/WEB-INF/lib/shib-spring-%%SHIBVER%%.jar
+%%DATADIR%%/webapp/WEB-INF/lib/shib-support-%%SHIBVER%%.jar
+%%DATADIR%%/webapp/WEB-INF/lib/shib-velocity-%%SHIBVER%%.jar
+%%DATADIR%%/webapp/WEB-INF/lib/shib-velocity-spring-%%SHIBVER%%.jar
 %%DATADIR%%/webapp/WEB-INF/lib/slf4j-api-2.0.13.jar
-%%DATADIR%%/webapp/WEB-INF/lib/spring-aop-6.1.11.jar
-%%DATADIR%%/webapp/WEB-INF/lib/spring-beans-6.1.11.jar
+%%DATADIR%%/webapp/WEB-INF/lib/spring-aop-6.1.18.jar
+%%DATADIR%%/webapp/WEB-INF/lib/spring-beans-6.1.18.jar
 %%DATADIR%%/webapp/WEB-INF/lib/spring-binding-3.0.0.jar
-%%DATADIR%%/webapp/WEB-INF/lib/spring-context-6.1.11.jar
-%%DATADIR%%/webapp/WEB-INF/lib/spring-core-6.1.11.jar
-%%DATADIR%%/webapp/WEB-INF/lib/spring-expression-6.1.11.jar
-%%DATADIR%%/webapp/WEB-INF/lib/spring-jcl-6.1.11.jar
-%%DATADIR%%/webapp/WEB-INF/lib/spring-web-6.1.11.jar
+%%DATADIR%%/webapp/WEB-INF/lib/spring-context-6.1.18.jar
+%%DATADIR%%/webapp/WEB-INF/lib/spring-core-6.1.18.jar
+%%DATADIR%%/webapp/WEB-INF/lib/spring-expression-6.1.18.jar
+%%DATADIR%%/webapp/WEB-INF/lib/spring-jcl-6.1.18.jar
+%%DATADIR%%/webapp/WEB-INF/lib/spring-web-6.1.18.jar
 %%DATADIR%%/webapp/WEB-INF/lib/spring-webflow-3.0.0.jar
-%%DATADIR%%/webapp/WEB-INF/lib/spring-webmvc-6.1.11.jar
+%%DATADIR%%/webapp/WEB-INF/lib/spring-webmvc-6.1.18.jar
 %%DATADIR%%/webapp/WEB-INF/lib/spymemcached-2.12.3.jar
 %%DATADIR%%/webapp/WEB-INF/lib/velocity-engine-core-2.3.jar
-%%DATADIR%%/webapp/WEB-INF/lib/xmlsec-3.0.3.jar
+%%DATADIR%%/webapp/WEB-INF/lib/xmlsec-3.0.5.jar
 %%DATADIR%%/webapp/WEB-INF/spring.tld
 %%DATADIR%%/webapp/WEB-INF/web.xml
 %%DATADIR%%/webapp/css/logout.css