Fix include guards. Fix format string. Fix uninitialised variables.

Not MAKE_JOBS_SAFE. Bump revision.

6 files changed, 69 insertions, 10 deletions

diff --git a/security/isakmpd/Makefile b/security/isakmpd/Makefile
index eff37ae3fa9..8bb3c0f472d 100644
--- a/security/isakmpd/Makefile
+++ b/security/isakmpd/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.47 2013/02/06 23:23:38 jperkin Exp $
+# $NetBSD: Makefile,v 1.48 2013/09/20 23:07:44 joerg Exp $
 #
 
 DISTNAME=		isakmpd-20030903
-PKGREVISION=		7
+PKGREVISION=		8
 CATEGORIES=		security net
 MASTER_SITES=		ftp://ftp.NetBSD.org/pub/NetBSD/packages/distfiles/LOCAL_PORTS/
 
@@ -11,6 +11,8 @@ COMMENT=		OpenBSD IKE daemon
 
 NOT_FOR_PLATFORM=	DragonFly-*-*
 
+MAKE_JOBS_SAFE=		no
+
 # this is not compatible with cross build - there's no other way
 .if !exists(/usr/include/netinet6/ipsec.h)
 PKG_FAIL_REASON+=	"${PKGNAME} requires ipsec-ready ${OPSYS}"
diff --git a/security/isakmpd/distinfo b/security/isakmpd/distinfo
index c354d0630d7..94fb4aa2229 100644
--- a/security/isakmpd/distinfo
+++ b/security/isakmpd/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2011/05/19 15:48:41 drochner Exp $
+$NetBSD: distinfo,v 1.20 2013/09/20 23:07:44 joerg Exp $
 
 SHA1 (isakmpd-20030903.tar.gz) = 3400947199759a69b878ea396a598d9df174c6e8
 RMD160 (isakmpd-20030903.tar.gz) = 988afc6f8c84122e7a0a70ef4afe6815aceeb95d
@@ -7,7 +7,7 @@ SHA1 (patch-aa) = da61cae20e99276720183264896ada554cc2f38e
 SHA1 (patch-ab) = f30c790f42d72866e95092848e102e4c3728365c
 SHA1 (patch-ad) = 8c477b99fd3d82ccb52b01374450295cc25244c0
 SHA1 (patch-ae) = c6ca573357381ae867b1251a90b0c4df4e82d95a
-SHA1 (patch-ag) = f0af67b96e2f72333e79486495ce6abf1b31b9c1
+SHA1 (patch-ag) = effdc541fd6e3dde8761fde48d3b3ed11b818412
 SHA1 (patch-aj) = bfffb5290629807a08870a438405adbab0efc9bf
 SHA1 (patch-ak) = e168240460695a86533237856f3997b5c06d7805
 SHA1 (patch-al) = eb6c16bf8d98219ab5d70dc5378a47772ec4dc23
@@ -20,3 +20,6 @@ SHA1 (patch-bc) = 4e31f3b55c6084bc2661f3e18333086d5d466ea4
 SHA1 (patch-bd) = 2208f541a6998df91b8ea62b78ae5c82fadf41f6
 SHA1 (patch-be) = e2d98476e3f15144157bb82f970a6f9b822534f8
 SHA1 (patch-bf) = e95bfdf10d289cbbbee400f175f02cdc40cf3f9f
+SHA1 (patch-math__2n.h) = 27a16155fba3c3de9e4bee6007280b511609b50d
+SHA1 (patch-math__ec2n.h) = 611fcd430f74d044515e096a337087fc0dc44443
+SHA1 (patch-udp.c) = 7ea9207979934db63988c476f72218e5e734e043
diff --git a/security/isakmpd/patches/patch-ag b/security/isakmpd/patches/patch-ag
index 01b1fc472dc..f0925d91ab3 100644
--- a/security/isakmpd/patches/patch-ag
+++ b/security/isakmpd/patches/patch-ag
@@ -1,8 +1,9 @@
-$NetBSD: patch-ag,v 1.1 2003/02/08 17:06:26 dmcmahill Exp $
+$NetBSD: patch-ag,v 1.2 2013/09/20 23:07:44 joerg Exp $
 
