From d3c061f918097e6fc798664fbb65c9ae5c393f09 Mon Sep 17 00:00:00 2001 From: Jakub Jirutka Date: Sun, 4 Mar 2018 18:51:43 +0100 Subject: main/iputils: upgrade to 20161105 and change upstream https://github.com/iputils/iputils is used in VoidLinux, Gentoo, Fedora, Arch Linux... --- main/iputils/APKBUILD | 49 +++++------ main/iputils/fix-init-of-cmsg.patch | 2 + main/iputils/iputils-20070202-no-open-max.patch | 16 ---- ...s_files_iputils-20121221-add-bits_types_h.patch | 94 ---------------------- ...utils_files_iputils-20121221-crypto-build.patch | 35 -------- ...ls_files_iputils-20121221-fix-init-elemnt.patch | 23 ------ ...s_files_iputils-20121221-fix-musl-headers.patch | 89 -------------------- ...c_iputils_files_iputils-20121221-makefile.patch | 61 -------------- ...sc_iputils_files_iputils-20121221-openssl.patch | 92 --------------------- ...putils_files_iputils-20121221-printf-size.patch | 64 --------------- ...ls-20121221-remove-rdisc-glibc-assumption.patch | 30 ------- 11 files changed, 20 insertions(+), 535 deletions(-) delete mode 100644 main/iputils/iputils-20070202-no-open-max.patch delete mode 100644 main/iputils/net-misc_iputils_files_iputils-20121221-add-bits_types_h.patch delete mode 100644 main/iputils/net-misc_iputils_files_iputils-20121221-crypto-build.patch delete mode 100644 main/iputils/net-misc_iputils_files_iputils-20121221-fix-init-elemnt.patch delete mode 100644 main/iputils/net-misc_iputils_files_iputils-20121221-fix-musl-headers.patch delete mode 100644 main/iputils/net-misc_iputils_files_iputils-20121221-makefile.patch delete mode 100644 main/iputils/net-misc_iputils_files_iputils-20121221-openssl.patch delete mode 100644 main/iputils/net-misc_iputils_files_iputils-20121221-printf-size.patch delete mode 100644 main/iputils/net-misc_iputils_files_iputils-20121221-remove-rdisc-glibc-assumption.patch (limited to 'main') diff --git a/main/iputils/APKBUILD b/main/iputils/APKBUILD index e0e9f415e5..96708948e9 100644 --- a/main/iputils/APKBUILD +++ b/main/iputils/APKBUILD @@ -1,53 +1,40 @@ # Maintainer: Natanael Copa pkgname=iputils -pkgver=20121221 -pkgrel=8 +pkgver=20161105 +pkgrel=0 pkgdesc="IP Configuration Utilities (and Ping)" -url="http://www.linuxfoundation.org/en/Net:Iputils" +url="https://github.com/iputils/iputils/" arch="all" -license="BSD" -install="" -depends="" +license="BSD-3-Clause GPL-2.0-or-later" makedepends="libcap-dev libressl-dev" replaces="bbsuid" -source="http://www.skbuff.net/$pkgname/$pkgname-s$pkgver.tar.bz2 - net-misc_iputils_files_iputils-20121221-add-bits_types_h.patch - net-misc_iputils_files_iputils-20121221-crypto-build.patch - net-misc_iputils_files_iputils-20121221-fix-init-elemnt.patch - net-misc_iputils_files_iputils-20121221-fix-musl-headers.patch - net-misc_iputils_files_iputils-20121221-makefile.patch - net-misc_iputils_files_iputils-20121221-openssl.patch - net-misc_iputils_files_iputils-20121221-printf-size.patch - net-misc_iputils_files_iputils-20121221-remove-rdisc-glibc-assumption.patch +source="https://github.com/iputils/$pkgname/archive/s$pkgver.tar.gz time.patch fix-init-of-cmsg.patch " options="!check suid" -builddir="$srcdir"/$pkgname-s$pkgver +builddir="$srcdir/$pkgname-s$pkgver" build() { cd "$builddir" - make USE_GNUTLS=no KERNEL_INCLUDE=/usr/include + make USE_IDN=no USE_NETTLE=no KERNEL_INCLUDE=/usr/include } package() { + local name cd "$builddir" - for i in arping clockdiff ipg rarpd rdisc tftpd tracepath tracepath6; do - install -D -m755 $i "$pkgdir"/usr/sbin/$i + + for name in arping clockdiff ipg rarpd rdisc tftpd tracepath; do + install -D -m755 $name "$pkgdir"/usr/sbin/$name done - for i in ping ping6 traceroute6; do - install -D -m4755 $i "$pkgdir"/bin/$i + for name in ping traceroute6; do + install -D -m4755 $name "$pkgdir"/bin/$name done + + ln -s tracepath "$pkgdir"/usr/sbin/tracepath6 + ln -s ping "$pkgdir"/bin/ping6 } -sha512sums="693d240becd766c345c3af2053fc0699b9358e54d667d40738c21d731b70e779112d81476a220d8300ca54250120385414a13610d445996f95a90571047389f4 iputils-s20121221.tar.bz2 -666c1711c5a5c829246a0f9a3d9afbb0ceb43e172b907230b856dbc0a330814d0c562e1894ee3b6051c01b54469fafd429c4236954967691b12744cacc844dab net-misc_iputils_files_iputils-20121221-add-bits_types_h.patch -922daa01f00c19f8237515b2d3ab73b87daa957cfc491382def2ce1c098ffed943ad4952c94134f3155570f64353abf5348523ea773ce7eb457578f975cc92d2 net-misc_iputils_files_iputils-20121221-crypto-build.patch -15cc4a96851eaa77f08e3914139925cecc50ff7161a693e86cb6f5ae09da5c2d232325f922c1cf4af20d639ed89071314092f31fa55e23bc5033bfb74eeda7a3 net-misc_iputils_files_iputils-20121221-fix-init-elemnt.patch -82b88635e5fec34b4175c74d25b821d3b76b899c48aa87b7035ae8702a3ede3abaebb3d9be32cb7e853186d78db5e9c03cdd14cfc1ce9481f6ae65466815bdac net-misc_iputils_files_iputils-20121221-fix-musl-headers.patch -5899942b73d4d13e0ff85f22a81e9107b2a04c82cac6b59559a521c5d0bf25007e34b61b2dfdb40c21b221a108f6ba72c1a51fa59359a400ad045c9394c176db net-misc_iputils_files_iputils-20121221-makefile.patch -05240c00d0a1f9f878a9826d54cbd0128c2ed5ce7cab4685907956156c3cf2131ccd563812b64490bf915a75f52851396966a590027fc4c1886b2d19f421718b net-misc_iputils_files_iputils-20121221-openssl.patch -ff5491ad5a0396bee41fcbfc1384699d396c24da093bd2209dead67f52efcec462dbfb4a43008083742d0139da7bd52e922499b5f7eae028384c74930453dd33 net-misc_iputils_files_iputils-20121221-printf-size.patch -2ed65a0c0188cf6e06bfb5e3795fa720f7e7040533adbc1ce0c5ded435b823792790890826fc4250a6b2fba16576dc024c50d1faf9598f2fe36aadda77db8a36 net-misc_iputils_files_iputils-20121221-remove-rdisc-glibc-assumption.patch +sha512sums="1593077b6eff1e57eb8a32897dd9624a745d0c87db1501a96436b168b109ef22d41ee69406a4a2154d8d72c823c1df723b4c52eeec8d82ba2762fb01dc0d4797 s20161105.tar.gz 530532d16574921d0789af6a82706915e8103e712195c4f2eb6379192cc7126ba6bc9f33e8454118628d59f8932ffd2bb5aaba3b61fa93df83088e3b0d93d227 time.patch -44d7d14d67e3425276cfdfaa613b44a8acec4d8a9c1aa496b5df382ca032e492780ca85f1432bb8103ecbdb076f91ccfa3225dbfe97964d6382cdbe038621917 fix-init-of-cmsg.patch" +2779b9d987089a2a9a39c27a092f16da85881e9dfbc99edcca6baea42912b8a1a7e16b00c19684d2ea1a6123d66f78be12bef43398e63be7d7c97d3d6269a5bf fix-init-of-cmsg.patch" diff --git a/main/iputils/fix-init-of-cmsg.patch b/main/iputils/fix-init-of-cmsg.patch index 8654a62c90..76ebc16c25 100644 --- a/main/iputils/fix-init-of-cmsg.patch +++ b/main/iputils/fix-init-of-cmsg.patch @@ -1,3 +1,5 @@ +Fixes ping on s390x. + diff --git a/ping.c b/ping.c index a0857a1..329553d 100644 --- a/ping.c diff --git a/main/iputils/iputils-20070202-no-open-max.patch b/main/iputils/iputils-20070202-no-open-max.patch deleted file mode 100644 index 5013ba4fdc..0000000000 --- a/main/iputils/iputils-20070202-no-open-max.patch +++ /dev/null @@ -1,16 +0,0 @@ -the OPEN_MAX define has been removed in newer kernel headers so use the -proper method of getting the value dynamically - -http://bugs.gentoo.org/195861 - ---- a/rdisc.c -+++ b/rdisc.c -@@ -247,7 +247,7 @@ void do_fork(void) - if ((pid=fork()) != 0) - exit(0); - -- for (t = 0; t < OPEN_MAX; t++) -+ for (t = 0; t < sysconf(_SC_OPEN_MAX); t++) - if (t != s) - close(t); - diff --git a/main/iputils/net-misc_iputils_files_iputils-20121221-add-bits_types_h.patch b/main/iputils/net-misc_iputils_files_iputils-20121221-add-bits_types_h.patch deleted file mode 100644 index 9ea341895d..0000000000 --- a/main/iputils/net-misc_iputils_files_iputils-20121221-add-bits_types_h.patch +++ /dev/null @@ -1,94 +0,0 @@ -diff -Naur iputils-s20121221.orig/clockdiff.c iputils-s20121221/clockdiff.c ---- iputils-s20121221.orig/clockdiff.c 2014-01-24 15:32:49.111934548 +0000 -+++ iputils-s20121221/clockdiff.c 2014-01-24 15:32:14.438932610 +0000 -@@ -23,6 +23,8 @@ - #include - #endif - -+#include "types.h" -+ - void usage(void) __attribute__((noreturn)); - - #define MAX_HOSTNAMELEN NI_MAXHOST -diff -Naur iputils-s20121221.orig/ping.c iputils-s20121221/ping.c ---- iputils-s20121221.orig/ping.c 2014-01-24 15:32:49.111934548 +0000 -+++ iputils-s20121221/ping.c 2014-01-24 15:32:14.459932611 +0000 -@@ -59,6 +59,7 @@ - */ - - #include "ping_common.h" -+#include "types.h" - - #include - #include -diff -Naur iputils-s20121221.orig/ping6.c iputils-s20121221/ping6.c ---- iputils-s20121221.orig/ping6.c 2014-01-24 15:32:49.112934549 +0000 -+++ iputils-s20121221/ping6.c 2014-01-24 15:32:14.439932610 +0000 -@@ -67,6 +67,7 @@ - * This program has to run SUID to ROOT to access the ICMP socket. - */ - #include "ping_common.h" -+#include "types.h" - - #include - #include -diff -Naur iputils-s20121221.orig/ping_common.c iputils-s20121221/ping_common.c ---- iputils-s20121221.orig/ping_common.c 2014-01-24 15:32:49.112934549 +0000 -+++ iputils-s20121221/ping_common.c 2014-01-24 15:32:14.439932610 +0000 -@@ -1,4 +1,5 @@ - #include "ping_common.h" -+#include "types.h" - #include - #include - #include -diff -Naur iputils-s20121221.orig/ping_common.h iputils-s20121221/ping_common.h ---- iputils-s20121221.orig/ping_common.h 2014-01-24 15:32:14.419932609 +0000 -+++ iputils-s20121221/ping_common.h 2014-01-24 15:33:08.206935616 +0000 -@@ -35,6 +35,7 @@ - #include - - #include "SNAPSHOT.h" -+#include "types.h" - - #define DEFDATALEN (64 - 8) /* default data length */ - -diff -Naur iputils-s20121221.orig/rdisc.c iputils-s20121221/rdisc.c ---- iputils-s20121221.orig/rdisc.c 2014-01-24 15:32:49.113934549 +0000 -+++ iputils-s20121221/rdisc.c 2014-01-24 15:32:14.450932610 +0000 -@@ -62,6 +62,7 @@ - #include - - #include "SNAPSHOT.h" -+#include "types.h" - - struct interface - { -diff -Naur iputils-s20121221.orig/traceroute6.c iputils-s20121221/traceroute6.c ---- iputils-s20121221.orig/traceroute6.c 2014-01-24 15:32:49.113934549 +0000 -+++ iputils-s20121221/traceroute6.c 2014-01-24 15:32:14.440932610 +0000 -@@ -267,6 +267,7 @@ - #include - #include - -+#include "types.h" - #include "SNAPSHOT.h" - - #ifndef SOL_IPV6 -diff -Naur iputils-s20121221.orig/types.h iputils-s20121221/types.h ---- iputils-s20121221.orig/types.h 1970-01-01 00:00:00.000000000 +0000 -+++ iputils-s20121221/types.h 2014-01-24 15:32:14.440932610 +0000 -@@ -0,0 +1,14 @@ -+/* This is a small version of from glibc -+ * to take care of type u_char. -+ * -+ * Anthony G. Basile -+ */ -+#ifndef _BITS_TYPES_H -+#define _BITS_TYPES_H 1 -+ -+typedef unsigned char u_char; -+typedef unsigned short int u_short; -+typedef unsigned int u_int; -+typedef unsigned long int u_long; -+ -+#endif /* mini */ diff --git a/main/iputils/net-misc_iputils_files_iputils-20121221-crypto-build.patch b/main/iputils/net-misc_iputils_files_iputils-20121221-crypto-build.patch deleted file mode 100644 index 1ec3c101d5..0000000000 --- a/main/iputils/net-misc_iputils_files_iputils-20121221-crypto-build.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 568e990d30fc7e9416e0a6f8c74ea5013921eaec Mon Sep 17 00:00:00 2001 -From: Arjan van de Ven -Date: Wed, 16 Jan 2013 03:12:15 +0900 -Subject: [PATCH [iputils]] ping6: Fix build command line argument with gnutls. - -The ping6 command can use either openssl or gnutls... -and the Makefile has a bunch of setup for defining which of the two to use. - -Unfortunately, the final -D define on the commandline to enable gnutls -inside the ping6.c file didn't actually make it onto the gcc -commandline. -This patch adds the $(DEF_CRYPTO) Makefile variable to fix this gap. - -Signed-off-by: Arjan van de Ven -Signed-off-by: YOSHIFUJI Hideaki ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index c62d9df..89249f5 100644 ---- a/Makefile -+++ b/Makefile -@@ -149,7 +149,7 @@ LIB_clockdiff = $(LIB_CAP) - DEF_ping_common = $(DEF_CAP) $(DEF_IDN) - DEF_ping = $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS) - LIB_ping = $(LIB_CAP) $(LIB_IDN) --DEF_ping6 = $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS) $(DEF_ENABLE_PING6_RTHDR) -+DEF_ping6 = $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS) $(DEF_ENABLE_PING6_RTHDR) $(DEF_CRYPTO) - LIB_ping6 = $(LIB_CAP) $(LIB_IDN) $(LIB_RESOLV) $(LIB_CRYPTO) - - ping: ping_common.o --- -1.8.0.2 - diff --git a/main/iputils/net-misc_iputils_files_iputils-20121221-fix-init-elemnt.patch b/main/iputils/net-misc_iputils_files_iputils-20121221-fix-init-elemnt.patch deleted file mode 100644 index 554ce9bd9b..0000000000 --- a/main/iputils/net-misc_iputils_files_iputils-20121221-fix-init-elemnt.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Naur iputils-s20121221.orig/ping.c iputils-s20121221/ping.c ---- iputils-s20121221.orig/ping.c 2014-01-24 15:05:02.082841335 +0000 -+++ iputils-s20121221/ping.c 2014-01-24 15:17:12.975882203 +0000 -@@ -774,9 +774,16 @@ - - do { - static struct iovec iov = {outpack, 0}; -- static struct msghdr m = { &whereto, sizeof(whereto), -- &iov, 1, &cmsg, 0, 0 }; -- m.msg_controllen = cmsg_len; -+ static struct msghdr m; -+ -+ m.msg_name = &whereto; -+ m.msg_namelen = sizeof(whereto); -+ m.msg_iov = &iov; -+ m.msg_iovlen = 1; -+ m.msg_control = &cmsg; -+ m.msg_controllen = sizeof(cmsg); -+ m.msg_flags = 0; -+ - iov.iov_len = cc; - - i = sendmsg(icmp_sock, &m, confirm); diff --git a/main/iputils/net-misc_iputils_files_iputils-20121221-fix-musl-headers.patch b/main/iputils/net-misc_iputils_files_iputils-20121221-fix-musl-headers.patch deleted file mode 100644 index d12dd828c1..0000000000 --- a/main/iputils/net-misc_iputils_files_iputils-20121221-fix-musl-headers.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff -Naur iputils-s20121221.orig/arping.c iputils-s20121221/arping.c ---- iputils-s20121221.orig/arping.c 2012-12-21 14:01:07.000000000 +0000 -+++ iputils-s20121221/arping.c 2014-01-23 21:19:57.091268011 +0000 -@@ -16,7 +16,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- iputils-s20121221.orig/clockdiff.c 2012-12-21 14:01:07.000000000 +0000 -+++ iputils-s20121221/clockdiff.c 2014-01-23 21:19:57.093268011 +0000 -@@ -14,7 +14,6 @@ - #include - #include - #define TSPTYPES --#include - #include - #include - #include -diff -Naur iputils-s20121221.orig/ping_common.h iputils-s20121221/ping_common.h ---- iputils-s20121221.orig/ping_common.h 2012-12-21 14:01:07.000000000 +0000 -+++ iputils-s20121221/ping_common.h 2014-01-23 21:27:07.677292088 +0000 -@@ -7,16 +7,17 @@ - #include - #include - #include --#include -+#include - #include - #include - #include --#include -+#include - #include - #include - #include - #include - #include -+#include - - #ifdef CAPABILITIES - #include ---- iputils-s20121221.orig/rarpd.c 2014-01-24 13:38:46.816551953 +0000 -+++ iputils-s20121221/rarpd.c 2014-01-24 13:36:51.833545524 +0000 -@@ -19,16 +19,17 @@ - #include - #include - #include --#include --#include --#include -+#include -+#include -+#include - #include --#include -+#include - #include - #include - #include - #include - #include -+#include - - int do_reload = 1; - ---- iputils-s20121221.orig/tracepath.c 2014-01-24 13:38:46.865551956 +0000 -+++ iputils-s20121221/tracepath.c 2014-01-23 21:19:57.109268012 +0000 -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - #ifdef USE_IDN - #include - #include ---- iputils-s20121221.orig/tracepath6.c 2014-01-24 13:38:46.865551956 +0000 -+++ iputils-s20121221/tracepath6.c 2014-01-23 21:20:40.316270428 +0000 -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - - #ifdef USE_IDN - #include diff --git a/main/iputils/net-misc_iputils_files_iputils-20121221-makefile.patch b/main/iputils/net-misc_iputils_files_iputils-20121221-makefile.patch deleted file mode 100644 index 66424c85cf..0000000000 --- a/main/iputils/net-misc_iputils_files_iputils-20121221-makefile.patch +++ /dev/null @@ -1,61 +0,0 @@ -From c66609d2c830d6fe06f48f5d38c54eb5cc6f2975 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Thu, 24 Jan 2013 23:36:16 -0500 -Subject: [PATCH [iputils]] fix handling of CFLAGS - -This defaults CFLAGS to -O3 without clobbering settings people have set -up in the environment already. - -Signed-off-by: Mike Frysinger ---- - Makefile | 13 +++++-------- - 1 file changed, 5 insertions(+), 8 deletions(-) - -diff --git a/Makefile b/Makefile -index 2c49940..ecabac3 100644 ---- a/Makefile -+++ b/Makefile -@@ -2,8 +2,6 @@ - # Configuration - # - --# CC --CC=gcc - # Path to parent kernel include files directory - LIBC_INCLUDE=/usr/include - # Libraries -@@ -48,11 +46,10 @@ ENABLE_RDISC_SERVER=no - - # ------------------------------------- - # What a pity, all new gccs are buggy and -Werror does not work. Sigh. --# CCOPT=-fno-strict-aliasing -Wstrict-prototypes -Wall -Werror -g --CCOPT=-fno-strict-aliasing -Wstrict-prototypes -Wall -g --CCOPTOPT=-O3 --GLIBCFIX=-D_GNU_SOURCE --DEFINES= -+# CFLAGS+=-fno-strict-aliasing -Wstrict-prototypes -Wall -Werror -g -+CFLAGS?=-O3 -g -+CFLAGS+=-fno-strict-aliasing -Wstrict-prototypes -Wall -+CPPFLAGS+=-D_GNU_SOURCE - LDLIB= - - FUNC_LIB = $(if $(filter static,$(1)),$(LDFLAG_STATIC) $(2) $(LDFLAG_DYNAMIC),$(2)) -@@ -113,7 +110,6 @@ IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd - IPV6_TARGETS=tracepath6 traceroute6 ping6 - TARGETS=$(IPV4_TARGETS) $(IPV6_TARGETS) - --CFLAGS=$(CCOPTOPT) $(CCOPT) $(GLIBCFIX) $(DEFINES) - LDLIBS=$(LDLIB) $(ADDLIB) - - UNAME_N:=$(shell uname -n) -@@ -132,6 +128,7 @@ all: $(TARGETS) - $(COMPILE.c) $< $(DEF_$(patsubst %.o,%,$@)) -S -o $@ - %.o: %.c - $(COMPILE.c) $< $(DEF_$(patsubst %.o,%,$@)) -o $@ -+LINK.o += $(CFLAGS) - $(TARGETS): %: %.o - $(LINK.o) $^ $(LIB_$@) $(LDLIBS) -o $@ - --- -1.8.0.2 - diff --git a/main/iputils/net-misc_iputils_files_iputils-20121221-openssl.patch b/main/iputils/net-misc_iputils_files_iputils-20121221-openssl.patch deleted file mode 100644 index 1c6ba81dab..0000000000 --- a/main/iputils/net-misc_iputils_files_iputils-20121221-openssl.patch +++ /dev/null @@ -1,92 +0,0 @@ -From b57d77dcfa5cb363b7eba5b331324669a8505ac4 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Thu, 24 Jan 2013 23:32:39 -0500 -Subject: [PATCH [iputils]] ping6: allow disabling of openssl support - -Signed-off-by: Mike Frysinger ---- - Makefile | 5 ++++- - ping6.c | 14 +++++++++++++- - 2 files changed, 17 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 89249f5..2c49940 100644 ---- a/Makefile -+++ b/Makefile -@@ -36,7 +36,7 @@ ARPING_DEFAULT_DEVICE= - - # GNU TLS library for ping6 [yes|no|static] - USE_GNUTLS=yes --# Crypto library for ping6 [shared|static] -+# Crypto library for ping6 [shared|static|no] - USE_CRYPTO=shared - # Resolv library for ping6 [yes|static] - USE_RESOLV=yes -@@ -63,7 +63,10 @@ ifneq ($(USE_GNUTLS),no) - LIB_CRYPTO = $(call FUNC_LIB,$(USE_GNUTLS),$(LDFLAG_GNUTLS)) - DEF_CRYPTO = -DUSE_GNUTLS - else -+ifneq ($(USE_CRYPTO),no) - LIB_CRYPTO = $(call FUNC_LIB,$(USE_CRYPTO),$(LDFLAG_CRYPTO)) -+ DEF_CRYPTO = -DUSE_OPENSSL -+endif - endif - - # USE_RESOLV: LIB_RESOLV -diff --git a/ping6.c b/ping6.c -index c39864d..f2f90af 100644 ---- a/ping6.c -+++ b/ping6.c -@@ -168,8 +168,10 @@ static int icmp_sock; - - #ifdef USE_GNUTLS - # include --#else -+# define USE_CRYPTO -+#elif defined USE_OPENSSL - # include -+# define USE_CRYPTO - #endif - - /* Node Information query */ -@@ -326,6 +328,7 @@ static void niquery_init_nonce(void) - #if !PING6_NONCE_MEMORY - static int niquery_nonce(__u8 *nonce, int fill) - { -+# ifdef USE_CRYPTO - static __u8 digest[MD5_DIGEST_LENGTH]; - static int seq = -1; - -@@ -348,6 +351,10 @@ static int niquery_nonce(__u8 *nonce, int fill) - return -1; - return ntohsp((__u16 *)nonce); - } -+# else -+ fprintf(stderr, "ping6: function not available; crypto disabled\n"); -+ exit(3); -+# endif - } - #endif - -@@ -502,6 +509,7 @@ static int niquery_option_subject_addr_handler(int index, const char *arg) - - static int niquery_option_subject_name_handler(int index, const char *arg) - { -+#ifdef USE_CRYPTO - static char nigroup_buf[INET6_ADDRSTRLEN + 1 + IFNAMSIZ]; - unsigned char *dnptrs[2], **dpp, **lastdnptr; - int n; -@@ -627,6 +635,10 @@ errexit: - free(idn); - free(name); - exit(1); -+#else -+ fprintf(stderr, "ping6: function not available; crypto disabled\n"); -+ exit(3); -+#endif - } - - int niquery_option_help_handler(int index, const char *arg) --- -1.8.0.2 - diff --git a/main/iputils/net-misc_iputils_files_iputils-20121221-printf-size.patch b/main/iputils/net-misc_iputils_files_iputils-20121221-printf-size.patch deleted file mode 100644 index 6d6c3b7d25..0000000000 --- a/main/iputils/net-misc_iputils_files_iputils-20121221-printf-size.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 23fcb10ae15a96aa9e5a823cfe0b612d9522691c Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Sat, 14 Aug 2010 01:16:42 -0400 -Subject: [PATCH [iputils]] tracepath: re-use printf return in print_host - -Since the printf funcs already return the length of chars displayed, -use that value instead of re-calculating the length with strlen. - -This also fixes the handling of the strlen return -- it's a size_t, -not an int. - -Signed-off-by: Mike Frysinger ---- - tracepath.c | 11 ++++------- - tracepath6.c | 11 ++++------- - 2 files changed, 8 insertions(+), 14 deletions(-) - -diff --git a/tracepath.c b/tracepath.c -index 8a08f1d..f155816 100644 ---- a/tracepath.c -+++ b/tracepath.c -@@ -73,13 +73,10 @@ void data_wait(int fd) - - void print_host(const char *a, const char *b, int both) - { -- int plen = 0; -- printf("%s", a); -- plen = strlen(a); -- if (both) { -- printf(" (%s)", b); -- plen += strlen(b) + 3; -- } -+ int plen; -+ plen = printf("%s", a); -+ if (both) -+ plen += printf(" (%s)", b); - if (plen >= HOST_COLUMN_SIZE) - plen = HOST_COLUMN_SIZE - 1; - printf("%*s", HOST_COLUMN_SIZE - plen, ""); -diff --git a/tracepath6.c b/tracepath6.c -index 126fadf..bee95c3 100644 ---- a/tracepath6.c -+++ b/tracepath6.c -@@ -86,13 +86,10 @@ void data_wait(int fd) - - void print_host(const char *a, const char *b, int both) - { -- int plen = 0; -- printf("%s", a); -- plen = strlen(a); -- if (both) { -- printf(" (%s)", b); -- plen += strlen(b) + 3; -- } -+ int plen; -+ plen = printf("%s", a); -+ if (both) -+ plen += printf(" (%s)", b); - if (plen >= HOST_COLUMN_SIZE) - plen = HOST_COLUMN_SIZE - 1; - printf("%*s", HOST_COLUMN_SIZE - plen, ""); --- -1.8.0.2 - diff --git a/main/iputils/net-misc_iputils_files_iputils-20121221-remove-rdisc-glibc-assumption.patch b/main/iputils/net-misc_iputils_files_iputils-20121221-remove-rdisc-glibc-assumption.patch deleted file mode 100644 index 08e764dde6..0000000000 --- a/main/iputils/net-misc_iputils_files_iputils-20121221-remove-rdisc-glibc-assumption.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -Naur iputils-s20121221.orig/rdisc.c iputils-s20121221/rdisc.c ---- iputils-s20121221.orig/rdisc.c 2014-01-24 14:59:29.937822762 +0000 -+++ iputils-s20121221/rdisc.c 2014-01-23 21:25:58.760288234 +0000 -@@ -115,26 +114,7 @@ - - #define MAXIFS 32 - --#if !defined(__GLIBC__) || __GLIBC__ < 2 --/* For router advertisement */ --struct icmp_ra --{ -- u_char icmp_type; /* type of message, see below */ -- u_char icmp_code; /* type sub code */ -- u_short icmp_cksum; /* ones complement cksum of struct */ -- u_char icmp_num_addrs; -- u_char icmp_wpa; /* Words per address */ -- short icmp_lifetime; --}; -- --struct icmp_ra_addr --{ -- __u32 ira_addr; -- __u32 ira_preference; --}; --#else - #define icmp_ra icmp --#endif - - /* Router constants */ - #define MAX_INITIAL_ADVERT_INTERVAL 16 -- cgit v1.2.3