6relayd: reduce fallout of RA spamming a bit

SVN-Revision: 38488

diff --git a/package/network/ipv6/6relayd/Makefile b/package/network/ipv6/6relayd/Makefile
index a515b7c6b4626eb70d6c51c67e7c7617d4e989ff..6f3c1731736f8a496369eb2f8f24e384a507720f 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
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=6relayd

-PKG_VERSION:=2013-07-26.1
+PKG_VERSION:=2013-10-21

 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_URL:=git://github.com/sbyx/6relayd.git
 PKG_SOURCE_PROTO:=git
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_URL:=git://github.com/sbyx/6relayd.git
 PKG_SOURCE_PROTO:=git

-PKG_SOURCE_VERSION:=2ed520c500b0fbb484cfad5687eb39a0da43dcf7
+PKG_SOURCE_VERSION:=ad00c3dd9ee42f172870708724858ab502b3a689

 
 PKG_MAINTAINER:=Steven Barth <steven@midlink.org>
 
 
 PKG_MAINTAINER:=Steven Barth <steven@midlink.org>
 

diff --git a/package/network/ipv6/6relayd/files/6relayd.hotplug b/package/network/ipv6/6relayd/files/6relayd.hotplug
index 79052822f68ec53a8f9e945e5ac8318e91076cda..fc9d680404d2f86fc3ea8fd638646f375929bab9 100644 (file)
--- a/package/network/ipv6/6relayd/files/6relayd.hotplug
+++ b/package/network/ipv6/6relayd/files/6relayd.hotplug
@@ -1,6 +1,6 @@
 #!/bin/sh
 /etc/init.d/6relayd enabled || exit 0
 #!/bin/sh
 /etc/init.d/6relayd enabled || exit 0

-[ -n "$INTERFACE" ] || exit 0
+[ -n "$INTERFACE" -a "$ACTION" != "ifupdate" ] || exit 0

 
 . /etc/init.d/6relayd
 restart_affected "$INTERFACE"
 
 . /etc/init.d/6relayd
 restart_affected "$INTERFACE"