Fix some compiler warnings.

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

5 files changed, 61 insertions, 11 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/Manifest b/net-wireless/reaver/Manifest
index 9eb72b1ac9f3..508a751579bc 100644
--- a/net-wireless/reaver/Manifest
+++ b/net-wireless/reaver/Manifest
@@ -2,18 +2,20 @@
 Hash: SHA256
 
 AUX reaver-1.4_cflags.patch 1096 SHA256 7a820f7c55dc35e1254470c475918a770f88b6c466b4f485a5cdd30d10a6aec0 SHA512 da429eb6ed25304d21e29894b8f185ad5a36b429aefcfc20133cba1cabf43a2e1fceb94f2b2e1335a98b33c3e7fa9bdfd901e1bf05a80e8331d2d3da29a97043 WHIRLPOOL 0fd07260dc3e3508343870d441cd043030d54733a4f3bd08adc3495be1aaab14738525c68815b465de09855c0d45aae6681d4f463e0dd7563960fee63355ea23
+AUX reaver-1.4_memset.patch 413 SHA256 6c75745560514fbc8d9403fec59c73261f77d47b5416c44d2e67e6107f7aed45 SHA512 66f71c475269098011d7db326f8e28f53767fef1a397a2996972a262ca9d8e4ee8b8ad148627bf48c4acdc4730001a40af9d98f7ce916d2611dc1e8d92a93409 WHIRLPOOL 242846e9ba6bdd8266dc7b886db90e55cb1191e9625403e1ee22167b795245d7d711c693edd10df8251d4e4a14115abf29d6b3c9791f215d55d3c61d579c0f28
 AUX reaver-1.4_parallel-make.patch 1074 SHA256 5c8c6b685b461b93e08aef76783247cce3e588854ac581cfd4b16dd111dda599 SHA512 96bf54c8e50f2a4013beccfe13bbd07a99e18a6059411ddcd3e5dd4ac6af6e82008e8d8601ca29b3013b761f88a10a7d873ff46898634ef2cfb9db18fc2fa86a WHIRLPOOL 4f3280b70982b02b1bcb63dd90d93ed3fd9d5978d484ad145e516cf6f9fcf3ec4b854246acce6d603a555deb1d494d5aaa87a9495f1e1a57f7119bd3b81a85ea
 AUX reaver-1.4_var_db.patch 405 SHA256 0f795e669e00a278268d63cc133d5fb5b80ead45bf791dd4877a92f6b40ccb3b SHA512 fa79135c59e25afaa254efb6029d1d87bbc2a00a778e4969b916b3cf428a784d61ba871048f297eba473af0ed4a0b1d56da00b045b69875711e127057d1d6efc WHIRLPOOL d4fbc20d290a28f24e19aee2c6a821f3991b8063b60fa5d5b715afcc234100b1d92105c92e2e0db03967308efd4594c99d1e02fce27ce491ed3d9ccfd70359a3
+AUX reaver-1.4_wps_registrar.patch 893 SHA256 5e9358c610183aaf4090ec9a27b6e8d7bf774c8e1dd17f95940274e042da8488 SHA512 e7c4e4549a49cebb9e35237da3532c1c3d0881b10564d443fdc77660d1f6ad868da401d2ec9145dd4a0cb088e4da1e9046ca458132cf2fd73fc647e6e2897e46 WHIRLPOOL 1e15e480342fe5bcbce7c4bcd576b15ff178b44230d3f0784c5daa77d403f4a7851b875ce496e72854f6f5ab24bb52fabcb8027c5a4f6ee1723450eb7f01aacb
 DIST reaver-1.4.tar.gz 766603 SHA256 add3050a4a05fe0ab6bfb291ee2de8e9b8a85f1e64ced93ee27a75744954b22d SHA512 59f2d6f8aa6228988ce5d1c102d9a48b2a23e582ff3d9afe39d7c9717b7e4be059362fdd21a3e5f5d59948df1a7616acdaa6df20f139e9c5aa9bd673f764dfbc WHIRLPOOL 5b8a91fe97bf08d6dc544b41dd04baedb9488d574e9a0695d8babeb34a9fa5acc81cfc86899c600b12b445cb83887dfbb18517f2ebbd5d34ab27e8c9ce428e38
 EBUILD reaver-1.4-r1.ebuild 827 SHA256 208fa8acee9944cc2896b49c5978b939ff737d70501cc61aaaffd393e51b4356 SHA512 9a993dc5bd05e5b295a46c42e99a3afe90d6ba5df51c942f21c3d8aad0851e9818ffe6618aa73351b328d8042727d46d66280b41ee2b32e39d4387b6e5850c00 WHIRLPOOL f3a09e04ed4149eb6a182a23e78be7aae50d94c75228563b9603e2e2c68e8b5b41ff0737bb5881a5a1ee1f29906797ce61e6aa5ebe4bffe5ed54f7aaf8b41648
