summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorJamie Lenehan <lenehan@twibble.org>2007-06-12 23:59:01 +0000
committerJamie Lenehan <lenehan@twibble.org>2007-06-12 23:59:01 +0000
commit7fc972d40dc286150feebe1f101ccf3d842b4e32 (patch)
treed6edfa7270549063fd5f9ba77f7d29164d2ef4c5 /packages
parent9f43275b770da93119a616b5ec9722f32e4b69b6 (diff)
poptop 1.3.4: Add 1.3.4 with some changes:
* Mark config files as such * Add an init script * Make bcrelay and the wtmp plugin available via seperate packages * Make the -doc package available.
Diffstat (limited to 'packages')
-rw-r--r--packages/poptop/files/.mtn2git_empty0
-rwxr-xr-xpackages/poptop/files/pptpd.init37
-rw-r--r--packages/poptop/poptop-1.3.4/.mtn2git_empty0
-rw-r--r--packages/poptop/poptop-1.3.4/fix-plugins-install.patch26
-rw-r--r--packages/poptop/poptop_1.3.4.bb40
5 files changed, 103 insertions, 0 deletions
diff --git a/packages/poptop/files/.mtn2git_empty b/packages/poptop/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/poptop/files/.mtn2git_empty
diff --git a/packages/poptop/files/pptpd.init b/packages/poptop/files/pptpd.init
new file mode 100755
index 0000000000..27786cd0c2
--- /dev/null
+++ b/packages/poptop/files/pptpd.init
@@ -0,0 +1,37 @@
+#! /bin/sh
+
+test -f /usr/sbin/pptpd || exit 0
+test -f /etc/default/pptpd && . /etc/default/pptpd
+
+case $1 in
+ start)
+ echo -n "Starting PPTP server: pptpd"
+ start-stop-daemon --start --quiet --pidfile /var/run/pptpd.pid \
+ --exec /usr/sbin/pptpd
+ echo "."
+ ;;
+ stop)
+ echo -n "Stopping PPTP server: pptpd"
+ start-stop-daemon --stop --quiet --pidfile /var/run/pptpd.pid \
+ --exec /usr/sbin/pptpd
+ echo "."
+ ;;
+ status)
+ pid=$(pidof pptpd)
+ if [ -n "$pid" ] ; then
+ echo "Running with pid $pid"
+ else
+ echo "Not running"
+ fi
+ ;;
+ restart|force-reload)
+ $0 stop
+ $0 start
+ ;;
+ *)
+ echo "Usage: /etc/init.d/pptpd {start|stop|restart|force-reload}"
+ exit 1
+ ;;
+esac
+
+exit 0
diff --git a/packages/poptop/poptop-1.3.4/.mtn2git_empty b/packages/poptop/poptop-1.3.4/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/poptop/poptop-1.3.4/.mtn2git_empty
diff --git a/packages/poptop/poptop-1.3.4/fix-plugins-install.patch b/packages/poptop/poptop-1.3.4/fix-plugins-install.patch
new file mode 100644
index 0000000000..8a02f7a5de
--- /dev/null
+++ b/packages/poptop/poptop-1.3.4/fix-plugins-install.patch
@@ -0,0 +1,26 @@
+Don't try and install as root.
+Always set LIBDIR to the include the DESTDIR, otherwise it uses the
+incorrect value set in the toplevel makefile.
+
+Index: pptpd-1.3.4/plugins/Makefile
+===================================================================
+--- pptpd-1.3.4.orig/plugins/Makefile 2006-08-03 12:02:01.000000000 +1000
++++ pptpd-1.3.4/plugins/Makefile 2007-06-09 11:42:57.000000000 +1000
+@@ -3,7 +3,7 @@
+ CFLAGS = $(COPTS) -I.. -I../../include -fPIC
+ LDFLAGS = -shared
+ LDADD = -lutil
+-INSTALL = install -o root
++INSTALL = install
+ prefix = /usr/local
+
+ PLUGINS = pptpd-logwtmp.so
+@@ -18,7 +18,7 @@
+ %.so: %.c
+ $(CC) -o $@ $(LDFLAGS) $(CFLAGS) $^ $(LDADD)
+
+-LIBDIR ?= $(DESTDIR)$(prefix)/lib/pptpd
++LIBDIR = $(DESTDIR)$(prefix)/lib/pptpd
+
+ install: $(PLUGINS)
+ $(INSTALL) -d $(LIBDIR)
diff --git a/packages/poptop/poptop_1.3.4.bb b/packages/poptop/poptop_1.3.4.bb
new file mode 100644
index 0000000000..9e4f31764f
--- /dev/null
+++ b/packages/poptop/poptop_1.3.4.bb
@@ -0,0 +1,40 @@
+DESCRIPTION = "Poptop is the PPTP server solution for Linux Using Poptop, \
+Linux servers can now function seamlessly in a PPTP VPN environment. This \
+enables administrators to leverage the considerable benefits of both \
+Microsoft and Linux operating systems The current release version supports \
+Windows 95/98/Me/NT/2000/XP PPTP clients and Linux PPTP clients"
+HOMEPAGE = "http://www.poptop.org/"
+SECTION = "network"
+LICENSE = "GPL"
+RDEPENDS_${PN} = "ppp"
+RDEPENDS_${PN}-logwtmp-plugin = "${PN}"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/poptop/pptpd-${PV}.tar.gz \
+ file://fix-plugins-install.patch;patch=1 \
+ file://pptpd.init"
+
+S = "${WORKDIR}/pptpd-${PV}"
+
+inherit autotools update-rc.d
+
+do_install_append() {
+ # Install init script
+ install -m 0755 -d ${D}${sysconfdir}/init.d
+ install -m 0755 ${WORKDIR}/pptpd.init ${D}${sysconfdir}/init.d/pptpd
+ # Install
+ install -d ${D}${sbindir} ${D}/${sysconfdir} ${D}/${sysconfdir}/ppp
+ install -m 0644 samples/options.pptpd ${D}/${sysconfdir}/ppp/
+ install -m 0644 samples/pptpd.conf ${D}/${sysconfdir}/
+}
+
+PACKAGES = "${PN}-dbg ${PN}-bcrelay ${PN}-logwtmp-plugin ${PN} ${PN}-doc"
+
+FILES_${PN}-bcrelay = "${sbindir}/bcrelay"
+FILES_${PN}-logwtmp-plugin = "${libdir}/pptpd/pptpd-logwtmp.so"
+
+CONFFILES_${PN} = "${sysconfdir}/pptpd.conf \
+ ${sysconfdir}/ppp/options.pptpd"
+
+INITSCRIPT_NAME = "pptpd"
+INITSCRIPT_PARAMS = "defaults 92 08"