contrib: updated gentoo ebuilds

8 files changed, 137 insertions, 50 deletions

diff --git a/README b/README
index a9635e18..95d047cd 100644
--- a/README
+++ b/README
@@ -17,7 +17,7 @@ Features
 6.  Radius DM/CoA extention
 7.  Supported authentication types: PAP, CHAP (md5), Microsoft CHAP Extentions (including version 2), not supported - EAP
 8.  Supported MPPE
-9.  Compression types are not supported
+9.  Compression is not supported
 10. Extensible logging engine with per session logging support, implemented log to file and log to PostgreSQL targets
 11. Extensible user/password database, implemented only Radius source
 12. Extensible IP pool, implemented Radius and static pools
@@ -40,9 +40,10 @@ or specify other location via KDIR.
 1. cd /path/to/accel-pptp-1.0
 2. mkdir build
 3. cd build
-4. cmake [ -D BUILD_DRIVER=TRUE ] [ -D KDIR=/usr/src/linux ] [ -D CMAKE_INSTALL_PREFIX=/usr/local ] [ -D CMAKE_BUILD_TYPE=Debug ] ..
+4. cmake [ -D BUILD_DRIVER=TRUE ] [ -D KDIR=/usr/src/linux ] [ -D CMAKE_INSTALL_PREFIX=/usr/local ] [ -D CMAKE_BUILD_TYPE=Debug ] [ -DLOG_PGSQL=TRUE ] ..
    Please note that the double dot record in the end of the command is essential. You'll get error if you miss it.
-   BUILD_DRIVER, KDIR, CMAKE_INSTALL_PREFIX, CMAKE_BUILD_TYPE are optional, but while pptp is not present in mainline kernel you probably need BUILD_DRIVER.
+   BUILD_DRIVER, KDIR, CMAKE_INSTALL_PREFIX, CMAKE_BUILD_TYPE, LOG_PGSQL  are optional,
+   but while pptp is not present in mainline kernel you probably need BUILD_DRIVER.
 5. make
 6. make install
 
@@ -57,15 +58,6 @@ Warning !!!
 1. This driver conflicts with ip_gre driver (in kernel), so make sure that ip_gre is not built-in or loaded at run time.
 2. Never mix connections of accel-pptp and original pptpd, before starting accel-pptp make sure that no connections
    of original pptpd exists.
-3. If you are switching from <2.6.23 to >=2.6.23 kernel or viĶe-versa then rebuild and reinstall entire package, 
-   not just kernel module.
-
-
-Kernel module
--------------
-Kernel module is available as separated module and as patch for kernel.
-You can use either separated module or patch for kernel.
-There is only patch for 2.6.18 kernel now. If you wish patch for other kernels please mail me.
 
 
 Thanks
diff --git a/accel-pptpd/CMakeLists.txt b/accel-pptpd/CMakeLists.txt
index dd1b2570..8242d490 100644
--- a/accel-pptpd/CMakeLists.txt
+++ b/accel-pptpd/CMakeLists.txt
@@ -39,7 +39,7 @@ ADD_EXECUTABLE(accel-pptpd
 SET(  FALSE)
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) 
 
