Attachment #345840 for bug #407195

Lines 16-18 Link Here

(-)a/files/openvpn-2.1.conf (+7 lines)
16	# In other words, unless you understand service dependencies and are a	16	# In other words, unless you understand service dependencies and are a
17	# competent shell scripter, don't set this.	17	# competent shell scripter, don't set this.
18	RE_ENTER="no"	18	RE_ENTER="no"
		19
		20	# OpenVPN is built with a static reference to the iproute2 'ip' program.
		21	# The initscript is able to dynamically determine the correct location based on
		22	# the environment $PATH. Most people will want to let the init script determine
		23	# this location, but if you would rather use the hard-coded path detected at
		24	# build-time, set this to "no" here.
		25	DETECT_IPROUTE2="yes"




	if ! grep -q "^[ 	]*cd[ 	].*" "${VPNCONF}" ; then
		args="${args} --cd ${VPNDIR}"
	fi

	# Under Linux, locate the 'ip' command to pass to --iproute
	# See bug #407195
	if [ $(uname -s) = "Linux" ] && [ "${DETECT_IPROUTE2:-yes}" = "yes" ]; then
		local ip_bin="$(which ip)"
		if [ $? -ne 0 ]; then
			eerror "Unable to locate the 'ip' binary in your PATH"
			return 1
		fi
		args="${args} --iproute $ip_bin"
	fi
	
	# We mark the service as inactive and then start it.
	# When we get an authenticated packet from the peer then we run our script




LICENSE="GPL-2"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
IUSE="examples minimal pam passwordsave selinux +ssl static pkcs11 userland_BSD"

DEPEND=">=dev-libs/lzo-1.07
	kernel_linux? (
		sys-apps/iproute2[-minimal]
	)
	!minimal? ( pam? ( virtual/pam ) )
	selinux? ( sec-policy/selinux-openvpn )

		myconf="$(use_enable pkcs11)"
	fi

	# We require iproute2 under Linux, see Bug #407195
	use kernel_linux && myconf="${myconf} --enable-iproute2"

	econf ${myconf} \
		$(use_enable passwordsave password-save) \
		$(use_enable ssl) \
		$(use_enable ssl crypto) \
		$(use_enable iproute2) \
		--docdir="${EPREFIX}/usr/share/doc/${PF}"
}





LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-linux"
IUSE="examples down-root pam passwordsave pkcs11 +plugins selinux +ssl +lzo static userland_BSD"

REQUIRED_USE="static? ( !plugins !pkcs11 )
			!plugins? ( !pam !down-root )"

DEPEND="
	kernel_linux? (
		sys-apps/iproute2[-minimal]
	)
	pam? ( virtual/pam )
	selinux? ( sec-policy/selinux-openvpn )


src_configure() {
	use static && LDFLAGS="${LDFLAGS} -Xcompiler -static"

	# We require iproute2 under Linux, see Bug #407195
	local myconf
	use kernel_linux && myconf="--enable-iproute2"

	econf ${myconf} \
		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
		--with-plugindir="${ROOT}/usr/$(get_libdir)/$PN" \
		$(use_enable passwordsave password-save) \

		$(use_enable lzo) \
		$(use_enable pkcs11) \
		$(use_enable plugins) \
		$(use_enable iproute2) \
		$(use_enable pam plugin-auth-pam) \
		$(use_enable down-root plugin-down-root)
}




LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
IUSE="examples down-root pam passwordsave pkcs11 +plugins selinux +ssl +lzo static userland_BSD"

REQUIRED_USE="static? ( !plugins !pkcs11 )
			!plugins? ( !pam !down-root )"

DEPEND="
	kernel_linux? (
		sys-apps/iproute2[-minimal]
	)
	pam? ( virtual/pam )
	selinux? ( sec-policy/selinux-openvpn )


src_configure() {
	use static && LDFLAGS="${LDFLAGS} -Xcompiler -static"

	# We require iproute2 under Linux, see Bug #407195
	local myconf
	use kernel_linux && myconf="--enable-iproute2"

	econf ${myconf} \
		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
		--with-plugindir="${ROOT}/usr/$(get_libdir)/$PN" \
		$(use_enable passwordsave password-save) \

		$(use_enable lzo) \
		$(use_enable pkcs11) \
		$(use_enable plugins) \
		$(use_enable iproute2) \
		$(use_enable pam plugin-auth-pam) \
		$(use_enable down-root plugin-down-root)
}

