[gentoo-commits] repo/gentoo:master commit in: sys-libs/efivar/files/

[gentoo-commits] repo/gentoo:master commit in: sys-libs/efivar/files/

[David Seifert]

commit:     43fcb0b5540fcd7818b0f8410fb658ac8ce0da45
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Feb 11 16:31:24 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Feb 11 20:15:12 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43fcb0b5

sys-libs/efivar: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/3914

 sys-libs/efivar/files/0.22-flags.patch | 41 ----------------------------------
 1 file changed, 41 deletions(-)

diff --git a/sys-libs/efivar/files/0.22-flags.patch b/sys-libs/efivar/files/0.22-flags.patch
deleted file mode 100644
index df49f43af7..0000000000
--- a/sys-libs/efivar/files/0.22-flags.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 5bc17590cb096340fc695da3020883130437d745 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Fri, 12 Feb 2016 13:22:13 -0500
-Subject: [PATCH] Make.defaults: Improve gcc/clang detection
-
-The old filter only matched "gcc" or "clang".
-
-The new findstring call matches any occurance of gcc or clang. This is
-useful when CC includes the full host tuple, like x86_64-pc-linux-gnu-gcc.
-
-Signed-off-by: Mike Gilbert <floppym@gentoo.org>
----
- Make.defaults | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/Make.defaults b/Make.defaults
-index bf814b8..5aed21e 100644
---- a/Make.defaults
-+++ b/Make.defaults
-@@ -25,14 +25,14 @@ PKGS	=
- clang_cflags =
- gcc_cflags = -specs=$(TOPDIR)/gcc.specs
- cflags	= $(CFLAGS) -I${TOPDIR}/src/include/efivar/ \
--	$(if $(filter $(CC),clang),$(clang_cflags),) \
--	$(if $(filter $(CC),gcc),$(gcc_cflags),) \
-+	$(if $(findstring clang,$(CC)),$(clang_cflags),) \
-+	$(if $(findstring gcc,$(CC)),$(gcc_cflags),) \
- 	$(call pkg-config-cflags)
- clang_ccldflags =
- gcc_ccldflags =
- ccldflags = $(cflags) $(CCLDFLAGS) $(LDFLAGS) \
--	$(if $(filter $(CCLD),clang),$(clang_ccldflags),) \
--	$(if $(filter $(CCLD),gcc),$(gcc_ccldflags),) \
-+	$(if $(findstring clang,$(CCLD)),$(clang_ccldflags),) \
-+	$(if $(findstring gcc,$(CCLD)),$(gcc_ccldflags),) \
- 	$(call pkg-config-ccldflags)
- SOFLAGS=-shared
- LDLIBS=$(foreach lib,$(LIBS),-l$(lib)) $(call pkg-config-ldlibs)
--- 
-2.7.1
-

[gentoo-commits] repo/gentoo:master commit in: sys-libs/efivar/files/

[David Seifert]

commit:     74633a6d0730cba43f297781969c38aef3b29369
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Aug 11 14:48:56 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Aug 13 11:28:35 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74633a6d

sys-libs/efivar: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/5390

 sys-libs/efivar/files/0.21-initializer.patch  | 42 ---------------------------
 sys-libs/efivar/files/0.21-nvme_ioctl.h.patch | 30 -------------------
 sys-libs/efivar/files/0.23-sysmacros.patch    | 29 ------------------
 3 files changed, 101 deletions(-)

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 25d06596831..00000000000
--- 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@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
-

diff --git a/sys-libs/efivar/files/0.21-nvme_ioctl.h.patch b/sys-libs/efivar/files/0.21-nvme_ioctl.h.patch
deleted file mode 100644
index 221ec5a7314..00000000000
--- a/sys-libs/efivar/files/0.21-nvme_ioctl.h.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From ae0869b71a90bc14e67f3c917bd9c96db25c99a6 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Thu, 14 Jan 2016 17:02:31 -0500
-Subject: [PATCH] Workaround rename of linux/nvme.h
-
-Bug: https://bugs.gentoo.org/571548
----
- src/linux.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/linux.c b/src/linux.c
-index 5ebc151..e551377 100644
---- a/src/linux.c
-+++ b/src/linux.c
-@@ -22,7 +22,12 @@
- #include <inttypes.h>
- #include <limits.h>
- #include <linux/ethtool.h>
-+#include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0)
-+#include <linux/nvme_ioctl.h>
-+#else
- #include <linux/nvme.h>
-+#endif
- #include <linux/sockios.h>
- #include <net/if.h>
- #include <scsi/scsi.h>
--- 
-2.7.0
-

diff --git a/sys-libs/efivar/files/0.23-sysmacros.patch b/sys-libs/efivar/files/0.23-sysmacros.patch
deleted file mode 100644
index 526b8436c2d..00000000000
--- a/sys-libs/efivar/files/0.23-sysmacros.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 554b0255f9ee265f7d093ac875215207fac8fb1e Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Fri, 15 Apr 2016 17:58:15 -0400
-Subject: [PATCH] Include sys/sysmacros.h when sys/types.h does not define
- major
-
-glibc is planning to drop this from sys/types.h.
----
- src/linux.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/linux.c b/src/linux.c
-index 866455d..fde6947 100644
---- a/src/linux.c
-+++ b/src/linux.c
-@@ -36,6 +36,10 @@
- #include <sys/stat.h>
- #include <unistd.h>
- 
-+#ifndef major
-+#include <sys/sysmacros.h>
-+#endif
-+
- #include <efivar.h>
- #include <efiboot.h>
- 
--- 
-2.8.1
-

[gentoo-commits] repo/gentoo:master commit in: sys-libs/efivar/files/

[Aaron Bauman]

