commit: 7b5c188d7e91deb52c739f00ba03336c63f69061
Author: stefson <herrtimson <AT> yahoo <DOT> de>
AuthorDate: Wed Jan 3 17:09:35 2018 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Wed Jan 3 17:09:35 2018 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=7b5c188d
net-misc/iputils: in tree works, see #643026
net-misc/iputils/Manifest | 2 -
.../files/021109-uclibc-no-ether_ntohost.patch | 24 ---
.../files/iputils-20071127-nonroot-floodping.patch | 11 --
.../files/iputils-20121221-add-bits_types_h.patch | 94 ------------
.../files/iputils-20121221-fix-header-order.patch | 18 ---
.../files/iputils-20121221-fix-init-elemnt.patch | 23 ---
.../files/iputils-20121221-fix-musl-headers.patch | 89 -----------
.../iputils/files/iputils-20121221-makefile.patch | 61 --------
.../iputils-20121221-missing-AI_IDN-NI_IDN.patch | 34 -----
.../files/iputils-20121221-parallel-doc.patch | 74 ---------
...ls-20121221-remove-rdisc-glibc-assumption.patch | 30 ----
.../iputils/files/iputils-20121221-strtod.patch | 45 ------
.../iputils/files/iputils-99999999-openssl.patch | 97 ------------
.../files/iputils-99999999-tftpd-syslog.patch | 38 -----
net-misc/iputils/files/rarpd.conf.d | 8 -
net-misc/iputils/files/rarpd.init.d | 19 ---
net-misc/iputils/iputils-20151218.ebuild | 166 ---------------------
net-misc/iputils/metadata.xml | 23 ---
18 files changed, 856 deletions(-)
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
deleted file mode 100644
index d87ff4b..0000000
--- a/net-misc/iputils/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST iputils-s20151218-manpages.tar.xz 22336 SHA256
ae60dcf7a5a83d02008c03888935fd2dcff56c9f86734d4656b6284a7631a28d SHA512
964b9e22b18b67215ea48e046c45768cd86076b53db2131b00ac721be9e7de4edadefb74855d81861f12b4e10dcecd90d29f0098c2c4568d7601d97e756be0a3
WHIRLPOOL
82e3c9930861ed2df00c3b40488212dc36d5d65d62e1e7245d778ff77c6660a93bdd1dd8931cdddba4a631a9321741c0c2246d0cf48b22fc562ee7a066ac75fd
-DIST iputils-s20151218.tar.bz2 157187 SHA256
549f58d71951e52b46595829134d4e330642f522f50026917fadc349a54825a1 SHA512
4bf0eed0ae5603e872afb0e09be039df3822a7723e8cbb8cbe578d69d8c457ffac9bdbe2eb17b32c95968e5e4ad6204af955617482c5701671f0f476b560b65c
WHIRLPOOL
e5b1d89eeaf64c2be97217eff37ef9aea33f69925683067c5366eb8db30a0b8cd8e96c2c18eedb573c965a6508efcb9e67effa66da1ad8bd606a1c1ffff9adf7
diff --git a/net-misc/iputils/files/021109-uclibc-no-ether_ntohost.patch
b/net-misc/iputils/files/021109-uclibc-no-ether_ntohost.patch
deleted file mode 100644
index e790d2b..0000000
--- a/net-misc/iputils/files/021109-uclibc-no-ether_ntohost.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- iputils/rarpd.c.mps 2004-06-10 15:27:01.000000000 +0200
-+++ iputils/rarpd.c 2004-06-10 15:26:29.000000000 +0200
-@@ -42,7 +42,9 @@ int listen_arp;
- char *ifname;
- char *tftp_dir = "/etc/tftpboot";
-
-+#ifndef __UCLIBC__
- extern int ether_ntohost(char *name, unsigned char *ea);
-+#endif
- void usage(void) __attribute__((noreturn));
-
- struct iflink
-@@ -305,7 +307,11 @@ struct rarp_map *rarp_lookup(int ifindex
- 6,
- };
-
-+#ifndef __UCLIBC__
- if (ether_ntohost(ename, lladdr) != 0 ||
-+#else
-+ if (
-+#endif
- (hp = gethostbyname(ename)) == NULL) {
- if (verbose)
- syslog(LOG_INFO, "not found in
/etc/ethers");
diff --git a/net-misc/iputils/files/iputils-20071127-nonroot-floodping.patch
b/net-misc/iputils/files/iputils-20071127-nonroot-floodping.patch
deleted file mode 100644
index cae8779..0000000
--- a/net-misc/iputils/files/iputils-20071127-nonroot-floodping.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- iputils-s20071127/ping_common.h.orig 2008-06-10 11:16:06.000000000
+0100
-+++ iputils-s20071127/ping_common.h 2008-06-10 11:16:18.000000000 +0100
-@@ -28,7 +28,7 @@
-
- #define MAXWAIT 10 /* max seconds to wait for
response */
- #define MININTERVAL 10 /* Minimal interpacket gap */
--#define MINUSERINTERVAL 200 /* Minimal allowed interval for
non-root */
-+#define MINUSERINTERVAL 0 /* Minimal allowed interval for
non-root */
-
- #define SCHINT(a) (((a) <= MININTERVAL) ? MININTERVAL : (a))
-
diff --git a/net-misc/iputils/files/iputils-20121221-add-bits_types_h.patch
b/net-misc/iputils/files/iputils-20121221-add-bits_types_h.patch
deleted file mode 100644
index 9ea3418..0000000
--- a/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 <sys/capability.h>
- #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 <netinet/ip.h>
- #include <netinet/ip_icmp.h>
-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 <linux/filter.h>
- #include <netinet/ip6.h>
-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 <ctype.h>
- #include <sched.h>
- #include <math.h>
-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 <linux/errqueue.h>
-
- #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 <syslog.h>
-
- #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 <string.h>
- #include <unistd.h>
-
-+#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 <bits/types.h> from glibc
-+ * to take care of type u_char.
-+ *
-+ * Anthony G. Basile <[email protected]>
-+ */
-+#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 <bits/types.h> */
diff --git a/net-misc/iputils/files/iputils-20121221-fix-header-order.patch
b/net-misc/iputils/files/iputils-20121221-fix-header-order.patch
deleted file mode 100644
index 6bfcea4..0000000
--- a/net-misc/iputils/files/iputils-20121221-fix-header-order.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Naur iputils-s20121221.orig/tracepath.c iputils-s20121221/tracepath.c
---- iputils-s20121221.orig/tracepath.c 2014-11-20 07:39:59.114108620 -0500
-+++ iputils-s20121221/tracepath.c 2014-11-20 07:40:37.813110381 -0500
-@@ -14,13 +14,13 @@
- #include <unistd.h>
- #include <sys/socket.h>
- #include <linux/types.h>
--#include <linux/errqueue.h>
- #include <errno.h>
- #include <string.h>
- #include <netdb.h>
- #include <netinet/in.h>
- #include <resolv.h>
- #include <sys/time.h>
-+#include <linux/errqueue.h>
- #include <sys/uio.h>
- #include <arpa/inet.h>
- #include <limits.h>
diff --git a/net-misc/iputils/files/iputils-20121221-fix-init-elemnt.patch
b/net-misc/iputils/files/iputils-20121221-fix-init-elemnt.patch
deleted file mode 100644
index 554ce9b..0000000
--- a/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/net-misc/iputils/files/iputils-20121221-fix-musl-headers.patch
b/net-misc/iputils/files/iputils-20121221-fix-musl-headers.patch
deleted file mode 100644
index cd1ff55..0000000
--- a/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 <linux/sockios.h>
- #include <sys/file.h>
- #include <sys/time.h>
--#include <sys/signal.h>
-+#include <signal.h>
- #include <sys/ioctl.h>
- #include <net/if.h>
- #include <linux/if_packet.h>
---- 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 <netinet/ip.h>
- #include <netinet/ip_icmp.h>
- #define TSPTYPES
--#include <protocols/timed.h>
- #include <fcntl.h>
- #include <netdb.h>
- #include <arpa/inet.h>
-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 <linux/sockios.h>
- #include <sys/file.h>
- #include <sys/time.h>
--#include <sys/signal.h>
-+#include <signal.h>
- #include <sys/ioctl.h>
- #include <net/if.h>
- #include <sys/uio.h>
--#include <sys/poll.h>
-+#include <poll.h>
- #include <ctype.h>
- #include <errno.h>
- #include <string.h>
- #include <netdb.h>
- #include <setjmp.h>
-+#include <linux/param.h>
-
- #ifdef CAPABILITIES
- #include <sys/prctl.h>
---- 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 <netdb.h>
- #include <arpa/inet.h>
- #include <sys/ioctl.h>
--#include <sys/poll.h>
--#include <sys/errno.h>
--#include <sys/fcntl.h>
-+#include <poll.h>
-+#include <errno.h>
-+#include <fcntl.h>
- #include <sys/socket.h>
--#include <sys/signal.h>
-+#include <signal.h>
- #include <linux/if.h>
- #include <linux/if_arp.h>
- #include <netinet/in.h>
- #include <linux/if_packet.h>
- #include <linux/filter.h>
-+#include <sys/types.h>
-
- 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 <sys/time.h>
- #include <sys/uio.h>
- #include <arpa/inet.h>
-+#include <limits.h>
- #ifdef USE_IDN
- #include <idna.h>
- #include <locale.h>
---- 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 <sys/time.h>
- #include <sys/uio.h>
- #include <arpa/inet.h>
-+#include <limits.h>
-
- #ifdef USE_IDN
- #include <idna.h>
diff --git a/net-misc/iputils/files/iputils-20121221-makefile.patch
b/net-misc/iputils/files/iputils-20121221-makefile.patch
deleted file mode 100644
index 66424c8..0000000
--- a/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 <[email protected]>
-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 <[email protected]>
----
- 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/net-misc/iputils/files/iputils-20121221-missing-AI_IDN-NI_IDN.patch
b/net-misc/iputils/files/iputils-20121221-missing-AI_IDN-NI_IDN.patch
deleted file mode 100644
index b6bf7ea..0000000
--- a/net-misc/iputils/files/iputils-20121221-missing-AI_IDN-NI_IDN.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -Naur iputils-s20121221.orig/ping6.c iputils-s20121221/ping6.c
---- iputils-s20121221.orig/ping6.c 2012-12-21 14:01:07.000000000 +0000
-+++ iputils-s20121221/ping6.c 2015-07-19 00:50:45.254912002 +0000
-@@ -80,6 +80,13 @@
- #include <stringprep.h>
- #endif
-
-+#ifndef AI_IDN
-+#define AI_IDN 0x0040
-+#endif
-+#ifndef NI_IDN
-+#define NI_IDN 32
-+#endif
-+
- #include "ping6_niquery.h"
- #include "in6_flowlabel.h"
-
-diff -Naur iputils-s20121221.orig/tracepath6.c iputils-s20121221/tracepath6.c
---- iputils-s20121221.orig/tracepath6.c 2012-12-21 14:01:07.000000000
+0000
-+++ iputils-s20121221/tracepath6.c 2015-07-19 00:51:06.490911203 +0000
-@@ -31,6 +31,13 @@
- #include <locale.h>
- #endif
-
-+#ifndef AI_IDN
-+#define AI_IDN 0x0040
-+#endif
-+#ifndef NI_IDN
-+#define NI_IDN 32
-+#endif
-+
- #ifndef SOL_IPV6
- #define SOL_IPV6 IPPROTO_IPV6
- #endif
diff --git a/net-misc/iputils/files/iputils-20121221-parallel-doc.patch
b/net-misc/iputils/files/iputils-20121221-parallel-doc.patch
deleted file mode 100644
index 22bfb88..0000000
--- a/net-misc/iputils/files/iputils-20121221-parallel-doc.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 4e322b85a12ba3ef5e8118724e3442b2ebb0f6d6 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <[email protected]>
-Date: Wed, 1 Aug 2012 11:43:34 -0400
-Subject: [PATCH iputils] doc: fix parallel build of html/man pages
-
-The use of the same tempdir prevents building of these files in parallel.
-So build all of them in unique tempdirs so we can do them in parallel.
-
-Signed-off-by: Mike Frysinger <[email protected]>
----
- doc/Makefile | 37 ++++++++++++++++++++++++-------------
- 1 file changed, 24 insertions(+), 13 deletions(-)
-
-diff --git a/doc/Makefile b/doc/Makefile
-index 7ec4f1c..4f930a3 100644
---- a/doc/Makefile
-+++ b/doc/Makefile
-@@ -12,29 +12,40 @@ man: $(MANFILES)
- # lots of some strange temporary junk directories and files.
- # So, scope it to a temporary dir and clean all after each run.
-
--$(HTMLFILES): index.db
-- @-rm -rf tmp.db2html
-- @mkdir tmp.db2html
-- @set -e; cd tmp.db2html; docbook2html ../$< ; mv *.html ..
-- @-rm -rf tmp.db2html
-+SETUP_TMPDIR = \
-+ t="tmp.db2html.$@"; \
-+ rm -rf $$t; \
-+ mkdir $$t; \
-+ cd $$t
-+CLEAN_TMPDIR = \
-+ cd ..; \
-+ rm -rf $$t
-+
-+MAKE_HTML = \
-+ @set -e; \
-+ $(SETUP_TMPDIR); \
-+ docbook2html ../$<; \
-+ mv *.html ..; \
-+ $(CLEAN_TMPDIR)
-
-+$(HTMLFILES): index.db
-+ $(MAKE_HTML)
- iputils.html: iputils.db
-- @-rm -rf tmp.db2html
-- @mkdir tmp.db2html
-- @set -e; cd tmp.db2html; docbook2html -u -o html ../$< ; mv html/$@ ..
-- @-rm -rf tmp.db2html
-+ $(MAKE_HTML)
-
- # docbook2man produces utterly ugly output and I did not find
- # any way to customize this but hacking backend perl script a little.
- # Well, hence...
-
- $(MANFILES): index.db
-- @-mkdir tmp.db2man
-- @set -e; cd tmp.db2man; nsgmls ../$< | sgmlspl ../docbook2man-spec.pl ;
mv $@ ..
-- @-rm -rf tmp.db2man
-+ @set -e; \
-+ $(SETUP_TMPDIR); \
-+ nsgmls ../$< | sgmlspl ../docbook2man-spec.pl; \
-+ mv $@ ..; \
-+ $(CLEAN_TMPDIR)
-
- clean:
-- @rm -rf $(MANFILES) $(HTMLFILES) iputils.html tmp.db2html tmp.db2man
-+ @rm -rf $(MANFILES) $(HTMLFILES) iputils.html tmp.db2html* tmp.db2man*
-
- snapshot:
- @date "+%y%m%d" > snapshot.db
---
-2.3.5
-
diff --git
a/net-misc/iputils/files/iputils-20121221-remove-rdisc-glibc-assumption.patch
b/net-misc/iputils/files/iputils-20121221-remove-rdisc-glibc-assumption.patch
deleted file mode 100644
index 08e764d..0000000
---
a/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
diff --git a/net-misc/iputils/files/iputils-20121221-strtod.patch
b/net-misc/iputils/files/iputils-20121221-strtod.patch
deleted file mode 100644
index 303acf5..0000000
--- a/net-misc/iputils/files/iputils-20121221-strtod.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-https://bugs.gentoo.org/472592
-
-From dd0aa192626f94d08e399fc2a743ee72c50853fb Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <[email protected]>
-Date: Fri, 24 Apr 2015 20:41:31 -0400
-Subject: [PATCH iputils] ping: fix -i number parsing in locales
-
-Always use #.# format for the -i flag even when the current locale uses
-a different separator. Locale de_DE which uses #,# normally.
-
-Simple testcase:
-$ make USE_IDN=1
-$ LANG=de_DE.UTF8 ./ping -i 0.5 localhost
-
-Reported-by: Sergey Fionov <[email protected]>
-Signed-off-by: Mike Frysinger <[email protected]>
----
- ping_common.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/ping_common.c b/ping_common.c
-index 62f53a6..0a37e09 100644
---- a/ping_common.c
-+++ b/ping_common.c
-@@ -269,9 +269,17 @@ void common_options(int ch)
- double dbl;
- char *ep;
-
-+#ifdef USE_IDN
-+ setlocale(LC_ALL, "C");
-+#endif
-+
- errno = 0;
- dbl = strtod(optarg, &ep);
-
-+#ifdef USE_IDN
-+ setlocale(LC_ALL, "");
-+#endif
-+
- if (errno || *ep != '\0' ||
- !finite(dbl) || dbl < 0.0 || dbl >= (double)INT_MAX / 1000
- 1.0) {
- fprintf(stderr, "ping: bad timing interval\n");
---
-2.3.5
-
diff --git a/net-misc/iputils/files/iputils-99999999-openssl.patch
b/net-misc/iputils/files/iputils-99999999-openssl.patch
deleted file mode 100644
index 13f5639..0000000
--- a/net-misc/iputils/files/iputils-99999999-openssl.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 321d64b9f94653322e678e34ac214ddb73a71db8 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <[email protected]>
-Date: Thu, 24 Jan 2013 23:32:39 -0500
-Subject: [PATCH iputils] ping6: allow disabling of openssl support
-
-Signed-off-by: Mike Frysinger <[email protected]>
----
- Makefile | 5 ++++-
- iputils_md5dig.h | 4 +++-
- ping6.c | 10 ++++++++++
- 3 files changed, 17 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 54e5a6d..7147f08 100644
---- a/Makefile
-+++ b/Makefile
-@@ -36,7 +36,7 @@ ARPING_DEFAULT_DEVICE=
-
- # Libgcrypt (for MD5) for ping6 [yes|no|static]
- USE_GCRYPT=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_GCRYPT),no)
- LIB_CRYPTO = $(call FUNC_LIB,$(USE_GCRYPT),$(LDFLAG_GCRYPT))
- DEF_CRYPTO = -DUSE_GCRYPT
- 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/iputils_md5dig.h b/iputils_md5dig.h
-index 4cec866..d6c4d46 100644
---- a/iputils_md5dig.h
-+++ b/iputils_md5dig.h
-@@ -5,8 +5,10 @@
- # include <stdlib.h>
- # include <gcrypt.h>
- # define IPUTILS_MD5DIG_LEN 16
--#else
-+# define USE_CRYPTO
-+#elif defined(USE_OPENSSL)
- # include <openssl/md5.h>
-+# define USE_CRYPTO
- #endif
-
- #ifdef USE_GCRYPT
-diff --git a/ping6.c b/ping6.c
-index 7085f31..7b7c1af 100644
---- a/ping6.c
-+++ b/ping6.c
-@@ -324,6 +324,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;
-
-@@ -346,6 +347,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
-
-@@ -500,6 +505,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;
-@@ -625,6 +631,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)
---
-2.3.5
-
diff --git a/net-misc/iputils/files/iputils-99999999-tftpd-syslog.patch
b/net-misc/iputils/files/iputils-99999999-tftpd-syslog.patch
deleted file mode 100644
index ad34f3b..0000000
--- a/net-misc/iputils/files/iputils-99999999-tftpd-syslog.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From e88ed3752872d7c7ca37d95eb4d434ca4d3c4eae Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <[email protected]>
-Date: Sat, 19 Apr 2014 10:39:39 -0400
-Subject: [PATCH iputils] tftpd: fix syslog setup
-
-Commit d81a44625b04d487c895473aa77af13420b7afdd added support for checking
-the set*id calls, but would call syslog() before it had called openlog().
-Move the call up earlier to fix that.
-
-Signed-off-by: Mike Frysinger <[email protected]>
----
- tftpd.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/tftpd.c b/tftpd.c
-index e3af2f4..7ddc8eb 100644
---- a/tftpd.c
-+++ b/tftpd.c
-@@ -109,6 +109,8 @@ int main(int ac, char **av)
- register int n = 0;
- int on = 1;
-
-+ openlog("tftpd", LOG_PID, LOG_DAEMON);
-+
- /* Sanity. If parent forgot to setuid() on us. */
- if (geteuid() == 0) {
- if (setgid(65534)) {
-@@ -125,7 +127,6 @@ int main(int ac, char **av)
- while (ac-- > 0 && n < MAXARG)
- dirs[n++] = *av++;
-
-- openlog("tftpd", LOG_PID, LOG_DAEMON);
- if (ioctl(0, FIONBIO, &on) < 0) {
- syslog(LOG_ERR, "ioctl(FIONBIO): %m\n");
- exit(1);
---
-2.3.5
-
diff --git a/net-misc/iputils/files/rarpd.conf.d
b/net-misc/iputils/files/rarpd.conf.d
deleted file mode 100644
index ef7fc48..0000000
--- a/net-misc/iputils/files/rarpd.conf.d
+++ /dev/null
@@ -1,8 +0,0 @@
-# Config file for /etc/init.d/rarpd
-
-# You probably want to select the interface for this to listen on.
-# By default it uses loopback which most likely won't help.
-RARPD_IFACE="lo"
-
-# See the rarpd(8) manpage for more info.
-RARPD_OPTS="-b /tftpboot"
diff --git a/net-misc/iputils/files/rarpd.init.d
b/net-misc/iputils/files/rarpd.init.d
deleted file mode 100644
index 27081fc..0000000
--- a/net-misc/iputils/files/rarpd.init.d
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-pidfile="/var/run/rarpd.pid"
-command="/usr/sbin/rarpd"
-# The -d option keeps it from forking. This way s-s-d can do the fork and
-# set up the pidfile with the right value below.
-command_args="-d ${RARPD_OPTS} ${RARPD_IFACE}"
-start_stop_daemon_args="--background --make-pidfile"
-
-start_pre() {
- if [ ! -f /etc/ethers ] ; then
- eerror "Please create /etc/ethers with the following content:"
- eerror "[MAC address] [name or IP]"
- return 1
- fi
- return 0
-}
diff --git a/net-misc/iputils/iputils-20151218.ebuild
b/net-misc/iputils/iputils-20151218.ebuild
deleted file mode 100644
index ffa652d..0000000
--- a/net-misc/iputils/iputils-20151218.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# For released versions, we precompile the man/html pages and store
-# them in a tarball on our mirrors. This avoids ugly issues while
-# building stages, and when the jade/sgml packages are broken (which
-# seems to be more common than would be nice).
-
-EAPI=5
-
-inherit flag-o-matic eutils toolchain-funcs fcaps
-if [[ ${PV} == "99999999" ]] ; then
- EGIT_REPO_URI="git://www.linux-ipv6.org/gitroot/iputils"
- inherit git-2
-else
- SRC_URI="http://www.skbuff.net/iputils/iputils-s${PV}.tar.bz2
-
https://dev.gentoo.org/~polynomial-c/iputils-s${PV}-manpages.tar.xz";
- KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh
sparc x86 ~ppc-aix ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Network monitoring tools including ping and ping6"
-HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils";
-
-LICENSE="BSD GPL-2+ rdisc"
-SLOT="0"
-IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl rarpd rdisc
SECURITY_HAZARD ssl static tftpd tracepath traceroute"
-
-LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
- idn? ( net-dns/libidn[static-libs(+)] )
- ipv6? ( ssl? (
- gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
- !gcrypt? (
- !libressl? ( dev-libs/openssl:0[static-libs(+)] )
- libressl? ( dev-libs/libressl[static-libs(+)] )
- )
- ) )"
-RDEPEND="arping? ( !net-misc/arping )
- rarpd? ( !net-misc/rarpd )
- traceroute? ( !net-analyzer/traceroute )
- !static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )
- virtual/os-headers"
-if [[ ${PV} == "99999999" ]] ; then
- DEPEND+="
- app-text/openjade
- dev-perl/SGMLSpm
- app-text/docbook-sgml-dtd
- app-text/docbook-sgml-utils
- "
-fi
-
-S=${WORKDIR}/${PN}-s${PV}
-
-PATCHES=(
- # musl patches
- "${FILESDIR}"/${PN}-20121221-fix-musl-headers.patch
- "${FILESDIR}"/${PN}-20121221-add-bits_types_h.patch
- "${FILESDIR}"/${PN}-20121221-remove-rdisc-glibc-assumption.patch
- "${FILESDIR}"/${PN}-20121221-fix-init-elemnt.patch
- "${FILESDIR}"/${PN}-20121221-fix-header-order.patch
- "${FILESDIR}"/${PN}-20121221-missing-AI_IDN-NI_IDN.patch
-
- "${FILESDIR}"/021109-uclibc-no-ether_ntohost.patch
- "${FILESDIR}"/${PN}-99999999-openssl.patch #335436
- "${FILESDIR}"/${PN}-99999999-tftpd-syslog.patch
- "${FILESDIR}"/${PN}-20121221-makefile.patch
- "${FILESDIR}"/${PN}-20121221-parallel-doc.patch
- "${FILESDIR}"/${PN}-20121221-strtod.patch #472592
-)
-
-src_prepare() {
- use SECURITY_HAZARD && PATCHES+=(
"${FILESDIR}"/${PN}-20071127-nonroot-floodping.patch )
- epatch "${PATCHES[@]}"
-}
-
-src_configure() {
- use static && append-ldflags -static
-
- IPV4_TARGETS=(
- ping
- $(for v in arping clockdiff rarpd rdisc tftpd tracepath ; do
usev ${v} ; done)
- )
- IPV6_TARGETS=(
- ping6
- $(usex tracepath 'tracepath6' '')
- $(usex traceroute 'traceroute6' '')
- )
- use ipv6 || IPV6_TARGETS=()
-}
-
-ldflag_resolv() {
- # See if the system includes a libresolv. #584132
- echo "main(){}" > "${T}"/resolv.c
- if ${CC} ${CFLAGS} ${LDFLAGS} "${T}"/resolv.c -lresolv -o "${T}"/resolv
2>/dev/null ; then
- echo -lresolv
- fi
-}
-
-src_compile() {
- tc-export CC
- emake \
- USE_CAP=$(usex caps) \
- USE_IDN=$(usex idn) \
- USE_GCRYPT=$(usex gcrypt) \
- USE_CRYPTO=$(usex ssl) \
- LDFLAG_RESOLV=$(ldflag_resolv) \
- IPV4_TARGETS="${IPV4_TARGETS[*]}" \
- IPV6_TARGETS="${IPV6_TARGETS[*]}"
-
- if [[ ${PV} == "99999999" ]] ; then
- emake html man
- fi
-}
-
-src_install() {
- into /
- dobin ping $(usex ipv6 'ping6' '')
- use ipv6 && dosym ping.8 /usr/share/man/man8/ping6.8
- doman doc/ping.8
-
- if use arping ; then
- dobin arping
- doman doc/arping.8
- fi
-
- into /usr
-
- local u
- for u in clockdiff rarpd rdisc tftpd tracepath ; do
- if use ${u} ; then
- case ${u} in
- clockdiff) dobin ${u};;
- *) dosbin ${u};;
- esac
- doman doc/${u}.8
- fi
- done
-
- if use tracepath && use ipv6 ; then
- dosbin tracepath6
- dosym tracepath.8 /usr/share/man/man8/tracepath6.8
- fi
-
- if use traceroute && use ipv6 ; then
- dosbin traceroute6
- doman doc/traceroute6.8
- fi
-
- if use rarpd ; then
- newinitd "${FILESDIR}"/rarpd.init.d rarpd
- newconfd "${FILESDIR}"/rarpd.conf.d rarpd
- fi
-
- dodoc INSTALL RELNOTES
-
- use doc && dohtml doc/*.html
-}
-
-pkg_postinst() {
- fcaps cap_net_raw \
- bin/ping \
- $(usex ipv6 'bin/ping6' '') \
- $(usex arping 'bin/arping' '') \
- $(usex clockdiff 'usr/bin/clockdiff' '')
-}
diff --git a/net-misc/iputils/metadata.xml b/net-misc/iputils/metadata.xml
deleted file mode 100644
index 36b0ace..0000000
--- a/net-misc/iputils/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
- <maintainer type="project">
- <email>[email protected]</email>
- <name>Gentoo Base System</name>
- </maintainer>
- <use>
- <flag name="arping">Build and install arping -- tool for sending ARP
requests to peers (see also <pkg>net-analyzer/arping</pkg>)</flag>
- <flag name="clockdiff">Build and install clockdiff -- tool for comparing
clocks via ICMP packets</flag>
- <flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> for md5
support</flag>
- <flag name="rarpd">Build and install rarpd -- server for handling RARP
(reverse ARP) requests; generally only used by old systems</flag>
- <flag name="rdisc">Build and install rdisc -- server for the client side
of the ICMP router discover protocol</flag>
- <flag name="tftpd">Build and install tftpd -- server for the Trivial File
Transfer Protocol (see also <pkg>net-ftp/tftp-hpa</pkg>)</flag>
- <flag name="tracepath">Build and install tracepath -- tool for tracing
network paths for discovering MTU values</flag>
- <flag name="traceroute">Build and install traceroute -- tool for tracing
network paths (see also <pkg>net-analyzer/traceroute</pkg>)</flag>
- <flag name="SECURITY_HAZARD">Allow non-root users to flood (ping -f). This
is generally a very bad idea.</flag>
- </use>
- <upstream>
- <remote-id type="cpe">cpe:/a:skbuff:iputils</remote-id>
- <remote-id type="github">iputils/iputils</remote-id>
- </upstream>
-</pkgmetadata>
