svn commit: r386796 - in branches/2015Q2/security/ipsec-tools: . files

[Brad Davis]

Author: brd
Date: Tue May 19 17:32:02 2015
New Revision: 386796
URL: https://svnweb.freebsd.org/changeset/ports/386796

Log:
  MFH: r386793 - Update ipsec-tools with a patch from NetBSD to fix a memory leak.
  
  Approved by:	portmgr (erwin)

Added:
  branches/2015Q2/security/ipsec-tools/files/patch-src_racoon_gssapi.c
     - copied unchanged from r386793, head/security/ipsec-tools/files/patch-src_racoon_gssapi.c
Modified:
  branches/2015Q2/security/ipsec-tools/Makefile
Directory Properties:
  branches/2015Q2/   (props changed)

Modified: branches/2015Q2/security/ipsec-tools/Makefile
==============================================================================
--- branches/2015Q2/security/ipsec-tools/Makefile	Tue May 19 17:23:00 2015	(r386795)
+++ branches/2015Q2/security/ipsec-tools/Makefile	Tue May 19 17:32:02 2015	(r386796)
@@ -8,6 +8,7 @@
 
 PORTNAME=	ipsec-tools
 PORTVERSION=	0.8.2
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	SF
 

Copied: branches/2015Q2/security/ipsec-tools/files/patch-src_racoon_gssapi.c (from r386793, head/security/ipsec-tools/files/patch-src_racoon_gssapi.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2015Q2/security/ipsec-tools/files/patch-src_racoon_gssapi.c	Tue May 19 17:32:02 2015	(r386796, copy of r386793, head/security/ipsec-tools/files/patch-src_racoon_gssapi.c)
@@ -0,0 +1,14 @@
+--- src/racoon/gssapi.c.orig	2015-05-19 16:38:06 UTC
++++ src/racoon/gssapi.c
+@@ -192,6 +192,11 @@ gssapi_init(struct ph1handle *iph1)
+ 	gss_name_t princ, canon_princ;
+ 	OM_uint32 maj_stat, min_stat;
+ 
++	if (iph1->rmconf == NULL) {
++		plog(LLV_ERROR, LOCATION, NULL, "no remote config\n");
++		return -1;
++	}
++
+ 	gps = racoon_calloc(1, sizeof (struct gssapi_ph1_state));
+ 	if (gps == NULL) {
+ 		plog(LLV_ERROR, LOCATION, NULL, "racoon_calloc failed\n");