Attachment #80200 for bug #115073

View | Details | Raw Unified | Return to bug 115073
Collapse All | Expand All

Lines 7-12 Link Here

(-)/disk/3/home/nivo/ports/poptop/Makefile (+2 lines)
7		7
8	PORTNAME= poptop	8	PORTNAME= poptop
9	PORTVERSION= 1.3.4	9	PORTVERSION= 1.3.4
		10	PORTREVISION= 1
10	CATEGORIES= net	11	CATEGORIES= net
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= ${PORTNAME}	13	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 17-22 Link Here
17		18
18	USE_GMAKE= yes	19	USE_GMAKE= yes
19	GNU_CONFIGURE= yes	20	GNU_CONFIGURE= yes
		21	CONFIGURE_ARGS= --mandir=${MANPREFIX}/man
20	MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \	22	MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
21	AUTOHEADER="${TRUE}"	23	AUTOHEADER="${TRUE}"
22		24




--- pptpctrl.c.orig	Fri Dec  8 01:01:40 2006
+++ pptpctrl.c	Tue Jul 31 07:56:19 2007
@@ -150,8 +150,13 @@
 			syslog(LOG_DEBUG, "CTRL: remote address = %s", pppRemote);
 		if (*speed)
 			syslog(LOG_DEBUG, "CTRL: pppd speed = %s", speed);
+#if BSDUSER_PPP
+		if (*pppdxfig)
+			syslog(LOG_DEBUG, "CTRL: BSD userland ppp system label = %s", pppdxfig);
+#else
 		if (*pppdxfig)
 			syslog(LOG_DEBUG, "CTRL: pppd options file = %s", pppdxfig);
+#endif
 	}
 
 	addrlen = sizeof(addr);
@@ -693,14 +698,19 @@
 
 	/* options for BSDUSER_PPP
 	 *
-	 * ignores IP addresses, config file option, speed
-	 * fix usage info in pptpd.c and configure script if this changes
+	 * Ignore IP addresses and line speed
+	 * Use -o or --option string as PPP system label
+	 * Usage info in pptpd.c and configure script have been updated to
+	 * reflect this change
 	 *
 	 * IP addresses can be specified in /etc/ppp/ppp.secret per user
 	 */
 	pppd_argv[an++] = "-direct";
-	pppd_argv[an++] = "pptp";	/* XXX this is the system name */
-	/* should be dynamic - PMG */
+	if (*pppdxfig) {
+		pppd_argv[an++] = pppdxfig;
+	} else {
+		pppd_argv[an++] = "pptp";       /* XXX this is the system label */
+	}
 
 #elif SLIRP
 
@@ -764,7 +774,6 @@
 		sprintf(pppInterfaceIPs, "%s:%s", pppaddrs[0], pppaddrs[1]);
 		pppd_argv[an++] = pppInterfaceIPs;
 	}
