summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-09-23 13:11:19 +0000
committernico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-09-23 13:11:19 +0000
commit7f6c829a9dc2d59279364d686e9eea8a787ada79 (patch)
treed5138686f1ee6c55162523f5b586ff35fd2de5bf
parent9ad94d5fa76fecc2174324605e3e4f8f13cbb725 (diff)
add fixes from whiterussian,
bump release number git-svn-id: svn://svn.openwrt.org/openwrt/trunk@1979 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--openwrt/package/pptpd/Makefile4
-rw-r--r--openwrt/package/pptpd/files/pptpd.conf2
-rw-r--r--openwrt/package/pptpd/files/pptpd.init2
-rw-r--r--openwrt/package/pptpd/ipkg/pptpd.control4
4 files changed, 6 insertions, 6 deletions
diff --git a/openwrt/package/pptpd/Makefile b/openwrt/package/pptpd/Makefile
index de12556efb..a115bd511f 100644
--- 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 e9ac115c79..354745f592 100644
--- 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 79db864f98..a76f739fd4 100644
--- 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 7d0a19bd3c..4de13ed7aa 100644
--- 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