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

Collapse All | Expand All

(-)Makefile (-51 / +67 lines)
Lines 1-29 Link Here
1
# New ports collection makefile for:	strongswan
1
# Created by: Riaan Kruger <riaank@gmail.com>
2
# Date created:				30 May 2010
3
# Whom:					<riaank@gmail.com>
4
#
5
# $FreeBSD$
2
# $FreeBSD$
6
3
7
PORTNAME=	strongswan
4
PORTNAME=	strongswan
8
PORTVERSION=	4.5.3
5
PORTVERSION=	5.0.1
9
CATEGORIES=	security
6
CATEGORIES=	security
10
MASTER_SITES=	http://download.strongswan.org/ \
7
MASTER_SITES=	http://download.strongswan.org/ \
11
		http://download2.strongswan.org/
8
		http://download2.strongswan.org/
12
9
13
MAINTAINER=	riaank@gmail.com
10
MAINTAINER=	strongswan@nanoteq.com
14
COMMENT=	Open Source IKEv2 IPsec-based VPN solution
11
COMMENT=	Open Source IKEv2 IPsec-based VPN solution
15
12
16
OPTIONS=	SQLITE		"Enable SQLite" off \
13
LIB_DEPENDS=	execinfo:${PORTSDIR}/devel/libexecinfo
17
		MYSQL		"Enable MySQL" off \
18
		CURL		"Enable CURL to fetch CRL/OCSP" off \
19
		EAPAKA3GPP2	"Enable EAP AKA with 3gpp2 backend" off \
20
		EAPSIMFILE	"Enable EAP SIM with filebased backend" off
21
14
22
USE_RC_SUBR=	strongswan
23
USE_BZIP2=	yes
15
USE_BZIP2=	yes
16
USE_OPENSSL=	yes
24
USE_AUTOTOOLS=	libtool
17
USE_AUTOTOOLS=	libtool
18
USE_RC_SUBR=	strongswan.sh
25
GNU_CONFIGURE=	yes
19
GNU_CONFIGURE=	yes
26
USE_OPENSSL=	yes
27
USE_LDCONFIG=	yes
20
USE_LDCONFIG=	yes
28
21
29
CONFIGURE_ARGS=	--enable-kernel-pfkey \
22
CONFIGURE_ARGS=	--enable-kernel-pfkey \
Lines 31-43 Link Here
31
		--disable-kernel-netlink  \
24
		--disable-kernel-netlink  \
32
		--disable-tools  \
25
		--disable-tools  \
33
		--disable-scripts  \
26
		--disable-scripts  \
34
		--disable-pluto  \
35
		--disable-gmp \
27
		--disable-gmp \
36
		--enable-openssl \
28
		--enable-openssl \
37
		--enable-eap-identity \
29
		--enable-eap-identity \
38
		--enable-eap-md5 \
30
		--enable-eap-md5 \
39
		--enable-eap-tls \
31
		--enable-eap-tls \
40
		--enable-eap-mschapv2 \
32
		--enable-eap-mschapv2 \
33
		--enable-eap-peap \
34
		--enable-eap-ttls \
41
		--enable-md4 \
35
		--enable-md4 \
42
		--enable-blowfish \
36
		--enable-blowfish \
43
		--enable-addrblock \
37
		--enable-addrblock \
Lines 46-82 Link Here
46
		--with-lib-prefix=${PREFIX}
40
		--with-lib-prefix=${PREFIX}
47
41
48
# Man pages with default install
42
# Man pages with default install
49
MAN3=	anyaddr.3 atoaddr.3 atoasr.3 atoul.3 goodmask.3 initaddr.3 \
50
	initsubnet.3 portof.3 rangetosubnet.3 sameaddr.3 subnetof.3 \
51
	ttoaddr.3 ttodata.3 ttosa.3 ttoul.3
