* [gentoo-commits] gentoo-x86 commit in net-misc/openvpn: ChangeLog openvpn-9999.ebuild
@ 2012-03-01 12:09 Dirkjan Ochtman (djc)
0 siblings, 0 replies; 5+ messages in thread
From: Dirkjan Ochtman (djc) @ 2012-03-01 12:09 UTC (permalink / raw
To: gentoo-commits
djc 12/03/01 12:09:00
Modified: ChangeLog
Added: openvpn-9999.ebuild
Log:
Add live ebuild for openvpn (bug 385375).
(Portage version: 2.1.10.49/cvs/Linux x86_64)
Revision Changes Path
1.224 net-misc/openvpn/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvpn/ChangeLog?rev=1.224&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvpn/ChangeLog?rev=1.224&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvpn/ChangeLog?r1=1.223&r2=1.224
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -r1.223 -r1.224
--- ChangeLog 23 Feb 2012 22:57:50 -0000 1.223
+++ ChangeLog 1 Mar 2012 12:09:00 -0000 1.224
@@ -1,6 +1,12 @@
# ChangeLog for net-misc/openvpn
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.223 2012/02/23 22:57:50 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.224 2012/03/01 12:09:00 djc Exp $
+
+*openvpn-9999 (01 Mar 2012)
+
+ 01 Mar 2012; Dirkjan Ochtman <djc@gentoo.org> +openvpn-9999.ebuild,
+ +files/openvpn-9999-pkcs11.patch:
+ Add live ebuild (bug 385375). Thanks to Marcel Pennewiß.
23 Feb 2012; Christian Faulhammer <fauli@gentoo.org>
files/openvpn-2.1_rc20-pkcs11.patch, +files/openvpn-2.2.0-pkcs11.patch:
1.1 net-misc/openvpn/openvpn-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvpn/openvpn-9999.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvpn/openvpn-9999.ebuild?rev=1.1&content-type=text/plain
Index: openvpn-9999.ebuild
===================================================================
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=4
inherit eutils multilib toolchain-funcs autotools flag-o-matic git-2
DESCRIPTION="OpenVPN is a robust and highly flexible tunneling application compatible with many OSes."
EGIT_REPO_URI="git://${PN}.git.sourceforge.net/gitroot/${PN}/${PN}.git"
HOMEPAGE="http://openvpn.net/"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
IUSE="examples iproute2 minimal pam passwordsave selinux +ssl static pkcs11 userland_BSD"
DEPEND=">=dev-libs/lzo-1.07
kernel_linux? (
iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools )
)
!minimal? ( pam? ( virtual/pam ) )
selinux? ( sec-policy/selinux-openvpn )
ssl? ( >=dev-libs/openssl-0.9.6 )
pkcs11? ( >=dev-libs/pkcs11-helper-1.05 )"
RDEPEND="${DEPEND}"
src_prepare() {
epatch "${FILESDIR}/${P}-pkcs11.patch"
sed -i \
-e "s/gcc \${CC_FLAGS}/\${CC} \${CFLAGS} -Wall/" \
-e "s/-shared/-shared \${LDFLAGS}/" \
plugin/*/Makefile || die "sed failed"
# Add GIT commit ID to Product Version
sed -i \
-e "/^define(PRODUCT_VERSION/s/])/-git-${EGIT_VERSION}])/" \
version.m4
eautoreconf
}
src_configure() {
# basic.h defines a type 'bool' that conflicts with the altivec
# keyword bool which has to be fixed upstream, see bugs #293840
# and #297854.
# For now, filter out -maltivec on ppc and append -mno-altivec, as
# -maltivec is enabled implicitly by -mcpu and similar flags.
(use ppc || use ppc64) && filter-flags -maltivec && append-flags -mno-altivec
local myconf=""
if use minimal ; then
myconf="${myconf} --disable-plugins"
myconf="${myconf} --disable-pkcs11"
else
myconf="$(use_enable pkcs11)"
fi
econf ${myconf} \
$(use_enable passwordsave password-save) \
$(use_enable ssl) \
$(use_enable ssl crypto) \
$(use_enable iproute2) \
--docdir="${EPREFIX}/usr/share/doc/${PF}"
}
src_compile() {
if use static ; then
sed -i -e '/^LIBS/s/LIBS = /LIBS = -static /' Makefile || die "sed failed"
fi
emake
if ! use minimal ; then
cd plugin
for i in *; do
[[ ${i} == "README" || ${i} == "examples" || ${i} == "defer" ]] && continue
[[ ${i} == "auth-pam" ]] && ! use pam && continue
einfo "Building ${i} plugin"
emake -C "${i}" CC=$(tc-getCC)
done
cd ..
fi
}
src_install() {
emake DESTDIR="${D}" install
# install openvpn-plugin.h
insinto /usr/include
doins openvpn-plugin.h
# install documentation
dodoc AUTHORS ChangeLog PORTS README README.IPv6 TODO.IPv6
# Install some helper scripts
keepdir /etc/openvpn
exeinto /etc/openvpn
doexe "${FILESDIR}/up.sh"
doexe "${FILESDIR}/down.sh"
# Install the init script and config file
newinitd "${FILESDIR}/${PN}-2.1.init" openvpn
newconfd "${FILESDIR}/${PN}-2.1.conf" openvpn
# install examples, controlled by the respective useflag
if use examples ; then
# dodoc does not supportly support directory traversal, #15193
insinto /usr/share/doc/${PF}/examples
doins -r sample-{config-files,keys,scripts} contrib
fi
# Install plugins and easy-rsa
doenvd "${FILESDIR}/65openvpn" # config-protect easy-rsa
if ! use minimal ; then
cd easy-rsa/2.0
make install "DESTDIR=${D}" "PREFIX=${EPREFIX}/usr/share/${PN}/easy-rsa"
cd ../..
exeinto "/usr/$(get_libdir)/${PN}"
doexe plugin/*/*.so
fi
}
pkg_postinst() {
# Add openvpn user so openvpn servers can drop privs
# Clients should run as root so they can change ip addresses,
# dns information and other such things.
enewgroup openvpn
enewuser openvpn "" "" "" openvpn
if [ path_exists -o "${ROOT}/etc/openvpn/*/local.conf" ] ; then
ewarn "WARNING: The openvpn init script has changed"
ewarn ""
fi
elog "The openvpn init script expects to find the configuration file"
elog "openvpn.conf in /etc/openvpn along with any extra files it may need."
elog ""
elog "To create more VPNs, simply create a new .conf file for it and"
elog "then create a symlink to the openvpn init script from a link called"
elog "openvpn.newconfname - like so"
elog " cd /etc/openvpn"
elog " ${EDITOR##*/} foo.conf"
elog " cd /etc/init.d"
elog " ln -s openvpn openvpn.foo"
elog ""
elog "You can then treat openvpn.foo as any other service, so you can"
elog "stop one vpn and start another if you need to."
if grep -Eq "^[ \t]*(up|down)[ \t].*" "${ROOT}/etc/openvpn"/*.conf 2>/dev/null ; then
ewarn ""
ewarn "WARNING: If you use the remote keyword then you are deemed to be"
ewarn "a client by our init script and as such we force up,down scripts."
ewarn "These scripts call /etc/openvpn/\$SVCNAME-{up,down}.sh where you"
ewarn "can move your scripts to."
fi
if ! use minimal ; then
einfo ""
einfo "plugins have been installed into /usr/$(get_libdir)/${PN}"
fi
if [[ ${PV} == "9999" ]]; then
ewarn ""
ewarn "You are using a live ebuild building from the sources of openvpn"
ewarn "repository from http://openvpn.git.sourceforge.net. For reporting"
ewarn "bugs please contact: openvpn-devel@lists.sourceforge.net"
fi
}
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-misc/openvpn: ChangeLog openvpn-9999.ebuild
@ 2012-03-01 12:10 Dirkjan Ochtman (djc)
0 siblings, 0 replies; 5+ messages in thread
From: Dirkjan Ochtman (djc) @ 2012-03-01 12:10 UTC (permalink / raw
To: gentoo-commits
djc 12/03/01 12:10:51
Modified: ChangeLog openvpn-9999.ebuild
Log:
Fix problem with CVS header.
(Portage version: 2.1.10.49/cvs/Linux x86_64)
Revision Changes Path
1.225 net-misc/openvpn/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvpn/ChangeLog?rev=1.225&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvpn/ChangeLog?rev=1.225&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvpn/ChangeLog?r1=1.224&r2=1.225
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -r1.224 -r1.225
--- ChangeLog 1 Mar 2012 12:09:00 -0000 1.224
+++ ChangeLog 1 Mar 2012 12:10:51 -0000 1.225
@@ -1,6 +1,9 @@
# ChangeLog for net-misc/openvpn
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.224 2012/03/01 12:09:00 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.225 2012/03/01 12:10:51 djc Exp $
+
+ 01 Mar 2012; Dirkjan Ochtman <djc@gentoo.org> openvpn-9999.ebuild:
+ Fix CVS header in live ebuild.
*openvpn-9999 (01 Mar 2012)
1.2 net-misc/openvpn/openvpn-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvpn/openvpn-9999.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvpn/openvpn-9999.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvpn/openvpn-9999.ebuild?r1=1.1&r2=1.2
Index: openvpn-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-9999.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openvpn-9999.ebuild 1 Mar 2012 12:09:00 -0000 1.1
+++ openvpn-9999.ebuild 1 Mar 2012 12:10:51 -0000 1.2
@@ -1,5 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-9999.ebuild,v 1.2 2012/03/01 12:10:51 djc Exp $
EAPI=4
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-misc/openvpn: ChangeLog openvpn-9999.ebuild
@ 2012-05-14 8:23 Dirkjan Ochtman (djc)
0 siblings, 0 replies; 5+ messages in thread
From: Dirkjan Ochtman (djc) @ 2012-05-14 8:23 UTC (permalink / raw
To: gentoo-commits
djc 12/05/14 08:23:50
Modified: ChangeLog openvpn-9999.ebuild
Log:
Update openvpn live ebuild for new build system.
(Portage version: 2.1.10.57/cvs/Linux x86_64)
Revision Changes Path
1.227 net-misc/openvpn/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvpn/ChangeLog?rev=1.227&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvpn/ChangeLog?rev=1.227&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvpn/ChangeLog?r1=1.226&r2=1.227
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -r1.226 -r1.227
--- ChangeLog 14 Apr 2012 05:48:20 -0000 1.226
+++ ChangeLog 14 May 2012 08:23:50 -0000 1.227
@@ -1,6 +1,10 @@
# ChangeLog for net-misc/openvpn
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.226 2012/04/14 05:48:20 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.227 2012/05/14 08:23:50 djc Exp $
+
+ 14 May 2012; Dirkjan Ochtman <djc@gentoo.org> openvpn-9999.ebuild:
+ Update live ebuild to deal with new build system (thanks Alon Bar-Lev, bug
+ 409577).
14 Apr 2012; Zac Medico <zmedico@gentoo.org> openvpn-2.2.2.ebuild:
Add ~amd64-linux keyword.
1.3 net-misc/openvpn/openvpn-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvpn/openvpn-9999.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvpn/openvpn-9999.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvpn/openvpn-9999.ebuild?r1=1.2&r2=1.3
Index: openvpn-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-9999.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openvpn-9999.ebuild 1 Mar 2012 12:10:51 -0000 1.2
+++ openvpn-9999.ebuild 14 May 2012 08:23:50 -0000 1.3
@@ -1,52 +1,38 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-9999.ebuild,v 1.2 2012/03/01 12:10:51 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-9999.ebuild,v 1.3 2012/05/14 08:23:50 djc Exp $
EAPI=4
inherit eutils multilib toolchain-funcs autotools flag-o-matic git-2
DESCRIPTION="OpenVPN is a robust and highly flexible tunneling application compatible with many OSes."
-EGIT_REPO_URI="git://${PN}.git.sourceforge.net/gitroot/${PN}/${PN}.git"
+EGIT_REPO_URI="https://github.com/OpenVPN/${PN}.git"
HOMEPAGE="http://openvpn.net/"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
-IUSE="examples iproute2 minimal pam passwordsave selinux +ssl static pkcs11 userland_BSD"
+IUSE="examples iproute2 minimal pam passwordsave selinux +ssl +lzo static pkcs11 userland_BSD"
-DEPEND=">=dev-libs/lzo-1.07
+REQUIRED_USE="static? ( minimal )"
+
+DEPEND="
kernel_linux? (
iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools )
)
!minimal? ( pam? ( virtual/pam ) )
selinux? ( sec-policy/selinux-openvpn )
- ssl? ( >=dev-libs/openssl-0.9.6 )
+ ssl? ( >=dev-libs/openssl-0.9.7 )
+ lzo? ( >=dev-libs/lzo-1.07 )
pkcs11? ( >=dev-libs/pkcs11-helper-1.05 )"
RDEPEND="${DEPEND}"
src_prepare() {
- epatch "${FILESDIR}/${P}-pkcs11.patch"
- sed -i \
- -e "s/gcc \${CC_FLAGS}/\${CC} \${CFLAGS} -Wall/" \
- -e "s/-shared/-shared \${LDFLAGS}/" \
- plugin/*/Makefile || die "sed failed"
-
- # Add GIT commit ID to Product Version
- sed -i \
- -e "/^define(PRODUCT_VERSION/s/])/-git-${EGIT_VERSION}])/" \
- version.m4
eautoreconf
}
src_configure() {
- # basic.h defines a type 'bool' that conflicts with the altivec
- # keyword bool which has to be fixed upstream, see bugs #293840
- # and #297854.
- # For now, filter out -maltivec on ppc and append -mno-altivec, as
- # -maltivec is enabled implicitly by -mcpu and similar flags.
- (use ppc || use ppc64) && filter-flags -maltivec && append-flags -mno-altivec
-
local myconf=""
if use minimal ; then
@@ -56,29 +42,26 @@
myconf="$(use_enable pkcs11)"
fi
+ use static && LDFLAGS="${LDFLAGS} -Xcompiler -static"
econf ${myconf} \
$(use_enable passwordsave password-save) \
$(use_enable ssl) \
$(use_enable ssl crypto) \
+ $(use_enable lzo) \
$(use_enable iproute2) \
--docdir="${EPREFIX}/usr/share/doc/${PF}"
}
src_compile() {
-
- if use static ; then
- sed -i -e '/^LIBS/s/LIBS = /LIBS = -static /' Makefile || die "sed failed"
- fi
-
emake
if ! use minimal ; then
- cd plugin
+ cd src/plugins
for i in *; do
[[ ${i} == "README" || ${i} == "examples" || ${i} == "defer" ]] && continue
[[ ${i} == "auth-pam" ]] && ! use pam && continue
einfo "Building ${i} plugin"
- emake -C "${i}" CC=$(tc-getCC)
+ emake -C "${i}" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
done
cd ..
fi
@@ -87,12 +70,8 @@
src_install() {
emake DESTDIR="${D}" install
- # install openvpn-plugin.h
- insinto /usr/include
- doins openvpn-plugin.h
-
# install documentation
- dodoc AUTHORS ChangeLog PORTS README README.IPv6 TODO.IPv6
+ dodoc AUTHORS ChangeLog PORTS README README.IPv6
# Install some helper scripts
keepdir /etc/openvpn
@@ -108,18 +87,12 @@
if use examples ; then
# dodoc does not supportly support directory traversal, #15193
insinto /usr/share/doc/${PF}/examples
- doins -r sample-{config-files,keys,scripts} contrib
+ doins -r sample contrib
fi
- # Install plugins and easy-rsa
- doenvd "${FILESDIR}/65openvpn" # config-protect easy-rsa
if ! use minimal ; then
- cd easy-rsa/2.0
- make install "DESTDIR=${D}" "PREFIX=${EPREFIX}/usr/share/${PN}/easy-rsa"
- cd ../..
-
exeinto "/usr/$(get_libdir)/${PN}"
- doexe plugin/*/*.so
+ doexe src/plugins/*/*.so
fi
}
@@ -162,10 +135,8 @@
einfo "plugins have been installed into /usr/$(get_libdir)/${PN}"
fi
- if [[ ${PV} == "9999" ]]; then
- ewarn ""
- ewarn "You are using a live ebuild building from the sources of openvpn"
- ewarn "repository from http://openvpn.git.sourceforge.net. For reporting"
- ewarn "bugs please contact: openvpn-devel@lists.sourceforge.net"
- fi
+ ewarn ""
+ ewarn "You are using a live ebuild building from the sources of openvpn"
+ ewarn "repository from http://openvpn.git.sourceforge.net. For reporting"
+ ewarn "bugs please contact: openvpn-devel@lists.sourceforge.net."
}
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-misc/openvpn: ChangeLog openvpn-9999.ebuild
@ 2013-01-12 14:43 Dirkjan Ochtman (djc)
0 siblings, 0 replies; 5+ messages in thread
From: Dirkjan Ochtman (djc) @ 2013-01-12 14:43 UTC (permalink / raw
To: gentoo-commits
djc 13/01/12 14:43:29
Modified: ChangeLog openvpn-9999.ebuild
Log:
Update live openvpn ebuild with changes for 2.3.0+ (bug 415995).
(Portage version: 2.1.11.38/cvs/Linux x86_64, signed Manifest commit with key 6B065BFB)
Revision Changes Path
1.243 net-misc/openvpn/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvpn/ChangeLog?rev=1.243&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvpn/ChangeLog?rev=1.243&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvpn/ChangeLog?r1=1.242&r2=1.243
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -r1.242 -r1.243
--- ChangeLog 12 Jan 2013 14:32:10 -0000 1.242
+++ ChangeLog 12 Jan 2013 14:43:29 -0000 1.243
@@ -1,6 +1,9 @@
# ChangeLog for net-misc/openvpn
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.242 2013/01/12 14:32:10 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.243 2013/01/12 14:43:29 djc Exp $
+
+ 12 Jan 2013; Dirkjan Ochtman <djc@gentoo.org> openvpn-9999.ebuild:
+ Update live ebuild with changes for 2.3.0 (bug 415995).
12 Jan 2013; Dirkjan Ochtman <djc@gentoo.org>
-files/openvpn-2.1_rc13-peercred.patch, -files/openvpn-2.1_rc20-pkcs11.patch,
1.6 net-misc/openvpn/openvpn-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvpn/openvpn-9999.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvpn/openvpn-9999.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvpn/openvpn-9999.ebuild?r1=1.5&r2=1.6
Index: openvpn-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-9999.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- openvpn-9999.ebuild 9 Sep 2012 17:15:31 -0000 1.5
+++ openvpn-9999.ebuild 12 Jan 2013 14:43:29 -0000 1.6
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-9999.ebuild,v 1.5 2012/09/09 17:15:31 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-9999.ebuild,v 1.6 2013/01/12 14:43:29 djc Exp $
EAPI=4
-inherit multilib toolchain-funcs autotools flag-o-matic user git-2
+inherit multilib autotools flag-o-matic user git-2
DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes"
EGIT_REPO_URI="https://github.com/OpenVPN/${PN}.git"
@@ -13,15 +13,16 @@
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
-IUSE="examples iproute2 minimal pam passwordsave selinux +ssl +lzo static pkcs11 userland_BSD"
+IUSE="examples down-root iproute2 pam passwordsave pkcs11 +plugins selinux +ssl +lzo static userland_BSD"
-REQUIRED_USE="static? ( minimal )"
+REQUIRED_USE="static? ( !plugins !pkcs11 )
+ !plugins? ( !pam !down-root )"
DEPEND="
kernel_linux? (
iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools )
)
- !minimal? ( pam? ( virtual/pam ) )
+ pam? ( virtual/pam )
selinux? ( sec-policy/selinux-openvpn )
ssl? ( >=dev-libs/openssl-0.9.7 )
lzo? ( >=dev-libs/lzo-1.07 )
@@ -33,43 +34,24 @@
}
src_configure() {
- local myconf=""
-
- if use minimal ; then
- myconf="${myconf} --disable-plugins"
- myconf="${myconf} --disable-pkcs11"
- else
- myconf="$(use_enable pkcs11)"
- fi
-
use static && LDFLAGS="${LDFLAGS} -Xcompiler -static"
- econf ${myconf} \
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --with-plugindir="${ROOT}/usr/$(get_libdir)/$PN" \
$(use_enable passwordsave password-save) \
$(use_enable ssl) \
$(use_enable ssl crypto) \
$(use_enable lzo) \
+ $(use_enable pkcs11) \
+ $(use_enable plugins) \
$(use_enable iproute2) \
- --docdir="${EPREFIX}/usr/share/doc/${PF}"
-}
-
-src_compile() {
- emake
-
- if ! use minimal ; then
- cd src/plugins
- for i in *; do
- [[ ${i} == "README" || ${i} == "examples" || ${i} == "defer" ]] && continue
- [[ ${i} == "auth-pam" ]] && ! use pam && continue
- einfo "Building ${i} plugin"
- emake -C "${i}" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
- done
- cd ..
- fi
+ $(use_enable pam plugin-auth-pam) \
+ $(use_enable down-root plugin-down-root)
}
src_install() {
- emake DESTDIR="${D}" install
-
+ default
+ find "${ED}/usr" -name '*.la' -delete
# install documentation
dodoc AUTHORS ChangeLog PORTS README README.IPv6
@@ -89,11 +71,6 @@
insinto /usr/share/doc/${PF}/examples
doins -r sample contrib
fi
-
- if ! use minimal ; then
- exeinto "/usr/$(get_libdir)/${PN}"
- doexe src/plugins/*/*.so
- fi
}
pkg_postinst() {
@@ -130,7 +107,7 @@
ewarn "can move your scripts to."
fi
- if ! use minimal ; then
+ if use plugins ; then
einfo ""
einfo "plugins have been installed into /usr/$(get_libdir)/${PN}"
fi
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-misc/openvpn: ChangeLog openvpn-9999.ebuild
@ 2013-05-03 7:56 Dirkjan Ochtman (djc)
0 siblings, 0 replies; 5+ messages in thread
From: Dirkjan Ochtman (djc) @ 2013-05-03 7:56 UTC (permalink / raw
To: gentoo-commits
djc 13/05/03 07:56:29
Modified: ChangeLog openvpn-9999.ebuild
Log:
Add polarssl support to openvpn-9999 ebuild.
(Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key 6B065BFB)
Revision Changes Path
1.249 net-misc/openvpn/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvpn/ChangeLog?rev=1.249&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvpn/ChangeLog?rev=1.249&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvpn/ChangeLog?r1=1.248&r2=1.249
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -r1.248 -r1.249
--- ChangeLog 3 May 2013 07:49:14 -0000 1.248
+++ ChangeLog 3 May 2013 07:56:29 -0000 1.249
@@ -1,6 +1,9 @@
# ChangeLog for net-misc/openvpn
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.248 2013/05/03 07:49:14 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.249 2013/05/03 07:56:29 djc Exp $
+
+ 03 May 2013; Dirkjan Ochtman <djc@gentoo.org> openvpn-9999.ebuild:
+ Add polarssl for 9999 ebuild (thanks to josh.cepek@usa.net).
*openvpn-2.3.1 (03 May 2013)
1.7 net-misc/openvpn/openvpn-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvpn/openvpn-9999.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvpn/openvpn-9999.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvpn/openvpn-9999.ebuild?r1=1.6&r2=1.7
Index: openvpn-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-9999.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- openvpn-9999.ebuild 12 Jan 2013 14:43:29 -0000 1.6
+++ openvpn-9999.ebuild 3 May 2013 07:56:29 -0000 1.7
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-9999.ebuild,v 1.6 2013/01/12 14:43:29 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-9999.ebuild,v 1.7 2013/05/03 07:56:29 djc Exp $
EAPI=4
@@ -13,9 +13,10 @@
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
-IUSE="examples down-root iproute2 pam passwordsave pkcs11 +plugins selinux +ssl +lzo static userland_BSD"
+IUSE="examples down-root iproute2 pam passwordsave pkcs11 +plugins polarssl selinux +ssl +lzo static userland_BSD"
REQUIRED_USE="static? ( !plugins !pkcs11 )
+ polarssl? ( ssl )
!plugins? ( !pam !down-root )"
DEPEND="
@@ -24,7 +25,9 @@
)
pam? ( virtual/pam )
selinux? ( sec-policy/selinux-openvpn )
- ssl? ( >=dev-libs/openssl-0.9.7 )
+ ssl? (
+ !polarssl? ( >=dev-libs/openssl-0.9.7 ) polarssl? ( >=net-libs/polarssl-1.1.0 )
+ )
lzo? ( >=dev-libs/lzo-1.07 )
pkcs11? ( >=dev-libs/pkcs11-helper-1.05 )"
RDEPEND="${DEPEND}"
@@ -35,7 +38,10 @@
src_configure() {
use static && LDFLAGS="${LDFLAGS} -Xcompiler -static"
+ local myconf
+ use polarssl && myconf="--with-crypto-library=polarssl"
econf \
+ ${myconf} \
--docdir="${EPREFIX}/usr/share/doc/${PF}" \
--with-plugindir="${ROOT}/usr/$(get_libdir)/$PN" \
$(use_enable passwordsave password-save) \
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-05-03 7:56 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-03 7:56 [gentoo-commits] gentoo-x86 commit in net-misc/openvpn: ChangeLog openvpn-9999.ebuild Dirkjan Ochtman (djc)
-- strict thread matches above, loose matches on Subject: below --
2013-01-12 14:43 Dirkjan Ochtman (djc)
2012-05-14 8:23 Dirkjan Ochtman (djc)
2012-03-01 12:10 Dirkjan Ochtman (djc)
2012-03-01 12:09 Dirkjan Ochtman (djc)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox