openl2tpd: use dns daemon dependence.

Since we support dns, this is required now.

4 files changed, 171 insertions, 3 deletions

diff --git a/net-dialup/openl2tp/ChangeLog b/net-dialup/openl2tp/ChangeLog
index b48713b..be7bfc1 100644
--- a/net-dialup/openl2tp/ChangeLog
+++ b/net-dialup/openl2tp/ChangeLog
@@ -2,6 +2,19 @@
 # Copyright 2000-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*openl2tp-1.8-r1.ebuild (28 Nov 2010)
+
+  6 Dec 2010; Andrew Savchenko <bircoph@gmail.com> 
+  files/openl2tpd.initd:
+  Use dns daemon too.
+
+*openl2tp-1.8.ebuild (28 Nov 2010)
+
+  28 Nov 2010; Andrew Savchenko <bircoph@gmail.com> 
+  +openl2tp-1.8.ebuild, openl2tp-1.8-ldflags.patch,
+  +openl2tp-1.8-pppd.patch,+openl2tp-1.8-werror.patch:
+  Bump for the new version.
+
 *openl2tp-1.7-r2.ebuild (10 Nov 2010)
 
   10 Nov 2010; Andrew Savchenko <bircoph@gmail.com> 
diff --git a/net-dialup/openl2tp/Manifest b/net-dialup/openl2tp/Manifest
index 2603399..b271456 100644
--- a/net-dialup/openl2tp/Manifest
+++ b/net-dialup/openl2tp/Manifest
@@ -10,11 +10,12 @@ AUX openl2tp-1.8-pppd.patch 846 RMD160 8ac9afbee793d60a1682364a00e1e2d409d17fae
 AUX openl2tp-1.8-werror.patch 1466 RMD160 85df32f171301bce175557ef078ae681d2b51d3d SHA1 c7e36dbe97a8c4fff199cb6a769fa7bb17f6bfc4 SHA256 5da5272f697d803c71256f298070c3a9783c1e8e43c890576a4615a407e069aa
 AUX openl2tpd.conf.sample 678 RMD160 34f2e81c2e1f810041eebf6859fb661105643428 SHA1 540606a185775d86137faff790bc54b905a297e0 SHA256 8f6b6bd8150b2275e3b0886fbe38fe79dc83870fc6d6ae848bdebda42e70d4a4
 AUX openl2tpd.confd 627 RMD160 c98ef7bdcca067cab855b43f4c28d7db5651dbee SHA1 ab72ca17e0f3b1d8839bc1a644c11f160529bc9d SHA256 9bea610cf2614bdd6c2f371987f98f8c9b854dd8332d33647505c895ae9a7314
-AUX openl2tpd.initd 1449 RMD160 dde8b7b40878613439ed1d7022637546bd874513 SHA1 2a812332d63bb1add88c6c7dbcdc5323e6d23a60 SHA256 1df1669db00ad97e7e56dcdc42e669c744aa894c8dabf66924f9b85921afa78e
+AUX openl2tpd.initd 1453 RMD160 14e2cdb45f0ecdea34f6900c48fd4408ab1df13d SHA1 f35b1573a7c07ed12e6e47c57267436d84aae21e SHA256 94360b8d62f5b1544132fa75601f75252da58371d100bb3aaa6e633996d468b5
 DIST openl2tp-1.7.tar.gz 501698 RMD160 5a85297060338fc24230582fc3674638d1778634 SHA1 f79e5229b8501664e98bac8229a6d8547b43467b SHA256 f6ae19e19340144ba28c31c55f4667fb180b61ee76ccef2bf63fa62f297ca9da
 DIST openl2tp-1.8.tar.gz 491160 RMD160 29913730809f7ea670c994c175551f31f2ba1e6f SHA1 314a8bb70f9f06bac840200fac0916e80d8d06b3 SHA256 1c97704d4b963a87fbc0e741668d4530933991515ae9ab0dffd11b5444f4860f
 EBUILD openl2tp-1.7-r2.ebuild 4524 RMD160 f3706473c3fd56b4115e14f369d08cf6ee2b464b SHA1 e5013ffd3b0d33928c89b19078a7ac5766ca4f34 SHA256 6f047e6da9b33507a770ea16a0f5ebb9dc6b93875843c121758f3d7b0f5494e6
 EBUILD openl2tp-1.7.ebuild 4023 RMD160 2cda1a5a433446f75057727a5152660fa07b8144 SHA1 367b57a117e106d4eefb657450ca1788c88a9b6b SHA256 ff06cb9413037def2eb2f81e63bb31d92827ca643c2f8e3d460e1d198610eda8
