[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-537-gc0bd330
Brought to you by:
sszy
|
From: Julien B a. A. <ar...@us...> - 2010-07-14 09:42:57
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via c0bd33059f1769bfec86e32806bd9d2031cb49cd (commit)
via 6f984fdf1f8f51802639a056e651406d5bf09ae6 (commit)
from be075ea9ca9833e2ed0825386cd6a78712980fb7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit c0bd33059f1769bfec86e32806bd9d2031cb49cd
Merge: 6f984fdf1f8f51802639a056e651406d5bf09ae6 be075ea9ca9833e2ed0825386cd6a78712980fb7
Author: Julien Boibessot <jul...@ar...>
Date: Wed Jul 14 11:42:15 2010 +0200
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 6f984fdf1f8f51802639a056e651406d5bf09ae6
Author: Julien Boibessot <jul...@ar...>
Date: Wed Jul 14 11:41:40 2010 +0200
[BUILDROOT] [2010.05] Add series of patches from BR mainline to make ipsec-tools compiling better
-----------------------------------------------------------------------
Summary of changes:
...ols-bump_version_and_convert_to_autotools.patch | 273 ++++++++++++++++++++
...-sstrip-fix_section_length_corruption_bug.patch | 27 ++
.../2010.05/128-flex-bump_patch_version.patch | 28 ++
...3_legacy_functions_with_modern_equivalent.patch | 55 ++++
4 files changed, 383 insertions(+), 0 deletions(-)
create mode 100644 patches/buildroot/2010.05/126-ipsec-tools-bump_version_and_convert_to_autotools.patch
create mode 100644 patches/buildroot/2010.05/127-sstrip-fix_section_length_corruption_bug.patch
create mode 100644 patches/buildroot/2010.05/128-flex-bump_patch_version.patch
create mode 100644 patches/buildroot/2010.05/129-ipsec-tools-replaces_susv3_legacy_functions_with_modern_equivalent.patch
diff --git a/patches/buildroot/2010.05/126-ipsec-tools-bump_version_and_convert_to_autotools.patch b/patches/buildroot/2010.05/126-ipsec-tools-bump_version_and_convert_to_autotools.patch
new file mode 100644
index 0000000..4704278
--- /dev/null
+++ b/patches/buildroot/2010.05/126-ipsec-tools-bump_version_and_convert_to_autotools.patch
@@ -0,0 +1,273 @@
+From dff1d590b2a0fadf58b6eed60029b2ecbab7c710 Mon Sep 17 00:00:00 2001
+From: Peter Korsgaard <ja...@su...>
+Date: Sun, 13 Jun 2010 12:24:48 +0000
+Subject: ipsec-tools: bump version, convert to autotools format and simplify Config.in
+
+Closes #2035
+
+- Remove -Werror from CFLAGS
+- Always enable ipv6 support if available in toolchain
+- Always install into staging
+
+Signed-off-by: Peter Korsgaard <ja...@su...>
+---
+diff --git a/package/ipsec-tools/Config.in b/package/ipsec-tools/Config.in
+index d29cb86..8a5f3d1 100644
+--- a/package/ipsec-tools/Config.in
++++ b/package/ipsec-tools/Config.in
+@@ -6,16 +6,16 @@ config BR2_PACKAGE_IPSEC_TOOLS
+ help
+ This package is required to support IPSec for Linux 2.6+
+
++if BR2_PACKAGE_IPSEC_TOOLS
++
+ config BR2_PACKAGE_IPSEC_TOOLS_ADMINPORT
+ default y
+- depends on BR2_PACKAGE_IPSEC_TOOLS
+ bool "Enable racoonctl(8)."
+ help
+ Lets racoon to listen to racoon admin port, which is to
+ be contacted by racoonctl(8).
+
+ config BR2_PACKAGE_IPSEC_TOOLS_NATT
+- depends on BR2_PACKAGE_IPSEC_TOOLS
+ bool "Enable NAT-Traversal"
+ help
+ This needs kernel support, which is available on Linux. On
+@@ -27,9 +27,7 @@ config BR2_PACKAGE_IPSEC_TOOLS_NATT
+ live in a country where software patents are legal, using
+ NAT-Traversal might infringe a patent.
+
+-
+ config BR2_PACKAGE_IPSEC_TOOLS_FRAG
+- depends on BR2_PACKAGE_IPSEC_TOOLS
+ bool "Enable IKE fragmentation."
+ help
+ Enable IKE fragmentation, which is a workaround for
+@@ -37,32 +35,12 @@ config BR2_PACKAGE_IPSEC_TOOLS_FRAG
+
+ config BR2_PACKAGE_IPSEC_TOOLS_STATS
+ default y
+- depends on BR2_PACKAGE_IPSEC_TOOLS
+ bool "Enable statistics logging function."
+
+-config BR2_PACKAGE_IPSEC_TOOLS_IPV6
+- default y
+- depends on BR2_PACKAGE_IPSEC_TOOLS && BR2_INET_IPV6
+- bool "Enable IPv6 support"
+- help
+- This option has no effect if uClibc has been compiled without
+- IPv6 support.
+-
+ config BR2_PACKAGE_IPSEC_TOOLS_READLINE
+- depends on BR2_PACKAGE_IPSEC_TOOLS
+ select BR2_PACKAGE_READLINE
+ bool "Enable readline input support if available."
+
+-config BR2_PACKAGE_IPSEC_TOOLS_LIBS
+- bool "Install IPSec libraries under staging_dir/lib"
+- default y
+- depends on BR2_PACKAGE_IPSEC_TOOLS
+- help
+- Install libipsec.a and libracoon.a under staging_dir/lib for further
+- development on a host machine.
+-
+-if BR2_PACKAGE_IPSEC_TOOLS
+-
+ choice
+ prompt "Security context"
+ default BR2_PACKAGE_IPSEC_SECCTX_DISABLE
+diff --git a/package/ipsec-tools/ipsec-tools.mk b/package/ipsec-tools/ipsec-tools.mk
+index 911da7c..eddc7ce 100644
+--- a/package/ipsec-tools/ipsec-tools.mk
++++ b/package/ipsec-tools/ipsec-tools.mk
+@@ -4,158 +4,65 @@
+ #
+ #############################################################
+
+-IPSEC_TOOLS_VERSION:=0.7.2
+-IPSEC_TOOLS_SOURCE:=ipsec-tools-$(IPSEC_TOOLS_VERSION).tar.bz2
+-IPSEC_TOOLS_CAT:=$(BZCAT)
+-IPSEC_TOOLS_DIR:=$(BUILD_DIR)/ipsec-tools-$(IPSEC_TOOLS_VERSION)
++IPSEC_TOOLS_VERSION = 0.7.3
++IPSEC_TOOLS_SOURCE = ipsec-tools-$(IPSEC_TOOLS_VERSION).tar.bz2
++IPSEC_TOOLS_SITE = http://ftp.sunet.se/pub/NetBSD/misc/ipsec-tools/0.7/
++IPSEC_TOOLS_INSTALL_STAGING = YES
++IPSEC_TOOLS_DEPENDENCIES = openssl flex host-flex
+
+-IPSEC_TOOLS_BINARY_SETKEY:=src/setkey/setkey
+-IPSEC_TOOLS_BINARY_RACOON:=src/racoon/racoon
+-IPSEC_TOOLS_BINARY_RACOONCTL:=src/racoon/racoonctl
++# configure hardcodes -Werror, so override CFLAGS on make invocation
++IPSEC_TOOLS_MAKE_OPT = CFLAGS='$(TARGET_CFLAGS)'
+
+-IPSEC_TOOLS_TARGET_BINARY_SETKEY:=usr/sbin/setkey
+-IPSEC_TOOLS_TARGET_BINARY_RACOON:=usr/sbin/racoon
+-IPSEC_TOOLS_TARGET_BINARY_RACOONCTL:=usr/sbin/racoonctl
+-IPSEC_TOOLS_SITE=http://ftp.sunet.se/pub/NetBSD/misc/ipsec-tools/0.7/
++IPSEC_TOOLS_CONF_OPT = \
++ --disable-hybrid \
++ --without-libpam \
++ --disable-gssapi \
++ --with-kernel-headers=$(STAGING_DIR)/usr/include
+
+ ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_ADMINPORT), y)
+-IPSEC_TOOLS_CONFIG_FLAGS+= --enable-adminport
++IPSEC_TOOLS_CONF_OPT+= --enable-adminport
+ else
+-IPSEC_TOOLS_CONFIG_FLAGS+= --disable-adminport
++IPSEC_TOOLS_CONF_OPT+= --disable-adminport
+ endif
+
+ ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_NATT), y)
+-IPSEC_TOOLS_CONFIG_FLAGS+= --enable-natt
++IPSEC_TOOLS_CONF_OPT+= --enable-natt
+ else
+-IPSEC_TOOLS_CONFIG_FLAGS+= --disable-natt
++IPSEC_TOOLS_CONF_OPT+= --disable-natt
+ endif
+
+ ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_FRAG), y)
+-IPSEC_TOOLS_CONFIG_FLAGS+= --enable-frag
++IPSEC_TOOLS_CONF_OPT+= --enable-frag
+ else
+-IPSEC_TOOLS_CONFIG_FLAGS+= --disable-frag
++IPSEC_TOOLS_CONF_OPT+= --disable-frag
+ endif
+
+ ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_STATS), y)
+-IPSEC_TOOLS_CONFIG_FLAGS+= --enable-stats
++IPSEC_TOOLS_CONF_OPT+= --enable-stats
+ else
+-IPSEC_TOOLS_CONFIG_FLAGS+= --disable-stats
++IPSEC_TOOLS_CONF_OPT+= --disable-stats
+ endif
+
+ ifeq ($(BR2_INET_IPV6),y)
+-
+-ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_IPV6), y)
+-IPSEC_TOOLS_CONFIG_FLAGS+= --enable-ipv6
++IPSEC_TOOLS_CONF_OPT+= --enable-ipv6
+ else
+-IPSEC_TOOLS_CONFIG_FLAGS+= $(DISABLE_IPV6)
+-endif
+-
+-else # ignore user's choice if it doesn't
+-IPSEC_TOOLS_CONFIG_FLAGS+= $(DISABLE_IPV6)
++IPSEC_TOOLS_CONF_OPT+= --disable-ipv6
+ endif
+
+ ifneq ($(BR2_PACKAGE_IPSEC_TOOLS_READLINE), y)
+-IPSEC_TOOLS_CONFIG_FLAGS+= --without-readline
++IPSEC_TOOLS_CONF_OPT+= --without-readline
++else
++IPSEC_DEPENDENCIES += readline
+ endif
+
+ ifeq ($(BR2_PACKAGE_IPSEC_SECCTX_DISABLE),y)
+-IPSEC_TOOLS_CONFIG_FLAGS+= --enable-security-context=no
++IPSEC_TOOLS_CONF_OPT+= --enable-security-context=no
+ endif
+ ifeq ($(BR2_PACKAGE_IPSEC_SECCTX_ENABLE),y)
+-IPSEC_TOOLS_CONFIG_FLAGS+= --enable-security-context=yes
++IPSEC_TOOLS_CONF_OPT+= --enable-security-context=yes
+ endif
+ ifeq ($(BR2_PACKAGE_IPSEC_SECCTX_KERNEL),y)
+-IPSEC_TOOLS_CONFIG_FLAGS+= --enable-security-context=kernel
+-endif
+-
+-$(DL_DIR)/$(IPSEC_TOOLS_SOURCE):
+- $(call DOWNLOAD,$(IPSEC_TOOLS_SITE),$(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_VERSION)\*.patch
+- $(CONFIG_UPDATE) $(IPSEC_TOOLS_DIR)
+- touch $@
+-
+-$(IPSEC_TOOLS_DIR)/.configured: $(IPSEC_TOOLS_DIR)/.patched
+- ( cd $(IPSEC_TOOLS_DIR); rm -rf config.cache; \
+- $(TARGET_CONFIGURE_OPTS) \
+- $(TARGET_CONFIGURE_ARGS) \
+- ./configure $(QUIET) \
+- --target=$(GNU_TARGET_NAME) \
+- --host=$(GNU_TARGET_NAME) \
+- --build=$(GNU_HOST_NAME) \
+- --prefix=/usr \
+- --sysconfdir=/etc \
+- --disable-hybrid \
+- --without-libpam \
+- --disable-gssapi \
+- --with-kernel-headers=$(STAGING_DIR)/usr/include \
+- $(IPSEC_TOOLS_CONFIG_FLAGS) \
+- )
+- # 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) \
+-$(IPSEC_TOOLS_DIR)/$(IPSEC_TOOLS_BINARY_RACOONCTL): \
+- $(IPSEC_TOOLS_DIR)/.configured
+- $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(IPSEC_TOOLS_DIR)
+-
+-$(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_SETKEY) \
+-$(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_RACOON) \
+-$(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_RACOONCTL): \
+- $(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
+- $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(REMOVE_SECTION_COMMENT) \
+- $(REMOVE_SECTION_NOTE) \
+- $(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_SETKEY) \
+- $(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_RACOON) \
+- $(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_RACOONCTL)
+-ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_LIBS), y)
+- 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
+-endif
+-ifneq ($(BR2_PACKAGE_IPSEC_TOOLS_ADMINPORT), y)
+- rm -f $(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_RACOONCTL)
+-endif
+-
+-IPSEC_TOOLS_PROGS= $(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_SETKEY) \
+- $(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_RACOON)
+-
+-ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_ADMINPORT), y)
+-IPSEC_TOOLS_PROGS+= $(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_RACOONCTL)
++IPSEC_TOOLS_CONF_OPT+= --enable-security-context=kernel
+ endif
+
+-ipsec-tools: openssl flex host-flex $(IPSEC_TOOLS_PROGS)
+-
+-ipsec-tools-source: $(DL_DIR)/$(IPSEC_TOOLS_SOURCE)
+-
+-ipsec-tools-uninstall:
+-
+-ipsec-tools-clean:
+- -$(MAKE) -C $(IPSEC_TOOLS_DIR) DESTDIR=$(TARGET_DIR) uninstall
+- -$(MAKE) -C $(IPSEC_TOOLS_DIR) clean
+-ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_LIBS),y)
+- rm -f $(addprefix $(STAGING_DIR)/lib/, \
+- libipsec.a libipsec.la libracoon.a libracoon.la)
+-endif
+- rm -f $(IPSEC_TOOLS_DIR)/.configured
+-
+-ipsec-tools-dirclean:
+- rm -rf $(IPSEC_TOOLS_DIR)
+-
+-ifeq ($(BR2_PACKAGE_IPSEC_TOOLS), y)
+-TARGETS+=ipsec-tools
+-endif
++$(eval $(call AUTOTARGETS,package,ipsec-tools))
+--
+cgit v0.8.2.1
diff --git a/patches/buildroot/2010.05/127-sstrip-fix_section_length_corruption_bug.patch b/patches/buildroot/2010.05/127-sstrip-fix_section_length_corruption_bug.patch
new file mode 100644
index 0000000..1712ad7
--- /dev/null
+++ b/patches/buildroot/2010.05/127-sstrip-fix_section_length_corruption_bug.patch
@@ -0,0 +1,27 @@
+From c0e307b848d8de23e6f10a179c4f240c023c8b82 Mon Sep 17 00:00:00 2001
+From: Peter Korsgaard <ja...@su...>
+Date: Tue, 13 Jul 2010 11:10:39 +0000
+Subject: sstrip: fix section length corruption bug
+
+Based on openwrt #6847:
+
+https://dev.openwrt.org/ticket/6847
+
+Signed-off-by: Peter Korsgaard <ja...@su...>
+---
+diff --git a/toolchain/sstrip/sstrip.c b/toolchain/sstrip/sstrip.c
+index 1842f05..03adc0e 100644
+--- a/toolchain/sstrip/sstrip.c
++++ b/toolchain/sstrip/sstrip.c
+@@ -253,8 +253,7 @@ static int modifyheaders ## CLASS (Elf ## CLASS ## _Ehdr *ehdr, \
+ ESET(phdr->p_offset,newsize); \
+ ESET(phdr->p_filesz,0); \
+ } else if (EGET(phdr->p_offset) + EGET(phdr->p_filesz) > newsize) { \
+- newsize -= EGET(phdr->p_offset); \
+- ESET(phdr->p_filesz, newsize); \
++ ESET(phdr->p_filesz, newsize - EGET(phdr->p_offset)); \
+ } \
+ } \
+ \
+--
+cgit v0.8.2.1
diff --git a/patches/buildroot/2010.05/128-flex-bump_patch_version.patch b/patches/buildroot/2010.05/128-flex-bump_patch_version.patch
new file mode 100644
index 0000000..0418090
--- /dev/null
+++ b/patches/buildroot/2010.05/128-flex-bump_patch_version.patch
@@ -0,0 +1,28 @@
+From 60e3fab1d4da5babd80dd768b231def15aa5c70c Mon Sep 17 00:00:00 2001
+From: Julien Boibessot <jul...@ar...>
+Date: Tue, 13 Jul 2010 14:08:49 +0200
+Subject: [PATCH] Bump Flex patch version.
+
+Version 9 is no more available on Debian FTP.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+---
+ package/flex/flex.mk | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/package/flex/flex.mk b/package/flex/flex.mk
+index 43e7d57..ad35548 100644
+--- a/package/flex/flex.mk
++++ b/package/flex/flex.mk
+@@ -4,7 +4,7 @@
+ #
+ #############################################################
+ FLEX_VERSION:=2.5.35
+-FLEX_PATCH_VERSION:=9
++FLEX_PATCH_VERSION:=9.1
+ FLEX_SOURCE:=flex_$(FLEX_VERSION).orig.tar.gz
+ FLEX_PATCH:=flex_$(FLEX_VERSION)-$(FLEX_PATCH_VERSION).diff.gz
+ FLEX_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/f/flex
+--
+1.6.0.4
+
diff --git a/patches/buildroot/2010.05/129-ipsec-tools-replaces_susv3_legacy_functions_with_modern_equivalent.patch b/patches/buildroot/2010.05/129-ipsec-tools-replaces_susv3_legacy_functions_with_modern_equivalent.patch
new file mode 100644
index 0000000..f6391ee
--- /dev/null
+++ b/patches/buildroot/2010.05/129-ipsec-tools-replaces_susv3_legacy_functions_with_modern_equivalent.patch
@@ -0,0 +1,55 @@
+From 01ef76485c75e933db853167fdc5c11f1aab952f Mon Sep 17 00:00:00 2001
+From: Julien Boibessot <jul...@ar...>
+Date: Tue, 13 Jul 2010 17:32:18 +0200
+Subject: [PATCH] ipsec-tools: replaces susv3 legacy functions with modern equivalents.
+
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+---
+ package/ipsec-tools/ipsec-tools-susv3-legacy.patch | 34 ++++++++++++++++++++
+ 1 files changed, 34 insertions(+), 0 deletions(-)
+ create mode 100644 package/ipsec-tools/ipsec-tools-susv3-legacy.patch
+
+diff --git a/package/ipsec-tools/ipsec-tools-susv3-legacy.patch b/package/ipsec-tools/ipsec-tools-susv3-legacy.patch
+new file mode 100644
+index 0000000..1bc5047
+--- /dev/null
++++ b/package/ipsec-tools/ipsec-tools-susv3-legacy.patch
+@@ -0,0 +1,34 @@
++Replaces sysv3 legacy functions with modern equivalents.
++
++Index: ipsec-tools-0.7.3/src/racoon/pfkey.c
++===================================================================
++--- ipsec-tools-0.7.3.orig/src/racoon/pfkey.c 2010-07-12 14:46:52.000000000 +0200
+++++ ipsec-tools-0.7.3/src/racoon/pfkey.c 2010-07-12 15:01:39.000000000 +0200
++@@ -3008,12 +3008,12 @@
++ struct sockaddr *paddr;
++
++ paddr = (struct sockaddr *)(xisr + 1);
++- bcopy(paddr, &(*p_isr)->saidx.src,
+++ memmove(&(*p_isr)->saidx.src, paddr,
++ sysdep_sa_len(paddr));
++
++ paddr = (struct sockaddr *)((caddr_t)paddr
++ + sysdep_sa_len(paddr));
++- bcopy(paddr, &(*p_isr)->saidx.dst,
+++ memmove(&(*p_isr)->saidx.dst, paddr,
++ sysdep_sa_len(paddr));
++ }
++
++Index: ipsec-tools-0.7.3/src/racoon/racoonctl.c
++===================================================================
++--- ipsec-tools-0.7.3.orig/src/racoon/racoonctl.c 2010-07-12 14:49:51.000000000 +0200
+++++ ipsec-tools-0.7.3/src/racoon/racoonctl.c 2010-07-12 15:00:52.000000000 +0200
++@@ -785,7 +785,7 @@
++ errx(1, "cannot read source address");
++
++ /* We get "ip[port]" strip the port */
++- if ((idx = index(srcaddr, '[')) == NULL)
+++ if ((idx = strchr(srcaddr, '[')) == NULL)
++ errx(1, "unexpected source address format");
++ *idx = '\0';
++
+--
+1.6.0.4
+
hooks/post-receive
--
armadeus
|