[packages_10.03.1] merge r27682, r27683

[openwrt/svn-archive/archive.git] / ipv6 / radvd / Makefile

diff --git a/ipv6/radvd/Makefile b/ipv6/radvd/Makefile
index 12c5bbcf4e6692b19b8ba07f659dfeeca8072a99..ca4327795a3d12ceb486b7c2cd2ae66a2d626449 100644 (file)
--- a/ipv6/radvd/Makefile
+++ b/ipv6/radvd/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006-2009 OpenWrt.org
+#
+# Copyright (C) 2006-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,55 +8,74 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=radvd
-PKG_VERSION:=1.4
-PKG_RELEASE:=1
+PKG_VERSION:=1.8
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://v6web.litech.org/radvd/dist \
                http://download.sourcemage.org/mirror
-PKG_MD5SUM:=ad57121d57a716aa5db33668e4fb32c5
+PKG_MD5SUM:=50b4cfbdfa04d629d80437fd1d9e2aef
+
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/radvd
+define Package/radvd/Default
   SECTION:=ipv6
   CATEGORY:=IPv6
-  TITLE:=IPv6 Routing Advertisement Daemon
+  TITLE:=IPv6 Routing Advertisement
   URL:=http://v6web.litech.org/radvd/
+  DEPENDS:=+kmod-ipv6
+endef
+
+define Package/radvd
+  $(call Package/radvd/Default)
+  TITLE+= Daemon
 endef
 
 define Package/radvd/description
-IPv6 Routing Advertisement Daemon.
+radvd is the router advertisement daemon for IPv6. It listens to router
+solicitations and sends router advertisements as described in "Neighbor
+Discovery for IP Version 6 (IPv6)" (RFC 4861).  With these advertisements hosts
+can automatically configure their addresses and some other parameters. They also
+can choose a default router based on these advertisements.
 endef
 
-define Build/Configure
-       $(call Build/Configure/Default,\
-               --with-configfile=/etc/radvd.conf \
-               --with-logfile=/var/log/radvd.log \
-               --with-pidfile=/var/run/radvd.pid \
-       )
+define Package/radvdump
+  $(call Package/radvd/Default)
+  TITLE+= Dumper
 endef
 
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               radvd_LDADD=""
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               install
+define Package/radvdump/description
+radvdump prints out the contents of incoming router advertisements sent by radvd
+or some other software implementing (parts of) "Neighbor Discovery for IP
+Version 6 (IPv6)" (RFC 4861).
 endef
 
+CONFIGURE_ARGS += \
+       --with-configfile=/etc/radvd.conf \
+       --with-logfile=/var/log/radvd.log \
+       --with-pidfile=/var/run/radvd.pid
+
 define Package/radvd/conffiles
 /etc/config/radvd
 endef
 
 define Package/radvd/install
        $(INSTALL_DIR) $(1)/etc/config
-       $(INSTALL_DATA) ./files/radvd.config $(1)/etc/config/radvd
+       $(INSTALL_CONF) ./files/radvd.config $(1)/etc/config/radvd
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/radvd.init $(1)/etc/init.d/radvd
+       $(INSTALL_DIR) $(1)/etc/hotplug.d/iface
+       $(INSTALL_DATA) ./files/radvd.hotplug $(1)/etc/hotplug.d/iface/05-radvd
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/radvd $(1)/usr/sbin/
+endef
+
+define Package/radvdump/install
+       $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/radvdump $(1)/usr/sbin/
 endef
 
 $(eval $(call BuildPackage,radvd))
+$(eval $(call BuildPackage,radvdump))