From dea8cc76af4a67e3e25ca09002ea0279b7d9ed3e Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sun, 17 Jul 2011 23:38:41 +0000 Subject: [PATCH] [packages_10.03.1] merge r27673, r27678 SVN-Revision: 27679 --- ipv6/radvd/Makefile | 9 ++++----- ipv6/radvd/files/radvd.hotplug | 5 +++++ ipv6/radvd/patches/002-no_libfl.patch | 11 ----------- 3 files changed, 9 insertions(+), 16 deletions(-) create mode 100644 ipv6/radvd/files/radvd.hotplug delete mode 100644 ipv6/radvd/patches/002-no_libfl.patch diff --git a/ipv6/radvd/Makefile b/ipv6/radvd/Makefile index ee95baba45..16d377c81c 100644 --- a/ipv6/radvd/Makefile +++ b/ipv6/radvd/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=radvd -PKG_VERSION:=1.7 +PKG_VERSION:=1.8 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://v6web.litech.org/radvd/dist \ http://download.sourcemage.org/mirror -PKG_MD5SUM:=5ec417bde33964a07231ddf6353177c8 +PKG_MD5SUM:=50b4cfbdfa04d629d80437fd1d9e2aef PKG_INSTALL:=1 @@ -37,9 +37,6 @@ CONFIGURE_ARGS += \ --with-logfile=/var/log/radvd.log \ --with-pidfile=/var/run/radvd.pid -MAKE_FLAGS += \ - radvd_LDADD="" - define Package/radvd/conffiles /etc/config/radvd endef @@ -49,6 +46,8 @@ define Package/radvd/install $(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/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/radvdump $(1)/usr/sbin/ diff --git a/ipv6/radvd/files/radvd.hotplug b/ipv6/radvd/files/radvd.hotplug new file mode 100644 index 0000000000..10a7ca8f6d --- /dev/null +++ b/ipv6/radvd/files/radvd.hotplug @@ -0,0 +1,5 @@ +#!/bin/sh + +if [ "$ACTION" = ifup ]; then + killall -HUP radvd 2>/dev/null +fi diff --git a/ipv6/radvd/patches/002-no_libfl.patch b/ipv6/radvd/patches/002-no_libfl.patch deleted file mode 100644 index 26041b7142..0000000000 --- a/ipv6/radvd/patches/002-no_libfl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/scanner.l -+++ b/scanner.l -@@ -21,6 +21,8 @@ - - extern char *conf_file; - -+int yywrap(void) { return 1; } -+ - int num_lines = 1; - %} - -- 2.30.2