[gentoo-commits] repo/gentoo:master commit in: net-wireless/wepdecrypt/files/, net-wireless/wepdecrypt/

[Ben Kohler]

commit:     eb68df8871ef3e986e2e6683a30632a21b22195c
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Mon Feb  1 18:06:48 2021 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Tue Feb  9 16:59:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb68df88

net-wireless/wepdecrypt: Fix build with gcc-10

Closes: https://bugs.gentoo.org/707456
Closes: https://bugs.gentoo.org/731722
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 .../wepdecrypt/files/wepdecrypt-0.8-buffer.patch   |  4 ++--
 .../wepdecrypt/files/wepdecrypt-0.8-build.patch    |  5 ++---
 .../wepdecrypt/files/wepdecrypt-0.8-dyn.patch      |  2 --
 .../wepdecrypt/files/wepdecrypt-0.8-fltk.patch     |  5 -----
 .../files/wepdecrypt-0.8-fno-common.patch          | 12 ++++++++++++
 net-wireless/wepdecrypt/wepdecrypt-0.8-r2.ebuild   | 22 ++++++++++++++++------
 6 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/net-wireless/wepdecrypt/files/wepdecrypt-0.8-buffer.patch b/net-wireless/wepdecrypt/files/wepdecrypt-0.8-buffer.patch
index 4b8fb8d1223..097979158af 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 5c13f87a740..fb38d95355e 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 6fcdc578c72..fab8fdf75e5 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 149c3eae32a..df2aa8d27bd 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 00000000000..dd689b18d77
--- /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 c7c1c62bc34..7ea4ad0436c 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
 }