4 files changed, 2 insertions, 56 deletions

diff --git a/security/ipsec-tools/files/patch-configure b/security/ipsec-tools/files/patch-configure
index ce675f9cf664..40076f479141 100644
--- a/security/ipsec-tools/files/patch-configure
+++ b/security/ipsec-tools/files/patch-configure
@@ -72,6 +72,6 @@
 +  LIBS="$LIBS -liconv"
 +fi
 +
- 	echo "$as_me:$LINENO: checking if iconv second argument needs const" >&5
- echo $ECHO_N "checking if iconv second argument needs const... $ECHO_C" >&6
+ 	{ echo "$as_me:$LINENO: checking if iconv second argument needs const" >&5
+ echo $ECHO_N "checking if iconv second argument needs const... $ECHO_C" >&6; }
  	saved_CFLAGS=$CFLAGS
diff --git a/security/ipsec-tools/files/patch-src__racoon__eaytest.c b/security/ipsec-tools/files/patch-src__racoon__eaytest.c
deleted file mode 100644
index 5e4b39740475..000000000000
--- a/security/ipsec-tools/files/patch-src__racoon__eaytest.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./src/racoon/eaytest.c.orig	Wed Jun  6 01:07:11 2007
-+++ ./src/racoon/eaytest.c	Wed Jun  6 01:07:22 2007
-@@ -311,7 +311,7 @@
- 
- 	printf("exact match: succeed.\n");
- 
--	if (dnstr_w1) {
-+	if (dnstr_w1 != NULL) {
- 		asn1dn = eay_str2asn1dn(dnstr_w1, strlen(dnstr_w1));
- 		if (asn1dn == NULL || asn1dn->l == asn1dn0.l)
- 			errx(1, "asn1dn length wrong for wildcard 1\n");
-@@ -321,7 +321,7 @@
- 		printf("wildcard 1 match: succeed.\n");
- 	}
- 
--	if (dnstr_w1) {
-+	if (dnstr_w1 != NULL) {
- 		asn1dn = eay_str2asn1dn(dnstr_w2, strlen(dnstr_w2));
- 		if (asn1dn == NULL || asn1dn->l == asn1dn0.l)
- 			errx(1, "asn1dn length wrong for wildcard 2\n");
diff --git a/security/ipsec-tools/files/patch-src__racoon__plog.c b/security/ipsec-tools/files/patch-src__racoon__plog.c
deleted file mode 100644
index b03a99eafa49..000000000000
--- a/security/ipsec-tools/files/patch-src__racoon__plog.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/racoon/plog.c.orig	Wed Dec  7 18:19:51 2005
-+++ ./src/racoon/plog.c	Wed Jun  6 00:49:18 2007
-@@ -224,7 +224,7 @@
- 		return;
- 	}
- 
--        openlog(pname, LOG_NDELAY, LOG_DAEMON);
-+        openlog(pname, LOG_NDELAY, LOG_SECURITY);
- }
- 
- void
diff --git a/security/ipsec-tools/files/patch-src__racoon__var.h b/security/ipsec-tools/files/patch-src__racoon__var.h
deleted file mode 100644
index 39c946b7aec5..000000000000
--- a/security/ipsec-tools/files/patch-src__racoon__var.h
+++ /dev/null
@@ -1,23 +0,0 @@
---- ./src/racoon/var.h.orig	Wed Jun  6 01:06:51 2007
-+++ ./src/racoon/var.h	Wed Jun  6 01:07:00 2007
-@@ -76,9 +76,9 @@
- do { \
- 	if (getnameinfo((x), sysdep_sa_len(x), (y), sizeof(y), (z), sizeof(z), \
- 			NIFLAGS) != 0) { \
--		if (y) \
-+		if (y != NULL) \
- 			strncpy((y), "(invalid)", sizeof(y)); \
--		if (z) \
-+		if (z != NULL) \
- 			strncpy((z), "(invalid)", sizeof(z)); \
- 	} \
- } while (0);
-@@ -87,7 +87,7 @@
- do { \
- 	if (getnameinfo((x), sysdep_sa_len(x), (y), sizeof(y), NULL, 0, \
- 			NIFLAGS) != 0) { \
--		if (y) \
-+		if (y != NULL) \
- 			strncpy((y), "(invalid)", sizeof(y)); \
- 	} \
- } while (0);