Make init script openrc compatible, bug 371575 thank Laszlo Valko for report. Update EAPI.

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64

4 files changed, 94 insertions, 3 deletions

diff --git a/net-dialup/pptpd/ChangeLog b/net-dialup/pptpd/ChangeLog
index 606264408791..11fb0babe358 100644
--- a/net-dialup/pptpd/ChangeLog
+++ b/net-dialup/pptpd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dialup/pptpd
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpd/ChangeLog,v 1.38 2009/06/04 15:44:59 pva Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpd/ChangeLog,v 1.39 2011/06/20 09:32:25 pva Exp $
+
+*pptpd-1.3.4-r1 (20 Jun 2011)
+
+  20 Jun 2011; Peter Volkov <pva@gentoo.org> +pptpd-1.3.4-r1.ebuild,
+  +files/pptpd-init-r1:
+  Make init script openrc compatible, bug 371575 thank Laszlo Valko for report.
+  Update EAPI.
 
   04 Jun 2009; Peter Volkov <pva@gentoo.org> pptpd-1.3.4.ebuild:
   Fixed build problem in case different automake version is installed. Small
diff --git a/net-dialup/pptpd/Manifest b/net-dialup/pptpd/Manifest
index 976fac818cc4..80793c719d7d 100644
--- a/net-dialup/pptpd/Manifest
+++ b/net-dialup/pptpd/Manifest
@@ -2,7 +2,9 @@ AUX pptpd-1.3.4-gentoo.patch 2139 RMD160 316f9335050084280431e00ae5b977653846beb
 AUX pptpd-1.3.4-more-reodering-fixes.patch 2340 RMD160 9322b15ead0ac585e7bb1a7bae8536e09f52c0ba SHA1 361099c9b2997d552744f383fea259312590eb0f SHA256 4540048186b1c1805b02d7d4740b89c498ea5e71a313b6592e469087bb4f0e9f
 AUX pptpd-confd 131 RMD160 cd7483c023adbb5d5e1aa6ed3b14114af5035790 SHA1 208d224be1e91f6e7d13b1c4cb451f92bbc55b94 SHA256 4d69da546e36439dc1a7cb5abb949ad48046155752c047babb5472decdfa1958
 AUX pptpd-init 386 RMD160 e496308edea338dfbd89016ae02aeb11db4fb0e0 SHA1 6b7c053a76c6e95f26b792e7b88b490e8ec433eb SHA256 17e78d810690dbbe0738d9f146b6b58e7b45f19ec545be630f1bf338869a86f4
+AUX pptpd-init-r1 377 RMD160 88248547562e3f753beef6a069fc5f5df200825c SHA1 94bbfe85f2c1473a06e7b3f906405f569a3c5676 SHA256 9c7f6a5deaecd4098312eefedf9d803cbea1728f7b61d08451fa9a88b105f3c7
 DIST pptpd-1.3.4.tar.gz 240942 RMD160 1c6c748bf9e81d223087998ee0cca821814d19f9 SHA1 3d1faf99055e420bafa96c96e8871a888c50b4e8 SHA256 c23a9bdd219a0a36ae7ca20e7c9749f2efdcdbf108aabeeeb5066ba442ec88b6
+EBUILD pptpd-1.3.4-r1.ebuild 1643 RMD160 c8f1a5609df4419fba210707df83986d6c7703b1 SHA1 41a0d6f898231628f40965456080ba60ff6158f2 SHA256 73d39c6d8356fde7d70026ce830977c770e9f7bb28118b45659523f0d89ea7fc
 EBUILD pptpd-1.3.4.ebuild 1672 RMD160 3cc41149c2c380543893f96ee88743db46894765 SHA1 49f5e8382c3e4ce442d1aa0303a56f665cbae947 SHA256 7eb7f995d615ba28e3413377f1a467d95fc31b3e3e9535ed122dc3aadff3f258
