gentoo resync : 03.11.2019

9 files changed, 46 insertions, 186 deletions

diff --git a/net-wireless/reaver/Manifest b/net-wireless/reaver/Manifest
index b5e9a027b6c2..0994b99b79ff 100644
--- a/net-wireless/reaver/Manifest
+++ b/net-wireless/reaver/Manifest
@@ -1,8 +1,4 @@
-AUX reaver-1.4_cflags.patch 1096 BLAKE2B feb7b27659a4f8c3de2bb00208cbc37a4b2f8284877b5505c35eff8944928595cf5c74b0e723b1b2d46023a835cda9ede9b83bc30404c32a7aa5629df17a7c42 SHA512 da429eb6ed25304d21e29894b8f185ad5a36b429aefcfc20133cba1cabf43a2e1fceb94f2b2e1335a98b33c3e7fa9bdfd901e1bf05a80e8331d2d3da29a97043
-AUX reaver-1.4_memset.patch 413 BLAKE2B c144f7525943e0876cd0e717fce87e22e663b584b65af5c648b6cf4035b3b11305998d59e0d01b3976f4f83a39addbebd03d940e1fd0677df13b49d3c774d9a6 SHA512 66f71c475269098011d7db326f8e28f53767fef1a397a2996972a262ca9d8e4ee8b8ad148627bf48c4acdc4730001a40af9d98f7ce916d2611dc1e8d92a93409
-AUX reaver-1.4_parallel-make.patch 1074 BLAKE2B a4f36781138a2430a4830f9bda1a22d8a156c12671263ef5ac034a458fb69af8c7c2a6c6e8e50570b6eee044160f1666b823667b36e8db2c9af9205f8836a50b SHA512 96bf54c8e50f2a4013beccfe13bbd07a99e18a6059411ddcd3e5dd4ac6af6e82008e8d8601ca29b3013b761f88a10a7d873ff46898634ef2cfb9db18fc2fa86a
-AUX reaver-1.4_var_db.patch 405 BLAKE2B 63a3fdcbd8ab6f640a0950c9d817cf281f9fc40dd6d6fa6abe37c3c99c036d4c806f1a9a063841fa969545e580d40e96ece15e7ef5e593a84cba71f3d34084ab SHA512 fa79135c59e25afaa254efb6029d1d87bbc2a00a778e4969b916b3cf428a784d61ba871048f297eba473af0ed4a0b1d56da00b045b69875711e127057d1d6efc
-AUX reaver-1.4_wps_registrar.patch 422 BLAKE2B 978fa05e7ffd86e876866f63fcf48fe0ba81ae066fd6c849693570b89a1a90e6f090de2c207abcd733a7b6bdcae4ce0769859081b295e2602c32cfa905bfa474 SHA512 226f6748026f7d8662eb04089a4265ce6dec0cdaeb7e054de2108922c873270d88ccf86aeea6bd1ff03031c3b77ef6e276b4012fa0110447856cafa5a80a523d
-DIST reaver-1.4.tar.gz 766603 BLAKE2B 4a488364718a17ec29c1d8da4bc7032b65e4597b89c2949e7108d625276e60d0b424f3b87a3d6baa30d5909ac206d6f7793f5e4514c307cc54784386ce5ce422 SHA512 59f2d6f8aa6228988ce5d1c102d9a48b2a23e582ff3d9afe39d7c9717b7e4be059362fdd21a3e5f5d59948df1a7616acdaa6df20f139e9c5aa9bd673f764dfbc
-EBUILD reaver-1.4-r3.ebuild 964 BLAKE2B a00975cc61ca9a7cd605917ded7f980a7f394352e915194565d84ebd69185ed676640ceabdd46ad135148c21ed2d2019daa62129cc786ffb5a341ce4ae207a7e SHA512 fafceaf8cb57fde5d76c9044f982196932f2168b5706fe22f689b17e61db1c71c44995dd90d9b4e3eb920a4762b0b446c8d87aef6b5fb8185859680edf0157e3
+AUX reaver-1.6.5-confdir.patch 281 BLAKE2B d8c1b89bf6a5291b75b99182a2a9b2149f6f83191fa5c0586ef5780acbc6e7d5fcf496f9b1f4715df0a3f7b097073e9a1a80ddc218c96d285aa297ddb595e1cd SHA512 36e2ede41de78573dae93727cee30c7f4031edce6b485d940a3f30209573e21be06d3e75ffb8239105e383bbd849fb728dc9ce9d28c5bab7d85b1b9526a67f5f
+DIST reaver-1.6.5.tar.gz 479441 BLAKE2B 21a1c54da559be4346b0c874947e982ea49ec6f20e612e3699d25524d49681a197a2a8cad0a31dd8dba919d065de48082572a471aa4f736397066edf7f7d8a43 SHA512 3e70d9fffefee3f6d60e72d7d7b1da91032e184c7d27f94b9f26e2260b7274d491f2e41f8056b386a211b9838d21afc6b65a8a826d310b51fc1065fa9e135dc0
+EBUILD reaver-1.6.5.ebuild 724 BLAKE2B a49ce91b2bc68438ab73917f2262e567edfa227de7528cd408c8b1cbaf8177672de9b234ae2776b5c53b719966a02410d86095302b1acbb9fab44911e55bcd33 SHA512 6402633b4819bb1f1036d1c7925e5002ac74025096bfcc4324f878cc486a907501a08548de4092e4a40853b9a6da1998ecfb68ddc2ae5227441c00efa7ae471b
 MISC metadata.xml 461 BLAKE2B b23d4c4b8865ca1c58140486368ee2f4daa29d67af27cc5cce63c137d652c4d28b131140807735e9a5125790cc53629eeef074705278c5a550073d92c3447894 SHA512 503400e6ae36b1819015f51f0e5e01d7ba3c18c0133d625f3c35242dcaef5cd5ce72d57caf1b18892dee2865fcd1af1313f42140f360c249f2048874985d5d5d