Return to bug 407195

Lines 72-77 Link Here

(-)a/files/openvpn-2.1.init (+11 lines)
72	if ! grep -q "^[ ]cd[ ]." "${VPNCONF}" ; then	72	if ! grep -q "^[ ]cd[ ]." "${VPNCONF}" ; then
73	args="${args} --cd ${VPNDIR}"	73	args="${args} --cd ${VPNDIR}"
74	fi	74	fi
		75
		76	# Under Linux, locate the 'ip' command to pass to --iproute
		77	# See bug #407195
		78	if [ $(uname -s) = "Linux" ] && [ "${DETECT_IPROUTE2:-yes}" = "yes" ]; then
		79	local ip_bin="$(which ip)"
		80	if [ $? -ne 0 ]; then
		81	eerror "Unable to locate the 'ip' binary in your PATH"
		82	return 1
		83	fi
		84	args="${args} --iproute $ip_bin"
		85	fi
75		86
76	# We mark the service as inactive and then start it.	87	# We mark the service as inactive and then start it.
77	# When we get an authenticated packet from the peer then we run our script	88	# When we get an authenticated packet from the peer then we run our script

Lines 13-23 Link Here

(-)a/openvpn-2.2.2.ebuild (-3 / +5 lines)
13	LICENSE="GPL-2"	13	LICENSE="GPL-2"
14	SLOT="0"	14	SLOT="0"
15	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"	15	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
16	IUSE="examples iproute2 minimal pam passwordsave selinux +ssl static pkcs11 userland_BSD"	16	IUSE="examples minimal pam passwordsave selinux +ssl static pkcs11 userland_BSD"
17		17
18	DEPEND=">=dev-libs/lzo-1.07	18	DEPEND=">=dev-libs/lzo-1.07
19	kernel_linux? (	19	kernel_linux? (
20	iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools )	20	sys-apps/iproute2[-minimal]
21	)	21	)
22	!minimal? ( pam? ( virtual/pam ) )	22	!minimal? ( pam? ( virtual/pam ) )
23	selinux? ( sec-policy/selinux-openvpn )	23	selinux? ( sec-policy/selinux-openvpn )
Lines 50-60 Link Here
50	myconf="$(use_enable pkcs11)"	50	myconf="$(use_enable pkcs11)"
51	fi	51	fi
52		52
		53	# We require iproute2 under Linux, see Bug #407195
		54	use kernel_linux && myconf="${myconf} --enable-iproute2"
		55
53	econf ${myconf} \	56	econf ${myconf} \
54	$(use_enable passwordsave password-save) \	57	$(use_enable passwordsave password-save) \
55	$(use_enable ssl) \	58	$(use_enable ssl) \
56	$(use_enable ssl crypto) \	59	$(use_enable ssl crypto) \
57	$(use_enable iproute2) \
58	--docdir="${EPREFIX}/usr/share/doc/${PF}"	60	--docdir="${EPREFIX}/usr/share/doc/${PF}"
59	}	61	}
60		62

Lines 13-26 Link Here

