EAPI bump. Clean up patches. Fix missing include.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)

5 files changed, 66 insertions, 57 deletions

diff --git a/net-wireless/wepattack/ChangeLog b/net-wireless/wepattack/ChangeLog
index 4e27e7cfb0e7..5ac762e03190 100644
--- a/net-wireless/wepattack/ChangeLog
+++ b/net-wireless/wepattack/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/wepattack
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wepattack/ChangeLog,v 1.16 2008/08/23 05:30:08 cardoe Exp $
+# Copyright 2002-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wepattack/ChangeLog,v 1.17 2014/07/19 00:59:00 jer Exp $
+
+  19 Jul 2014; Jeroen Roovers <jer@gentoo.org> wepattack-0.1.3-r3.ebuild,
+  -files/0.1.3-filter-mac-address.patch,
+  +files/wepattack-0.1.3-filter-mac-address.patch,
+  -files/wepattack-0.1.3-missed-string.h-warnings-fix.diff,
+  +files/wepattack-0.1.3-missed-string.h-warnings-fix.patch:
+  EAPI bump. Clean up patches. Fix missing include.
 
   23 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   add GLEP 56 USE flag desc from use.local.desc
diff --git a/net-wireless/wepattack/files/0.1.3-filter-mac-address.patch b/net-wireless/wepattack/files/wepattack-0.1.3-filter-mac-address.patch
index 65347e558ecd..63ba5f3473bb 100644
--- a/net-wireless/wepattack/files/0.1.3-filter-mac-address.patch
+++ b/net-wireless/wepattack/files/wepattack-0.1.3-filter-mac-address.patch
@@ -1,6 +1,5 @@
-diff -U 3 -r /src/config.h src/config.h
---- src/config.h	2002-10-24 15:16:34.000000000 +0200
-+++ src/config.h	2004-04-07 00:39:51.000000000 +0200
+--- a/src/config.h
++++ b/src/config.h
 @@ -37,7 +37,7 @@
  #define WEPKEYSTORE     	(WEPKEYSIZE * WEPKEYS)
  
@@ -10,9 +9,8 @@ diff -U 3 -r /src/config.h src/config.h
  
  
  #endif
-diff -U 3 -r /src/log.c src/log.c
---- src/log.c	2002-10-24 15:15:55.000000000 +0200
-+++ src/log.c	2004-04-07 00:39:51.000000000 +0200
+--- a/src/log.c
++++ b/src/log.c
 @@ -73,7 +73,7 @@
  	fprintf(fp, "Cracking started: %s", ctime(&start_time));
  	fprintf(fp, "%s\t%s\n", word, in);
@@ -31,9 +29,8 @@ diff -U 3 -r /src/log.c src/log.c
  				(int)difftime(now, start_time));
  		}
  		list = list->next;
-diff -U 3 -r /src/misc.c src/misc.c
---- src/misc.c	2002-10-24 15:15:42.000000000 +0200
-+++ src/misc.c	2004-04-07 00:39:51.000000000 +0200
+--- a/src/misc.c
++++ b/src/misc.c
 @@ -40,10 +40,11 @@
  	fprintf(stdout,"WEPATTACK by Dominik Blunk and Alain ");
  	fprintf(stdout,"Girardet - Version %s\n", VERSION);
@@ -47,9 +44,8 @@ diff -U 3 -r /src/misc.c src/misc.c
  	fprintf(stdout,"-m mode \trun wepattack in diffente modes (default: all)\n");
  	fprintf(stdout,"\t\tvalues: 64, 128, n64, n128\n");
  	fprintf(stdout,"-n network \tnetwork number to attack\n");
-diff -U 3 -r /src/wepattack.c src/wepattack.c
---- src/wepattack.c	2002-10-24 15:14:29.000000000 +0200
-+++ src/wepattack.c	2004-04-07 00:43:56.000000000 +0200
+--- a/src/wepattack.c
++++ b/src/wepattack.c
 @@ -4,6 +4,8 @@
  * Author: 		Alain Girardet/Dominik Blunk
  * Last Modified:	2002-10-24
@@ -168,9 +164,8 @@ diff -U 3 -r /src/wepattack.c src/wepattack.c
                  // arg for packet file to read from
  		case 'f':
                          packet_file = optarg;
-diff -U 3 -r /src/wepattack.h src/wepattack.h
---- src/wepattack.h	2002-10-24 15:14:22.000000000 +0200
-+++ src/wepattack.h	2004-04-07 00:39:51.000000000 +0200
+--- a/src/wepattack.h
++++ b/src/wepattack.h
 @@ -38,6 +38,7 @@
  	unsigned char iv[3];
  	unsigned char key;
