Giovanni Bechis wrote:
Now with patch attached

Better patch attached
 Giovanni

Index: Makefile
===================================================================
RCS file: /cvs/ports/net/poptop/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile    15 Sep 2007 22:36:58 -0000      1.6
+++ Makefile    31 Dec 2007 16:38:54 -0000
@@ -2,13 +2,13 @@
 
 COMMENT=               PPTP Server
 
-PKGNAME=               poptop-1.1.4.b4p1
-DISTNAME=              pptpd-1.1.4-b4
+PKGNAME=               poptop-1.3.0
+DISTNAME=              pptpd-1.3.0
 CATEGORIES=            net
 
 HOMEPAGE=              http://www.poptop.org/
 
-MAINTAINER=            Craig Barraclough <[EMAIL PROTECTED]>
+MAINTAINER=            Giovanni Bechis <[EMAIL PROTECTED]>
 
 # GPL
 PERMIT_PACKAGE_CDROM=  Yes
@@ -21,8 +21,10 @@ MASTER_SITES=                ${MASTER_SITE_SOURCEFORGE
 
 CONFIGURE_STYLE=       gnu
 CONFIGURE_ARGS+=       --with-bsdppp --with-pppd-ip-alloc
+USE_GMAKE=      yes
 
-WRKDIST=               ${WRKDIR}/poptop-1.1.4
+post-patch:
+       @perl -pi -e 's,/usr,${PREFIX},g' ${WRKSRC}/pptpctrl.c
 
 post-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/poptop
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/poptop/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo    5 Apr 2007 16:20:14 -0000       1.4
+++ distinfo    31 Dec 2007 16:38:54 -0000
@@ -1,5 +1,5 @@
-MD5 (pptpd-1.1.4-b4.tar.gz) = WGAyJJmPIlQujX7LNXvABg==
-RMD160 (pptpd-1.1.4-b4.tar.gz) = SCSizbe9W6fUiRugISZwDZlnMco=
-SHA1 (pptpd-1.1.4-b4.tar.gz) = DYHZzZvkmN1EKhgsM96vvmlAOM0=
-SHA256 (pptpd-1.1.4-b4.tar.gz) = qWIFeg4Z0TP5nOrHqayYPblw2TblYufOiOTNN8tsrvo=
-SIZE (pptpd-1.1.4-b4.tar.gz) = 157684
+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
Index: files/README.OpenBSD
===================================================================
RCS file: /cvs/ports/net/poptop/files/README.OpenBSD,v
retrieving revision 1.2
diff -u -p -r1.2 README.OpenBSD
--- files/README.OpenBSD        11 Nov 2004 18:15:53 -0000      1.2
+++ files/README.OpenBSD        31 Dec 2007 16:38:54 -0000
@@ -1,10 +1,8 @@
                      PoPToP - Unix PPTP Server
                    ----------------------------
 1. GRE Support
-   PoPToP requires GRE support to be enabled. As of 3.6, this is now done
-   via a sysctl - net.inet.gre.allow. Modify /etc/sysctl.conf, adding a
-   line such as:
-        net.inet.gre.allow=1                   # GRE Support for PoPToP
+   PoPToP requires GRE support to be enabled. It will be enabled at run time
+   by the pptpd daemon.
 2. Configuration of PPTP
    A sample configuration file is copied into your configuration directory
    (normally /etc) as pptpd.conf. Personalise this config file to suit. At
Index: patches/patch-Makefile_in
===================================================================
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-Makefile_in   31 Dec 2007 16:38:54 -0000
@@ -0,0 +1,23 @@
+$OpenBSD$
+--- Makefile.in.orig   Wed Aug  3 09:47:42 2005
++++ Makefile.in        Mon Dec 31 09:53:39 2007
+@@ -37,7 +37,7 @@ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ EXTRA_PROGRAMS =
+-sbin_PROGRAMS = pptpd$(EXEEXT) pptpctrl$(EXEEXT) bcrelay$(EXEEXT)
++sbin_PROGRAMS = pptpd$(EXEEXT) pptpctrl$(EXEEXT)
+ 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
+       $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(bcrelay_SOURCES) $(pptpctrl_SOURCES) $(pptpd_SOURCES)
+-DIST_SOURCES = $(bcrelay_SOURCES) $(pptpctrl_SOURCES) $(pptpd_SOURCES)
++SOURCES = $(pptpctrl_SOURCES) $(pptpd_SOURCES)
++DIST_SOURCES = $(pptpctrl_SOURCES) $(pptpd_SOURCES)
+ man5dir = $(mandir)/man5
+ man8dir = $(mandir)/man8
+ NROFF = nroff
Index: patches/patch-pptpctrl_c
===================================================================
RCS file: patches/patch-pptpctrl_c
diff -N patches/patch-pptpctrl_c
--- patches/patch-pptpctrl_c    17 Apr 2003 08:59:26 -0000      1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-pptpctrl_c,v 1.1.1.1 2003/04/17 08:59:26 wilfried Exp $
---- pptpctrl.c.orig    Fri Apr 11 10:51:32 2003
-+++ pptpctrl.c Fri Apr 11 10:51:53 2003
-@@ -26,7 +26,6 @@
- #include <time.h>
- #include <sys/time.h>
- #include <dirent.h>
--#include <net/if.h>
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
Index: patches/patch-pptpd_c
===================================================================
RCS file: patches/patch-pptpd_c
diff -N patches/patch-pptpd_c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-pptpd_c       31 Dec 2007 16:38:54 -0000
@@ -0,0 +1,35 @@
+$OpenBSD$
+--- pptpd.c.orig       Thu Feb 17 03:04:59 2005
++++ pptpd.c    Mon Dec 31 09:55:06 2007
+@@ -36,6 +36,11 @@
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
++#ifdef __OpenBSD__
++#include <netinet/ip_gre.h>
++#include <sys/param.h>
++#include <sys/sysctl.h>
++#endif
+ #include <sys/wait.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
+@@ -415,6 +420,19 @@ int main(int argc, char **argv)
+ #endif
+       /* after we have our final pid... */
+       log_pid(pid_file);
++
++#ifdef __OpenBSD__
++       {
++       int mib[] = { CTL_NET, PF_INET, IPPROTO_GRE, GRECTL_ALLOW };
++       int gre_allow = 1;
++
++       if (sysctl(mib, 4, NULL, 0, &gre_allow, sizeof(gre_allow)) == -1) {
++               syslog(LOG_ERR, "PPTPD: failed to allow GRE, errno=%d\n",
++                       errno);
++               return 1;
++       }
++       }
++#endif
+ 
+       /* manage connections until SIGTERM */
+       pptp_manager(argc, argv);
Index: pkg/PFRAG.shared
===================================================================
RCS file: pkg/PFRAG.shared
diff -N pkg/PFRAG.shared
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ pkg/PFRAG.shared    31 Dec 2007 16:38:54 -0000
@@ -0,0 +1,3 @@
[EMAIL PROTECTED] $OpenBSD$
+lib/pptpd/
+lib/pptpd/pptpd-logwtmp.so
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/poptop/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- pkg/PLIST   11 Nov 2004 18:15:53 -0000      1.6
+++ pkg/PLIST   31 Dec 2007 16:38:54 -0000
@@ -1,4 +1,5 @@
 @comment $OpenBSD: PLIST,v 1.6 2004/11/11 18:15:53 naddy Exp $
+%%SHARED%%
 @man man/man5/pptpd.conf.5
 @man man/man8/pptpctrl.8
 @man man/man8/pptpd.8
@@ -9,5 +10,3 @@ share/doc/poptop/README.OpenBSD
 share/examples/poptop/
 share/examples/poptop/pptpd.conf-sample
 @sample ${SYSCONFDIR}/pptpd.conf
[EMAIL PROTECTED] GRE support required for PPTP data
[EMAIL PROTECTED] net.inet.gre.allow=1

Reply via email to