mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-02 06:03:50 +00:00
Code Issues Releases Activity

Update to 1.1.3.

Browse Source 
Submitted by:	Mike Harding
This commit is contained in:
Nick Sayer 2002-09-08 17:39:44 +00:00
parent f2b32b838c
commit 62d793b81b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=65843
6 changed files with 42 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/poptop/Makefile
View File

@ -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

2
net/poptop/distinfo
View File

@ -1 +1 @@
MD5 (pptpd-1.1.2.tar.gz) = 03f7106c6fd7f22bd904b5c66aedbe92
MD5 (pptpd-1.1.3.tar.gz) = 1f2d75829883a375b43abcc3e39dcf62

18
net/poptop/files/patch-aa
View File

@ -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 */

2
net/poptop/files/patch-ac
View File

@ -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

18
net/poptop/files/patch-ae
View File

@ -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 */

21
net/poptop/files/patch-af Normal file
View File

@ -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);