Changeset 18460


Ignore:
Timestamp:
2009-11-22T04:48:32+01:00 (8 years ago)
Author:
nbd
Message:

Fix and upgrade the ahcpd package

  • 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).

Signed-off-by: Gabriel Kerneis <kerneis@…>

Location:
packages/ipv6/ahcpd
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • packages/ipv6/ahcpd/Makefile

    r15266 r18460  
    99 
    1010PKG_NAME:=ahcpd 
    11 PKG_VERSION:=0.5 
    12 PKG_RELEASE:=2 
     11PKG_VERSION:=0.50 
     12PKG_RELEASE:=3 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
    1515PKG_SOURCE_URL:=http://www.pps.jussieu.fr/~jch/software/files/ 
    16 PKG_MD5SUM:=0e5fe1199161eeef214c43eca7eec9a1 
     16PKG_MD5SUM:=627ec199784c60e5250651f82511fff2 
    1717 
    1818include $(INCLUDE_DIR)/package.mk 
     
    2323  TITLE:=Ad-Hoc Configuration Protocol daemon 
    2424  URL:=http://www.pps.jussieu.fr/~jch/software/ahcp/ 
    25   DEPENDS:=+kmod-ipv6 +ip 
     25  DEPENDS:=+kmod-ipv6 +ip +librt 
    2626endef 
    2727 
     
    5353define Package/ahcpd/install 
    5454        $(INSTALL_DIR) $(1)/usr/bin 
    55         $(INSTALL_BIN) $(PKG_BUILD_DIR)/ahcp-generate{,-address} $(1)/usr/bin/ 
    5655        $(INSTALL_DIR) $(1)/usr/lib/ahcp 
    57         $(INSTALL_BIN) $(PKG_BUILD_DIR)/ahcp{,-dummy}-config.sh $(1)/usr/lib/ahcp/ 
     56        $(INSTALL_BIN) $(PKG_BUILD_DIR)/ahcp-config.sh $(1)/usr/lib/ahcp/ 
    5857        $(INSTALL_DIR) $(1)/usr/sbin 
    5958        $(INSTALL_BIN) $(PKG_BUILD_DIR)/ahcpd $(1)/usr/sbin/ 
  • packages/ipv6/ahcpd/files/ahcpd.config

    r15266 r18460  
    11config ahcpd 
    22        option interfaces "wl0" 
     3        option no_config true 
    34        option no_dns false 
    4         option no_ipv4 true 
     5        option ipv4_only false 
     6        option ipv6_only false 
  • packages/ipv6/ahcpd/files/ahcpd.init

    r15266 r18460  
    88        local cfg="$1" 
    99        config_get interfaces "$cfg" interfaces 
    10         config_get_bool no_ipv4 "$cfg" no_ipv4 0 
     10        config_get_bool no_config "$cfg" no_config 0 
     11        config_get_bool ipv4_only "$cfg" ipv4_only 0 
     12        config_get_bool ipv6_only "$cfg" ipv6_only 0 
    1113        config_get_bool no_dns "$cfg" no_dns 0 
    1214} 
     
    1618        config_foreach ahcpd_config ahcpd 
    1719        mkdir -p /var/lib 
    18         [ -r /usr/lib/ahcp/ahcp.dat ] && authority="-a /usr/lib/ahcp/ahcp.dat" 
    19         if [ "$no_ipv4" -eq 0 ]; then 
    20                 unset no_ipv4 
     20        if [ "$no_config" -eq 0 ]; then 
     21                unset no_config 
     22        fi 
     23        if [ "$ipv4_only" -eq 0 ]; then 
     24                unset ipv4_only 
     25        fi 
     26        if [ "$ipv6_only" -eq 0 ]; then 
     27                unset ipv6_only 
    2128        fi 
    2229        if [ "$no_dns" -eq 0 ]; then 
     
    2633                echo "$pidfile exists -- not starting ahcpd." >&2 
    2734        else 
    28                 /usr/sbin/ahcpd -D -I $pidfile ${no_ipv4:+-s} ${no_dns:+-N} $authority $interfaces 
     35                /usr/sbin/ahcpd -s /usr/lib/ahcp/ahcp-config.sh -D -I $pidfile \ 
     36                ${ipv4_only:+-4} ${ipv6_only:+-6} ${no_dns:+-N} ${no_config:+-n} \ 
     37                $interfaces 
    2938        fi 
    3039} 
Note: See TracChangeset for help on using the changeset viewer.