updated contrib files

6 files changed, 55 insertions, 71 deletions

diff --git a/contrib/debian/accel-pptp-default b/contrib/debian/accel-ppp-default
index 50a75c9..50a75c9 100644
--- a/contrib/debian/accel-pptp-default
+++ b/contrib/debian/accel-ppp-default
diff --git a/contrib/debian/accel-pptp-init b/contrib/debian/accel-ppp-init
index fd48332..7918ee6 100755
--- a/contrib/debian/accel-pptp-init
+++ b/contrib/debian/accel-ppp-init
@@ -1,7 +1,7 @@
 #!/bin/sh
-# /etc/init.d/accel-pptpd: set up the accel-pptp server
+# /etc/init.d/accel-pppd: set up the accel-ppp server
 ### BEGIN INIT INFO
-# Provides:          accel-pptp
+# Provides:          accel-ppp
 # Required-Start:    $networking
 # Required-Stop:     $networking
 # Default-Start:     2 3 4 5
@@ -14,27 +14,27 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 
 . /lib/lsb/init-functions
 
-if test -f /etc/default/accel-pptp; then
-    . /etc/default/accel-pptp
+if test -f /etc/default/accel-ppp; then
+    . /etc/default/accel-ppp
 fi
 
-if [ -z $ACCEL_PPPTD_OPTS ]; then
-  ACCEL_PPTPD_OPTS="-c /etc/accel-pptp.conf"
+if [ -z $ACCEL_PPPD_OPTS ]; then
+  ACCEL_PPPD_OPTS="-c /etc/accel-ppp.conf"
 fi
 
 case "$1" in
   start)
-	log_daemon_msg "Starting accel-pptp server" "accel-pptpd"
-	if start-stop-daemon --start --quiet --oknodo --exec /usr/sbin/accel-pptpd -- -d -p /var/run/accel-pptpd.pid $ACCEL_PPTPD_OPTS; then
+	log_daemon_msg "Starting PPtP/L2TP/PPPoE server" "accel-pppd"
+	if start-stop-daemon --start --quiet --oknodo --exec /usr/sbin/accel-pppd -- -d -p /var/run/accel-pppd.pid $ACCEL_PPPD_OPTS; then
 	    log_end_msg 0
 	else
 	    log_end_msg 1
 	fi
   ;;
   restart)
-	log_daemon_msg "Restarting accel-pptp server" "accel-pptpd"
-	start-stop-daemon --stop --quiet --oknodo --retry 180 --pidfile /var/run/accel-pptpd.pid
-	if start-stop-daemon --start --quiet --oknodo --exec /usr/sbin/accel-pptpd -- -d -p /var/run/accel-pptpd.pid $ACCEL_PPTPD_OPTS; then
+	log_daemon_msg "Restarting PPtP/L2TP/PPPoE server" "accel-pppd"
+	start-stop-daemon --stop --quiet --oknodo --retry 180 --pidfile /var/run/accel-pppd.pid
+	if start-stop-daemon --start --quiet --oknodo --exec /usr/sbin/accel-pppd -- -d -p /var/run/accel-pppd.pid $ACCEL_PPPD_OPTS; then
 	    log_end_msg 0
 	else
 	    log_end_msg 1
@@ -42,8 +42,8 @@ case "$1" in
   ;;
 
   stop)
-	log_daemon_msg "Stopping accel-pptp server" "accel-pptpd"
-	start-stop-daemon --stop --quiet --oknodo --retry 180 --pidfile /var/run/accel-pptpd.pid
+	log_daemon_msg "Stopping PPtP/L2TP/PPPoE server" "accel-pppd"
+	start-stop-daemon --stop --quiet --oknodo --retry 180 --pidfile /var/run/accel-pppd.pid
 	log_end_msg 0
   ;;
 
@@ -51,7 +51,7 @@ case "$1" in
     do_status
   ;;
   *)
-    log_success_msg "Usage: /etc/init.d/accel-pptp {start|stop|status|restart}"
+    log_success_msg "Usage: /etc/init.d/accel-ppp {start|stop|status|restart}"
     exit 1
     ;;
 esac
diff --git a/contrib/gentoo/net-dialup/accel-pptp/accel-pptp-1.1.1.ebuild b/contrib/gentoo/net-dialup/accel-ppp/accel-ppp-1.1.1.ebuild
index 7555c18..8ee851f 100644
--- a/contrib/gentoo/net-dialup/accel-pptp/accel-pptp-1.1.1.ebuild
+++ b/contrib/gentoo/net-dialup/accel-ppp/accel-ppp-1.1.1.ebuild
@@ -5,24 +5,23 @@ EAPI=2
 
 inherit eutils linux-mod cmake-utils
 
