Date: Tue, 7 Aug 2018 13:24:37 +0000 (UTC) From: Palle Girgensohn <girgen@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r476595 - in head: . devel/log4shib devel/xmltooling devel/xmltooling/files security security/apache-xml-security-c security/apache-xml-security-c/files security/opensaml security/opens... Message-ID: <201808071324.w77DObxE027409@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: girgen Date: Tue Aug 7 13:24:36 2018 New Revision: 476595 URL: https://svnweb.freebsd.org/changeset/ports/476595 Log: Update Shibboleth to 3.0.2 Also update the toolchain to latest versions. This includes a security fix for apache-xml-security-c. Releaseinfo: https://wiki.shibboleth.net/confluence/display/SP3/ReleaseNotes Security: 5786185a-9a43-11e8-b34b-6cc21735f730 Security: https://shibboleth.net/community/advisories/secadv_20180803.txt Added: head/devel/xmltooling/files/patch-configure.ac (contents, props changed) head/security/apache-xml-security-c/files/patch-configure.ac (contents, props changed) head/security/opensaml/ - copied from r476517, head/security/opensaml2/ head/security/shibboleth-sp/ - copied from r476517, head/security/shibboleth2-sp/ head/security/shibboleth-sp/files/patch-shibboleth.spec.in - copied, changed from r476517, head/security/shibboleth2-sp/files/patch-shibboleth-spec Deleted: head/devel/xmltooling/files/patch-Makefile.in head/devel/xmltooling/files/patch-doc_Makefile.in head/security/apache-xml-security-c/files/patch-xsec_enc_OpenSSL_OpenSSLCryptoSymmetricKey.hpp head/security/apache-xml-security-c/files/patch-xsec_tools_checksig_InteropResolver.cpp head/security/opensaml/files/ head/security/opensaml2/ head/security/shibboleth-sp/files/patch-makefiles-docdir head/security/shibboleth-sp/files/patch-shibboleth-spec head/security/shibboleth2-sp/ Modified: head/MOVED head/devel/log4shib/Makefile head/devel/log4shib/distinfo head/devel/log4shib/pkg-plist head/devel/xmltooling/Makefile head/devel/xmltooling/distinfo head/devel/xmltooling/pkg-plist head/security/Makefile head/security/apache-xml-security-c/Makefile head/security/apache-xml-security-c/distinfo head/security/apache-xml-security-c/pkg-plist head/security/opensaml/Makefile head/security/opensaml/distinfo head/security/opensaml/pkg-plist head/security/shibboleth-sp/Makefile head/security/shibboleth-sp/distinfo head/security/shibboleth-sp/files/patch-shibsp_remoting_impl_TCPListener.cpp head/security/shibboleth-sp/pkg-plist Modified: head/MOVED ============================================================================== --- head/MOVED Tue Aug 7 13:18:02 2018 (r476594) +++ head/MOVED Tue Aug 7 13:24:36 2018 (r476595) @@ -971,7 +971,6 @@ x11-toolkits/gtkada-gcc||2010-01-24|Not really maintai x11-toolkits/gtkada-gps||2010-01-28|Has expired: has been broken for 3 months x11-fm/velocity||2010-01-28|Has expired: has been broken for 7 months x11-drivers/xf86-video-nsc||2010-01-28|Has expired: has been broken for 5 months -security/shibboleth-sp||2010-01-28|Has expired: has been broken for 3 months www/pecl-pecl_http|www/pecl-http|2010-01-31|Duplicate ports chinese/stardict2-dict-zh_CN||2010-01-31|Please use chinese/stardict-dict-zh_CN math/octave-forge-ann||2010-02-02|Has expired: has been broken for 3 months @@ -2877,7 +2876,6 @@ news/nntpswitch||2011-11-01|Does not fetch news/p5-NewsLib||2011-11-01|Does not fetch russian/cyrproxy||2011-11-01|Does not fetch science/gerris||2011-11-01|Does not fetch -security/opensaml||2011-11-01|Does not fetch sysutils/wmbattery||2011-11-01|Does not fetch textproc/tei-guidelines-p4||2011-11-01|Does not fetch textproc/tei-p4||2011-11-01|Does not fetch @@ -10419,3 +10417,5 @@ emulators/snes9express||2018-08-03|Please use emulator security/rubygem-omniauth-shibboleth12||2018-08-04|Removed textproc/rubygem-html-pipeline-gitlab||2018-08-04|Removed net/qmdnsengine|dns/qmdnsengine|2018-08-04|Move to a proper category +security/shibboleth2-sp|security/shibboleth-sp|2018-08-07|Project updated to version 3, so the 2 suffix is not valid anymore +security/opensaml2|security/opensaml|2018-08-07|Project updated to version 3, so the 2 suffix is not valid anymore Modified: head/devel/log4shib/Makefile ============================================================================== --- head/devel/log4shib/Makefile Tue Aug 7 13:18:02 2018 (r476594) +++ head/devel/log4shib/Makefile Tue Aug 7 13:24:36 2018 (r476595) @@ -2,17 +2,18 @@ # $FreeBSD$ PORTNAME= log4shib -DISTVERSION= 1.0.7 -PORTREVISION= 1 +DISTVERSION= 2.0.0 CATEGORIES= devel MASTER_SITES= http://shibboleth.net/downloads/${PORTNAME}/${DISTVERSION}/ MAINTAINER= girgen@FreeBSD.org COMMENT= Library of C++ classes for flexible logging +LICENSE= APACHE20 + USES= gmake pathfix pkgconfig libtool GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-html-docs --disable-doxygen +CONFIGURE_ARGS= --disable-html-docs --disable-doxygen --disable-dependency-tracking USE_LDCONFIG= yes post-patch: Modified: head/devel/log4shib/distinfo ============================================================================== --- head/devel/log4shib/distinfo Tue Aug 7 13:18:02 2018 (r476594) +++ head/devel/log4shib/distinfo Tue Aug 7 13:24:36 2018 (r476595) @@ -1,2 +1,3 @@ -SHA256 (log4shib-1.0.7.tar.gz) = bffc04065eed981b2e7cf2bd828d258bb89cfe450ecadfb11f6f555832b263ee -SIZE (log4shib-1.0.7.tar.gz) = 572041 +TIMESTAMP = 1533580447 +SHA256 (log4shib-2.0.0.tar.gz) = d066e2f208bdf3ce28e279307ce7e23ed9c5226f6afde288cd429a0a46792222 +SIZE (log4shib-2.0.0.tar.gz) = 538719 Modified: head/devel/log4shib/pkg-plist ============================================================================== --- head/devel/log4shib/pkg-plist Tue Aug 7 13:18:02 2018 (r476594) +++ head/devel/log4shib/pkg-plist Tue Aug 7 13:24:36 2018 (r476595) @@ -1,4 +1,3 @@ -bin/log4shib-config include/log4shib/AbortAppender.hh include/log4shib/Appender.hh include/log4shib/AppenderSkeleton.hh @@ -42,7 +41,6 @@ include/log4shib/threading/PThreads.hh include/log4shib/threading/Threading.hh lib/liblog4shib.a lib/liblog4shib.so -lib/liblog4shib.so.1 -lib/liblog4shib.so.1.0.7 +lib/liblog4shib.so.2 +lib/liblog4shib.so.2.0.0 libdata/pkgconfig/log4shib.pc -share/aclocal/log4shib.m4 Modified: head/devel/xmltooling/Makefile ============================================================================== --- head/devel/xmltooling/Makefile Tue Aug 7 13:18:02 2018 (r476594) +++ head/devel/xmltooling/Makefile Tue Aug 7 13:24:36 2018 (r476595) @@ -2,25 +2,26 @@ # $FreeBSD$ PORTNAME= xmltooling -PORTVERSION= 1.6.4 -PORTREVISION= 1 +PORTVERSION= 3.0.2 CATEGORIES= devel security -MASTER_SITES= http://shibboleth.net/downloads/c++-opensaml/2.6.1/ +MASTER_SITES= http://shibboleth.net/downloads/c++-opensaml/3.0.0/ MAINTAINER= girgen@FreeBSD.org COMMENT= Low level XML support for SAML +LICENSE= APACHE20 + +BUILD_DEPENDS= boost-libs>=0:devel/boost-libs LIB_DEPENDS= libcurl.so:ftp/curl \ liblog4shib.so:devel/log4shib \ - libxerces-c.so.3:textproc/xerces-c3 \ + libxerces-c.so:textproc/xerces-c3 \ libxml-security-c.so:security/apache-xml-security-c -BUILD_DEPENDS= boost-libs>=0:devel/boost-libs - GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-log4shib=${LOCALBASE} --with-openssl=${OPENSSLBASE} --with-curl=${LOCALBASE} --disable-doxygen-doc -USES= gmake libtool pkgconfig tar:bzip2 ssl +CONFIGURE_ARGS+=--disable-dependency-tracking --disable-doxygen-doc --with-xmlsec +USES= gmake libtool pkgconfig tar:bzip2 ssl autoreconf USE_LDCONFIG= yes +CONFIGURE_ENV+= openssl_LIBS="-L${OPENSSLLIB} -lcrypto" openssl_CFLAGS=-I${OPENSSLBASE} PORTDOCS= * @@ -28,9 +29,9 @@ OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -e 's,^pkgdocdir.*=.*,pkgdocdir = ${DOCSDIR},' \ - ${WRKSRC}/doc/Makefile.in + ${WRKSRC}/doc/Makefile.am post-patch-DOCS-off: - @${REINPLACE_CMD} -e '/^SUBDIRS/s,doc ,,' ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e '/^SUBDIRS/s,doc ,,' ${WRKSRC}/Makefile.am .include <bsd.port.mk> Modified: head/devel/xmltooling/distinfo ============================================================================== --- head/devel/xmltooling/distinfo Tue Aug 7 13:18:02 2018 (r476594) +++ head/devel/xmltooling/distinfo Tue Aug 7 13:24:36 2018 (r476595) @@ -1,3 +1,3 @@ -TIMESTAMP = 1519744998 -SHA256 (xmltooling-1.6.4.tar.bz2) = 4c0c4a08b8c55f1210673281f37fc95b6d1d365a8cdc726fd189dea96c45efca -SIZE (xmltooling-1.6.4.tar.bz2) = 581796 +TIMESTAMP = 1533581107 +SHA256 (xmltooling-3.0.2.tar.bz2) = 5709cf30c9d7cfc786599ac2433653fac8cc64d425781068af86019c8ce8d689 +SIZE (xmltooling-3.0.2.tar.bz2) = 596471 Added: head/devel/xmltooling/files/patch-configure.ac ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/xmltooling/files/patch-configure.ac Tue Aug 7 13:24:36 2018 (r476595) @@ -0,0 +1,11 @@ +--- configure.ac.orig 2018-07-20 01:39:47 UTC ++++ configure.ac +@@ -154,7 +154,7 @@ AX_PKG_CHECK_MODULES([$1],,[$2],[$3], + ]) + + AS_IF([test "x$with_xmlsec" != xno], +- [XMLSEC_PKG_CHECK([openssl],[openssl], ++ [XMLSEC_PKG_CHECK([openssl],[], + [XMLSEC_PKG_CHECK([libcurl],[libcurl], + [AX_SAVE_FLAGS + CXXFLAGS="$libcurl_CFLAGS $CXXFLAGS" Modified: head/devel/xmltooling/pkg-plist ============================================================================== --- head/devel/xmltooling/pkg-plist Tue Aug 7 13:18:02 2018 (r476594) +++ head/devel/xmltooling/pkg-plist Tue Aug 7 13:24:36 2018 (r476595) @@ -23,6 +23,9 @@ include/xmltooling/encryption/Encrypter.h include/xmltooling/encryption/Encryption.h include/xmltooling/exceptions.h include/xmltooling/impl/AnyElement.h +include/xmltooling/impl/ManagedResource.h +include/xmltooling/impl/OpenSSLSecurityHelper.h +include/xmltooling/impl/OpenSSLSupport.h include/xmltooling/impl/UnknownElement.h include/xmltooling/io/AbstractXMLObjectMarshaller.h include/xmltooling/io/AbstractXMLObjectUnmarshaller.h @@ -38,6 +41,7 @@ include/xmltooling/security/Credential.h include/xmltooling/security/CredentialContext.h include/xmltooling/security/CredentialCriteria.h include/xmltooling/security/CredentialResolver.h +include/xmltooling/security/DataSealer.h include/xmltooling/security/KeyInfoCredentialContext.h include/xmltooling/security/KeyInfoResolver.h include/xmltooling/security/OpenSSLCredential.h @@ -64,7 +68,7 @@ include/xmltooling/soap/SOAPTransport.h include/xmltooling/unicode.h include/xmltooling/util/CloneInputStream.h include/xmltooling/util/CurlURLInputStream.h -include/xmltooling/util/DateTime.h +include/xmltooling/util/DirectoryWalker.h include/xmltooling/util/NDC.h include/xmltooling/util/ParserPool.h include/xmltooling/util/PathResolver.h @@ -82,11 +86,12 @@ include/xmltooling/validation/Validator.h include/xmltooling/validation/ValidatorSuite.h include/xmltooling/version.h lib/libxmltooling-lite.so -lib/libxmltooling-lite.so.7 -lib/libxmltooling-lite.so.7.0.4 +lib/libxmltooling-lite.so.8 +lib/libxmltooling-lite.so.8.0.2 lib/libxmltooling.so -lib/libxmltooling.so.7 -lib/libxmltooling.so.7.0.4 +lib/libxmltooling.so.8 +lib/libxmltooling.so.8.0.2 +libdata/pkgconfig/xmltooling-lite.pc libdata/pkgconfig/xmltooling.pc share/xml/xmltooling/catalog.xml share/xml/xmltooling/soap-envelope.xsd Modified: head/security/Makefile ============================================================================== --- head/security/Makefile Tue Aug 7 13:18:02 2018 (r476594) +++ head/security/Makefile Tue Aug 7 13:24:36 2018 (r476595) @@ -456,7 +456,7 @@ SUBDIR += opencryptoki SUBDIR += openct SUBDIR += openiked - SUBDIR += opensaml2 + SUBDIR += opensaml SUBDIR += opensc SUBDIR += openscep SUBDIR += openssh-askpass @@ -1217,7 +1217,7 @@ SUBDIR += sha SUBDIR += sha1collisiondetection SUBDIR += sha2wordlist - SUBDIR += shibboleth2-sp + SUBDIR += shibboleth-sp SUBDIR += shimmer SUBDIR += shishi SUBDIR += shttpscanner Modified: head/security/apache-xml-security-c/Makefile ============================================================================== --- head/security/apache-xml-security-c/Makefile Tue Aug 7 13:18:02 2018 (r476594) +++ head/security/apache-xml-security-c/Makefile Tue Aug 7 13:24:36 2018 (r476595) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= xml-security-c -PORTVERSION= 1.7.3 -PORTREVISION= 1 +PORTVERSION= 2.0.1 CATEGORIES= security MASTER_SITES= APACHE/santuario/c-library PKGNAMEPREFIX= apache- @@ -13,13 +12,13 @@ COMMENT= Apache XML security libraries - C++ version LICENSE= APACHE20 -LIB_DEPENDS+= libxerces-c.so.3:textproc/xerces-c3 +LIB_DEPENDS+= libxerces-c.so:textproc/xerces-c3 GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-xerces=${LOCALBASE} -USES= cpe gmake libtool tar:bzip2 ssl +CONFIGURE_ARGS= --disable-dependency-tracking --without-xalan --with-openssl=${OPENSSLBASE} +USES= cpe gmake libtool tar:bzip2 ssl pkgconfig autoreconf USE_LDCONFIG= yes -CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE} +CONFIGURE_ENV+= openssl_LIBS="-L${OPENSSLLIB} -lcrypto" openssl_CFLAGS=-I${OPENSSLBASE} CPE_PRODUCT= xml_security_for_c\+\+ CPE_VENDOR= apache Modified: head/security/apache-xml-security-c/distinfo ============================================================================== --- head/security/apache-xml-security-c/distinfo Tue Aug 7 13:18:02 2018 (r476594) +++ head/security/apache-xml-security-c/distinfo Tue Aug 7 13:24:36 2018 (r476595) @@ -1,3 +1,3 @@ -TIMESTAMP = 1473589138 -SHA256 (xml-security-c-1.7.3.tar.bz2) = 09a1165c2cfcd468dbc170935db10861107dfa22e02754092473c0f555ef6819 -SIZE (xml-security-c-1.7.3.tar.bz2) = 673977 +TIMESTAMP = 1533580535 +SHA256 (xml-security-c-2.0.1.tar.bz2) = e7e9ccb8fd9d67eb1b981b191c724112f0b45f5b601f5fcc64708ebd6906e791 +SIZE (xml-security-c-2.0.1.tar.bz2) = 659112 Added: head/security/apache-xml-security-c/files/patch-configure.ac ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/apache-xml-security-c/files/patch-configure.ac Tue Aug 7 13:24:36 2018 (r476595) @@ -0,0 +1,11 @@ +--- configure.ac.orig 2018-08-01 13:02:42 UTC ++++ configure.ac +@@ -176,7 +176,7 @@ AC_ARG_WITH([openssl], + [with_openssl=check]) + + AS_IF([test x"$with_openssl" != xno], +- [AX_PKG_CHECK_MODULES([openssl],,[libcrypto], ++ [AX_PKG_CHECK_MODULES([openssl],,[], + [with_openssl=found + AC_DEFINE([XSEC_HAVE_OPENSSL],[1],[Define if OpenSSL is in use]) + Modified: head/security/apache-xml-security-c/pkg-plist ============================================================================== --- head/security/apache-xml-security-c/pkg-plist Tue Aug 7 13:18:02 2018 (r476594) +++ head/security/apache-xml-security-c/pkg-plist Tue Aug 7 13:24:36 2018 (r476595) @@ -1,11 +1,11 @@ -bin/c14n -bin/checksig -bin/cipher -bin/siginf -bin/templatesign -bin/txfmout -bin/xklient -bin/xtest +bin/xsec-c14n +bin/xsec-checksig +bin/xsec-cipher +bin/xsec-siginf +bin/xsec-templatesign +bin/xsec-txfmout +bin/xsec-xklient +bin/xsec-xtest include/xsec/canon/XSECC14n20010315.hpp include/xsec/canon/XSECCanon.hpp include/xsec/canon/XSECXMLNSStack.hpp @@ -54,6 +54,7 @@ include/xsec/enc/OpenSSL/OpenSSLCryptoKeyRSA.hpp include/xsec/enc/OpenSSL/OpenSSLCryptoProvider.hpp include/xsec/enc/OpenSSL/OpenSSLCryptoSymmetricKey.hpp include/xsec/enc/OpenSSL/OpenSSLCryptoX509.hpp +include/xsec/enc/OpenSSL/OpenSSLSupport.hpp include/xsec/enc/XSCrypt/XSCryptCryptoBase64.hpp include/xsec/enc/XSECCryptoBase64.hpp include/xsec/enc/XSECCryptoException.hpp @@ -85,22 +86,20 @@ include/xsec/transformers/TXFMBase.hpp include/xsec/transformers/TXFMBase64.hpp include/xsec/transformers/TXFMC14n.hpp include/xsec/transformers/TXFMChain.hpp +include/xsec/transformers/TXFMChar.hpp include/xsec/transformers/TXFMCipher.hpp include/xsec/transformers/TXFMConcatChains.hpp include/xsec/transformers/TXFMDocObject.hpp include/xsec/transformers/TXFMEnvelope.hpp -include/xsec/transformers/TXFMMD5.hpp +include/xsec/transformers/TXFMHash.hpp include/xsec/transformers/TXFMOutputFile.hpp include/xsec/transformers/TXFMParser.hpp include/xsec/transformers/TXFMSB.hpp -include/xsec/transformers/TXFMSHA1.hpp include/xsec/transformers/TXFMURL.hpp include/xsec/transformers/TXFMXPath.hpp include/xsec/transformers/TXFMXPathFilter.hpp include/xsec/transformers/TXFMXSL.hpp -include/xsec/utils/XSECAutoPtr.hpp include/xsec/utils/XSECBinTXFMInputStream.hpp -include/xsec/utils/XSECDOMUtils.hpp include/xsec/utils/XSECNameSpaceExpander.hpp include/xsec/utils/XSECPlatformUtils.hpp include/xsec/utils/XSECSOAPRequestor.hpp @@ -109,8 +108,6 @@ include/xsec/utils/XSECSafeBuffer.hpp include/xsec/utils/XSECSafeBufferFormatter.hpp include/xsec/utils/XSECTXFMInputSource.hpp include/xsec/utils/XSECXPathNodeList.hpp -include/xsec/utils/unixutils/XSECBinHTTPURIInputStream.hpp -include/xsec/utils/unixutils/XSECURIResolverGenericUnix.hpp include/xsec/xenc/XENCCipher.hpp include/xsec/xenc/XENCCipherData.hpp include/xsec/xenc/XENCCipherReference.hpp @@ -160,5 +157,6 @@ include/xsec/xkms/XKMSValidateResult.hpp include/xsec/xkms/XKMSValidityInterval.hpp lib/libxml-security-c.a lib/libxml-security-c.so -lib/libxml-security-c.so.17 -lib/libxml-security-c.so.17.0.3 +lib/libxml-security-c.so.20 +lib/libxml-security-c.so.20.0.1 +libdata/pkgconfig/xml-security-c.pc Modified: head/security/opensaml/Makefile ============================================================================== --- head/security/opensaml2/Makefile Mon Aug 6 17:22:36 2018 (r476517) +++ head/security/opensaml/Makefile Tue Aug 7 13:24:36 2018 (r476595) @@ -1,12 +1,10 @@ # Created by: Janos Mohacsi # $FreeBSD$ -PORTNAME= opensaml2 -PORTVERSION= 2.6.1 -PORTREVISION= 2 +PORTNAME= opensaml +PORTVERSION= 3.0.0 CATEGORIES= security MASTER_SITES= http://shibboleth.net/downloads/c++-opensaml/${PORTVERSION}/ -DISTNAME= opensaml-${PORTVERSION} MAINTAINER= girgen@FreeBSD.org COMMENT= Open source implementation of SAML2 @@ -21,9 +19,8 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ libxmltooling.so:devel/xmltooling GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-log4shib=${LOCALBASE} --with-openssl=${OPENSSLBASE} \ - --with-xmltooling=${LOCALBASE} --disable-doxygen-doc -USES= gmake libtool pkgconfig tar:bzip2 +CONFIGURE_ARGS+=--disable-doxygen-doc --disable-dependency-tracking +USES= gmake libtool pkgconfig tar:bzip2 ssl USE_LDCONFIG= yes OPTIONS_DEFINE= DOCS Modified: head/security/opensaml/distinfo ============================================================================== --- head/security/opensaml2/distinfo Mon Aug 6 17:22:36 2018 (r476517) +++ head/security/opensaml/distinfo Tue Aug 7 13:24:36 2018 (r476595) @@ -1,3 +1,3 @@ -TIMESTAMP = 1510765173 -SHA256 (opensaml-2.6.1.tar.bz2) = 69516b165858d381fcf1d8ce809c101246824d383aa635a3676648c88b242a83 -SIZE (opensaml-2.6.1.tar.bz2) = 575533 +TIMESTAMP = 1533580413 +SHA256 (opensaml-3.0.0.tar.bz2) = a9cb72e41cc9d1af08a3d7c7843410eb41d4e97d88d516db7f0e2da1243e296e +SIZE (opensaml-3.0.0.tar.bz2) = 587569 Modified: head/security/opensaml/pkg-plist ============================================================================== --- head/security/opensaml2/pkg-plist Mon Aug 6 17:22:36 2018 (r476517) +++ head/security/opensaml/pkg-plist Tue Aug 7 13:24:36 2018 (r476595) @@ -1,29 +1,32 @@ bin/samlsign -include/saml/encryption/EncryptedKeyResolver.h include/saml/Assertion.h -include/saml/base.h -include/saml/exceptions.h -include/saml/version.h include/saml/RootObject.h include/saml/SAMLConfig.h -include/saml/saml1/binding/SAMLArtifactType0001.h -include/saml/saml1/binding/SAMLArtifactType0002.h +include/saml/base.h +include/saml/binding/ArtifactMap.h +include/saml/binding/MessageDecoder.h +include/saml/binding/MessageEncoder.h +include/saml/binding/SAMLArtifact.h +include/saml/binding/SOAPClient.h +include/saml/binding/SecurityPolicy.h +include/saml/binding/SecurityPolicyRule.h +include/saml/encryption/EncryptedKeyResolver.h +include/saml/exceptions.h include/saml/saml1/binding/SAML1MessageDecoder.h include/saml/saml1/binding/SAML1SOAPClient.h +include/saml/saml1/binding/SAMLArtifactType0001.h +include/saml/saml1/binding/SAMLArtifactType0002.h include/saml/saml1/core/Assertions.h include/saml/saml1/core/Protocols.h -include/saml/saml1/profile/AssertionValidator.h -include/saml/saml1/profile/BrowserSSOProfileValidator.h include/saml/saml2/binding/SAML2Artifact.h include/saml/saml2/binding/SAML2ArtifactType0004.h include/saml/saml2/binding/SAML2MessageDecoder.h -include/saml/saml2/binding/SAML2Redirect.h include/saml/saml2/binding/SAML2SOAPClient.h include/saml/saml2/core/Assertions.h include/saml/saml2/core/Protocols.h +include/saml/saml2/metadata/AbstractDynamicMetadataProvider.h include/saml/saml2/metadata/AbstractMetadataProvider.h include/saml/saml2/metadata/DiscoverableMetadataProvider.h -include/saml/saml2/metadata/DynamicMetadataProvider.h include/saml/saml2/metadata/EndpointManager.h include/saml/saml2/metadata/EntityMatcher.h include/saml/saml2/metadata/Metadata.h @@ -32,24 +35,16 @@ include/saml/saml2/metadata/MetadataCredentialCriteria include/saml/saml2/metadata/MetadataFilter.h include/saml/saml2/metadata/MetadataProvider.h include/saml/saml2/metadata/ObservableMetadataProvider.h -include/saml/saml2/profile/AssertionValidator.h -include/saml/saml2/profile/BrowserSSOProfileValidator.h include/saml/saml2/profile/SAML2AssertionPolicy.h -include/saml/binding/ArtifactMap.h -include/saml/binding/MessageDecoder.h -include/saml/binding/MessageEncoder.h -include/saml/binding/SAMLArtifact.h -include/saml/binding/SecurityPolicy.h -include/saml/binding/SecurityPolicyRule.h -include/saml/binding/SOAPClient.h include/saml/signature/ContentReference.h include/saml/signature/SignableObject.h include/saml/signature/SignatureProfileValidator.h include/saml/util/CommonDomainCookie.h include/saml/util/SAMLConstants.h +include/saml/version.h lib/libsaml.so -lib/libsaml.so.9 -lib/libsaml.so.9.0.1 +lib/libsaml.so.10 +lib/libsaml.so.10.0.0 libdata/pkgconfig/opensaml.pc %%PORTDOCS%%%%DOCSDIR%%/README.txt %%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt Modified: head/security/shibboleth-sp/Makefile ============================================================================== --- head/security/shibboleth2-sp/Makefile Mon Aug 6 17:22:36 2018 (r476517) +++ head/security/shibboleth-sp/Makefile Tue Aug 7 13:24:36 2018 (r476595) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= shibboleth-sp -PORTVERSION= 2.6.1 -PORTREVISION= 2 +PORTVERSION= 3.0.2 CATEGORIES= security www MASTER_SITES= http://shibboleth.net/downloads/service-provider/${PORTVERSION}/ @@ -13,17 +12,19 @@ COMMENT= C++ Shibboleth Service Provider (Internet2) f LICENSE= APACHE20 BUILD_DEPENDS= boost-libs>=0:devel/boost-libs -LIB_DEPENDS= libsaml.so:security/opensaml2 \ +LIB_DEPENDS= libsaml.so:security/opensaml \ libxmltooling-lite.so:devel/xmltooling \ liblog4shib.so:devel/log4shib \ libxerces-c.so:textproc/xerces-c3 \ libxml-security-c.so:security/apache-xml-security-c -USES= gmake tar:bzip2 ssl +USES= gmake tar:bzip2 cpe pkgconfig libtool GNU_CONFIGURE= yes MAKE_ENV= NOKEYGEN=YES USE_LDCONFIG= yes USE_RC_SUBR= shibboleth-sp +DOCSDIR= ${PREFIX}/share/doc/shibboleth +CPE_VENDOR= shibboleth USERS= shibd GROUPS= shibd @@ -45,7 +46,7 @@ MEMCACHED_DESC= Store sessions in memcached FASTCGI_DESC= FastCGI protocol support, e.g. for NGINX APACHE_DESC= Build Apache module -APACHE_USES= apache:2.2+ +APACHE_USES= apache:2.4+ ODBC_CONFIGURE_ENABLE= odbc ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC @@ -66,26 +67,22 @@ SUB_LIST+= SHIBD_GROUP=${GROUPS} PLIST_SUB+= SHIBD_USER=${USERS} PLIST_SUB+= SHIBD_GROUP=${GROUPS} -CONFIGURE_ARGS+= --localstatedir=/var --with-log4shib=${LOCALBASE} -CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE} --with-xmltooling=${LOCALBASE} -CONFIGURE_ARGS+= --disable-doxygen-doc +CONFIGURE_ARGS+=--localstatedir=/var \ + --disable-doxygen-doc --disable-dependency-tracking .include <bsd.port.pre.mk> -.if ${PORT_OPTIONS:MAPACHE} -.if "${APACHE_VERSION}" == 2.2 -CONFIGURE_ARGS+=--disable-apache-24 --enable-apache-22 --with-apxs22=${APXS} -PLIST_SUB+= WITH_APACHE_22="" -PLIST_SUB+= WITH_APACHE_24="@comment " -.else +.if ${PORT_OPTIONS:MAPACHE} && "${APACHE_VERSION}" == 2.4 CONFIGURE_ARGS+=--disable-apache-22 --enable-apache-24 --with-apxs24=${APXS} -PLIST_SUB+= WITH_APACHE_22="@comment " PLIST_SUB+= WITH_APACHE_24="" -.endif .else CONFIGURE_ARGS+=--disable-apache-24 --disable-apache-22 -PLIST_SUB+= WITH_APACHE_22="@comment " PLIST_SUB+= WITH_APACHE_24="@comment " .endif + +post-patch: + @${REINPLACE_CMD} -e 's,^pkgdocdir.*=.*,pkgdocdir = ${DOCSDIR},' \ + -e 's,^pkgwebdir.*=.*,pkgwebdir = ${DOCSDIR},' \ + ${WRKSRC}/doc/Makefile.in ${WRKSRC}/configs/Makefile.in .include <bsd.port.post.mk> Modified: head/security/shibboleth-sp/distinfo ============================================================================== --- head/security/shibboleth2-sp/distinfo Mon Aug 6 17:22:36 2018 (r476517) +++ head/security/shibboleth-sp/distinfo Tue Aug 7 13:24:36 2018 (r476595) @@ -1,3 +1,3 @@ -TIMESTAMP = 1510743416 -SHA256 (shibboleth-sp-2.6.1.tar.bz2) = 1121e3b726b844d829ad86f2047be62da4284ce965ac184de2f81903f16b98e4 -SIZE (shibboleth-sp-2.6.1.tar.bz2) = 758031 +TIMESTAMP = 1533580338 +SHA256 (shibboleth-sp-3.0.2.tar.bz2) = 7aab399aeaf39145c60e1713dbc29a65f618e9eca84505f5ed03cee63e3f31a3 +SIZE (shibboleth-sp-3.0.2.tar.bz2) = 805141 Copied and modified: head/security/shibboleth-sp/files/patch-shibboleth.spec.in (from r476517, head/security/shibboleth2-sp/files/patch-shibboleth-spec) ============================================================================== --- head/security/shibboleth2-sp/files/patch-shibboleth-spec Mon Aug 6 17:22:36 2018 (r476517, copy source) +++ head/security/shibboleth-sp/files/patch-shibboleth.spec.in Tue Aug 7 13:24:36 2018 (r476595) @@ -1,6 +1,6 @@ ---- shibboleth.spec.in.orig 2015-07-20 21:31:32.000000000 +0200 -+++ shibboleth.spec.in 2015-07-22 17:45:15.000000000 +0200 -@@ -71,7 +71,7 @@ +--- shibboleth.spec.in.orig 2018-07-10 01:17:23 UTC ++++ shibboleth.spec.in +@@ -69,7 +69,7 @@ BuildRequires: systemd-rpm-macros, syste %if "%{_vendor}" == "suse" %define pkgdocdir %{_docdir}/shibboleth %else @@ -9,16 +9,13 @@ %endif %description -@@ -275,14 +275,6 @@ +@@ -289,11 +289,6 @@ exit 0 /sbin/ldconfig %endif --# Key generation or ownership fix --cd %{_sysconfdir}/shibboleth --if [ -f sp-key.pem ] ; then -- %{__chown} %{runuser}:%{runuser} sp-key.pem sp-cert.pem 2>/dev/null || : --else -- /bin/sh ./keygen.sh -b -u %{runuser} -g %{runuser} +-# Key ownership fix. +-if [ -f %{_sysconfdir}/shibboleth/sp-key.pem ] ; then +- %{__chown} %{runuser}:%{runuser} %{_sysconfdir}/shibboleth/sp-key.pem %{_sysconfdir}/shibboleth/sp-cert.pem 2>/dev/null || : -fi - # Fix ownership of log files (even on new installs, if they're left from an older one). Modified: head/security/shibboleth-sp/files/patch-shibsp_remoting_impl_TCPListener.cpp ============================================================================== --- head/security/shibboleth2-sp/files/patch-shibsp_remoting_impl_TCPListener.cpp Mon Aug 6 17:22:36 2018 (r476517) +++ head/security/shibboleth-sp/files/patch-shibsp_remoting_impl_TCPListener.cpp Tue Aug 7 13:24:36 2018 (r476595) @@ -1,8 +1,8 @@ ---- shibsp/remoting/impl/TCPListener.cpp.orig +--- shibsp/remoting/impl/TCPListener.cpp.orig 2018-07-10 01:17:23 UTC +++ shibsp/remoting/impl/TCPListener.cpp -@@ -38,6 +38,7 @@ - #include <stdio.h> +@@ -55,6 +55,7 @@ #include <stdlib.h> + #include <fcntl.h> #include <errno.h> +#include <netinet/in.h> Modified: head/security/shibboleth-sp/pkg-plist ============================================================================== --- head/security/shibboleth2-sp/pkg-plist Mon Aug 6 17:22:36 2018 (r476517) +++ head/security/shibboleth-sp/pkg-plist Tue Aug 7 13:24:36 2018 (r476595) @@ -8,8 +8,6 @@ etc/shibboleth/metagen.sh @sample etc/shibboleth/attribute-policy.xml.dist etc/shibboleth/attribute-policy.xml @sample etc/shibboleth/example-metadata.xml.dist etc/shibboleth/example-metadata.xml @sample etc/shibboleth/console.logger.dist etc/shibboleth/console.logger -@sample etc/shibboleth/syslog.logger.dist etc/shibboleth/syslog.logger -@sample etc/shibboleth/accessError.html.dist etc/shibboleth/accessError.html @sample etc/shibboleth/sessionError.html.dist etc/shibboleth/sessionError.html @sample etc/shibboleth/metadataError.html.dist etc/shibboleth/metadataError.html @sample etc/shibboleth/bindingTemplate.html.dist etc/shibboleth/bindingTemplate.html @@ -20,6 +18,7 @@ etc/shibboleth/metagen.sh @sample etc/shibboleth/example-shibboleth2.xml.dist etc/shibboleth/example-shibboleth2.xml @sample etc/shibboleth/protocols.xml.dist etc/shibboleth/protocols.xml @sample etc/shibboleth/security-policy.xml.dist etc/shibboleth/security-policy.xml +etc/shibboleth/seckeygen.sh etc/shibboleth/shibd-amazon etc/shibboleth/shibd-redhat etc/shibboleth/shibd-debian @@ -43,7 +42,6 @@ include/shibsp/SPConfig.h include/shibsp/SPRequest.h include/shibsp/ServiceProvider.h include/shibsp/SessionCache.h -include/shibsp/SessionCacheEx.h include/shibsp/TransactionLog.h include/shibsp/attribute/Attribute.h include/shibsp/attribute/AttributeDecoder.h @@ -93,23 +91,28 @@ include/shibsp/util/SPConstants.h include/shibsp/util/TemplateParameters.h include/shibsp/version.h lib/libshibsp.so -lib/libshibsp.so.7 -lib/libshibsp.so.7.0.1 +lib/libshibsp.so.8 +lib/libshibsp.so.8.0.2 lib/shibboleth/adfs.so lib/shibboleth/adfs-lite.so %%MEMCACHED%%lib/shibboleth/memcache-store.so %%ODBC%%lib/shibboleth/odbc-store.so lib/shibboleth/plugins-lite.so lib/shibboleth/plugins.so -%%WITH_APACHE_22%%lib/shibboleth/mod_shib_22.so %%WITH_APACHE_24%%lib/shibboleth/mod_shib_24.so %%FASTCGI%%lib/shibboleth/shibauthorizer %%FASTCGI%%lib/shibboleth/shibresponder lib/libshibsp-lite.so -lib/libshibsp-lite.so.7 -lib/libshibsp-lite.so.7.0.1 +lib/libshibsp-lite.so.8 +lib/libshibsp-lite.so.8.0.2 +libdata/pkgconfig/shibsp-lite.pc +libdata/pkgconfig/shibsp.pc sbin/shibd +share/xml/shibboleth/MetadataExchange.xsd +share/xml/shibboleth/WS-Trust.xsd share/xml/shibboleth/catalog.xml +share/xml/shibboleth/oasis-200401-wss-wssecurity-secext-1.0.xsd +share/xml/shibboleth/oasis-200401-wss-wssecurity-utility-1.0.xsd share/xml/shibboleth/shibboleth-2.0-afp-mf-basic.xsd share/xml/shibboleth/shibboleth-2.0-afp-mf-saml.xsd share/xml/shibboleth/shibboleth-2.0-afp.xsd @@ -117,19 +120,22 @@ share/xml/shibboleth/shibboleth-2.0-attribute-map.xsd share/xml/shibboleth/shibboleth-2.0-native-sp-config.xsd share/xml/shibboleth/shibboleth-2.0-native-sp-protocols.xsd share/xml/shibboleth/shibboleth-2.0-sp-notify.xsd +share/xml/shibboleth/shibboleth-3.0-native-sp-config.xsd share/xml/shibboleth/shibboleth-metadata-1.0.xsd share/xml/shibboleth/shibboleth.xsd -share/xml/shibboleth/WS-Trust.xsd -share/doc/shibboleth/CREDITS.txt -share/doc/shibboleth/FASTCGI.LICENSE -share/doc/shibboleth/LICENSE.txt -share/doc/shibboleth/LOG4CPP.LICENSE -share/doc/shibboleth/NOTICE.txt -share/doc/shibboleth/OPENSSL.LICENSE -share/doc/shibboleth/README.txt -share/doc/shibboleth/RELEASE.txt -share/doc/shibboleth/main.css -@dir /var/log/shibboleth-www +share/xml/shibboleth/ws-addr.xsd +share/xml/shibboleth/ws-authorization.xsd +share/xml/shibboleth/ws-federation.xsd +share/xml/shibboleth/ws-securitypolicy-1.2.xsd +%%DOCSDIR%%/CREDITS.txt +%%DOCSDIR%%/FASTCGI.LICENSE +%%DOCSDIR%%/LICENSE.txt +%%DOCSDIR%%/LOG4CPP.LICENSE +%%DOCSDIR%%/NOTICE.txt +%%DOCSDIR%%/OPENSSL.LICENSE +%%DOCSDIR%%/README.txt +%%DOCSDIR%%/RELEASE.txt +%%DOCSDIR%%/main.css @dir(%%SHIBD_USER%%,%%SHIBD_GROUP%%,755) /var/log/shibboleth @dir(%%SHIBD_USER%%,%%SHIBD_GROUP%%,755) /var/cache/shibboleth @dir(%%SHIBD_USER%%,%%WWWGRP%%,750) /var/run/shibboleth
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808071324.w77DObxE027409>