From 5d683a23366d27c39acf3a1d4aa9170be2f4ddde Mon Sep 17 00:00:00 2001 From: wbx Date: Tue, 15 Mar 2005 10:34:22 +0000 Subject: add pptp client git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@376 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/pptp/Config.in | 7 +++++++ package/pptp/Makefile | 50 +++++++++++++++++++++++++++++++++++++++++++++++ package/pptp/pptp.control | 9 +++++++++ 3 files changed, 66 insertions(+) create mode 100644 package/pptp/Config.in create mode 100644 package/pptp/Makefile create mode 100644 package/pptp/pptp.control (limited to 'package/pptp') diff --git a/package/pptp/Config.in b/package/pptp/Config.in new file mode 100644 index 000000000..40c1ded3d --- /dev/null +++ b/package/pptp/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PPTP + tristate "PPTP Client" + default m + select BR2_PACKAGE_KMOD_GRE + select BR2_PACKAGE_PPP + help + A Point-to-Point Tunneling Protocol Client diff --git a/package/pptp/Makefile b/package/pptp/Makefile new file mode 100644 index 000000000..d0803103b --- /dev/null +++ b/package/pptp/Makefile @@ -0,0 +1,50 @@ +############################################################# +# +# pptp client +# +############################################################# +include $(TOPDIR)/rules.mk + +PKG_NAME:=pptp +PKG_VERSION:=1.6.0 +PKG_RELEASE:=1 +PKG_SOURCE_URL:=http://unc.dl.sourceforge.net/sourceforge/pptpclient/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_CAT:=zcat +PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk +PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg + +$(DL_DIR)/$(PKG_SOURCE): + $(WGET) -P $(DL_DIR) $(PKG_SOURCE_URL)/$(PKG_SOURCE) + +$(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE) + $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + touch $(PKG_BUILD_DIR)/.unpacked + +$(PKG_BUILD_DIR)/$(PKG_NAME): $(PKG_BUILD_DIR)/.unpacked + $(MAKE) -C $(PKG_BUILD_DIR) \ + CC=$(TARGET_CC) \ + CFLAGS="$(TARGET_CFLAGS)" \ + all + +$(PKG_IPK): $(PKG_BUILD_DIR)/$(PKG_NAME) + mkdir -p $(PKG_IPK_DIR)/usr/sbin + cp -a ./ipkg/* $(PKG_IPK_DIR)/ + $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) + cp $(PKG_BUILD_DIR)/pptp $(PKG_IPK_DIR)/usr/sbin/ + $(STRIP) $(PKG_IPK_DIR)/usr/sbin/* + mkdir -p $(PACKAGE_DIR) + $(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR) + +$(IPKG_STATE_DIR)/info/pptp.list: $(PKG_IPK) + $(IPKG) install $(PKG_IPK) + +source: $(DL_DIR)/$(PKG_SOURCE) +prepare: $(PKG_BUILD_DIR)/.unpacked +compile: $(PKG_IPK) +install: $(IPKG_STATE_DIR)/info/pptp.list + +clean: + rm -rf $(PKG_BUILD_DIR) + rm -f $(PKG_IPK) diff --git a/package/pptp/pptp.control b/package/pptp/pptp.control new file mode 100644 index 000000000..391962274 --- /dev/null +++ b/package/pptp/pptp.control @@ -0,0 +1,9 @@ +Package: pptp +Priority: optional +Section: net +Version: 1.6.0-1 +Architecture: mipsel +Maintainer: Waldemar Brodkorb +Source: buildroot internal +Description: a Point-to-Point Tunneling Protocol (PPTP) client +Depends: ppp, kmod-gre -- cgit v1.2.3 From b274709fb33f5268aa7821acbee788ade1c0176e Mon Sep 17 00:00:00 2001 From: wbx Date: Wed, 16 Mar 2005 14:55:56 +0000 Subject: add sample ppp options file git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@382 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/pptp/ipkg/etc/ppp/options.pptp | 1 + 1 file changed, 1 insertion(+) create mode 100644 package/pptp/ipkg/etc/ppp/options.pptp (limited to 'package/pptp') diff --git a/package/pptp/ipkg/etc/ppp/options.pptp b/package/pptp/ipkg/etc/ppp/options.pptp new file mode 100644 index 000000000..85b043fab --- /dev/null +++ b/package/pptp/ipkg/etc/ppp/options.pptp @@ -0,0 +1 @@ +lock noauth nobsdcomp nodeflate -- cgit v1.2.3 From 0d52ac0f6a06a36bc0f0316b8593f1f8dc3a8a53 Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 19 Mar 2005 22:51:51 +0000 Subject: add downloading script (with md5sum checking and sourceforge downloading support) git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@391 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/pptp/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/pptp') diff --git a/package/pptp/Makefile b/package/pptp/Makefile index d0803103b..0ddd247dc 100644 --- a/package/pptp/Makefile +++ b/package/pptp/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pptp PKG_VERSION:=1.6.0 PKG_RELEASE:=1 -PKG_SOURCE_URL:=http://unc.dl.sourceforge.net/sourceforge/pptpclient/ +PKG_SOURCE_URL:=@SF/pptpclient PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_CAT:=zcat @@ -16,7 +16,7 @@ PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg $(DL_DIR)/$(PKG_SOURCE): - $(WGET) -P $(DL_DIR) $(PKG_SOURCE_URL)/$(PKG_SOURCE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) x $(PKG_SOURCE_URL) $(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE) $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - -- cgit v1.2.3 From df1d9706f4e8dc21c18dd210c16cef8620ca7efe Mon Sep 17 00:00:00 2001 From: wbx Date: Mon, 21 Mar 2005 08:12:49 +0000 Subject: add md5sums git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@405 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/pptp/Makefile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'package/pptp') diff --git a/package/pptp/Makefile b/package/pptp/Makefile index 0ddd247dc..e017f9836 100644 --- a/package/pptp/Makefile +++ b/package/pptp/Makefile @@ -1,13 +1,12 @@ -############################################################# -# -# pptp client -# -############################################################# +# $Id$ + include $(TOPDIR)/rules.mk PKG_NAME:=pptp PKG_VERSION:=1.6.0 PKG_RELEASE:=1 +PKG_MD5SUM:=9a706327fb9827541d7c86d48ceb9631 + PKG_SOURCE_URL:=@SF/pptpclient PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -16,7 +15,7 @@ PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg $(DL_DIR)/$(PKG_SOURCE): - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) x $(PKG_SOURCE_URL) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL) $(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE) $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - -- cgit v1.2.3 From 0c0deaf40555f9a918a01c7a31af8cbb0206443a Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 24 Mar 2005 17:35:55 +0000 Subject: remove CVS dirs from package git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@440 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/pptp/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'package/pptp') diff --git a/package/pptp/Makefile b/package/pptp/Makefile index e017f9836..a07d6bdf6 100644 --- a/package/pptp/Makefile +++ b/package/pptp/Makefile @@ -34,6 +34,7 @@ $(PKG_IPK): $(PKG_BUILD_DIR)/$(PKG_NAME) cp $(PKG_BUILD_DIR)/pptp $(PKG_IPK_DIR)/usr/sbin/ $(STRIP) $(PKG_IPK_DIR)/usr/sbin/* mkdir -p $(PACKAGE_DIR) + find $(PKG_IPK_DIR) -name CVS | xargs rm -rf $(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR) $(IPKG_STATE_DIR)/info/pptp.list: $(PKG_IPK) -- cgit v1.2.3 From ff9bbc017e981c31d69a2646aea52cb9b83364cd Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 30 Mar 2005 19:29:51 +0000 Subject: remove version and architecture from control files git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@481 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/pptp/pptp.control | 2 -- 1 file changed, 2 deletions(-) (limited to 'package/pptp') diff --git a/package/pptp/pptp.control b/package/pptp/pptp.control index 391962274..67dbd2694 100644 --- a/package/pptp/pptp.control +++ b/package/pptp/pptp.control @@ -1,8 +1,6 @@ Package: pptp Priority: optional Section: net -Version: 1.6.0-1 -Architecture: mipsel Maintainer: Waldemar Brodkorb Source: buildroot internal Description: a Point-to-Point Tunneling Protocol (PPTP) client -- cgit v1.2.3 From 2d2de20c87800851bdfde176239df326bd79ea50 Mon Sep 17 00:00:00 2001 From: nbd Date: Mon, 18 Apr 2005 19:45:56 +0000 Subject: disable non-essential packages by default if DEVELOPER is unset on make menuconfig git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@675 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/pptp/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/pptp') diff --git a/package/pptp/Config.in b/package/pptp/Config.in index 40c1ded3d..8ffeff264 100644 --- a/package/pptp/Config.in +++ b/package/pptp/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_PPTP tristate "PPTP Client" - default m + default m if CONFIG_DEVEL select BR2_PACKAGE_KMOD_GRE select BR2_PACKAGE_PPP help -- cgit v1.2.3 From e6082d4f06b7ef223bdf62198138349b692b0d5e Mon Sep 17 00:00:00 2001 From: wbx Date: Wed, 4 May 2005 07:07:58 +0000 Subject: first try to configure pptp automatically git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@796 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/pptp/ipkg/etc/init.d/S50pptp | 18 ++++++++++++++++++ package/pptp/ipkg/etc/ppp/options.pptp | 13 ++++++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100755 package/pptp/ipkg/etc/init.d/S50pptp (limited to 'package/pptp') diff --git a/package/pptp/ipkg/etc/init.d/S50pptp b/package/pptp/ipkg/etc/init.d/S50pptp new file mode 100755 index 000000000..34ff8a63b --- /dev/null +++ b/package/pptp/ipkg/etc/init.d/S50pptp @@ -0,0 +1,18 @@ +#!/bin/sh + +. /etc/functions.sh + +WAN_PROTO=$(nvram get wan_proto) +[ "$WAN_PROTO" = "pptp" ] || exit 0 + +for module in ip_gre slhc ppp_generic ppp_async ppp_deflate ; do + /sbin/insmod $module 2>/dev/null >/dev/null +done + +if test -d "/var/lock"; then + mkdir -p /var/lock || exit 1 +fi + +/usr/sbin/pppd pty "pptp x.x.x.x --loglevel 0 --nolaunchpppd" file /etc/ppp/options.pptp + + diff --git a/package/pptp/ipkg/etc/ppp/options.pptp b/package/pptp/ipkg/etc/ppp/options.pptp index 85b043fab..0eb1e87e8 100644 --- a/package/pptp/ipkg/etc/ppp/options.pptp +++ b/package/pptp/ipkg/etc/ppp/options.pptp @@ -1 +1,12 @@ -lock noauth nobsdcomp nodeflate +lock +noauth +nobsdcomp +nodeflate +mtu 1490 +mru 1490 +lcp-echo-failure 5 +lcp-echo-interval 120 +idle 0 +defaultroute +name xxxx +remotename xxxx -- cgit v1.2.3 From 1827dd39e4ef9f2fdf6594029bf1d920c75ede5b Mon Sep 17 00:00:00 2001 From: nico Date: Wed, 18 May 2005 23:42:09 +0000 Subject: Convert pptp to new packaging style git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@941 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/pptp/Config.in | 6 +++- package/pptp/Makefile | 56 +++++++++++++--------------------- package/pptp/files/options.pptp | 12 ++++++++ package/pptp/files/pptp.init | 18 +++++++++++ package/pptp/ipkg/etc/init.d/S50pptp | 18 ----------- package/pptp/ipkg/etc/ppp/options.pptp | 12 -------- package/pptp/ipkg/pptp.conffiles | 1 + package/pptp/ipkg/pptp.control | 7 +++++ package/pptp/pptp.control | 7 ----- 9 files changed, 65 insertions(+), 72 deletions(-) create mode 100644 package/pptp/files/options.pptp create mode 100644 package/pptp/files/pptp.init delete mode 100755 package/pptp/ipkg/etc/init.d/S50pptp delete mode 100644 package/pptp/ipkg/etc/ppp/options.pptp create mode 100644 package/pptp/ipkg/pptp.conffiles create mode 100644 package/pptp/ipkg/pptp.control delete mode 100644 package/pptp/pptp.control (limited to 'package/pptp') diff --git a/package/pptp/Config.in b/package/pptp/Config.in index 8ffeff264..ad41744ce 100644 --- a/package/pptp/Config.in +++ b/package/pptp/Config.in @@ -1,7 +1,11 @@ config BR2_PACKAGE_PPTP - tristate "PPTP Client" + prompt "pptp - a PPTP (Point-to-Point Tunneling Protocol) client" + tristate default m if CONFIG_DEVEL select BR2_PACKAGE_KMOD_GRE select BR2_PACKAGE_PPP help A Point-to-Point Tunneling Protocol Client + + http://pptpclient.sourceforge.net/ + diff --git a/package/pptp/Makefile b/package/pptp/Makefile index a07d6bdf6..b54b9d31d 100644 --- a/package/pptp/Makefile +++ b/package/pptp/Makefile @@ -9,42 +9,30 @@ PKG_MD5SUM:=9a706327fb9827541d7c86d48ceb9631 PKG_SOURCE_URL:=@SF/pptpclient PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_CAT:=zcat -PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk -PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg -$(DL_DIR)/$(PKG_SOURCE): - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL) +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) + +include $(TOPDIR)/package/rules.mk + +$(eval $(call PKG_template,PPTP,pptp,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE) - $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - touch $(PKG_BUILD_DIR)/.unpacked +$(PKG_BUILD_DIR)/.configured: + touch $(PKG_BUILD_DIR)/.configured -$(PKG_BUILD_DIR)/$(PKG_NAME): $(PKG_BUILD_DIR)/.unpacked +$(PKG_BUILD_DIR)/.built: $(MAKE) -C $(PKG_BUILD_DIR) \ - CC=$(TARGET_CC) \ - CFLAGS="$(TARGET_CFLAGS)" \ - all - -$(PKG_IPK): $(PKG_BUILD_DIR)/$(PKG_NAME) - mkdir -p $(PKG_IPK_DIR)/usr/sbin - cp -a ./ipkg/* $(PKG_IPK_DIR)/ - $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) - cp $(PKG_BUILD_DIR)/pptp $(PKG_IPK_DIR)/usr/sbin/ - $(STRIP) $(PKG_IPK_DIR)/usr/sbin/* - mkdir -p $(PACKAGE_DIR) - find $(PKG_IPK_DIR) -name CVS | xargs rm -rf - $(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR) - -$(IPKG_STATE_DIR)/info/pptp.list: $(PKG_IPK) - $(IPKG) install $(PKG_IPK) - -source: $(DL_DIR)/$(PKG_SOURCE) -prepare: $(PKG_BUILD_DIR)/.unpacked -compile: $(PKG_IPK) -install: $(IPKG_STATE_DIR)/info/pptp.list - -clean: - rm -rf $(PKG_BUILD_DIR) - rm -f $(PKG_IPK) + CC=$(TARGET_CC) \ + CFLAGS="$(TARGET_CFLAGS)" \ + all + touch $(PKG_BUILD_DIR)/.built + +$(IPKG_PPTP): + install -d -m0755 $(IDIR_PPTP)/etc/init.d + install -m0755 ./files/pptp.init $(IDIR_PPTP)/etc/init.d/S50pptp + install -d -m0755 $(IDIR_PPTP)/etc/ppp + install -m0644 ./files/options.pptp $(IDIR_PPTP)/etc/ppp/ + install -d -m0755 $(IDIR_PPTP)/usr/sbin + install -m0755 $(PKG_BUILD_DIR)/pptp $(IDIR_PPTP)/usr/sbin/ + $(RSTRIP) $(IDIR_PPTP) + $(IPKG_BUILD) $(IDIR_PPTP) $(PACKAGE_DIR) diff --git a/package/pptp/files/options.pptp b/package/pptp/files/options.pptp new file mode 100644 index 000000000..0eb1e87e8 --- /dev/null +++ b/package/pptp/files/options.pptp @@ -0,0 +1,12 @@ +lock +noauth +nobsdcomp +nodeflate +mtu 1490 +mru 1490 +lcp-echo-failure 5 +lcp-echo-interval 120 +idle 0 +defaultroute +name xxxx +remotename xxxx diff --git a/package/pptp/files/pptp.init b/package/pptp/files/pptp.init new file mode 100644 index 000000000..34ff8a63b --- /dev/null +++ b/package/pptp/files/pptp.init @@ -0,0 +1,18 @@ +#!/bin/sh + +. /etc/functions.sh + +WAN_PROTO=$(nvram get wan_proto) +[ "$WAN_PROTO" = "pptp" ] || exit 0 + +for module in ip_gre slhc ppp_generic ppp_async ppp_deflate ; do + /sbin/insmod $module 2>/dev/null >/dev/null +done + +if test -d "/var/lock"; then + mkdir -p /var/lock || exit 1 +fi + +/usr/sbin/pppd pty "pptp x.x.x.x --loglevel 0 --nolaunchpppd" file /etc/ppp/options.pptp + + diff --git a/package/pptp/ipkg/etc/init.d/S50pptp b/package/pptp/ipkg/etc/init.d/S50pptp deleted file mode 100755 index 34ff8a63b..000000000 --- a/package/pptp/ipkg/etc/init.d/S50pptp +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -. /etc/functions.sh - -WAN_PROTO=$(nvram get wan_proto) -[ "$WAN_PROTO" = "pptp" ] || exit 0 - -for module in ip_gre slhc ppp_generic ppp_async ppp_deflate ; do - /sbin/insmod $module 2>/dev/null >/dev/null -done - -if test -d "/var/lock"; then - mkdir -p /var/lock || exit 1 -fi - -/usr/sbin/pppd pty "pptp x.x.x.x --loglevel 0 --nolaunchpppd" file /etc/ppp/options.pptp - - diff --git a/package/pptp/ipkg/etc/ppp/options.pptp b/package/pptp/ipkg/etc/ppp/options.pptp deleted file mode 100644 index 0eb1e87e8..000000000 --- a/package/pptp/ipkg/etc/ppp/options.pptp +++ /dev/null @@ -1,12 +0,0 @@ -lock -noauth -nobsdcomp -nodeflate -mtu 1490 -mru 1490 -lcp-echo-failure 5 -lcp-echo-interval 120 -idle 0 -defaultroute -name xxxx -remotename xxxx diff --git a/package/pptp/ipkg/pptp.conffiles b/package/pptp/ipkg/pptp.conffiles new file mode 100644 index 000000000..136db31f1 --- /dev/null +++ b/package/pptp/ipkg/pptp.conffiles @@ -0,0 +1 @@ +/etc/ppp/options.pptp \ No newline at end of file diff --git a/package/pptp/ipkg/pptp.control b/package/pptp/ipkg/pptp.control new file mode 100644 index 000000000..67dbd2694 --- /dev/null +++ b/package/pptp/ipkg/pptp.control @@ -0,0 +1,7 @@ +Package: pptp +Priority: optional +Section: net +Maintainer: Waldemar Brodkorb +Source: buildroot internal +Description: a Point-to-Point Tunneling Protocol (PPTP) client +Depends: ppp, kmod-gre diff --git a/package/pptp/pptp.control b/package/pptp/pptp.control deleted file mode 100644 index 67dbd2694..000000000 --- a/package/pptp/pptp.control +++ /dev/null @@ -1,7 +0,0 @@ -Package: pptp -Priority: optional -Section: net -Maintainer: Waldemar Brodkorb -Source: buildroot internal -Description: a Point-to-Point Tunneling Protocol (PPTP) client -Depends: ppp, kmod-gre -- cgit v1.2.3 From 0cfd99d729c2d53031c2d564a4b70760eb1a7c30 Mon Sep 17 00:00:00 2001 From: nico Date: Thu, 19 May 2005 16:49:23 +0000 Subject: Standardize package Config.in, change prompt to package name + short description, add URL when missing (and found) git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@956 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/pptp/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/pptp') diff --git a/package/pptp/Config.in b/package/pptp/Config.in index ad41744ce..905506e39 100644 --- a/package/pptp/Config.in +++ b/package/pptp/Config.in @@ -1,5 +1,5 @@ config BR2_PACKAGE_PPTP - prompt "pptp - a PPTP (Point-to-Point Tunneling Protocol) client" + prompt "pptp - PPTP (Point-to-Point Tunneling Protocol) client" tristate default m if CONFIG_DEVEL select BR2_PACKAGE_KMOD_GRE -- cgit v1.2.3 From 08fd6bda6451b3dff2cd82cfde6f5393a1018dd5 Mon Sep 17 00:00:00 2001 From: nico Date: Thu, 19 May 2005 21:22:09 +0000 Subject: Cosmetic fix git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@973 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/pptp/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/pptp') diff --git a/package/pptp/Makefile b/package/pptp/Makefile index b54b9d31d..6c9f5150d 100644 --- a/package/pptp/Makefile +++ b/package/pptp/Makefile @@ -18,14 +18,14 @@ include $(TOPDIR)/package/rules.mk $(eval $(call PKG_template,PPTP,pptp,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(PKG_BUILD_DIR)/.configured: - touch $(PKG_BUILD_DIR)/.configured + touch $@ $(PKG_BUILD_DIR)/.built: $(MAKE) -C $(PKG_BUILD_DIR) \ CC=$(TARGET_CC) \ CFLAGS="$(TARGET_CFLAGS)" \ all - touch $(PKG_BUILD_DIR)/.built + touch $@ $(IPKG_PPTP): install -d -m0755 $(IDIR_PPTP)/etc/init.d -- cgit v1.2.3 From bb8d5928d39a15f6337b653621e2a8c625e10d1a Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 16 Jul 2005 14:05:46 +0000 Subject: update pptp in head to whiterussian version git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1464 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/pptp/Makefile | 4 ++-- package/pptp/files/ifup.pptp | 43 +++++++++++++++++++++++++++++++++++++++++ package/pptp/files/options.pptp | 6 ------ package/pptp/files/pptp.init | 18 ----------------- 4 files changed, 45 insertions(+), 26 deletions(-) create mode 100644 package/pptp/files/ifup.pptp delete mode 100644 package/pptp/files/pptp.init (limited to 'package/pptp') diff --git a/package/pptp/Makefile b/package/pptp/Makefile index 6c9f5150d..94ac61cde 100644 --- a/package/pptp/Makefile +++ b/package/pptp/Makefile @@ -28,8 +28,8 @@ $(PKG_BUILD_DIR)/.built: touch $@ $(IPKG_PPTP): - install -d -m0755 $(IDIR_PPTP)/etc/init.d - install -m0755 ./files/pptp.init $(IDIR_PPTP)/etc/init.d/S50pptp + install -d -m0755 $(IDIR_PPTP)/sbin + install -m0755 ./files/ifup.pptp $(IDIR_PPTP)/sbin/ifup.pptp install -d -m0755 $(IDIR_PPTP)/etc/ppp install -m0644 ./files/options.pptp $(IDIR_PPTP)/etc/ppp/ install -d -m0755 $(IDIR_PPTP)/usr/sbin diff --git a/package/pptp/files/ifup.pptp b/package/pptp/files/ifup.pptp new file mode 100644 index 000000000..21a574acb --- /dev/null +++ b/package/pptp/files/ifup.pptp @@ -0,0 +1,43 @@ +#!/bin/sh +. /etc/functions.sh +type=$1 + +[ "$(nvram get ${type}_proto)" = "pptp" ] || exit + +[ -d "/var/lock" ] || mkdir -p /var/lock || exit 1 + +for module in slhc ppp_generic ppp_async ip_gre; do + /sbin/insmod $module 2>&- >&- +done + +if=$(nvram get pptp_ifname) +ip=$(nvram get ${type}_ipaddr) +netmask=$(nvram get ${type}_netmask) +[ -z "$ip" -o -z "$if" ] || ifconfig $if $ip ${netmask:+netmask $netmask} broadcast + up + +while :; do + IP=$(nvram get pptp_server_ip) + USERNAME=$(nvram get ppp_username) + PASSWORD=$(nvram get ppp_passwd) + REDIAL=$(nvram get ppp_redialperiod) + REDIAL=${REDIAL:+lcp-echo-interval $REDIAL} + IDLETIME=$(nvram get ppp_idletime) + IDLETIME=${IDLETIME:+lcp-echo-failure $IDLETIME} + MTU=$(nvram get ppp_mtu) + MTU=${MTU:+ mtu $MTU mru $MTU} + + /usr/sbin/pppd nodetach \ + pty "/usr/sbin/pptp $IP --loglevel 0 --nolaunchpppd" \ + file /etc/ppp/options.pptp \ + connect /bin/true \ + usepeerdns \ + defaultroute \ + linkname $type \ + user "$USERNAME" \ + password "$PASSWORD" \ + $MTU \ + $IDLETIME \ + $REDIAL \ + $IFNAME +done & + diff --git a/package/pptp/files/options.pptp b/package/pptp/files/options.pptp index 0eb1e87e8..c520de74b 100644 --- a/package/pptp/files/options.pptp +++ b/package/pptp/files/options.pptp @@ -2,11 +2,5 @@ lock noauth nobsdcomp nodeflate -mtu 1490 -mru 1490 -lcp-echo-failure 5 -lcp-echo-interval 120 idle 0 defaultroute -name xxxx -remotename xxxx diff --git a/package/pptp/files/pptp.init b/package/pptp/files/pptp.init deleted file mode 100644 index 34ff8a63b..000000000 --- a/package/pptp/files/pptp.init +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -. /etc/functions.sh - -WAN_PROTO=$(nvram get wan_proto) -[ "$WAN_PROTO" = "pptp" ] || exit 0 - -for module in ip_gre slhc ppp_generic ppp_async ppp_deflate ; do - /sbin/insmod $module 2>/dev/null >/dev/null -done - -if test -d "/var/lock"; then - mkdir -p /var/lock || exit 1 -fi - -/usr/sbin/pppd pty "pptp x.x.x.x --loglevel 0 --nolaunchpppd" file /etc/ppp/options.pptp - - -- cgit v1.2.3 From 48289044a17d07dca496f186ae3b0c72e3a10f0a Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 16 Jul 2005 22:53:40 +0000 Subject: increase pptp package version git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1471 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/pptp/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/pptp') diff --git a/package/pptp/Makefile b/package/pptp/Makefile index 94ac61cde..3334f2311 100644 --- a/package/pptp/Makefile +++ b/package/pptp/Makefile @@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pptp PKG_VERSION:=1.6.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MD5SUM:=9a706327fb9827541d7c86d48ceb9631 PKG_SOURCE_URL:=@SF/pptpclient -- cgit v1.2.3 From f80d4fdc68858ba956a39e19ad6efa868beb827e Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 21 Jul 2005 14:02:53 +0000 Subject: add config file /etc/config/network, add board-specific network.overrides (instead of nvram.overrides) git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1519 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/pptp/files/ifup.pptp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'package/pptp') diff --git a/package/pptp/files/ifup.pptp b/package/pptp/files/ifup.pptp index 21a574acb..833544077 100644 --- a/package/pptp/files/ifup.pptp +++ b/package/pptp/files/ifup.pptp @@ -1,5 +1,7 @@ #!/bin/sh . /etc/functions.sh +. /etc/nvram.overrides +[ -e /etc/config/network ] && . /etc/config/network type=$1 [ "$(nvram get ${type}_proto)" = "pptp" ] || exit -- cgit v1.2.3 From 7c673c3d2664cc0d6e240c81c1ad6f3bb17f7a10 Mon Sep 17 00:00:00 2001 From: nbd Date: Fri, 21 Oct 2005 17:21:28 +0000 Subject: remove Maintainer: and Source: from packages git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2210 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/pptp/ipkg/pptp.control | 2 -- 1 file changed, 2 deletions(-) (limited to 'package/pptp') diff --git a/package/pptp/ipkg/pptp.control b/package/pptp/ipkg/pptp.control index 67dbd2694..e582c6221 100644 --- a/package/pptp/ipkg/pptp.control +++ b/package/pptp/ipkg/pptp.control @@ -1,7 +1,5 @@ Package: pptp Priority: optional Section: net -Maintainer: Waldemar Brodkorb -Source: buildroot internal Description: a Point-to-Point Tunneling Protocol (PPTP) client Depends: ppp, kmod-gre -- cgit v1.2.3 From 2be847dc58145c4946781ebde7cda49ce0e5f099 Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 22 Oct 2005 21:58:50 +0000 Subject: sync pptp ifup script with whiterussian git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2265 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/pptp/files/ifup.pptp | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'package/pptp') diff --git a/package/pptp/files/ifup.pptp b/package/pptp/files/ifup.pptp index 833544077..15178fe30 100644 --- a/package/pptp/files/ifup.pptp +++ b/package/pptp/files/ifup.pptp @@ -1,7 +1,5 @@ #!/bin/sh . /etc/functions.sh -. /etc/nvram.overrides -[ -e /etc/config/network ] && . /etc/config/network type=$1 [ "$(nvram get ${type}_proto)" = "pptp" ] || exit @@ -12,12 +10,10 @@ for module in slhc ppp_generic ppp_async ip_gre; do /sbin/insmod $module 2>&- >&- done -if=$(nvram get pptp_ifname) -ip=$(nvram get ${type}_ipaddr) -netmask=$(nvram get ${type}_netmask) -[ -z "$ip" -o -z "$if" ] || ifconfig $if $ip ${netmask:+netmask $netmask} broadcast + up - while :; do + PPTP_PROTO="$(nvram get pptp_proto)" + [ "$PPTP_PROTO" = "static" ] || PPTP_PROTO="" + PPTP_PROTO="${PPTP_PROTO:-dhcp}" IP=$(nvram get pptp_server_ip) USERNAME=$(nvram get ppp_username) PASSWORD=$(nvram get ppp_passwd) @@ -28,18 +24,25 @@ while :; do MTU=$(nvram get ppp_mtu) MTU=${MTU:+ mtu $MTU mru $MTU} + do_ifup $PPTP_PROTO $type + + # hack for some buggy ISPs + NETMASK=$(nvram get ${type}_netmask) + IFNAME=$(nvram get pptp_ifname) + [ -z "$NETMASK" -o -z "$IFNAME" ] || ifconfig $IFNAME netmask $NETMASK + /usr/sbin/pppd nodetach \ pty "/usr/sbin/pptp $IP --loglevel 0 --nolaunchpppd" \ file /etc/ppp/options.pptp \ connect /bin/true \ usepeerdns \ defaultroute \ + replacedefaultroute \ linkname $type \ user "$USERNAME" \ password "$PASSWORD" \ $MTU \ $IDLETIME \ - $REDIAL \ - $IFNAME + $REDIAL done & -- cgit v1.2.3 From 7bd944d2153b871aaaee970811f27772cbe36a6f Mon Sep 17 00:00:00 2001 From: nico Date: Sat, 5 Nov 2005 02:16:36 +0000 Subject: reorganize/rationalize/format package menuconfig, make updatedd modular git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2333 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/pptp/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/pptp') diff --git a/package/pptp/Config.in b/package/pptp/Config.in index 905506e39..88da23748 100644 --- a/package/pptp/Config.in +++ b/package/pptp/Config.in @@ -1,5 +1,5 @@ config BR2_PACKAGE_PPTP - prompt "pptp - PPTP (Point-to-Point Tunneling Protocol) client" + prompt "pptp.............................. PPTP (Point-to-Point Tunneling Protocol) client" tristate default m if CONFIG_DEVEL select BR2_PACKAGE_KMOD_GRE @@ -8,4 +8,4 @@ config BR2_PACKAGE_PPTP A Point-to-Point Tunneling Protocol Client http://pptpclient.sourceforge.net/ - + -- cgit v1.2.3 From 0bb68e81eca839c8eed0c629b403ac558ea662e6 Mon Sep 17 00:00:00 2001 From: nbd Date: Mon, 7 Nov 2005 01:12:51 +0000 Subject: add hotplug stuff to trunk/ git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2364 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/pptp/Makefile | 2 +- package/pptp/files/ifup.pptp | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'package/pptp') diff --git a/package/pptp/Makefile b/package/pptp/Makefile index 3334f2311..870341c87 100644 --- a/package/pptp/Makefile +++ b/package/pptp/Makefile @@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pptp PKG_VERSION:=1.6.0 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_MD5SUM:=9a706327fb9827541d7c86d48ceb9631 PKG_SOURCE_URL:=@SF/pptpclient diff --git a/package/pptp/files/ifup.pptp b/package/pptp/files/ifup.pptp index 15178fe30..acaeabd97 100644 --- a/package/pptp/files/ifup.pptp +++ b/package/pptp/files/ifup.pptp @@ -22,7 +22,7 @@ while :; do IDLETIME=$(nvram get ppp_idletime) IDLETIME=${IDLETIME:+lcp-echo-failure $IDLETIME} MTU=$(nvram get ppp_mtu) - MTU=${MTU:+ mtu $MTU mru $MTU} + MTU=${MTU:-1452} do_ifup $PPTP_PROTO $type @@ -38,10 +38,12 @@ while :; do usepeerdns \ defaultroute \ replacedefaultroute \ - linkname $type \ + linkname "$type" \ + ipparam "$type" \ user "$USERNAME" \ password "$PASSWORD" \ - $MTU \ + mtu $MTU \ + mru $MTU \ $IDLETIME \ $REDIAL done & -- cgit v1.2.3 From 2663cb716873d252ed952b18266d43808f8784df Mon Sep 17 00:00:00 2001 From: nbd Date: Fri, 11 Nov 2005 21:15:33 +0000 Subject: add new ppp timeout/redial stuff from [2433] to pptp init script git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2436 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/pptp/files/ifup.pptp | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'package/pptp') diff --git a/package/pptp/files/ifup.pptp b/package/pptp/files/ifup.pptp index acaeabd97..23cad0805 100644 --- a/package/pptp/files/ifup.pptp +++ b/package/pptp/files/ifup.pptp @@ -17,10 +17,16 @@ while :; do IP=$(nvram get pptp_server_ip) USERNAME=$(nvram get ppp_username) PASSWORD=$(nvram get ppp_passwd) - REDIAL=$(nvram get ppp_redialperiod) - REDIAL=${REDIAL:+lcp-echo-interval $REDIAL} - IDLETIME=$(nvram get ppp_idletime) - IDLETIME=${IDLETIME:+lcp-echo-failure $IDLETIME} + KEEPALIVE=$(nvram get ppp_redialperiod) + KEEPALIVE=${KEEPALIVE:+lcp-echo-interval 10 lcp-echo-failure $KEEPALIVE} + DEMAND=$(nvram get ppp_demand) + case "$DEMAND" in + on|1|enabled) + DEMAND=$(nvram get ppp_idletime) + DEMAND=${IDLETIME:+demand idle $IDLETIME} + ;; + *) DEMAND="";; + esac MTU=$(nvram get ppp_mtu) MTU=${MTU:-1452} @@ -42,9 +48,8 @@ while :; do ipparam "$type" \ user "$USERNAME" \ password "$PASSWORD" \ - mtu $MTU \ - mru $MTU \ - $IDLETIME \ - $REDIAL + mtu $MTU mru $MTU \ + $DEMAND \ + $KEEPALIVE done & -- cgit v1.2.3 From 2af90479fbd25ca63d9697200d43ea614d657184 Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 19 Nov 2005 03:17:20 +0000 Subject: hotplug-based network script rewrite git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2531 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/pptp/files/ifup.pptp | 82 +++++++++++++++++++++----------------------- 1 file changed, 40 insertions(+), 42 deletions(-) (limited to 'package/pptp') diff --git a/package/pptp/files/ifup.pptp b/package/pptp/files/ifup.pptp index 23cad0805..eda78e440 100644 --- a/package/pptp/files/ifup.pptp +++ b/package/pptp/files/ifup.pptp @@ -10,46 +10,44 @@ for module in slhc ppp_generic ppp_async ip_gre; do /sbin/insmod $module 2>&- >&- done -while :; do - PPTP_PROTO="$(nvram get pptp_proto)" - [ "$PPTP_PROTO" = "static" ] || PPTP_PROTO="" - PPTP_PROTO="${PPTP_PROTO:-dhcp}" - IP=$(nvram get pptp_server_ip) - USERNAME=$(nvram get ppp_username) - PASSWORD=$(nvram get ppp_passwd) - KEEPALIVE=$(nvram get ppp_redialperiod) - KEEPALIVE=${KEEPALIVE:+lcp-echo-interval 10 lcp-echo-failure $KEEPALIVE} - DEMAND=$(nvram get ppp_demand) - case "$DEMAND" in - on|1|enabled) - DEMAND=$(nvram get ppp_idletime) - DEMAND=${IDLETIME:+demand idle $IDLETIME} - ;; - *) DEMAND="";; - esac - MTU=$(nvram get ppp_mtu) - MTU=${MTU:-1452} - - do_ifup $PPTP_PROTO $type - - # hack for some buggy ISPs - NETMASK=$(nvram get ${type}_netmask) - IFNAME=$(nvram get pptp_ifname) - [ -z "$NETMASK" -o -z "$IFNAME" ] || ifconfig $IFNAME netmask $NETMASK - - /usr/sbin/pppd nodetach \ - pty "/usr/sbin/pptp $IP --loglevel 0 --nolaunchpppd" \ - file /etc/ppp/options.pptp \ - connect /bin/true \ - usepeerdns \ - defaultroute \ - replacedefaultroute \ - linkname "$type" \ - ipparam "$type" \ - user "$USERNAME" \ - password "$PASSWORD" \ - mtu $MTU mru $MTU \ - $DEMAND \ - $KEEPALIVE -done & +PPTP_PROTO="$(nvram get pptp_proto)" +[ "$PPTP_PROTO" = "static" ] || PPTP_PROTO="" +PPTP_PROTO="${PPTP_PROTO:-dhcp}" +IP=$(nvram get pptp_server_ip) +USERNAME=$(nvram get ppp_username) +PASSWORD=$(nvram get ppp_passwd) +KEEPALIVE=$(nvram get ppp_redialperiod) +KEEPALIVE=${KEEPALIVE:+lcp-echo-interval 10 lcp-echo-failure $KEEPALIVE} +DEMAND=$(nvram get ppp_demand) +case "$DEMAND" in + on|1|enabled) + DEMAND=$(nvram get ppp_idletime) + DEMAND=${IDLETIME:+demand idle $IDLETIME} + ;; + *) DEMAND="persist";; +esac +MTU=$(nvram get ppp_mtu) +MTU=${MTU:-1452} + +do_ifup $PPTP_PROTO $type + +# hack for some buggy ISPs +NETMASK=$(nvram get ${type}_netmask) +IFNAME=$(nvram get pptp_ifname) +[ -z "$NETMASK" -o -z "$IFNAME" ] || ifconfig $IFNAME netmask $NETMASK + +/usr/sbin/pppd nodetach \ + pty "/usr/sbin/pptp $IP --loglevel 0 --nolaunchpppd" \ + file /etc/ppp/options.pptp \ + connect /bin/true \ + usepeerdns \ + defaultroute \ + replacedefaultroute \ + linkname "$type" \ + ipparam "$type" \ + user "$USERNAME" \ + password "$PASSWORD" \ + mtu $MTU mru $MTU \ + $DEMAND \ + $KEEPALIVE -- cgit v1.2.3 From 1b02e2c32ceefd3b59c34c3eb8d9080b83be1bd6 Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 19 Nov 2005 14:07:54 +0000 Subject: remove nodetach from ppp init scripts git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2534 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/pptp/files/ifup.pptp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/pptp') diff --git a/package/pptp/files/ifup.pptp b/package/pptp/files/ifup.pptp index eda78e440..c8a1a5eee 100644 --- a/package/pptp/files/ifup.pptp +++ b/package/pptp/files/ifup.pptp @@ -36,7 +36,7 @@ NETMASK=$(nvram get ${type}_netmask) IFNAME=$(nvram get pptp_ifname) [ -z "$NETMASK" -o -z "$IFNAME" ] || ifconfig $IFNAME netmask $NETMASK -/usr/sbin/pppd nodetach \ +/usr/sbin/pppd \ pty "/usr/sbin/pptp $IP --loglevel 0 --nolaunchpppd" \ file /etc/ppp/options.pptp \ connect /bin/true \ -- cgit v1.2.3 From 23e86550c9c59436cc5f253292774861dd6ca62e Mon Sep 17 00:00:00 2001 From: nbd Date: Mon, 16 Jan 2006 03:14:59 +0000 Subject: port wan_device changes from whiterussian to kamikaze git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2993 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/pptp/files/ifup.pptp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/pptp') diff --git a/package/pptp/files/ifup.pptp b/package/pptp/files/ifup.pptp index c8a1a5eee..fe04d9784 100644 --- a/package/pptp/files/ifup.pptp +++ b/package/pptp/files/ifup.pptp @@ -33,7 +33,7 @@ do_ifup $PPTP_PROTO $type # hack for some buggy ISPs NETMASK=$(nvram get ${type}_netmask) -IFNAME=$(nvram get pptp_ifname) +IFNAME=$(nvram get ${type}_device) [ -z "$NETMASK" -o -z "$IFNAME" ] || ifconfig $IFNAME netmask $NETMASK /usr/sbin/pppd \ -- cgit v1.2.3 From f71d418315f9efac495af5dcec0e750d195486ea Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 18 Mar 2006 17:27:20 +0000 Subject: precompile ppp active filter (reduces libpcap overhead to only a few k), enable by default to support proper demand dialling, fixes #307 git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3401 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/pptp/files/ifup.pptp | 1 + 1 file changed, 1 insertion(+) (limited to 'package/pptp') diff --git a/package/pptp/files/ifup.pptp b/package/pptp/files/ifup.pptp index fe04d9784..9b1ac07c2 100644 --- a/package/pptp/files/ifup.pptp +++ b/package/pptp/files/ifup.pptp @@ -23,6 +23,7 @@ case "$DEMAND" in on|1|enabled) DEMAND=$(nvram get ppp_idletime) DEMAND=${IDLETIME:+demand idle $IDLETIME} + [ -f /etc/ppp/filter ] && DEMAND=${DEMAND:+precompiled-active-filter /etc/ppp/filter $DEMAND} ;; *) DEMAND="persist";; esac -- cgit v1.2.3 From 676c017ecfced2e37aeec176f8aa6b9df90024f3 Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 5 Apr 2006 02:09:22 +0000 Subject: large init script cleanup and merge of whiterussian changes, new dnsmasq config handling git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3588 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/pptp/files/ifup.pptp | 41 ++++++++++++++++------------------------- 1 file changed, 16 insertions(+), 25 deletions(-) (limited to 'package/pptp') diff --git a/package/pptp/files/ifup.pptp b/package/pptp/files/ifup.pptp index 9b1ac07c2..a9bc579b5 100644 --- a/package/pptp/files/ifup.pptp +++ b/package/pptp/files/ifup.pptp @@ -1,8 +1,13 @@ #!/bin/sh -. /etc/functions.sh +[ $# = 0 ] && { echo " $0 "; exit; } +. /etc/config/network type=$1 -[ "$(nvram get ${type}_proto)" = "pptp" ] || exit +eval "proto=\"\${${type}_proto}\"" +[ "$proto" = "pptp" ] || { + echo "$0: ${type}_proto isn't pptp" + exit +} [ -d "/var/lock" ] || mkdir -p /var/lock || exit 1 @@ -10,35 +15,21 @@ for module in slhc ppp_generic ppp_async ip_gre; do /sbin/insmod $module 2>&- >&- done -PPTP_PROTO="$(nvram get pptp_proto)" -[ "$PPTP_PROTO" = "static" ] || PPTP_PROTO="" -PPTP_PROTO="${PPTP_PROTO:-dhcp}" -IP=$(nvram get pptp_server_ip) -USERNAME=$(nvram get ppp_username) -PASSWORD=$(nvram get ppp_passwd) -KEEPALIVE=$(nvram get ppp_redialperiod) -KEEPALIVE=${KEEPALIVE:+lcp-echo-interval 10 lcp-echo-failure $KEEPALIVE} -DEMAND=$(nvram get ppp_demand) -case "$DEMAND" in +KEEPALIVE=${ppp_redialperiod:+lcp-echo-interval $ppp_redialperiod lcp-echo-failure 5} +case "$ppp_demand" in on|1|enabled) - DEMAND=$(nvram get ppp_idletime) - DEMAND=${IDLETIME:+demand idle $IDLETIME} + DEMAND=${ppp_idletime:+demand idle $ppp_idletime} [ -f /etc/ppp/filter ] && DEMAND=${DEMAND:+precompiled-active-filter /etc/ppp/filter $DEMAND} ;; *) DEMAND="persist";; esac -MTU=$(nvram get ppp_mtu) -MTU=${MTU:-1452} +MTU=${ppp_mtu:-1452} -do_ifup $PPTP_PROTO $type - -# hack for some buggy ISPs -NETMASK=$(nvram get ${type}_netmask) -IFNAME=$(nvram get ${type}_device) -[ -z "$NETMASK" -o -z "$IFNAME" ] || ifconfig $IFNAME netmask $NETMASK +[ "$pptp_proto" = "static" ] || pptp_proto="dhcp" +do_ifup $pptp_proto $type /usr/sbin/pppd \ - pty "/usr/sbin/pptp $IP --loglevel 0 --nolaunchpppd" \ + pty "/usr/sbin/pptp $pptp_server_ip --loglevel 0 --nolaunchpppd" \ file /etc/ppp/options.pptp \ connect /bin/true \ usepeerdns \ @@ -46,8 +37,8 @@ IFNAME=$(nvram get ${type}_device) replacedefaultroute \ linkname "$type" \ ipparam "$type" \ - user "$USERNAME" \ - password "$PASSWORD" \ + user "$ppp_username" \ + password "$ppp_passwd" \ mtu $MTU mru $MTU \ $DEMAND \ $KEEPALIVE -- cgit v1.2.3 From 2b42215e7af143bc9c1734cfc551e28a27a91af5 Mon Sep 17 00:00:00 2001 From: mbm Date: Wed, 10 May 2006 19:06:22 +0000 Subject: Convert packages to new template git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3752 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/pptp/Makefile | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) (limited to 'package/pptp') diff --git a/package/pptp/Makefile b/package/pptp/Makefile index 870341c87..de7c50c2d 100644 --- a/package/pptp/Makefile +++ b/package/pptp/Makefile @@ -5,34 +5,30 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pptp PKG_VERSION:=1.6.0 PKG_RELEASE:=3 -PKG_MD5SUM:=9a706327fb9827541d7c86d48ceb9631 -PKG_SOURCE_URL:=@SF/pptpclient +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=@SF/pptpclient +PKG_MD5SUM:=9a706327fb9827541d7c86d48ceb9631 PKG_CAT:=zcat -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) - include $(TOPDIR)/package/rules.mk -$(eval $(call PKG_template,PPTP,pptp,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +define Package/pptp +SECTION:=base +# CATEGORY:=FIXME +TITLE:=PPTP (Point-to-Point Tunneling Protocol) client +DESCRIPTION:=A Point-to-Point Tunneling Protocol Client +URL:=http://pptpclient.sourceforge.net/ +endef -$(PKG_BUILD_DIR)/.configured: - touch $@ - -$(PKG_BUILD_DIR)/.built: - $(MAKE) -C $(PKG_BUILD_DIR) \ - CC=$(TARGET_CC) \ - CFLAGS="$(TARGET_CFLAGS)" \ - all - touch $@ - -$(IPKG_PPTP): +define Package/pptp/install install -d -m0755 $(IDIR_PPTP)/sbin - install -m0755 ./files/ifup.pptp $(IDIR_PPTP)/sbin/ifup.pptp install -d -m0755 $(IDIR_PPTP)/etc/ppp - install -m0644 ./files/options.pptp $(IDIR_PPTP)/etc/ppp/ install -d -m0755 $(IDIR_PPTP)/usr/sbin + install -m0755 ./files/ifup.pptp $(IDIR_PPTP)/sbin/ifup.pptp + install -m0644 ./files/options.pptp $(IDIR_PPTP)/etc/ppp/ install -m0755 $(PKG_BUILD_DIR)/pptp $(IDIR_PPTP)/usr/sbin/ - $(RSTRIP) $(IDIR_PPTP) - $(IPKG_BUILD) $(IDIR_PPTP) $(PACKAGE_DIR) +endef + +$(eval $(call BuildPackage,pptp)) -- cgit v1.2.3 From 44ba04efe200178dd52943b2c1edd8418fbac0ba Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 11 May 2006 16:00:43 +0000 Subject: replace $(IDIR_*) with $(1) git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3759 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/pptp/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'package/pptp') diff --git a/package/pptp/Makefile b/package/pptp/Makefile index de7c50c2d..776a66864 100644 --- a/package/pptp/Makefile +++ b/package/pptp/Makefile @@ -23,12 +23,12 @@ URL:=http://pptpclient.sourceforge.net/ endef define Package/pptp/install - install -d -m0755 $(IDIR_PPTP)/sbin - install -d -m0755 $(IDIR_PPTP)/etc/ppp - install -d -m0755 $(IDIR_PPTP)/usr/sbin - install -m0755 ./files/ifup.pptp $(IDIR_PPTP)/sbin/ifup.pptp - install -m0644 ./files/options.pptp $(IDIR_PPTP)/etc/ppp/ - install -m0755 $(PKG_BUILD_DIR)/pptp $(IDIR_PPTP)/usr/sbin/ + install -d -m0755 $(1)/sbin + install -d -m0755 $(1)/etc/ppp + install -d -m0755 $(1)/usr/sbin + install -m0755 ./files/ifup.pptp $(1)/sbin/ifup.pptp + install -m0644 ./files/options.pptp $(1)/etc/ppp/ + install -m0755 $(PKG_BUILD_DIR)/pptp $(1)/usr/sbin/ endef $(eval $(call BuildPackage,pptp)) -- cgit v1.2.3 From f47790856c089dd077ca817ad94820a65b755686 Mon Sep 17 00:00:00 2001 From: mbm Date: Mon, 15 May 2006 23:13:49 +0000 Subject: more BR2_ / CONFIG_ patches git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3784 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/pptp/Config.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'package/pptp') diff --git a/package/pptp/Config.in b/package/pptp/Config.in index 88da23748..425473a05 100644 --- a/package/pptp/Config.in +++ b/package/pptp/Config.in @@ -1,9 +1,9 @@ -config BR2_PACKAGE_PPTP +config PACKAGE_PPTP prompt "pptp.............................. PPTP (Point-to-Point Tunneling Protocol) client" tristate - default m if CONFIG_DEVEL - select BR2_PACKAGE_KMOD_GRE - select BR2_PACKAGE_PPP + default m if DEVEL + select PACKAGE_KMOD_GRE + select PACKAGE_PPP help A Point-to-Point Tunneling Protocol Client -- cgit v1.2.3 From 3830e0d317c429f3770f6c36977cb6984d102602 Mon Sep 17 00:00:00 2001 From: nico Date: Wed, 24 May 2006 09:50:24 +0000 Subject: sync pptp with trunk, remove Config.in and ipkg not needed anymore. git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3828 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/pptp/Config.in | 11 ----------- package/pptp/files/ifup.pptp | 2 +- package/pptp/ipkg/pptp.conffiles | 1 - package/pptp/ipkg/pptp.control | 5 ----- 4 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 package/pptp/Config.in delete mode 100644 package/pptp/ipkg/pptp.conffiles delete mode 100644 package/pptp/ipkg/pptp.control (limited to 'package/pptp') diff --git a/package/pptp/Config.in b/package/pptp/Config.in deleted file mode 100644 index 425473a05..000000000 --- a/package/pptp/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config PACKAGE_PPTP - prompt "pptp.............................. PPTP (Point-to-Point Tunneling Protocol) client" - tristate - default m if DEVEL - select PACKAGE_KMOD_GRE - select PACKAGE_PPP - help - A Point-to-Point Tunneling Protocol Client - - http://pptpclient.sourceforge.net/ - diff --git a/package/pptp/files/ifup.pptp b/package/pptp/files/ifup.pptp index a9bc579b5..f401a36b2 100644 --- a/package/pptp/files/ifup.pptp +++ b/package/pptp/files/ifup.pptp @@ -9,7 +9,7 @@ eval "proto=\"\${${type}_proto}\"" exit } -[ -d "/var/lock" ] || mkdir -p /var/lock || exit 1 +mkdir -p /var/lock for module in slhc ppp_generic ppp_async ip_gre; do /sbin/insmod $module 2>&- >&- diff --git a/package/pptp/ipkg/pptp.conffiles b/package/pptp/ipkg/pptp.conffiles deleted file mode 100644 index 136db31f1..000000000 --- a/package/pptp/ipkg/pptp.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/ppp/options.pptp \ No newline at end of file diff --git a/package/pptp/ipkg/pptp.control b/package/pptp/ipkg/pptp.control deleted file mode 100644 index e582c6221..000000000 --- a/package/pptp/ipkg/pptp.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: pptp -Priority: optional -Section: net -Description: a Point-to-Point Tunneling Protocol (PPTP) client -Depends: ppp, kmod-gre -- cgit v1.2.3 From 4e00d98efdec5bb2e6e19eccf85fcf9a0eecb646 Mon Sep 17 00:00:00 2001 From: nico Date: Sun, 18 Jun 2006 18:30:40 +0000 Subject: normalize Makefiles. git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3998 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/pptp/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'package/pptp') diff --git a/package/pptp/Makefile b/package/pptp/Makefile index 776a66864..08cb43a7c 100644 --- a/package/pptp/Makefile +++ b/package/pptp/Makefile @@ -23,11 +23,11 @@ URL:=http://pptpclient.sourceforge.net/ endef define Package/pptp/install - install -d -m0755 $(1)/sbin install -d -m0755 $(1)/etc/ppp - install -d -m0755 $(1)/usr/sbin - install -m0755 ./files/ifup.pptp $(1)/sbin/ifup.pptp install -m0644 ./files/options.pptp $(1)/etc/ppp/ + install -d -m0755 $(1)/sbin + install -m0755 ./files/ifup.pptp $(1)/sbin/ + install -d -m0755 $(1)/usr/sbin install -m0755 $(PKG_BUILD_DIR)/pptp $(1)/usr/sbin/ endef -- cgit v1.2.3 From 859e8f7f7d8bfbefd610d338d16498190cd51e15 Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 21 Jun 2006 02:16:37 +0000 Subject: build system cleanup. move shared include files into $(TOPDIR)/include, move lzma, mkfs.* into toolchain/ git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4032 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/pptp/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/pptp') diff --git a/package/pptp/Makefile b/package/pptp/Makefile index 08cb43a7c..6d01ce19f 100644 --- a/package/pptp/Makefile +++ b/package/pptp/Makefile @@ -12,7 +12,7 @@ PKG_SOURCE_URL:=@SF/pptpclient PKG_MD5SUM:=9a706327fb9827541d7c86d48ceb9631 PKG_CAT:=zcat -include $(TOPDIR)/package/rules.mk +include $(TOPDIR)/include/package.mk define Package/pptp SECTION:=base -- cgit v1.2.3 From 0b0afa4d818ec18187b09055fbb8d84a01590d6e Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 21 Jun 2006 02:32:39 +0000 Subject: add INCLUDE_DIR variable for $(TOPDIR)/include git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4033 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/pptp/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/pptp') diff --git a/package/pptp/Makefile b/package/pptp/Makefile index 6d01ce19f..0478b4c2b 100644 --- a/package/pptp/Makefile +++ b/package/pptp/Makefile @@ -12,7 +12,7 @@ PKG_SOURCE_URL:=@SF/pptpclient PKG_MD5SUM:=9a706327fb9827541d7c86d48ceb9631 PKG_CAT:=zcat -include $(TOPDIR)/include/package.mk +include $(INCLUDE_DIR)/package.mk define Package/pptp SECTION:=base -- cgit v1.2.3 From 02cdebbb91a33d8e24da1c94a9d93ac39be168a7 Mon Sep 17 00:00:00 2001 From: mbm Date: Tue, 27 Jun 2006 00:35:46 +0000 Subject: credit where credit is due git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4091 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/pptp/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'package/pptp') diff --git a/package/pptp/Makefile b/package/pptp/Makefile index 0478b4c2b..061e55395 100644 --- a/package/pptp/Makefile +++ b/package/pptp/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# # $Id$ include $(TOPDIR)/rules.mk -- cgit v1.2.3 From c4f3575368c5aeef4134d82125df2814d688cc2a Mon Sep 17 00:00:00 2001 From: nbd Date: Sun, 30 Jul 2006 03:09:09 +0000 Subject: rewrite of the network scripts and configuration git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4323 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/pptp/Makefile | 4 ++-- package/pptp/files/ifup.pptp | 45 -------------------------------------------- package/pptp/files/pptp.sh | 22 ++++++++++++++++++++++ 3 files changed, 24 insertions(+), 47 deletions(-) delete mode 100644 package/pptp/files/ifup.pptp create mode 100644 package/pptp/files/pptp.sh (limited to 'package/pptp') diff --git a/package/pptp/Makefile b/package/pptp/Makefile index 061e55395..b060c12a7 100644 --- a/package/pptp/Makefile +++ b/package/pptp/Makefile @@ -31,8 +31,8 @@ endef define Package/pptp/install install -d -m0755 $(1)/etc/ppp install -m0644 ./files/options.pptp $(1)/etc/ppp/ - install -d -m0755 $(1)/sbin - install -m0755 ./files/ifup.pptp $(1)/sbin/ + install -d -m0755 $(1)/lib/network + install -m0755 ./files/pptp.sh $(1)/lib/network/ install -d -m0755 $(1)/usr/sbin install -m0755 $(PKG_BUILD_DIR)/pptp $(1)/usr/sbin/ endef diff --git a/package/pptp/files/ifup.pptp b/package/pptp/files/ifup.pptp deleted file mode 100644 index f401a36b2..000000000 --- a/package/pptp/files/ifup.pptp +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh -[ $# = 0 ] && { echo " $0 "; exit; } -. /etc/config/network -type=$1 - -eval "proto=\"\${${type}_proto}\"" -[ "$proto" = "pptp" ] || { - echo "$0: ${type}_proto isn't pptp" - exit -} - -mkdir -p /var/lock - -for module in slhc ppp_generic ppp_async ip_gre; do - /sbin/insmod $module 2>&- >&- -done - -KEEPALIVE=${ppp_redialperiod:+lcp-echo-interval $ppp_redialperiod lcp-echo-failure 5} -case "$ppp_demand" in - on|1|enabled) - DEMAND=${ppp_idletime:+demand idle $ppp_idletime} - [ -f /etc/ppp/filter ] && DEMAND=${DEMAND:+precompiled-active-filter /etc/ppp/filter $DEMAND} - ;; - *) DEMAND="persist";; -esac -MTU=${ppp_mtu:-1452} - -[ "$pptp_proto" = "static" ] || pptp_proto="dhcp" -do_ifup $pptp_proto $type - -/usr/sbin/pppd \ - pty "/usr/sbin/pptp $pptp_server_ip --loglevel 0 --nolaunchpppd" \ - file /etc/ppp/options.pptp \ - connect /bin/true \ - usepeerdns \ - defaultroute \ - replacedefaultroute \ - linkname "$type" \ - ipparam "$type" \ - user "$ppp_username" \ - password "$ppp_passwd" \ - mtu $MTU mru $MTU \ - $DEMAND \ - $KEEPALIVE - diff --git a/package/pptp/files/pptp.sh b/package/pptp/files/pptp.sh new file mode 100644 index 000000000..784780204 --- /dev/null +++ b/package/pptp/files/pptp.sh @@ -0,0 +1,22 @@ +scan_pppoe() { + scan_ppp "$@" +} + +setup_interface_pppoe() { + local iface="$1" + local config="$2" + + config_get device "$config" device + + for module in slhc ppp_generic ppp_async ip_gre; do + /sbin/insmod $module 2>&- >&- + done + setup_interface "$iface" "$config" "dhcp" + + config_get mtu "$cfg" mtu + mtu=${mtu:-1452} + start_pppd "$config" \ + plugin rp-pppoe.so \ + mtu $mtu mru $mtu \ + "nic-$device" +} -- cgit v1.2.3 From a52f52f7d0a39870f5b62e5f1f4d7af215434919 Mon Sep 17 00:00:00 2001 From: florian Date: Tue, 22 Aug 2006 12:05:58 +0000 Subject: Add maxfail option to avoid pptp giving up, closes #663 git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4624 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/pptp/files/options.pptp | 1 + 1 file changed, 1 insertion(+) (limited to 'package/pptp') diff --git a/package/pptp/files/options.pptp b/package/pptp/files/options.pptp index c520de74b..5332445e7 100644 --- a/package/pptp/files/options.pptp +++ b/package/pptp/files/options.pptp @@ -4,3 +4,4 @@ nobsdcomp nodeflate idle 0 defaultroute +maxfail 0 -- cgit v1.2.3 From acbb40d7e1d8af5d0e06fc553c237404443c3df8 Mon Sep 17 00:00:00 2001 From: nico Date: Sat, 23 Sep 2006 13:29:15 +0000 Subject: standardize Makefile, change section from base to net git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4814 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/pptp/Makefile | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'package/pptp') diff --git a/package/pptp/Makefile b/package/pptp/Makefile index b060c12a7..b32ab0627 100644 --- a/package/pptp/Makefile +++ b/package/pptp/Makefile @@ -21,20 +21,21 @@ PKG_CAT:=zcat include $(INCLUDE_DIR)/package.mk define Package/pptp -SECTION:=base -# CATEGORY:=FIXME -TITLE:=PPTP (Point-to-Point Tunneling Protocol) client -DESCRIPTION:=A Point-to-Point Tunneling Protocol Client -URL:=http://pptpclient.sourceforge.net/ + SECTION:=net + CATEGORY:=Network + TITLE:=PPTP client + DESCRIPTION:=\ + This package contains a PPTP (Point-to-Point Tunneling Protocol) client. + URL:=http://pptpclient.sourceforge.net/ endef define Package/pptp/install + install -d -m0755 $(1)/usr/sbin + install -m0755 $(PKG_BUILD_DIR)/pptp $(1)/usr/sbin/ install -d -m0755 $(1)/etc/ppp install -m0644 ./files/options.pptp $(1)/etc/ppp/ install -d -m0755 $(1)/lib/network install -m0755 ./files/pptp.sh $(1)/lib/network/ - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/pptp $(1)/usr/sbin/ endef $(eval $(call BuildPackage,pptp)) -- cgit v1.2.3 From 89c0b40c57f9de26cf5d4e2d5167bfd294aa1e83 Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 23 Sep 2006 18:01:51 +0000 Subject: add fixes for the pptp network scripts git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4835 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/pptp/files/pptp.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'package/pptp') diff --git a/package/pptp/files/pptp.sh b/package/pptp/files/pptp.sh index 784780204..fffa625a2 100644 --- a/package/pptp/files/pptp.sh +++ b/package/pptp/files/pptp.sh @@ -1,8 +1,8 @@ -scan_pppoe() { +scan_pptp() { scan_ppp "$@" } -setup_interface_pppoe() { +setup_interface_pptp() { local iface="$1" local config="$2" @@ -14,9 +14,10 @@ setup_interface_pppoe() { setup_interface "$iface" "$config" "dhcp" config_get mtu "$cfg" mtu + config_get server "$cfg" server mtu=${mtu:-1452} start_pppd "$config" \ - plugin rp-pppoe.so \ - mtu $mtu mru $mtu \ - "nic-$device" + pty "/usr/sbin/pptp $server --loglevel 0 --nolaunchpppd" + file /etc/ppp/options.pptp + mtu $mtu mru $mtu } -- cgit v1.2.3 From 8afb23270d23db6a033ba8fb77e1cf1a1d925a7c Mon Sep 17 00:00:00 2001 From: nico Date: Sun, 24 Sep 2006 20:49:31 +0000 Subject: new (last?) attempt at standardizing Makefiles git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4855 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/pptp/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'package/pptp') diff --git a/package/pptp/Makefile b/package/pptp/Makefile index b32ab0627..bb0710419 100644 --- a/package/pptp/Makefile +++ b/package/pptp/Makefile @@ -12,12 +12,13 @@ PKG_NAME:=pptp PKG_VERSION:=1.6.0 PKG_RELEASE:=3 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/pptpclient PKG_MD5SUM:=9a706327fb9827541d7c86d48ceb9631 PKG_CAT:=zcat +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) + include $(INCLUDE_DIR)/package.mk define Package/pptp -- cgit v1.2.3