From 0982183a8d7313a63718c86e3524caea1910b886 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Mon, 25 Jun 2007 09:41:35 +0000 Subject: - bump version - add SUSV legacy fixups --- ...ols-0.6.6.100-do_not_use_addr_as_truthval.patch | 45 ---------------------- .../ipsec-tools-0.6.6.101-string_legacy.patch | 32 --------------- .../ipsec-tools-0.6.6.102-GLOB_TILDE.patch | 15 -------- ...ols-0.6.7.100-do_not_use_addr_as_truthval.patch | 45 ++++++++++++++++++++++ .../ipsec-tools-0.6.7.101-string_legacy.patch | 32 +++++++++++++++ .../ipsec-tools-0.6.7.102-GLOB_TILDE.patch | 15 ++++++++ package/ipsec-tools/ipsec-tools.mk | 26 ++++++++----- 7 files changed, 108 insertions(+), 102 deletions(-) delete mode 100644 package/ipsec-tools/ipsec-tools-0.6.6.100-do_not_use_addr_as_truthval.patch delete mode 100644 package/ipsec-tools/ipsec-tools-0.6.6.101-string_legacy.patch delete mode 100644 package/ipsec-tools/ipsec-tools-0.6.6.102-GLOB_TILDE.patch create mode 100644 package/ipsec-tools/ipsec-tools-0.6.7.100-do_not_use_addr_as_truthval.patch create mode 100644 package/ipsec-tools/ipsec-tools-0.6.7.101-string_legacy.patch create mode 100644 package/ipsec-tools/ipsec-tools-0.6.7.102-GLOB_TILDE.patch (limited to 'package') 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 deleted file mode 100644 index 4988ee5f3..000000000 --- a/package/ipsec-tools/ipsec-tools-0.6.6.100-do_not_use_addr_as_truthval.patch +++ /dev/null @@ -1,45 +0,0 @@ -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 deleted file mode 100644 index 976081a4d..000000000 --- a/package/ipsec-tools/ipsec-tools-0.6.6.101-string_legacy.patch +++ /dev/null @@ -1,32 +0,0 @@ -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 - - #include -+#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 - #include -+#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-0.6.6.102-GLOB_TILDE.patch b/package/ipsec-tools/ipsec-tools-0.6.6.102-GLOB_TILDE.patch deleted file mode 100644 index 41d9c2bf2..000000000 --- a/package/ipsec-tools/ipsec-tools-0.6.6.102-GLOB_TILDE.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- ipsec-tools-0.6.6.oorig/src/racoon/cftoken.c 2006-06-13 10:49:01.000000000 +0200 -+++ ipsec-tools-0.6.6/src/racoon/cftoken.c 2006-11-22 21:20:30.000000000 +0100 -@@ -4076,8 +4076,11 @@ - "Includes nested too deeply"); - return -1; - } -- -+#ifdef GLOB_TILDE - if (glob(path, GLOB_TILDE, NULL, &incstack[incstackp].matches) != 0 || -+#else -+ if (glob(path, 0, NULL, &incstack[incstackp].matches) != 0 || -+#endif - incstack[incstackp].matches.gl_pathc == 0) { - plog(LLV_ERROR, LOCATION, NULL, - "glob found no matches for path"); diff --git a/package/ipsec-tools/ipsec-tools-0.6.7.100-do_not_use_addr_as_truthval.patch b/package/ipsec-tools/ipsec-tools-0.6.7.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.7.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.7.101-string_legacy.patch b/package/ipsec-tools/ipsec-tools-0.6.7.101-string_legacy.patch new file mode 100644 index 000000000..976081a4d --- /dev/null +++ b/package/ipsec-tools/ipsec-tools-0.6.7.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 + + #include ++#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 + #include ++#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-0.6.7.102-GLOB_TILDE.patch b/package/ipsec-tools/ipsec-tools-0.6.7.102-GLOB_TILDE.patch new file mode 100644 index 000000000..41d9c2bf2 --- /dev/null +++ b/package/ipsec-tools/ipsec-tools-0.6.7.102-GLOB_TILDE.patch @@ -0,0 +1,15 @@ +--- ipsec-tools-0.6.6.oorig/src/racoon/cftoken.c 2006-06-13 10:49:01.000000000 +0200 ++++ ipsec-tools-0.6.6/src/racoon/cftoken.c 2006-11-22 21:20:30.000000000 +0100 +@@ -4076,8 +4076,11 @@ + "Includes nested too deeply"); + return -1; + } +- ++#ifdef GLOB_TILDE + if (glob(path, GLOB_TILDE, NULL, &incstack[incstackp].matches) != 0 || ++#else ++ if (glob(path, 0, NULL, &incstack[incstackp].matches) != 0 || ++#endif + incstack[incstackp].matches.gl_pathc == 0) { + plog(LLV_ERROR, LOCATION, NULL, + "glob found no matches for path"); diff --git a/package/ipsec-tools/ipsec-tools.mk b/package/ipsec-tools/ipsec-tools.mk index e90f2dabf..d6b9c7bbe 100644 --- a/package/ipsec-tools/ipsec-tools.mk +++ b/package/ipsec-tools/ipsec-tools.mk @@ -4,7 +4,7 @@ # ############################################################# -IPSEC_TOOLS_VER:=0.6.6 +IPSEC_TOOLS_VER:=0.6.7 IPSEC_TOOLS_SOURCE:=ipsec-tools-$(IPSEC_TOOLS_VER).tar.bz2 IPSEC_TOOLS_CAT:=$(BZCAT) IPSEC_TOOLS_DIR:=$(BUILD_DIR)/ipsec-tools-$(IPSEC_TOOLS_VER) @@ -63,17 +63,15 @@ endif $(DL_DIR)/$(IPSEC_TOOLS_SOURCE): $(WGET) -P $(DL_DIR) $(IPSEC_TOOLS_SITE)/$(IPSEC_TOOLS_SOURCE) - -$(IPSEC_TOOLS_DIR)/.source: $(DL_DIR)/$(IPSEC_TOOLS_SOURCE) +$(IPSEC_TOOLS_DIR)/.patched: $(DL_DIR)/$(IPSEC_TOOLS_SOURCE) $(IPSEC_TOOLS_CAT) $(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 + $(CONFIG_UPDATE) $(IPSEC_TOOLS_DIR) + touch $@ -$(IPSEC_TOOLS_DIR)/.configured: $(IPSEC_TOOLS_DIR)/.source - ( cd $(IPSEC_TOOLS_DIR); \ +$(IPSEC_TOOLS_DIR)/.configured: $(IPSEC_TOOLS_DIR)/.patched + ( cd $(IPSEC_TOOLS_DIR); rm -rf config.cache ; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ @@ -83,10 +81,18 @@ $(IPSEC_TOOLS_DIR)/.configured: $(IPSEC_TOOLS_DIR)/.source --disable-hybrid \ --without-libpam \ --disable-gssapi \ - --with-kernel-headers=$(STAGING_DIR)/include \ + --with-kernel-headers=$(STAGING_DIR)/usr/include \ $(IPSEC_TOOLS_CONFIG_FLAGS) \ ); - touch $(IPSEC_TOOLS_DIR)/.configured + # simpler than patching that cruft.. + (echo '#undef bzero' ; \ + echo '#define bzero(a, b) memset((a), 0, (b))' ; \ + echo '#undef bcopy' ; \ + echo '#define bcopy(src, dest, len) memmove(dest, src, len)' ; \ + echo '#undef index' ; \ + echo '#define index(a, b) strchr(a, b)' ; \ + ) >> $(IPSEC_TOOLS_DIR)/config.h + touch $@ $(IPSEC_TOOLS_DIR)/$(IPSEC_TOOLS_BINARY_SETKEY) \ $(IPSEC_TOOLS_DIR)/$(IPSEC_TOOLS_BINARY_RACOON) \ -- cgit v1.2.3