6relayd: Overridden DNS should affect DHCPv6

[openwrt.git] / package / network / ipv6 / 6relayd / Makefile

diff --git a/package/network/ipv6/6relayd/Makefile b/package/network/ipv6/6relayd/Makefile
index d627bd2..eb15cf8 100644 (file)
--- a/package/network/ipv6/6relayd/Makefile
+++ b/package/network/ipv6/6relayd/Makefile
@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=6relayd
-PKG_VERSION:=2012-10-30
+PKG_VERSION:=2013-07-26
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_URL:=git://nbd.name/6relayd.git
+PKG_SOURCE_URL:=git://github.com/sbyx/6relayd.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=04222b093056ff364ab9a31bce92fdae707a589e
+PKG_SOURCE_VERSION:=2ed520c500b0fbb484cfad5687eb39a0da43dcf7
 
 PKG_MAINTAINER:=Steven Barth <steven@midlink.org>
 
@@ -23,24 +23,33 @@ include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
 define Package/6relayd
-  SECTION:=ipv6
-  CATEGORY:=IPv6
-  TITLE:=IPv6-Relay (RD-, DHCPv6- & NDP-Proxy)
-  DEPENDS:=+kmod-ipv6
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=DHCPv6(-PD)/RA Server & Relay
+  DEPENDS:=+kmod-ipv6 @!TARGET_avr32
 endef
 
 define Package/6relayd/description
- 6relayd is an IPv6-tool that relays IPv6-management protocols like router
- discovery, neighbor discovery and DHCPv6 so that clients on routed (non-
- bridged) interfaces can use the public address prefix, DHCPv6 and DNS-service
- of a master interface. This is useful to avoid NAT in chained IPv6-routers.
+ 6relayd is a daemon for serving and relaying IPv6 management protocols to
+ configure clients and downstream routers.
+
+ 6relayd provides server services for RA, stateless DHCPv6, DHCPv6-PD and can
+ be used to relay RA, DHCPv6 and NDP between routed (non-bridged) interfaces
+ in case no delegated prefixes are provided by the upstream router.
+endef
+
+define Package/6relayd/conffiles
+/etc/config/6relayd
 endef
 
 define Package/6relayd/install
        $(INSTALL_DIR) $(1)/usr/sbin/
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/6relayd $(1)/usr/sbin/
+       $(INSTALL_BIN) ./files/6relayd-update $(1)/usr/sbin/
        $(INSTALL_DIR) $(1)/etc/hotplug.d/iface
        $(INSTALL_DATA) ./files/6relayd.hotplug $(1)/etc/hotplug.d/iface/30-6relay
+       $(INSTALL_DIR) $(1)/etc/config
+       $(INSTALL_DATA) ./files/6relayd.config $(1)/etc/config/6relayd
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/6relayd.init $(1)/etc/init.d/6relayd
 endef