(-)a/openvpn-2.3.0.ebuild (-4 / +8 lines)
13	LICENSE="GPL-2"	13	LICENSE="GPL-2"
14	SLOT="0"	14	SLOT="0"
15	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-linux"	15	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-linux"
16	IUSE="examples down-root iproute2 pam passwordsave pkcs11 +plugins selinux +ssl +lzo static userland_BSD"	16	IUSE="examples down-root pam passwordsave pkcs11 +plugins selinux +ssl +lzo static userland_BSD"
17		17
18	REQUIRED_USE="static? ( !plugins !pkcs11 )	18	REQUIRED_USE="static? ( !plugins !pkcs11 )
19	!plugins? ( !pam !down-root )"	19	!plugins? ( !pam !down-root )"
20		20
21	DEPEND="	21	DEPEND="
22	kernel_linux? (	22	kernel_linux? (
23	iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools )	23	sys-apps/iproute2[-minimal]
24	)	24	)
25	pam? ( virtual/pam )	25	pam? ( virtual/pam )
26	selinux? ( sec-policy/selinux-openvpn )	26	selinux? ( sec-policy/selinux-openvpn )
Lines 35-41 Link Here
35		35
36	src_configure() {	36	src_configure() {
37	use static && LDFLAGS="${LDFLAGS} -Xcompiler -static"	37	use static && LDFLAGS="${LDFLAGS} -Xcompiler -static"
38	econf \	38
		39	# We require iproute2 under Linux, see Bug #407195
		40	local myconf
		41	use kernel_linux && myconf="--enable-iproute2"
		42
		43	econf ${myconf} \
39	--docdir="${EPREFIX}/usr/share/doc/${PF}" \	44	--docdir="${EPREFIX}/usr/share/doc/${PF}" \
40	--with-plugindir="${ROOT}/usr/$(get_libdir)/$PN" \	45	--with-plugindir="${ROOT}/usr/$(get_libdir)/$PN" \
41	$(use_enable passwordsave password-save) \	46	$(use_enable passwordsave password-save) \
Lines 44-50 Link Here
44	$(use_enable lzo) \	49	$(use_enable lzo) \
45	$(use_enable pkcs11) \	50	$(use_enable pkcs11) \
46	$(use_enable plugins) \	51	$(use_enable plugins) \
47	$(use_enable iproute2) \
48	$(use_enable pam plugin-auth-pam) \	52	$(use_enable pam plugin-auth-pam) \
49	$(use_enable down-root plugin-down-root)	53	$(use_enable down-root plugin-down-root)
50	}	54	}

Lines 13-26 Link Here

(-)a/openvpn-9999.ebuild (-4 / +8 lines)
13	LICENSE="GPL-2"	13	LICENSE="GPL-2"
14	SLOT="0"	14	SLOT="0"
15	KEYWORDS=""	15	KEYWORDS=""
16	IUSE="examples down-root iproute2 pam passwordsave pkcs11 +plugins selinux +ssl +lzo static userland_BSD"	16	IUSE="examples down-root pam passwordsave pkcs11 +plugins selinux +ssl +lzo static userland_BSD"
17		17
18	REQUIRED_USE="static? ( !plugins !pkcs11 )	18	REQUIRED_USE="static? ( !plugins !pkcs11 )
19	!plugins? ( !pam !down-root )"	19	!plugins? ( !pam !down-root )"
20		20
21	DEPEND="	21	DEPEND="
22	kernel_linux? (	22	kernel_linux? (
23	iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools )	23	sys-apps/iproute2[-minimal]
24	)	24	)
25	pam? ( virtual/pam )	25	pam? ( virtual/pam )
26	selinux? ( sec-policy/selinux-openvpn )	26	selinux? ( sec-policy/selinux-openvpn )
Lines 35-41 Link Here
35		35
36	src_configure() {	36	src_configure() {
37	use static && LDFLAGS="${LDFLAGS} -Xcompiler -static"	37	use static && LDFLAGS="${LDFLAGS} -Xcompiler -static"
38	econf \	38
		39	# We require iproute2 under Linux, see Bug #407195
		40	local myconf
		41	use kernel_linux && myconf="--enable-iproute2"
		42
		43	econf ${myconf} \
39	--docdir="${EPREFIX}/usr/share/doc/${PF}" \	44	--docdir="${EPREFIX}/usr/share/doc/${PF}" \
40	--with-plugindir="${ROOT}/usr/$(get_libdir)/$PN" \	45	--with-plugindir="${ROOT}/usr/$(get_libdir)/$PN" \
41	$(use_enable passwordsave password-save) \	46	$(use_enable passwordsave password-save) \
Lines 44-50 Link Here
44	$(use_enable lzo) \	49	$(use_enable lzo) \
45	$(use_enable pkcs11) \	50	$(use_enable pkcs11) \
46	$(use_enable plugins) \	51	$(use_enable plugins) \
47	$(use_enable iproute2) \
48	$(use_enable pam plugin-auth-pam) \	52	$(use_enable pam plugin-auth-pam) \
49	$(use_enable down-root plugin-down-root)	53	$(use_enable down-root plugin-down-root)
50	}	54	}