-TARGET_LINK_LIBRARIES(accel-pptpd triton rt pthread ssl)
+TARGET_LINK_LIBRARIES(accel-pptpd triton rt pthread ssl crypto)
 set_property(TARGET accel-pptpd PROPERTY CMAKE_SKIP_BUILD_RPATH FALSE)
 set_property(TARGET accel-pptpd PROPERTY CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
 set_property(TARGET accel-pptpd PROPERTY INSTALL_RPATH_USE_LINK_PATH FALSE)
diff --git a/accel-pptpd/triton/CMakeLists.txt b/accel-pptpd/triton/CMakeLists.txt
index 3e5e068a..edbc53e0 100644
--- a/accel-pptpd/triton/CMakeLists.txt
+++ b/accel-pptpd/triton/CMakeLists.txt
@@ -14,6 +14,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 ADD_DEFINITIONS(-DMODULE_PATH="${CMAKE_INSTALL_PREFIX}/usr/lib/accel-pptp")
 
 ADD_LIBRARY(triton SHARED ${sources_c})
+TARGER_LINK_LIBRARIES(triton dl)
 
 INSTALL(TARGETS triton
 	LIBRARY DESTINATION usr/lib/accel-pptp
diff --git a/contrib/gentoo/net-dialup/accel-pptp/accel-pptp-1.0.ebuild b/contrib/gentoo/net-dialup/accel-pptp/accel-pptp-1.0.ebuild
new file mode 100644
index 00000000..3da1f13f
--- /dev/null
+++ b/contrib/gentoo/net-dialup/accel-pptp/accel-pptp-1.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+
+inherit git 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/"
+
+SLOT="0"
+LICENSE="GPL"
+KEYWORDS="~amd64 ~x86"
+IUSE="postgres debug"
+
+DEPEND="dev-libs/openssl
+	dev-libs/libaio
+	postgres? ( >=dev-db/postgresql-base-8.1 )"
+
+RDEPEND="virtual/modutils"
+
+BUILD_TARGETS="default"
+BUILD_PARAMS="KDIR=${KERNEL_DIR}"
+CONFIG_CHECK="PPP PPPOE"
+MODULESD_PPTP_ALIASES=("net-pf-24 pptp")
+PREFIX="/"
+
+src_prepare() {
+	sed -i -e "/mkdir/d" "${S}/accel-pptpd/CMakeLists.txt"
+	sed -i -e "/INSTALL/d" "${S}/driver/CMakeLists.txt"
+}
+
+src_configure() {
+    mycmakeargs+=( "-DBUILD_DRIVER=TRUE" )
+    
+    if use debug; then
+	mycmakeargs+=( "-DCMAKE_BUILD_TYPE=Debug" )
+    fi
+    
+    if  use postgres; then
+	mycmakeargs+=( "-DLOG_PGSQL=TRUE" )
+    fi
+	
+    cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	MODULE_NAMES="pptp(extra:${CMAKE_BUILD_DIR}/driver/driver)"
+	linux-mod_src_install
+
+	exeinto /etc/init.d
+	newexe "${S}/contrib/gentoo/net-dialup/accel-pptp/files/pptpd-init" pptpd
+
+	insinto /etc/conf.d
+	newins "${S}/contrib/gentoo/net-dialup/accel-pptp/files/pptpd-confd" pptpd
+
+	dodir /var/log/accel-pptp
+	dodir /var/run/radattr
+}
diff --git a/contrib/gentoo/net-dialup/accel-pptp/accel-pptp-9999.ebuild b/contrib/gentoo/net-dialup/accel-pptp/accel-pptp-9999.ebuild
new file mode 100644
index 00000000..4a490afc
--- /dev/null
+++ b/contrib/gentoo/net-dialup/accel-pptp/accel-pptp-9999.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+
+inherit git linux-mod cmake-utils
+
+EGIT_REPO_URI="git://accel-pptp.git.sourceforge.net/gitroot/accel-pptp/accel-pptp"
+
+DESCRIPTION="Point-to-Point Tunnelling Protocol Client/Server for Linux"
+SRC_URI=""
+HOMEPAGE="http://accel-pptp.sourceforge.net/"
+
+SLOT="0"
+LICENSE="GPL"
+KEYWORDS="~amd64 ~x86"
+IUSE="postgres debug"
+
+DEPEND="dev-libs/openssl
+	dev-libs/libaio
+	postgres? ( >=dev-db/postgresql-base-8.1 )"
+
+RDEPEND="virtual/modutils"
+
+BUILD_TARGETS="default"
+BUILD_PARAMS="KDIR=${KERNEL_DIR}"
+CONFIG_CHECK="PPP PPPOE"
+MODULESD_PPTP_ALIASES=("net-pf-24 pptp")
+PREFIX="/"
+
+src_unpack() {
+	git_src_unpack
+	sed -i -e "/mkdir/d" "${S}/accel-pptpd/CMakeLists.txt"
+	sed -i -e "/INSTALL/d" "${S}/driver/CMakeLists.txt"
+}
+
+src_configure() {
+    mycmakeargs+=( "-DBUILD_DRIVER=TRUE" )
+    if use debug; then
+	mycmakeargs+=( "-DCMAKE_BUILD_TYPE=Debug" )
+    fi
+    
+    if  use postgres; then
+	mycmakeargs+=( "-DLOG_PGSQL=TRUE" )
+    fi
+	
+    cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	MODULE_NAMES="pptp(extra:${CMAKE_BUILD_DIR}/driver/driver)"
+	linux-mod_src_install
+
+	exeinto /etc/init.d
+	newexe "${S}/contrib/gentoo/net-dialup/accel-pptp/files/pptpd-init" pptpd
+
+	insinto /etc/conf.d
+	newins "${S}/contrib/gentoo/net-dialup/accel-pptp/files/pptpd-confd" pptpd
+
+	dodir /var/log/accel-pptp
+	dodir /var/run/radattr
+}
diff --git a/contrib/gentoo/net-dialup/accel-pptp/files/options.pptp b/contrib/gentoo/net-dialup/accel-pptp/files/options.pptp
deleted file mode 100644
index d61ab80c..00000000
--- a/contrib/gentoo/net-dialup/accel-pptp/files/options.pptp
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# 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/contrib/gentoo/net-dialup/accel-pptp/files/pptpd-confd b/contrib/gentoo/net-dialup/accel-pptp/files/pptpd-confd
index 1169e57f..fe9e0880 100644
--- a/contrib/gentoo/net-dialup/accel-pptp/files/pptpd-confd
+++ b/contrib/gentoo/net-dialup/accel-pptp/files/pptpd-confd
@@ -2,4 +2,4 @@
 
 # Any extra options you want to pass to pptpd
 # on start-up should be put here.
-PPTPD_OPTS=""
+PPTPD_OPTS="-d -c /etc/accel-pptp.conf"
diff --git a/contrib/gentoo/net-dialup/accel-pptp/files/pptpd-init b/contrib/gentoo/net-dialup/accel-pptp/files/pptpd-init
index c0537206..d8e2ee57 100755
--- a/contrib/gentoo/net-dialup/accel-pptp/files/pptpd-init
+++ b/contrib/gentoo/net-dialup/accel-pptp/files/pptpd-init
@@ -5,17 +5,17 @@ depend() {
 }
 
 start() {
-	ebegin "Starting pptpd"
+	ebegin "Starting accel-pptpd"
 	modprobe pptp
-	start-stop-daemon --start --quiet --exec /usr/sbin/pptpd -- ${PPTPD_OPTS}
+	start-stop-daemon --start --quiet --exec /usr/sbin/accel-pptpd -- -p /var/run/pptpd.pid ${PPTPD_OPTS}
 	eend $?
 }
 
 stop() {
-	ebegin "Stopping pptpd"
+	ebegin "Stopping accel-pptpd"
 	start-stop-daemon --stop --quiet --pidfile /var/run/pptpd.pid
 	result=$?
-	start-stop-daemon --stop --quiet --oknodo --exec /usr/sbin/pptpctrl
+	start-stop-daemon --stop --quiet --oknodo --exec /usr/sbin/accel-pptpd
 	result=$(( $result + $? ))
 	eend $result
 }