network/pptpd: Updated for version 1.4.0.

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

6 files changed, 16 insertions, 31 deletions

diff --git a/network/pptpd/patches/fix_plugins_patchlevel_h.diff b/network/pptpd/patches/fix_plugins_patchlevel_h.diff
index dbcf995f79..cc02ad767a 100644
--- a/network/pptpd/patches/fix_plugins_patchlevel_h.diff
+++ b/network/pptpd/patches/fix_plugins_patchlevel_h.diff
@@ -1,6 +1,6 @@
-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
+diff -Nur pptpd-1.4.0.orig/plugins/patchlevel.h pptpd-1.4.0/plugins/patchlevel.h
+--- pptpd-1.4.0.orig/plugins/patchlevel.h	2013-02-18 16:05:46.000000000 -0600
++++ pptpd-1.4.0/plugins/patchlevel.h	2016-01-10 23:24:22.095247474 -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 $ */
diff --git a/network/pptpd/patches/fix_pptpctrl_c_for_x86_64.diff b/network/pptpd/patches/fix_pptpctrl_c_for_x86_64.diff
index d2ebfa99b3..b70bb73369 100644
--- a/network/pptpd/patches/fix_pptpctrl_c_for_x86_64.diff
+++ b/network/pptpd/patches/fix_pptpctrl_c_for_x86_64.diff
@@ -1,7 +1,7 @@
-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 @@
+diff -Nur pptpd-1.4.0.orig/pptpctrl.c pptpd-1.4.0/pptpctrl.c
+--- pptpd-1.4.0.orig/pptpctrl.c	2013-10-22 23:53:19.000000000 -0500
++++ pptpd-1.4.0/pptpctrl.c	2016-01-10 23:26:25.182409723 -0600
+@@ -786,7 +786,7 @@
  
          if (pptp_logwtmp) {
                   pppd_argv[an++] = "plugin";
diff --git a/network/pptpd/patches/plugins_Makefile.diff b/network/pptpd/patches/plugins_Makefile.diff
index 52d4134a90..9275a340b7 100644
--- a/network/pptpd/patches/plugins_Makefile.diff
+++ b/network/pptpd/patches/plugins_Makefile.diff
@@ -1,5 +1,6 @@
---- 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
+diff -Nur pptpd-1.4.0.orig/plugins/Makefile pptpd-1.4.0/plugins/Makefile
+--- pptpd-1.4.0.orig/plugins/Makefile	2013-02-18 16:05:46.000000000 -0600
++++ pptpd-1.4.0/plugins/Makefile	2016-01-10 23:23:06.816535697 -0600
 @@ -3,7 +3,7 @@
  CFLAGS	= $(COPTS) -I.. -I../../include -fPIC
  LDFLAGS	= -shared
diff --git a/network/pptpd/patches/pptpctl_fix.patch b/network/pptpd/patches/pptpctl_fix.patch
deleted file mode 100644
index 86011c275e..0000000000
--- a/network/pptpd/patches/pptpctl_fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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;
- 	}
diff --git a/network/pptpd/pptpd.SlackBuild b/network/pptpd/pptpd.SlackBuild
index bd4e5040b6..9b1bc16774 100644
--- a/network/pptpd/pptpd.SlackBuild
+++ b/network/pptpd/pptpd.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pptpd
 
-# Copyright 2007-2012  Robby Workman, Northport, Alabama, USA
+# Copyright 2007-2016  Robby Workman, Tuscaloosa, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pptpd
-VERSION=${VERSION:-1.3.4}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-1.4.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -79,9 +79,6 @@ patch -p1 < $CWD/patches/fix_plugins_patchlevel_h.diff
 # Fix hardcoded /usr/lib/pptpd/ in pptpctrl.c if ARCH=x86_64
 [ "$ARCH" = "x86_64" ] && patch -p1 < $CWD/patches/fix_pptpctrl_c_for_x86_64.diff
 
-# Thanks to Swaz for the patch to fix an invalid declaration of pppInterfaceIPs
-patch -p1 < $CWD/patches/pptpctl_fix.patch
-
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
diff --git a/network/pptpd/pptpd.info b/network/pptpd/pptpd.info
index cc73ed9085..a3b7583ec1 100644
--- a/network/pptpd/pptpd.info
+++ b/network/pptpd/pptpd.info
@@ -1,8 +1,8 @@
 PRGNAM="pptpd"
-VERSION="1.3.4"
+VERSION="1.4.0"
 HOMEPAGE="http://poptop.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/poptop/pptpd-1.3.4.tar.gz"
-MD5SUM="b38df9c431041922c997c1148bedf591"
+DOWNLOAD="http://downloads.sourceforge.net/poptop/pptpd-1.4.0.tar.gz"
+MD5SUM="36f9f45c6ffa92bc3b6e24ae2d053505"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""