Attachment #68696 for bug #100917

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




# WILL BE DROPPED.       -- Matthias Andree, 2006-04-26
# -----------------------------------------------------
PORTVERSION=	2.0.6
PORTREVISION=	1
CATEGORIES=	security net
# MASTER_SITES points to hosts in distinct data centers,
# so just one MASTER_SITES entry should be OK.

OPTIONS=	PW_SAVE "Interactive passwords may be read from a file" off

USE_RC_SUBR=	openvpn.sh
USE_LDCONFIG=	${PREFIX}/lib

SUB_FILES=	pkg-message pkg-req
SUB_LIST+=	OSVERSION=${OSVERSION}

.include <bsd.port.pre.mk>

.if (${OSVERSION} >= 700007 || ( ${OSVERSION} < 700000 && ${OSVERSION} >= 600101))
rcsuffix=
.else
rcsuffix=	.sh
.endif
SUB_LIST+=	RCSFX=${rcsuffix}

# NOTE: there is no way to explicitly specify the LZO version to OpenVPN,
# if LZO2 and LZO1 are installed, OpenVPN will pick LZO2.
# So depend on LZO1 only if it's already there and LZO2 isn't.

CONFIGURE_ARGS+=	--enable-password-save
.endif

# self-tests here
post-build:
	cd ${WRKSRC}/plugin/down-root && ${MAKE}
	@# self-tests here
.if !defined(WITHOUT_CHECK)
	cd ${WRKSRC} && ${MAKE} check
.endif

pre-install:
	PKG_PREFIX=${PREFIX} ${SH} ${PKGREQ} ${PKGNAME} INSTALL

post-install:
	${MKDIR} ${PREFIX}/lib
	${INSTALL_PROGRAM} ${WRKSRC}/plugin/down-root/openvpn-down-root.so \
		${PREFIX}/lib
