[gentoo-commits] dev/alexxy:master commit in: net-dialup/accel-pptp/, net-dialup/accel-pptp/files/

[Alexey Shvetsov]

commit:     8d4856c043e2a22fbb59fbe3fb9a28c4f3a5d54a
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 26 18:04:01 2011 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Sat Feb 26 18:04:01 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/alexxy.git;a=commit;h=8d4856c0

[net-dialup/accel-pptp] import from pva's overlay with some fixes for 2.6.37

(Portage version: 2.2.0_alpha25/git/Linux x86_64, signed Manifest commit with key F82F92E6)

---
 net-dialup/accel-pptp/Manifest                |   27 +++++++
 net-dialup/accel-pptp/accel-pptp-0.8.5.ebuild |   96 +++++++++++++++++++++++++
 net-dialup/accel-pptp/files/README.gentoo     |   13 ++++
 net-dialup/accel-pptp/files/options.pptp      |   32 ++++++++
 net-dialup/accel-pptp/files/pptpd-confd       |    5 ++
 net-dialup/accel-pptp/files/pptpd-init        |   24 ++++++
 net-dialup/accel-pptp/metadata.xml            |    8 ++
 7 files changed, 205 insertions(+), 0 deletions(-)

diff --git a/net-dialup/accel-pptp/Manifest b/net-dialup/accel-pptp/Manifest
new file mode 100644
index 0000000..bbfe5c8
--- /dev/null
+++ b/net-dialup/accel-pptp/Manifest
@@ -0,0 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX README.gentoo 217 RMD160 9657859baa2f07dd426612321ffbf8312538b236 SHA1 351e9a8c3d7e6fbfb72a80926c9977fbf4e3ab7d SHA256 766c4d19732a44f1e1a5b093b2d65e6d1690fa29ddeada5116f1643ff1582f16
+AUX options.pptp 341 RMD160 c55a423ee0bc8a9c349c1fe0c54847242809e915 SHA1 756529a80b02ed63a8625df8db195280447cc9a9 SHA256 fbf4859f10e5c7093b65c7edac506e240598ad53002bc5cea4569adf9ca85ce0
+AUX pptpd-confd 131 RMD160 cd7483c023adbb5d5e1aa6ed3b14114af5035790 SHA1 208d224be1e91f6e7d13b1c4cb451f92bbc55b94 SHA256 4d69da546e36439dc1a7cb5abb949ad48046155752c047babb5472decdfa1958
+AUX pptpd-init 531 RMD160 983c64cea78173ff190938e53f852e6ff4cb8ab9 SHA1 f6b83a219c44956e480f0668de7cfde44e741d2c SHA256 5e7f353a2b3812cd0e0292e5889bdbda6849e79be336d0acd5113f2fc00d38c6
+DIST accel-pptp-0.8.5.tar.bz2 589096 RMD160 7ac16756f32ccf617ac63e50fa57ab8c6d9f106f SHA1 1bb5ee672dab14025fc16906368244c17719e7a1 SHA256 ac27e9834e61bb4c97be232c8c2c342cc91ebf431309079d1014acede805106b
+EBUILD accel-pptp-0.8.5.ebuild 2498 RMD160 674eff714ba4497b4106fc421ec39895c6e3de84 SHA1 023c5fa5f89c1555c407bc25a234b2b779418e45 SHA256 2a9f380cfba486dca0b0f1a0371ccb549a69fca5922083b8a8d0c547fffb84d9
+MISC metadata.xml 221 RMD160 756fe44d71e8afa311b1225c339c3a9d0b2793ec SHA1 90294fff7dc5be56dbaa336e0110740aca61941c SHA256 3373f0149123450e7b5cc766b78d55363c1206cab339795ab0b012085d23980b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCAAGBQJNaUCRAAoJEOf+E+/4L5LmYKkP/008GCytZGkAQnb6nDMNoAnY
+yoEu3LZMWV20h8QT2bTBq2XGjd0ivc94kHIng36PG/muVFpgtR9+UHp/B26lYbav
+ZPUi0YQbabsapl1kJmUWFmsY/5oFa4cB2ZqrCTnqBygGoFOKrAIkpoFMEvUGV50k
+yXD+P72/rJxrp/qL3mHgqKH5B7r/bv9Tnq0rNYbFJpb5K4YXQIzDb2MR0myD+D2W
+xG+Sb6dyxVaw9YSjcMG0+TJ38TID2sV/oHEE3/Sc1MCtslDi1HJXzmLEQ97wy1wH
+L3pGqBsu+2rJCwPefJQbIjlPoPokvL087RHhMX5+q01N3YbqWkVOYey9AOgUVMoz
+7lK9bq4uiVXvST9QFDVikWxXryORIBagBfw8PgYM+iDnnlTvLziYY87E4q4rbqr4
+w6T+zFMnXhLhqwlGf0bEY/HkY1u20sXU8vJPo62FCLhNzC9rQbN3ly9bJEKuqO5o
+ylMCZPYs0l21L4JzTBKxEFBT3xQCmC9TqJIR6Fw+azE4RaxsTxNbD6YDNxPKsKti
+SoGC0NIlFp4DzaazQEg3puzHOBYoxGWlxmMyCQZMMEEVMonQMb7j+yfR7LpFL9h6
+zni92oaalSA/HVfYZLNNE8kFMlnH52gEuTlwQyOdI87YrnWr5qto/jnu9Dt+v/9t
+78KtpgGileHqrizmmTV6
+=iBw5
+-----END PGP SIGNATURE-----

