Revision bump: EAPI 5, fix stop function in initscript, wrt bug #449950

(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)

3 files changed, 90 insertions, 2 deletions

diff --git a/net-dialup/pptpd/ChangeLog b/net-dialup/pptpd/ChangeLog
index b0d5ba40d2fe..79bcd31ff0c7 100644
--- a/net-dialup/pptpd/ChangeLog
+++ b/net-dialup/pptpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dialup/pptpd
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpd/ChangeLog,v 1.43 2011/11/02 15:21:13 mattst88 Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpd/ChangeLog,v 1.44 2013/03/10 12:47:10 pinkbyte Exp $
+
+*pptpd-1.3.4-r2 (10 Mar 2013)
+
+  10 Mar 2013; Sergey Popov <pinkbyte@gentoo.org> +pptpd-1.3.4-r2.ebuild,
+  +files/pptpd-init-r2:
+  Revision bump: EAPI 5, fix stop function in initscript, wrt bug #449950
 
   02 Nov 2011; Matt Turner <mattst88@gentoo.org> pptpd-1.3.4.ebuild,
   pptpd-1.3.4-r1.ebuild:
diff --git a/net-dialup/pptpd/files/pptpd-init-r2 b/net-dialup/pptpd/files/pptpd-init-r2
new file mode 100644
index 000000000000..b1f8d293183e
--- /dev/null
+++ b/net-dialup/pptpd/files/pptpd-init-r2
@@ -0,0 +1,19 @@
+#!/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 /run/pptpd.pid
+	result=$?
+	killall -SIGTERM pptpctrl &>/dev/null
+	eend $result
+}
diff --git a/net-dialup/pptpd/pptpd-1.3.4-r2.ebuild b/net-dialup/pptpd/pptpd-1.3.4-r2.ebuild
new file mode 100644
index 000000000000..d44ff6240ee4
--- /dev/null
+++ b/net-dialup/pptpd/pptpd-1.3.4-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2013 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-r2.ebuild,v 1.1 2013/03/10 12:47:10 pinkbyte Exp $
+
+EAPI="5"
+
+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="~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 || die
+	sed -i -e "/^LDFLAGS/{s:=:+=:}" plugins/Makefile || die
+
+	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-r2" pptpd
+	newconfd "${FILESDIR}/pptpd-confd" pptpd
+
+	dodoc AUTHORS ChangeLog NEWS README* TODO
+	docinto samples
+	dodoc samples/*
+}