Fix build failure, bug 555384.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

4 files changed, 59 insertions, 8 deletions

diff --git a/sys-libs/efivar/ChangeLog b/sys-libs/efivar/ChangeLog
index cd8440711a1b..9890bc919707 100644
--- a/sys-libs/efivar/ChangeLog
+++ b/sys-libs/efivar/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/efivar
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/efivar/ChangeLog,v 1.8 2015/07/19 17:15:14 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/efivar/ChangeLog,v 1.9 2015/07/19 22:15:13 floppym Exp $
+
+  19 Jul 2015; Mike Gilbert <floppym@gentoo.org> +files/0.21-initializer.patch,
+  efivar-0.21.ebuild:
+  Fix build failure, bug 555384.
 
 *efivar-0.21 (19 Jul 2015)
 
diff --git a/sys-libs/efivar/Manifest b/sys-libs/efivar/Manifest
index 7fad2aea72e9..d092a23a7074 100644
--- a/sys-libs/efivar/Manifest
+++ b/sys-libs/efivar/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX 0.21-initializer.patch 1261 SHA256 ce6792192c9014bd0db4acbf0866f3d6eb1e608225177cbfaf6dd54b7d447bf5 SHA512 e7593fcefead06007a2314217b4be61161261b2be06c631065ede00f48098b924395605faba2ef859be9b6a242d531942460f2b51ea346d1cb93af94ecb23b3c WHIRLPOOL efcec5c85046ba5acff2b8559fad7c05175ed791ea84f47587013e90a3e2c301df507a776097795f0003625fbc40b95d79ecb1a349ee5ee08d5b4a7ad841b452
 DIST efivar-0.15.tar.bz2 26936 SHA256 08251e10dbee8a5a9851d859b98fc6cb479acfced38695a101bd8ed2a447051e SHA512 f6fbc71fa892366933f11f230f662ff7af515bcee3d4eb0279a3aeb6aa5bf21d86f86db928ff3cb4ed3366f52bd3fb8b959752759277ed4bf368a5fc223d62e9 WHIRLPOOL 8fd6a689b14aed7d8a9ed7d17fe4206416d5bb72d04843dab7de22c513cc0ad639daa8dad0de4c87e60164092d3c31c8d25973be03e20add99018c9a122bb9be
 DIST efivar-0.20.tar.bz2 66165 SHA256 cf699c1406c6d012ab0665f653b2f1a14d99edd8e2bf06f5ac2caa1b10e030a9 SHA512 c50de9cb8bad49eeaf00721c1bcea060a5c3486574bbba891a51eaff81bd12e764bf42b56c94c8b483359e082365848198a88d67b7c82df4c39c09fb47ce7474 WHIRLPOOL af760446f24832702f6b6d65dd6bbb9ccfede45680aac7bd9700619522bb5e774b1d24386aa74a879cd4cf6fdfa7362bb19b390aa519b3b9e8fc651b5af20951
 DIST efivar-0.21.tar.bz2 66677 SHA256 04b9b9de9d9a1a013395400438a033daf4a4290f497ec5be04a120e2ac535094 SHA512 851b5e29c2dab213bb81c6ea5c5c211d36fb6846de8aa1086b0657f06917c2f93bf154aa3a4c2dda22103bdf1d67ca877f9771dc3f979c9311ca24e0bc09492a WHIRLPOOL d6cdb2e2f047a22677d046581490ee4e64a2ac0631be8e41bf6250241b2554f62ddf81226fa3970ee80ebb9ec62665ca21f4fec94cc5ebe05414b0c674ad38dd
 EBUILD efivar-0.15.ebuild 621 SHA256 d5051f42e4bb127bc8c45a1c6545f0db8d568053437b294a42810d7efe7dd8ba SHA512 a3ec8bf3bc5d1e3e515a5edb7ad0ac2f84f22f00688095dfdbdf4916885345ea417598a2e8f860ff009aca0b6d1a37e4b73c9c1b1738577986459f1951d738dd WHIRLPOOL 3c1061b5ecf30b43128b5b9910ccf2c23ef51ba009ba2791e1e6086cafdb7a32fb963edf54988f548a12725635c05733d2d2352986e0723ff23e2ff2debc6635
 EBUILD efivar-0.20.ebuild 624 SHA256 3e456054d09f832797de7ea5cdaf31ed77113b63db52591a96da2d836d528a30 SHA512 2d80d1ba08120f5a1c4b99b90a7d8bfba4d001de642d88569fb8c9aee416a481e36987a59683717081c3057a05be61ba78801e284912b498ac7f8d6c2cd77d71 WHIRLPOOL 09157145fbab81d7f30d9d91acc3f3e470359525179ab94d5f83c1ef03bc7154b935706feeec8aab555443df82fe9613f2cedd8061df6e7527450dff6cdfbbb3
