[gentoo-commits] proj/musl:master commit in: sys-libs/efivar/, sys-libs/efivar/files/

[Anthony G. Basile]

commit:     98160f796934bd15df4ae2bbb9f7dd56cc2d0cbc
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 29 16:42:45 2017 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Jan 29 16:42:45 2017 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=98160f79

sys-libs/efivar: remove 0.21, bug #607618

Package-Manager: portage-2.3.3

 sys-libs/efivar/Manifest                     |  4 --
 sys-libs/efivar/efivar-0.21.ebuild           | 32 --------------
 sys-libs/efivar/files/0.21-initializer.patch | 42 -------------------
 sys-libs/efivar/files/0.21-musl.patch        | 62 ----------------------------
 4 files changed, 140 deletions(-)

diff --git a/sys-libs/efivar/Manifest b/sys-libs/efivar/Manifest
index edccd9f..e182e4a 100644
--- a/sys-libs/efivar/Manifest
+++ b/sys-libs/efivar/Manifest
@@ -1,9 +1,5 @@
-AUX 0.21-initializer.patch 1261 SHA256 ce6792192c9014bd0db4acbf0866f3d6eb1e608225177cbfaf6dd54b7d447bf5 SHA512 e7593fcefead06007a2314217b4be61161261b2be06c631065ede00f48098b924395605faba2ef859be9b6a242d531942460f2b51ea346d1cb93af94ecb23b3c WHIRLPOOL efcec5c85046ba5acff2b8559fad7c05175ed791ea84f47587013e90a3e2c301df507a776097795f0003625fbc40b95d79ecb1a349ee5ee08d5b4a7ad841b452
-AUX 0.21-musl.patch 2108 SHA256 319478e8626271f4fa17fdfeabeca84a08027d1228ac02b60169dd1a3d676deb SHA512 fb0df957015f4b34fa89786780b070df2fe9d7511882cc836d643997d83e303863d2016fb780c3a0f047b84e67093584690ab42fb1772165b2742206402e0f3d WHIRLPOOL fea636b8b89770d7d43267d5e0bb7c46ef1d76a87120a5facb6e2db20c03c9b3f784317f2c6b6d31bb800e40d33c069056c1e895e154faa67cce87b0ff7ff127
 AUX 0.23-musl.patch 934 SHA256 8979af4cdc8eefd54209e0ae2c8b3e1bb820bba35de2a788d177998a077200e7 SHA512 f5736bff08e86fb388695ef44303da5c322275871028e726d38bfc3822de6c89fa498555a10ae51c55d79c9f55a8595ce6d84d3bff5350207b212ca08cbf1abb WHIRLPOOL 883b73f26b78b95ee69672d165c1c54beb4e46e1c27b900fcfafebdf39ca134a116ed7f72ad279c99e70b420adae7c2df4f8fc6c94254416c9f73c4b07f77459
 AUX 27-strndupa.patch 702 SHA256 b53715e85e65794967434d6751f19cf9d2139cbdbd02d1dd870873957deb596b SHA512 746083032316440b83de82680ec51fd5ca195a48977f4a4e3384114104620fdfd115cf408f1baa7e3ca5f7d038a968131a078349d5404b55277b3b8ba0a15607 WHIRLPOOL 02ce9d9e266fb5112a2bde917e835c51fd2094a6ad3222e7df83511dd5d350104ecbe755b2eac5e9cbf07961734799a334356da6a4d359ab8bb251b884914d81
-DIST efivar-0.21.tar.bz2 66677 SHA256 04b9b9de9d9a1a013395400438a033daf4a4290f497ec5be04a120e2ac535094 SHA512 851b5e29c2dab213bb81c6ea5c5c211d36fb6846de8aa1086b0657f06917c2f93bf154aa3a4c2dda22103bdf1d67ca877f9771dc3f979c9311ca24e0bc09492a WHIRLPOOL d6cdb2e2f047a22677d046581490ee4e64a2ac0631be8e41bf6250241b2554f62ddf81226fa3970ee80ebb9ec62665ca21f4fec94cc5ebe05414b0c674ad38dd
 DIST efivar-30.tar.gz 86395 SHA256 20709c76311f8eb8be92977b7ac008ce62501fa9f7fe885a784321540fc352f9 SHA512 ab73c2a49175e01cb4872bfb47708a71399c6f8237a02fbbbf4755fcd10efb82984baf76a83c3b3e7f5cf4183050e535cf18dff2bbfed10d9a0f5d4cf2021b32 WHIRLPOOL d0a7fe13e4359ddafb717b666b81fdecf786f8cc3a794e47a46d80064cd402780feeab5f501f9b0796d3a847b58611b7581341e0e9cb4449d86e75e6903591eb
