View | Details | Raw Unified | Return to bug 171738
Collapse All | Expand All

(-)distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (openvpn-2.2-RC2.tar.xz) = 8fdfab6be1ba6d0101601966123cd108536ca08259503c131bf270132c7d15b4
1
SHA256 (openvpn-2.3_beta1.tar.xz) = 885c332fe5527ecefd2b69f8f190877d477731b578c4c7283dc989a5ea686a25
2
SIZE (openvpn-2.2-RC2.tar.xz) = 639196
2
SIZE (openvpn-2.3_beta1.tar.xz) = 763628
(-)files/pkg-message.in (+12 lines)
Lines 8-10 Link Here
8
###  NOTE THIS IS AN UNSTABLE BETA VERSION UNDER DEVELOPMENT!
8
###  NOTE THIS IS AN UNSTABLE BETA VERSION UNDER DEVELOPMENT!
9
###  It may or may not be suitable for production. Use at your own risk.
9
###  It may or may not be suitable for production. Use at your own risk.
10
### ------------------------------------------------------------------------
10
### ------------------------------------------------------------------------
11
###
12
### PLUGIN LOCATION CHANGED!  
13
### The following plugin locations have changed.  There is a symlink to the
14
### new file for the duration of the 2.3 release.  This will be removed in
15
### OpenVPN 2.4+.
16
### Old Location:
17
### %%PREFIX%%/openvpn/plugins/openvpn-plugin-auth-pam.so
18
### %%PREFIX%%/openvpn/plugins/openvpn-plugin-down-root.so
19
###
20
### New Location:
21
### %%PREFIX%%/openvpn-plugin-auth-pam.so
22
### %%PREFIX%%/openvpn-plugin-down-root.so
(-)pkg-plist (-49 / +18 lines)
Lines 1-6 Link Here
1
sbin/openvpn
1
lib/openvpn/plugins/openvpn-plugin-auth-pam.so
2
lib/openvpn-plugin-auth-pam.so
3
lib/openvpn/plugins/openvpn-plugin-auth-pam.la
4
lib/openvpn/plugins/openvpn-plugin-down-root.so
5
lib/openvpn-plugin-down-root.so
6
lib/openvpn/plugins/openvpn-plugin-down-root.la
2
lib/openvpn-auth-pam.so
7
lib/openvpn-auth-pam.so
3
lib/openvpn-down-root.so
8
lib/openvpn-down-root.so
9
include/openvpn-plugin.h
10
sbin/openvpn
4
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
11
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
5
%%PORTDOCS%%%%DOCSDIR%%/COPYING
12
%%PORTDOCS%%%%DOCSDIR%%/COPYING
6
%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT.GPL
13
%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT.GPL
Lines 8-55 Link Here
8
%%PORTDOCS%%%%DOCSDIR%%/INSTALL
15
%%PORTDOCS%%%%DOCSDIR%%/INSTALL
9
%%PORTDOCS%%%%DOCSDIR%%/PORTS
16
%%PORTDOCS%%%%DOCSDIR%%/PORTS
10
%%PORTDOCS%%%%DOCSDIR%%/README
17
%%PORTDOCS%%%%DOCSDIR%%/README
11
%%PORTDOCS%%%%DOCSDIR%%/README.openvpn-auth-pam
18
%%PORTDOCS%%%%DOCSDIR%%/README.auth-pam
12
%%PORTDOCS%%%%DOCSDIR%%/README.openvpn-down-root
19
%%PORTDOCS%%%%DOCSDIR%%/README.down-root
20
%%PORTDOCS%%%%DOCSDIR%%/README.IPv6
21
%%PORTDOCS%%%%DOCSDIR%%/README.polarssl
13
%%PORTDOCS%%%%DOCSDIR%%/management-notes.txt
22
%%PORTDOCS%%%%DOCSDIR%%/management-notes.txt
14
%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/1.0/README
15
%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/1.0/build-ca
16
%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/1.0/build-dh
17
%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/1.0/build-inter
18
%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/1.0/build-key
19
%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/1.0/build-key-pass
20
%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/1.0/build-key-pkcs12
21
%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/1.0/build-key-server
22
%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/1.0/build-req
23
%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/1.0/build-req-pass
24
%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/1.0/clean-all
25
%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/1.0/list-crl
26
%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/1.0/make-crl
27
%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/1.0/openssl.cnf
28
%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/1.0/revoke-crt
29
%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/1.0/revoke-full
30
%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/1.0/sign-req
31
%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/1.0/vars
32
%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/Makefile
33
%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/README
34
%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/build-ca
35
%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/build-dh
36
%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/build-inter
37
%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/build-key
38
%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/build-key-pass
39
%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/build-key-pkcs12
40
%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/build-key-server
41
%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/build-req
42
%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/build-req-pass
43
%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/clean-all
44
%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/inherit-inter
45
%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/list-crl
46
%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/openssl-0.9.6.cnf
47
%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/openssl.cnf
48
%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/pkitool
49
%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/revoke-full
50
%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/sign-req
51
%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/vars
52
%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/whichopensslcnf
53
%%PORTDOCS%%%%DOCSDIR%%/sample-config-files/README
23
%%PORTDOCS%%%%DOCSDIR%%/sample-config-files/README
54
%%PORTDOCS%%%%DOCSDIR%%/sample-config-files/client.conf
24
%%PORTDOCS%%%%DOCSDIR%%/sample-config-files/client.conf
55
%%PORTDOCS%%%%DOCSDIR%%/sample-config-files/firewall.sh
25
%%PORTDOCS%%%%DOCSDIR%%/sample-config-files/firewall.sh
Lines 69-80 Link Here
69
%%PORTDOCS%%%%DOCSDIR%%/sample-scripts/auth-pam.pl
39
%%PORTDOCS%%%%DOCSDIR%%/sample-scripts/auth-pam.pl
70
%%PORTDOCS%%%%DOCSDIR%%/sample-scripts/bridge-start
40
%%PORTDOCS%%%%DOCSDIR%%/sample-scripts/bridge-start
71
%%PORTDOCS%%%%DOCSDIR%%/sample-scripts/bridge-stop
41
%%PORTDOCS%%%%DOCSDIR%%/sample-scripts/bridge-stop
72
%%PORTDOCS%%%%DOCSDIR%%/sample-scripts/openvpn.init
73
%%PORTDOCS%%%%DOCSDIR%%/sample-scripts/ucn.pl
42
%%PORTDOCS%%%%DOCSDIR%%/sample-scripts/ucn.pl
74
%%PORTDOCS%%%%DOCSDIR%%/sample-scripts/verify-cn
43
%%PORTDOCS%%%%DOCSDIR%%/sample-scripts/verify-cn
75
%%PORTDOCS%%@dirrm %%DOCSDIR%%/sample-scripts
44
@dirrmtry %%PORTDOCS%%%%DOCSDIR%%/sample-scripts
76
%%PORTDOCS%%@dirrm %%DOCSDIR%%/sample-config-files
45
@dirrmtry %%PORTDOCS%%%%DOCSDIR%%/sample-config-files
77
%%PORTDOCS%%@dirrm %%DOCSDIR%%/easy-rsa/2.0
46
@dirrmtry %%PORTDOCS%%%%DOCSDIR%%
78
%%PORTDOCS%%@dirrm %%DOCSDIR%%/easy-rsa/1.0
47
@dirrmtry %%PORTDOCS%%%%DOCSDIR%%/openvpn
79
%%PORTDOCS%%@dirrm %%DOCSDIR%%/easy-rsa
48
@dirrmtry lib/openvpn/plugins
80
%%PORTDOCS%%@dirrm %%DOCSDIR%%
49
@dirrmtry lib/openvpn
(-)Makefile (-32 / +32 lines)
Lines 2-11 Link Here
2
# Date created:		2010-08-13
2
# Date created:		2010-08-13
3
# Whom:			Eric F Crist <ecrist@secure-computing.net>
3
# Whom:			Eric F Crist <ecrist@secure-computing.net>
4
#
4
#
5
# $FreeBSD$
5
# $FreeBSD$ 
6
#
6
7
7
PORTNAME=	openvpn
8
PORTNAME=	openvpn
8
DISTVERSION=	2.2-RC2
9
DISTVERSION=	2.3_beta1
9
CATEGORIES=	security net
10
CATEGORIES=	security net
10
MASTER_SITES=	http://swupdate.openvpn.net/community/releases/
11
MASTER_SITES=	http://swupdate.openvpn.net/community/releases/
11
PKGNAMESUFFIX=	-beta
12
PKGNAMESUFFIX=	-beta
Lines 13-44 Link Here
13
MAINTAINER=	ecrist@secure-computing.net
14
MAINTAINER=	ecrist@secure-computing.net
14
COMMENT=	Secure IP/Ethernet tunnel daemon
15
COMMENT=	Secure IP/Ethernet tunnel daemon
15
16
16
# ecrist will update the -beta port as soon as there are formal
17
LICENSE=	GPLv2
17
# upstream test releases derived from openvpn-devel; in the meanwhile,
18
# move users to -devel.
19
IGNORE=	use openvpn-devel instead for now, there are currently no formal -betas.
20
18
21
CONFLICTS=	openvpn-devel-[0-9]* openvpn-2.0*
19
WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
22
20
21
CONFLICTS_INSTALL=	openvpn-[0-9]* openvpn-beta-[0-9]*
22
23
USE_XZ=		yes
23
USE_XZ=		yes
24
24
GNU_CONFIGURE=	yes
25
GNU_CONFIGURE=	yes
25
USE_OPENSSL=	yes
26
CFLAGS+=	-I${LOCALBASE}/include
26
CONFIGURE_ARGS=	--with-lzo-lib=${LOCALBASE}/lib \
27
LDFLAGS+=	-L${LOCALBASE}/lib
27
		--with-lzo-headers=${LOCALBASE}/include \