-DESCRIPTION="Point-to-Point Tunnelling Protocol Client/Server for Linux"
-SRC_URI="http://sourceforge.net/projects/accel-pptp/files/accel-pptp/${P}.tar.bz2"
-HOMEPAGE="http://accel-pptp.sourceforge.net/"
+DESCRIPTION="PPtP/L2TP/PPPoE server for Linux"
+SRC_URI="http://sourceforge.net/projects/accel-ppp/files/accel-ppp/${P}.tar.bz2"
+HOMEPAGE="http://accel-ppp.sourceforge.net/"
 
 SLOT="0"
 LICENSE="GPL"
 KEYWORDS="~amd64 ~x86"
-IUSE="postgres debug l2tp shaper"
+IUSE="postgres debug shaper pptp_driver"
 
 DEPEND=">=sys-libs/glibc-2.8
 	dev-libs/openssl
 	dev-libs/libaio
-	l2tp? ( =dev-libs/libnl-9999 )
-	shaper? ( =dev-libs/libnl-9999 )
+	shaper? ( =dev-libs/libnl-2 )
 	postgres? ( >=dev-db/postgresql-base-8.1 )"
 
 RDEPEND="$DEPEND
-         virtual/modutils"
+         pptp_driver? ( virtual/modutils )"
 
 BUILD_TARGETS="default"
 BUILD_PARAMS="KDIR=${KERNEL_DIR}"
@@ -32,7 +31,7 @@ PREFIX="/"
 MODULE_NAMES="pptp(extra:${S}/driver/)"
 
 src_prepare() {
-	sed -i -e "/mkdir/d" "${S}/accel-pptpd/CMakeLists.txt"
+	sed -i -e "/mkdir/d" "${S}/accel-pppd/CMakeLists.txt"
 	sed -i -e "/INSTALL/d" "${S}/driver/CMakeLists.txt"
 }
 
