From 7fc972d40dc286150feebe1f101ccf3d842b4e32 Mon Sep 17 00:00:00 2001
From: Jamie Lenehan <lenehan@twibble.org>
Date: Tue, 12 Jun 2007 23:59:01 +0000
Subject: 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.

---
 packages/poptop/poptop-1.3.4/.mtn2git_empty        |  0
 .../poptop/poptop-1.3.4/fix-plugins-install.patch  | 26 ++++++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 packages/poptop/poptop-1.3.4/.mtn2git_empty
 create mode 100644 packages/poptop/poptop-1.3.4/fix-plugins-install.patch

(limited to 'packages/poptop/poptop-1.3.4')

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
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)
-- 
cgit v1.2.3