28
		--disable-depr-random-resolv
29
INSTALL_TARGET=	install mandir=${MANPREFIX}/man
28
INSTALL_TARGET=	install mandir=${MANPREFIX}/man
30
29
30
LIB_DEPENDS+=	lzo2.2:${PORTSDIR}/archivers/lzo2
31
31
MAN8=		openvpn.8
32
MAN8=		openvpn.8
32
33
33
OPTIONS=	PW_SAVE "Interactive passwords may be read from a file" off \
34
OPTIONS=	PW_SAVE "Interactive passwords may be read from a file" off \
34
		PKCS11  "Use security/pkcs11-helper" off
35
		PKCS11  "Use security/pkcs11-helper" off \
36
		POLARSSL "Build will PolarSSL instead of OpenSSL" off
35
37
36
USE_RC_SUBR=	openvpn
38
USE_RC_SUBR=	openvpn.sh
37
USE_LDCONFIG=	${PREFIX}/lib
39
USE_LDCONFIG=	${PREFIX}/lib
38
40
39
LIB_DEPENDS+=	lzo2.2:${PORTSDIR}/archivers/lzo2
41
SUB_FILES=	pkg-message
40
41
SUB_FILES=	pkg-message pkg-req
42
SUB_LIST+=	OSVERSION=${OSVERSION}
42
SUB_LIST+=	OSVERSION=${OSVERSION}
43
43
44
.if defined(PACKAGE_BUILDING)
44
.if defined(PACKAGE_BUILDING)
Lines 51-56 Link Here
51
CFLAGS+=	-DLOG_OPENVPN=${LOG_OPENVPN}
51
CFLAGS+=	-DLOG_OPENVPN=${LOG_OPENVPN}
52
.endif
52
.endif
53
53
54
.if defined (WITH_POLARSSL)
55
LIB_DEPENDS+=		polarssl:${PORTSDIR}/security/polarssl
56
CONFIGURE_ARGS+=	--with-crypto-library=polarssl
57
WITHOUT_CHECK=	yes
58
.else
59
USE_OPENSSL=	yes
60
.endif
61
54
pre-fetch:
62
pre-fetch:
55
.ifdef (LOG_OPENVPN)
63
.ifdef (LOG_OPENVPN)
56
	@${ECHO} "Building with LOG_OPENVPN=${LOG_OPENVPN}"