diff --git a/net-dialup/accel-pptp/accel-pptp-0.8.5.ebuild b/net-dialup/accel-pptp/accel-pptp-0.8.5.ebuild
new file mode 100644
index 0000000..ab5f266
--- /dev/null
+++ b/net-dialup/accel-pptp/accel-pptp-0.8.5.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit linux-mod eutils autotools multilib
+
+DESCRIPTION="Point-to-Point Tunnelling Protocol Client/Server for Linux"
+SRC_URI="mirror://sourceforge/accel-pptp/${P}.tar.bz2"
+HOMEPAGE="http://accel-pptp.sourceforge.net/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="tcpd server"
+
+COMMON_DEPEND=">=net-dialup/ppp-2.4.2
+	server? ( !net-dialup/pptpd )
+	tcpd? ( sys-apps/tcp-wrappers )"
+DEPEND="${COMMON_DEPEND}
+	>=virtual/linux-sources-2.6.15"
+RDEPEND="${COMMON_DEPEND}
+	virtual/modutils"
+
+BUILD_TARGETS="all"
+BUILD_PARAMS="KDIR=${KERNEL_DIR}"
+CONFIG_CHECK="PPP PPPOE PPTP"
+MODULESD_PPTP_ALIASES=("net-pf-24 pptp")
+
+src_prepare() {
+	use server && cd "${S}/pptpd-1.3.3" && eautoreconf
+	cd "${S}/pppd_plugin" && eautoreconf
+
+	#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
+	echo "#define VERSION \"${PPPD_VER}\"" > "${S}/pptpd-1.3.3/plugins/patchlevel.h"
+	# Respect LDFLAGS
+	sed -e "/^LDFLAGS/{s:=:+=:}" -i "${S}/pptpd-1.3.3/plugins/Makefile"
+}
+
+src_configure() {
+	if use server; then
+		cd "${S}/pptpd-1.3.3"
+		# Define KDIR to build against userspace headers...
+		KDIR='/usr' \
+		    econf --enable-bcrelay \
+				$(use_with tcpd libwrap)
+	fi
+
+	cd "${S}/pppd_plugin"
+	KDIR='/usr' econf
+}
+
+src_compile() {
+	if use server; then
+		cd "${S}/pptpd-1.3.3"
+	    emake COPTS="${CFLAGS}" || die "make failed"
+	fi
+
+	cd "${S}/pppd_plugin"
+	emake COPTS="${CFLAGS}" || die "make failed"
+}
+
+src_install () {
+	if use server; then
+	    cd "${S}/pptpd-1.3.3"
+	    einstall || die "make install failed"
+
+	    insinto /etc
+	    doins samples/pptpd.conf
+
+	    insinto /etc/ppp
+	    doins samples/options.pptpd
+
+	    exeinto /etc/init.d
+	    newexe "${FILESDIR}/pptpd-init" pptpd || die
+
+	    insinto /etc/conf.d
+	    newins "${FILESDIR}/pptpd-confd" pptpd || die
+	fi
+
+	cd "${S}/pppd_plugin/src/.libs"
+	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
+	insinto /usr/$(get_libdir)/pppd/${PPPD_VER}
+	newins pptp.so.0.0.0 pptp.so || die
+	doman "${S}"/pppd_plugin/src/pppd-pptp.8 || die
+
+	cd "${S}"
+	dodoc README || die
+	cp -R example "${D}/usr/share/doc/${P}/example"
+}

