Attachment 134092 Details for Bug 178694 – file.diff

[patch] file.diff

file.diff (text/plain), 9.49 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: 9.49 KB

patch

obsolete

>Index: GIDs
>===================================================================
>--- GIDs	(revision 317858)
>+++ GIDs	(working copy)
>@@ -252,5 +252,6 @@
> ossec:*:966:
> kippo:*:969:
> colord:*:970:
>+shibd:*:971:
> nogroup:*:65533:
> nobody:*:65534:
>Index: UIDs
>===================================================================
>--- UIDs	(revision 317858)
>+++ UIDs	(working copy)
>@@ -259,4 +259,5 @@
> ossecr:*:968:966::0:0:OSSEC rem user:/usr/local/ossec-hids:/usr/sbin/nologin
> kippo:*:969:969::0:0:kippo user:/nonexistent:/usr/sbin/nologin
> colord:*:970:970::0:0:colord color management daemon:/nonexistent:/usr/sbin/nologin
>+shibd:*:971:971::0:0:Shibboleth SAML daemon:/nonexistent:/usr/sbin/nologin
> nobody:*:65534:65534::0:0:Unprivileged user:/nonexistent:/usr/sbin/nologin
>Index: devel/xmltooling/Makefile
>===================================================================
>--- devel/xmltooling/Makefile	(revision 317858)
>+++ devel/xmltooling/Makefile	(working copy)
>@@ -2,10 +2,9 @@
> # $FreeBSD$
> 
> PORTNAME=	xmltooling
>-PORTVERSION=	1.4.2
>-PORTREVISION=	1
>+PORTVERSION=	1.5.2
> CATEGORIES=	devel security
>-MASTER_SITES=	http://www.shibboleth.net/downloads/c++-opensaml/2.4.3/
>+MASTER_SITES=	http://shibboleth.net/downloads/c++-opensaml/2.5.2/
> 
> MAINTAINER=	jmohacsi@bsd.hu
> COMMENT=	Low level XML support for SAML
>@@ -13,7 +12,9 @@
> LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl \
> 		log4shib.1:${PORTSDIR}/devel/log4shib \
> 		xerces-c.3:${PORTSDIR}/textproc/xerces-c3 \
>-		xml-security-c.16:${PORTSDIR}/security/apache-xml-security-c
>+		xml-security-c.17:${PORTSDIR}/security/apache-xml-security-c
>+	
>+BUILD_DEPENDS=	boost-libs>=0:${PORTSDIR}/devel/boost-libs
> 
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS+=--with-log4shib=${LOCALBASE} --with-openssl=${OPENSSLBASE} --with-curl=${LOCALBASE} --disable-doxygen-doc
>Index: devel/xmltooling/distinfo
>===================================================================
>--- devel/xmltooling/distinfo	(revision 317858)
>+++ devel/xmltooling/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (xmltooling-1.4.2.tar.gz) = c32c503532cd0f2c64a71f0a7f4e63f660f1205830603b0bcd9225dc3c23445d
>-SIZE (xmltooling-1.4.2.tar.gz) = 636598
>+SHA256 (xmltooling-1.5.2.tar.gz) = d43719f8d742d87131ea64f2dbc8f1b366c7f216ac21015090a51693ff11df98
>+SIZE (xmltooling-1.5.2.tar.gz) = 679098
>Index: devel/xmltooling/pkg-plist
>===================================================================
>--- devel/xmltooling/pkg-plist	(revision 317858)
>+++ devel/xmltooling/pkg-plist	(working copy)
>@@ -48,7 +48,10 @@
> include/xmltooling/security/KeyInfoResolver.h
> include/xmltooling/security/OpenSSLCredential.h
> include/xmltooling/security/OpenSSLCryptoX509CRL.h
>+include/xmltooling/security/OpenSSLPathValidator.h
> include/xmltooling/security/OpenSSLTrustEngine.h
>+include/xmltooling/security/PKIXPathValidatorParams.h
>+include/xmltooling/security/PathValidator.h
> include/xmltooling/security/SecurityHelper.h
> include/xmltooling/security/SignatureTrustEngine.h
> include/xmltooling/security/TrustEngine.h
>@@ -84,13 +87,14 @@
> include/xmltooling/validation/ValidatorSuite.h
> include/xmltooling/version.h
> lib/libxmltooling-lite.so
>-lib/libxmltooling-lite.so.5
>+lib/libxmltooling-lite.so.6
> lib/libxmltooling.so
>-lib/libxmltooling.so.5
>+lib/libxmltooling.so.6
> libdata/pkgconfig/xmltooling.pc
> share/xml/xmltooling/catalog.xml
> share/xml/xmltooling/soap-envelope.xsd
> share/xml/xmltooling/xenc-schema.xsd
>+share/xml/xmltooling/xenc11-schema.xsd
> share/xml/xmltooling/xml.xsd
> share/xml/xmltooling/xmldsig-core-schema.xsd
> share/xml/xmltooling/xmldsig11-schema.xsd
>Index: security/shibboleth2-sp/Makefile
>===================================================================
>--- security/shibboleth2-sp/Makefile	(revision 317858)
>+++ security/shibboleth2-sp/Makefile	(working copy)
>@@ -1,54 +1,49 @@
> # Created by: Janos Mohacsi <janos.mohacsi@bsd.hu>
> # $FreeBSD$
>-
> PORTNAME=	shibboleth-sp
>-PORTVERSION=	2.4.3
>-PORTREVISION=	1
>+PORTVERSION=	2.5.1
> CATEGORIES=	security www
>-MASTER_SITES=	http://www.shibboleth.net/downloads/service-provider/${PORTVERSION}/
>+MASTER_SITES=	http://shibboleth.net/downloads/service-provider/${PORTVERSION}/
> 
> MAINTAINER=	swills@FreeBSD.org
> COMMENT=	C++ Shibboleth Service Provider (Internet2) for Apache
> 
>-LIB_DEPENDS=	saml.7:${PORTSDIR}/security/opensaml2
>+LIB_DEPENDS=	saml.8:${PORTSDIR}/security/opensaml2
> 
>-OPTIONS_DEFINE=	APACHE22
>-APACHE22_DESC=	Use Apache version 2.2 instead of version 2.0
>-
> MAKE_JOBS_SAFE=	yes
> USE_GMAKE=	yes
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
> USE_RC_SUBR=	shibboleth-sp
>-USE_AUTOTOOLS=	autoconf automake:env libtool:env
>-WRKSRC=		${WRKDIR}/shibboleth-${PORTVERSION}
> 
> LATEST_LINK=	shibboleth2-sp
> 
>+USERS=		shibd
>+GROUPS=		shibd
>+
>+USE_APACHE=	22-24
>+
> .include <bsd.port.pre.mk>
> 
>-.if ${PORT_OPTIONS:MAPACHE22}
>-USE_APACHE=	22
>+.if ${APACHE_VERSION} == 22
> CONFIGURE_ARGS=	--enable-apache-22 --with-apxs22=${APXS}
> PLIST_SUB+=	WITH_APACHE_22=""
>-PLIST_SUB+=	WITH_APACHE_20="@comment "
>+PLIST_SUB+=	WITH_APACHE_24="@comment "
> .else
>-IGNORE=	apache20 is no longer available
>-#USE_APACHE=	20
>-#CONFIGURE_ARGS=	--enable-apache-20 --with-apxs2=${APXS} --with-apr=${PREFIX}/lib/apache2/apr-config --with-apu=${PREFIX}/lib/apache2/apu-config
>+CONFIGURE_ARGS=	--enable-apache-24 --with-apxs24=${APXS}
> PLIST_SUB+=	WITH_APACHE_22="@comment "
>-PLIST_SUB+=	WITH_APACHE_20=""
>+PLIST_SUB+=	WITH_APACHE_24=""
> .endif
>+
>+SUB_LIST+=	SHIBD_USER=${USERS}
>+SUB_LIST+=	SHIBD_GROUP=${GROUPS}
> CONFIGURE_ARGS+=	--localstatedir=/var --with-log4shib=${LOCALBASE}
> CONFIGURE_ARGS+=	--with-openssl=${OPENSSLBASE} --with-xmltooling=${LOCALBASE}
> CONFIGURE_ARGS+=	--disable-doxygen-doc
> 
>-pre-configure:
>-	@${REINPLACE_CMD} -e 's|/run|/run/shibboleth|' ${WRKSRC}/configs/Makefile.in
>-	@${REINPLACE_CMD} -e 's|/doc/@PACKAGE@-@PACKAGE_VERSION@|/doc/@PACKAGE@|' \
>-		${WRKSRC}/configs/Makefile.am ${WRKSRC}/configs/Makefile.in \
>-		${WRKSRC}/doc/Makefile.am ${WRKSRC}/doc/Makefile.in
>-	${RM} ${WRKSRC}/aclocal.m4
>-	@cd ${WRKSRC} && ${AUTORECONF} -fvi
>+post-install:
>+		${CHOWN} ${USERS} ${PREFIX}/etc/shibboleth/sp-key.pem ${PREFIX}/etc/shibboleth/sp-cert.pem ;\
>+		${CHOWN} -R ${USERS} /var/log/shibboleth ;\
>+	       	${CHOWN} -R ${USERS}:www /var/run/shibboleth ; ${CHMOD} -R u=rwx,g=rx,o= /var/run/shibboleth
> 
> .include <bsd.port.post.mk>
>Index: security/shibboleth2-sp/distinfo
>===================================================================
>--- security/shibboleth2-sp/distinfo	(revision 317858)
>+++ security/shibboleth2-sp/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (shibboleth-sp-2.4.3.tar.gz) = 9e0b219707046b55d0ca38627fb213b799ac98cf11541845b7e6b036a89dcdcf
>-SIZE (shibboleth-sp-2.4.3.tar.gz) = 854326
>+SHA256 (shibboleth-sp-2.5.1.tar.gz) = a697034fe56a170602a3907cde6faf822836b1ba23cdc11af315a81df6102f04
>+SIZE (shibboleth-sp-2.5.1.tar.gz) = 952815
>Index: security/shibboleth2-sp/files/patch-configure.ac
>===================================================================
>--- security/shibboleth2-sp/files/patch-configure.ac	(revision 317858)
>+++ security/shibboleth2-sp/files/patch-configure.ac	(working copy)
>@@ -1,11 +0,0 @@
>---- configure.ac.orig	2009-12-01 19:07:37.000000000 +0200
>-+++ configure.ac	2010-01-06 19:23:05.000000000 +0200
>-@@ -717,7 +717,7 @@
>-         AC_MSG_CHECKING(for user-specified apu-config name/location)
>-         if test "$withval" != "no" ; then
>-             if test "$withval" != "yes"; then
>--                APR_CONFIG=$withval
>-+                APU_CONFIG=$withval
>-                 AC_MSG_RESULT("$withval")
>-             fi
>-         fi
>Index: security/shibboleth2-sp/files/patch-makefiles-docdir
>===================================================================
>--- security/shibboleth2-sp/files/patch-makefiles-docdir	(revision 0)
>+++ security/shibboleth2-sp/files/patch-makefiles-docdir	(working copy)
>@@ -0,0 +1,47 @@
>+--- doc/Makefile.am.orig	2012-07-23 22:08:29.000000000 +0200
>++++ doc/Makefile.am	2013-02-22 10:53:42.000000000 +0100
>+@@ -1,7 +1,7 @@
>+ AUTOMAKE_OPTIONS = foreign
>+ 
>+-pkgdocdir = $(datadir)/doc/@PACKAGE_NAME@-@PACKAGE_VERSION@
>+-pkgwebdir = $(datadir)/@PACKAGE_NAME@
>++pkgdocdir = $(datadir)/doc/@PACKAGE_NAME@
>++pkgwebdir = $(datadir)/doc/@PACKAGE_NAME@
>+ 
>+ install-data-hook:
>+ 	if test -d api ; then \
>+--- doc/Makefile.in.orig	2012-12-04 05:50:56.000000000 +0100
>++++ doc/Makefile.in	2013-02-22 10:53:42.000000000 +0100
>+@@ -288,8 +288,8 @@
>+ top_srcdir = @top_srcdir@
>+ xs = @xs@
>+ AUTOMAKE_OPTIONS = foreign
>+-pkgdocdir = $(datadir)/doc/@PACKAGE_NAME@-@PACKAGE_VERSION@
>+-pkgwebdir = $(datadir)/@PACKAGE_NAME@
>++pkgdocdir = $(datadir)/doc/@PACKAGE_NAME@
>++pkgwebdir = $(datadir)/doc/@PACKAGE_NAME@
>+ docfiles = \
>+ 	CREDITS.txt \
>+ 	LICENSE.txt \
>+--- configs/Makefile.am.orig	2012-12-04 05:49:50.000000000 +0100
>++++ configs/Makefile.am	2013-02-22 10:53:42.000000000 +0100
>+@@ -6,7 +6,7 @@
>+ pkglogdir = ${localstatedir}/log/@PACKAGE_NAME@
>+ shirelogdir = ${localstatedir}/log/httpd
>+ pkgxmldir = $(datadir)/xml/@PACKAGE_NAME@
>+-pkgwebdir = $(datadir)/@PACKAGE_NAME@
>++pkgwebdir = $(datadir)/doc/@PACKAGE_NAME@
>+ pkgrundir = $(localstatedir)/run/@PACKAGE_NAME@
>+ pkgcachedir = $(localstatedir)/cache/@PACKAGE_NAME@
>+ pkgsysconfdir = $(sysconfdir)/@PACKAGE_NAME@
>+--- configs/Makefile.in.orig	2012-12-04 05:50:56.000000000 +0100
>++++ configs/Makefile.in	2013-02-22 10:53:42.000000000 +0100
>+@@ -291,7 +291,7 @@
>+ pkglogdir = ${localstatedir}/log/@PACKAGE_NAME@
>+ shirelogdir = ${localstatedir}/log/httpd
>+ pkgxmldir = $(datadir)/xml/@PACKAGE_NAME@
>+-pkgwebdir = $(datadir)/@PACKAGE_NAME@
>++pkgwebdir = $(datadir)/doc/@PACKAGE_NAME@
>+ pkgrundir = $(localstatedir)/run/@PACKAGE_NAME@
>+ pkgcachedir = $(localstatedir)/cache/@PACKAGE_NAME@
>+ pkgsysconfdir = $(sysconfdir)/@PACKAGE_NAME@

Actions: View | Diff

Attachments on bug 178694: 134092 | 134093 | 134094