add fixes from whiterussian, bump release number

SVN-Revision: 1979

diff --git a/openwrt/package/pptpd/Makefile b/openwrt/package/pptpd/Makefile
index de12556efbd6a651bb8220ee4374b2c3f6f4569d..a115bd511fb9c17149049780ac1bf77862075150 100644 (file)
--- a/openwrt/package/pptpd/Makefile
+++ b/openwrt/package/pptpd/Makefile
@@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pptpd
 PKG_VERSION:=1.2.3
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_MD5SUM:=a521e40ca304b0c125cc25f9b9d03324
 
 PKG_SOURCE_URL:=@SF/poptop
@@ -59,7 +59,7 @@ $(IPKG_PPTPD):
        install -d -m0755 $(IDIR_PPTPD)/etc
        install -m0644 ./files/pptpd.conf $(IDIR_PPTPD)/etc/
        install -d -m0755 $(IDIR_PPTPD)/etc/init.d
-       install -m0644 ./files/pptpd.init $(IDIR_PPTPD)/etc/init.d/pptpd
+       install -m0755 ./files/pptpd.init $(IDIR_PPTPD)/etc/init.d/pptpd
        install -d -m0755 $(IDIR_PPTPD)/etc/ppp
        install -m0644 ./files/options.pptpd $(IDIR_PPTPD)/etc/ppp/
        install -d -m0755 $(IDIR_PPTPD)/usr/sbin

diff --git a/openwrt/package/pptpd/files/pptpd.conf b/openwrt/package/pptpd/files/pptpd.conf
index e9ac115c79d4488e2673694d37caf0c22a6eb35a..354745f592f8995bfcd66e0a0bb494a9f7de56be 100644 (file)
--- a/openwrt/package/pptpd/files/pptpd.conf
+++ b/openwrt/package/pptpd/files/pptpd.conf
@@ -1,5 +1,5 @@
 #debug
-option /etc/ppp/pptp-server-options
+option /etc/ppp/options.pptpd
 speed 115200
 stimeout 10
 #localip & remoteip are not needed, ip management is done by pppd

diff --git a/openwrt/package/pptpd/files/pptpd.init b/openwrt/package/pptpd/files/pptpd.init
index 79db864f9827a92d6130ea5f419c463d0fecfab8..a76f739fd4ae5f49105248fbf7849827cce4888f 100644 (file)
--- a/openwrt/package/pptpd/files/pptpd.init
+++ b/openwrt/package/pptpd/files/pptpd.init
@@ -9,7 +9,7 @@ PID_F=$RUN_D/$BIN.pid
 case $1 in
  start)
   mkdir -p $RUN_D
-  for m in arc4 sha1 shlc ppp_generic ppp_async ppp_mppe_mppc; do
+  for m in arc4 sha1 slhc ppp_generic ppp_async ppp_mppe_mppc; do
    insmod $m >/dev/null 2>&1
   done
   $BIN $OPTIONS

diff --git a/openwrt/package/pptpd/ipkg/pptpd.control b/openwrt/package/pptpd/ipkg/pptpd.control
index 7d0a19bd3c65c952c9048d51f6a483b9d4a6d4c0..4de13ed7aad20dd4a844ad9dc371a5424e4dfde6 100644 (file)
--- a/openwrt/package/pptpd/ipkg/pptpd.control
+++ b/openwrt/package/pptpd/ipkg/pptpd.control
@@ -1,7 +1,7 @@
 Package: pptpd
 Priority: optional
 Section: net
-Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
+Maintainer: OpenWrt Delelopers Team <openwrt-devel@openwrt.org>
 Source: buildroot internal
 Description: a Point-to-Point Tunneling Protocol (PPTP) server
-Depends: ppp, kmod-gre
+Depends: ppp, kmod-crypto, kmod-mppe, kmod-ppp