64
	@${ECHO} "Building with LOG_OPENVPN=${LOG_OPENVPN}"
Lines 78-113 Link Here
78
	@${FIND} ${WRKSRC} -name \*.bak -delete
86
	@${FIND} ${WRKSRC} -name \*.bak -delete
79
87
80
post-build:
88
post-build:
81
	cd ${WRKSRC}/plugin/down-root && ${MAKE}
89
	cd ${WRKSRC}/src/plugins/down-root && ${MAKE}
82
	cd ${WRKSRC}/plugin/auth-pam && ${CC} ${CPPFLAGS} -I../.. -DDLOPEN_PAM=0 ${CFLAGS} -fPIC -shared -Wl,-soname,openvpn-auth-pam.so -o openvpn-auth-pam.so auth-pam.c pamdl.c -lc -lpam
90
	cd ${WRKSRC}/src/plugins/auth-pam && ${CC} ${CPPFLAGS} -I../../../include -DDLOPEN_PAM=0 ${CFLAGS} -fPIC -shared -Wl,-soname,openvpn-auth-pam.so -o openvpn-auth-pam.so auth-pam.c pamdl.c -lc -lpam
83
	@# self-tests here
91
	@# self-tests here
84
.if !defined(WITHOUT_CHECK)
92
.if !defined(WITHOUT_CHECK)
85
	cd ${WRKSRC} && ${MAKE} check
