diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/ipsec-tools/ipsec-tools-0.6.7.100-do_not_use_addr_as_truthval.patch (renamed from package/ipsec-tools/ipsec-tools-0.6.6.100-do_not_use_addr_as_truthval.patch) | 0 | ||||
| -rw-r--r-- | package/ipsec-tools/ipsec-tools-0.6.7.101-string_legacy.patch (renamed from package/ipsec-tools/ipsec-tools-0.6.6.101-string_legacy.patch) | 0 | ||||
| -rw-r--r-- | package/ipsec-tools/ipsec-tools-0.6.7.102-GLOB_TILDE.patch (renamed from package/ipsec-tools/ipsec-tools-0.6.6.102-GLOB_TILDE.patch) | 0 | ||||
| -rw-r--r-- | package/ipsec-tools/ipsec-tools.mk | 26 |
4 files changed, 16 insertions, 10 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.7.100-do_not_use_addr_as_truthval.patch index 4988ee5f3..4988ee5f3 100644 --- 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.7.100-do_not_use_addr_as_truthval.patch diff --git a/package/ipsec-tools/ipsec-tools-0.6.6.101-string_legacy.patch b/package/ipsec-tools/ipsec-tools-0.6.7.101-string_legacy.patch index 976081a4d..976081a4d 100644 --- a/package/ipsec-tools/ipsec-tools-0.6.6.101-string_legacy.patch +++ b/package/ipsec-tools/ipsec-tools-0.6.7.101-string_legacy.patch diff --git a/package/ipsec-tools/ipsec-tools-0.6.6.102-GLOB_TILDE.patch b/package/ipsec-tools/ipsec-tools-0.6.7.102-GLOB_TILDE.patch index 41d9c2bf2..41d9c2bf2 100644 --- a/package/ipsec-tools/ipsec-tools-0.6.6.102-GLOB_TILDE.patch +++ b/package/ipsec-tools/ipsec-tools-0.6.7.102-GLOB_TILDE.patch 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) \ |