gentoo resync : 30.09.2020

4 files changed, 124 insertions, 5 deletions

diff --git a/net-misc/nemesis/Manifest b/net-misc/nemesis/Manifest
index 297252fb021d..6df3739e1f91 100644
--- a/net-misc/nemesis/Manifest
+++ b/net-misc/nemesis/Manifest
@@ -2,7 +2,10 @@ AUX nemesis-1.4-fileio.patch 975 BLAKE2B 6f955ef14cff07d34ea5693a9dec680748d50c5
 AUX nemesis-1.4-fno-common.patch 4632 BLAKE2B 3a5352f58eaed5cd0120142c482551d15fe94a5660153c45c2ea79deedcf2fc535f4986a33a7a91fb21eb5f7275f762e8c800ac9e7f137932bf961e1b4b81d84 SHA512 e45442fea4d9f904a848e2529d401b296bf9c3d68e27ec464b6ce3160c49d73f96514d5211186158c8cbc0e9b5c2bc4d1a6cc1eb94d2301a4209d9c48f14cbbb
 AUX nemesis-1.4-libnet-1.0.patch 4627 BLAKE2B b2ab0e2c72bc24729912d60938dbd0f06ea7f93d78f0431baacab136b1a892ef8c5b0c1d6be96d03940b45aa8d058b05853db7f35832d7bbc53fc988fa019968 SHA512 aa94f7b9db756e636b671de2e0f56bcc145b73f808ef907d1f8965c78e8fd025a69e684d693a3095a751d6a3433c3f34c43c753624c0543c1c5b45bbb1c69eb9
 AUX nemesis-1.4-prototcp.patch 1287 BLAKE2B 0d50d3258f8a1c80cb9622c05ec8611e6f90491fc2d045c9a792630918f8bb73776555ce7714b6d5a2f0ee79b54d9d842db8f0ab3482b6d1fb18a92fe9fd257e SHA512 89f5bbd0506ff6ee15823631c254b9dc7049eccc31f9882485a6e07a9686f8d96f84ef7b56e366d1f3fccb302db9383b10ed3a17be3508a8ab4a001809e7876a
+AUX nemesis-1.7-fno-common.patch 2057 BLAKE2B c40c2b9549237432168f22d8d4f1903f4b6772b02466616df6b0951a7c6451ccd2adeb103a1931bfb82c7b1df78ff320de137ae0d522806e203ae9a7f7587377 SHA512 0d62b46676c3ebbe2e2bc8636a4d14de52ab9f94f8b67e86b7bcf3546a62b59503f4e1f23a18f25358bf0315983474f5ae602d87281802c30de00645ee56e700
 DIST nemesis-1.4.tar.gz 144187 BLAKE2B 9b16fa37283e4a659312bbd24e5ab850cf11cbee9c598f9e57bda517f462448a0a74721425144ec00afb2cde5ba86fcb020d2d7dbf4d6df688b67f7c282d9d38 SHA512 a8d4b434a9b0287e704ab923900c43051dc3aac4a7063e702aa93d7c89cfdeac287a6f40138bdca140e2c889e024f885288c4953940104ac12631cf7394501c8
+DIST nemesis-1.7.tar.gz 93423 BLAKE2B d46d19ae46852ea5a5f745b719779f3e4fbd77b918c8f53eaf743beb53d3ee345fa1663350d98095519481e819c5174fbe41b356da643b0aff9a2d5825494436 SHA512 6085cb91535c895325ca04e7583b29df9073731d8bee1d48ef46d09d25042d5220a73b2d02d77b4101de649877c0a2d0f4af5c06f125389fbd97c7350449134b
 EBUILD nemesis-1.4-r1.ebuild 626 BLAKE2B 0b7f3379705788d1873f67005011e0e6c8f54fa2ca7e96f22524ffc1ad67545e4e286991fd829db4a72bdfb0f9d22dad5ebdf93ff7537ffbc138e80490f9856a SHA512 d54b880507e5cfdc71fcc735d404758ffb9f466f1a633f410431ac2555b515238d35f76774ebf311f9378cddecd2c4feed9b1d00b596d36c1d7dde8756e652fc
-EBUILD nemesis-1.4-r2.ebuild 666 BLAKE2B 14e7e14141dbfff3fc419d00beaf5728f992bbd423ea772298dccb1c4d7b4839d0e9ce309c94352191569e93a135387cd509a4ec61f2fa483e62c13292ad17e6 SHA512 395dbb43b21367dc634319c8ba94f3f9461bc8e3f31cee318366066d4ea0709f9bca74be5848dec0210530844ac724c9357df1c3a14550953f84cf750e620ddd
+EBUILD nemesis-1.4-r2.ebuild 686 BLAKE2B 4379f65cdc3a45a0a9cf64f26e587e2591fbe9e50033ec5e525af5872e3485982d8c36ffaaabfc3031d3382b8c6c417e47ebb45582eaa8e66d3e2819e89e13e5 SHA512 ce6f875a66a18c5e4d0c7d2cb1774aceb6d10d7d17b6fc8d723715ae6a5c872ddd701b3709705148607ec14b1e08cbcd15e5ac4d1d781af0c38ee3420b01d2ce
+EBUILD nemesis-1.7-r1.ebuild 624 BLAKE2B a914021deacc4e92d24e8ca38754cf0525fd51b9dbd06e6243786700120d4e78de1e472eefc16868898e68b23b7da4feab788cf21792cd2f724b8db21bb66c38 SHA512 07ced0bdda5f237c5ae691c24d497c03ff62eae19a6a6f025c361466e8be244914d25eaa577a7b0c7c9a3558bd80eef4300e245eb386a042ed30345d5f4b8f66
 MISC metadata.xml 291 BLAKE2B 41178dcbae1f81d0bc5a8cfaacce0d5bdf65648775430d1b8828e3875e7322c7de7537983852485f3a091380a72b964e82f4cac91dc2281f1291662abfacd72a SHA512 7e39bc9868b0b6603f3a48d7905f47745656f96334e6fbaa66e314a6dbfb0c63e1ba33cbbc63fc61f8289fb756105dfd6cf9b990c113a8569a9997af29d2c2dc
