bring up to date with nbd's br2_test20.tar.bz2

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@308 3c298f89-4303-0410-b956-a3cf2f4a3e73

6 files changed, 120 insertions, 0 deletions

diff --git a/package/pptpd/Config.in b/package/pptpd/Config.in
new file mode 100644
index 0000000000..e713b18b02
--- /dev/null
+++ b/package/pptpd/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_PPTPD
+	tristate "PPTP Server"
+	default m
+	select BR2_PACKAGE_KMOD_GRE
+	select BR2_PACKAGE_PPP
+	help
+	  A Point-to-Point Tunneling Protocol Server 
diff --git a/package/pptpd/Makefile b/package/pptpd/Makefile
new file mode 100644
index 0000000000..dcd4e94bb3
--- /dev/null
+++ b/package/pptpd/Makefile
@@ -0,0 +1,70 @@
+#############################################################
+#
+# ebtables
+#
+#############################################################
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=pptpd
+PKG_VERSION:=1.2.3
+PKG_RELEASE:=1
+PKG_SOURCE_URL:=http://unc.dl.sourceforge.net/sourceforge/poptop
+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)/.configured: $(PKG_BUILD_DIR)/.unpacked
+	(cd $(PKG_BUILD_DIR) ; \
+	$(TARGET_CONFIGURE_OPTS) \
+	CFLAGS="$(TARGET_CFLAGS)" \
+	./configure \
+	  --target=$(GNU_TARGET_NAME) \
+	  --host=$(GNU_TARGET_NAME) \
+	  --build=$(GNU_HOST_NAME) \
+	  --prefix=/usr \
+	  --exec-prefix=/usr \
+	  --bindir=/usr/bin \
+	  --sbindir=/usr/sbin \
+	  --libexecdir=/usr/lib \
+	  --datadir=/usr/share \
+	  --infodir=/usr/share/info \
+	  --mandir=/usr/share/man \
+	  --localstatedir=/var \
+	  --sysconfdir=/etc \
+	  $(DISABLE_NLS) \
+	  --with-pppd-ip-alloc)
+	touch $(PKG_BUILD_DIR)/.configured
+
+$(PKG_BUILD_DIR)/$(PKG_NAME): $(PKG_BUILD_DIR)/.configured
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+	 CC=$(TARGET_CC) \
+	 CFLAGS="$(TARGET_CFLAGS) -DSBINDIR=\\\"/usr/sbin\\\"" \
+	 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)/pptpd $(PKG_IPK_DIR)/usr/sbin/
+	cp $(PKG_BUILD_DIR)/pptpctrl $(PKG_IPK_DIR)/usr/sbin/
+	$(STRIP) $(PKG_IPK_DIR)/usr/sbin/*
+	mkdir -p $(PACKAGE_DIR)
+	$(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR)
+
+source: $(DL_DIR)/$(PKG_SOURCE)
+prepare: $(PKG_BUILD_DIR)/.unpacked
+compile: $(PKG_IPK)
+install:
+	$(IPKG) install $(PKG_IPK)
+clean:
+	rm -rf $(PKG_BUILD_DIR)
+	rm -f $(PKG_IPK)
diff --git a/package/pptpd/ipkg/CONTROL/conffiles b/package/pptpd/ipkg/CONTROL/conffiles
new file mode 100644
index 0000000000..34a387ba43
--- /dev/null
+++ b/package/pptpd/ipkg/CONTROL/conffiles
@@ -0,0 +1,2 @@
+/etc/ppp/pptp-server-options
+/etc/pptpd.conf
diff --git a/package/pptpd/ipkg/etc/ppp/pptp-server-options b/package/pptpd/ipkg/etc/ppp/pptp-server-options
new file mode 100644
index 0000000000..cca8027dbb
--- /dev/null
+++ b/package/pptpd/ipkg/etc/ppp/pptp-server-options
@@ -0,0 +1,27 @@
+#debug
+#logfile /tmp/pptp-server.log
+172.16.1.1:
+auth
+name "pptp-server"
+lcp-echo-failure 3
+lcp-echo-interval 60
+default-asyncmap
+mtu 1482
+mru 1482
+nobsdcomp
+nodeflate
+#noproxyarp
+#nomppc
+nomppe-40
+nomppe-56
+nomppe-stateful
+require-mppe
+require-mppe-128
+require-mschap-v2
+refuse-chap
+refuse-mschap
+refuse-eap
+refuse-pap
+#ms-dns 172.16.1.1
+#plugin radius.so
+#radius-config-file /etc/radius.conf
diff --git a/package/pptpd/ipkg/etc/pptpd.conf b/package/pptpd/ipkg/etc/pptpd.conf
new file mode 100644
index 0000000000..e9ac115c79
--- /dev/null
+++ b/package/pptpd/ipkg/etc/pptpd.conf
@@ -0,0 +1,5 @@
+#debug
+option /etc/ppp/pptp-server-options
+speed 115200
+stimeout 10
+#localip & remoteip are not needed, ip management is done by pppd
diff --git a/package/pptpd/pptpd.control b/package/pptpd/pptpd.control
new file mode 100644
index 0000000000..3879d2ec40
--- /dev/null
+++ b/package/pptpd/pptpd.control
@@ -0,0 +1,9 @@
+Package: pptpd
+Priority: optional
+Section: net
+Version: 1.2.3-1
+Architecture: mipsel
+Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
+Source: buildroot internal
+Description: a Point-to-Point Tunneling Protocol (PPTP) server
+Depends: ppp, kmod-gre