.if !defined(NOPORTDOCS)
	${MKDIR} ${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/plugin/down-root/README \
		${DOCSDIR}/README.openvpn-down-root
.for docs in AUTHORS COPYING COPYRIGHT.GPL ChangeLog INSTALL NEWS \
	PORTS README
	${INSTALL_DATA} ${WRKSRC}/${docs} ${DOCSDIR}

Lines 1-7 Link Here

(-)/usr/home/emma/ports/security/openvpn/files/pkg-message.in (-1 / +1 lines)
1	### ------------------------------------------------------------------------	1	### ------------------------------------------------------------------------
2	### The OpenVPN FreeBSD port, since v2.0.1, uses rcNG to start OpenVPN.	2	### The OpenVPN FreeBSD port, since v2.0.1, uses rcNG to start OpenVPN.
3	### Edit /etc/rc.conf to start OpenVPN automatically at system startup.	3	### Edit /etc/rc.conf to start OpenVPN automatically at system startup.
4	### See %%PREFIX%%/etc/rc.d/openvpn.sh for details.	4	### See %%PREFIX%%/etc/rc.d/openvpn%%RCSFX%% for details.
5	### ------------------------------------------------------------------------	5	### ------------------------------------------------------------------------
6	### To get OpenVPN 1.X to talk with the new 2.0 version, you may need to	6	### To get OpenVPN 1.X to talk with the new 2.0 version, you may need to
7	### edit the 1.X configuration file by adding these lines:	7	### edit the 1.X configuration file by adding these lines:




set -e

rcvers() {
	# determine if we have "old" or "new" (rcorder integration) scheme
	# for %%PREFIX%%/etc/rc.d/* files
	if test $1 -ge 700007 || test $1 -lt 700000 -a $1 -ge 600101 ; then
		echo 2
	else
		echo 1
	fi
}

if [ "$2" = INSTALL ] ; then
	# check if the base system is new enough for us,
	# which should only matter for package installs.
	buildrc=$(rcvers %%OSVERSION%%)
	execrc=$(rcvers $(sysctl -n kern.osreldate) )
	if test $buildrc -gt $execrc ; then
		cat <<EOF

Error:   this package, $1, was compiled for a newer FreeBSD
======   version that uses different boot scripts.
         Therefore, the rc.d script WILL NOT WORK.
         Please update your ports tree and install security/openvpn from there.

EOF
		exit 1
	fi
fi

Lines 1-4 Link Here

(-)/usr/home/emma/ports/security/openvpn/pkg-plist (+2 lines)
1	sbin/openvpn	1	sbin/openvpn
		2	lib/openvpn-down-root.so
2	%%PORTDOCS%%%%DOCSDIR%%/AUTHORS	3	%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
3	%%PORTDOCS%%%%DOCSDIR%%/COPYING	4	%%PORTDOCS%%%%DOCSDIR%%/COPYING
4	%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT.GPL	5	%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT.GPL
Lines 7-12 Link Here
7	%%PORTDOCS%%%%DOCSDIR%%/NEWS	8	%%PORTDOCS%%%%DOCSDIR%%/NEWS
8	%%PORTDOCS%%%%DOCSDIR%%/PORTS	9	%%PORTDOCS%%%%DOCSDIR%%/PORTS
9	%%PORTDOCS%%%%DOCSDIR%%/README	10	%%PORTDOCS%%%%DOCSDIR%%/README
		11	%%PORTDOCS%%%%DOCSDIR%%/README.openvpn-down-root
10	%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/README	12	%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/README
11	%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/build-ca	13	%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/build-ca
12	%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/build-dh	14	%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/build-dh

Return to bug 100917

Lines 13-18 Link Here

(-)/usr/home/emma/ports/security/openvpn/Makefile (-2 / +23 lines)
13	# WILL BE DROPPED. -- Matthias Andree, 2006-04-26	13	# WILL BE DROPPED. -- Matthias Andree, 2006-04-26
14	# -----------------------------------------------------	14	# -----------------------------------------------------
15	PORTVERSION= 2.0.6	15	PORTVERSION= 2.0.6
		16	PORTREVISION= 1
16	CATEGORIES= security net	17	CATEGORIES= security net
17	# MASTER_SITES points to hosts in distinct data centers,	18	# MASTER_SITES points to hosts in distinct data centers,
18	# so just one MASTER_SITES entry should be OK.	19	# so just one MASTER_SITES entry should be OK.
Lines 32-42 Link Here
32	OPTIONS= PW_SAVE "Interactive passwords may be read from a file" off	33	OPTIONS= PW_SAVE "Interactive passwords may be read from a file" off
33		34
34	USE_RC_SUBR= openvpn.sh	35	USE_RC_SUBR= openvpn.sh
		36	USE_LDCONFIG= ${PREFIX}/lib
35		37
36	SUB_FILES= pkg-message	38	SUB_FILES= pkg-message pkg-req
		39	SUB_LIST+= OSVERSION=${OSVERSION}
37		40
38	.include <bsd.port.pre.mk>	41	.include <bsd.port.pre.mk>
39		42
		43	.if (${OSVERSION} >= 700007 \|\| ( ${OSVERSION} < 700000 && ${OSVERSION} >= 600101))
		44	rcsuffix=
		45	.else
		46	rcsuffix= .sh
		47	.endif
		48	SUB_LIST+= RCSFX=${rcsuffix}
		49
40	# NOTE: there is no way to explicitly specify the LZO version to OpenVPN,	50	# NOTE: there is no way to explicitly specify the LZO version to OpenVPN,
41	# if LZO2 and LZO1 are installed, OpenVPN will pick LZO2.	51	# if LZO2 and LZO1 are installed, OpenVPN will pick LZO2.
42	# So depend on LZO1 only if it's already there and LZO2 isn't.	52	# So depend on LZO1 only if it's already there and LZO2 isn't.
Lines 51-63 Link Here
51	CONFIGURE_ARGS+= --enable-password-save	61	CONFIGURE_ARGS+= --enable-password-save
52	.endif	62	.endif
53		63
54	# self-tests here
55	post-build:	64	post-build:
		65	cd ${WRKSRC}/plugin/down-root && ${MAKE}
		66	@# self-tests here
		67	.if !defined(WITHOUT_CHECK)
56	cd ${WRKSRC} && ${MAKE} check	68	cd ${WRKSRC} && ${MAKE} check
		69	.endif
		70
		71	pre-install:
		72	PKG_PREFIX=${PREFIX} ${SH} ${PKGREQ} ${PKGNAME} INSTALL
57		73
58	post-install:	74	post-install:
		75	${MKDIR} ${PREFIX}/lib
		76	${INSTALL_PROGRAM} ${WRKSRC}/plugin/down-root/openvpn-down-root.so \
		77	${PREFIX}/lib
59	.if !defined(NOPORTDOCS)	78	.if !defined(NOPORTDOCS)
60	${MKDIR} ${DOCSDIR}	79	${MKDIR} ${DOCSDIR}
		80	${INSTALL_DATA} ${WRKSRC}/plugin/down-root/README \
		81	${DOCSDIR}/README.openvpn-down-root
61	.for docs in AUTHORS COPYING COPYRIGHT.GPL ChangeLog INSTALL NEWS \	82	.for docs in AUTHORS COPYING COPYRIGHT.GPL ChangeLog INSTALL NEWS \
62	PORTS README	83	PORTS README
63	${INSTALL_DATA} ${WRKSRC}/${docs} ${DOCSDIR}	84	${INSTALL_DATA} ${WRKSRC}/${docs} ${DOCSDIR}

Line 0 Link Here

(-)/usr/home/emma/ports/security/openvpn/files/pkg-req.in (+29 lines)
	1	set -e
	2
	3	rcvers() {
	4	# determine if we have "old" or "new" (rcorder integration) scheme
	5	# for %%PREFIX%%/etc/rc.d/* files
	6	if test $1 -ge 700007 \|\| test $1 -lt 700000 -a $1 -ge 600101 ; then
	7	echo 2
	8	else
	9	echo 1
	10	fi
	11	}
	12
	13	if [ "$2" = INSTALL ] ; then
	14	# check if the base system is new enough for us,
	15	# which should only matter for package installs.
	16	buildrc=$(rcvers %%OSVERSION%%)
	17	execrc=$(rcvers $(sysctl -n kern.osreldate) )
	18	if test $buildrc -gt $execrc ; then
	19	cat <<EOF
	20
	21	Error: this package, $1, was compiled for a newer FreeBSD
	22	====== version that uses different boot scripts.
	23	Therefore, the rc.d script WILL NOT WORK.
	24	Please update your ports tree and install security/openvpn from there.
	25
	26	EOF
	27	exit 1
	28	fi
	29	fi