52
MAN5=	ipsec.conf.5 ipsec.secrets.5 strongswan.conf.5
43
MAN5=	ipsec.conf.5 ipsec.secrets.5 strongswan.conf.5
53
MAN8=	ipsec.8 _updown.8 _updown_espmark.8
44
MAN8=	ipsec.8 _updown.8 _updown_espmark.8
54
45
55
.include <bsd.port.pre.mk>
46
OPTIONS_DEFINE=	CURL EAPAKA3GPP2 EAPSIMFILE IKEv1 LDAP MYSQL SQLITE
47
CURL_DESC=	Enable CURL to fetch CRL/OCSP
48
EAPAKA3GPP2_DESC=	Enable EAP AKA with 3gpp2 backend
49
EAPSIMFILE_DESC=	Enable EAP SIM with file backend
50
IKEv1_DESC=	Enable IKEv1 support (Experimental)
56
51
57
# Requires FreeBSD 8 and above to work
52
.include <bsd.port.options.mk>
58
.if ${OSVERSION} < 800000
59
IGNORE=		requires at least FreeBSD 8.X
60
.endif
61
53
62
# Extra options
54
# Extra options
63
.if defined(WITH_SQLITE) || defined (WITH_MYSQL)
55
.if ${PORT_OPTIONS:MCURL}
64
CONFIGURE_ARGS+=	--enable-attr-sql
56
CONFIGURE_ARGS+=	--enable-curl
65
CONFIGURE_ARGS+=	--enable-sql
57
LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
66
PLIST_SUB+=	SQL=""
58
PLIST_SUB+=	CURL=""
67
.else
59
.else
68
PLIST_SUB+=	SQL="@comment "
60
PLIST_SUB+=	CURL="@comment "
69
.endif
61
.endif
70
62
71
.if defined(WITH_SQLITE)
63
.if ${PORT_OPTIONS:MEAPSIMFILE}
72
CONFIGURE_ARGS+=	--enable-sqlite
64
CONFIGURE_ARGS+=	--enable-eap-sim --enable-eap-sim-file
73
LIB_DEPENDS += sqlite3.8:${PORTSDIR}/databases/sqlite3
65
PLIST_SUB+=	EAPSIMFILE=""
74
PLIST_SUB+=	SQLITE=""
75
.else
66
.else
76
PLIST_SUB+=	SQLITE="@comment "
67
PLIST_SUB+=	EAPSIMFILE="@comment "
77
.endif
68
.endif
78
69
79
.if defined(WITH_MYSQL)
70
.if ${PORT_OPTIONS:MEAPAKA3GPP2}
71
CONFIGURE_ARGS+=	--enable-eap-aka --enable-eap-aka-3gpp2
72
LIB_DEPENDS+=	gmp:${PORTSDIR}/math/gmp
73
PLIST_SUB+=	EAPAKA3GPP2=""
74
.else
75
PLIST_SUB+=	EAPAKA3GPP2="@comment "
76
.endif
77
78
.if ${PORT_OPTIONS:MEAPSIMFILE} || ${PORT_OPTIONS:MEAPAKA3GPP2}
79
PLIST_SUB+=SIMAKA=""
80
.else
81
PLIST_SUB+=SIMAKA="@comment "
82
.endif
83
84
.if ${PORT_OPTIONS:MIKEv1}
85
PLIST_SUB+=	IKEv1=""
86
.else
87
CONFIGURE_ARGS+=	--disable-ikev1
88
PLIST_SUB+=	IKEv1="@comment "
89
.endif
90
91
.if ${PORT_OPTIONS:MLDAP}
92
USE_OPENLDAP=	yes
93
CONFIGURE_ARGS+=	--enable-ldap
94
PLIST_SUB+=	LDAP=""
95
.else
96
PLIST_SUB+=	LDAP="@comment "
97
.endif
98
99
.if ${PORT_OPTIONS:MMYSQL}
80
CONFIGURE_ARGS+=	--enable-mysql
100
CONFIGURE_ARGS+=	--enable-mysql
81
USE_MYSQL=	yes
101
USE_MYSQL=	yes
82
PLIST_SUB+=	MYSQL=""
102
PLIST_SUB+=	MYSQL=""
Lines 84-113 Link Here
84
PLIST_SUB+=	MYSQL="@comment "
104
PLIST_SUB+=	MYSQL="@comment "
85
.endif
105
.endif
86
106
87
.if defined(WITH_CURL)
107
.if ${PORT_OPTIONS:MSQLITE}
88
CONFIGURE_ARGS+=	--enable-curl
108
CONFIGURE_ARGS+=	--enable-sqlite
89
LIB_DEPENDS+=	curl.6:${PORTSDIR}/ftp/curl
109
LIB_DEPENDS+=	sqlite3:${PORTSDIR}/databases/sqlite3
90
PLIST_SUB+=	CURL=""
110
PLIST_SUB+=	SQLITE=""
91
.else
111
.else
92
PLIST_SUB+=	CURL="@comment "
112
PLIST_SUB+=	SQLITE="@comment "
93
.endif
113
.endif
94
114
95
.if defined(WITH_EAPSIMFILE)
115
.if ${PORT_OPTIONS:MMYSQL} || ${PORT_OPTIONS:MSQLITE}
96
CONFIGURE_ARGS+=	--enable-eap-sim
116
CONFIGURE_ARGS+=	--enable-attr-sql --enable-sql
97
CONFIGURE_ARGS+=	--enable-eap-sim-file
117
PLIST_SUB+=	SQL=""
98
PLIST_SUB+=	EAPSIMFILE=""
99
.else
118
.else
100
PLIST_SUB+=	EAPSIMFILE="@comment "
119
PLIST_SUB+=	SQL="@comment "
101
.endif
120
.endif
102
121
103
.if defined(WITH_EAPAKA3GPP2)
122
.include <bsd.port.pre.mk>
104
CONFIGURE_ARGS+=	--enable-eap-aka
123
105
CONFIGURE_ARGS+=	--enable-eap-aka-3gpp2
124
# Requires FreeBSD 8 and above to work
106
CONFIGURE_ARGS+=	--enable-gmp
125
.if ${OSVERSION} < 800000
107
LIB_DEPENDS+=	gmp.10:${PORTSDIR}/math/gmp
126
IGNORE=		requires at least FreeBSD 8.X
108
PLIST_SUB+=	EAPAKA3GPP2=""
109
.else
110
PLIST_SUB+=	EAPAKA3GPP2="@comment "
111
.endif
127
.endif
112
128
113
.include <bsd.port.post.mk>
129
.include <bsd.port.post.mk>
(-)distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (strongswan-4.5.3.tar.bz2) = a59fa0d9820fb06a3c848f4537b9256d2067265ad10e1b007b79f3b16279f1ff
1
SHA256 (strongswan-5.0.1.tar.bz2) = 1a4dff19ef69d15e0b90b1ea80bd183235ac73b4ecd114aab58ed54de0f5c3b4
2
SIZE (strongswan-4.5.3.tar.bz2) = 3299522
2
SIZE (strongswan-5.0.1.tar.bz2) = 3146776
(-)files/patch-src__ipsec__ipsec.in (-20 lines)
Lines 1-20 Link Here
1
diff -ur srcold/ipsec/ipsec.in src/ipsec/ipsec.in
2
--- srcold/ipsec/ipsec.in	2011-09-22 08:39:26.589952124 +0200
3
+++ src/ipsec/ipsec.in	2011-09-22 08:39:44.640945476 +0200
4
@@ -19,6 +19,7 @@
5
 export PATH
