summaryrefslogtreecommitdiff
path: root/net/poptop
diff options
context:
space:
mode:
authorNick Sayer <nsayer@FreeBSD.org>2002-09-08 17:39:44 +0000
committerNick Sayer <nsayer@FreeBSD.org>2002-09-08 17:39:44 +0000
commit62d793b81b02730f789ebf5ca49794eed5f3d500 (patch)
tree0ee3280a620e53edf19c9672dc6beda084eafc9b /net/poptop
parentIssue a warning if procfs is not mounted. This is a linuxism (diff)
Update to 1.1.3.
Submitted by: Mike Harding
Notes
Notes: svn path=/head/; revision=65843
Diffstat (limited to 'net/poptop')
-rw-r--r--net/poptop/Makefile10
-rw-r--r--net/poptop/distinfo2
-rw-r--r--net/poptop/files/patch-aa18
-rw-r--r--net/poptop/files/patch-ac2
-rw-r--r--net/poptop/files/patch-ae18
-rw-r--r--net/poptop/files/patch-af21
6 files changed, 42 insertions, 29 deletions
diff --git a/net/poptop/Makefile b/net/poptop/Makefile
index a12a519e8fb6..225a671ab7a7 100644
--- a/net/poptop/Makefile
+++ b/net/poptop/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= poptop
-PORTVERSION= 1.1.2
+PORTVERSION= 1.1.3
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= nsayer
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR= poptop
DISTNAME= pptpd-${PORTVERSION}
MAINTAINER= nsayer@freebsd.org
@@ -20,6 +20,10 @@ CONFIGURE_ARGS= --with-bsdppp
MAN5= pptpd.conf.5
MAN8= pptpd.8 pptpctrl.8
+pre-patch:
+ ${RM} ${WRKSRC}/config.cache
+ ${CP} ${WRKSRC}/our_getopt.h ${WRKSRC}/getopt.h
+
post-install:
${INSTALL_DATA} ${WRKSRC}/samples/pptpd.conf \
${PREFIX}/etc/pptpd.conf.sample
diff --git a/net/poptop/distinfo b/net/poptop/distinfo
index 9cdcb50209a5..5f86e62c13e5 100644
--- a/net/poptop/distinfo
+++ b/net/poptop/distinfo
@@ -1 +1 @@
-MD5 (pptpd-1.1.2.tar.gz) = 03f7106c6fd7f22bd904b5c66aedbe92
+MD5 (pptpd-1.1.3.tar.gz) = 1f2d75829883a375b43abcc3e39dcf62
diff --git a/net/poptop/files/patch-aa b/net/poptop/files/patch-aa
index 6ff97a4bedbd..adf68bc67653 100644
--- a/net/poptop/files/patch-aa
+++ b/net/poptop/files/patch-aa
@@ -1,11 +1,17 @@
---- defaults.h.orig Wed Sep 22 17:01:28 1999
-+++ defaults.h Tue Oct 5 19:24:12 1999
-@@ -40,7 +40,7 @@
+--- defaults.h.orig Thu Mar 7 19:09:42 2002
++++ defaults.h Sun Sep 8 10:19:58 2002
+@@ -40,10 +40,14 @@
#endif
#define PPP_SPEED_DEFAULT "115200"
--#define PPTPD_CONFIG_FILE_DEFAULT "/etc/pptpd.conf"
-+#define PPTPD_CONFIG_FILE_DEFAULT ETCDIR "/pptpd.conf"
++#ifdef __FreeBSD__
++#define PPTPD_CONFIG_FILE_DEFAULT ETCDIR "pptpd.conf"
++#else
+ #if EMBED
+ #define PPTPD_CONFIG_FILE_DEFAULT "/etc/config/pptpd.conf"
+ #else
+ #define PPTPD_CONFIG_FILE_DEFAULT "/etc/pptpd.conf"
++#endif
+ #endif
#define PIDFILE_DEFAULT "/var/run/pptpd.pid"
- /* Location of binaries */
diff --git a/net/poptop/files/patch-ac b/net/poptop/files/patch-ac
index a9b45647da22..92fb9cf37021 100644
--- a/net/poptop/files/patch-ac
+++ b/net/poptop/files/patch-ac
@@ -5,7 +5,7 @@
## -Wmissing-prototypes removed (eg, Linux 2.2.6 headers
## aren't up to it).
-CFLAGS = -O2 -fno-builtin -Wall -ansi -DSBINDIR='"$(sbindir)"'
-+CFLAGS+= -DSBINDIR='"$(sbindir)"' -DETCDIR='"$(sysconfdir)'"
++CFLAGS+= -DSBINDIR='"$(sbindir)"' -DETCDIR='"$(sysconfdir)"'
#CFLAGS = -O2 -fno-builtin -Wall -ansi -pedantic -Wmissing-prototypes -Werror -DSBINDIR='"$(sbindir)"'
man_MANS = pptpctrl.8 pptpd.8 pptpd.conf.5
diff --git a/net/poptop/files/patch-ae b/net/poptop/files/patch-ae
deleted file mode 100644
index c0ab9ecc1129..000000000000
--- a/net/poptop/files/patch-ae
+++ /dev/null
@@ -1,18 +0,0 @@
---- pptpgre.c.orig Sat Sep 8 09:12:30 2001
-+++ pptpgre.c Sat Sep 8 09:13:11 2001
-@@ -114,6 +114,7 @@
- strerror (errno));
- }
-
-+#if 0
- /* Tell kernel we do not want headers with our IP packets. I was
- hoping this would eliminate the need to strip them from received
- packets, but instead it appears to only affect transmission.
-@@ -131,6 +132,7 @@
- syslog (LOG_ERR, "Couldn't set hdrincl to false");
- }
- }
-+#endif
-
- gre->pty_fd = pty_fd;
- gre->call_id_pair = call_id_pair; /* network byte order */
diff --git a/net/poptop/files/patch-af b/net/poptop/files/patch-af
new file mode 100644
index 000000000000..a5a4ddbde183
--- /dev/null
+++ b/net/poptop/files/patch-af
@@ -0,0 +1,21 @@
+--- pptpmanager.c.orig Sun Sep 8 10:35:53 2002
++++ pptpmanager.c Sun Sep 8 10:36:05 2002
+@@ -72,15 +72,15 @@
+ char pppLocal[16];
+ };
+
+-/* option for timeout on starting ctrl connection */
+-int pptp_stimeout = STIMEOUT_DEFAULT;
+-
+ /* global for signal handler */
+ static struct callArray clientArray[MAX_CONNECTIONS];
+
+ /* from IP parser */
+ extern int maxConnections;
+ #endif
++
++/* option for timeout on starting ctrl connection */
++int pptp_stimeout = STIMEOUT_DEFAULT;
+
+ /* local function prototypes */
+ static void connectCall(int clientSocket, int clientNumber);