Attachment 134094 Details for Bug 178694 – file.diff

[patch] file.diff

file.diff (text/plain), 10.21 KB, created by Palle Girgensohn on 2013-05-16 22:50:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Palle Girgensohn

Created: 2013-05-16 22:50:00 UTC

Size: 10.21 KB

patch

obsolete

>Index: security/shibboleth2-sp/files/shibboleth-sp.in
>===================================================================
>--- security/shibboleth2-sp/files/shibboleth-sp.in	(revision 317858)
>+++ security/shibboleth2-sp/files/shibboleth-sp.in	(working copy)
>@@ -11,9 +11,12 @@
> name="shibboleth_sp"
> rcvar=shibboleth_sp_enable
> 
>+: ${shibboleth_sp_user:='%%SHIBD_USER%%'}
>+: ${shibboleth_sp_group:='%%SHIBD_GROUP%%'}
>+
> command=${shibboleth_sp_program:-%%PREFIX%%/sbin/shibd}
>-pidfile="${shibboleth_sp_pidfile:-/var/run/${name}.pid}"
>-command_args="-f -p ${pidfile}"
>+pidfile="${shibboleth_sp_pidfile:-/var/run/shibboleth/${name}.pid}"
>+command_args="-f -p ${pidfile} -u ${shibboleth_sp_user} -g ${shibboleth_sp_group}"
> 
> load_rc_config $name
> run_rc_command "$1"
>Index: security/shibboleth2-sp/pkg-descr
>===================================================================
>--- security/shibboleth2-sp/pkg-descr	(revision 317858)
>+++ security/shibboleth2-sp/pkg-descr	(working copy)
>@@ -10,4 +10,4 @@
> is based on assertions received by the service provider (SP) from
> an identity provider.
> 
>-WWW:	http://shibboleth.internet2.edu/
>+WWW: http://shibboleth.internet2.edu/
>Index: security/shibboleth2-sp/pkg-plist
>===================================================================
>--- security/shibboleth2-sp/pkg-plist	(revision 317858)
>+++ security/shibboleth2-sp/pkg-plist	(working copy)
>@@ -64,7 +64,11 @@
> etc/shibboleth/shibd-osx.plist
> etc/shibboleth/apache.config
> etc/shibboleth/apache2.config
>+@unexec if cmp -s %D/etc/shibboleth/attrChecker.html.dist %D/etc/shibboleth/attrChecker.html; then rm -f %D/etc/shibboleth/attrChecker.html; fi
>+etc/shibboleth/attrChecker.html.dist
>+@exec if [ ! -f %D/etc/shibboleth/attrChecker.html ] ; then cp -p %D/etc/shibboleth/attrChecker.html.dist %D/etc/shibboleth/attrChecker.html; fi
> etc/shibboleth/apache22.config
>+etc/shibboleth/apache24.config
> etc/shibboleth/keygen.sh
> etc/shibboleth/upgrade.xsl
> etc/shibboleth/sp-key.pem
>@@ -88,6 +92,7 @@
> include/shibsp/TransactionLog.h
> include/shibsp/attribute/Attribute.h
> include/shibsp/attribute/AttributeDecoder.h
>+include/shibsp/attribute/BinaryAttribute.h
> include/shibsp/attribute/ExtensibleAttribute.h
> include/shibsp/attribute/NameIDAttribute.h
> include/shibsp/attribute/ScopedAttribute.h
>@@ -102,10 +107,10 @@
> include/shibsp/attribute/resolver/AttributeResolver.h
> include/shibsp/attribute/resolver/ResolutionContext.h
> include/shibsp/base.h
>-include/shibsp/config_pub.h
> include/shibsp/binding/ArtifactResolver.h
> include/shibsp/binding/ProtocolProvider.h
> include/shibsp/binding/SOAPClient.h
>+include/shibsp/config_pub.h
> include/shibsp/exceptions.h
> include/shibsp/handler/AbstractHandler.h
> include/shibsp/handler/AssertionConsumerService.h
>@@ -113,6 +118,7 @@
> include/shibsp/handler/LogoutHandler.h
> include/shibsp/handler/LogoutInitiator.h
> include/shibsp/handler/RemotedHandler.h
>+include/shibsp/handler/SecuredHandler.h
> include/shibsp/handler/SessionInitiator.h
> include/shibsp/lite/CommonDomainCookie.h
> include/shibsp/lite/SAMLConstants.h
>@@ -126,21 +132,20 @@
> include/shibsp/security/SecurityPolicyProvider.h
> include/shibsp/util/CGIParser.h
> include/shibsp/util/DOMPropertySet.h
>+include/shibsp/util/IPRange.h
> include/shibsp/util/PropertySet.h
> include/shibsp/util/SPConstants.h
> include/shibsp/util/TemplateParameters.h
> include/shibsp/version.h
>-lib/libshibsp.so.5
>+lib/libshibsp.so.6
> lib/libshibsp.so
> lib/shibboleth/adfs.so
>-lib/shibboleth/adfs.la
> lib/shibboleth/adfs-lite.so
>-lib/shibboleth/adfs-lite.la
>+lib/shibboleth/plugins-lite.so
>+lib/shibboleth/plugins.so
> %%WITH_APACHE_22%%lib/shibboleth/mod_shib_22.so
>-%%WITH_APACHE_22%%lib/shibboleth/mod_shib_22.la
>-%%WITH_APACHE_20%%lib/shibboleth/mod_shib_20.so
>-%%WITH_APACHE_20%%lib/shibboleth/mod_shib_20.la
>-lib/libshibsp-lite.so.5
>+%%WITH_APACHE_24%%lib/shibboleth/mod_shib_24.so
>+lib/libshibsp-lite.so.6
> lib/libshibsp-lite.so
> sbin/shibd
> share/xml/shibboleth/catalog.xml
>@@ -155,20 +160,20 @@
> 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/FASTCGI.LICENSE
>-share/doc/shibboleth/OPENSSL.LICENSE
>-share/doc/shibboleth/LOG4CPP.LICENSE
> share/doc/shibboleth/main.css
>-share/doc/shibboleth/logo.jpg
> @exec mkdir -p %D/data
> @exec mkdir -p /var/log/shibboleth
>+@exec chown -R shibd /var/log/shibboleth
> @exec mkdir -p /var/run/shibboleth
>-@exec chown www:www /var/run/shibboleth
>-@exec chmod -R ug=rwx,o= /var/run/shibboleth
>+@exec chown -R shibd:www /var/run/shibboleth
>+@exec chmod -R u=rwx,g=rx,o= /var/run/shibboleth
> @unexec rm -rf /var/run/shibboleth 2>&1 >/dev/null || true
> @dirrmtry share/doc/shibboleth/api
> @dirrmtry share/doc/shibboleth
>Index: security/opensaml2/Makefile
>===================================================================
>--- security/opensaml2/Makefile	(revision 317858)
>+++ security/opensaml2/Makefile	(working copy)
>@@ -2,10 +2,9 @@
> # $FreeBSD$
> 
> PORTNAME=	opensaml2
>-PORTVERSION=	2.4.3
>-PORTREVISION=	1
>+PORTVERSION=	2.5.2
> CATEGORIES=	security
>-MASTER_SITES=	http://www.shibboleth.net/downloads/c++-opensaml/${PORTVERSION}/
>+MASTER_SITES=	http://shibboleth.net/downloads/c++-opensaml/${PORTVERSION}/
> DISTNAME=	opensaml-${PORTVERSION}
> 
> MAINTAINER=	jmohacsi@bsd.hu
>@@ -14,7 +13,7 @@
> LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl \
> 		log4shib.1:${PORTSDIR}/devel/log4shib \
> 		xerces-c.3:${PORTSDIR}/textproc/xerces-c3 \
>-		xmltooling.5:${PORTSDIR}/devel/xmltooling
>+		xmltooling.6:${PORTSDIR}/devel/xmltooling
> 
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS+=--with-log4shib=${LOCALBASE} --with-openssl=${OPENSSLBASE} \
>Index: security/opensaml2/distinfo
>===================================================================
>--- security/opensaml2/distinfo	(revision 317858)
>+++ security/opensaml2/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (opensaml-2.4.3.tar.gz) = 850187c7dd664f9216a387bcc9e08f36643f04ddc08d11551e33a46dd15d2539
>-SIZE (opensaml-2.4.3.tar.gz) = 871693
>+SHA256 (opensaml-2.5.2.tar.gz) = 5bc3fbe5e789ad7aedfc2919413131400290466ecd2b77b1c3f3dc4c37e6fe54
>+SIZE (opensaml-2.5.2.tar.gz) = 707139
>Index: security/opensaml2/pkg-plist
>===================================================================
>--- security/opensaml2/pkg-plist	(revision 317858)
>+++ security/opensaml2/pkg-plist	(working copy)
>@@ -25,6 +25,7 @@
> 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
> include/saml/saml2/metadata/MetadataCredentialContext.h
> include/saml/saml2/metadata/MetadataCredentialCriteria.h
>@@ -46,7 +47,7 @@
> include/saml/signature/SignatureProfileValidator.h
> include/saml/util/CommonDomainCookie.h
> include/saml/util/SAMLConstants.h
>-lib/libsaml.so.7
>+lib/libsaml.so.8
> lib/libsaml.so
> libdata/pkgconfig/opensaml.pc
> %%PORTDOCS%%%%DOCSDIR%%/README.txt
>@@ -67,6 +68,8 @@
> share/xml/opensaml/cs-sstc-schema-protocol-01.xsd
> share/xml/opensaml/cs-sstc-schema-assertion-1.1.xsd
> share/xml/opensaml/cs-sstc-schema-protocol-1.1.xsd
>+share/xml/opensaml/saml-async-slo-v1.0.xsd
>+share/xml/opensaml/saml-metadata-rpi-v1.0.xsd
> share/xml/opensaml/saml-schema-assertion-2.0.xsd
> share/xml/opensaml/saml-schema-authn-context-2.0.xsd
> share/xml/opensaml/saml-schema-authn-context-auth-telephony-2.0.xsd
>Index: security/apache-xml-security-c/Makefile
>===================================================================
>--- security/apache-xml-security-c/Makefile	(revision 317858)
>+++ security/apache-xml-security-c/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	xml-security-c
>-PORTVERSION=	1.6.1
>+PORTVERSION=	1.7.0
> CATEGORIES=	security
> MASTER_SITES=	${MASTER_SITE_APACHE}
> MASTER_SITE_SUBDIR=santuario/c-library
>Index: security/apache-xml-security-c/distinfo
>===================================================================
>--- security/apache-xml-security-c/distinfo	(revision 317858)
>+++ security/apache-xml-security-c/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (xml-security-c-1.6.1.tar.gz) = 73931a55d6925a82416ea48f8d6f1b8ed591368e1dfc30574fe43904b7c62fcd
>-SIZE (xml-security-c-1.6.1.tar.gz) = 864366
>+SHA256 (xml-security-c-1.7.0.tar.gz) = c8cd6ec3d3b777fcca295cb4b273b08e4cfe37e03fc27131ec079894b9dae87c
>+SIZE (xml-security-c-1.7.0.tar.gz) = 874025
>Index: security/apache-xml-security-c/pkg-plist
>===================================================================
>--- security/apache-xml-security-c/pkg-plist	(revision 317858)
>+++ security/apache-xml-security-c/pkg-plist	(working copy)
>@@ -160,7 +160,7 @@
> include/xsec/xkms/XKMSValidityInterval.hpp
> lib/libxml-security-c.a
> lib/libxml-security-c.so
>-lib/libxml-security-c.so.16
>+lib/libxml-security-c.so.17
> @dirrm include/xsec/xkms
> @dirrm include/xsec/xenc
> @dirrm include/xsec/utils/unixutils
>Index: devel/log4shib/Makefile
>===================================================================
>--- devel/log4shib/Makefile	(revision 317858)
>+++ devel/log4shib/Makefile	(working copy)
>@@ -7,9 +7,9 @@
> #
> 
> PORTNAME=	log4shib
>-DISTVERSION=	1.0.4
>+DISTVERSION=	1.0.5
> CATEGORIES=	devel
>-MASTER_SITES=	http://shibboleth.internet2.edu/downloads/${PORTNAME}/${DISTVERSION}/
>+MASTER_SITES=	http://shibboleth.net/downloads/${PORTNAME}/${DISTVERSION}/
> 
> MAINTAINER=	vanilla@FreeBSD.org
> COMMENT=	A library of C++ classes for flexible logging
>@@ -21,8 +21,8 @@
> CONFIGURE_ARGS=	--with-pthreads --disable-html-docs --disable-doxygen
> USE_LDCONFIG=	yes
> 
>+USES=		pathfix
> post-patch:
> 	@${REINPLACE_CMD} -e 's| -pedantic||g' ${WRKSRC}/configure
>-	@${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' ${WRKSRC}/Makefile.in
> 
> .include <bsd.port.mk>
>Index: devel/log4shib/distinfo
>===================================================================
>--- devel/log4shib/distinfo	(revision 317858)
>+++ devel/log4shib/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (log4shib-1.0.4.tar.gz) = 4e5f9e58f14f2498d8be15dc0a6223e83f0510a924494295329b20745cacbc38
>-SIZE (log4shib-1.0.4.tar.gz) = 487529
>+SHA256 (log4shib-1.0.5.tar.gz) = 0cd7f6e45f02fabeb3e4c5e7704504ec0ee23b3170e136cdf4aaaec0f78f0bf4
>+SIZE (log4shib-1.0.5.tar.gz) = 562871

Actions: View | Diff

Attachments on bug 178694: 134092 | 134093 | 134094