diff --git a/net-misc/nemesis/files/nemesis-1.7-fno-common.patch b/net-misc/nemesis/files/nemesis-1.7-fno-common.patch
new file mode 100644
index 000000000000..fba7641a493a
--- /dev/null
+++ b/net-misc/nemesis/files/nemesis-1.7-fno-common.patch
@@ -0,0 +1,86 @@
+--- a/src/nemesis.h
++++ b/src/nemesis.h
+@@ -164,10 +164,10 @@
+ extern int         verbose;
+ extern int         interval;
+ extern int         count;
+-int                got_link;
+-int                got_payload;
+-int                got_ipoptions;
+-int                got_tcpoptions;
++extern int                got_link;
++extern int                got_payload;
++extern int                got_ipoptions;
++extern int                got_tcpoptions;
+ 
+ struct file {
+ 	uint8_t *file_buf; /* pointer to file memory */
+--- a/src/nemesis.c
++++ b/src/nemesis.c
+@@ -10,6 +10,9 @@
+ #include <string.h>
+ #include <unistd.h>
+ 
++int got_payload;
++int mode;
++
+ extern int optind;
+ 
+ static int usage(char *arg)
+--- a/src/nemesis-icmp.c
++++ b/src/nemesis-icmp.c
+@@ -12,6 +12,8 @@
+ #include <pcap.h>
+ #endif
+ 
++int got_origoptions;
++
+ static ETHERhdr etherhdr;
+ static IPhdr    iphdr;
+ static IPhdr    ipunreach;
+--- a/src/nemesis-icmp.h
++++ b/src/nemesis-icmp.h
+@@ -39,8 +39,8 @@
+ #include "nemesis.h"
+ #include <libnet.h>
+ 
+-int mode; /* ICMP injection mode */
+-int got_origoptions;
++extern int mode; /* ICMP injection mode */
++extern int got_origoptions;
+ 
+ int buildicmp(ETHERhdr *, IPhdr *, ICMPhdr *, IPhdr *, struct file *, struct file *, struct file *, libnet_t *);
+ 
+--- a/src/nemesis-ospf.h
++++ b/src/nemesis-ospf.h
+@@ -43,7 +43,7 @@
+ extern NETLSAhdr    netlsahdr;
+ extern SUMLSAhdr    sumlsahdr;
+ 
+-int mode; /* OSPF injection mode */
++extern int mode; /* OSPF injection mode */
+ 
+ int buildospf(ETHERhdr *, IPhdr *, struct file *, struct file *, libnet_t *, int);
+ 
+--- a/src/nemesis-dns.c
++++ b/src/nemesis-dns.c
+@@ -12,6 +12,8 @@
+ #include <pcap.h>
+ #endif
+ 
++int state;
++
+ static ETHERhdr etherhdr;
+ static IPhdr    iphdr;
+ static TCPhdr   tcphdr;
+--- a/src/nemesis-dns.h
++++ b/src/nemesis-dns.h
+@@ -29,7 +29,7 @@
+ #include "nemesis.h"
+ #include <libnet.h>
+ 
+-int state; /* default to UDP */
++extern int state; /* default to UDP */
+ 
+ int builddns(ETHERhdr *, IPhdr *, TCPhdr *, UDPhdr *, DNShdr *, struct file *, struct file *, struct file *, libnet_t *);
+ 
diff --git a/net-misc/nemesis/nemesis-1.4-r2.ebuild b/net-misc/nemesis/nemesis-1.4-r2.ebuild
index 12ed858e34a0..0d74247451fd 100644
--- a/net-misc/nemesis/nemesis-1.4-r2.ebuild
+++ b/net-misc/nemesis/nemesis-1.4-r2.ebuild
@@ -23,10 +23,10 @@ DEPEND="
 DOCS="CREDITS ChangeLog README"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-fileio.patch
-	"${FILESDIR}"/${P}-libnet-1.0.patch
-	"${FILESDIR}"/${P}-prototcp.patch
-	"${FILESDIR}"/${P}-fno-common.patch
+	"${FILESDIR}"/${PN}-1.4-fileio.patch
+	"${FILESDIR}"/${PN}-1.4-libnet-1.0.patch
+	"${FILESDIR}"/${PN}-1.4-prototcp.patch
+	"${FILESDIR}"/${PN}-1.4-fno-common.patch
 )
 
 src_prepare() {
diff --git a/net-misc/nemesis/nemesis-1.7-r1.ebuild b/net-misc/nemesis/nemesis-1.7-r1.ebuild
new file mode 100644
index 000000000000..f34383cb354c
--- /dev/null
+++ b/net-misc/nemesis/nemesis-1.7-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="A commandline-based, portable human IP stack for UNIX/Linux"
+HOMEPAGE="https://github.com/libnet/nemesis"
+SRC_URI="https://github.com/libnet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~sparc ~x86"
+
+RDEPEND="
+	net-libs/libnet:1.1
+	net-libs/libpcap
+"
+DEPEND="
+	${RDEPEND}
+"
+DOCS="ChangeLog.md docs/CONTRIBUTING.md docs/CREDITS README.md"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7-fno-common.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}