@@ -179,9 +174,8 @@ diff -U 3 -r /src/wepattack.h src/wepattack.h
  };
  
  /*
-diff -U 3 -r /src/wepfilter.c src/wepfilter.c
---- src/wepfilter.c	2002-10-24 15:14:13.000000000 +0200
-+++ src/wepfilter.c	2004-04-07 00:39:51.000000000 +0200
+--- a/src/wepfilter.c
++++ b/src/wepfilter.c
 @@ -104,6 +103,7 @@
  	memcpy(&newframe->frame.key, data+limits.key, 1);
  	newframe->frame.key = newframe->frame.key >> 6;
diff --git a/net-wireless/wepattack/files/wepattack-0.1.3-missed-string.h-warnings-fix.diff b/net-wireless/wepattack/files/wepattack-0.1.3-missed-string.h-warnings-fix.diff
deleted file mode 100644
index a5e1cf754151..000000000000
--- a/net-wireless/wepattack/files/wepattack-0.1.3-missed-string.h-warnings-fix.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur WepAttack-0.1.3.orig/src/modes.c WepAttack-0.1.3/src/modes.c
---- WepAttack-0.1.3.orig/src/modes.c	2002-10-24 17:15:19.000000000 +0400
-+++ WepAttack-0.1.3/src/modes.c	2006-11-06 09:59:46.000000000 +0300
-@@ -20,6 +20,7 @@
- 
- #include <sys/types.h>
- #include <stdio.h>
-+#include <string.h>
- #include "modes.h"
- #include "rc4.h"
- #include "wlan/wlan_compat.h"
-diff -Naur WepAttack-0.1.3.orig/src/wepattack.c WepAttack-0.1.3/src/wepattack.c
---- WepAttack-0.1.3.orig/src/wepattack.c	2006-11-06 09:58:33.000000000 +0300
-+++ WepAttack-0.1.3/src/wepattack.c	2006-11-06 09:59:36.000000000 +0300
-@@ -32,6 +32,7 @@
- #include <zlib.h>
- #include <math.h>
- #include <signal.h>
-+#include <string.h>
- #include "wepattack.h"
- #include "wepfilter.h"
- #include "log.h"
diff --git a/net-wireless/wepattack/files/wepattack-0.1.3-missed-string.h-warnings-fix.patch b/net-wireless/wepattack/files/wepattack-0.1.3-missed-string.h-warnings-fix.patch
new file mode 100644
index 000000000000..b46220d0eff5
--- /dev/null
+++ b/net-wireless/wepattack/files/wepattack-0.1.3-missed-string.h-warnings-fix.patch
@@ -0,0 +1,30 @@
+--- a/src/modes.c
++++ b/src/modes.c
+@@ -20,6 +20,7 @@
+ 
+ #include <sys/types.h>
+ #include <stdio.h>
++#include <string.h>
+ #include "modes.h"
+ #include "rc4.h"
+ #include "wlan/wlan_compat.h"
+--- a/src/wepattack.c
++++ b/src/wepattack.c
+@@ -32,6 +32,7 @@
+ #include <zlib.h>
+ #include <math.h>
+ #include <signal.h>
++#include <string.h>
+ #include "wepattack.h"
+ #include "wepfilter.h"
+ #include "log.h"
+--- a/src/verify.c
++++ b/src/verify.c
+@@ -19,6 +19,7 @@
+ 
+ #include <stdio.h>
+ #include <zlib.h>
++#include <string.h> /* memcmp() */
+ 
+ int verify_crc32(unsigned char *data, int length, unsigned long* crc) {
+ 
diff --git a/net-wireless/wepattack/wepattack-0.1.3-r3.ebuild b/net-wireless/wepattack/wepattack-0.1.3-r3.ebuild
index a3e29b93bb76..0407a901dd73 100644
--- a/net-wireless/wepattack/wepattack-0.1.3-r3.ebuild
+++ b/net-wireless/wepattack/wepattack-0.1.3-r3.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wepattack/wepattack-0.1.3-r3.ebuild,v 1.3 2006/11/25 08:30:06 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wepattack/wepattack-0.1.3-r3.ebuild,v 1.4 2014/07/19 00:59:00 jer Exp $
 
+EAPI=5
 inherit eutils toolchain-funcs
 
 MY_P="WepAttack-${PV}"
@@ -14,20 +15,20 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="john"
 
-DEPEND="sys-libs/zlib
+DEPEND="
+	dev-libs/openssl
 	net-libs/libpcap
-	dev-libs/openssl"
+	sys-libs/zlib
+"
 
 RDEPEND="${DEPEND}
 	john? ( app-crypt/johntheripper )"
 
 S="${WORKDIR}/${MY_P}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PV}-filter-mac-address.patch
-	epatch "${FILESDIR}"/${P}-missed-string.h-warnings-fix.diff
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-filter-mac-address.patch
+	epatch "${FILESDIR}"/${P}-missed-string.h-warnings-fix.patch
 	chmod +x src/wlan
 	sed -i \
 		-e "/^CFLAGS=/s:=:=${CFLAGS} :" \
@@ -35,21 +36,20 @@ src_unpack() {
 		-e "/^CC=/s:gcc:$(tc-getCC):" \
 		-e "/^LD=/s:gcc:$(tc-getCC):" \
 		-e 's:log.o\\:log.o \\:' \
-		src/Makefile || die "sed Makefile failed"
+		src/Makefile || die
 	sed -i \
 		-e "s/wordfile:/-wordlist=/" \
-		run/wepattack_word || die "sed wepattack_world faild"
+		run/wepattack_word || die
 }
 
 src_compile() {
-	cd src
-	emake || die "emake failed"
+	emake -C src
 }
 
 src_install() {
-	dobin src/wepattack || die "dobin failed"
+	dobin src/wepattack
 	if use john; then
-		dosbin run/wepattack_{inc,word} || die "dosbin failed"
+		dosbin run/wepattack_{inc,word}
 		insinto /etc
 		doins "${FILESDIR}"/wepattack.conf
 	fi