Date: Tue, 3 Mar 2015 20:50:54 +0000 (UTC) From: Emanuel Haupt <ehaupt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r380395 - in head/security/vpnc: . files Message-ID: <201503032050.t23Kos2J090789@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ehaupt Date: Tue Mar 3 20:50:53 2015 New Revision: 380395 URL: https://svnweb.freebsd.org/changeset/ports/380395 QAT: https://qat.redports.org/buildarchive/r380395/ Log: Fix bug on __FreeBSD_version >= 1100042 where once vpnc set up a tunnel and went into the main loop, no esp could be sent. PR: 197835 (based on) Submitted by: markiyan.kushnir@gmail.com Fix confirmed: xmj Modified: head/security/vpnc/Makefile head/security/vpnc/files/patch-sysdep.h Modified: head/security/vpnc/Makefile ============================================================================== --- head/security/vpnc/Makefile Tue Mar 3 20:48:16 2015 (r380394) +++ head/security/vpnc/Makefile Tue Mar 3 20:50:53 2015 (r380395) @@ -3,7 +3,7 @@ PORTNAME= vpnc PORTVERSION= 0.5.3 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= security MASTER_SITES= http://www.unix-ag.uni-kl.de/~massar/vpnc/ \ LOCAL/ehaupt @@ -56,6 +56,11 @@ CFLAGS+= -DCISCO_PATCH_VERSION .endif post-patch: +.if ${OSVERSION} >= 1100042 + @${REINPLACE_CMD} \ + -e 's|.*%%FREEBSD_IPLEN_FIX%%.*|#define NEED_IPLEN_FIX 1|' \ + ${WRKSRC}/sysdep.h +.endif @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/config.c @${REINPLACE_CMD} -e 's|\(/etc/vpnc\)|${PREFIX}\1|' \ ${WRKSRC}/${MANPAGE8}.template Modified: head/security/vpnc/files/patch-sysdep.h ============================================================================== --- head/security/vpnc/files/patch-sysdep.h Tue Mar 3 20:48:16 2015 (r380394) +++ head/security/vpnc/files/patch-sysdep.h Tue Mar 3 20:50:53 2015 (r380395) @@ -1,6 +1,19 @@ ---- sysdep.h.orig 2008-11-19 20:36:12 UTC -+++ sysdep.h -@@ -86,6 +86,7 @@ int tun_get_hwaddr(int fd, char *dev, ui +--- sysdep.h.orig 2008-11-19 21:36:12.000000000 +0100 ++++ sysdep.h 2015-03-03 21:35:27.443313082 +0100 +@@ -75,17 +75,20 @@ + /***************************************************************************/ + #if defined(__FreeBSD_kernel__) + #define HAVE_SA_LEN 1 ++/* %%FREEBSD_IPLEN_FIX%% */ + #endif + + /***************************************************************************/ + #if defined(__FreeBSD__) + #define HAVE_SA_LEN 1 ++/* %%FREEBSD_IPLEN_FIX%% */ + + #define HAVE_VASPRINTF 1 + #define HAVE_ASPRINTF 1 #define HAVE_FGETLN 1 #define HAVE_UNSETENV 1 #define HAVE_SETENV 1 @@ -8,7 +21,7 @@ #endif /***************************************************************************/ -@@ -97,6 +98,7 @@ int tun_get_hwaddr(int fd, char *dev, ui +@@ -97,6 +100,7 @@ #define HAVE_FGETLN 1 #define HAVE_UNSETENV 1 #define HAVE_SETENV 1
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503032050.t23Kos2J090789>