ahcpd: apply unreleased upstream patch

- Tue Jul 20 00:25:27 CEST 2010  Juliusz Chroboczek <jch@pps.jussieu.fr>
  * Fix typo -- ignore autoconf prefixes for plen > 64.
- Use uci_get_state instead of invoking uci directly.

Signed-off-by: Gabriel Kerneis <kerneis@pps.jussieu.fr>
SVN-Revision: 22309

diff --git a/ipv6/ahcpd/Makefile b/ipv6/ahcpd/Makefile
index b044e66e2b3762530ccea5ace1210a431639760a..1a1f4df231a6d5597e0180c51c38652d0f06c723 100644 (file)
--- a/ipv6/ahcpd/Makefile
+++ b/ipv6/ahcpd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ahcpd
 PKG_VERSION:=0.51
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.pps.jussieu.fr/~jch/software/files/

diff --git a/ipv6/ahcpd/files/ahcp.sh b/ipv6/ahcpd/files/ahcp.sh
index e77f33723e45db0ccd53367d80e0e719784b30fd..e909def5304e3ce7bd96a893434cd92f7784b90c 100644 (file)
--- a/ipv6/ahcpd/files/ahcp.sh
+++ b/ipv6/ahcpd/files/ahcp.sh
@@ -34,9 +34,8 @@ append_opt_stmt() {
 }
 
 ahcp_addif() {
-       local name="$1"
-       local _uciname=`uci get -q -P /var/state network.$name.ifname`
-       append interfaces "${_uciname:-$name}"
+       local ifname=$(uci_get_state network "$1" ifname "$1")
+       append interfaces "$ifname"
 }
 
 ahcp_server() {

diff --git a/ipv6/ahcpd/patches/001-autoconf-prefixes.patch b/ipv6/ahcpd/patches/001-autoconf-prefixes.patch
new file mode 100644 (file)
index 0000000..e29dcf1
--- /dev/null
+++ b/ipv6/ahcpd/patches/001-autoconf-prefixes.patch
@@ -0,0 +1,14 @@
+Tue Jul 20 00:25:27 CEST 2010  Juliusz Chroboczek <jch@pps.jussieu.fr>
+  * Fix typo -- ignore autoconf prefixes for plen > 64.
+  Thanks to Gabriel Kerneis.
+--- old-ahcpd/configure.c      2010-07-20 09:31:19.000000000 +0200
++++ new-ahcpd/configure.c      2010-07-20 09:31:19.000000000 +0200
+@@ -505,7 +505,7 @@
+         if(config->ipv6_address) {
+             config->our_ipv6_address = copy_prefix_list(config->ipv6_address);
+         } else if(config->ipv6_prefix && config->ipv6_prefix->n > 0 &&
+-                  config->ipv6_prefix->l[0].plen >= 64) {
++                  config->ipv6_prefix->l[0].plen <= 64) {
+             unsigned char address[16];
+             int have_address = 0;
+