gentoo resync : 05.02.2020

4 files changed, 189 insertions, 2 deletions

diff --git a/net-misc/nemesis/Manifest b/net-misc/nemesis/Manifest
index 1e51863270f9..e82fe8ba1216 100644
--- a/net-misc/nemesis/Manifest
+++ b/net-misc/nemesis/Manifest
@@ -1,6 +1,8 @@
 AUX nemesis-1.4-fileio.patch 975 BLAKE2B 6f955ef14cff07d34ea5693a9dec680748d50c5d831663590a63e97aef9cc68668dd242610a996f19736bba409e6c36fdc2a3a3897cb18f656a2081c7f58d64e SHA512 3bfc30e047eaa493d47ef1dbc1e6940746b347f64c60c210a68db47774c169b2eaeedcaba84eff2fe16fca656d613819218b5f2afe52b97f0d0152cf00a65a3f
+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
 DIST nemesis-1.4.tar.gz 144187 BLAKE2B 9b16fa37283e4a659312bbd24e5ab850cf11cbee9c598f9e57bda517f462448a0a74721425144ec00afb2cde5ba86fcb020d2d7dbf4d6df688b67f7c282d9d38 SHA512 a8d4b434a9b0287e704ab923900c43051dc3aac4a7063e702aa93d7c89cfdeac287a6f40138bdca140e2c889e024f885288c4953940104ac12631cf7394501c8
-EBUILD nemesis-1.4-r1.ebuild 625 BLAKE2B 12c3fa61d7fd39ae885d63a2371e4d0065d0f1a176f126d00e0af1ec8fe810c00063f44623bc554ed77250cdd3d1c0a5b907b0b63ee5c525cb3ddf3b61edc43f SHA512 580e5b8a62e664cd408cfb23b8fa1baa5c715addd2ac8c873295da51bbcb720b5bdc3afe0f6a8e0d19f9ed5493599aa1fd64ac1d9ab170d12807ba42fc9dabc2
+EBUILD nemesis-1.4-r1.ebuild 626 BLAKE2B f9c7e0bfc12c5454ecb735171f698ddfe9aee49b95e55a2b4177489b382ce423c7c467bc867260cb45f026a9e3eb3333749a57b5e0d77c3afc3299d38eeae98e SHA512 f8a01c0e2b031ecb40d161aeecc83bd3931a21185ffdb3fe8c1cc83a0332f1f225405e65d0efb13de18276abea8be80b982f05d5ae7774fd6eb6e8a1029e25a2
+EBUILD nemesis-1.4-r2.ebuild 666 BLAKE2B 14e7e14141dbfff3fc419d00beaf5728f992bbd423ea772298dccb1c4d7b4839d0e9ce309c94352191569e93a135387cd509a4ec61f2fa483e62c13292ad17e6 SHA512 395dbb43b21367dc634319c8ba94f3f9461bc8e3f31cee318366066d4ea0709f9bca74be5848dec0210530844ac724c9357df1c3a14550953f84cf750e620ddd
 MISC metadata.xml 291 BLAKE2B 41178dcbae1f81d0bc5a8cfaacce0d5bdf65648775430d1b8828e3875e7322c7de7537983852485f3a091380a72b964e82f4cac91dc2281f1291662abfacd72a SHA512 7e39bc9868b0b6603f3a48d7905f47745656f96334e6fbaa66e314a6dbfb0c63e1ba33cbbc63fc61f8289fb756105dfd6cf9b990c113a8569a9997af29d2c2dc
