diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-11-17 11:48:42 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-11-17 11:48:42 +0000 |
| commit | ad8547af5b519870e43ee5e586e1723a7f4b57e8 (patch) | |
| tree | bf75e64fb102fbbbd3dfa60677659ed8e799213b /package | |
| parent | bffe93141bd21639370f59040a933d0ab5057c1d (diff) | |
- bump version
Diffstat (limited to 'package')
3 files changed, 79 insertions, 1 deletions
diff --git a/package/ipsec-tools/ipsec-tools-0.6.6.100-do_not_use_addr_as_truthval.patch b/package/ipsec-tools/ipsec-tools-0.6.6.100-do_not_use_addr_as_truthval.patch new file mode 100644 index 000000000..4988ee5f3 --- /dev/null +++ b/package/ipsec-tools/ipsec-tools-0.6.6.100-do_not_use_addr_as_truthval.patch @@ -0,0 +1,45 @@ +diff -rup ipsec-tools-0.6.6.oorig/src/racoon/eaytest.c ipsec-tools-0.6.6/src/racoon/eaytest.c +--- ipsec-tools-0.6.6.oorig/src/racoon/eaytest.c 2005-06-29 00:38:02.000000000 +0200 ++++ ipsec-tools-0.6.6/src/racoon/eaytest.c 2006-10-11 16:01:45.000000000 +0200 +@@ -311,7 +311,7 @@ certtest(ac, av) + + printf("exact match: succeed.\n"); + +- if (dnstr_w1) { ++ if (*dnstr_w1) { + 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 @@ certtest(ac, av) + printf("wildcard 1 match: succeed.\n"); + } + +- if (dnstr_w1) { ++ if (*dnstr_w1) { + 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 -rup ipsec-tools-0.6.6.oorig/src/racoon/var.h ipsec-tools-0.6.6/src/racoon/var.h +--- ipsec-tools-0.6.6.oorig/src/racoon/var.h 2004-11-20 17:16:59.000000000 +0100 ++++ ipsec-tools-0.6.6/src/racoon/var.h 2006-10-11 16:00:15.000000000 +0200 +@@ -76,9 +76,9 @@ + do { \ + if (getnameinfo((x), sysdep_sa_len(x), (y), sizeof(y), (z), sizeof(z), \ + NIFLAGS) != 0) { \ +- if (y) \ ++ if (*y) \ + strncpy((y), "(invalid)", sizeof(y)); \ +- if (z) \ ++ if (*z) \ + strncpy((z), "(invalid)", sizeof(z)); \ + } \ + } while (0); +@@ -87,7 +87,7 @@ do { \ + do { \ + if (getnameinfo((x), sysdep_sa_len(x), (y), sizeof(y), NULL, 0, \ + NIFLAGS) != 0) { \ +- if (y) \ ++ if (*y) \ + strncpy((y), "(invalid)", sizeof(y)); \ + } \ + } while (0); diff --git a/package/ipsec-tools/ipsec-tools-0.6.6.101-string_legacy.patch b/package/ipsec-tools/ipsec-tools-0.6.6.101-string_legacy.patch new file mode 100644 index 000000000..976081a4d --- /dev/null +++ b/package/ipsec-tools/ipsec-tools-0.6.6.101-string_legacy.patch @@ -0,0 +1,32 @@ +diff -rup ipsec-tools-0.6.6.oorig/src/racoon/missing/crypto/rijndael/rijndael-api-fst.c ipsec-tools-0.6.6/src/racoon/missing/crypto/rijndael/rijndael-api-fst.c +--- ipsec-tools-0.6.6.oorig/src/racoon/missing/crypto/rijndael/rijndael-api-fst.c 2004-01-12 23:31:45.000000000 +0100 ++++ ipsec-tools-0.6.6/src/racoon/missing/crypto/rijndael/rijndael-api-fst.c 2006-10-11 16:29:42.000000000 +0200 +@@ -30,8 +30,12 @@ + #include <crypto/rijndael/rijndael_local.h> + + #include <err.h> ++#ifndef bcopy + #define bcopy(a, b, c) memcpy(b, a, c) ++#endif ++#ifndef bzero + #define bzero(a, b) memset(a, 0, b) ++#endif + #define panic(a) err(1, (a)) + + int rijndael_makeKey(keyInstance *key, BYTE direction, int keyLen, char *keyMaterial) { +diff -rup ipsec-tools-0.6.6.oorig/src/racoon/missing/crypto/sha2/sha2.c ipsec-tools-0.6.6/src/racoon/missing/crypto/sha2/sha2.c +--- ipsec-tools-0.6.6.oorig/src/racoon/missing/crypto/sha2/sha2.c 2004-09-21 16:35:25.000000000 +0200 ++++ ipsec-tools-0.6.6/src/racoon/missing/crypto/sha2/sha2.c 2006-10-11 16:29:08.000000000 +0200 +@@ -50,8 +50,12 @@ + + #include <err.h> + #include <string.h> ++#ifndef bcopy + #define bcopy(a, b, c) memcpy((b), (a), (c)) ++#endif ++#ifndef bzero + #define bzero(a, b) memset((a), 0, (b)) ++#endif + #define panic(a) err(1, (a)) + + #if OPENSSL_VERSION_NUMBER >= 0x00907000L diff --git a/package/ipsec-tools/ipsec-tools.mk b/package/ipsec-tools/ipsec-tools.mk index a9b6fcb71..7fedf5f3a 100644 --- a/package/ipsec-tools/ipsec-tools.mk +++ b/package/ipsec-tools/ipsec-tools.mk @@ -4,7 +4,7 @@ # ############################################################# -IPSEC_TOOLS_VER:=0.6.1 +IPSEC_TOOLS_VER:=0.6.6 IPSEC_TOOLS_SOURCE:=ipsec-tools-$(IPSEC_TOOLS_VER).tar.bz2 IPSEC_TOOLS_DIR:=$(BUILD_DIR)/ipsec-tools-$(IPSEC_TOOLS_VER) @@ -65,6 +65,7 @@ $(DL_DIR)/$(IPSEC_TOOLS_SOURCE): $(IPSEC_TOOLS_DIR)/.source: $(DL_DIR)/$(IPSEC_TOOLS_SOURCE) bunzip2 -c $(DL_DIR)/$(IPSEC_TOOLS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + toolchain/patch-kernel.sh $(IPSEC_TOOLS_DIR) package/ipsec-tools ipsec-tools-$(IPSEC_TOOLS_VER)\*.patch touch $(IPSEC_TOOLS_DIR)/.source $(IPSEC_TOOLS_DIR)/.configured: $(IPSEC_TOOLS_DIR)/.source |