[packages_10.03.2] wide-dhcpv6: backport r28929, r29222

SVN-Revision: 30316

diff --git a/ipv6/wide-dhcpv6/Makefile b/ipv6/wide-dhcpv6/Makefile
index 54950e487fbabcb43ccce48afb0301b69d34e87a..04f13264da869e953bb045b04edf056e170b3d4b 100644 (file)
--- a/ipv6/wide-dhcpv6/Makefile
+++ b/ipv6/wide-dhcpv6/Makefile
@@ -1,9 +1,15 @@
+#
+# Copyright (C) 2010-2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wide-dhcpv6
 PKG_VERSION:=20080615
-PKG_RELEASE:=6.3
+PKG_RELEASE:=10
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
@@ -94,11 +100,11 @@ define Package/wide-dhcpv6-client/install
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/dhcp6c $(1)/usr/sbin
        $(INSTALL_DIR) $(1)/etc/config
-       $(INSTALL_CONF) ./files/dhcp6c.conf $(1)/etc/config/dhcp6c
+       $(INSTALL_CONF) ./files/dhcp6c.config $(1)/etc/config/dhcp6c
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/dhcp6c.init $(1)/etc/init.d/dhcp6c
        $(INSTALL_DIR) $(1)/etc/hotplug.d/iface
-       $(INSTALL_DATA) ./files/dhcp6c.hotplug $(1)/etc/hotplug.d/iface/40-dhcp6c       
+       $(INSTALL_DATA) ./files/dhcp6c.hotplug $(1)/etc/hotplug.d/iface/40-dhcp6c
        $(INSTALL_DIR) $(1)/etc/hotplug.d/dhcp6c
        $(INSTALL_DATA) ./files/dhcp6c-dnsmasq.hotplug $(1)/etc/hotplug.d/dhcp6c/10-dnsmasq
        $(INSTALL_DATA) ./files/dhcp6c-radvd.hotplug $(1)/etc/hotplug.d/dhcp6c/20-radvd
@@ -116,11 +122,11 @@ define Package/wide-dhcpv6-server/install
        $(INSTALL_DIR) $(1)/etc
        $(INSTALL_CONF) $(PKG_BUILD_DIR)/dhcp6s.conf.sample $(1)/etc
        $(INSTALL_DIR) $(1)/etc/config
-       $(INSTALL_CONF) ./files/dhcp6s.conf $(1)/etc/config/dhcp6s
+       $(INSTALL_CONF) ./files/dhcp6s.config $(1)/etc/config/dhcp6s
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/dhcp6s.init $(1)/etc/init.d/dhcp6s
        $(INSTALL_DIR) $(1)/etc/hotplug.d/iface
-       $(INSTALL_DATA) ./files/dhcp6s.hotplug $(1)/etc/hotplug.d/iface/50-dhcp6s       
+       $(INSTALL_DATA) ./files/dhcp6s.hotplug $(1)/etc/hotplug.d/iface/50-dhcp6s
 endef
 
 define Package/wide-dhcpv6-relay/install

diff --git a/ipv6/wide-dhcpv6/files/dhcp6c.conf b/ipv6/wide-dhcpv6/files/dhcp6c.conf
deleted file mode 100644 (file)
index 04a3ca9..0000000
--- a/ipv6/wide-dhcpv6/files/dhcp6c.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-config 'dhcp6c' 'basic'
-       option 'enabled' '0'                            # 1 = enabled; 0 = disabled
-       option 'interface' 'wan'                        # This is the interface the DHCPv6 client will run on
-       option 'dns' 'dnsmasq'                          # Which DNS server you run (only dnsmasq currently supported)
-       option 'debug' '0'                              # 1 = enable debugging; 0 = disable debugging
-       
-       # Send options (1 = send; 0 = do not send)
-       option 'pd' '1'                                 # Prefix Delegation
-       option 'na' '0'                                 # Non-Temporary Address
-       option 'rapid_commit' '1'                       # Rapid Commit
-       
-       # Request options (1 = request; 0 = do not request)
-       option 'domain_name_servers' '1'
-       option 'domain_name' '0'
-       option 'ntp_servers' '0'
-       option 'sip_server_address' '0'
-       option 'sip_server_domain_name' '0'
-       option 'nis_server_address' '0'
-       option 'nis_domain_name' '0'
-       option 'nisp_server_address' '0'
-       option 'nisp_domain_name' '0'
-       option 'bcmcs_server_address' '0'
-       option 'bcmcs_server_domain_name' '0'
-       
-       # Override the used DUID, by default it is derived from the interface MAC
-       # The given value must be uppercase and globally unique!
-       #option 'duid' '00:03:00:06:D8:5D:4C:A5:03:F2'
-
-       # Script to run when a reply is received
-       option 'script' '/usr/bin/dhcp6c-state'
-
-# Define one or more interfaces on which prefixes should be assigned
-config 'interface' 'loopback'
-       option 'enabled' '1'                            # 1 = enabled; 0 = disabled
-       option 'sla_id' '0'                             # Site level aggregator identifier specified in decimal (subnet)
-       option 'sla_len' '4'                            # Site level aggregator length (64 - size of prefix being delegated)
-                                                       # e.g. /60 from ISP -> 64 - 60 = 4
-
-config 'interface' 'lan'
-       option 'enabled' '1'
-       option 'sla_id' '1'
-       option 'sla_len' '4'

