From c3622e01df9dd712f2801de7e664012ef196259e Mon Sep 17 00:00:00 2001 From: manu Date: Fri, 18 Feb 2005 09:53:40 +0000 Subject: Upgraded ipsec-tools to release version 0.5 --- security/ipsec-tools/DESCR | 2 +- security/ipsec-tools/Makefile | 8 +++---- security/ipsec-tools/distinfo | 14 +++--------- security/ipsec-tools/patches/patch-aa | 25 ---------------------- security/ipsec-tools/patches/patch-ab | 14 ------------ security/ipsec-tools/patches/patch-ac | 21 ------------------ security/ipsec-tools/patches/patch-ad | 13 ------------ security/ipsec-tools/patches/patch-ae | 13 ------------ security/ipsec-tools/patches/patch-af | 25 ---------------------- security/ipsec-tools/patches/patch-ag | 20 ------------------ security/ipsec-tools/patches/patch-ah | 40 ----------------------------------- 11 files changed, 7 insertions(+), 188 deletions(-) delete mode 100644 security/ipsec-tools/patches/patch-aa delete mode 100644 security/ipsec-tools/patches/patch-ab delete mode 100644 security/ipsec-tools/patches/patch-ac delete mode 100644 security/ipsec-tools/patches/patch-ad delete mode 100644 security/ipsec-tools/patches/patch-ae delete mode 100644 security/ipsec-tools/patches/patch-af delete mode 100644 security/ipsec-tools/patches/patch-ag delete mode 100644 security/ipsec-tools/patches/patch-ah (limited to 'security') diff --git a/security/ipsec-tools/DESCR b/security/ipsec-tools/DESCR index ca7181317aa..0d8c9d69c33 100644 --- a/security/ipsec-tools/DESCR +++ b/security/ipsec-tools/DESCR @@ -2,7 +2,7 @@ racoon speaks IKE (ISAKMP/Oakley) key management protocol, to establish IPsec security association with other hosts. This is based on KAME racoon, with some enhancements such as -NAT-Traversal (needs a kernel patch), hybrid authentication, +NAT-Traversal (needs kernel support), hybrid authentication, ISAKMP mode config, RADIUS support, IKE fragmentation and others. Ipsec-tools' racoon is able to act as a VPN server for the diff --git a/security/ipsec-tools/Makefile b/security/ipsec-tools/Makefile index 665713e5571..85fb4094b5d 100644 --- a/security/ipsec-tools/Makefile +++ b/security/ipsec-tools/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2005/01/12 15:31:11 kim Exp $ +# $NetBSD: Makefile,v 1.11 2005/02/18 09:53:40 manu Exp $ # -DISTNAME= ipsec-tools-0.5.pre20041109 +DISTNAME= ipsec-tools-0.5 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ipsec-tools/} EXTRACT_SUFX= .tar.bz2 @@ -28,9 +28,7 @@ LIBS+= ${BUILDLINK_LDADD.libradius} .endif CONFIGURE_ARGS+= --enable-frag --enable-hybrid - -# Require a kernel patch not integrated yet (IPR problem) -#CONFIGURE_ARGS+= --enable-natt +CONFIGURE_ARGS+= --enable-natt=kernel PKG_SYSCONFSUBDIR= racoon CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} diff --git a/security/ipsec-tools/distinfo b/security/ipsec-tools/distinfo index 70d1c058485..2ef96028d62 100644 --- a/security/ipsec-tools/distinfo +++ b/security/ipsec-tools/distinfo @@ -1,12 +1,4 @@ -$NetBSD: distinfo,v 1.4 2004/12/12 23:51:10 kleink Exp $ +$NetBSD: distinfo,v 1.5 2005/02/18 09:53:40 manu Exp $ -SHA1 (ipsec-tools-0.5.pre20041109.tar.bz2) = 2e91a2b1adea46facdbdfe70dfcc4aca3cc01913 -Size (ipsec-tools-0.5.pre20041109.tar.bz2) = 618629 bytes -SHA1 (patch-aa) = fadc2685847af19288782a0fd911dc5accee0fc9 -SHA1 (patch-ab) = dd5293512228a02ce8f37f8d1a10fb865cc79aa5 -SHA1 (patch-ac) = 28cbaa97ab1853bb03202c46718c0c72bc4b8fb6 -SHA1 (patch-ad) = 091a41782511f40c2ee1bd64502dc2073675ed84 -SHA1 (patch-ae) = 4059050714af8acbf7bc8fc242cc09a6890b5687 -SHA1 (patch-af) = bffe225378e211baf1e0b0a7afb85dae6c41e89c -SHA1 (patch-ag) = 77bcd3a9a90eca65a9fe270f4cfb6db4f6d7eb97 -SHA1 (patch-ah) = 97e84d26fe9fa895294722172d457e37e6d9ad53 +SHA1 (ipsec-tools-0.5.tar.bz2) = d52e75156b89c4a589ef014aaec07d0be2248710 +Size (ipsec-tools-0.5.tar.bz2) = 646397 bytes diff --git a/security/ipsec-tools/patches/patch-aa b/security/ipsec-tools/patches/patch-aa deleted file mode 100644 index e0bde15ffab..00000000000 --- a/security/ipsec-tools/patches/patch-aa +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-aa,v 1.1 2004/11/10 16:53:51 manu Exp $ ---- src/racoon/ipsec_doi.c.orig 2004-11-10 19:03:38.000000000 +0100 -+++ src/racoon/ipsec_doi.c 2004-11-10 19:03:39.000000000 +0100 -@@ -350,9 +350,9 @@ - authmethod = s->authmethod; - #endif - plog(LLV_DEBUG, LOCATION, NULL, "Compared: DB:Peer\n"); - plog(LLV_DEBUG, LOCATION, NULL, "(lifetime = %ld:%ld)\n", -- s->lifetime, tsap->lifetime); -+ (long)s->lifetime, (long)tsap->lifetime); - plog(LLV_DEBUG, LOCATION, NULL, "(lifebyte = %zu:%zu)\n", - s->lifebyte, tsap->lifebyte); - plog(LLV_DEBUG, LOCATION, NULL, "enctype = %s:%s\n", - s_oakley_attr_v(OAKLEY_ATTR_ENC_ALG, -@@ -3820,9 +3820,9 @@ - plog(LLV_ERROR, LOCATION, NULL, - "lifetime mismatched " - "in a proposal, " - "prev:%ld curr:%u.\n", -- pp->lifetime, t); -+ (long)pp->lifetime, t); - goto end; - } - break; - case IPSECDOI_ATTR_SA_LD_TYPE_KB: diff --git a/security/ipsec-tools/patches/patch-ab b/security/ipsec-tools/patches/patch-ab deleted file mode 100644 index 87a9649856b..00000000000 --- a/security/ipsec-tools/patches/patch-ab +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2004/11/10 16:53:51 manu Exp $ ---- src/racoon/remoteconf.c.orig 2004-11-10 19:04:19.000000000 +0100 -+++ src/racoon/remoteconf.c 2004-11-10 19:04:26.000000000 +0100 -@@ -544,9 +544,9 @@ - prop->prop_no, prop->trns_no, - saddr2str(prop->rmconf->remote)); - plog(LLV_INFO, LOCATION, NULL, "\tproposal {\n"); - plog(LLV_INFO, LOCATION, NULL, "\t\tlifetime time %lu sec;\n", -- prop->lifetime); -+ (long)prop->lifetime); - plog(LLV_INFO, LOCATION, NULL, "\t\tlifetime bytes %zd;\n", - prop->lifebyte); - plog(LLV_INFO, LOCATION, NULL, "\t\tdh_group %s;\n", - alg_oakley_dhdef_name(prop->dh_group)); diff --git a/security/ipsec-tools/patches/patch-ac b/security/ipsec-tools/patches/patch-ac deleted file mode 100644 index d90cd1dc1ce..00000000000 --- a/security/ipsec-tools/patches/patch-ac +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2004/11/11 11:50:20 grant Exp $ - ---- src/racoon/grabmyaddr.c.orig 2004-10-29 21:50:04.000000000 +1000 -+++ src/racoon/grabmyaddr.c -@@ -37,8 +37,14 @@ - #include - - #include --#if defined(__FreeBSD__) && __FreeBSD__ >= 3 --#include -+#ifdef __FreeBSD__ -+# if __FreeBSD__ >= 3 -+# include -+# endif -+# if __FreeBSD__ >= 5 -+# include -+# include -+# endif - #endif - #ifdef __NetBSD__ - #include diff --git a/security/ipsec-tools/patches/patch-ad b/security/ipsec-tools/patches/patch-ad deleted file mode 100644 index d7021b54692..00000000000 --- a/security/ipsec-tools/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2004/12/12 23:51:10 kleink Exp $ - ---- src/libipsec/key_debug.c.orig 2004-09-21 16:23:10.000000000 +0200 -+++ src/libipsec/key_debug.c 2004-12-13 00:33:44.000000000 +0100 -@@ -274,7 +274,7 @@ - p = (char *)(id + 1); - ep = p + len; - for (/*nothing*/; *p && p < ep; p++) { -- if (isprint(*p)) -+ if (isprint((unsigned char)*p)) - printf("%c", *p & 0xff); - else - printf("\\%03o", *p & 0xff); diff --git a/security/ipsec-tools/patches/patch-ae b/security/ipsec-tools/patches/patch-ae deleted file mode 100644 index dd79090ed75..00000000000 --- a/security/ipsec-tools/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2004/12/12 23:51:10 kleink Exp $ - ---- src/setkey/parse.y.orig 2004-10-20 17:25:29.000000000 +0200 -+++ src/setkey/parse.y 2004-12-13 00:39:15.000000000 +0100 -@@ -65,7 +65,7 @@ - #endif - - #define ATOX(c) \ -- (isdigit(c) ? (c - '0') : (isupper(c) ? (c - 'A' + 10) : (c - 'a' + 10))) -+ (isdigit((unsigned char)c) ? c - '0' : toupper((unsigned char)c) - 'A' + 10) - - u_int32_t p_spi; - u_int p_ext, p_alg_enc, p_alg_auth, p_replay, p_mode; diff --git a/security/ipsec-tools/patches/patch-af b/security/ipsec-tools/patches/patch-af deleted file mode 100644 index 86a879f053b..00000000000 --- a/security/ipsec-tools/patches/patch-af +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-af,v 1.1 2004/12/12 23:51:10 kleink Exp $ - ---- src/racoon/str2val.c.orig 2004-09-21 16:23:22.000000000 +0200 -+++ src/racoon/str2val.c 2004-12-13 00:41:21.000000000 +0100 -@@ -87,9 +87,9 @@ - - i = 0; - for (p = str; *p != '\0'; p++) { -- if (isxdigit(*p)) -+ if (isxdigit((unsigned char)*p)) - i++; -- else if (isspace(*p)) -+ else if (isspace((unsigned char)*p)) - ; - else - return NULL; -@@ -104,7 +104,7 @@ - i = 0; - f = 0; - for (rp = dst, p = str; *p != '\0'; p++) { -- if (isxdigit(*p)) { -+ if (isxdigit((unsigned char)*p)) { - if (!f) { - b[0] = *p; - f = 1; diff --git a/security/ipsec-tools/patches/patch-ag b/security/ipsec-tools/patches/patch-ag deleted file mode 100644 index c70f27e4c35..00000000000 --- a/security/ipsec-tools/patches/patch-ag +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-ag,v 1.1 2004/12/12 23:51:10 kleink Exp $ - ---- src/racoon/localconf.c.orig 2004-09-21 16:23:20.000000000 +0200 -+++ src/racoon/localconf.c 2004-12-13 00:43:08.000000000 +0100 -@@ -193,13 +193,13 @@ - continue; - - /* search the end of 1st string. */ -- for (p = buf; *p != '\0' && !isspace(*p); p++) -+ for (p = buf; *p != '\0' && !isspace((unsigned char)*p); p++) - ; - if (*p == '\0') - continue; /* no 2nd parameter */ - *p = '\0'; - /* search the 1st of 2nd string. */ -- while (isspace(*++p)) -+ while (isspace((unsigned char)*++p)) - ; - if (*p == '\0') - continue; /* no 2nd parameter */ diff --git a/security/ipsec-tools/patches/patch-ah b/security/ipsec-tools/patches/patch-ah deleted file mode 100644 index 07b10d2f7c3..00000000000 --- a/security/ipsec-tools/patches/patch-ah +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-ah,v 1.1 2004/12/12 23:51:10 kleink Exp $ - ---- src/racoon/backupsa.c.orig 2004-09-21 16:23:11.000000000 +0200 -+++ src/racoon/backupsa.c 2004-12-13 00:45:11.000000000 +0100 -@@ -250,7 +250,7 @@ - created = mktime(&tm); - p++; - -- for (q = p; *q != '\0' && !isspace(*q); q++) -+ for (q = p; *q != '\0' && !isspace((unsigned char)*q); q++) - ; - *q = '\0'; - src = str2saddr(p, NULL); -@@ -258,7 +258,7 @@ - goto err; - p = q + 1; - -- for (q = p; *q != '\0' && !isspace(*q); q++) -+ for (q = p; *q != '\0' && !isspace((unsigned char)*q); q++) - ; - *q = '\0'; - dst = str2saddr(p, NULL); -@@ -271,7 +271,7 @@ - #define GETNEXTNUM(value, function) \ - do { \ - char *y; \ -- for (q = p; *q != '\0' && !isspace(*q); q++) \ -+ for (q = p; *q != '\0' && !isspace((unsigned char)*q); q++) \ - ; \ - *q = '\0'; \ - (value) = function(p, &y, 10); \ -@@ -453,7 +453,7 @@ - - res = 0; - for (i = len; i > 0; i--) { -- if (!isdigit(*p)) -+ if (!isdigit((unsigned char)*p)) - return -1; - res *= 10; - res += *p - '0'; -- cgit v1.2.3