* Re: [PR PATCH] [Updated] efivar: update to 38
2022-10-17 5:48 [PR PATCH] efivar: update to 38 RunningDroid
@ 2022-10-17 5:50 ` RunningDroid
2022-10-17 6:21 ` RunningDroid
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: RunningDroid @ 2022-10-17 5:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1257 bytes --]
There is an updated pull request by RunningDroid against master on the void-packages repository
https://github.com/RunningDroid/void-packages update_efivar
https://github.com/void-linux/void-packages/pull/40004
efivar: update to 38
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/40004.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update_efivar-40004.patch --]
[-- Type: text/x-diff, Size: 8881 bytes --]
From c7aa00c010555c68234d44f5eb4894ed4661b475 Mon Sep 17 00:00:00 2001
From: RunningDroid <runningdroid@zoho.com>
Date: Mon, 17 Oct 2022 00:54:13 -0400
Subject: [PATCH] efivar: update to 38.
---
common/shlibs | 1 +
...flags-for-CC_FOR_BUILD-and-CCLD_FOR_.patch | 54 ---------
...strncpy-by-memcpy-to-fix-some-GCC8-w.patch | 111 ------------------
srcpkgs/efivar/template | 21 ++--
4 files changed, 9 insertions(+), 178 deletions(-)
delete mode 100644 srcpkgs/efivar/patches/0001-Support-custom-cflags-for-CC_FOR_BUILD-and-CCLD_FOR_.patch
delete mode 100644 srcpkgs/efivar/patches/0002-Replace-call-to-strncpy-by-memcpy-to-fix-some-GCC8-w.patch
diff --git a/common/shlibs b/common/shlibs
index 02780902e137..dfef074e133b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1730,6 +1730,7 @@ libxmlsec1-gcrypt.so.1 xmlsec1-1.2.31_2
libxmlsec1-gnutls.so.1 xmlsec1-1.2.31_2
libefivar.so.1 libefivar-31_1
libefiboot.so.1 libefivar-31_1
+libefisec.so.1 libefivar-38_1
libportaudio.so.2 portaudio-19.20140130_1
libportaudiocpp.so.0 portaudio-cpp-19.20140130_1
libdar.so.6000 libdar-2.6.6_1
diff --git a/srcpkgs/efivar/patches/0001-Support-custom-cflags-for-CC_FOR_BUILD-and-CCLD_FOR_.patch b/srcpkgs/efivar/patches/0001-Support-custom-cflags-for-CC_FOR_BUILD-and-CCLD_FOR_.patch
deleted file mode 100644
index 64aa449c9a45..000000000000
--- a/srcpkgs/efivar/patches/0001-Support-custom-cflags-for-CC_FOR_BUILD-and-CCLD_FOR_.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 41d039a327a6a9254a1580699188413a7e7363af Mon Sep 17 00:00:00 2001
-From: Elie ROUDNINSKI <xademax@gmail.com>
-Date: Sun, 7 Oct 2018 18:02:24 +0100
-Subject: [PATCH] Support custom c(cld)flags for CC(LD)_FOR_BUILD
-
----
- Make.defaults | 11 +++++++++++
- src/Makefile | 1 +
- 2 files changed, 12 insertions(+)
-
-diff --git a/Make.defaults b/Make.defaults
-index 57cee6e..814b0ef 100644
---- a/Make.defaults
-+++ b/Make.defaults
-@@ -36,6 +36,11 @@ cflags = $(CFLAGS) -I${TOPDIR}/src/include/ \
- $(if $(findstring ccc-analyzer,$(CC)),$(clang_cflags),) \
- $(if $(findstring gcc,$(CC)),$(gcc_cflags),) \
- $(call pkg-config-cflags)
-+cflags_for_build = $(CFLAGS_FOR_BUILD) -I${TOPDIR}/src/include/ \
-+ $(if $(findstring clang,$(CC_FOR_BUILD)),$(clang_cflags),) \
-+ $(if $(findstring ccc-analyzer,$(CC_FOR_BUILD)),$(clang_cflags),) \
-+ $(if $(findstring gcc,$(CC_FOR_BUILD)),$(gcc_cflags),) \
-+ $(call pkg-config-cflags)
- clang_ccldflags =
- gcc_ccldflags =
- ccldflags = $(cflags) -L. $(CCLDFLAGS) $(LDFLAGS) \
-@@ -44,6 +49,12 @@ ccldflags = $(cflags) -L. $(CCLDFLAGS) $(LDFLAGS) \
- $(if $(findstring ccc-analyzer,$(CCLD)),$(clang_ccldflags),) \
- $(if $(findstring gcc,$(CCLD)),$(gcc_ccldflags),) \
- $(call pkg-config-ldflags)
-+ccldflags_for_build = $(cflags_for_build) -L. $(CCLDFLAGS) $(LDFLAGS) \
-+ -Wl,-z,muldefs \
-+ $(if $(findstring clang,$(CCLD_FOR_BUILD)),$(clang_ccldflags),) \
-+ $(if $(findstring ccc-analyzer,$(CCLD_FOR_BUILD)),$(clang_ccldflags),) \
-+ $(if $(findstring gcc,$(CCLD_FOR_BUILD)),$(gcc_ccldflags),) \
-+ $(call pkg-config-ldflags)
- SOFLAGS=-shared
- LDLIBS=$(foreach lib,$(LIBS),-l$(lib)) $(call pkg-config-ldlibs)
-
-diff --git a/src/Makefile b/src/Makefile
-index 76bc474..287bb1d 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -56,6 +56,7 @@ makeguids : CPPFLAGS+=-DEFIVAR_BUILD_ENVIRONMENT
- makeguids : LIBS=dl
- makeguids : $(MAKEGUIDS_SOURCES)
- makeguids : CCLD=$(CCLD_FOR_BUILD)
-+makeguids : ccldflags=$(ccldflags_for_build)
-
- guids.o : guids.S | guids.bin names.bin
-
---
-2.19.0
-
diff --git a/srcpkgs/efivar/patches/0002-Replace-call-to-strncpy-by-memcpy-to-fix-some-GCC8-w.patch b/srcpkgs/efivar/patches/0002-Replace-call-to-strncpy-by-memcpy-to-fix-some-GCC8-w.patch
deleted file mode 100644
index 649a57d7bac8..000000000000
--- a/srcpkgs/efivar/patches/0002-Replace-call-to-strncpy-by-memcpy-to-fix-some-GCC8-w.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From 9fc8c48fa59a6d7aaa4c7df7642bfd316086d3b7 Mon Sep 17 00:00:00 2001
-From: Elie ROUDNINSKI <xademax@gmail.com>
-Date: Sun, 7 Oct 2018 18:38:47 +0100
-Subject: [PATCH] Replace call to strncpy by memcpy to fix some GCC8 warnings
-
----
- src/guid.h | 30 ++++++++++++++++++++----------
- 1 file changed, 20 insertions(+), 10 deletions(-)
-
-diff --git a/src/guid.h b/src/guid.h
-index d4a06f9..c03a362 100644
---- a/src/guid.h
-+++ b/src/guid.h
-@@ -103,7 +103,8 @@ text_to_guid(const char *text, efi_guid_t *guid)
-
- /* 84be9c3e-8a32-42c0-891c-4cd3b072becc
- * ^ */
-- strncpy(eightbytes, text, 8);
-+ memcpy(eightbytes, text, 8);
-+ eightbytes[8] = 0;
- if (check_segment_sanity(eightbytes, 8) < 0)
- return -1;
- guid->a = (uint32_t)strtoul(eightbytes, NULL, 16);
-@@ -111,7 +112,8 @@ text_to_guid(const char *text, efi_guid_t *guid)
-
- /* 84be9c3e-8a32-42c0-891c-4cd3b072becc
- * ^ */
-- strncpy(fourbytes, text+9, 4);
-+ memcpy(fourbytes, text+9, 4);
-+ fourbytes[4] = 0;
- if (check_segment_sanity(fourbytes, 4) < 0)
- return -1;
- guid->b = (uint16_t)strtoul(fourbytes, NULL, 16);
-@@ -119,7 +121,8 @@ text_to_guid(const char *text, efi_guid_t *guid)
-
- /* 84be9c3e-8a32-42c0-891c-4cd3b072becc
- * ^ */
-- strncpy(fourbytes, text+14, 4);
-+ memcpy(fourbytes, text+14, 4);
-+ fourbytes[4] = 0;
- if (check_segment_sanity(fourbytes, 4) < 0)
- return -1;
- guid->c = (uint16_t)strtoul(fourbytes, NULL, 16);
-@@ -127,7 +130,8 @@ text_to_guid(const char *text, efi_guid_t *guid)
-
- /* 84be9c3e-8a32-42c0-891c-4cd3b072becc
- * ^ */
-- strncpy(fourbytes, text+19, 4);
-+ memcpy(fourbytes, text+19, 4);
-+ fourbytes[4] = 0;
- if (check_segment_sanity(fourbytes, 4) < 0)
- return -1;
- guid->d = (uint16_t)strtoul(fourbytes, NULL, 16);
-@@ -135,42 +139,48 @@ text_to_guid(const char *text, efi_guid_t *guid)
-
- /* 84be9c3e-8a32-42c0-891c-4cd3b072becc
- * ^ */
-- strncpy(twobytes, text+24, 2);
-+ memcpy(twobytes, text+24, 2);
-+ twobytes[2] = 0;
- if (check_segment_sanity(twobytes, 2) < 0)
- return -1;
- guid->e[0] = (uint8_t)strtoul(twobytes, NULL, 16);
-
- /* 84be9c3e-8a32-42c0-891c-4cd3b072becc
- * ^ */
-- strncpy(twobytes, text+26, 2);
-+ memcpy(twobytes, text+26, 2);
-+ twobytes[2] = 0;
- if (check_segment_sanity(twobytes, 2) < 0)
- return -1;
- guid->e[1] = (uint8_t)strtoul(twobytes, NULL, 16);
-
- /* 84be9c3e-8a32-42c0-891c-4cd3b072becc
- * ^ */
-- strncpy(twobytes, text+28, 2);
-+ memcpy(twobytes, text+28, 2);
-+ twobytes[2] = 0;
- if (check_segment_sanity(twobytes, 2) < 0)
- return -1;
- guid->e[2] = (uint8_t)strtoul(twobytes, NULL, 16);
-
- /* 84be9c3e-8a32-42c0-891c-4cd3b072becc
- * ^ */
-- strncpy(twobytes, text+30, 2);
-+ memcpy(twobytes, text+30, 2);
-+ twobytes[2] = 0;
- if (check_segment_sanity(twobytes, 2) < 0)
- return -1;
- guid->e[3] = (uint8_t)strtoul(twobytes, NULL, 16);
-
- /* 84be9c3e-8a32-42c0-891c-4cd3b072becc
- * ^ */
-- strncpy(twobytes, text+32, 2);
-+ memcpy(twobytes, text+32, 2);
-+ twobytes[2] = 0;
- if (check_segment_sanity(twobytes, 2) < 0)
- return -1;
- guid->e[4] = (uint8_t)strtoul(twobytes, NULL, 16);
-
- /* 84be9c3e-8a32-42c0-891c-4cd3b072becc
- * ^ */
-- strncpy(twobytes, text+34, 2);
-+ memcpy(twobytes, text+34, 2);
-+ twobytes[2] = 0;
- if (check_segment_sanity(twobytes, 2) < 0)
- return -1;
- guid->e[5] = (uint8_t)strtoul(twobytes, NULL, 16);
---
-2.19.0
-
diff --git a/srcpkgs/efivar/template b/srcpkgs/efivar/template
index 9a21d44175b9..2536d9518da4 100644
--- a/srcpkgs/efivar/template
+++ b/srcpkgs/efivar/template
@@ -1,29 +1,24 @@
# Template file for 'efivar'
pkgname=efivar
-version=37
-revision=2
+version=38
+revision=1
build_style=gnu-makefile
make_build_args="libdir=/usr/lib"
-make_build_target="all test"
+make_build_target="all"
+make_check_args="GRUB_PREFIX=grub -j1" # Tests broken when ran in parallel
+make_check_target="test"
make_install_args="libdir=/usr/lib"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config mdocml"
+checkdepends="grub"
short_desc="Tools to manipulate EFI variables"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://github.com/rhinstaller/efivar"
distfiles="https://github.com/rhboot/efivar/releases/download/${version}/efivar-${version}.tar.bz2"
-checksum=3c67feb93f901b98fbb897d5ca82931a6698b5bcd6ac34f0815f670d77747b9f
+checksum=f018ed6e49c5f1c16d336d9fd7687ce87023276591921db1e49a314ad6515349
CFLAGS="-D_GNU_SOURCE -Wno-error=address-of-packed-member"
-post_build() {
- make -C src/test
-}
-
-post_install() {
- vbin src/test/tester efivar-tester
-}
-
libefivar_package() {
short_desc="Library to manipulate EFI variables"
pkg_install() {
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PR PATCH] [Updated] efivar: update to 38
2022-10-17 5:48 [PR PATCH] efivar: update to 38 RunningDroid
2022-10-17 5:50 ` [PR PATCH] [Updated] " RunningDroid
@ 2022-10-17 6:21 ` RunningDroid
2022-10-17 6:31 ` RunningDroid
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: RunningDroid @ 2022-10-17 6:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1257 bytes --]
There is an updated pull request by RunningDroid against master on the void-packages repository
https://github.com/RunningDroid/void-packages update_efivar
https://github.com/void-linux/void-packages/pull/40004
efivar: update to 38
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/40004.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update_efivar-40004.patch --]
[-- Type: text/x-diff, Size: 15576 bytes --]
From 782a032862bb32ed8970fa124d2d6193ec1fb5d0 Mon Sep 17 00:00:00 2001
From: RunningDroid <runningdroid@zoho.com>
Date: Mon, 17 Oct 2022 00:54:13 -0400
Subject: [PATCH] efivar: update to 38.
---
common/shlibs | 1 +
...flags-for-CC_FOR_BUILD-and-CCLD_FOR_.patch | 54 ----
...strncpy-by-memcpy-to-fix-some-GCC8-w.patch | 111 ---------
.../efisecdb:-fix-build-with-musl-libc.patch | 231 ++++++++++++++++++
srcpkgs/efivar/template | 21 +-
5 files changed, 242 insertions(+), 176 deletions(-)
delete mode 100644 srcpkgs/efivar/patches/0001-Support-custom-cflags-for-CC_FOR_BUILD-and-CCLD_FOR_.patch
delete mode 100644 srcpkgs/efivar/patches/0002-Replace-call-to-strncpy-by-memcpy-to-fix-some-GCC8-w.patch
create mode 100644 srcpkgs/efivar/patches/efisecdb:-fix-build-with-musl-libc.patch
diff --git a/common/shlibs b/common/shlibs
index 02780902e137..dfef074e133b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1730,6 +1730,7 @@ libxmlsec1-gcrypt.so.1 xmlsec1-1.2.31_2
libxmlsec1-gnutls.so.1 xmlsec1-1.2.31_2
libefivar.so.1 libefivar-31_1
libefiboot.so.1 libefivar-31_1
+libefisec.so.1 libefivar-38_1
libportaudio.so.2 portaudio-19.20140130_1
libportaudiocpp.so.0 portaudio-cpp-19.20140130_1
libdar.so.6000 libdar-2.6.6_1
diff --git a/srcpkgs/efivar/patches/0001-Support-custom-cflags-for-CC_FOR_BUILD-and-CCLD_FOR_.patch b/srcpkgs/efivar/patches/0001-Support-custom-cflags-for-CC_FOR_BUILD-and-CCLD_FOR_.patch
deleted file mode 100644
index 64aa449c9a45..000000000000
--- a/srcpkgs/efivar/patches/0001-Support-custom-cflags-for-CC_FOR_BUILD-and-CCLD_FOR_.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 41d039a327a6a9254a1580699188413a7e7363af Mon Sep 17 00:00:00 2001
-From: Elie ROUDNINSKI <xademax@gmail.com>
-Date: Sun, 7 Oct 2018 18:02:24 +0100
-Subject: [PATCH] Support custom c(cld)flags for CC(LD)_FOR_BUILD
-
----
- Make.defaults | 11 +++++++++++
- src/Makefile | 1 +
- 2 files changed, 12 insertions(+)
-
-diff --git a/Make.defaults b/Make.defaults
-index 57cee6e..814b0ef 100644
---- a/Make.defaults
-+++ b/Make.defaults
-@@ -36,6 +36,11 @@ cflags = $(CFLAGS) -I${TOPDIR}/src/include/ \
- $(if $(findstring ccc-analyzer,$(CC)),$(clang_cflags),) \
- $(if $(findstring gcc,$(CC)),$(gcc_cflags),) \
- $(call pkg-config-cflags)
-+cflags_for_build = $(CFLAGS_FOR_BUILD) -I${TOPDIR}/src/include/ \
-+ $(if $(findstring clang,$(CC_FOR_BUILD)),$(clang_cflags),) \
-+ $(if $(findstring ccc-analyzer,$(CC_FOR_BUILD)),$(clang_cflags),) \
-+ $(if $(findstring gcc,$(CC_FOR_BUILD)),$(gcc_cflags),) \
-+ $(call pkg-config-cflags)
- clang_ccldflags =
- gcc_ccldflags =
- ccldflags = $(cflags) -L. $(CCLDFLAGS) $(LDFLAGS) \
-@@ -44,6 +49,12 @@ ccldflags = $(cflags) -L. $(CCLDFLAGS) $(LDFLAGS) \
- $(if $(findstring ccc-analyzer,$(CCLD)),$(clang_ccldflags),) \
- $(if $(findstring gcc,$(CCLD)),$(gcc_ccldflags),) \
- $(call pkg-config-ldflags)
-+ccldflags_for_build = $(cflags_for_build) -L. $(CCLDFLAGS) $(LDFLAGS) \
-+ -Wl,-z,muldefs \
-+ $(if $(findstring clang,$(CCLD_FOR_BUILD)),$(clang_ccldflags),) \
-+ $(if $(findstring ccc-analyzer,$(CCLD_FOR_BUILD)),$(clang_ccldflags),) \
-+ $(if $(findstring gcc,$(CCLD_FOR_BUILD)),$(gcc_ccldflags),) \
-+ $(call pkg-config-ldflags)
- SOFLAGS=-shared
- LDLIBS=$(foreach lib,$(LIBS),-l$(lib)) $(call pkg-config-ldlibs)
-
-diff --git a/src/Makefile b/src/Makefile
-index 76bc474..287bb1d 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -56,6 +56,7 @@ makeguids : CPPFLAGS+=-DEFIVAR_BUILD_ENVIRONMENT
- makeguids : LIBS=dl
- makeguids : $(MAKEGUIDS_SOURCES)
- makeguids : CCLD=$(CCLD_FOR_BUILD)
-+makeguids : ccldflags=$(ccldflags_for_build)
-
- guids.o : guids.S | guids.bin names.bin
-
---
-2.19.0
-
diff --git a/srcpkgs/efivar/patches/0002-Replace-call-to-strncpy-by-memcpy-to-fix-some-GCC8-w.patch b/srcpkgs/efivar/patches/0002-Replace-call-to-strncpy-by-memcpy-to-fix-some-GCC8-w.patch
deleted file mode 100644
index 649a57d7bac8..000000000000
--- a/srcpkgs/efivar/patches/0002-Replace-call-to-strncpy-by-memcpy-to-fix-some-GCC8-w.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From 9fc8c48fa59a6d7aaa4c7df7642bfd316086d3b7 Mon Sep 17 00:00:00 2001
-From: Elie ROUDNINSKI <xademax@gmail.com>
-Date: Sun, 7 Oct 2018 18:38:47 +0100
-Subject: [PATCH] Replace call to strncpy by memcpy to fix some GCC8 warnings
-
----
- src/guid.h | 30 ++++++++++++++++++++----------
- 1 file changed, 20 insertions(+), 10 deletions(-)
-
-diff --git a/src/guid.h b/src/guid.h
-index d4a06f9..c03a362 100644
---- a/src/guid.h
-+++ b/src/guid.h
-@@ -103,7 +103,8 @@ text_to_guid(const char *text, efi_guid_t *guid)
-
- /* 84be9c3e-8a32-42c0-891c-4cd3b072becc
- * ^ */
-- strncpy(eightbytes, text, 8);
-+ memcpy(eightbytes, text, 8);
-+ eightbytes[8] = 0;
- if (check_segment_sanity(eightbytes, 8) < 0)
- return -1;
- guid->a = (uint32_t)strtoul(eightbytes, NULL, 16);
-@@ -111,7 +112,8 @@ text_to_guid(const char *text, efi_guid_t *guid)
-
- /* 84be9c3e-8a32-42c0-891c-4cd3b072becc
- * ^ */
-- strncpy(fourbytes, text+9, 4);
-+ memcpy(fourbytes, text+9, 4);
-+ fourbytes[4] = 0;
- if (check_segment_sanity(fourbytes, 4) < 0)
- return -1;
- guid->b = (uint16_t)strtoul(fourbytes, NULL, 16);
-@@ -119,7 +121,8 @@ text_to_guid(const char *text, efi_guid_t *guid)
-
- /* 84be9c3e-8a32-42c0-891c-4cd3b072becc
- * ^ */
-- strncpy(fourbytes, text+14, 4);
-+ memcpy(fourbytes, text+14, 4);
-+ fourbytes[4] = 0;
- if (check_segment_sanity(fourbytes, 4) < 0)
- return -1;
- guid->c = (uint16_t)strtoul(fourbytes, NULL, 16);
-@@ -127,7 +130,8 @@ text_to_guid(const char *text, efi_guid_t *guid)
-
- /* 84be9c3e-8a32-42c0-891c-4cd3b072becc
- * ^ */
-- strncpy(fourbytes, text+19, 4);
-+ memcpy(fourbytes, text+19, 4);
-+ fourbytes[4] = 0;
- if (check_segment_sanity(fourbytes, 4) < 0)
- return -1;
- guid->d = (uint16_t)strtoul(fourbytes, NULL, 16);
-@@ -135,42 +139,48 @@ text_to_guid(const char *text, efi_guid_t *guid)
-
- /* 84be9c3e-8a32-42c0-891c-4cd3b072becc
- * ^ */
-- strncpy(twobytes, text+24, 2);
-+ memcpy(twobytes, text+24, 2);
-+ twobytes[2] = 0;
- if (check_segment_sanity(twobytes, 2) < 0)
- return -1;
- guid->e[0] = (uint8_t)strtoul(twobytes, NULL, 16);
-
- /* 84be9c3e-8a32-42c0-891c-4cd3b072becc
- * ^ */
-- strncpy(twobytes, text+26, 2);
-+ memcpy(twobytes, text+26, 2);
-+ twobytes[2] = 0;
- if (check_segment_sanity(twobytes, 2) < 0)
- return -1;
- guid->e[1] = (uint8_t)strtoul(twobytes, NULL, 16);
-
- /* 84be9c3e-8a32-42c0-891c-4cd3b072becc
- * ^ */
-- strncpy(twobytes, text+28, 2);
-+ memcpy(twobytes, text+28, 2);
-+ twobytes[2] = 0;
- if (check_segment_sanity(twobytes, 2) < 0)
- return -1;
- guid->e[2] = (uint8_t)strtoul(twobytes, NULL, 16);
-
- /* 84be9c3e-8a32-42c0-891c-4cd3b072becc
- * ^ */
-- strncpy(twobytes, text+30, 2);
-+ memcpy(twobytes, text+30, 2);
-+ twobytes[2] = 0;
- if (check_segment_sanity(twobytes, 2) < 0)
- return -1;
- guid->e[3] = (uint8_t)strtoul(twobytes, NULL, 16);
-
- /* 84be9c3e-8a32-42c0-891c-4cd3b072becc
- * ^ */
-- strncpy(twobytes, text+32, 2);
-+ memcpy(twobytes, text+32, 2);
-+ twobytes[2] = 0;
- if (check_segment_sanity(twobytes, 2) < 0)
- return -1;
- guid->e[4] = (uint8_t)strtoul(twobytes, NULL, 16);
-
- /* 84be9c3e-8a32-42c0-891c-4cd3b072becc
- * ^ */
-- strncpy(twobytes, text+34, 2);
-+ memcpy(twobytes, text+34, 2);
-+ twobytes[2] = 0;
- if (check_segment_sanity(twobytes, 2) < 0)
- return -1;
- guid->e[5] = (uint8_t)strtoul(twobytes, NULL, 16);
---
-2.19.0
-
diff --git a/srcpkgs/efivar/patches/efisecdb:-fix-build-with-musl-libc.patch b/srcpkgs/efivar/patches/efisecdb:-fix-build-with-musl-libc.patch
new file mode 100644
index 000000000000..00229be5c723
--- /dev/null
+++ b/srcpkgs/efivar/patches/efisecdb:-fix-build-with-musl-libc.patch
@@ -0,0 +1,231 @@
+From cece3ffd5be2f8641eb694513f2b73e5eb97ffd3 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Fri, 28 Jan 2022 12:13:30 +0100
+Subject: [PATCH 1/2] efisecdb: fix build with musl libc
+
+Refactor code to use POSIX atexit(3) instead of the GNU specific
+on_exit(3).
+
+Resolves: #197
+Resolves: #202
+Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
+---
+ src/compiler.h | 2 --
+ src/efisecdb.c | 68 +++++++++++++++++++-------------------------------
+ 2 files changed, 26 insertions(+), 44 deletions(-)
+
+diff --git a/src/compiler.h b/src/compiler.h
+index e2f18f0b..d95fb014 100644
+--- a/src/compiler.h
++++ b/src/compiler.h
+@@ -7,8 +7,6 @@
+ #ifndef COMPILER_H_
+ #define COMPILER_H_
+
+-#include <sys/cdefs.h>
+-
+ /* GCC version checking borrowed from glibc. */
+ #if defined(__GNUC__) && defined(__GNUC_MINOR__)
+ # define GNUC_PREREQ(maj,min) \
+diff --git a/src/efisecdb.c b/src/efisecdb.c
+index f8823737..6bd5ad90 100644
+--- a/src/efisecdb.c
++++ b/src/efisecdb.c
+@@ -25,6 +25,10 @@
+ extern char *optarg;
+ extern int optind, opterr, optopt;
+
++static efi_secdb_t *secdb = NULL;
++static list_t infiles;
++static list_t actions;
++
+ struct hash_param {
+ char *name;
+ efi_secdb_type_t algorithm;
+@@ -187,12 +191,11 @@ add_action(list_t *list, action_type_t action_type, const efi_guid_t *owner,
+ }
+
+ static void
+-free_actions(int status UNUSED, void *actionsp)
++free_actions(void)
+ {
+- list_t *actions = (list_t *)actionsp;
+ list_t *pos, *tmp;
+
+- for_each_action_safe(pos, tmp, actions) {
++ for_each_action_safe(pos, tmp, &actions) {
+ action_t *action = list_entry(pos, action_t, list);
+
+ list_del(&action->list);
+@@ -202,12 +205,11 @@ free_actions(int status UNUSED, void *actionsp)
+ }
+
+ static void
+-free_infiles(int status UNUSED, void *infilesp)
++free_infiles(void)
+ {
+- list_t *infiles = (list_t *)infilesp;
+ list_t *pos, *tmp;
+
+- for_each_ptr_safe(pos, tmp, infiles) {
++ for_each_ptr_safe(pos, tmp, &infiles) {
+ ptrlist_t *entry = list_entry(pos, ptrlist_t, list);
+
+ list_del(&entry->list);
+@@ -216,27 +218,12 @@ free_infiles(int status UNUSED, void *infilesp)
+ }
+
+ static void
+-maybe_free_secdb(int status UNUSED, void *voidp)
++maybe_free_secdb(void)
+ {
+- efi_secdb_t **secdbp = (efi_secdb_t **)voidp;
+-
+- if (secdbp == NULL || *secdbp == NULL)
++ if (secdb == NULL)
+ return;
+
+- efi_secdb_free(*secdbp);
+-}
+-
+-static void
+-maybe_do_unlink(int status, void *filep)
+-{
+- char **file = (char **)filep;
+-
+- if (status == 0)
+- return;
+- if (file == NULL || *file == NULL)
+- return;
+-
+- unlink(*file);
++ efi_secdb_free(secdb);
+ }
+
+ static void
+@@ -323,15 +310,6 @@ parse_input_files(list_t *infiles, char **outfile, efi_secdb_t **secdb,
+ return status;
+ }
+
+-/*
+- * These need to be static globals so that they're not on main's stack when
+- * on_exit() fires.
+- */
+-static efi_secdb_t *secdb = NULL;
+-static list_t infiles;
+-static list_t actions;
+-static char *outfile = NULL;
+-
+ int
+ main(int argc, char *argv[])
+ {
+@@ -351,6 +329,7 @@ main(int argc, char *argv[])
+ bool do_sort_data = false;
+ bool sort_descending = false;
+ int status = 0;
++ char *outfile = NULL;
+
+ const char sopts[] = ":aAc:dfg:h:i:Lo:rs:t:v?";
+ const struct option lopts[] = {
+@@ -376,10 +355,9 @@ main(int argc, char *argv[])
+ INIT_LIST_HEAD(&infiles);
+ INIT_LIST_HEAD(&actions);
+
+- on_exit(free_actions, &actions);
+- on_exit(free_infiles, &infiles);
+- on_exit(maybe_free_secdb, &secdb);
+- on_exit(maybe_do_unlink, &outfile);
++ atexit(free_actions);
++ atexit(free_infiles);
++ atexit(maybe_free_secdb);
+
+ /*
+ * parse the command line.
+@@ -587,24 +565,30 @@ main(int argc, char *argv[])
+ outfd = open(outfile, flags, 0600);
+ if (outfd < 0) {
+ char *tmpoutfile = outfile;
+- if (errno == EEXIST)
+- outfile = NULL;
++ if (errno != EEXIST)
++ unlink(outfile);
+ err(1, "could not open \"%s\"", tmpoutfile);
+ }
+
+ rc = ftruncate(outfd, 0);
+- if (rc < 0)
++ if (rc < 0) {
++ unlink(outfile);
+ err(1, "could not truncate output file \"%s\"", outfile);
++ }
+
+ void *output;
+ size_t size = 0;
+ rc = efi_secdb_realize(secdb, &output, &size);
+- if (rc < 0)
++ if (rc < 0) {
++ unlink(outfile);
+ secdb_err(1, "could not realize signature list");
++ }
+
+ rc = write(outfd, output, size);
+- if (rc < 0)
++ if (rc < 0) {
++ unlink(outfile);
+ err(1, "could not write signature list");
++ }
+
+ close(outfd);
+ xfree(output);
+
+From df09b472419466987f2f30176dd00937e640aa9a Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Fri, 28 Jan 2022 12:29:00 +0100
+Subject: [PATCH 2/2] efisecdb: do not free optarg
+
+The *outfile passed to parse_input_files can only be either set to
+optarg or be NULL. optarg should not be free'd and NULL does not need
+to.
+
+Since we no longer use on_exit to unlink outfile we also don't need to
+set *outfile to NULL.
+
+Fixes commit d91787035bc1 (efisecdb: add efisecdb)
+
+Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
+---
+ src/efisecdb.c | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/src/efisecdb.c b/src/efisecdb.c
+index 6bd5ad90..70fa1847 100644
+--- a/src/efisecdb.c
++++ b/src/efisecdb.c
+@@ -255,8 +255,7 @@ list_guids(void)
+ * failure.
+ */
+ static int
+-parse_input_files(list_t *infiles, char **outfile, efi_secdb_t **secdb,
+- bool dump)
++parse_input_files(list_t *infiles, efi_secdb_t **secdb, bool dump)
+ {
+ int status = 0;
+ list_t *pos, *tmp;
+@@ -297,8 +296,6 @@ parse_input_files(list_t *infiles, char **outfile, efi_secdb_t **secdb,
+ if (!dump)
+ exit(1);
+ status = 1;
+- xfree(*outfile);
+- *outfile = NULL;
+ break;
+ }
+ }
+@@ -528,7 +525,7 @@ main(int argc, char *argv[])
+ efi_secdb_set_bool(secdb, EFI_SECDB_SORT_DATA, do_sort_data);
+ efi_secdb_set_bool(secdb, EFI_SECDB_SORT_DESCENDING, sort_descending);
+
+- status = parse_input_files(&infiles, &outfile, &secdb, dump);
++ status = parse_input_files(&infiles, &secdb, dump);
+ if (status == 0) {
+ for_each_action_safe(pos, tmp, &actions) {
+ action_t *action = list_entry(pos, action_t, list);
diff --git a/srcpkgs/efivar/template b/srcpkgs/efivar/template
index 9a21d44175b9..34fddf8a6c37 100644
--- a/srcpkgs/efivar/template
+++ b/srcpkgs/efivar/template
@@ -1,27 +1,26 @@
# Template file for 'efivar'
pkgname=efivar
-version=37
-revision=2
+version=38
+revision=1
build_style=gnu-makefile
make_build_args="libdir=/usr/lib"
-make_build_target="all test"
+make_build_target="all"
+make_check_args="GRUB_PREFIX=grub -j1" # Tests broken when ran in parallel
+make_check_target="test"
make_install_args="libdir=/usr/lib"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config mdocml"
+checkdepends="grub"
short_desc="Tools to manipulate EFI variables"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://github.com/rhinstaller/efivar"
distfiles="https://github.com/rhboot/efivar/releases/download/${version}/efivar-${version}.tar.bz2"
-checksum=3c67feb93f901b98fbb897d5ca82931a6698b5bcd6ac34f0815f670d77747b9f
+checksum=f018ed6e49c5f1c16d336d9fd7687ce87023276591921db1e49a314ad6515349
CFLAGS="-D_GNU_SOURCE -Wno-error=address-of-packed-member"
-post_build() {
- make -C src/test
-}
-
-post_install() {
- vbin src/test/tester efivar-tester
+post_patch() {
+ vsed -i src/include/defaults.mk -e "s/HOST_MARCH=-march=native/HOST_MARCH=/"
}
libefivar_package() {
^ permalink raw reply [flat|nested] 6+ messages in thread