cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bug on __FreeBSD_version >= 1100042 where once vpnc set up a tunnel and

Browse Source 
went into the main loop, no esp could be sent.

PR:             197835 (based on)
Submitted by:   markiyan.kushnir@gmail.com
Fix confirmed:  xmj
This commit is contained in:
Emanuel Haupt 2015-03-03 20:50:53 +00:00
parent 25c8965284
commit d979d4588d
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=380395
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
security/vpnc/Makefile
View File

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

21
security/vpnc/files/patch-sysdep.h
View File

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