Update to latest stable version, noipparam and logwtmp do not work on
*BSD and they have been disabled in development version.
Please use patch -E to apply this diff.
Tested @amd64 and @i386.
Cheers
Giovanni
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/poptop/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile 8 Jan 2008 16:50:27 -0000 1.7
+++ Makefile 8 Oct 2008 07:34:28 -0000
@@ -2,8 +2,9 @@
COMMENT= PPTP Server
-PKGNAME= poptop-1.3.0
-DISTNAME= pptpd-1.3.0
+V=1.3.4
+DISTNAME= pptpd-$V
+PKGNAME= poptop-$V
CATEGORIES= net
HOMEPAGE= http://www.poptop.org/
@@ -20,11 +21,13 @@ WANTLIB= c util
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=poptop/}
CONFIGURE_STYLE= gnu
+CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
+ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -lintl -liconv"
CONFIGURE_ARGS+= --with-bsdppp --with-pppd-ip-alloc
-USE_GMAKE= yes
+FAKE_FLAGS= DESTDIR=
+USE_GMAKE= Yes
-post-patch:
- @perl -pi -e 's,/usr,${PREFIX},g' ${WRKSRC}/pptpctrl.c
+MODULES= devel/gettext
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/poptop
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/poptop/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 8 Jan 2008 16:50:27 -0000 1.5
+++ distinfo 8 Oct 2008 07:34:28 -0000
@@ -1,5 +1,5 @@
-MD5 (pptpd-1.3.0.tar.gz) = ddSU6IH3An9OYLEUFj9rZw==
-RMD160 (pptpd-1.3.0.tar.gz) = AbuXa1ZYnX/SZGU8OUq+PIg+BVs=
-SHA1 (pptpd-1.3.0.tar.gz) = mqEjRq+mB2UfFuHdffA1bXF7Y68=
-SHA256 (pptpd-1.3.0.tar.gz) = T2/k6wjKemnINlirE7I6d6oVPsGiZjWW3cu/NXaLDO4=
-SIZE (pptpd-1.3.0.tar.gz) = 204099
+MD5 (pptpd-1.3.4.tar.gz) = s435xDEEGSLJl8EUi+31kQ==
+RMD160 (pptpd-1.3.4.tar.gz) = HGx0i/noHSIwh5mO4MyoIYFNGfk=
+SHA1 (pptpd-1.3.4.tar.gz) = PR+vmQVeQguvqWyW6IcaiIxQtOg=
+SHA256 (pptpd-1.3.4.tar.gz) = wjqb3SGaCjaufKIOfJdJ8u/c2/EIqr7utQZrpELsiLY=
+SIZE (pptpd-1.3.4.tar.gz) = 240942
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/net/poptop/patches/patch-Makefile_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-Makefile_in
--- patches/patch-Makefile_in 8 Jan 2008 16:50:27 -0000 1.1
+++ patches/patch-Makefile_in 8 Oct 2008 07:34:28 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.1 2008/01/08 16:50:27 naddy Exp $
---- Makefile.in.orig Wed Aug 3 09:47:42 2005
-+++ Makefile.in Tue Jan 8 17:40:03 2008
-@@ -37,7 +37,7 @@ NORMAL_UNINSTALL = :
+--- Makefile.in.orig Mon Apr 16 03:10:27 2007
++++ Makefile.in Wed Oct 8 09:26:23 2008
+@@ -35,7 +35,7 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
EXTRA_PROGRAMS =
@@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile_in,v 1.1 2008/0
subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-@@ -77,8 +77,8 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES
+@@ -75,8 +75,8 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -21,7 +21,7 @@ $OpenBSD: patch-Makefile_in,v 1.1 2008/0
man5dir = $(mandir)/man5
man8dir = $(mandir)/man8
NROFF = nroff
-@@ -106,7 +106,7 @@ AUTOMAKE = @AUTOMAKE@
+@@ -104,7 +104,7 @@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -30,3 +30,25 @@ $OpenBSD: patch-Makefile_in,v 1.1 2008/0
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
+@@ -167,11 +167,11 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-mandir = @mandir@
++mandir = ${PREFIX}/man
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
+-prefix = @prefix@
++prefix = ${PREFIX}
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+ sbindir = @sbindir@
+@@ -213,7 +213,6 @@ pptpctrl_SOURCES = \
+ pptpd_LDADD = $(XTRALIBS_MGR)
+ pptpctrl_LDADD = $(XTRALIBS_CTRL)
+ bcrelay_SOURCES = bcrelay.c defaults.h our_syslog.h our_getopt.h
+-subdirs = plugins
+ all: config.h
+ $(MAKE) $(AM_MAKEFLAGS) all-am
+
Index: patches/patch-plugins_Makefile
===================================================================
RCS file: /cvs/ports/net/poptop/patches/patch-plugins_Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 patch-plugins_Makefile
--- patches/patch-plugins_Makefile 8 Jan 2008 16:50:27 -0000 1.1
+++ patches/patch-plugins_Makefile 8 Oct 2008 07:34:28 -0000
@@ -1,16 +1,17 @@
$OpenBSD: patch-plugins_Makefile,v 1.1 2008/01/08 16:50:27 naddy Exp $
---- plugins/Makefile.orig Tue Jan 8 17:42:27 2008
-+++ plugins/Makefile Tue Jan 8 17:44:11 2008
-@@ -1,9 +1,7 @@
+--- plugins/Makefile.orig Thu Aug 3 04:02:01 2006
++++ plugins/Makefile Tue Jun 24 09:48:15 2008
+@@ -1,10 +1,8 @@
-CC = gcc
-COPTS = -O2 -g
-CFLAGS = $(COPTS) -I.. -I../../include -fPIC
-+CFLAGS += -I.. -I../../include -fPIC
++CFLAGS += -I.. -I../../include -fPIC
LDFLAGS = -shared
+ LDADD = -lutil
-INSTALL = install -o root
-prefix = /usr/local
-+INSTALL = $(BSD_INSTALL_DATA)
-+prefix = $(TRUEPREFIX)
++INSTALL = $(BSD_INSTALL_DATA)
++prefix = $(PREFIX)
PLUGINS = pptpd-logwtmp.so
Index: patches/patch-pptpctrl_c
===================================================================
RCS file: patches/patch-pptpctrl_c
diff -N patches/patch-pptpctrl_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-pptpctrl_c 8 Oct 2008 07:34:28 -0000
@@ -0,0 +1,23 @@
+$OpenBSD$
+--- pptpctrl.c.orig Fri Dec 8 01:01:40 2006
++++ pptpctrl.c Wed Oct 8 09:28:48 2008
+@@ -764,7 +764,6 @@ static void launch_pppd(char **pppaddrs, struct in_add
+ sprintf(pppInterfaceIPs, "%s:%s", pppaddrs[0], pppaddrs[1]);
+ pppd_argv[an++] = pppInterfaceIPs;
+ }
+-#endif
+
+ if (!noipparam) {
+ pppd_argv[an++] = "ipparam";
+@@ -777,6 +776,11 @@ static void launch_pppd(char **pppaddrs, struct in_add
+ pppd_argv[an++] = "pptpd-original-ip";
+ pppd_argv[an++] = inet_ntoa(inetaddrs[1]);
+ }
++
++/*
++ * Disable noipparam and logwtmp on BSD
++ */
++#endif
+
+ /* argv arrays must always be NULL terminated */
+ pppd_argv[an++] = NULL;
Index: patches/patch-pptpd_c
===================================================================
RCS file: /cvs/ports/net/poptop/patches/patch-pptpd_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-pptpd_c
--- patches/patch-pptpd_c 8 Jan 2008 16:50:27 -0000 1.1
+++ patches/patch-pptpd_c 8 Oct 2008 07:34:28 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-pptpd_c,v 1.1 2008/01/08 16:50:27 naddy Exp $
---- pptpd.c.orig Thu Feb 17 03:04:59 2005
-+++ pptpd.c Mon Dec 31 09:55:06 2007
+--- pptpd.c.orig Tue Sep 5 01:17:25 2006
++++ pptpd.c Tue Jun 24 09:45:13 2008
@@ -36,6 +36,11 @@
#include <sys/socket.h>
#include <netinet/in.h>
@@ -13,7 +13,7 @@ $OpenBSD: patch-pptpd_c,v 1.1 2008/01/08
#include <sys/wait.h>
#include <sys/stat.h>
#include <unistd.h>
-@@ -415,6 +420,19 @@ int main(int argc, char **argv)
+@@ -433,6 +438,19 @@ int main(int argc, char **argv)
#endif
/* after we have our final pid... */
log_pid(pid_file);
Index: patches/patch-samples_pptpd_conf
===================================================================
RCS file: patches/patch-samples_pptpd_conf
diff -N patches/patch-samples_pptpd_conf
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-samples_pptpd_conf 8 Oct 2008 07:34:28 -0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+--- samples/pptpd.conf.orig Tue Mar 4 10:00:06 2008
++++ samples/pptpd.conf Tue Mar 4 10:00:19 2008
+@@ -31,12 +31,12 @@ option /etc/ppp/options.pptpd
+ # Suppress the passing of the client's IP address to PPP, which is
+ # done by default otherwise.
+ #
+-#noipparam
++noipparam
+
+ # TAG: logwtmp
+ # Use wtmp(5) to record client connections and disconnections.
+ #
+-logwtmp
++# logwtmp
+
+ # TAG: bcrelay <if>
+ # Turns on broadcast relay to clients from interface <if>
Index: pkg/PFRAG.shared
===================================================================
RCS file: pkg/PFRAG.shared
diff -N pkg/PFRAG.shared
--- pkg/PFRAG.shared 8 Jan 2008 16:50:27 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,3 +0,0 @@
[EMAIL PROTECTED] $OpenBSD: PFRAG.shared,v 1.1 2008/01/08 16:50:27 naddy Exp $
-lib/pptpd/
-lib/pptpd/pptpd-logwtmp.so
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/poptop/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- pkg/PLIST 8 Jan 2008 16:50:27 -0000 1.7
+++ pkg/PLIST 8 Oct 2008 07:34:28 -0000
@@ -1,10 +1,9 @@
@comment $OpenBSD: PLIST,v 1.7 2008/01/08 16:50:27 naddy Exp $
-%%SHARED%%
@man man/man5/pptpd.conf.5
@man man/man8/pptpctrl.8
@man man/man8/pptpd.8
-sbin/pptpctrl
-sbin/pptpd
[EMAIL PROTECTED] sbin/pptpctrl
[EMAIL PROTECTED] sbin/pptpd
share/doc/poptop/
share/doc/poptop/README.OpenBSD
share/examples/poptop/
