1 |
commit: 6a7ba49face09a3dcac346983baa2c26c8dc0165 |
2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jun 17 18:15:48 2021 +0000 |
4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jun 17 18:44:02 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a7ba49f |
7 |
|
8 |
net-analyzer/openbsd-netcat: cleanup old |
9 |
|
10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.2 |
11 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
12 |
|
13 |
net-analyzer/openbsd-netcat/Manifest | 2 - |
14 |
.../files/openbsd-netcat-1.105-darwin.patch | 84 ---------------------- |
15 |
.../openbsd-netcat/openbsd-netcat-1.105-r1.ebuild | 54 -------------- |
16 |
.../openbsd-netcat/openbsd-netcat-1.105.ebuild | 37 ---------- |
17 |
4 files changed, 177 deletions(-) |
18 |
|
19 |
diff --git a/net-analyzer/openbsd-netcat/Manifest b/net-analyzer/openbsd-netcat/Manifest |
20 |
index 0ccf2ff4923..d79bf275887 100644 |
21 |
--- a/net-analyzer/openbsd-netcat/Manifest |
22 |
+++ b/net-analyzer/openbsd-netcat/Manifest |
23 |
@@ -1,5 +1,3 @@ |
24 |
-DIST netcat-openbsd_1.105-7.debian.tar.gz 31843 BLAKE2B 115eb2d0c0f35055eb26608746806ba97d15b9320954b5d531a73f3f76ed22238395797e90bc3e60dd9cf5b31e696eec59843f37001093013ed0ef82ae590126 SHA512 ec507c858a9f0e75f5a8d6ee8e60eef5200428e55091e831a7acba6c61d70f97af01103c9b65354b0ce773214b0758d957852af793debb70be8aab5b5900b3f6 |
25 |
-DIST netcat-openbsd_1.105.orig.tar.gz 14891 BLAKE2B 65119a4e2cb3d9cd7b2d7d346b827ff1c175cc3255f40d70bbd45213b438635d6b063b3cf210d27595e38b0d67339788221ae5c3737e6096782245fb573bca3a SHA512 1e515b5af83a12c6f270d6e8bede6406cc7c9f83ca0e316816508dfe2e2c49cda3fffb6b24a3922bf9908dc8b70d540eb8cc49e9cbfe867e49133c004d3f4703 |
26 |
DIST netcat-openbsd_1.190-2.debian.tar.xz 34836 BLAKE2B 3ff4390c07d05e8d1a19c8696da12bdc6bba07c6e88281b04cd7915509f44a14dda66462128da768b255d92f3a02d008750a860db9290f9f8e0e0bb9dd66e01b SHA512 c33510ad6761627e0b7e564747f6ae82c7569157bdc91f6a282a97b038b2b0917c27fdfba137462c7c34d84fcfdfe8b6393204884d153e3d200a86f5c6657a9a |
27 |
DIST netcat-openbsd_1.190.orig.tar.gz 22384 BLAKE2B c3e83106f53a0214f71c805b1dfe6b66718dfca217f713a0d7016cb0a3c75c78580fbdd277bd7b5324371145c4b986ebb867e6f779cd61ffecb8e732ebabcb84 SHA512 32310813391f63b8283dc4a63e52821e464ecbfcd0ea995e8e15047c6252a86b31eb4725dc69b778594c43d6ce0cc081aa0f00d7cda0587c91941f20b93a33fe |
28 |
DIST netcat-openbsd_1.195-2.debian.tar.xz 35984 BLAKE2B eedac24eedc243ad1d58576be76f4f98392e1f455863fa3cdc06bde2714612819b7dfa98dd45c1739a65680469460410f5e4b2f4144f4c24fea04b59dda4d0da SHA512 2a5cc6d04112fdde007be4b9adb3aee44060570c0cb2ae0e33e54af3d37c0b2ff4d6c96edf1f16047365106c7c3720195b38417af3c332226c9be81d49caa552 |
29 |
|
30 |
diff --git a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-darwin.patch b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-darwin.patch |
31 |
deleted file mode 100644 |
32 |
index a6f805af1a6..00000000000 |
33 |
--- a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-darwin.patch |
34 |
+++ /dev/null |
35 |
@@ -1,84 +0,0 @@ |
36 |
---- a/netcat.c |
37 |
-+++ b/netcat.c |
38 |
-@@ -43,11 +43,13 @@ |
39 |
- #include <arpa/telnet.h> |
40 |
- #include <arpa/inet.h> |
41 |
- |
42 |
-+#ifndef IPTOS_LOWCOST |
43 |
-+# define IPTOS_LOWCOST 0x02 |
44 |
-+#endif |
45 |
- #ifndef IPTOS_LOWDELAY |
46 |
- # define IPTOS_LOWDELAY 0x10 |
47 |
- # define IPTOS_THROUGHPUT 0x08 |
48 |
- # define IPTOS_RELIABILITY 0x04 |
49 |
--# define IPTOS_LOWCOST 0x02 |
50 |
- # define IPTOS_MINCOST IPTOS_LOWCOST |
51 |
- #endif /* IPTOS_LOWDELAY */ |
52 |
- |
53 |
-@@ -96,8 +98,9 @@ |
54 |
- #include <unistd.h> |
55 |
- #include <fcntl.h> |
56 |
- #include <limits.h> |
57 |
--#include <bsd/stdlib.h> |
58 |
--#include <bsd/string.h> |
59 |
-+#include <stdlib.h> |
60 |
-+#include <string.h> |
61 |
-+#include <ctype.h> |
62 |
- #include "atomicio.h" |
63 |
- |
64 |
- #ifndef SUN_LEN |
65 |
-@@ -169,6 +172,43 @@ |
66 |
- socklen_t salen, int ctimeout); |
67 |
- static void quit(); |
68 |
- |
69 |
-+static char* strtonumerrs[] = { |
70 |
-+ "too large", |
71 |
-+ "too small", |
72 |
-+ "invalid" |
73 |
-+}; |
74 |
-+ |
75 |
-+static long long |
76 |
-+strtonum( |
77 |
-+ const char *nptr, |
78 |
-+ long long minval, |
79 |
-+ long long maxval, |
80 |
-+ const char **errstr) |
81 |
-+{ |
82 |
-+ long long val; |
83 |
-+ |
84 |
-+ while (*nptr != '\0' && isspace(*nptr)) |
85 |
-+ nptr++; |
86 |
-+ if (*nptr == '\0') { |
87 |
-+ if (errstr != NULL) |
88 |
-+ *errstr = strtonumerrs[2]; |
89 |
-+ return 0; |
90 |
-+ } |
91 |
-+ val = atoll(nptr); |
92 |
-+ if (val < minval) { |
93 |
-+ if (errstr != NULL) |
94 |
-+ *errstr = strtonumerrs[1]; |
95 |
-+ return 0; |
96 |
-+ } |
97 |
-+ if (val > maxval) { |
98 |
-+ if (errstr != NULL) |
99 |
-+ *errstr = strtonumerrs[0]; |
100 |
-+ return 0; |
101 |
-+ } |
102 |
-+ *errstr = NULL; |
103 |
-+ return val; |
104 |
-+} |
105 |
-+ |
106 |
- int |
107 |
- main(int argc, char *argv[]) |
108 |
- { |
109 |
---- a/socks.c |
110 |
-+++ b/socks.c |
111 |
-@@ -38,7 +38,7 @@ |
112 |
- #include <string.h> |
113 |
- #include <unistd.h> |
114 |
- #include <resolv.h> |
115 |
--#include <bsd/readpassphrase.h> |
116 |
-+#include <readpassphrase.h> |
117 |
- #include "atomicio.h" |
118 |
- |
119 |
- #define SOCKS_PORT "1080" |
120 |
|
121 |
diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild |
122 |
deleted file mode 100644 |
123 |
index 9b84922f8b7..00000000000 |
124 |
--- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild |
125 |
+++ /dev/null |
126 |
@@ -1,54 +0,0 @@ |
127 |
-# Copyright 1999-2021 Gentoo Authors |
128 |
-# Distributed under the terms of the GNU General Public License v2 |
129 |
- |
130 |
-EAPI=6 |
131 |
- |
132 |
-inherit toolchain-funcs |
133 |
- |
134 |
-DESCRIPTION="The OpenBSD network swiss army knife" |
135 |
-HOMEPAGE="http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/nc/" |
136 |
-SRC_URI="http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}.orig.tar.gz |
137 |
- http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}-7.debian.tar.gz" |
138 |
-LICENSE="BSD" |
139 |
-SLOT="0" |
140 |
-IUSE="elibc_Darwin" |
141 |
- |
142 |
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x64-macos" |
143 |
- |
144 |
-DEPEND="virtual/pkgconfig" |
145 |
-RDEPEND="!elibc_Darwin? ( dev-libs/libbsd ) |
146 |
- !net-analyzer/netcat |
147 |
- !net-analyzer/netcat6 |
148 |
-" |
149 |
- |
150 |
-S=${WORKDIR}/netcat-openbsd-${PV} |
151 |
- |
152 |
-PATCHES=( "${WORKDIR}/debian/patches" ) |
153 |
- |
154 |
-src_prepare() { |
155 |
- default |
156 |
- if [[ ${CHOST} == *-darwin* ]] ; then |
157 |
- # this undoes some of the Debian/Linux changes |
158 |
- eapply "${FILESDIR}"/${P}-darwin.patch |
159 |
- fi |
160 |
-} |
161 |
- |
162 |
-src_compile() { |
163 |
- emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" |
164 |
-} |
165 |
- |
166 |
-src_install() { |
167 |
- dobin nc |
168 |
- doman nc.1 |
169 |
- cd "${WORKDIR}/debian" |
170 |
- newdoc netcat-openbsd.README.Debian README |
171 |
- dodoc -r examples |
172 |
-} |
173 |
- |
174 |
-pkg_postinst() { |
175 |
- if [[ ${KERNEL} = "linux" ]]; then |
176 |
- ewarn "FO_REUSEPORT is introduced in linux 3.9. If your running kernel is older" |
177 |
- ewarn "and kernel header is newer, nc will not listen correctly. Matching the header" |
178 |
- ewarn "to the running kernel will do. See bug #490246 for details." |
179 |
- fi |
180 |
-} |
181 |
|
182 |
diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.105.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.105.ebuild |
183 |
deleted file mode 100644 |
184 |
index 34432cdfd0d..00000000000 |
185 |
--- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.105.ebuild |
186 |
+++ /dev/null |
187 |
@@ -1,37 +0,0 @@ |
188 |
-# Copyright 1999-2016 Gentoo Foundation |
189 |
-# Distributed under the terms of the GNU General Public License v2 |
190 |
- |
191 |
-EAPI=6 |
192 |
- |
193 |
-DESCRIPTION="the OpenBSD network swiss army knife" |
194 |
-HOMEPAGE="http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/nc/" |
195 |
-SRC_URI="http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}.orig.tar.gz |
196 |
- http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}-7.debian.tar.gz" |
197 |
-LICENSE="BSD" |
198 |
-SLOT="0" |
199 |
- |
200 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x64-macos" |
201 |
- |
202 |
-DEPEND="virtual/pkgconfig" |
203 |
-RDEPEND="dev-libs/libbsd" |
204 |
- |
205 |
-S=${WORKDIR}/netcat-openbsd-${PV} |
206 |
- |
207 |
-PATCHES=( "${WORKDIR}/debian/patches" ) |
208 |
- |
209 |
-src_install() { |
210 |
- # avoid name conflict against net-analyzer/netcat |
211 |
- newbin nc nc.openbsd |
212 |
- newman nc.1 nc.openbsd.1 |
213 |
- cd "${WORKDIR}/debian" |
214 |
- newdoc netcat-openbsd.README.Debian README |
215 |
- dodoc -r examples |
216 |
-} |
217 |
- |
218 |
-pkg_postinst() { |
219 |
- if [[ ${KERNEL} = "linux" ]]; then |
220 |
- ewarn "FO_REUSEPORT is introduced in linux 3.9. If your running kernel is older" |
221 |
- ewarn "and kernel header is newer, nc will not listen correctly. Matching the header" |
222 |
- ewarn "to the running kernel will do. See bug #490246 for details." |
223 |
- fi |
224 |
-} |