93
	cd ${WRKSRC} && ${MAKE} check
86
.endif
94
.endif
87
95
88
pre-install:
89
	PKG_PREFIX=${PREFIX} ${SH} ${PKGREQ} ${PKGNAME} INSTALL
90
91
post-install:
96
post-install:
92
	${MKDIR} ${PREFIX}/lib
97
	${MKDIR} ${PREFIX}/lib
93
	${INSTALL_PROGRAM} ${WRKSRC}/plugin/down-root/openvpn-down-root.so ${PREFIX}/lib/
98
	${INSTALL_LIB} ${WRKSRC}/src/plugins/down-root/.libs/openvpn-plugin-down-root.so ${PREFIX}/lib/
94
	${INSTALL_PROGRAM} ${WRKSRC}/plugin/auth-pam/openvpn-auth-pam.so ${PREFIX}/lib/
99
	${INSTALL_LIB} ${WRKSRC}/src/plugins/auth-pam/.libs/openvpn-plugin-auth-pam.so ${PREFIX}/lib/
100
	${LN} -s ${WRKSRC}/src/plugins/down-root/.libs/openvpn-plugin-down-root.so ${PREFIX}/lib/openvpn-down-root.so
101
	${LN} -s ${WRKSRC}/src/plugins/down-root/.libs/openvpn-plugin-auth-pam.so ${PREFIX}/lib/openvpn-auth-pam.so
95
.if !defined(NOPORTDOCS)
102
.if !defined(NOPORTDOCS)
96
	${MKDIR} ${DOCSDIR}
103
	${MKDIR} ${DOCSDIR}
97
	${INSTALL_DATA} ${WRKSRC}/plugin/down-root/README ${DOCSDIR}/README.openvpn-down-root
98
	${INSTALL_DATA} ${WRKSRC}/plugin/auth-pam/README ${DOCSDIR}/README.openvpn-auth-pam
99
.for docs in AUTHORS COPYING COPYRIGHT.GPL ChangeLog INSTALL \
104
.for docs in AUTHORS COPYING COPYRIGHT.GPL ChangeLog INSTALL \
100
	PORTS README
105
	PORTS README
101
	${INSTALL_DATA} ${WRKSRC}/${docs} ${DOCSDIR}/
106
	${INSTALL_DATA} ${WRKSRC}/${docs} ${DOCSDIR}/
102
.endfor
107
.endfor
103
.for dir in easy-rsa easy-rsa/1.0 easy-rsa/2.0 sample-config-files
108
.for sample in sample-config-files sample-scripts
104
	${MKDIR} ${DOCSDIR}/${dir}
109
	(cd ${WRKSRC}/sample/${sample} && ${COPYTREE_SHARE} \*  ${DOCSDIR}/${sample})
105
	${FIND} ${WRKSRC}/${dir}/ -maxdepth 1 -type f -exec ${INSTALL_DATA} \{\} ${DOCSDIR}/${dir} \;
106
.endfor
110
.endfor
107
.for dir in sample-scripts
108
	${MKDIR} ${DOCSDIR}/${dir}
109
	${FIND} ${WRKSRC}/${dir}/ -maxdepth 1 -type f -exec ${INSTALL_SCRIPT} \{\} ${DOCSDIR}/${dir} \;
110
.endfor
111
.else
111
.else
112
	-@${RMDIR} ${DOCSDIR}
112
	-@${RMDIR} ${DOCSDIR}
113
.endif
113
.endif

Return to bug 171738