-EBUILD efivar-0.21.ebuild 744 SHA256 419fb5abcd14e1eb3604156c6e678b0bdf251311456931ffd5fd38972f1f108f SHA512 a69ef35673943e7761e57f17206e3ab1b089ea5bdcad16e081c61291da6c56e31aee4720b7ce193e5e0b58c44f76c722e281965ec1009330ab164f9b6bd6f738 WHIRLPOOL a36f7122218e0244212f50382271884de1017b147d141e56830a8829d070916b36e304497feba8ec098d12336b376d2046f14f5aaed240b7987df1431e5a4f6c
 EBUILD efivar-30.ebuild 1014 SHA256 386d8218cd312d6f88d32bfa2aa949f4c8c54e3e14ac1f71ed4e9a61f221b0a6 SHA512 18d4ea42b4d0bd48c138cedd09101efc597213f044f01c7dd5b65a4c56f10fe86682af9bd5aa1619e91c30deb8254f15087b2e13ca18b9f6215cd1d1ed10c9c0 WHIRLPOOL 7846501dc60e1b6cd1bf38ca14b6eddc9d417fa54cf83f6016fa188f68a64ab390e359ff79f9cc7cd36624bdd2e96e200729fc115a029ba8b237d47b2e4f38b2
 MISC metadata.xml 329 SHA256 562af8ae9d4eac40cd37ccea2827ecb766176649c836296a10a75dddc4446181 SHA512 a349c5ce7e3ad96d816b52ee35e6547bfb1f4cf9ebd60426ac90b84d67adb0728ab9dcccf93754ad7c71614b0fbd82a1a02fc3fde07e15d12d960d1a7fc088df WHIRLPOOL b6c568a210bf85aea3dffae55d3f861fae101047b431b9ed64f60a61ac5b76d4866d63298a8a11e42f78c013388bc932b1fdd73d44a82fa2476138f2521f3444

diff --git a/sys-libs/efivar/efivar-0.21.ebuild b/sys-libs/efivar/efivar-0.21.ebuild
deleted file mode 100644
index b5d64c3..0000000
--- a/sys-libs/efivar/efivar-0.21.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Tools and library to manipulate EFI variables"
-HOMEPAGE="https://github.com/rhinstaller/efivar"
-SRC_URI="https://github.com/rhinstaller/${PN}/releases/download/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ia64 x86"
-
-RDEPEND="dev-libs/popt"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-3.18"
-
-src_prepare() {
-	epatch "${FILESDIR}/0.21-initializer.patch"
-	epatch "${FILESDIR}/0.21-musl.patch"
-	epatch "${FILESDIR}/0.21-nvme_ioctl.h.patch"
-	epatch_user
-}
-
-src_configure() {
-	tc-export CC
-	export libdir="/usr/$(get_libdir)"
-	unset LIBS # Bug 562004
-}

diff --git a/sys-libs/efivar/files/0.21-initializer.patch b/sys-libs/efivar/files/0.21-initializer.patch
deleted file mode 100644
index 25d0659..0000000
--- a/sys-libs/efivar/files/0.21-initializer.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From a3606c02fd271d32e364fcc540e34ba1899309f6 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@××××××.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@××××××.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
-

diff --git a/sys-libs/efivar/files/0.21-musl.patch b/sys-libs/efivar/files/0.21-musl.patch
deleted file mode 100644
index 2c5d7eb..0000000
--- a/sys-libs/efivar/files/0.21-musl.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 262acfc7c4fbb4bbc76f4235220336fd41993ca8 Mon Sep 17 00:00:00 2001
-From: Felix Janda <felix.janda@××××××.de>
-Date: Tue, 14 Jul 2015 05:53:04 -0600
-Subject: [PATCH 1/2] Remove -fshort-wchar from CFLAGS
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
--fshort-wchar makes wchar_t 16bit. We are not using wchar_t anywhere,
-so we don't need it. Removing it fixes an compilation error with musl
-libc:
-
-In file included from dp-acpi.c:21:0:
-/usr/lib/gcc/armv7a-hardfloat-linux-musleabi/4.7.4/include/stddef.h:325:24: error: conflicting types for ‘wchar_t’
-In file included from /usr/include/inttypes.h:12:0,
-                 from dp-acpi.c:20:
-/usr/include/bits/alltypes.h:18:18: note: previous declaration of ‘wchar_t’ was here
-make[1]: *** [dp-acpi.o] Error 1
-make: *** [src] Error 2
----
- Make.defaults | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Make.defaults b/Make.defaults
-index cc2baa9..7f5ae5e 100644
---- a/Make.defaults
-+++ b/Make.defaults
-@@ -13,7 +13,7 @@ clang_cflags =
- gcc_cflags = -Wmaybe-uninitialized
- cflags	:= $(CFLAGS) \
- 	-Werror -Wall -Wsign-compare -Wstrict-aliasing \
--	-std=gnu11 -fshort-wchar -fPIC \
-+	-std=gnu11 -fPIC \
- 	-fvisibility=hidden \
- 	-D_GNU_SOURCE -I${TOPDIR}/src/include/efivar/ \
- 	$(if $(filter $(CC),clang),$(clang_cflags),) \
-
-From 841ae2fc8c911dbac595cbd228be6bfed7881cad Mon Sep 17 00:00:00 2001
-From: Felix Janda <felix.janda@××××××.de>
-Date: Tue, 14 Jul 2015 05:56:05 -0600
-Subject: [PATCH 2/2] Use the more portable major() instead of gnu_dev_major()
-
-Do the same for minor() and gnu_dev_minor()
----
- src/linux.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/linux.c b/src/linux.c
-index c4d099e..0cbd94a 100644
---- a/src/linux.c
-+++ b/src/linux.c
-@@ -129,8 +129,8 @@ get_partition_number(const char *devpath)
- 		return -1;
- 	}
- 
--	maj = gnu_dev_major(statbuf.st_rdev);
--	min = gnu_dev_minor(statbuf.st_rdev);
-+	maj = major(statbuf.st_rdev);
-+	min = minor(statbuf.st_rdev);
- 
- 	rc = sysfs_readlink(&linkbuf, "/sys/dev/block/%u:%u", maj, min);
- 	if (rc < 0)