git: b4e7dc9bf4a2 - main - security/shibboleth-sp: update to 3.4.0
Date: Mon, 07 Nov 2022 17:07:06 UTC
The branch main has been updated by girgen:
URL: https://cgit.FreeBSD.org/ports/commit/?id=b4e7dc9bf4a25f8fb4858b55d811f2b001a49602
commit b4e7dc9bf4a25f8fb4858b55d811f2b001a49602
Author: Palle Girgensohn <girgen@FreeBSD.org>
AuthorDate: 2022-11-07 17:03:06 +0000
Commit: Palle Girgensohn <girgen@FreeBSD.org>
CommitDate: 2022-11-07 17:03:06 +0000
security/shibboleth-sp: update to 3.4.0
This is a minor update containing a new setting suggested by a
contributor (thus the unplanned minor version change) controlling
retries when TCP connections to shibd are used. The other changes are
minimal in nature.
Update the toolchain as well:
devel/xmltooling
textproc/xerces-c3
and bump PORTREVISION for security/opensaml due to dependencies'
updates.
Release notes: https://wiki.shibboleth.net/confluence/display/SP3/ReleaseNotes
---
devel/xmltooling/Makefile | 5 ++---
devel/xmltooling/distinfo | 6 ++---
devel/xmltooling/pkg-plist | 4 ++--
security/opensaml/Makefile | 2 +-
security/shibboleth-sp/Makefile | 11 +++++----
security/shibboleth-sp/distinfo | 6 ++---
.../shibboleth-sp/files/patch-apache__mod_shib_cpp | 26 ----------------------
security/shibboleth-sp/pkg-plist | 10 ++++-----
textproc/xerces-c3/Makefile | 2 +-
textproc/xerces-c3/distinfo | 6 ++---
textproc/xerces-c3/pkg-plist | 2 +-
11 files changed, 26 insertions(+), 54 deletions(-)
diff --git a/devel/xmltooling/Makefile b/devel/xmltooling/Makefile
index dd803d87ee1d..806c868c887b 100644
--- a/devel/xmltooling/Makefile
+++ b/devel/xmltooling/Makefile
@@ -1,8 +1,7 @@
PORTNAME= xmltooling
-PORTVERSION= 3.2.1
-PORTREVISION= 1
+PORTVERSION= 3.2.2
CATEGORIES= devel security
-MASTER_SITES= http://shibboleth.net/downloads/c++-opensaml/${PORTVERSION}/
+MASTER_SITES= http://shibboleth.net/downloads/c++-opensaml/3.2.1/
MAINTAINER= girgen@FreeBSD.org
COMMENT= Low level XML support for SAML
diff --git a/devel/xmltooling/distinfo b/devel/xmltooling/distinfo
index 99a29a6b5910..ba07463117ea 100644
--- a/devel/xmltooling/distinfo
+++ b/devel/xmltooling/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1638280048
-SHA256 (xmltooling-3.2.1.tar.bz2) = ac974755e76f80e1a08294e7b984a57f2f8e2845f01a8b63cad81362e88626e3
-SIZE (xmltooling-3.2.1.tar.bz2) = 614678
+TIMESTAMP = 1667482615
+SHA256 (xmltooling-3.2.2.tar.bz2) = d31bebd5f783464c541f9bca8656a8730e1de8574ff77e92c72aae3dc8ee4174
+SIZE (xmltooling-3.2.2.tar.bz2) = 618792
diff --git a/devel/xmltooling/pkg-plist b/devel/xmltooling/pkg-plist
index 4430810b8af3..be1e12dc70aa 100644
--- a/devel/xmltooling/pkg-plist
+++ b/devel/xmltooling/pkg-plist
@@ -87,10 +87,10 @@ include/xmltooling/validation/ValidatorSuite.h
include/xmltooling/version.h
lib/libxmltooling-lite.so
lib/libxmltooling-lite.so.10
-lib/libxmltooling-lite.so.10.0.1
+lib/libxmltooling-lite.so.10.0.2
lib/libxmltooling.so
lib/libxmltooling.so.10
-lib/libxmltooling.so.10.0.1
+lib/libxmltooling.so.10.0.2
libdata/pkgconfig/xmltooling-lite.pc
libdata/pkgconfig/xmltooling.pc
share/xml/xmltooling/catalog.xml
diff --git a/security/opensaml/Makefile b/security/opensaml/Makefile
index 974131a5b6cf..7bd39b424f47 100644
--- a/security/opensaml/Makefile
+++ b/security/opensaml/Makefile
@@ -1,6 +1,6 @@
PORTNAME= opensaml
PORTVERSION= 3.2.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security
MASTER_SITES= http://shibboleth.net/downloads/c++-opensaml/${PORTVERSION}/
diff --git a/security/shibboleth-sp/Makefile b/security/shibboleth-sp/Makefile
index c161cc17ce27..6887e84a5fb2 100644
--- a/security/shibboleth-sp/Makefile
+++ b/security/shibboleth-sp/Makefile
@@ -1,6 +1,5 @@
PORTNAME= shibboleth-sp
-PORTVERSION= 3.3.0
-PORTREVISION= 2
+PORTVERSION= 3.4.0
CATEGORIES= security www
MASTER_SITES= http://shibboleth.net/downloads/service-provider/${PORTVERSION}/
@@ -37,14 +36,14 @@ OPTIONS_GROUP= CONNECT SESSION
OPTIONS_GROUP_CONNECT=FASTCGI APACHE
CONNECT_DESC= Webserver modules
-OPTIONS_GROUP_SESSION=ODBC MEMCACHED
+OPTIONS_GROUP_SESSION=ODBC # broken MEMCACHED
SESSION_DESC= Optional session storage
OPTIONS_DEFAULT=ODBC APACHE
# Descriptions
ODBC_DESC= ODBC database backend - store sessions in a database
-MEMCACHED_DESC= Store sessions in memcached
+# broken MEMCACHED_DESC= Store sessions in memcached
FASTCGI_DESC= FastCGI protocol support, e.g. for NGINX
APACHE_DESC= Build Apache module
@@ -56,8 +55,8 @@ ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC
FASTCGI_CONFIGURE_WITH= fastcgi=${LOCALBASE}
FASTCGI_LIB_DEPENDS= libfcgi++.so:www/fcgi
-MEMCACHED_CONFIGURE_WITH= memcached=${LOCALBASE}
-MEMCACHED_LIB_DEPENDS= libmemcached.so:databases/libmemcached
+#MEMCACHED_CONFIGURE_WITH= memcached=${LOCALBASE}
+#MEMCACHED_LIB_DEPENDS= libmemcached.so:databases/libmemcached
OPTIONS_SUB= yes
diff --git a/security/shibboleth-sp/distinfo b/security/shibboleth-sp/distinfo
index 10c831a7f186..8dd9afdaf7dc 100644
--- a/security/shibboleth-sp/distinfo
+++ b/security/shibboleth-sp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1638279845
-SHA256 (shibboleth-sp-3.3.0.tar.bz2) = f175bd0dc695a8b7cbe78f6156b14f7f407e1742d045d9a8e3f2cf1078c04704
-SIZE (shibboleth-sp-3.3.0.tar.bz2) = 826175
+TIMESTAMP = 1667481817
+SHA256 (shibboleth-sp-3.4.0.tar.bz2) = e7994be1105bc8683949fd11030a685fffc64cd6fa6d3e80c41bd078b05d5909
+SIZE (shibboleth-sp-3.4.0.tar.bz2) = 830634
diff --git a/security/shibboleth-sp/files/patch-apache__mod_shib_cpp b/security/shibboleth-sp/files/patch-apache__mod_shib_cpp
deleted file mode 100644
index 681b195a738a..000000000000
--- a/security/shibboleth-sp/files/patch-apache__mod_shib_cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Scott Cantor <cantor.2@osu.edu>
-Date: Tue, 30 Nov 2021 17:38:09 +0000 (-0500)
-Subject: SSPCPP-948 - mod_shib warning about Apache 1.3 in log
-X-Git-Url: https://git.shibboleth.net/view/?p=cpp-sp.git;a=commitdiff_plain;h=7b5c7aced15c0be5404bcba0bcec4c586323fba9
-
-SSPCPP-948 - mod_shib warning about Apache 1.3 in log
-
-https://shibboleth.atlassian.net/browse/SSPCPP-948
----
-
-diff --git a/apache/mod_shib.cpp b/apache/mod_shib.cpp
-index 6b1dc676..1a1f2543 100644
---- apache/mod_shib.cpp
-+++ apache/mod_shib.cpp
-@@ -1983,10 +1983,10 @@ extern "C" void shib_child_init(apr_pool_t* p, server_rec* s)
- // Initialize runtime components.
-
- ap_log_error(APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, SH_AP_R(s), "child_init: mod_shib initializing in pid (%d)", (int)getpid());
-- ap_log_error(APLOG_MARK, APLOG_WARNING|APLOG_NOERRNO, SH_AP_R(s), "DEPRECATED: Apache 1.3 module, please upgrade to Apache 2.4+");
-
- // 2.x versions have already initialized the libraries.
- #ifdef SHIB_APACHE_13
-+ ap_log_error(APLOG_MARK, APLOG_WARNING|APLOG_NOERRNO, SH_AP_R(s), "DEPRECATED: Apache 1.3 module, please upgrade to Apache 2.4+");
- if (g_Config) {
- ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, SH_AP_R(s), "child_init: mod_shib already initialized, exiting");
- exit(1);
diff --git a/security/shibboleth-sp/pkg-plist b/security/shibboleth-sp/pkg-plist
index aae374307916..82f18664b086 100644
--- a/security/shibboleth-sp/pkg-plist
+++ b/security/shibboleth-sp/pkg-plist
@@ -91,11 +91,11 @@ include/shibsp/util/SPConstants.h
include/shibsp/util/TemplateParameters.h
include/shibsp/version.h
lib/libshibsp.so
-lib/libshibsp.so.10
-lib/libshibsp.so.10.0.3
+lib/libshibsp.so.11
+lib/libshibsp.so.11.0.0
lib/shibboleth/adfs.so
lib/shibboleth/adfs-lite.so
-%%MEMCACHED%%lib/shibboleth/memcache-store.so
+@comment %%MEMCACHED%%lib/shibboleth/memcache-store.so
%%ODBC%%lib/shibboleth/odbc-store.so
lib/shibboleth/plugins-lite.so
lib/shibboleth/plugins.so
@@ -103,8 +103,8 @@ lib/shibboleth/plugins.so
%%FASTCGI%%lib/shibboleth/shibauthorizer
%%FASTCGI%%lib/shibboleth/shibresponder
lib/libshibsp-lite.so
-lib/libshibsp-lite.so.10
-lib/libshibsp-lite.so.10.0.3
+lib/libshibsp-lite.so.11
+lib/libshibsp-lite.so.11.0.0
libdata/pkgconfig/shibsp-lite.pc
libdata/pkgconfig/shibsp.pc
sbin/shibd
diff --git a/textproc/xerces-c3/Makefile b/textproc/xerces-c3/Makefile
index 017ea8966208..43e94f5a3a58 100644
--- a/textproc/xerces-c3/Makefile
+++ b/textproc/xerces-c3/Makefile
@@ -1,5 +1,5 @@
PORTNAME= xerces-c
-PORTVERSION= 3.2.3
+PORTVERSION= 3.2.4
CATEGORIES= textproc
MASTER_SITES= APACHE/xerces/c/3/sources
PKGNAMESUFFIX= 3
diff --git a/textproc/xerces-c3/distinfo b/textproc/xerces-c3/distinfo
index 414acf4c3d81..dc2fdb779ce7 100644
--- a/textproc/xerces-c3/distinfo
+++ b/textproc/xerces-c3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1587445498
-SHA256 (xerces-c-3.2.3.tar.gz) = fb96fc49b1fb892d1e64e53a6ada8accf6f0e6d30ce0937956ec68d39bd72c7e
-SIZE (xerces-c-3.2.3.tar.gz) = 7120270
+TIMESTAMP = 1667481916
+SHA256 (xerces-c-3.2.4.tar.gz) = 3d8ec1c7f94e38fee0e4ca5ad1e1d9db23cbf3a10bba626f6b4afa2dedafe5ab
+SIZE (xerces-c-3.2.4.tar.gz) = 7374651
diff --git a/textproc/xerces-c3/pkg-plist b/textproc/xerces-c3/pkg-plist
index bfaeba448512..ef68c8d169dd 100644
--- a/textproc/xerces-c3/pkg-plist
+++ b/textproc/xerces-c3/pkg-plist
@@ -486,5 +486,5 @@ include/xercesc/xinclude/XIncludeUtils.hpp
lib/libxerces-c-%%MAJOR_VER%%.so
lib/libxerces-c.a
lib/libxerces-c.so
-lib/libxerces-c.so.3
+lib/libxerces-c.so.%%MAJOR_VER%%
libdata/pkgconfig/xerces-c.pc