-EBUILD reaver-1.4-r2.ebuild 925 SHA256 a2ee288a8f19b0ca655401fab1d3fe5cd1e547214d19fce2b977463812e135f0 SHA512 9fd68406c600a6e0bfebd51073bcf5be0e2e89689a65ca9c162a46a482f87c4f7007c63746f635bb8c9d3f39daaef37e06574ea9077b6c5200ef05a309e49128 WHIRLPOOL ecda24775079265394f47eff1c43ccb757d192d8ba20dbcd8a607911d068a5db04b125d1b8af9006d738f3d13ee35ae649cd82345067b74e528f75967c8fb7e7
+EBUILD reaver-1.4-r3.ebuild 992 SHA256 394a2f98fefc462f691c21eaac43c0f2aff52a43fd7197e0a596cd86e624aae3 SHA512 daa213f7d4fa95f4aab4f93ba31255829c2a3e26fc7cf10f31ebef12aa28fc4b1139b70f834660755109f22da44021e445cc9089684440bfd2e7f17eba9257f0 WHIRLPOOL 13001c02877daf5f48e7b7477d191e839e6a84418fa6add7f2289b2c2a2cc6ec3b42b6beddcdb6dba3ff314c104e0f732eff9bf2cfdf57ed1d9b8944aadf1dd7
 EBUILD reaver-1.4.ebuild 776 SHA256 5ffe02ed93acaab539c2e1a00e4873b1fbcc2b04ad165f545f01dd7f81350896 SHA512 52ed699b882f8e6a337c9325ec39a8bb8721d543fcc1cf588d3565ee5caf480893bdefd9405828b56585682d8b8a21674e04e3652357b4651a58994522c68bac WHIRLPOOL 13ad537ccb4436f4de5c9287e5e118d58cd39d0996d3dc825993c2975744754239b7986bc09117800ff1e895ed4640eef8ba847f2b0f788664956f387c4f7a63
-MISC ChangeLog 998 SHA256 5188ddaf6672b466739247c51c96e00345a1f9c044a8f981be6d7748ab1e4325 SHA512 d60a2e9ffd1510a8d789c3f48743ee0c11dbf03658db282cb7ce40735de347c98158f40a275246b3e34c3c2e43b4acfb75513b4ff8a7a63fed90fd3bdb42b53b WHIRLPOOL d285571dd6c9d78177dcef09fe99c5c3e82ed6264ec533e6961139845693c7b57903e36bc9446f8ba8b26e7c16249ba13dd83ddde01ca14798045f58473dab27
+MISC ChangeLog 1227 SHA256 306c477593fb5646299e011fd7a5f55b42fee3af856663040a25a07d8049d145 SHA512 078e5cb8435e53db15fe308d41205aca7df4629ed7a0b4c0ab7581421cc6576c609a9bd1039bb28330f6247c7750438710ba189705602616021913f6ddf3e848 WHIRLPOOL a96421ce7097ef84e0593b73f9aec1d3efc2e3fe1d131bc44eedadf185b82bd95465a5c5422a5a8e7de3a4d7a021003dc76acd64eadb7dfc9fc537ef419e3777
 MISC metadata.xml 351 SHA256 8bd7560869d675b48d4a04cd19294323e6e39f21b47b67cc42806d0109105e8e SHA512 2145924744d1a15913ae0e6d6e3ba4a4b14f906615a3d79decfbacad71afc28647053cd73d6e5a590a61e6f68bb3c885bba28da3731f63ff71ceb4606187af99 WHIRLPOOL 6c711e649ddbe929eae41b8b2d21d6255330b630a2b39109bbc80fd3a27d19811fadffc428214a9ae14ec799f7d6169aee97350e5b39c66ebedecfcee686b95d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQ0K4sACgkQVWmRsqeSphMqPQCfWRrOF3TBkDVBH0qZgfGr2cTz
-n8wAn0cKeW2QhcyN+GrM0xcen2nag2Tr
-=zemr
+iEYEAREIAAYFAlQ0N8kACgkQVWmRsqeSphPbFACeIeQ77szzY0WyqTBCxQIwQkaN
+ne8AnjMAni1u6ZhpqBE3izHppwnKWEkB
+=ABx4
 -----END PGP SIGNATURE-----
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() {