diff --git a/net-misc/nemesis/files/nemesis-1.4-fno-common.patch b/net-misc/nemesis/files/nemesis-1.4-fno-common.patch
new file mode 100644
index 000000000000..068fef61b6e4
--- /dev/null
+++ b/net-misc/nemesis/files/nemesis-1.4-fno-common.patch
@@ -0,0 +1,150 @@
+--- a/src/nemesis.c
++++ b/src/nemesis.c
+@@ -12,6 +12,8 @@
+ #include <string.h>
+ #include "nemesis.h"
+ 
++int mode;   /* injection mode */
++
+ int main(int argc, char **argv)
+ {
+     char **avtmp, *avval;
+--- a/src/nemesis-dns.c
++++ b/src/nemesis-dns.c
+@@ -37,6 +37,8 @@
+ static void dns_validatedata(void);
+ static void dns_verbose(void);
+ 
++int state;  /* default to UDP */
++
+ void nemesis_dns(int argc, char **argv)
+ {
+     const char *module = "DNS Packet Injection";
+--- a/src/nemesis-dns.h
++++ b/src/nemesis-dns.h
+@@ -32,7 +32,7 @@
+ #include <libnet-1.0.h>
+ #include "nemesis.h"
+ 
+-int state;  /* default to UDP */
++extern int state;  /* default to UDP */
+ 
+ int builddns(ETHERhdr *, IPhdr *, TCPhdr *, UDPhdr *, DNShdr *, FileData *,
+         FileData *, FileData *, char *);
+--- a/src/nemesis.h
++++ b/src/nemesis.h
+@@ -122,6 +122,8 @@
+ extern int got_ipoptions;
+ extern int got_tcpoptions;
+ 
++extern int mode;   /* injection mode */
++
+ typedef struct _FileData
+ {
+     int32_t file_s;         /* file size */
+--- a/src/nemesis-icmp.c
++++ b/src/nemesis-icmp.c
+@@ -38,6 +38,8 @@
+ static void icmp_validatedata(void);
+ static void icmp_verbose(void);
+ 
++int got_origoptions;
++
+ void nemesis_icmp(int argc, char **argv)
+ {
+     const char *module = "ICMP Packet Injection";
+--- a/src/nemesis-icmp.h
++++ b/src/nemesis-icmp.h
+@@ -42,8 +42,7 @@
+ #include <libnet-1.0.h>
+ #include "nemesis.h"
+ 
+-int mode;   /* ICMP injection mode */
+-int got_origoptions;
++extern int got_origoptions;
+ 
+ int buildicmp(ETHERhdr *, IPhdr *, ICMPhdr *, IPhdr *, FileData *, FileData *, 
+         FileData *, char *);
+--- a/src/nemesis-ospf.c
++++ b/src/nemesis-ospf.c
+@@ -15,6 +15,37 @@
+     #include <pcap.h>
+ #endif
+ 
++u_short id,            /* IP id */
++        frag,          /* frag shit */
++        mtusize,       /* Max dgram length (DBD) */
++        num,           /* LSA_RTR num */
++        interval,      /* secs since last pkt sent */
++        rtr_flags,     /* LSA_RTR flags */
++        metric,        /* OSPF metric */
++        ospf_age;      /* OSPF advertisement age */
++
++u_long source,         /* source address */
++       dest,           /* destination address */
++       neighbor,       /* neighbor router */
++       as_fwd,         /* AS_EXT forward address */
++       addrid,         /* advertising router id */
++       addaid,         /* advertising area id */
++       router,         /* advertising router */
++       auth[2],        /* authentication type */
++       mask;           /* subnet mask (icmp_mask) */
++
++u_char priority,       /* OSPF priority */
++       exchange,       /* DBD exchange type */
++       rtrtype,        /* LSA_RTR type */
++       ooptions;       /* OSPF options */
++
++u_int dead_int,        /* dead router interval in secs */
++      as_tag,          /* AS_EXT tag */
++      seqnum,          /* seqnum for LSA */
++      bcastnum,        /* num of LSAs to bcast (LSU) */
++      rtrdata,         /* LSA_RTR router data */
++      rtrid;           /* router id for LSA */
++
+ static ETHERhdr etherhdr;
+ static IPhdr iphdr;
+ static OSPFhdr ospfhdr;
+--- a/src/nemesis-ospf.h
++++ b/src/nemesis-ospf.h
+@@ -35,7 +35,7 @@
+ #include <libnet-1.0.h>
+ #include "nemesis.h"
+ 
+-u_short id,            /* IP id */
++extern u_short id,            /* IP id */
+         frag,          /* frag shit */
+         mtusize,       /* Max dgram length (DBD) */
+         num,           /* LSA_RTR num */
+@@ -44,7 +44,7 @@
+         metric,        /* OSPF metric */
+         ospf_age;      /* OSPF advertisement age */
+ 
+-u_long source,         /* source address */
++extern u_long source,         /* source address */
+        dest,           /* destination address */
+        neighbor,       /* neighbor router */
+        as_fwd,         /* AS_EXT forward address */
+@@ -54,20 +54,18 @@
+        auth[2],        /* authentication type */
+        mask;           /* subnet mask (icmp_mask) */
+ 
+-u_char priority,       /* OSPF priority */
++extern u_char priority,       /* OSPF priority */
+        exchange,       /* DBD exchange type */
+        rtrtype,        /* LSA_RTR type */
+        ooptions;       /* OSPF options */
+ 
+-u_int dead_int,        /* dead router interval in secs */
++extern u_int dead_int,        /* dead router interval in secs */
+       as_tag,          /* AS_EXT tag */
+       seqnum,          /* seqnum for LSA */
+       bcastnum,        /* num of LSAs to bcast (LSU) */
+       rtrdata,         /* LSA_RTR router data */
+       rtrid;           /* router id for LSA */
+ 
+-int mode;   /* OSPF injection mode */
+-
+ int buildospf(ETHERhdr *, IPhdr *, FileData *, FileData *, char *);
+ 
+ #endif /* __NEMESIS_OSPF_H__ */
diff --git a/net-misc/nemesis/nemesis-1.4-r1.ebuild b/net-misc/nemesis/nemesis-1.4-r1.ebuild
index 10d1e02a2814..2728a521e68c 100644
--- a/net-misc/nemesis/nemesis-1.4-r1.ebuild
+++ b/net-misc/nemesis/nemesis-1.4-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 sparc x86"
+KEYWORDS="~alpha amd64 sparc x86"
 
 RDEPEND="
 	net-libs/libpcap
diff --git a/net-misc/nemesis/nemesis-1.4-r2.ebuild b/net-misc/nemesis/nemesis-1.4-r2.ebuild
new file mode 100644
index 000000000000..12ed858e34a0
--- /dev/null
+++ b/net-misc/nemesis/nemesis-1.4-r2.ebuild
@@ -0,0 +1,35 @@
+# 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="http://nemesis.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~sparc ~x86"
+
+RDEPEND="
+	net-libs/libpcap
+"
+DEPEND="
+	${RDEPEND}
+	=net-libs/libnet-1.0*
+"
+
+DOCS="CREDITS ChangeLog README"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fileio.patch
+	"${FILESDIR}"/${P}-libnet-1.0.patch
+	"${FILESDIR}"/${P}-prototcp.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}