#
-# Copyright (C) 2006-2010 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.
include $(TOPDIR)/rules.mk
PKG_NAME:=ndisc6
-PKG_VERSION:=0.9.9
+PKG_VERSION:=1.0.0
PKG_RELEASE:=1
-PKG_MD5SUM:=aab2209fa7bf6b02ed2f49e7b8e9fa18
-PKG_SOURCE_URL:=http://www.remlab.net/files/ndisc6/
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://www.remlab.net/files/ndisc6
+PKG_MD5SUM:=0aa142213f4b24a6c7dcf75d2a2c05a8
+
+PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
CATEGORY:=IPv6
SUBMENU:=IPv6 discovery tools
TITLE:=IPv6 discovery tools
- URL:=http://people.via.ecp.fr/~rem/ndisc6/
+ URL:=http://www.remlab.net/ndisc6/
endef
define Package/ndisc/description
define Package/ndisc6
$(call Package/ndisc)
TITLE:=An ICMPv6 neighbour discovery tool
+ DEPENDS:=+libpthread
endef
define Package/ndisc6/description
define Package/rdisc6
$(call Package/ndisc)
TITLE:=An ICMPv6 router discovery tool
+ DEPENDS:=+libpthread
endef
define Package/rdisc6/description
define Package/rdnssd
$(call Package/ndisc)
TITLE:=DNS server discovery daemon
- DEPENDS:=+librt
+ DEPENDS:=+libpthread
endef
define Package/rdnssd/description
information through stateless IPv6 autoconfiguration (RFC5006)
endef
-
-define Build/Compile
- $(MAKE) -C $(PKG_BUILD_DIR) \
- $(TARGET_CONFIGURE_OPTS) \
- CFLAGS="$(TARGET_CFLAGS) -std=c99" \
- all
-endef
+TARGET_CFLAGS += -std=c99
define Package/ndisc6/install
$(INSTALL_DIR) $(1)/usr/bin
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/ndisc6 $(1)/usr/bin/
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ndisc6 $(1)/usr/bin/
endef
define Package/rdisc6/install
$(INSTALL_DIR) $(1)/usr/bin
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/rdisc6 $(1)/usr/bin/
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rdisc6 $(1)/usr/bin/
endef
define Package/tcptraceroute6/install
$(INSTALL_DIR) $(1)/usr/bin
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/tcptraceroute6 $(1)/usr/bin/
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/tcptraceroute6 $(1)/usr/bin/
endef
define Package/rdnssd/install
- $(INSTALL_DIR) $(1)/usr/bin
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/rdnssd/rdnssd $(1)/usr/bin/
+ $(INSTALL_DIR) $(1)/usr/sbin
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/rdnssd $(1)/usr/sbin/
endef
$(eval $(call BuildPackage,ndisc6))
--- a/rdnssd/Makefile.am
+++ b/rdnssd/Makefile.am
-@@ -27,7 +27,8 @@ conf_SCRIPTS = merge-hook
+@@ -30,7 +30,8 @@ conf_SCRIPTS = merge-hook
# rdnssd
rdnssd_SOURCES = rdnssd.c rdnssd.h \
icmp.c \
--- a/rdnssd/Makefile.in
+++ b/rdnssd/Makefile.in
-@@ -58,7 +58,7 @@ CONFIG_CLEAN_FILES =
+@@ -60,7 +60,7 @@ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(confdir)"
- sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(sbin_PROGRAMS)
-am_rdnssd_OBJECTS = rdnssd.$(OBJEXT) icmp.$(OBJEXT) netlink.$(OBJEXT)
+am_rdnssd_OBJECTS = rdnssd.$(OBJEXT) icmp.$(OBJEXT) netlink.$(OBJEXT) strverscmp.$(OBJEXT)
rdnssd_OBJECTS = $(am_rdnssd_OBJECTS)
am__DEPENDENCIES_1 =
rdnssd_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-@@ -213,7 +213,8 @@ conf_SCRIPTS = merge-hook
+@@ -251,7 +251,8 @@ conf_SCRIPTS = merge-hook
# rdnssd
rdnssd_SOURCES = rdnssd.c rdnssd.h \
icmp.c \
rdnssd_LDADD = $(LIBRT) \
@top_builddir@/compat/libcompat.a
-@@ -336,6 +337,7 @@ distclean-compile:
+@@ -373,6 +374,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/icmp.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netlink.Po@am__quote@