@@ -44,10 +43,6 @@ src_configure() {
 	if  use postgres; then
 		mycmakeargs+=( "-DLOG_PGSQL=TRUE" )
 	fi
-	
-	if use l2tp; then
-		mycmakeargs+=( "-DL2TP=TRUE" )
-	fi
 
 	if use shaper; then
 		mycmakeargs+=( "-DSHAPER=TRUE" )
@@ -58,23 +53,28 @@ src_configure() {
 
 src_compile() {
 	cmake-utils_src_compile
-	
-	cd ${S}/driver
-	linux-mod_src_compile || die "failed to build driver"
+
+	if use pptp_driver; then
+		cd ${S}/driver
+		linux-mod_src_compile || die "failed to build driver"
+	fi
 }
 
 src_install() {
 	cmake-utils_src_install
 
-	cd ${S}/driver
-	linux-mod_src_install
+	if use pptp_driver; then
+		cd ${S}/driver
+		linux-mod_src_install
+	fi
 
 	exeinto /etc/init.d
-	newexe "${S}/contrib/gentoo/net-dialup/accel-pptp/files/pptpd-init" accel-pptpd
+	newexe "${S}/contrib/gentoo/net-dialup/accel-ppp/files/accel-pppd-init" accel-pppd
 
 	insinto /etc/conf.d
-	newins "${S}/contrib/gentoo/net-dialup/accel-pptp/files/pptpd-confd" accel-pptpd
+	newins "${S}/contrib/gentoo/net-dialup/accel-ppp/files/pppd-confd" accel-pppd
 
-	dodir /var/log/accel-pptp
+	dodir /var/log/accel-ppp
+	dodir /var/run/accel-ppp
 	dodir /var/run/radattr
 }
diff --git a/contrib/gentoo/net-dialup/accel-pptp/accel-pptp-9999.ebuild b/contrib/gentoo/net-dialup/accel-ppp/accel-ppp-9999.ebuild
index cd158d6..03f2a51 100644
--- a/contrib/gentoo/net-dialup/accel-pptp/accel-pptp-9999.ebuild
+++ b/contrib/gentoo/net-dialup/accel-ppp/accel-ppp-9999.ebuild
@@ -5,16 +5,16 @@ EAPI=2
 
 inherit eutils git linux-mod cmake-utils
 
-EGIT_REPO_URI="git://accel-pptp.git.sourceforge.net/gitroot/accel-pptp/accel-pptp"
+EGIT_REPO_URI="git://accel-ppp.git.sourceforge.net/gitroot/accel-ppp/accel-ppp"
 
-DESCRIPTION="Point-to-Point Tunnelling Protocol Client/Server for Linux"
+DESCRIPTION="PPtP/L2TP/PPPoE Server for Linux"
 SRC_URI=""
-HOMEPAGE="http://accel-pptp.sourceforge.net/"
+HOMEPAGE="http://accel-ppp.sourceforge.net/"
 
 SLOT="0"
 LICENSE="GPL"
 KEYWORDS="~amd64 ~x86"
-IUSE="postgres debug shaper"
+IUSE="postgres debug shaper pptp_driver"
 
 DEPEND=">=sys-libs/glibc-2.8
 	dev-libs/openssl
@@ -23,7 +23,7 @@ DEPEND=">=sys-libs/glibc-2.8
 	postgres? ( >=dev-db/postgresql-base-8.1 )"
 
 RDEPEND="$DEPEND
-         virtual/modutils"
+         pptp_driver? ( virtual/modutils )"
 
 BUILD_TARGETS="default"
 BUILD_PARAMS="KDIR=${KERNEL_DIR}"
@@ -37,8 +37,8 @@ src_unpack () {
 }
 
 src_prepare() {
-	sed -i -e "/mkdir/d" "${S}/accel-pptpd/CMakeLists.txt"
-	sed -i -e "/echo/d" "${S}/accel-pptpd/CMakeLists.txt"
+	sed -i -e "/mkdir/d" "${S}/accel-pppd/CMakeLists.txt"
+	sed -i -e "/echo/d" "${S}/accel-pppd/CMakeLists.txt"
 	sed -i -e "/INSTALL/d" "${S}/driver/CMakeLists.txt"
 }
 
@@ -61,24 +61,28 @@ src_configure() {
 src_compile() {
 	cmake-utils_src_compile
 	
-	cd ${S}/driver
-	#convert_to_m Makefile
-	linux-mod_src_compile || die "failed to build driver"
+	if use pptp_driver; then
+		cd ${S}/driver
+		#convert_to_m Makefile
+		linux-mod_src_compile || die "failed to build driver"
+	fi
 }
 
 src_install() {
 	cmake-utils_src_install
 
-	cd ${S}/driver
-	linux-mod_src_install
+	if use pptp_driver; then
+		cd ${S}/driver
+		linux-mod_src_install
+	fi
 
 	exeinto /etc/init.d
-	newexe "${S}/contrib/gentoo/net-dialup/accel-pptp/files/pptpd-init" accel-pptpd
+	newexe "${S}/contrib/gentoo/net-dialup/accel-ppp/files/accel-pppd-init" accel-pppd
 
 	insinto /etc/conf.d
-	newins "${S}/contrib/gentoo/net-dialup/accel-pptp/files/pptpd-confd" accel-pptpd
+	newins "${S}/contrib/gentoo/net-dialup/accel-ppp/files/accel-pppd-confd" accel-pppd
 
-	dodir /var/log/accel-pptp
-	dodir /var/run/accel-pptp
+	dodir /var/log/accel-ppp
+	dodir /var/run/accel-ppp
 	dodir /var/run/radattr
 }
diff --git a/contrib/gentoo/net-dialup/accel-pptp/files/pptpd-confd b/contrib/gentoo/net-dialup/accel-ppp/files/accel-pppd-confd
index ddc7aed..6bc0dff 100644
--- a/contrib/gentoo/net-dialup/accel-pptp/files/pptpd-confd
+++ b/contrib/gentoo/net-dialup/accel-ppp/files/accel-pppd-confd
@@ -2,4 +2,4 @@
 
 # Any extra options you want to pass to pptpd
 # on start-up should be put here.
-PPTPD_OPTS="-d -c /etc/accel-pptp.conf"
+ACCEL_PPPD_OPTS="-d -c /etc/accel-ppp.conf"
diff --git a/contrib/gentoo/net-dialup/accel-pptp/files/pptpd-init b/contrib/gentoo/net-dialup/accel-pptp/files/pptpd-init
deleted file mode 100755
index f9155b4..0000000
--- a/contrib/gentoo/net-dialup/accel-pptp/files/pptpd-init
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting accel-pptpd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/accel-pptpd -- -p /var/run/pptpd.pid ${PPTPD_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping accel-pptpd"
-	start-stop-daemon --stop --quiet --pidfile /var/run/pptpd.pid
-	result=$?
-	start-stop-daemon --stop --quiet --oknodo --exec /usr/sbin/accel-pptpd
-	result=$(( $result + $? ))
-	eend $result
-}