-#endif
 
         if (!noipparam) {
                  pppd_argv[an++] = "ipparam";
@@ -773,10 +782,12 @@
 
         if (pptp_logwtmp) {
                  pppd_argv[an++] = "plugin";
-                 pppd_argv[an++] = "/usr/lib/pptpd/pptpd-logwtmp.so";

                  pppd_argv[an++] = "pptpd-original-ip";
                  pppd_argv[an++] = inet_ntoa(inetaddrs[1]);
         }
+
+#endif
 
 	/* argv arrays must always be NULL terminated */
 	pppd_argv[an++] = NULL;

Lines 1-6 Link Here

(-)/disk/3/home/nivo/ports/poptop/files/patch-pptpd.c (-4 / +30 lines)
1	--- pptpd.c.orig Fri Oct 21 12:10:41 2005	1	--- pptpd.c.orig Tue Sep 5 01:17:25 2006
2	+++ pptpd.c Fri Oct 21 12:12:30 2005	2	+++ pptpd.c Tue Jul 31 08:19:38 2007
3	@@ -109,13 +109,13 @@	3	@@ -98,18 +98,21 @@
		4	printf(" [-i] [--noipparam] Suppress the passing of the client's IP address\n");
		5	printf(" to PPP, which is done by default otherwise.\n");
		6	printf(" [-l] [--listen x.x.x.x] Specifies IP of local interface to listen to.\n");
		7	-#if !defined(BSDUSER_PPP)
		8	+#ifdef BSDUSER_PPP
		9	+ printf(" [-o] [--option file] Specifies the userland PPP system label to use\n");
		10	+ printf(" (default is pptp).\n");
		11	+#else
		12	printf(" [-o] [--option file] Specifies the PPP options file to use\n");
4	printf(" (default is /etc/ppp/options).\n");	13	printf(" (default is /etc/ppp/options).\n");
5	#endif	14	#endif
6	printf(" [-p] [--pidfile file] Specifies the file to write the process ID to\n");	15	printf(" [-p] [--pidfile file] Specifies the file to write the process ID to\n");
Lines 16-19 Link Here
16	+ printf(" (default is %s).\n",STIMEOUT_DEFAULT);	25	+ printf(" (default is %s).\n",STIMEOUT_DEFAULT);
17	printf(" [-v] [--version] Displays the pptpd version number.\n");	26	printf(" [-v] [--version] Displays the pptpd version number.\n");
18	printf(" [-w] [--logwtmp] Update wtmp as users login.\n");	27	printf(" [-w] [--logwtmp] Update wtmp as users login.\n");
19		28	printf(" [-C] [--connections n] Limit on number of connections.\n");
		29	@@ -375,11 +378,16 @@
		30	return 1;
		31	}
		32	/* check that the PPP options file is readable */
		33	+ /* If -o or --option is being used to specify BSD userland
		34	+ PPP system label, it makes no sense to check the option string to
		35	+ see if it is the name of a readable file. */
		36	+#if !defined(BSDUSER_PPP)
		37	if (pppdoptstr && access(pppdoptstr, R_OK) < 0) {
		38	syslog(LOG_ERR, "MGR: PPP options file %s not readable",
		39	pppdoptstr);
		40	return 1;
		41	}
		42	+#endif
		43	#ifdef BCRELAY
		44	/* check that the bcrelay binary is executable */
		45	if (bcrelay && access(BCRELAY_BIN, X_OK) < 0) {

Return to bug 115073

Lines 1-15 Link Here

(-)/disk/3/home/nivo/ports/poptop/files/patch-pptpctrl.c (-7 / +46 lines)
1	--- pptpctrl.c.orig Mon Jan 24 23:04:13 2005	1	--- pptpctrl.c.orig Fri Dec 8 01:01:40 2006
2	+++ pptpctrl.c Sat May 6 12:48:55 2006	2	+++ pptpctrl.c Tue Jul 31 07:56:19 2007
3	@@ -742,7 +742,6 @@	3	@@ -150,8 +150,13 @@
		4	syslog(LOG_DEBUG, "CTRL: remote address = %s", pppRemote);
		5	if (*speed)
		6	syslog(LOG_DEBUG, "CTRL: pppd speed = %s", speed);
		7	+#if BSDUSER_PPP
		8	+ if (*pppdxfig)
		9	+ syslog(LOG_DEBUG, "CTRL: BSD userland ppp system label = %s", pppdxfig);
		10	+#else
		11	if (*pppdxfig)
		12	syslog(LOG_DEBUG, "CTRL: pppd options file = %s", pppdxfig);
		13	+#endif
		14	}
		15
		16	addrlen = sizeof(addr);
		17	@@ -693,14 +698,19 @@
		18
		19	/* options for BSDUSER_PPP
		20	*
		21	- * ignores IP addresses, config file option, speed
		22	- * fix usage info in pptpd.c and configure script if this changes
		23	+ * Ignore IP addresses and line speed
		24	+ * Use -o or --option string as PPP system label
		25	+ * Usage info in pptpd.c and configure script have been updated to
		26	+ * reflect this change
		27	*
		28	* IP addresses can be specified in /etc/ppp/ppp.secret per user
		29	*/
		30	pppd_argv[an++] = "-direct";
		31	- pppd_argv[an++] = "pptp"; /* XXX this is the system name */
		32	- /* should be dynamic - PMG */
		33	+ if (*pppdxfig) {
		34	+ pppd_argv[an++] = pppdxfig;
		35	+ } else {
		36	+ pppd_argv[an++] = "pptp"; /* XXX this is the system label */
		37	+ }
		38
		39	#elif SLIRP
		40
		41	@@ -764,7 +774,6 @@
4	sprintf(pppInterfaceIPs, "%s:%s", pppaddrs[0], pppaddrs[1]);	42	sprintf(pppInterfaceIPs, "%s:%s", pppaddrs[0], pppaddrs[1]);
5	pppd_argv[an++] = pppInterfaceIPs;	43	pppd_argv[an++] = pppInterfaceIPs;
6	}	44	}
7	-#endif	45	-#endif
8		46
9	if (!noipparam) {	47	if (!noipparam) {
10	pppd_argv[an++] = "ipparam";	48	pppd_argv[an++] = "ipparam";
11	@@ -751,10 +750,11 @@	49	@@ -773,10 +782,12 @@
12		50
13	if (pptp_logwtmp) {	51	if (pptp_logwtmp) {
14	pppd_argv[an++] = "plugin";	52	pppd_argv[an++] = "plugin";
15	- pppd_argv[an++] = "/usr/lib/pptpd/pptpd-logwtmp.so";	53	- pppd_argv[an++] = "/usr/lib/pptpd/pptpd-logwtmp.so";
Lines 17-23 Link Here
17	pppd_argv[an++] = "pptpd-original-ip";	55	pppd_argv[an++] = "pptpd-original-ip";
18	pppd_argv[an++] = inet_ntoa(inetaddrs[1]);	56	pppd_argv[an++] = inet_ntoa(inetaddrs[1]);
19	}	57	}
		58	+
20	+#endif	59	+#endif
21		60
22	/* argv arrays must always be NULL terminated */	61	/* argv arrays must always be NULL terminated */
23	pppd_argv[an++] = NULL;	62	pppd_argv[an++] = NULL;