6
 
7
 # name and version of the ipsec implementation
8
+OS_NAME=`uname -s`
9
 IPSEC_NAME="@IPSEC_NAME@"
10
 IPSEC_VERSION="U@IPSEC_VERSION@/K`uname -r`"
11
 
12
@@ -378,7 +379,7 @@
13
 	fi
14
 	;;
15
 version|--version)
16
-	printf "Linux $IPSEC_NAME $IPSEC_VERSION\n"
17
+	printf "$OS_NAME $IPSEC_NAME $IPSEC_VERSION\n"
18
 	printf "$IPSEC_DISTRO\n"
19
 	printf "See 'ipsec --copyright' for copyright information.\n"
20
 	exit 0
(-)files/strongswan.in (-37 lines)
Lines 1-37 Link Here
1
#!/bin/sh
2
3
# $FreeBSD$
4
5
# PROVIDE: strongswan
6
# REQUIRE: LOGIN
7
# KEYWORD: shutdown
8
9
# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
10
# to enable this service:
11
#
12
# strongswan_enable (bool):   Set to NO by default.
13
#               Set it to YES to enable strongswan.
14
15
. /etc/rc.subr
16
17
name="strongswan"
18
rcvar=strongswan_enable
19
20
command="%%PREFIX%%/sbin/ipsec"
21
extra_commands="reload statusall"
22
23
load_rc_config $name
24
25
start_cmd="strongswan_command start"
26
stop_cmd="strongswan_command stop"
27
restart_cmd="strongswan_command restart"
28
status_cmd="strongswan_command status"
29
reload_cmd="strongswan_command reload"
30
statusall_cmd="strongswan_command statusall"
31
32
strongswan_command()
33
{
34
	$command ${rc_arg}
35
}
36
37
run_rc_command "$1"
(-)files/strongswan.sh.in (-11 / +7 lines)
Lines 1-23 Link Here
1
#!/bin/sh
1
#!/bin/sh
2
2
# Start or stop strongswan
3
# $FreeBSD$
3
# $FreeBSD$
4
4
5
# PROVIDE: strongswan
5
# PROVIDE: strongswan
6
# REQUIRE: LOGIN
6
# REQUIRE: DAEMON
7
# BEFORE: LOGIN
7
# KEYWORD: shutdown
8
# KEYWORD: shutdown
8
9
9
# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
10
command="%%PREFIX%%/sbin/ipsec"
10
# to enable this service:
11
#
12
# strongswan_enable (bool):   Set to NO by default.
13
#               Set it to YES to enable strongswan.
14
15
. /etc/rc.subr
11
. /etc/rc.subr
16
12
17
name="strongswan"
13
name="strongswan"
18
rcvar=strongswan_enable
14
rcvar=`set_rcvar`
19
20
command="%%PREFIX%%/sbin/ipsec"
21
extra_commands="reload statusall"
15
extra_commands="reload statusall"
22
16
23
load_rc_config $name
17
load_rc_config $name
Lines 29-37 Link Here
29
reload_cmd="strongswan_command reload"
23
reload_cmd="strongswan_command reload"
30
statusall_cmd="strongswan_command statusall"
24
statusall_cmd="strongswan_command statusall"
31
25
26
32
strongswan_command()
27
strongswan_command()
33
{
28
{
34
	$command ${rc_arg}
29
	$command ${rc_arg}
35
}
30
}
36
31
37
run_rc_command "$1"
32
run_rc_command "$1"
33
(-)pkg-plist (+30 lines)
Lines 12-17 Link Here
12
lib/ipsec/libstrongswan.la
12
lib/ipsec/libstrongswan.la
13
lib/ipsec/libstrongswan.so
13
lib/ipsec/libstrongswan.so
14
lib/ipsec/libstrongswan.so.0
14
lib/ipsec/libstrongswan.so.0
15
lib/ipsec/libtls.a
16
lib/ipsec/libtls.la
17
lib/ipsec/libtls.so
18
lib/ipsec/libtls.so.0
15
lib/ipsec/plugins/libstrongswan-addrblock.a
19
lib/ipsec/plugins/libstrongswan-addrblock.a
16
lib/ipsec/plugins/libstrongswan-addrblock.la
20
lib/ipsec/plugins/libstrongswan-addrblock.la
17
lib/ipsec/plugins/libstrongswan-addrblock.so
21
lib/ipsec/plugins/libstrongswan-addrblock.so
Lines 24-29 Link Here
24
lib/ipsec/plugins/libstrongswan-blowfish.a
28
lib/ipsec/plugins/libstrongswan-blowfish.a
25
lib/ipsec/plugins/libstrongswan-blowfish.la
29
lib/ipsec/plugins/libstrongswan-blowfish.la
26
lib/ipsec/plugins/libstrongswan-blowfish.so
30
lib/ipsec/plugins/libstrongswan-blowfish.so
31
lib/ipsec/plugins/libstrongswan-cmac.a
32
lib/ipsec/plugins/libstrongswan-cmac.la
33
lib/ipsec/plugins/libstrongswan-cmac.so
27
lib/ipsec/plugins/libstrongswan-constraints.a
34
lib/ipsec/plugins/libstrongswan-constraints.a
28
lib/ipsec/plugins/libstrongswan-constraints.la
35
lib/ipsec/plugins/libstrongswan-constraints.la
29
lib/ipsec/plugins/libstrongswan-constraints.so
36
lib/ipsec/plugins/libstrongswan-constraints.so
Lines 42-50 Link Here
42
lib/ipsec/plugins/libstrongswan-eap-mschapv2.a
49
lib/ipsec/plugins/libstrongswan-eap-mschapv2.a
43
lib/ipsec/plugins/libstrongswan-eap-mschapv2.la
50
lib/ipsec/plugins/libstrongswan-eap-mschapv2.la
44
lib/ipsec/plugins/libstrongswan-eap-mschapv2.so
51
lib/ipsec/plugins/libstrongswan-eap-mschapv2.so
52
lib/ipsec/plugins/libstrongswan-eap-peap.a
53
lib/ipsec/plugins/libstrongswan-eap-peap.la
54
lib/ipsec/plugins/libstrongswan-eap-peap.so
45
lib/ipsec/plugins/libstrongswan-eap-tls.a
55
lib/ipsec/plugins/libstrongswan-eap-tls.a
46
lib/ipsec/plugins/libstrongswan-eap-tls.la
56
lib/ipsec/plugins/libstrongswan-eap-tls.la
47
lib/ipsec/plugins/libstrongswan-eap-tls.so
57
lib/ipsec/plugins/libstrongswan-eap-tls.so
58
lib/ipsec/plugins/libstrongswan-eap-ttls.a
59
lib/ipsec/plugins/libstrongswan-eap-ttls.la
60
lib/ipsec/plugins/libstrongswan-eap-ttls.so
48
lib/ipsec/plugins/libstrongswan-fips-prf.a
61
lib/ipsec/plugins/libstrongswan-fips-prf.a
49
lib/ipsec/plugins/libstrongswan-fips-prf.la
62
lib/ipsec/plugins/libstrongswan-fips-prf.la
50
lib/ipsec/plugins/libstrongswan-fips-prf.so
63
lib/ipsec/plugins/libstrongswan-fips-prf.so
Lines 63-68 Link Here
63
lib/ipsec/plugins/libstrongswan-md5.a
76
lib/ipsec/plugins/libstrongswan-md5.a
64
lib/ipsec/plugins/libstrongswan-md5.la
77
lib/ipsec/plugins/libstrongswan-md5.la
65
lib/ipsec/plugins/libstrongswan-md5.so
78
lib/ipsec/plugins/libstrongswan-md5.so
79
lib/ipsec/plugins/libstrongswan-nonce.a
80
lib/ipsec/plugins/libstrongswan-nonce.la
81
lib/ipsec/plugins/libstrongswan-nonce.so
66
lib/ipsec/plugins/libstrongswan-openssl.a
82
lib/ipsec/plugins/libstrongswan-openssl.a
67
lib/ipsec/plugins/libstrongswan-openssl.la
83
lib/ipsec/plugins/libstrongswan-openssl.la
68
lib/ipsec/plugins/libstrongswan-openssl.so
84
lib/ipsec/plugins/libstrongswan-openssl.so
Lines 75-80 Link Here
75
lib/ipsec/plugins/libstrongswan-pkcs1.a
91
lib/ipsec/plugins/libstrongswan-pkcs1.a
76
lib/ipsec/plugins/libstrongswan-pkcs1.la
92
lib/ipsec/plugins/libstrongswan-pkcs1.la
77
lib/ipsec/plugins/libstrongswan-pkcs1.so
93
lib/ipsec/plugins/libstrongswan-pkcs1.so
94
lib/ipsec/plugins/libstrongswan-pkcs8.a
95
lib/ipsec/plugins/libstrongswan-pkcs8.la
96
lib/ipsec/plugins/libstrongswan-pkcs8.so
78
lib/ipsec/plugins/libstrongswan-pubkey.a
97
lib/ipsec/plugins/libstrongswan-pubkey.a
79
lib/ipsec/plugins/libstrongswan-pubkey.la
98
lib/ipsec/plugins/libstrongswan-pubkey.la
80
lib/ipsec/plugins/libstrongswan-pubkey.so
99
lib/ipsec/plugins/libstrongswan-pubkey.so
Lines 119-124 Link Here
119
libexec/ipsec/stroke
138
libexec/ipsec/stroke
120
libexec/ipsec/whitelist
139
libexec/ipsec/whitelist
121
sbin/ipsec
140
sbin/ipsec
141
%%SIMAKA%%lib/ipsec/libsimaka.a
142
%%SIMAKA%%lib/ipsec/libsimaka.la
143
%%SIMAKA%%lib/ipsec/libsimaka.so
144
%%SIMAKA%%lib/ipsec/libsimaka.so.0
122
%%EAPAKA3GPP2%%lib/ipsec/plugins/libstrongswan-eap-aka.a
145
%%EAPAKA3GPP2%%lib/ipsec/plugins/libstrongswan-eap-aka.a
123
%%EAPAKA3GPP2%%lib/ipsec/plugins/libstrongswan-eap-aka.la
146
%%EAPAKA3GPP2%%lib/ipsec/plugins/libstrongswan-eap-aka.la
124
%%EAPAKA3GPP2%%lib/ipsec/plugins/libstrongswan-eap-aka.so
147
%%EAPAKA3GPP2%%lib/ipsec/plugins/libstrongswan-eap-aka.so
Lines 137-142 Link Here
137
%%CURL%%lib/ipsec/plugins/libstrongswan-curl.a
160
%%CURL%%lib/ipsec/plugins/libstrongswan-curl.a
138
%%CURL%%lib/ipsec/plugins/libstrongswan-curl.la
161
%%CURL%%lib/ipsec/plugins/libstrongswan-curl.la
139
%%CURL%%lib/ipsec/plugins/libstrongswan-curl.so
162
%%CURL%%lib/ipsec/plugins/libstrongswan-curl.so
163
%%IKEv1%%lib/ipsec/plugins/libstrongswan-xauth-generic.a
164
%%IKEv1%%lib/ipsec/plugins/libstrongswan-xauth-generic.la
165
%%IKEv1%%lib/ipsec/plugins/libstrongswan-xauth-generic.so
166
%%LDAP%%lib/ipsec/plugins/libstrongswan-ldap.a
167
%%LDAP%%lib/ipsec/plugins/libstrongswan-ldap.la
168
%%LDAP%%lib/ipsec/plugins/libstrongswan-ldap.so
140
%%MYSQL%%lib/ipsec/plugins/libstrongswan-mysql.a
169
%%MYSQL%%lib/ipsec/plugins/libstrongswan-mysql.a
141
%%MYSQL%%lib/ipsec/plugins/libstrongswan-mysql.la
170
%%MYSQL%%lib/ipsec/plugins/libstrongswan-mysql.la
142
%%MYSQL%%lib/ipsec/plugins/libstrongswan-mysql.so
171
%%MYSQL%%lib/ipsec/plugins/libstrongswan-mysql.so
Lines 162-167 Link Here
162
@dirrm etc/ipsec.d/acerts
191
@dirrm etc/ipsec.d/acerts
163
@dirrm etc/ipsec.d/aacerts
192
@dirrm etc/ipsec.d/aacerts
164
@dirrm etc/ipsec.d
193
@dirrm etc/ipsec.d
194
@exec mkdir -p %D/etc/ipsec.d
165
@exec mkdir -p %D/etc/ipsec.d/reqs
195
@exec mkdir -p %D/etc/ipsec.d/reqs
166
@exec mkdir -p %D/etc/ipsec.d/private
196
@exec mkdir -p %D/etc/ipsec.d/private
167
@exec mkdir -p %D/etc/ipsec.d/ocspcerts
197
@exec mkdir -p %D/etc/ipsec.d/ocspcerts

Return to bug 173860