From owner-dev-commits-ports-all@freebsd.org Fri Apr 23 19:04:48 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 687C55FC823; Fri, 23 Apr 2021 19:04:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FRkHh1nGWz3DyR; Fri, 23 Apr 2021 19:04:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 278BB12C89; Fri, 23 Apr 2021 19:04:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13NJ4mbw042474; Fri, 23 Apr 2021 19:04:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13NJ4mUM042473; Fri, 23 Apr 2021 19:04:48 GMT (envelope-from git) Date: Fri, 23 Apr 2021 19:04:48 GMT Message-Id: <202104231904.13NJ4mUM042473@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Palle Girgensohn Subject: git: ff87b2584732 - main - security/shibboleth-sp: Reintroduce direct dependencies to silent Q/A. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: girgen X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ff87b258473211ee848d3aba7bea1246fcf44f3c Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Apr 2021 19:04:48 -0000 The branch main has been updated by girgen: URL: https://cgit.FreeBSD.org/ports/commit/?id=ff87b258473211ee848d3aba7bea1246fcf44f3c commit ff87b258473211ee848d3aba7bea1246fcf44f3c Author: Palle Girgensohn AuthorDate: 2021-04-23 16:42:28 +0000 Commit: Palle Girgensohn CommitDate: 2021-04-23 19:04:42 +0000 security/shibboleth-sp: Reintroduce direct dependencies to silent Q/A. The dependencies where previously added indirectly through the dependency chain via opensaml, bust the Q/A disapproved of that. Add patch to check for missing DataSealer during cookie recovery. --- security/shibboleth-sp/Makefile | 14 +++++++--- ...atch-shibsp_impl_StorageServiceSessionCache.cpp | 31 ++++++++++++++++++++++ 2 files changed, 42 insertions(+), 3 deletions(-) diff --git a/security/shibboleth-sp/Makefile b/security/shibboleth-sp/Makefile index 35d763f065d2..1fe26dee2eaa 100644 --- a/security/shibboleth-sp/Makefile +++ b/security/shibboleth-sp/Makefile @@ -2,6 +2,7 @@ PORTNAME= shibboleth-sp PORTVERSION= 3.2.1 +PORTREVISION= 1 CATEGORIES= security www MASTER_SITES= http://shibboleth.net/downloads/service-provider/${PORTVERSION}/ @@ -11,9 +12,16 @@ COMMENT= C++ Shibboleth Service Provider (Internet2) for Apache LICENSE= APACHE20 BUILD_DEPENDS= boost-libs>=0:devel/boost-libs -LIB_DEPENDS= libsaml.so:security/opensaml - -USES= gmake tar:bzip2 cpe pkgconfig libtool +LIB_DEPENDS= libsaml.so:security/opensaml \ + liblog4shib.so:devel/log4shib \ + libxerces-c-3.2.so:textproc/xerces-c3 \ + libxml-security-c.so:security/apache-xml-security-c \ + libxmltooling.so:devel/xmltooling \ + libapr-1.so:devel/apr1 \ + libgdbm.so:databases/gdbm \ + libexpat.so:textproc/expat2 + +USES= gmake tar:bzip2 cpe pkgconfig libtool bdb GNU_CONFIGURE= yes MAKE_ENV= NOKEYGEN=YES USE_LDCONFIG= yes diff --git a/security/shibboleth-sp/files/patch-shibsp_impl_StorageServiceSessionCache.cpp b/security/shibboleth-sp/files/patch-shibsp_impl_StorageServiceSessionCache.cpp new file mode 100644 index 000000000000..7cb55f5f16d5 --- /dev/null +++ b/security/shibboleth-sp/files/patch-shibsp_impl_StorageServiceSessionCache.cpp @@ -0,0 +1,31 @@ +From 5a47c3b9378f4c49392dd4d15189b70956f9f2ec Mon Sep 17 00:00:00 2001 +From: Scott Cantor +Date: Thu, 22 Apr 2021 15:58:43 -0400 +Subject: [PATCH] SSPCPP-927 - Check for missing DataSealer during cookie recovery + +https://issues.shibboleth.net/jira/browse/SSPCPP-927 + +--- shibsp/impl/StorageServiceSessionCache.cpp.orig 2020-12-07 20:51:12.000000000 +0000 ++++ shibsp/impl/StorageServiceSessionCache.cpp 2021-04-23 16:17:00.398821000 +0000 +@@ -1148,6 +1148,12 @@ + else { + // We're out of process, so we can recover the session. + #ifndef SHIBSP_LITE ++ const DataSealer* sealer = XMLToolingConfig::getConfig().getDataSealer(); ++ if (!sealer) { ++ m_log.warn("can't attempt recovery of session (%s), no DataSealer configured", key); ++ return false; ++ } ++ + m_log.debug("checking for revocation of session (%s)", key); + try { + if (m_storage_lite->readString("Revoked", key) > 0) { +@@ -1174,7 +1180,7 @@ + try { + dup = strdup(data); + XMLToolingConfig::getConfig().getURLEncoder()->decode(dup); +- unwrapped = XMLToolingConfig::getConfig().getDataSealer()->unwrap(dup); ++ unwrapped = sealer->unwrap(dup); + free(dup); + + stringstream str(unwrapped);