-MISC ChangeLog 5679 RMD160 e1c922f285af195896ec12d72af9678fad2cb7ff SHA1 fd18fd1bcecd21e497624c2358229020bae3e4a8 SHA256 556a5c3b4dc53ab023372c370b165b4a9ed35eeda9b9558f6f85010be0e8f61e
+MISC ChangeLog 5899 RMD160 aacc70f6de584b254c13dbc9069430ddb7e19a8f SHA1 6b7b0f201f754c8d39c19de50cee4c152b8015a1 SHA256 fbf539e019243ce5dfdd32e5613671d229751f55ded2abb88383184da7a22779
 MISC metadata.xml 306 RMD160 d4581d96db120891e544294369a2b1da345cc8cc SHA1 70ff431fa94b340c5f869e34aa435f65c3d8f2b8 SHA256 a0cf603b6e5ca038b8b5801dcd69aed9a0a6d0944b36d4cd7653f72a49ca0da2
diff --git a/net-dialup/pptpd/files/pptpd-init-r1 b/net-dialup/pptpd/files/pptpd-init-r1
new file mode 100644
index 000000000000..36af3f25fff0
--- /dev/null
+++ b/net-dialup/pptpd/files/pptpd-init-r1
@@ -0,0 +1,20 @@
+#!/sbin/runscript
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting pptpd"
+	start-stop-daemon --start --quiet --exec /usr/sbin/pptpd -- ${PPTPD_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping pptpd"
+	start-stop-daemon --stop --quiet --pidfile /var/run/pptpd.pid
+	result=$?
+	start-stop-daemon --stop --quiet --exec /usr/sbin/pptpctrl
+	result=$(( $result + $? ))
+	eend $result
+}
diff --git a/net-dialup/pptpd/pptpd-1.3.4-r1.ebuild b/net-dialup/pptpd/pptpd-1.3.4-r1.ebuild
new file mode 100644
index 000000000000..09484735b768
--- /dev/null
+++ b/net-dialup/pptpd/pptpd-1.3.4-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpd/pptpd-1.3.4-r1.ebuild,v 1.1 2011/06/20 09:32:25 pva Exp $
+
+EAPI="4"
+inherit eutils autotools flag-o-matic
+
+DESCRIPTION="Linux Point-to-Point Tunnelling Protocol Server"
+HOMEPAGE="http://poptop.sourceforge.net/"
+SRC_URI="mirror://sourceforge/poptop/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="tcpd gre-extreme-debug"
+
+DEPEND="net-dialup/ppp
+	tcpd? ( sys-apps/tcp-wrappers )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	epatch "${FILESDIR}/${P}-more-reodering-fixes.patch"
+
+	#Match pptpd-logwtmp.so's version with pppd's version (#89895)
+	local PPPD_VER=`best_version net-dialup/ppp`
+	PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
+	PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
+	sed -i -e "s:\\(#define[ \\t]*VERSION[ \\t]*\\)\".*\":\\1\"${PPPD_VER}\":" "plugins/patchlevel.h"
+	sed -e "/^LDFLAGS/{s:=:+=:}" -i plugins/Makefile
+
+	eautoreconf
+}
+
+src_configure() {
+	use gre-extreme-debug && append-flags "-DLOG_DEBUG_GRE_ACCEPTING_PACKET"
+	local myconf
+	use tcpd && myconf="--with-libwrap"
+	econf --enable-bcrelay \
+		${myconf}
+}
+
+src_compile() {
+	emake COPTS="${CFLAGS}"
+}
+
+src_install () {
+	einstall
+
+	insinto /etc
+	doins samples/pptpd.conf
+
+	insinto /etc/ppp
+	doins samples/options.pptpd
+
+	newinitd "${FILESDIR}/pptpd-init-r1" pptpd
+	newconfd "${FILESDIR}/pptpd-confd" pptpd
+
+	dodoc AUTHORS ChangeLog NEWS README* TODO
+	docinto samples
+	dodoc samples/*
+}