+EBUILD openl2tp-1.8-r1.ebuild 4291 RMD160 909e88b9cd330928c3265011056f008f22d79f46 SHA1 ae18917fc9e0a6b9d5fb25a63c01d883dc13533c SHA256 00f375383cfe49881915a30b83540f1dd67200e938ba43f2aae03161f67d9fa6
 EBUILD openl2tp-1.8.ebuild 4291 RMD160 909e88b9cd330928c3265011056f008f22d79f46 SHA1 ae18917fc9e0a6b9d5fb25a63c01d883dc13533c SHA256 00f375383cfe49881915a30b83540f1dd67200e938ba43f2aae03161f67d9fa6
-MISC ChangeLog 1218 RMD160 15f78b990049c0bd91ccdd49a32c4f61b79be92c SHA1 abdabc3cbbb9cedc95486980f69f4ccabe0fdd15 SHA256 3509825ea4ae953ba5e1bc60f4f1200dccf37d950bf637adff65ce1ba478579a
+MISC ChangeLog 1582 RMD160 90c40d2d22260069142e954ba8142dbed8cb0257 SHA1 d247daace8ace740d90be52371e4ac9a9ca07643 SHA256 4d4a07fb71c5b0a05fda867ea92f0f53146e3f70967c0e3a7b76866c4b59f5ab
 MISC metadata.xml 762 RMD160 416cd2087fe041e02046f07bb6c1677908542c37 SHA1 302dc937814f7d4c32ad16c0300020794f519c0e SHA256 e765957111816f91553fd3db2fef165babdd02ee82d923da6f5b455b684afd72
