gentoo (valentine's day) resync : 14.02.2021

7 files changed, 38 insertions, 23 deletions

diff --git a/net-wireless/wepdecrypt/Manifest b/net-wireless/wepdecrypt/Manifest
index 316d3917d585..b01dc9651159 100644
--- a/net-wireless/wepdecrypt/Manifest
+++ b/net-wireless/wepdecrypt/Manifest
@@ -1,7 +1,8 @@
-AUX wepdecrypt-0.8-buffer.patch 588 BLAKE2B 10d13f865f9f9033c017718c10a8cc1b6edc80a28fb7341e7c06b1663afaa87f3905cbbf9fb9d5ad6d407de551f5ffe09cac2d6bf18c778e429a6e1b1ab3becd SHA512 4fd35710e614fcfa54de7d67e9ddc87fe1f956b534f0cd626bfa82ff2c0b3c9c80fab982900e42e5b61bb82472472e9192bbb08a343fc5526ba7366acb17fc6c
-AUX wepdecrypt-0.8-build.patch 1249 BLAKE2B 412a4d2a055d56a444c068ef1a508d693a5ed7335febc84dc8b64aeefbf8debd6b8b118caef8633e5aa1f09ca5fe9025eabe5c208ea2d064af1f34cbec7e66d9 SHA512 0d02e7642b874ab626d2b2d4093e456135b8e8f06ff4afa5dd2caf3e9489d23cd1668ff8cb9a4a732105d88bc55702ad722da682af46f680251597642f15316a
-AUX wepdecrypt-0.8-dyn.patch 548 BLAKE2B 0c699ecb20a35fd2912662fafa1057f832580a6692c7e986a3863a17be59887a58cce475cbf37a888d053e868bdfde98c524bf3bb916215967607915ba7c8493 SHA512 d3d04cf3fd40f68255fc2893560283c5a34abbfb246c15e84e3c8ee4aa2eae6390033ac2c9a352ab68b5c6026ac3f79dd111faf144673faceb15ae1942d7c6cc
-AUX wepdecrypt-0.8-fltk.patch 534 BLAKE2B 08de31992e5f68d883b461e3071d1b094405e29423569d28e3c599e4228b018f84b2753ba2294d0bec1be1cb6ad7e83c6903bc1022d6adcd9ef40c7d356cd999 SHA512 dfc860cb95640a2bdfdc648a2588b6a02e8e47b8ba8959762b69d19a97f4ad5e8253baa8ca53e2a8556b5d4b3ce56fab3bd44d861ab0205465e39fe460ebabdb
+AUX wepdecrypt-0.8-buffer.patch 516 BLAKE2B 30c52367c72e52d7a537c721ae874dd788b57765ebe261fe1f8b491ce58676452ab202afb24e14969d7485fe95bb7f8b28fd60c26ab440b24b4cf19fba8a19f3 SHA512 c0e1c7f03d6f2a588f021ae39f20c3de0788c6ce562da9ed14841f038459d1917115540bf01ffce38aee8ec16948817026e13ccaa4ca58eb35060a9851fa6db0
+AUX wepdecrypt-0.8-build.patch 1076 BLAKE2B 1f2acbc2a63e1317ce20c8a46e7a8ca6871c7d2ae23025fb2aa35737f6dd649fd0816cf36423921dde7624c4b9f768545b8a742609baadef8811c71a21eec05b SHA512 716ec50ef04514ff5eae86571868b5e1041b3d5001fe9b262e7bc77969c05321d9e2449ec70a88ee9d9d9f2b228ada874ebfe4bda2d3e68c5d700826763e11d5
+AUX wepdecrypt-0.8-dyn.patch 477 BLAKE2B c2f00d30dcc5a81dd7f6c737fc919c560bcaeb3b734860b8d930f434a1e1a88be44d43887a9b153e70113696db7e4c712eeb3e574ca92868614c118bb710727c SHA512 f8c5af04dfa5ceebcf877d13c83ac56bfcaa045dbcee0886a2cb530444300d3e494edfafb799c0fec8db377110c5e38349636d747eb016c02e998eb44d5919f9
+AUX wepdecrypt-0.8-fltk.patch 397 BLAKE2B 1e6602d0853d5f37b251e89e50d641ffaf1e4abf8126768105ddf7f306e0dce150d3ee7401e41e3e1af606cbfc1ecfa2987cb68108b8e5dd0112033f3f6f3d02 SHA512 5c562ff285661eef13e02eb1d75a638658e55e868b5bf378b43b037ef4bc99076e630a706823832c2d9e639b3a32f3f59eee3f91b33fa5ad6e2fb79e5e6e0ddd
+AUX wepdecrypt-0.8-fno-common.patch 256 BLAKE2B fed7cb5f1118bf2691b0d3f5fd5c5ffb8373962b1dc73272a57a5b3d9ff3fc8e0eeecd9945cc1710dfff7f3ea34de98f501b7caebf8fecffc811256c91946c2d SHA512 87f9485b8fbde6eabb26908ac0779effe1541a1acce80d40b0172718d3c3f332f085008ccfbaceac9c0398a983413ed3c52c38834a4792b8dc7b14f011a50f45
 DIST wepdecrypt-0.8.tar.gz 90260 BLAKE2B b5f2474ce86b376d77275fa39a59cf4e524221e8eca816dd153c55e3283793ad62257010acb380273dfc391a9e2bc04eeaee53a9a1dc80add3431e763cc6f07a SHA512 68278e44055354eaf85640fdefc8d97a1155e6f022ed3d708db7d32e0fe8a8306a34fd80aae81eb9aa3ef51a069f8fe5ef060847163774184d4181c62853300f
-EBUILD wepdecrypt-0.8-r2.ebuild 768 BLAKE2B 8a28f00d032fcd581510f87f44220ea06fb9c5a71e6ed017c21046e852920e15e9c3c986f192d01bb6b831e2f072e4c44322513d939d253aec7f32680c5c90e2 SHA512 8e6691e318ee69df1fe93de8c11ca4f8a9e729acf2f7abfc7f0e907ac9c512aa84738c96b66d7b9e07834c8c0d6fdd6ddb2c1a0f1f28e692ff9d55c5848c958e
+EBUILD wepdecrypt-0.8-r2.ebuild 939 BLAKE2B 56c18014f144904f18634a2f35d7873422f02c037f2614d2efbeadebe40df5b5164e0822e85d465b927a42964788ecafeca295793473f04b576ec811d273c105 SHA512 48d85534f7d17e428c8b1da5e0f109852812888bcab56b3264dbd2b08528e274a5b5fd7501dd51377c4552d0ecb90280dc2c9312650fdca3652d6a48ebcd4997
 MISC metadata.xml 247 BLAKE2B 28ed640c3f82b1ebdfada3787e9c6f8338282489bfcb9475cbb56e59be4caed2f632461d4f65d4e0d77d4c50a1e4747bababbe5766f2c19b45e93a62e5eefb40 SHA512 afa5218288bb0930f5ebca83619ae5d2b08a02b651aca5455d8fc712a85445754ea9e7e370fcf72c757982a48b60a848318c315746c9c3f01e1ca0bf79260d6f
diff --git a/net-wireless/wepdecrypt/files/wepdecrypt-0.8-buffer.patch b/net-wireless/wepdecrypt/files/wepdecrypt-0.8-buffer.patch
index 4b8fb8d1223a..097979158af7 100644
--- a/net-wireless/wepdecrypt/files/wepdecrypt-0.8-buffer.patch
+++ b/net-wireless/wepdecrypt/files/wepdecrypt-0.8-buffer.patch
@@ -1,5 +1,5 @@
---- a/src/wepclient.c	2006-07-08 19:48:08.000000000 -0400
-+++ b/src/wepclient.c	2010-12-10 13:16:32.000000000 -0500
+--- a/src/wepclient.c
++++ b/src/wepclient.c
 @@ -75,7 +75,7 @@
  int server_connection(unsigned char * server_host, int port, char * packet_file, unsigned char * init_key, unsigned char * end_key, unsigned char * decrypted_key, unsigned char * bssid, unsigned char * mode ,int option){
  	int sd, read_bytes, write_bytes, i, fd;
diff --git a/net-wireless/wepdecrypt/files/wepdecrypt-0.8-build.patch b/net-wireless/wepdecrypt/files/wepdecrypt-0.8-build.patch
index 5c13f87a7402..fb38d95355ee 100644
--- a/net-wireless/wepdecrypt/files/wepdecrypt-0.8-build.patch
+++ b/net-wireless/wepdecrypt/files/wepdecrypt-0.8-build.patch
@@ -1,6 +1,5 @@
-diff -urNp wepdecrypt-0.8.org/src/Makefile wepdecrypt-0.8/src/Makefile
---- wepdecrypt-0.8.org/src/Makefile	2006-07-09 02:48:08.000000000 +0300
-+++ wepdecrypt-0.8/src/Makefile	2007-11-10 18:36:25.000000000 +0200
+--- a/src/Makefile
++++ b/src/Makefile
 @@ -6,15 +6,12 @@ include ../config.mak
  wepdecrypt: 	wepdecrypt.o rc4.o wepfilter.o log.o modes.o misc.o verify.o keygen.o localkeygen.o wepserver.o wepclient.o md5_digest.o
  	$(LD) $(LDFLAGS) -o $@ wepdecrypt.o rc4.o wepfilter.o log.o \
diff --git a/net-wireless/wepdecrypt/files/wepdecrypt-0.8-dyn.patch b/net-wireless/wepdecrypt/files/wepdecrypt-0.8-dyn.patch
index 6fcdc578c729..fab8fdf75e57 100644
--- a/net-wireless/wepdecrypt/files/wepdecrypt-0.8-dyn.patch
+++ b/net-wireless/wepdecrypt/files/wepdecrypt-0.8-dyn.patch
@@ -1,5 +1,3 @@
-diff --git a/src/Makefile b/src/Makefile
-index a779cb7..f32e65e 100644
 --- a/src/Makefile
 +++ b/src/Makefile
 @@ -8,7 +8,7 @@ wepdecrypt: 	wepdecrypt.o rc4.o wepfilter.o log.o modes.o misc.o verify.o keygen
diff --git a/net-wireless/wepdecrypt/files/wepdecrypt-0.8-fltk.patch b/net-wireless/wepdecrypt/files/wepdecrypt-0.8-fltk.patch
index 149c3eae32ad..df2aa8d27bdc 100644
--- a/net-wireless/wepdecrypt/files/wepdecrypt-0.8-fltk.patch
+++ b/net-wireless/wepdecrypt/files/wepdecrypt-0.8-fltk.patch
@@ -1,8 +1,3 @@
- configure |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/configure b/configure
-index 12fa395..258b157 100755
 --- a/configure
 +++ b/configure
 @@ -2915,7 +2915,7 @@ fi
diff --git a/net-wireless/wepdecrypt/files/wepdecrypt-0.8-fno-common.patch b/net-wireless/wepdecrypt/files/wepdecrypt-0.8-fno-common.patch
new file mode 100644
index 000000000000..dd689b18d772
--- /dev/null
+++ b/net-wireless/wepdecrypt/files/wepdecrypt-0.8-fno-common.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/707456
+--- a/src/wepfilter.c
++++ b/src/wepfilter.c
+@@ -30,7 +30,7 @@
+ #include "config.h"
+ #include "misc.h"
+ 
+-int server_mode;
++extern int server_mode;
+ static int capture_successfull = 0;
+ static wlan_packet_list* head = NULL;
+ 
diff --git a/net-wireless/wepdecrypt/wepdecrypt-0.8-r2.ebuild b/net-wireless/wepdecrypt/wepdecrypt-0.8-r2.ebuild
index c7c1c62bc348..7ea4ad0436cc 100644
--- a/net-wireless/wepdecrypt/wepdecrypt-0.8-r2.ebuild
+++ b/net-wireless/wepdecrypt/wepdecrypt-0.8-r2.ebuild
@@ -11,6 +11,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="X"
+
 RDEPEND="
 	dev-libs/openssl:=
 	net-libs/libpcap
@@ -19,19 +20,28 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-	"${FILESDIR}/${P}-fltk.patch"
-	"${FILESDIR}/${P}-buffer.patch" # bug#340148.
-	"${FILESDIR}/${P}-dyn.patch"
+	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${P}-fltk.patch
+	"${FILESDIR}"/${P}-buffer.patch # bug#340148.
+	"${FILESDIR}"/${P}-dyn.patch
+	"${FILESDIR}"/${P}-fno-common.patch
 )
 
 src_prepare() {
 	default
 
-	sed -i 's/make/$(MAKE)/g' Makefile || die "Sed failed"
+	sed -i \
+		-e 's/make/$(MAKE)/g' \
+		-e 's/wepdecrypt-$(VERSION)/${PF}/g' Makefile || die
 }
 
 src_configure() {
 	econf \
-		$(use X || echo --disable-gui)
+		$(use X || echo --disable-gui) \
+		--infodir=/usr/share/doc/${PF}
+}
+
+src_install() {
+	default
+	docompress -x /usr/share/man/man1
 }