diff --git a/net-wireless/reaver/files/reaver-1.4_cflags.patch b/net-wireless/reaver/files/reaver-1.4_cflags.patch
deleted file mode 100644
index e4e1da718d64..000000000000
--- a/net-wireless/reaver/files/reaver-1.4_cflags.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/src/wps/Makefile
-+++ b/src/wps/Makefile
-@@ -1,34 +1,34 @@
--CC=gcc
-+CC?=gcc
- INC=-I../utils -I ../
- 
- all: wps_attr_build.o wps_attr_parse.o wps_attr_process.o wps.o wps_common.o wps_dev_attr.o wps_enrollee.o wps_registrar.o wps_ufd.o
- 
- wps_attr_build.o:
--	$(CC) $(INC) wps_attr_build.c -c
-+	$(CC) $(CFLAGS) $(INC) wps_attr_build.c -c
- 
- wps_attr_parse.o:
--	$(CC) $(INC) wps_attr_parse.c -c
-+	$(CC) $(CFLAGS) $(INC) wps_attr_parse.c -c
- 
- wps_attr_process.o:
--	$(CC) $(INC) wps_attr_process.c -c
-+	$(CC) $(CFLAGS) $(INC) wps_attr_process.c -c
- 
- wps.o:
--	$(CC) $(INC) wps.c -c
-+	$(CC) $(CFLAGS) $(INC) wps.c -c
- 
- wps_common.o:
--	$(CC) $(INC) wps_common.c -c
-+	$(CC) $(CFLAGS) $(INC) wps_common.c -c
- 
- wps_dev_attr.o:
--	$(CC) $(INC) wps_dev_attr.c -c
-+	$(CC) $(CFLAGS) $(INC) wps_dev_attr.c -c
- 
- wps_enrollee.o:
--	$(CC) $(INC) wps_enrollee.c -c
-+	$(CC) $(CFLAGS) $(INC) wps_enrollee.c -c
- 
- wps_registrar.o:
--	$(CC) $(INC) wps_registrar.c -c
-+	$(CC) $(CFLAGS) $(INC) wps_registrar.c -c
- 
- wps_ufd.o:
--	$(CC) $(INC) wps_ufd.c -c
-+	$(CC) $(CFLAGS) $(INC) wps_ufd.c -c
- 
- clean:
- 	rm -f *.o
diff --git a/net-wireless/reaver/files/reaver-1.4_memset.patch b/net-wireless/reaver/files/reaver-1.4_memset.patch
deleted file mode 100644
index 782910a3f0f5..000000000000
--- a/net-wireless/reaver/files/reaver-1.4_memset.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/crypto/md5-internal.c
-+++ b/src/crypto/md5-internal.c
-@@ -188,7 +188,7 @@
-     MD5Transform(ctx->buf, (u32 *) ctx->in);
-     byteReverse((unsigned char *) ctx->buf, 4);
-     os_memcpy(digest, ctx->buf, 16);
--    os_memset(ctx, 0, sizeof(ctx));	/* In case it's sensitive */
-+    os_memset(ctx, 0, sizeof(*ctx));	/* In case it's sensitive */
- }
- 
- /* The four core functions - F1 is optimized somewhat */
diff --git a/net-wireless/reaver/files/reaver-1.4_parallel-make.patch b/net-wireless/reaver/files/reaver-1.4_parallel-make.patch
deleted file mode 100644
index f880cd7562b4..000000000000
--- a/net-wireless/reaver/files/reaver-1.4_parallel-make.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -16,22 +16,22 @@
- 	$(CC) $(CFLAGS) $(INC) wpscrack.c *.o $(LDFLAGS) -o reaver
- 
- libwps.o:
--	(cd $(LIBWPS_DIR) && make)
-+	(cd $(LIBWPS_DIR) && $(MAKE))
- 
- wps: libutils libcrypto
--	(cd wps && make)
-+	(cd wps && $(MAKE))
- 
- libutils:
--	(cd utils && make)
-+	(cd utils && $(MAKE))
- 
- libcrypto: libtls
--	(cd crypto && make)
-+	(cd crypto && $(MAKE))
- 
- libtls:
--	(cd tls && make)
-+	(cd tls && $(MAKE))
- 
- libiw:
--	(cd lwe && make BUILD_STATIC=y libiw.a)
-+	(cd lwe && $(MAKE) BUILD_STATIC=y libiw.a)
- 
- init.o:
- 	$(CC) $(CFLAGS) init.c -c
-@@ -93,12 +93,12 @@
- clean:
- 	rm -f *~ *.o reaver wash
- 	rm -rf *.cache config.status config.log
--	(cd utils && make clean)
--	(cd tls && make clean)
--	(cd crypto && make clean)
--	(cd wps && make clean)
--	(cd lwe && make realclean)
--	(cd $(LIBWPS_DIR) && make clean)
-+	(cd utils && $(MAKE) clean)
-+	(cd tls && $(MAKE) clean)
-+	(cd crypto && $(MAKE) clean)
-+	(cd wps && $(MAKE) clean)
-+	(cd lwe && $(MAKE) realclean)
-+	(cd $(LIBWPS_DIR) && $(MAKE) clean)
- 	rm -f Makefile config.h
- 
- cleanbin: 
diff --git a/net-wireless/reaver/files/reaver-1.4_var_db.patch b/net-wireless/reaver/files/reaver-1.4_var_db.patch
deleted file mode 100644
index de4317b59ffc..000000000000
--- a/net-wireless/reaver/files/reaver-1.4_var_db.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -3,7 +3,7 @@ LIBWPS_DIR=libwps
- INC=-I$(LIBWPS_DIR)
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--CONFDIR=@sysconfdir@/@target@
-+CONFDIR=/var/db/reaver
- CFLAGS=-DCONF_DIR='"$(CONFDIR)"' -DREAVER_DATABASE='"$(CONFDIR)/reaver.db"' @CFLAGS@
- LDFLAGS=$(LIBWPS_DIR)/*.o wps/*.o tls/bignum.o tls/libtls.a utils/libutils.a crypto/libcrypto.a lwe/libiw.a @LDFLAGS@
- 
diff --git a/net-wireless/reaver/files/reaver-1.4_wps_registrar.patch b/net-wireless/reaver/files/reaver-1.4_wps_registrar.patch
deleted file mode 100644
index cc9fe6b774e8..000000000000
--- a/net-wireless/reaver/files/reaver-1.4_wps_registrar.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/wps/wps_registrar.c
-+++ b/wps/wps_registrar.c
-@@ -1469,7 +1469,7 @@
- 
- 	wpa_printf(MSG_DEBUG, "WPS: Building Message M4");
- 
--	wpa_printf(MSG_DEBUG, "WPS: Dev Password Len: %d", wps->dev_password_len);
-+	wpa_printf(MSG_DEBUG, "WPS: Dev Password Len: %zd", wps->dev_password_len);
- 	wpa_printf(MSG_DEBUG, "WPS: Dev Password: %s", wps->dev_password);
- 
- 	wps_derive_psk(wps, wps->dev_password, wps->dev_password_len);
diff --git a/net-wireless/reaver/files/reaver-1.6.5-confdir.patch b/net-wireless/reaver/files/reaver-1.6.5-confdir.patch
new file mode 100644
index 000000000000..d5673d82452b
--- /dev/null
+++ b/net-wireless/reaver/files/reaver-1.6.5-confdir.patch
@@ -0,0 +1,10 @@
+--- src/config.mak.in	2019-10-25 23:32:43.196353940 +0300
++++ src/config.mak.in	2019-10-25 23:32:33.935249226 +0300
+@@ -1,6 +1,6 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-CONFDIR=@localstatedir@/lib/@target@
++CONFDIR=@localstatedir@/@target@
+ 
+ CC=@CC@
+ CFLAGS_USER=@CFLAGS@
diff --git a/net-wireless/reaver/reaver-1.4-r3.ebuild b/net-wireless/reaver/reaver-1.4-r3.ebuild
deleted file mode 100644
index 2769fa2548fc..000000000000
--- a/net-wireless/reaver/reaver-1.4-r3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-inherit autotools-utils
-
-DESCRIPTION="Brute force attack against Wifi Protected Setup"
-HOMEPAGE="https://code.google.com/p/reaver-wps/"
-SRC_URI="https://reaver-wps.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	net-libs/libpcap
-	dev-db/sqlite:3
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P}/src"
-
-PATCHES=(
-	"${FILESDIR}"/${P}_cflags.patch
-	"${FILESDIR}"/${P}_memset.patch
-	"${FILESDIR}"/${P}_parallel-make.patch
-	"${FILESDIR}"/${P}_var_db.patch
-	"${FILESDIR}"/${P}_wps_registrar.patch
-)
-
-src_compile() {
-	emake V=1
-
-	# doman accept only uncompressed files #619966
-	gzip -d ../docs/reaver.1.gz || die
-}
-
-src_install() {
-	dobin wash reaver
-
-	insinto "/var/db/reaver"
-	doins reaver.db
-
-	doman ../docs/reaver.1
-	dodoc ../docs/README ../docs/README.REAVER ../docs/README.WASH
-}
diff --git a/net-wireless/reaver/reaver-1.6.5.ebuild b/net-wireless/reaver/reaver-1.6.5.ebuild
new file mode 100644
index 000000000000..dd1c5685b545
--- /dev/null
+++ b/net-wireless/reaver/reaver-1.6.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="reaver-wps-fork-t6x"
+
+DESCRIPTION="Brute force attack against Wifi Protected Setup"
+HOMEPAGE="https://github.com/t6x/${MY_PN}"
+SRC_URI="https://github.com/t6x/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+DEPEND="net-libs/libpcap"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}/src"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-confdir.patch
+)
+
+src_install() {
+	# Upstream's Makefile does the same but in non-standard way.
+	dobin wash reaver
+
+	doman ../docs/reaver.1
+	dodoc ../docs/README ../docs/README.REAVER ../docs/README.WASH
+
+	keepdir /var/lib/reaver
+}