diff --git a/net-dialup/openl2tp/files/openl2tpd.initd b/net-dialup/openl2tp/files/openl2tpd.initd
index aa75778..a549ad0 100644
--- a/net-dialup/openl2tp/files/openl2tpd.initd
+++ b/net-dialup/openl2tp/files/openl2tpd.initd
@@ -12,7 +12,7 @@ pid=/var/run/openl2tpd.pid
 depend() {
     need net
     [[ $userpc == "yes" ]] && need portmap
-    use racoon ipsec
+    use dns ipsec racoon
 }
 
 check_module () {
diff --git a/net-dialup/openl2tp/openl2tp-1.8-r1.ebuild b/net-dialup/openl2tp/openl2tp-1.8-r1.ebuild
new file mode 100644
index 0000000..25f40a1
--- /dev/null
+++ b/net-dialup/openl2tp/openl2tp-1.8-r1.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+
+inherit eutils linux-info
+
+DESCRIPTION="Userspace tools for kernel L2TP implementation."
+HOMEPAGE="http://openl2tp.sourceforge.net"
+SRC_URI="mirror://sourceforge/openl2tp/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+client doc examples pppd rpc server -stats"
+
+CDEPEND="net-dialup/ppp
+	sys-libs/readline
+	"
+DEPEND="${CDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	"
+RDEPEND="${CDEPEND}
+	rpc? ( || (
+		net-nds/rpcbind
+		net-nds/portmap
+	) )"
+
+CONFIG_CHECK="~PPPOL2TP"
+
+pkg_setup() {
+	# check for sane USE flags
+	if ! use server && ! use client; then
+		eerror
+		eerror "You have disabled both server and client parts!"
+		eerror "At least one of them must be enabled. ;)"
+		eerror
+		die "bad USE flags"
+	fi
+	# kernel requirements
+	linux-info_pkg_setup
+	if kernel_is -lt 2 6 23; then
+		eerror
+		eerror "Your kernel is too old. At least 2.6.23 is required to work with this program."
+		eerror
+		die "kernel is too old"
+	fi
+}
+
+src_prepare() {
+	# disable -Werror, as warnings may occur on different CFLAGS
+	epatch "${FILESDIR}/${P}-werror.patch"
+	# use system LDFLAGS
+	epatch "${FILESDIR}/${P}-ldflags.patch"
+	# let ebuild to control pppd plugins support
+	epatch "${FILESDIR}/${P}-pppd.patch"
+	# do not gzip man pages, let portage to compress them
+	epatch "${FILESDIR}/${PN}-1.7-man.patch"
+	# install l2tpconfig to /usr/sbin with 0700 permissions
+	# to make it at least a bit more secure
+	epatch "${FILESDIR}/${PN}-1.7-l2tpconfig.patch"
+}
+
+src_configure() {
+	myconf=""	# not local, should be used at src_compile()
+
+	use client || myconf+="L2TP_FEATURE_LAC_SUPPORT=n \
+						   L2TP_FEATURE_LAIC_SUPPORT=n \
+						   L2TP_FEATURE_LAOC_SUPPORT=n "
+
+	use server || myconf+="L2TP_FEATURE_LNS_SUPPORT=n \
+						   L2TP_FEATURE_LNIC_SUPPORT=n \
+						   L2TP_FEATURE_LNOC_SUPPORT=n "
+
+	use rpc || myconf+="L2TP_FEATURE_RPC_MANAGEMENT=n "
+
+	use stats && myconf+="L2TP_FEATURE_LOCAL_STAT_FILE=y "
+
+	# pppd plugin is only needed for pppd < 2.4.5
+	unset PPPD_SUBDIR
+	if use pppd; then
+		export PPPD_VERSION=$( gawk '{
+			if ($2=="VERSION") {
+				gsub("\"","",$3);
+				print $3
+			}
+		}' /usr/include/pppd/patchlevel.h ) || die "gawk failed"
+		einfo "Building for pppd version $PPPD_VERSION"
+
+		# convert version to comparable format
+		local ver=$( echo $PPPD_VERSION | gawk -F "." '{
+			print lshift($1,16) + lshift($2,8) + $3
+		}' )
+	if [[ $ver -lt $(( (2<<16) + (4<<8) + 5)) ]]; then
+			export PPPD_SUBDIR="pppd"
+		else
+		ewarn
+			ewarn "openl2tp plugins are already integrated in >=net-dialup/ppp-2.4.5"
+		fi
+	fi
+}
+
+src_compile() {
+	# upstream use OPT_CFLAGS for optimizations
+	export OPT_CFLAGS=${CFLAGS}
+	emake ${myconf} || die "emake failed"
+}
+
+src_install() {
+	emake ${myconf} DESTDIR="${D}" install || die "emake install failed"
+	dodoc CHANGES INSTALL README
+
+	if use examples; then
+		dodoc doc/*.c
+	fi
+
+	if use doc; then
+		dodoc doc/*.txt doc/README.event_sock "${FILESDIR}"/openl2tpd.conf.sample
+		newdoc plugins/README README.plugins
+		use pppd && newdoc pppd/README README.pppd
+		docinto ipsec
+		dodoc ipsec/*
+	fi
+
+	newinitd "${FILESDIR}"/openl2tpd.initd openl2tpd
+	# init.d script is quite different for RPC and non-RPC versions.
+	use rpc || sed -i s/userpc=\"yes\"/userpc=\"no\"/ "${D}/etc/init.d/openl2tpd" || die "sed failed"
+	newconfd "${FILESDIR}"/openl2tpd.confd openl2tpd
+}
+
+pkg_postinst() {
+	if use rpc; then
+		ewarn
+		ewarn "RPC control does not provide any auth checks for control connection."
+		ewarn "By default localhost only is allowed and l2tpconfig is installed"
+		ewarn "accessible only by root, but local users may install or compile binary"
+		ewarn "on they own if not prohibited by system administrator."
+		ewarn
+		ewarn "Therefore DO NOT USE RPC IN INSECURE ENVIRONMENTS!"
+	else
+		ewarn
+		ewarn "Without RPC support you won't be able to use l2tpconfig."
+		ewarn "If you are using numerical strings (e.g. login name containing only"
+		ewarn "digits) or special characters in password, please use double quotes"
+		ewarn "to enclose them."
+	fi
+	if use stats; then
+		ewarn
+		ewarn "To enable status files openl2tpd must be started with -S option."
+		ewarn "Upstream warns about runtime overhead with status files enabled."
+	fi
+}