---- sa.c.orig	Wed Nov 13 04:31:38 2002
-+++ sa.c	Sat Feb  8 12:04:21 2003
-@@ -440,6 +440,6 @@
+--- sa.c.orig	2003-07-25 08:31:16.000000000 +0000
++++ sa.c
+@@ -435,8 +435,8 @@ sa_dump (int cls, int level, char *heade
+ 	    decode_32 (sa->cookies + 8), decode_32 (sa->cookies + 12)));
    LOG_DBG ((cls, level, "%s: msgid %08x refcnt %d", header,
  	    decode_32 (sa->message_id), sa->refcnt));
 -  LOG_DBG ((cls, level, "%s: life secs %llu kb %llu", header, sa->seconds,
@@ -11,17 +12,31 @@ $NetBSD: patch-ag,v 1.1 2003/02/08 17:06:26 dmcmahill Exp $
 +	    (long long unsigned) sa->kilobytes));
    for (proto = TAILQ_FIRST (&sa->protos); proto;
         proto = TAILQ_NEXT (proto, link))
-@@ -1040,5 +1040,5 @@
+     {
+@@ -659,7 +659,7 @@ sa_dump_all (FILE *fd, struct sa *sa)
+   fprintf (fd, " (Phase %d)\n", sa->phase);
+ 
+   /* Source and destination IPs. */
+-  fprintf (fd, sa->transport == NULL ? "<no transport>" :
++  fprintf (fd, "%s", sa->transport == NULL ? "<no transport>" :
+ 	   sa->transport->vtbl->decode_ids (sa->transport));
+   fprintf (fd, "\n");
+ 
+@@ -1086,7 +1086,7 @@ sa_setup_expirations (struct sa *sa)
+       seconds = sa->seconds * (850 + sysdep_random () % 100) / 1000;
        LOG_DBG ((LOG_TIMER, 95,
  		"sa_setup_expirations: SA %p soft timeout in %llu seconds",
 -		sa, seconds));
 +		sa, (long long unsigned) seconds));
        expiration.tv_sec += seconds;
        sa->soft_death
-@@ -1058,5 +1058,5 @@
+ 	= timer_add_event ("sa_soft_expire", sa_soft_expire, sa, &expiration);
+@@ -1104,7 +1104,7 @@ sa_setup_expirations (struct sa *sa)
+       gettimeofday (&expiration, 0);
        LOG_DBG ((LOG_TIMER, 95,
  		"sa_setup_expirations: SA %p hard timeout in %llu seconds",
 -		sa, sa->seconds));
 +		sa, (long long unsigned) sa->seconds));
        expiration.tv_sec += sa->seconds;
        sa->death
+ 	= timer_add_event ("sa_hard_expire", sa_hard_expire, sa, &expiration);
diff --git a/security/isakmpd/patches/patch-math__2n.h b/security/isakmpd/patches/patch-math__2n.h
new file mode 100644
index 00000000000..b5804ba9704
--- /dev/null
+++ b/security/isakmpd/patches/patch-math__2n.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-math__2n.h,v 1.1 2013/09/20 23:07:44 joerg Exp $
+
+--- math_2n.h.orig	2013-09-20 20:49:55.000000000 +0000
++++ math_2n.h
+@@ -30,7 +30,7 @@
+  * This code was written under funding by Ericsson Radio Systems.
+  */
+ 
+-#ifndef _MATH_2N_H
++#ifndef _MATH_2N_H_
+ #define _MATH_2N_H_
+ 
+ /*
diff --git a/security/isakmpd/patches/patch-math__ec2n.h b/security/isakmpd/patches/patch-math__ec2n.h
new file mode 100644
index 00000000000..14e9c3f54c2
--- /dev/null
+++ b/security/isakmpd/patches/patch-math__ec2n.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-math__ec2n.h,v 1.1 2013/09/20 23:07:44 joerg Exp $
+
+--- math_ec2n.h.orig	2013-09-20 20:50:09.000000000 +0000
++++ math_ec2n.h
+@@ -29,7 +29,7 @@
+  * This code was written under funding by Ericsson Radio Systems.
+  */
+ 
+-#ifndef _MATH_EC2N_H
++#ifndef _MATH_EC2N_H_
+ #define _MATH_EC2N_H_
+ 
+ /* Definitions for points on an elliptic curve */
diff --git a/security/isakmpd/patches/patch-udp.c b/security/isakmpd/patches/patch-udp.c
new file mode 100644
index 00000000000..1510da65ecb
--- /dev/null
+++ b/security/isakmpd/patches/patch-udp.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-udp.c,v 1.1 2013/09/20 23:07:44 joerg Exp $
+
+--- udp.c.orig	2003-06-10 16:41:29.000000000 +0000
++++ udp.c
+@@ -561,7 +561,7 @@ void
+ udp_report (struct transport *t)
+ {
+   struct udp_transport *u = (struct udp_transport *)t;
+-  char *src, *dst;
++  char *src = NULL, *dst = NULL;
+ 
+   if (sockaddr2text (u->src, &src, 0))
+     goto ret;