* [Buildroot] svn commit: trunk/buildroot/package/ipsec-tools
@ 2006-11-20 13:37 aldot at uclibc.org
0 siblings, 0 replies; 8+ messages in thread
From: aldot at uclibc.org @ 2006-11-20 13:37 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2006-11-20 05:37:09 -0800 (Mon, 20 Nov 2006)
New Revision: 16588
Log:
- setkeys needs libfl
Modified:
trunk/buildroot/package/ipsec-tools/Config.in
Changeset:
Modified: trunk/buildroot/package/ipsec-tools/Config.in
===================================================================
--- trunk/buildroot/package/ipsec-tools/Config.in 2006-11-20 01:13:09 UTC (rev 16587)
+++ trunk/buildroot/package/ipsec-tools/Config.in 2006-11-20 13:37:09 UTC (rev 16588)
@@ -2,6 +2,7 @@
bool "ipsec-tools"
default n
select BR2_PACKAGE_OPENSSL
+ select BR2_PACKAGE_FLEX
help
This package is required to support IPSec for Linux 2.6+
^ permalink raw reply [flat|nested] 8+ messages in thread* [Buildroot] svn commit: trunk/buildroot/package/ipsec-tools
@ 2009-03-02 19:56 jacmet at uclibc.org
0 siblings, 0 replies; 8+ messages in thread
From: jacmet at uclibc.org @ 2009-03-02 19:56 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2009-03-02 19:56:13 +0000 (Mon, 02 Mar 2009)
New Revision: 25492
Log:
ipsec-tools: use select rather than depends for library dependencies
As noticed on the mailing list.
Modified:
trunk/buildroot/package/ipsec-tools/Config.in
Changeset:
Modified: trunk/buildroot/package/ipsec-tools/Config.in
===================================================================
--- trunk/buildroot/package/ipsec-tools/Config.in 2009-03-02 19:51:24 UTC (rev 25491)
+++ trunk/buildroot/package/ipsec-tools/Config.in 2009-03-02 19:56:13 UTC (rev 25492)
@@ -1,12 +1,11 @@
config BR2_PACKAGE_IPSEC_TOOLS
bool "ipsec-tools"
- depends on BR2_PACKAGE_OPENSSL && BR2_PACKAGE_FLEX && BR2_PACKAGE_FLEX_LIBFL
+ select BR2_PACKAGE_OPENSSL
+ select BR2_PACKAGE_FLEX
+ select BR2_PACKAGE_FLEX_LIBFL
help
This package is required to support IPSec for Linux 2.6+
-comment "ipsec-tools - disabled (requires openssl, flex and the flex library (libfl.a) )"
- depends on !BR2_PACKAGE_OPENSSL || !BR2_PACKAGE_FLEX
-
config BR2_PACKAGE_IPSEC_TOOLS_ADMINPORT
default y
depends on BR2_PACKAGE_IPSEC_TOOLS
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/ipsec-tools
@ 2007-11-29 13:06 ulf at uclibc.org
0 siblings, 0 replies; 8+ messages in thread
From: ulf at uclibc.org @ 2007-11-29 13:06 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-11-29 05:06:42 -0800 (Thu, 29 Nov 2007)
New Revision: 20589
Log:
Make ipsec-tools depend on packets, instead of selecting them, depend on flex
Modified:
trunk/buildroot/package/ipsec-tools/Config.in
trunk/buildroot/package/ipsec-tools/ipsec-tools.mk
Changeset:
Modified: trunk/buildroot/package/ipsec-tools/Config.in
===================================================================
--- trunk/buildroot/package/ipsec-tools/Config.in 2007-11-29 13:05:28 UTC (rev 20588)
+++ trunk/buildroot/package/ipsec-tools/Config.in 2007-11-29 13:06:42 UTC (rev 20589)
@@ -1,11 +1,13 @@
config BR2_PACKAGE_IPSEC_TOOLS
bool "ipsec-tools"
default n
- select BR2_PACKAGE_OPENSSL
- select BR2_PACKAGE_FLEX
+ depends BR2_PACKAGE_OPENSSL && BR2_PACKAGE_FLEX && BR2_PACKAGE_FLEX_LIBFL
help
This package is required to support IPSec for Linux 2.6+
+comment "ipsec-tools - disabled (requires openssl, flex and the flex library (libfl.a) )"
+ depends on !BR2_PACKAGE_OPENSSL || !BR2_PACKAGE_FLEX
+
config BR2_PACKAGE_IPSEC_TOOLS_ADMINPORT
default y
depends on BR2_PACKAGE_IPSEC_TOOLS
Modified: trunk/buildroot/package/ipsec-tools/ipsec-tools.mk
===================================================================
--- trunk/buildroot/package/ipsec-tools/ipsec-tools.mk 2007-11-29 13:05:28 UTC (rev 20588)
+++ trunk/buildroot/package/ipsec-tools/ipsec-tools.mk 2007-11-29 13:06:42 UTC (rev 20589)
@@ -97,7 +97,7 @@
$(IPSEC_TOOLS_DIR)/$(IPSEC_TOOLS_BINARY_RACOON) \
$(IPSEC_TOOLS_DIR)/$(IPSEC_TOOLS_BINARY_RACOONCTL): \
$(IPSEC_TOOLS_DIR)/.configured
- $(MAKE) CC=$(TARGET_CC) -C $(IPSEC_TOOLS_DIR)
+ $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(IPSEC_TOOLS_DIR)
$(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_SETKEY) \
$(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_RACOON) \
@@ -135,7 +135,7 @@
IPSEC_TOOLS_PROGS+= $(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_RACOONCTL)
endif
-ipsec-tools: uclibc openssl $(IPSEC_TOOLS_PROGS)
+ipsec-tools: uclibc openssl flex $(IPSEC_TOOLS_PROGS)
ipsec-tools-source: $(DL_DIR)/$(IPSEC_TOOLS_SOURCE)
^ permalink raw reply [flat|nested] 8+ messages in thread* [Buildroot] svn commit: trunk/buildroot/package/ipsec-tools
@ 2007-09-23 9:56 ulf at uclibc.org
0 siblings, 0 replies; 8+ messages in thread
From: ulf at uclibc.org @ 2007-09-23 9:56 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-09-23 02:56:21 -0700 (Sun, 23 Sep 2007)
New Revision: 19959
Log:
Fix syntax error when using addprefix in ipsec-tools.mk
Modified:
trunk/buildroot/package/ipsec-tools/ipsec-tools.mk
Changeset:
Modified: trunk/buildroot/package/ipsec-tools/ipsec-tools.mk
===================================================================
--- trunk/buildroot/package/ipsec-tools/ipsec-tools.mk 2007-09-23 09:55:17 UTC (rev 19958)
+++ trunk/buildroot/package/ipsec-tools/ipsec-tools.mk 2007-09-23 09:56:21 UTC (rev 19959)
@@ -112,14 +112,14 @@
$(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_RACOON) \
$(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_RACOONCTL)
ifneq ($(BR2_HAVE_MANPAGES),y)
- rm -f $(addprefix $(TARGET_DIR)/usr/man/,
+ rm -f $(addprefix $(TARGET_DIR)/usr/man/, \
man3/ipsec_strerror.3 man3/ipsec_set_policy.3 \
man5/racoon.conf.5 \
man8/racoonctl.8 man8/racoon.8 \
man8/plainrsa-gen.8 man8/setkey.8)
endif
ifeq ($(strip $(BR2_PACKAGE_IPSEC_TOOLS_LIBS)), y)
- install -D $(addprefix $(IPSEC_TOOLS_DIR)/src/,
+ install -D $(addprefix $(IPSEC_TOOLS_DIR)/src/, \
libipsec/.libs/libipsec.a libipsec/.libs/libipsec.la \
racoon/.libs/libracoon.a racoon/.libs/libracoon.la) \
$(STAGING_DIR)/lib
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/ipsec-tools
@ 2007-06-25 9:41 aldot at uclibc.org
0 siblings, 0 replies; 8+ messages in thread
From: aldot at uclibc.org @ 2007-06-25 9:41 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-06-25 02:41:35 -0700 (Mon, 25 Jun 2007)
New Revision: 18914
Log:
- bump version
- add SUSV legacy fixups
Added:
trunk/buildroot/package/ipsec-tools/ipsec-tools-0.6.7.100-do_not_use_addr_as_truthval.patch
trunk/buildroot/package/ipsec-tools/ipsec-tools-0.6.7.101-string_legacy.patch
trunk/buildroot/package/ipsec-tools/ipsec-tools-0.6.7.102-GLOB_TILDE.patch
Removed:
trunk/buildroot/package/ipsec-tools/ipsec-tools-0.6.6.100-do_not_use_addr_as_truthval.patch
trunk/buildroot/package/ipsec-tools/ipsec-tools-0.6.6.101-string_legacy.patch
trunk/buildroot/package/ipsec-tools/ipsec-tools-0.6.6.102-GLOB_TILDE.patch
Modified:
trunk/buildroot/package/ipsec-tools/ipsec-tools.mk
Changeset:
Deleted: trunk/buildroot/package/ipsec-tools/ipsec-tools-0.6.6.100-do_not_use_addr_as_truthval.patch
===================================================================
--- trunk/buildroot/package/ipsec-tools/ipsec-tools-0.6.6.100-do_not_use_addr_as_truthval.patch 2007-06-25 09:07:08 UTC (rev 18913)
+++ trunk/buildroot/package/ipsec-tools/ipsec-tools-0.6.6.100-do_not_use_addr_as_truthval.patch 2007-06-25 09:41:35 UTC (rev 18914)
@@ -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);
Deleted: trunk/buildroot/package/ipsec-tools/ipsec-tools-0.6.6.101-string_legacy.patch
===================================================================
--- trunk/buildroot/package/ipsec-tools/ipsec-tools-0.6.6.101-string_legacy.patch 2007-06-25 09:07:08 UTC (rev 18913)
+++ trunk/buildroot/package/ipsec-tools/ipsec-tools-0.6.6.101-string_legacy.patch 2007-06-25 09:41:35 UTC (rev 18914)
@@ -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 <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
Deleted: trunk/buildroot/package/ipsec-tools/ipsec-tools-0.6.6.102-GLOB_TILDE.patch
===================================================================
--- trunk/buildroot/package/ipsec-tools/ipsec-tools-0.6.6.102-GLOB_TILDE.patch 2007-06-25 09:07:08 UTC (rev 18913)
+++ trunk/buildroot/package/ipsec-tools/ipsec-tools-0.6.6.102-GLOB_TILDE.patch 2007-06-25 09:41:35 UTC (rev 18914)
@@ -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");
Copied: trunk/buildroot/package/ipsec-tools/ipsec-tools-0.6.7.100-do_not_use_addr_as_truthval.patch (from rev 18907, trunk/buildroot/package/ipsec-tools/ipsec-tools-0.6.6.100-do_not_use_addr_as_truthval.patch)
===================================================================
--- trunk/buildroot/package/ipsec-tools/ipsec-tools-0.6.7.100-do_not_use_addr_as_truthval.patch (rev 0)
+++ trunk/buildroot/package/ipsec-tools/ipsec-tools-0.6.7.100-do_not_use_addr_as_truthval.patch 2007-06-25 09:41:35 UTC (rev 18914)
@@ -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);
Copied: trunk/buildroot/package/ipsec-tools/ipsec-tools-0.6.7.101-string_legacy.patch (from rev 18907, trunk/buildroot/package/ipsec-tools/ipsec-tools-0.6.6.101-string_legacy.patch)
===================================================================
--- trunk/buildroot/package/ipsec-tools/ipsec-tools-0.6.7.101-string_legacy.patch (rev 0)
+++ trunk/buildroot/package/ipsec-tools/ipsec-tools-0.6.7.101-string_legacy.patch 2007-06-25 09:41:35 UTC (rev 18914)
@@ -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
Copied: trunk/buildroot/package/ipsec-tools/ipsec-tools-0.6.7.102-GLOB_TILDE.patch (from rev 18907, trunk/buildroot/package/ipsec-tools/ipsec-tools-0.6.6.102-GLOB_TILDE.patch)
===================================================================
--- trunk/buildroot/package/ipsec-tools/ipsec-tools-0.6.7.102-GLOB_TILDE.patch (rev 0)
+++ trunk/buildroot/package/ipsec-tools/ipsec-tools-0.6.7.102-GLOB_TILDE.patch 2007-06-25 09:41:35 UTC (rev 18914)
@@ -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");
Modified: trunk/buildroot/package/ipsec-tools/ipsec-tools.mk
===================================================================
--- trunk/buildroot/package/ipsec-tools/ipsec-tools.mk 2007-06-25 09:07:08 UTC (rev 18913)
+++ trunk/buildroot/package/ipsec-tools/ipsec-tools.mk 2007-06-25 09:41:35 UTC (rev 18914)
@@ -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 @@
$(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 @@
--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) \
^ permalink raw reply [flat|nested] 8+ messages in thread* [Buildroot] svn commit: trunk/buildroot/package/ipsec-tools
@ 2006-11-22 20:26 aldot at uclibc.org
0 siblings, 0 replies; 8+ messages in thread
From: aldot at uclibc.org @ 2006-11-22 20:26 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2006-11-22 12:26:06 -0800 (Wed, 22 Nov 2006)
New Revision: 16635
Log:
- ignore GLOB_TILDE if it's not available.
Added:
trunk/buildroot/package/ipsec-tools/ipsec-tools-0.6.6.102-GLOB_TILDE.patch
Changeset:
Added: trunk/buildroot/package/ipsec-tools/ipsec-tools-0.6.6.102-GLOB_TILDE.patch
===================================================================
--- trunk/buildroot/package/ipsec-tools/ipsec-tools-0.6.6.102-GLOB_TILDE.patch 2006-11-22 20:21:24 UTC (rev 16634)
+++ trunk/buildroot/package/ipsec-tools/ipsec-tools-0.6.6.102-GLOB_TILDE.patch 2006-11-22 20:26:06 UTC (rev 16635)
@@ -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");
^ permalink raw reply [flat|nested] 8+ messages in thread* [Buildroot] svn commit: trunk/buildroot/package/ipsec-tools
@ 2006-11-17 11:48 aldot at uclibc.org
0 siblings, 0 replies; 8+ messages in thread
From: aldot at uclibc.org @ 2006-11-17 11:48 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2006-11-17 03:48:42 -0800 (Fri, 17 Nov 2006)
New Revision: 16555
Log:
- bump version
Added:
trunk/buildroot/package/ipsec-tools/ipsec-tools-0.6.6.100-do_not_use_addr_as_truthval.patch
trunk/buildroot/package/ipsec-tools/ipsec-tools-0.6.6.101-string_legacy.patch
Modified:
trunk/buildroot/package/ipsec-tools/ipsec-tools.mk
Changeset:
Added: trunk/buildroot/package/ipsec-tools/ipsec-tools-0.6.6.100-do_not_use_addr_as_truthval.patch
===================================================================
--- trunk/buildroot/package/ipsec-tools/ipsec-tools-0.6.6.100-do_not_use_addr_as_truthval.patch 2006-11-17 11:47:04 UTC (rev 16554)
+++ trunk/buildroot/package/ipsec-tools/ipsec-tools-0.6.6.100-do_not_use_addr_as_truthval.patch 2006-11-17 11:48:42 UTC (rev 16555)
@@ -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);
Added: trunk/buildroot/package/ipsec-tools/ipsec-tools-0.6.6.101-string_legacy.patch
===================================================================
--- trunk/buildroot/package/ipsec-tools/ipsec-tools-0.6.6.101-string_legacy.patch 2006-11-17 11:47:04 UTC (rev 16554)
+++ trunk/buildroot/package/ipsec-tools/ipsec-tools-0.6.6.101-string_legacy.patch 2006-11-17 11:48:42 UTC (rev 16555)
@@ -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
Modified: trunk/buildroot/package/ipsec-tools/ipsec-tools.mk
===================================================================
--- trunk/buildroot/package/ipsec-tools/ipsec-tools.mk 2006-11-17 11:47:04 UTC (rev 16554)
+++ trunk/buildroot/package/ipsec-tools/ipsec-tools.mk 2006-11-17 11:48:42 UTC (rev 16555)
@@ -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 @@
$(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
^ permalink raw reply [flat|nested] 8+ messages in thread* [Buildroot] svn commit: trunk/buildroot/package/ipsec-tools
@ 2006-08-28 13:46 aldot at uclibc.org
0 siblings, 0 replies; 8+ messages in thread
From: aldot at uclibc.org @ 2006-08-28 13:46 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2006-08-28 06:46:38 -0700 (Mon, 28 Aug 2006)
New Revision: 16001
Log:
- use cross strip instead of host strip; closes #773
Modified:
trunk/buildroot/package/ipsec-tools/ipsec-tools.mk
Changeset:
Modified: trunk/buildroot/package/ipsec-tools/ipsec-tools.mk
===================================================================
--- trunk/buildroot/package/ipsec-tools/ipsec-tools.mk 2006-08-28 13:29:41 UTC (rev 16000)
+++ trunk/buildroot/package/ipsec-tools/ipsec-tools.mk 2006-08-28 13:46:38 UTC (rev 16001)
@@ -97,8 +97,8 @@
$(IPSEC_TOOLS_DIR)/$(IPSEC_TOOLS_BINARY_SETKEY) \
$(IPSEC_TOOLS_DIR)/$(IPSEC_TOOLS_BINARY_RACOON) \
$(IPSEC_TOOLS_DIR)/$(IPSEC_TOOLS_BINARY_RACOONCTL)
- make -C $(IPSEC_TOOLS_DIR) DESTDIR=$(TARGET_DIR) install
- strip --strip-unneeded --remove-section=.comment \
+ $(MAKE) -C $(IPSEC_TOOLS_DIR) DESTDIR=$(TARGET_DIR) install
+ $(STRIP) --strip-unneeded --remove-section=.comment \
--remove-section=.note \
$(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_SETKEY) \
$(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_RACOON) \
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2009-03-02 19:56 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-11-20 13:37 [Buildroot] svn commit: trunk/buildroot/package/ipsec-tools aldot at uclibc.org
-- strict thread matches above, loose matches on Subject: below --
2009-03-02 19:56 jacmet at uclibc.org
2007-11-29 13:06 ulf at uclibc.org
2007-09-23 9:56 ulf at uclibc.org
2007-06-25 9:41 aldot at uclibc.org
2006-11-22 20:26 aldot at uclibc.org
2006-11-17 11:48 aldot at uclibc.org
2006-08-28 13:46 aldot at uclibc.org
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox