network/pptpd: Rearranged $CWD - no functional changes

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

4 files changed, 66 insertions, 0 deletions

diff --git a/network/pptpd/patches/fix_plugins_patchlevel_h.diff b/network/pptpd/patches/fix_plugins_patchlevel_h.diff
new file mode 100644
index 000000000000..dbcf995f79db
--- /dev/null
+++ b/network/pptpd/patches/fix_plugins_patchlevel_h.diff
@@ -0,0 +1,11 @@
+diff -Nur pptpd-1.3.4.orig//plugins/patchlevel.h pptpd-1.3.4/plugins/patchlevel.h
+--- pptpd-1.3.4.orig//plugins/patchlevel.h	2005-02-23 19:25:34.000000000 -0600
++++ pptpd-1.3.4/plugins/patchlevel.h	2010-11-08 22:26:18.989688208 -0600
+@@ -1,5 +1,5 @@
+ /* upstream patchlevel.h,v 1.60 2004/01/13 04:46:52 paulus Exp */
+ /* $Id: patchlevel.h,v 1.4 2005/02/24 01:25:34 quozl Exp $ */
+ 
+-#define VERSION		"2.4.3"
+-#define DATE		"13 Jan 2004"
++#define VERSION		"2.4.5"
++#define DATE		"17 Nov 2009"
diff --git a/network/pptpd/patches/fix_pptpctrl_c_for_x86_64.diff b/network/pptpd/patches/fix_pptpctrl_c_for_x86_64.diff
new file mode 100644
index 000000000000..d2ebfa99b325
--- /dev/null
+++ b/network/pptpd/patches/fix_pptpctrl_c_for_x86_64.diff
@@ -0,0 +1,12 @@
+diff -Nur pptpd-1.3.4.orig//pptpctrl.c pptpd-1.3.4/pptpctrl.c
+--- pptpd-1.3.4.orig//pptpctrl.c	2006-12-07 18:01:40.000000000 -0600
++++ pptpd-1.3.4/pptpctrl.c	2010-11-08 22:29:50.111138505 -0600
+@@ -773,7 +773,7 @@
+ 
+         if (pptp_logwtmp) {
+                  pppd_argv[an++] = "plugin";
+-                 pppd_argv[an++] = "/usr/lib/pptpd/pptpd-logwtmp.so";
++                 pppd_argv[an++] = "/usr/lib64/pptpd/pptpd-logwtmp.so";
+                  pppd_argv[an++] = "pptpd-original-ip";
+                  pppd_argv[an++] = inet_ntoa(inetaddrs[1]);
+         }
diff --git a/network/pptpd/patches/plugins_Makefile.diff b/network/pptpd/patches/plugins_Makefile.diff
new file mode 100644
index 000000000000..52d4134a9003
--- /dev/null
+++ b/network/pptpd/patches/plugins_Makefile.diff
@@ -0,0 +1,30 @@
+--- pptpd-1.3.4/plugins/Makefile	2008-07-20 01:46:35.836374075 -0500
++++ pptpd-1.3.4/plugins/Makefile	2008-07-20 01:48:48.729656656 -0500
+@@ -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,14 +18,14 @@
+ %.so: %.c
+ 	$(CC) -o $@ $(LDFLAGS) $(CFLAGS) $^ $(LDADD)
+ 
+-LIBDIR	?= $(DESTDIR)$(prefix)/lib/pptpd
++LIBDIR	?= $(prefix)/@baselibdir@/pptpd
+ 
+ install: $(PLUGINS)
+-	$(INSTALL) -d $(LIBDIR)
+-	$(INSTALL) $? $(LIBDIR)
++	$(INSTALL) -d $(DESTDIR)/$(LIBDIR)
++	$(INSTALL) $? $(DESTDIR)/$(LIBDIR)
+ 
+ uninstall:
+-	rm -f $(LIBDIR)$(PLUGINS)
++	rm -f $(DESTDIR)/$(LIBDIR)$(PLUGINS)
+ 
+ clean:
+ 	rm -f *.o *.so *.a
diff --git a/network/pptpd/patches/pptpctl_fix.patch b/network/pptpd/patches/pptpctl_fix.patch
new file mode 100644
index 000000000000..86011c275e8a
--- /dev/null
+++ b/network/pptpd/patches/pptpctl_fix.patch
@@ -0,0 +1,13 @@
+diff -rupN pptpd-1.3.4/pptpctrl.c pptpd-1.3.4.new/pptpctrl.c
+--- pptpd-1.3.4/pptpctrl.c	2006-12-08 13:01:40.000000000 +1300
++++ pptpd-1.3.4.new/pptpctrl.c	2012-09-14 11:16:38.646659399 +1200
+@@ -759,8 +759,8 @@ static void launch_pppd(char **pppaddrs,
+ 			syslog(LOG_DEBUG, "CTRL (PPPD Launcher): remote address = %s", pppaddrs[1]);
+ 	}
+ 	
++	char pppInterfaceIPs[33];
+ 	if (*pppaddrs[0] || *pppaddrs[1]) {
+-		char pppInterfaceIPs[33];
+ 		sprintf(pppInterfaceIPs, "%s:%s", pppaddrs[0], pppaddrs[1]);
+ 		pppd_argv[an++] = pppInterfaceIPs;
+ 	}