diff --git a/net-dialup/accel-pptp/files/README.gentoo b/net-dialup/accel-pptp/files/README.gentoo
new file mode 100644
index 0000000..68d6af2
--- /dev/null
+++ b/net-dialup/accel-pptp/files/README.gentoo
@@ -0,0 +1,13 @@
+link_ppp17="/dev/null"
+username_ppp17='pva0xd'
+password_ppp17='3149068110'
+pppd_ppp17="
+plugin pptp.so
+pptp_server 78.31.23.148
+file /etc/ppp/options.pptp
+mtu 1436
+mru 1436
+lcp-echo-interval 20
+lcp-echo-failure  3
+"
+

diff --git a/net-dialup/accel-pptp/files/options.pptp b/net-dialup/accel-pptp/files/options.pptp
new file mode 100644
index 0000000..d61ab80
--- /dev/null
+++ b/net-dialup/accel-pptp/files/options.pptp
@@ -0,0 +1,32 @@
+#
+# Lock the port
+#
+#lock
+
+#
+# We don't need the tunnel server to authenticate itself
+#
+noauth
+
+#
+# Turn off transmission protocols we know won't be used
+#
+nobsdcomp
+nodeflate
+
+#
+# We want MPPE
+#
+require-mppe
+
+#
+# We want a sane mtu/mru
+#
+mtu 1437
+mru 1437
+
+#
+# Time this thing out of it goes poof
+#
+lcp-echo-failure 10
+lcp-echo-interval 10

diff --git a/net-dialup/accel-pptp/files/pptpd-confd b/net-dialup/accel-pptp/files/pptpd-confd
new file mode 100644
index 0000000..1169e57
--- /dev/null
+++ b/net-dialup/accel-pptp/files/pptpd-confd
@@ -0,0 +1,5 @@
+# Config file for /etc/init.d/pptpd
+
+# Any extra options you want to pass to pptpd
+# on start-up should be put here.
+PPTPD_OPTS=""

diff --git a/net-dialup/accel-pptp/files/pptpd-init b/net-dialup/accel-pptp/files/pptpd-init
new file mode 100644
index 0000000..171e113
--- /dev/null
+++ b/net-dialup/accel-pptp/files/pptpd-init
@@ -0,0 +1,24 @@
+#!/sbin/runscript
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: $
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting pptpd"
+	modprobe pptp
+	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 --oknodo --exec /usr/sbin/pptpctrl
+	result=$(( $result + $? ))
+	eend $result
+}

diff --git a/net-dialup/accel-pptp/metadata.xml b/net-dialup/accel-pptp/metadata.xml
new file mode 100644
index 0000000..009a9d9
--- /dev/null
+++ b/net-dialup/accel-pptp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-dialup</herd>
+	<use>
+		<flag name='server'>Enable pptpd</flag>
+	</use>
+</pkgmetadata>