diff --git a/ipv6/wide-dhcpv6/files/dhcp6c.config b/ipv6/wide-dhcpv6/files/dhcp6c.config
new file mode 100644 (file)
index 0000000..04a3ca9
--- /dev/null
+++ b/ipv6/wide-dhcpv6/files/dhcp6c.config
@@ -0,0 +1,42 @@
+config 'dhcp6c' 'basic'
+       option 'enabled' '0'                            # 1 = enabled; 0 = disabled
+       option 'interface' 'wan'                        # This is the interface the DHCPv6 client will run on
+       option 'dns' 'dnsmasq'                          # Which DNS server you run (only dnsmasq currently supported)
+       option 'debug' '0'                              # 1 = enable debugging; 0 = disable debugging
+       
+       # Send options (1 = send; 0 = do not send)
+       option 'pd' '1'                                 # Prefix Delegation
+       option 'na' '0'                                 # Non-Temporary Address
+       option 'rapid_commit' '1'                       # Rapid Commit
+       
+       # Request options (1 = request; 0 = do not request)
+       option 'domain_name_servers' '1'
+       option 'domain_name' '0'
+       option 'ntp_servers' '0'
+       option 'sip_server_address' '0'
+       option 'sip_server_domain_name' '0'
+       option 'nis_server_address' '0'
+       option 'nis_domain_name' '0'
+       option 'nisp_server_address' '0'
+       option 'nisp_domain_name' '0'
+       option 'bcmcs_server_address' '0'
+       option 'bcmcs_server_domain_name' '0'
+       
+       # Override the used DUID, by default it is derived from the interface MAC
+       # The given value must be uppercase and globally unique!
+       #option 'duid' '00:03:00:06:D8:5D:4C:A5:03:F2'
+
+       # Script to run when a reply is received
+       option 'script' '/usr/bin/dhcp6c-state'
+
+# Define one or more interfaces on which prefixes should be assigned
+config 'interface' 'loopback'
+       option 'enabled' '1'                            # 1 = enabled; 0 = disabled
+       option 'sla_id' '0'                             # Site level aggregator identifier specified in decimal (subnet)
+       option 'sla_len' '4'                            # Site level aggregator length (64 - size of prefix being delegated)
+                                                       # e.g. /60 from ISP -> 64 - 60 = 4
+
+config 'interface' 'lan'
+       option 'enabled' '1'
+       option 'sla_id' '1'
+       option 'sla_len' '4'

diff --git a/ipv6/wide-dhcpv6/files/dhcp6s.conf b/ipv6/wide-dhcpv6/files/dhcp6s.conf
deleted file mode 100644 (file)
index dda53d1..0000000
--- a/ipv6/wide-dhcpv6/files/dhcp6s.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-config 'dhcp6s' 'basic'
-       option 'enabled' '0'                            # 1 = enabled; 0 = disabled
-       option 'interface' 'lan'                        # This is the interface the DHCPv6 server will run on
-       option 'config_file' '/etc/dhcp6s.conf'         # Config file (as this UCI config doesn't fully support all options)

diff --git a/ipv6/wide-dhcpv6/files/dhcp6s.config b/ipv6/wide-dhcpv6/files/dhcp6s.config
new file mode 100644 (file)
index 0000000..dda53d1
--- /dev/null
+++ b/ipv6/wide-dhcpv6/files/dhcp6s.config
@@ -0,0 +1,4 @@
+config 'dhcp6s' 'basic'
+       option 'enabled' '0'                            # 1 = enabled; 0 = disabled
+       option 'interface' 'lan'                        # This is the interface the DHCPv6 server will run on
+       option 'config_file' '/etc/dhcp6s.conf'         # Config file (as this UCI config doesn't fully support all options)

diff --git a/ipv6/wide-dhcpv6/files/dhcp6s.init b/ipv6/wide-dhcpv6/files/dhcp6s.init
index fc0da52e9ec68c14c46b08e39064d184f6eb615e..c50765974c59b6584d938951ea2a52b6797a8a9a 100644 (file)
--- a/ipv6/wide-dhcpv6/files/dhcp6s.init
+++ b/ipv6/wide-dhcpv6/files/dhcp6s.init
@@ -1,4 +1,7 @@
 #!/bin/sh /etc/rc.common 
+# Copyright (C) 2010-2011 OpenWrt.org
+
+SERVICE_USE_PID=1
 
 get_ifname() {
        local interface=$1
@@ -10,7 +13,6 @@ get_ifname() {
 }
 
 start() {
-
        [ ! -e /etc/dhcp6sctlkey ] && `dd if=/dev/urandom count=1 2> /dev/null | md5sum | cut -d" " -f1 > /etc/dhcp6sctlkey`
 
        [ -e /var/run/dhcp6s.pid ] && return 0
@@ -18,33 +20,27 @@ start() {
        include /lib/network
 
        config_load "dhcp6s"
-       
+
        local enabled
        config_get_bool enabled basic enabled 0
        [ $enabled -eq 0 ] && return 0
-       
+
        logger starting dhcp6s
-       
+
        local server_interface 
        config_get server_interface basic interface
        local server_ifname=$(get_ifname "$server_interface")
-       
+
        local config_file
        config_get config_file basic config_file
 
        [ ! -e $config_file ] && return 1
-       
-       /usr/sbin/dhcp6s -c $config_file $server_ifname
-       
-       return 0
-       
+
+       service_start /usr/sbin/dhcp6s -c $config_file $server_ifname
 }
 
 stop() {
-
        logger stopping dhcp6s
-       kill -TERM `cat /var/run/dhcp6s.pid`
-       return 0
-       
+       service_stop /usr/sbin/dhcp6s
 }