View | Details | Raw Unified | Return to bug 178694 | Differences between
and this patch

Collapse All | Expand All

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

Return to bug 178694