Fix some compiler warnings.

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

4 files changed, 54 insertions, 6 deletions

diff --git a/net-wireless/reaver/ChangeLog b/net-wireless/reaver/ChangeLog
index 0c0f6a0263b1..4b21827da0f1 100644
--- a/net-wireless/reaver/ChangeLog
+++ b/net-wireless/reaver/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/reaver
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/reaver/ChangeLog,v 1.4 2014/10/07 18:06:01 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/reaver/ChangeLog,v 1.5 2014/10/07 18:58:15 jer Exp $
+
+*reaver-1.4-r3 (07 Oct 2014)
+
+  07 Oct 2014; Jeroen Roovers <jer@gentoo.org> -reaver-1.4-r2.ebuild,
+  +reaver-1.4-r3.ebuild, +files/reaver-1.4_memset.patch,
+  +files/reaver-1.4_wps_registrar.patch:
+  Fix some compiler warnings.
 
 *reaver-1.4-r2 (07 Oct 2014)
 
diff --git a/net-wireless/reaver/files/reaver-1.4_memset.patch b/net-wireless/reaver/files/reaver-1.4_memset.patch
new file mode 100644
index 000000000000..782910a3f0f5
--- /dev/null
+++ b/net-wireless/reaver/files/reaver-1.4_memset.patch
@@ -0,0 +1,11 @@
+--- 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_wps_registrar.patch b/net-wireless/reaver/files/reaver-1.4_wps_registrar.patch
new file mode 100644
index 000000000000..adaeded1c298
--- /dev/null
+++ b/net-wireless/reaver/files/reaver-1.4_wps_registrar.patch
@@ -0,0 +1,27 @@
+--- a/wps/wps_registrar.c
++++ b/wps/wps_registrar.c
+@@ -2317,11 +2317,11 @@
+ 	/* @@@ Save a copy of the network key and ssid directly to the wps_data structure @@@ */
+ 	if(wps->cred.key_len > 0)
+ 	{
+-		wps->key = strdup(wps->cred.key);
++		memcpy(wps->key, wps->cred.key, sizeof(wps->cred.key));
+ 	}
+ 	if(wps->cred.ssid_len > 0)
+ 	{
+-		wps->essid = strdup(wps->cred.ssid);
++		memcpy(wps->essid, wps->cred.ssid, sizeof(wps->cred.ssid));
+ 	}
+ 
+ 	if (wps->new_ap_settings) {
+--- 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/reaver-1.4-r2.ebuild b/net-wireless/reaver/reaver-1.4-r3.ebuild
index 6a68a4079779..5b54d2bf2660 100644
--- a/net-wireless/reaver/reaver-1.4-r2.ebuild
+++ b/net-wireless/reaver/reaver-1.4-r3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/reaver/reaver-1.4-r2.ebuild,v 1.1 2014/10/07 18:06:01 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/reaver/reaver-1.4-r3.ebuild,v 1.1 2014/10/07 18:58:15 jer Exp $
 
-EAPI=4
+EAPI=5
 
 AUTOTOOLS_IN_SOURCE_BUILD="1"
 
@@ -15,18 +15,21 @@ SRC_URI="http://reaver-wps.googlecode.com/files/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND="net-libs/libpcap
-		dev-db/sqlite:3"
+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() {