commit:     5fc7cefa25cf656f5a30b5ecba4368c8de78d9fe
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Dec 27 16:00:06 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Fri Dec 27 17:09:18 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fc7cefa

sys-libs/efivar: remove unused patch(es)

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/14140
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 .../files/efivar-32-efi_guid_ux_capsule.patch      | 59 ----------------------
 1 file changed, 59 deletions(-)

diff --git a/sys-libs/efivar/files/efivar-32-efi_guid_ux_capsule.patch b/sys-libs/efivar/files/efivar-32-efi_guid_ux_capsule.patch
deleted file mode 100644
index 8a5a72f66fb..00000000000
--- a/sys-libs/efivar/files/efivar-32-efi_guid_ux_capsule.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From cd732494ba7685feaf71b9ee58619ca6aef39fc9 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Tue, 12 Sep 2017 10:45:31 -0400
-Subject: [PATCH] Make efi_guid_ux_capsule actually work.
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
----
- src/abignore         | 11 ++++++++++-
- src/guids.txt        |  2 +-
- src/libefivar.map.in |  4 ++++
- 3 files changed, 15 insertions(+), 2 deletions(-)
-
-diff --git a/src/abignore b/src/abignore
-index 74b5160..479b5c3 100644
---- a/src/abignore
-+++ b/src/abignore
-@@ -14,7 +14,16 @@
- #               'efidp_wifi __anonymous_union__::wifi' at efivar-dp.h:868:1
- #
- [suppress_type]
--  soname_regexp = libefi(var|boot)\\.so
-+  soname_regexp = libefi(var|boot)\\.so\\..*
-   name = efidp_data
-   type_kind = typedef
-   has_data_member_inserted_at = end
-+
-+# 1 Added variable:
-+#
-+#  'const __anonymous_struct__ efi_guid_ux_capsule'    {efi_guid_ux_capsule@@LIBEFIVAR_1.32}
-+#
-+[suppress_variable]
-+  soname_regexp = ^libefivar\\.so\\.[[:digit:]]+
-+  symbol_name_regexp = ^efi_guid_[[:alnum:]_]+$
-+  change_kind = add-variable
-diff --git a/src/guids.txt b/src/guids.txt
-index 87e2f61..06081ed 100644
---- a/src/guids.txt
-+++ b/src/guids.txt
-@@ -3,7 +3,7 @@
- 0abba7dc-e516-4167-bbf5-4d9d1c739416	redhat	Red Hat
- 0b6e5233-a65c-44c9-9407-d9ab83bfc8bd	sha224	SHA-224
- 126a762d-5758-4fca-8531-201a7f57f850	lenovo_boot_menu	Lenovo Boot Menu
--3b8c8162-188c-46a4-aec9-be43f1d65697	ux_capsule_guid	Firmware update localized text image
-+3b8c8162-188c-46a4-aec9-be43f1d65697	ux_capsule	Firmware update localized text image
- 3bd2a492-96c0-4079-b420-fcf98ef103ed	x509_sha256	SHA256 hash of X.509 Certificate
- 3c5766e8-269c-4e34-aa14-ed776e85b3b6	rsa2048	RSA 2048
- 3CC24E96-22C7-41D8-8863-8E39DCDCC2CF	lenovo	Lenovo
-diff --git a/src/libefivar.map.in b/src/libefivar.map.in
-index ba51d55..a95a505 100644
---- a/src/libefivar.map.in
-+++ b/src/libefivar.map.in
-@@ -110,3 +110,7 @@ LIBEFIVAR_1.30 {
- 		efi_error_get;
- 		efi_error_clear;
- } LIBEFIVAR_1.29;
-+
-+LIBEFIVAR_1.32 {
-+	global: efi_guid_ux_capsule;
-+} LIBEFIVAR_1.30;

[gentoo-commits] repo/gentoo:master commit in: sys-libs/efivar/files/

[Sam James]

commit:     e54d1e325411a252c0c267c63cb51c7ead227631
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 22 04:06:14 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 22 04:06:42 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e54d1e32

sys-libs/efivar: adjust ia64-relro patch

Some extra fatal warning bits snuck in upstream, it looks like.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-libs/efivar/files/efivar-38-ia64-relro.patch | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/sys-libs/efivar/files/efivar-38-ia64-relro.patch b/sys-libs/efivar/files/efivar-38-ia64-relro.patch
index 2f3686cac444..e90736a0394b 100644
--- a/sys-libs/efivar/files/efivar-38-ia64-relro.patch
+++ b/sys-libs/efivar/files/efivar-38-ia64-relro.patch
@@ -23,6 +23,8 @@ The change drops `--fatal-warnings` option from gcc.spec entirely.
 
 Rejected upstream in https://github.com/rhboot/efivar/pull/164.
 
+[sam: add extra hunk to fix 38 build.]
+
 Reported-by: Émeric Maschino
 Bug: https://bugs.gentoo.org/749963
 Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
@@ -43,3 +45,16 @@ index ef28e2b..4deead5 100644
 -- 
 2.34.1
 
+diff --git a/src/include/defaults.mk b/src/include/defaults.mk
+index 9024a3a..f5515fa 100644
+--- a/src/include/defaults.mk
++++ b/src/include/defaults.mk
+@@ -58,7 +58,7 @@ override LDFLAGS = $(CFLAGS) -L. $(_LDFLAGS) $(_CCLDFLAGS) \
+ 		   -Wl,-z,now \
+ 		   -Wl,-z,muldefs \
+ 		   -Wl,-z,relro \
+-		   -Wl,--fatal-warnings \
++		   -Wl,--no-fatal-warnings \
+ 		   $(call family,LDFLAGS) $(call family,CCLDFLAGS) \
+ 		   $(call pkg-config-ccldflags)
+ override CCLDFLAGS = $(LDFLAGS)