1 |
commit: 113cb929218bb726627bb6d60740f553db8c8bf4 |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Mar 31 22:31:56 2019 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Mar 31 22:37:40 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=113cb929 |
7 |
|
8 |
net-misc/iputils: drop old |
9 |
|
10 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
11 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
12 |
|
13 |
net-misc/iputils/Manifest | 2 - |
14 |
.../files/iputils-20150815-nonroot-floodping.patch | 11 -- |
15 |
net-misc/iputils/iputils-20171016_pre.ebuild | 178 --------------------- |
16 |
net-misc/iputils/metadata.xml | 1 - |
17 |
4 files changed, 192 deletions(-) |
18 |
|
19 |
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest |
20 |
index e2cf5240b90..50e512301db 100644 |
21 |
--- a/net-misc/iputils/Manifest |
22 |
+++ b/net-misc/iputils/Manifest |
23 |
@@ -1,4 +1,2 @@ |
24 |
-DIST iputils-20171016_pre.tar.gz 195254 BLAKE2B 1170db29d53dd8285b11d4df7b7da2ea3bd2be3599a3f0df85ca7e64247f2a534d03e43a2b6267ba4b9c0b65fcc58045151833ae2c1035a839ed728a389804af SHA512 570896fc58d945e08032134701ab6ea02bbf6fff420437bc5f89687cdcce6f3c1c64418a4c5ff54ca3cdc582bae2c95e196b2c8368eba2b163ebf88490aabf99 |
25 |
DIST iputils-20180629.tar.gz 195094 BLAKE2B 81bf6ef427eac0769ea3f95c20294b46c81f9c619551234eb265b3a428998a96cf3df0cdc7499f9eea280c1999e899e87c3f4a863141de251a9c509840bc83b3 SHA512 16b8f5ad1cf88083ebaee0a71fddb14bb0a904336fd0baebfcca86c27ac0773553b21d12790b05cab7661d6432c75bbb1523e871e5e1b77faacd13ccc84f4476 |
26 |
-DIST iputils-manpages-20171016_pre.tar.xz 29764 BLAKE2B 47def1413b2cdcfba7f924dd7a045063c289c244ba8fb4dc43caf2a8d52032b57ee6d86ee4dffd5351faa3124d4c83a33ca3365866568c2164b374eed9d70ec0 SHA512 31b4b0b4e46d7c98530577392c636e4397917cbe415762145a119e68e3223bc85b9d5afcfe61ae01584a35f6a1a772adffc52deeedc722c474179fa1d208d8d9 |
27 |
DIST iputils-manpages-20180629.tar.xz 29804 BLAKE2B 15983cc97bc6b6853c193f046687f10be11902f7e1d2dc2eec6c58edd1926f10152108d378858b0d7eb2d2908f038965b05515c4927aedc460282a22307883ad SHA512 1c5b0bab8496a3f3d9b5080029221231a497d9a5e91c61bd0ddd0b63fd51572d052801294aafd08e1dc8ad448b82cdaf48c72f0b08cc143f9c144f3db6848d9a |
28 |
|
29 |
diff --git a/net-misc/iputils/files/iputils-20150815-nonroot-floodping.patch b/net-misc/iputils/files/iputils-20150815-nonroot-floodping.patch |
30 |
deleted file mode 100644 |
31 |
index 50e108b09e8..00000000000 |
32 |
--- a/net-misc/iputils/files/iputils-20150815-nonroot-floodping.patch |
33 |
+++ /dev/null |
34 |
@@ -1,11 +0,0 @@ |
35 |
---- iputils-s20150815/ping.h |
36 |
-+++ iputils-s20150815/ping.h |
37 |
-@@ -61,7 +61,7 @@ |
38 |
- |
39 |
- #define MAXWAIT 10 /* max seconds to wait for response */ |
40 |
- #define MININTERVAL 10 /* Minimal interpacket gap */ |
41 |
--#define MINUSERINTERVAL 200 /* Minimal allowed interval for non-root */ |
42 |
-+#define MINUSERINTERVAL 0 /* Minimal allowed interval for non-root */ |
43 |
- |
44 |
- #define SCHINT(a) (((a) <= MININTERVAL) ? MININTERVAL : (a)) |
45 |
- |
46 |
|
47 |
diff --git a/net-misc/iputils/iputils-20171016_pre.ebuild b/net-misc/iputils/iputils-20171016_pre.ebuild |
48 |
deleted file mode 100644 |
49 |
index bea9c59247c..00000000000 |
50 |
--- a/net-misc/iputils/iputils-20171016_pre.ebuild |
51 |
+++ /dev/null |
52 |
@@ -1,178 +0,0 @@ |
53 |
-# Copyright 1999-2019 Gentoo Authors |
54 |
-# Distributed under the terms of the GNU General Public License v2 |
55 |
- |
56 |
-# For released versions, we precompile the man/html pages and store |
57 |
-# them in a tarball on our mirrors. This avoids ugly issues while |
58 |
-# building stages, and reduces depedencies. |
59 |
-# To regenerate man/html pages emerge iputils-99999999[doc] with |
60 |
-# EGIT_COMMIT set to release tag and tar ${S}/doc folder. |
61 |
- |
62 |
-EAPI="6" |
63 |
- |
64 |
-inherit flag-o-matic toolchain-funcs fcaps |
65 |
- |
66 |
-MY_COMMIT="67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf" |
67 |
- |
68 |
-PATCHES=( |
69 |
- "${FILESDIR}"/${PN}-99999999-tracepath46.patch |
70 |
- "${FILESDIR}"/${PN}-99999999-musl.patch |
71 |
-) |
72 |
- |
73 |
-if [[ ${PV} == "99999999" ]] ; then |
74 |
- EGIT_REPO_URI="https://github.com/iputils/iputils.git" |
75 |
- inherit git-r3 |
76 |
-else |
77 |
- SRC_URI="https://github.com/iputils/iputils/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz |
78 |
- https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz" |
79 |
- KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux" |
80 |
-fi |
81 |
- |
82 |
-DESCRIPTION="Network monitoring tools including ping and ping6" |
83 |
-HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils" |
84 |
- |
85 |
-LICENSE="BSD GPL-2+ rdisc" |
86 |
-SLOT="0" |
87 |
-IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle +openssl rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute6" |
88 |
- |
89 |
-LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] ) |
90 |
- idn? ( net-dns/libidn:=[static-libs(+)] ) |
91 |
- ipv6? ( ssl? ( |
92 |
- gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) |
93 |
- nettle? ( dev-libs/nettle[static-libs(+)] ) |
94 |
- openssl? ( |
95 |
- !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) |
96 |
- libressl? ( dev-libs/libressl:0=[static-libs(+)] ) |
97 |
- ) |
98 |
- ) )" |
99 |
-RDEPEND="arping? ( !net-misc/arping ) |
100 |
- rarpd? ( !net-misc/rarpd ) |
101 |
- traceroute6? ( !net-analyzer/traceroute ) |
102 |
- !static? ( ${LIB_DEPEND//\[static-libs(+)]} )" |
103 |
-DEPEND="${RDEPEND} |
104 |
- static? ( ${LIB_DEPEND} ) |
105 |
- virtual/os-headers |
106 |
-" |
107 |
-if [[ ${PV} == "99999999" ]] ; then |
108 |
- DEPEND+="app-text/docbook-xml-dtd:4.2 |
109 |
- app-text/docbook-xml-dtd:4.5 |
110 |
- app-text/docbook-xsl-stylesheets |
111 |
- dev-libs/libxslt:0 |
112 |
- " |
113 |
-fi |
114 |
- |
115 |
-REQUIRED_USE="ipv6? ( ssl? ( ^^ ( gcrypt nettle openssl ) ) )" |
116 |
- |
117 |
-[ "${PV}" = "99999999" ] || S="${WORKDIR}/${PN}-s${PV}" |
118 |
- |
119 |
-S="${WORKDIR}/${PN}-${MY_COMMIT}" |
120 |
- |
121 |
-src_prepare() { |
122 |
- use SECURITY_HAZARD && PATCHES+=( "${FILESDIR}"/${PN}-20150815-nonroot-floodping.patch ) |
123 |
- |
124 |
- default |
125 |
-} |
126 |
- |
127 |
-src_configure() { |
128 |
- use static && append-ldflags -static |
129 |
- |
130 |
- TARGETS=( |
131 |
- ping |
132 |
- $(for v in arping clockdiff rarpd rdisc tftpd tracepath ; do usev ${v} ; done) |
133 |
- ) |
134 |
- if use ipv6 ; then |
135 |
- TARGETS+=( |
136 |
- $(usex traceroute6 'traceroute6' '') |
137 |
- ) |
138 |
- fi |
139 |
- |
140 |
- myconf=( |
141 |
- USE_CRYPTO=no |
142 |
- USE_GCRYPT=no |
143 |
- USE_NETTLE=no |
144 |
- ) |
145 |
- |
146 |
- if use ipv6 && use ssl ; then |
147 |
- myconf=( |
148 |
- USE_CRYPTO=$(usex openssl) |
149 |
- USE_GCRYPT=$(usex gcrypt) |
150 |
- USE_NETTLE=$(usex nettle) |
151 |
- ) |
152 |
- fi |
153 |
-} |
154 |
- |
155 |
-src_compile() { |
156 |
- tc-export CC |
157 |
- emake \ |
158 |
- USE_CAP=$(usex caps) \ |
159 |
- USE_IDN=$(usex idn) \ |
160 |
- IPV4_DEFAULT=$(usex ipv6 'no' 'yes') \ |
161 |
- TARGETS="${TARGETS[*]}" \ |
162 |
- ${myconf[@]} |
163 |
- |
164 |
- if [[ ${PV} == "99999999" ]] ; then |
165 |
- emake man |
166 |
- |
167 |
- use doc && emake html |
168 |
- fi |
169 |
-} |
170 |
- |
171 |
-src_install() { |
172 |
- into / |
173 |
- dobin ping |
174 |
- dosym ping /bin/ping4 |
175 |
- if use ipv6 ; then |
176 |
- dosym ping /bin/ping6 |
177 |
- dosym ping.8 /usr/share/man/man8/ping6.8 |
178 |
- fi |
179 |
- doman doc/ping.8 |
180 |
- |
181 |
- if use arping ; then |
182 |
- dobin arping |
183 |
- doman doc/arping.8 |
184 |
- fi |
185 |
- |
186 |
- into /usr |
187 |
- |
188 |
- if use tracepath ; then |
189 |
- dosbin tracepath |
190 |
- doman doc/tracepath.8 |
191 |
- dosym tracepath /usr/sbin/tracepath4 |
192 |
- fi |
193 |
- |
194 |
- local u |
195 |
- for u in clockdiff rarpd rdisc tftpd ; do |
196 |
- if use ${u} ; then |
197 |
- case ${u} in |
198 |
- clockdiff) dobin ${u};; |
199 |
- *) dosbin ${u};; |
200 |
- esac |
201 |
- doman doc/${u}.8 |
202 |
- fi |
203 |
- done |
204 |
- |
205 |
- if use tracepath && use ipv6 ; then |
206 |
- dosym tracepath /usr/sbin/tracepath6 |
207 |
- dosym tracepath.8 /usr/share/man/man8/tracepath6.8 |
208 |
- fi |
209 |
- |
210 |
- if use traceroute6 && use ipv6 ; then |
211 |
- dosbin traceroute6 |
212 |
- doman doc/traceroute6.8 |
213 |
- fi |
214 |
- |
215 |
- if use rarpd ; then |
216 |
- newinitd "${FILESDIR}"/rarpd.init.d rarpd |
217 |
- newconfd "${FILESDIR}"/rarpd.conf.d rarpd |
218 |
- fi |
219 |
- |
220 |
- dodoc INSTALL.md |
221 |
- |
222 |
- use doc && dodoc doc/*.html |
223 |
-} |
224 |
- |
225 |
-pkg_postinst() { |
226 |
- fcaps cap_net_raw \ |
227 |
- bin/ping \ |
228 |
- $(usex arping 'bin/arping' '') \ |
229 |
- $(usex clockdiff 'usr/bin/clockdiff' '') |
230 |
-} |
231 |
|
232 |
diff --git a/net-misc/iputils/metadata.xml b/net-misc/iputils/metadata.xml |
233 |
index 2c0fdf44b67..6d135dfdb42 100644 |
234 |
--- a/net-misc/iputils/metadata.xml |
235 |
+++ b/net-misc/iputils/metadata.xml |
236 |
@@ -10,7 +10,6 @@ |
237 |
<flag name="clockdiff">Build and install clockdiff -- tool for comparing clocks via ICMP packets</flag> |
238 |
<flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> for md5 support</flag> |
239 |
<flag name="nettle">Use <pkg>dev-libs/nettle</pkg> for md5 support</flag> |
240 |
- <flag name="openssl">Use <pkg>dev-libs/openssl</pkg> for md5 support</flag> |
241 |
<flag name="rarpd">Build and install rarpd -- server for handling RARP (reverse ARP) requests; generally only used by old systems</flag> |
242 |
<flag name="rdisc">Build and install rdisc -- server for the client side of the ICMP router discover protocol</flag> |
243 |
<flag name="tftpd">Build and install tftpd -- server for the Trivial File Transfer Protocol (see also <pkg>net-ftp/tftp-hpa</pkg>)</flag> |