-EBUILD efivar-0.21.ebuild 624 SHA256 a42f8392b721977e68ae26e1c14e3bdc7cb8f51295bad1c6286e6543b485c59b SHA512 efe40c7cda590224f2750e45b191a5433da74cee3ddd3b8bfd1b578a802a77a075363906ad061f55dcc42644b806de2e9c5ae1e4438a94b0c45b7c556eac1029 WHIRLPOOL b27e387e5e40a216eacd58dd54d68e530f2bfceacf2d65c6e15ac5ec86317957a4ec23b965ea97a976318ab1edc5a7ca8e81281cddd480097a9753b7b509e0c4
-MISC ChangeLog 1175 SHA256 1e5f52295276a5d1ab495342998b4b949e1d6e4fe9a4fa1813326a2994009303 SHA512 ff641d5dfde8f3754052fc2ac45571f6517e7bf2e6cefc13842dd85c9db37fc2b2671b4f1fc43cbb0209387cbe9fca3f6b726425892bb039c3f639345403f91b WHIRLPOOL 7dfa2e231964507e610ddf3b53af00e538de839ee5f63d7a05f2e8c0b95b0e2b78af8f5c16c65c97ae9398c4121c26b0aba5741c3960e8957c8f2b8c5d3d8990
+EBUILD efivar-0.21.ebuild 695 SHA256 a6af270748c5aa88daea56db50f6ed90a0919ad1d2719e604c989ff1be9198c8 SHA512 e3963982934bf21e3309f3c9af6bf0a8b821be66fbfe6acd3f3532225fc5fa3e9ae8666de373bf755295961f1cda35c63a3e3dcad4f5e100d738b988fbed65f4 WHIRLPOOL 74cb8d270f0d094f34bc758653802489b231fc6ef1874415c2b4cbac64dfb264d8b540acdc94d41628d199281d385c0d2c63775037077047fa59d994b5bbaadb
+MISC ChangeLog 1311 SHA256 dd88f7429f27a75d15079b8fa57ed6bd5ac39cb11cae4b19024b786aa2ee2c41 SHA512 fc46295a92a424d4ee88fde31cdeb3c5e1cde5fef7242102322c2ae20a216c0bd6574d5bb45075385816f7bd28810f7fc61d2e794d78ef6cb3c4b019eee54bee WHIRLPOOL c44a85db1b840967683bd83653ea60b49d05f60aefa0f6edf6383818584053f3965bbd89738c459546c56a8931afd54c02fd8cc03584030bf73bbf477280e7b7
 MISC metadata.xml 508 SHA256 7dd402a7ff44021019e0f6a82414fd5c50b50d8ed78e49fc8608f71c11d58f5a SHA512 c5d92d7795124b9333f7d0cc22fa1db06e414afcb8e2eb0f521fa80c4fffa842fde4d57dfeddf14b71a3b2268ea4f15421ff9d13476f09bf2884c93a4d7cac25 WHIRLPOOL a0c1b72a887a59d73d20a5925047fd710b7ae668e8aa7ee1204761eda617c718487bc4bbad301162877bbf46baaeb04cb0e9edb1118df2fcd8ef19b0e6785ea6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlWr2yQACgkQRxvnM+8pGj8ddwD/eNRZLH3ilkTyhliig4AzbAM+
-s55dHNzt1vMBw3BVE7sA/jhx1aUIxWILkHDTsixTuN0cYNDV8oUDzldq/kFjhRAh
-=iTHJ
+iF4EAREIAAYFAlWsIXMACgkQRxvnM+8pGj9iJAD9Fn7auJ9qt5XzIEYGLMBf6xmG
+c+anCsJr5QUkOFiHi6QBANW5UCZ7K7f543ODPdEp9JmEjclaqXR6BMAO4250aPfN
+=nof7
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/efivar/efivar-0.21.ebuild b/sys-libs/efivar/efivar-0.21.ebuild
index 846209985ee4..8a202ffe455e 100644
--- a/sys-libs/efivar/efivar-0.21.ebuild
+++ b/sys-libs/efivar/efivar-0.21.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/efivar/efivar-0.21.ebuild,v 1.1 2015/07/19 17:15:14 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/efivar/efivar-0.21.ebuild,v 1.2 2015/07/19 22:15:13 floppym Exp $
 
 EAPI=5
 
-inherit multilib toolchain-funcs
+inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="Tools and library to manipulate EFI variables"
 HOMEPAGE="https://github.com/rhinstaller/efivar"
@@ -17,6 +17,10 @@ KEYWORDS="~amd64 ~ia64 ~x86"
 RDEPEND="dev-libs/popt"
 DEPEND="${RDEPEND}"
 
+src_prepare() {
+	epatch "${FILESDIR}/0.21-initializer.patch"
+}
+
 src_configure() {
 	tc-export CC
 	export libdir="/usr/$(get_libdir)"
diff --git a/sys-libs/efivar/files/0.21-initializer.patch b/sys-libs/efivar/files/0.21-initializer.patch
new file mode 100644
index 000000000000..25d065968318
--- /dev/null
+++ b/sys-libs/efivar/files/0.21-initializer.patch
@@ -0,0 +1,42 @@
+From a3606c02fd271d32e364fcc540e34ba1899309f6 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Tue, 14 Jul 2015 09:33:54 -0400
+Subject: [PATCH] Sometimes the compiler doesn't like { 0, } as an
+ initializer...
+
+Because it really wants to be { {0, },} or something, and sometimes the
+compiler, knowing full well what we're trying to do, likes to complain
+about the rigor applied to our technique in doing it.
+
+memset() the struct ifreq to 0 instead so I don't need to figure out its
+internal structure just to zero it out.
+
+Resolves #28
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+---
+ src/linux.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/linux.c b/src/linux.c
+index 57f71f3..817b8e6 100644
+--- a/src/linux.c
++++ b/src/linux.c
+@@ -847,12 +847,13 @@ ssize_t
+ __attribute__((__visibility__ ("hidden")))
+ make_mac_path(uint8_t *buf, ssize_t size, const char * const ifname)
+ {
+-	struct ifreq ifr = { 0, };
++	struct ifreq ifr;
+ 	struct ethtool_drvinfo drvinfo = { 0, };
+ 	int fd, rc;
+ 	ssize_t ret = -1, sz, off=0;
+ 	char busname[PATH_MAX+1] = "";
+ 
++	memset(&ifr, 0, sizeof (ifr));
+ 	strncpy(ifr.ifr_name, ifname, IF_NAMESIZE);
+ 	drvinfo.cmd = ETHTOOL_GDRVINFO;
+ 	ifr.ifr_data = (caddr_t)&drvinfo;
+-- 
+2.4.6
+