Changeset 26994


Ignore:
Timestamp:
2011-05-24T11:46:46+02:00 (7 years ago)
Author:
jow
Message:

[PATCH] Update iputils to 20101006
This patch also fixes the ping6 linking issues with uClibc by disabling
the libresolv-based stuff (the "-N nodeinfo-option" feature).

Signed-off-by: Luis Alberto Dallos Roa <luis.dallos at gmail.com>

Location:
packages/net/iputils
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed
  • packages/net/iputils/Makefile

    r26282 r26994  
    99 
    1010PKG_NAME:=iputils 
    11 PKG_VERSION:=20100418 
    12 PKG_RELEASE:=2 
     11PKG_VERSION:=20101006 
     12PKG_RELEASE:=1 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-s$(PKG_VERSION).tar.bz2 
    1515PKG_SOURCE_URL:=http://www.skbuff.net/iputils 
    16 PKG_MD5SUM:=df6b0062118cdc5c62e3c810f831e976 
     16PKG_MD5SUM:=a36c25e9ec17e48be514dc0485e7376c 
    1717 
    1818PKG_BUILD_DEPENDS:=sysfsutils 
     
    6767$(call Package/iputils/Default) 
    6868  TITLE:=iputils - ping6 
    69   DEPENDS+= @IPV6 @BROKEN 
     69  DEPENDS+= @IPV6 
    7070endef 
    7171 
     
    7878define Package/iputils-tftpd 
    7979$(call Package/iputils/Default) 
    80   SUBMENU:=File Transfer 
    8180  TITLE:=iputils - tftpd 
    8281endef 
     
    102101$(call Package/iputils/Default) 
    103102  TITLE:=iputils - tracepath6 
    104   DEPENDS+= @IPV6 @BROKEN 
     103  DEPENDS+= @IPV6 
    105104endef 
    106105 
     
    114113$(call Package/iputils/Default) 
    115114  TITLE:=iputils - traceroute6 
    116   DEPENDS+= @IPV6 @BROKEN 
     115  DEPENDS+= @IPV6 
    117116endef 
    118117 
     
    128127MAKE_FLAGS += \ 
    129128        CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)" \ 
     129        CONFIG_IPV6="$(CONFIG_IPV6)" \ 
     130        CONFIG_USE_UCLIBC="$(CONFIG_USE_UCLIBC)" \ 
    130131 
    131132define Package/iputils-arping/install 
     
    174175$(eval $(call BuildPackage,iputils-tftpd)) 
    175176$(eval $(call BuildPackage,iputils-tracepath)) 
    176 #$(eval $(call BuildPackage,iputils-ping6)) 
    177 #$(eval $(call BuildPackage,iputils-tracepath6)) 
    178 #$(eval $(call BuildPackage,iputils-traceroute6)) 
     177$(eval $(call BuildPackage,iputils-ping6)) 
     178$(eval $(call BuildPackage,iputils-tracepath6)) 
     179$(eval $(call BuildPackage,iputils-traceroute6)) 
  • packages/net/iputils/patches/001-iputils.patch

    r22011 r26994  
    1 diff -ur iputils/Makefile iputils_new/Makefile 
    2 --- iputils/Makefile    2002-09-20 18:23:55.000000000 +0000 
    3 +++ iputils_new/Makefile        2007-05-17 13:59:55.000000000 +0000 
    4 @@ -27,8 +27,8 @@ 
     1diff -ur a/Makefile b/Makefile 
     2--- a/Makefile  2002-09-20 18:23:55.000000000 +0000 
     3+++ b/Makefile  2007-05-17 13:59:55.000000000 +0000 
     4@@ -16,8 +16,8 @@ 
    55 CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g 
    6  CFLAGS=$(CCOPT) $(GLIBCFIX) -I$(KERNEL_INCLUDE) -I../include $(DEFINES)  
     6 CFLAGS=$(CCOPT) $(GLIBCFIX) $(DEFINES)  
    77  
    88-IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd 
     
    1212 TARGETS=$(IPV4_TARGETS) $(IPV6_TARGETS) 
    1313  
    14  all: check-kernel $(TARGETS) 
     14 LASTTAG:=`git describe HEAD | sed -e 's/-.*//'` 
  • packages/net/iputils/patches/002-fix-ipv6.patch

    r22083 r26994  
    1111+endif 
    1212  
    13  LASTTAG:=`git-describe HEAD | sed -e 's/-.*//'` 
     13 LASTTAG:=`git describe HEAD | sed -e 's/-.*//'` 
    1414 TAG:=`date +s%Y%m%d` 
  • packages/net/iputils/patches/003-fix-makefile.patch

    r22083 r26994  
    11--- a/Makefile 
    22+++ b/Makefile 
    3 @@ -30,9 +30,11 @@ all: $(TARGETS) 
     3@@ -30,9 +30,13 @@ all: $(TARGETS) 
    44  
    55  
     
    1010 ping: ping.o ping_common.o 
    1111-ping6: ping6.o ping_common.o -lresolv -lcrypto 
    12 +ping6: ping6.o ping_common.o  
    13 +       $(CC) $(CFLAGS) -o $@  ping6.o ping_common.o -lresolv -lcrypto 
     12+ping6: ping6.o ping_common.o 
     13+ifneq ($(CONFIG_USE_UCLIBC),y) 
     14+       $(CC) $(CFLAGS) -o $@ ping6.o ping_common.o -lresolv -lcrypto 
     15+endif 
    1416 ping.o ping6.o ping_common.o: ping_common.h 
    1517 tftpd.o tftpsubs.o: tftp.h 
Note: See TracChangeset for help on using the changeset viewer.