Hello,
the following patch fixes the ahcpd package. More precisely, it:
- upgrades ahcpd to the latest release (0.50),
- adds librt dependency to the Makefile,
- removes the installation of the obsolete ahcp-dummy-config.sh file,
- fixes the ahcpd.init file to ensure compatibility with ahcpd 0.50,
options, and provide a sane default behaviour (forward ahcpd messages
without performing any configuration).
Since I do not know if opkg is able to distinguish between ahcpd 0.5
(the former version) and ahcpd 0.50 (the current, incompatible,
version), I labelled this release ahcpd-0.50-3 (the former being
ahcpd-0.5-2). If this is unnecessary, please feel free to label it
0.50-1 instead.
Regards,
Signed-off-by: Gabriel Kerneis <kern...@pps.jussieu.fr>
---
Index: ipv6/ahcpd/files/ahcpd.init
===================================================================
--- ipv6/ahcpd/files/ahcpd.init (révision 18433)
+++ ipv6/ahcpd/files/ahcpd.init (copie de travail)
@@ -7,7 +7,9 @@
ahcpd_config() {
local cfg="$1"
config_get interfaces "$cfg" interfaces
- config_get_bool no_ipv4 "$cfg" no_ipv4 0
+ config_get_bool no_config "$cfg" no_config 0
+ config_get_bool ipv4_only "$cfg" ipv4_only 0
+ config_get_bool ipv6_only "$cfg" ipv6_only 0
config_get_bool no_dns "$cfg" no_dns 0
}
@@ -15,17 +17,24 @@
config_load ahcpd
config_foreach ahcpd_config ahcpd
mkdir -p /var/lib
- [ -r /usr/lib/ahcp/ahcp.dat ] && authority="-a /usr/lib/ahcp/ahcp.dat"
- if [ "$no_ipv4" -eq 0 ]; then
- unset no_ipv4
+ if [ "$no_config" -eq 0 ]; then
+ unset no_config
fi
+ if [ "$ipv4_only" -eq 0 ]; then
+ unset ipv4_only
+ fi
+ if [ "$ipv6_only" -eq 0 ]; then
+ unset ipv6_only
+ fi
if [ "$no_dns" -eq 0 ]; then
unset no_dns
fi
if [ -e $pidfile ] ; then
echo "$pidfile exists -- not starting ahcpd." >&2
else
- /usr/sbin/ahcpd -D -I $pidfile ${no_ipv4:+-s} ${no_dns:+-N}
$authority $interfaces
+ /usr/sbin/ahcpd -s /usr/lib/ahcp/ahcp-config.sh -D -I $pidfile \
+ ${ipv4_only:+-4} ${ipv6_only:+-6} ${no_dns:+-N}
${no_config:+-n} \
+ $interfaces
fi
}
Index: ipv6/ahcpd/files/ahcpd.config
===================================================================
--- ipv6/ahcpd/files/ahcpd.config (révision 18433)
+++ ipv6/ahcpd/files/ahcpd.config (copie de travail)
@@ -1,4 +1,6 @@
config ahcpd
option interfaces "wl0"
+ option no_config true
option no_dns false
- option no_ipv4 true
+ option ipv4_only false
+ option ipv6_only false
Index: ipv6/ahcpd/Makefile
===================================================================
--- ipv6/ahcpd/Makefile (révision 18433)
+++ ipv6/ahcpd/Makefile (copie de travail)
@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=ahcpd
-PKG_VERSION:=0.5
-PKG_RELEASE:=2
+PKG_VERSION:=0.50
+PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.pps.jussieu.fr/~jch/software/files/
-PKG_MD5SUM:=0e5fe1199161eeef214c43eca7eec9a1
+PKG_MD5SUM:=627ec199784c60e5250651f82511fff2
include $(INCLUDE_DIR)/package.mk
@@ -22,7 +22,7 @@
CATEGORY:=IPv6
TITLE:=Ad-Hoc Configuration Protocol daemon
URL:=http://www.pps.jussieu.fr/~jch/software/ahcp/
- DEPENDS:=+kmod-ipv6 +ip
+ DEPENDS:=+kmod-ipv6 +ip +librt
endef
define Package/ahcpd/description
@@ -52,9 +52,8 @@
define Package/ahcpd/install
$(INSTALL_DIR) $(1)/usr/bin
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/ahcp-generate{,-address} $(1)/usr/bin/
$(INSTALL_DIR) $(1)/usr/lib/ahcp
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/ahcp{,-dummy}-config.sh
$(1)/usr/lib/ahcp/
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/ahcp-config.sh $(1)/usr/lib/ahcp/
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/ahcpd $(1)/usr/sbin/
$(INSTALL_DIR) $(1)/etc/config
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
