From: swalker Date: Thu, 3 Feb 2011 03:25:29 +0000 (+0000) Subject: [packages] ndisc: update to 1.0.0 X-Git-Url: http://git.archive.openwrt.org/?a=commitdiff_plain;h=60472ecda0148771545f595056b35a3670e56d4a;p=packages.git [packages] ndisc: update to 1.0.0 * add missing libpthread dependencies * append -std=c99 to TARGET_CFLAGS * update URL * use PKG_INSTALL * refresh patches git-svn-id: svn://svn.openwrt.org/openwrt/packages@25336 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/ipv6/ndisc/Makefile b/ipv6/ndisc/Makefile index d16a6a6ed..c2679e043 100644 --- a/ipv6/ndisc/Makefile +++ b/ipv6/ndisc/Makefile @@ -1,5 +1,5 @@ # -# 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. @@ -8,12 +8,14 @@ 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 @@ -22,7 +24,7 @@ define Package/ndisc 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 @@ -32,6 +34,7 @@ endef define Package/ndisc6 $(call Package/ndisc) TITLE:=An ICMPv6 neighbour discovery tool + DEPENDS:=+libpthread endef define Package/ndisc6/description @@ -41,6 +44,7 @@ endef define Package/rdisc6 $(call Package/ndisc) TITLE:=An ICMPv6 router discovery tool + DEPENDS:=+libpthread endef define Package/rdisc6/description @@ -59,7 +63,7 @@ endef define Package/rdnssd $(call Package/ndisc) TITLE:=DNS server discovery daemon - DEPENDS:=+librt + DEPENDS:=+libpthread endef define Package/rdnssd/description @@ -67,32 +71,26 @@ A recursive DNS server discovery daemon gathering 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)) diff --git a/ipv6/ndisc/patches/110-strverscmp.patch b/ipv6/ndisc/patches/110-strverscmp.patch index ccee8da0b..345661fef 100644 --- a/ipv6/ndisc/patches/110-strverscmp.patch +++ b/ipv6/ndisc/patches/110-strverscmp.patch @@ -1,6 +1,6 @@ --- 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 \ @@ -12,16 +12,16 @@ --- 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 \ @@ -31,7 +31,7 @@ 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@