From: RunningDroid <RunningDroid@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] efivar: update to 38
Date: Mon, 17 Oct 2022 07:48:18 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-40004@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1252 bytes --]
There is a new 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: 8382 bytes --]
From 590a210c386edf6ce440673f7ffd9cefc9b6ed59 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.
---
...flags-for-CC_FOR_BUILD-and-CCLD_FOR_.patch | 54 ---------
...strncpy-by-memcpy-to-fix-some-GCC8-w.patch | 111 ------------------
srcpkgs/efivar/template | 21 ++--
3 files changed, 8 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/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() {
next reply other threads:[~2022-10-17 5:48 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-17 5:48 RunningDroid [this message]
2022-10-17 5:50 ` [PR PATCH] [Updated] " RunningDroid
2022-10-17 6:21 ` RunningDroid
2022-10-17 6:31 ` RunningDroid
2023-01-16 1:59 ` github-actions
2023-01-31 2:01 ` [PR PATCH] [Closed]: " github-actions
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-40004@inbox.vuxu.org \
--to=runningdroid@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).