X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=ipv6%2Fradvd%2FMakefile;h=5a8aaf464af67eea07c9abbbb2f872868f5a119e;hb=02a568e6aff57446b736f28228c01d3033e6a51c;hp=e51b963d58eba5e46da3c3baf1e0963098cf0d39;hpb=12a23b283aee2da26a904badd99c616cdc219cbb;p=packages.git

diff --git a/ipv6/radvd/Makefile b/ipv6/radvd/Makefile
index e51b963d5..5a8aaf464 100644
--- a/ipv6/radvd/Makefile
+++ b/ipv6/radvd/Makefile
@@ -1,64 +1,79 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=radvd
-PKG_VERSION:=1.2
-PKG_RELEASE:=1
+PKG_VERSION:=1.8.3
+PKG_RELEASE:=3
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://v6web.litech.org/radvd/dist \
 		http://download.sourcemage.org/mirror
-PKG_MD5SUM:=614876420d76cd2bb5bcb49760c8b9e3
+PKG_MD5SUM:=73d533b7b20f5554c8d3e33643945442
+
+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)/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))