sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (c947c4357aed2121496b6b32661102f116303783)
- From: Treeve Jelbert <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
- Subject: [[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (c947c4357aed2121496b6b32661102f116303783)
- Date: Sun, 19 Jan 2025 12:26:40 +0000
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:
disk/efivar/DETAILS | 8
disk/efivar/HISTORY | 4
disk/efivar/patches/0001-efisecdb-fix-build-with-musl-libc.patch | 231
----------
disk/efivar/patches/glibc-2.36.patch | 55 --
disk/mtools/DETAILS | 2
disk/mtools/HISTORY | 3
6 files changed, 12 insertions(+), 291 deletions(-)
New commits:
commit c947c4357aed2121496b6b32661102f116303783
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
mtools: => 4.0.47
commit cdd190afdd9e036cc6b7ad9b410bcbfa19cdad20
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
efivar: => 39
diff --git a/disk/efivar/DETAILS b/disk/efivar/DETAILS
index 7c63476..08bc81b 100755
--- a/disk/efivar/DETAILS
+++ b/disk/efivar/DETAILS
@@ -1,10 +1,10 @@
SPELL=efivar
- VERSION=38
-
SOURCE_HASH=sha512:c2f17297c863ece134a9dd758d237fd2df8c8d072f87af1d0bf2bcf9acfc7a53c25597f03fd4fb8cc664b205743d4ffa0ef1b068d0f73c58fa573d40993f3155
- SOURCE=${SPELL}-${VERSION}.tar.bz2
+ VERSION=39
+
SOURCE_HASH=sha512:04493c30efbfc2773abac9a3dd93aa13403c05e29e3bfc72877d2054930811fae99119aadcb1729b6ca85abf5a24db786ea0c27c16d5458ef1b19e74696f5ff7
+ SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE=https://github.com/rhboot/$SPELL
-SOURCE_URL=${WEB_SITE}/releases/download/${VERSION}/${SOURCE}
+SOURCE_URL=${WEB_SITE}/archive/refs/tags/${VERSION}.tar.gz
ENTERED=20171124
LICENSE[0]=LGPL
KEYWORDS="boot uefi"
diff --git a/disk/efivar/HISTORY b/disk/efivar/HISTORY
index 80bd5d7..84cad97 100644
--- a/disk/efivar/HISTORY
+++ b/disk/efivar/HISTORY
@@ -1,3 +1,7 @@
+2025-01-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 39
+ * patches: delete obslete patches
+
2022-12-14 Ismael Luceno <ismael AT sourcemage.org>
* patches/0001-efisecdb-fix-build-with-musl-libc.patch:
fixed build against musl
diff --git a/disk/efivar/patches/0001-efisecdb-fix-build-with-musl-libc.patch
b/disk/efivar/patches/0001-efisecdb-fix-build-with-musl-libc.patch
deleted file mode 100644
index 00229be..0000000
--- a/disk/efivar/patches/0001-efisecdb-fix-build-with-musl-libc.patch
+++ /dev/null
@@ -1,231 +0,0 @@
-From cece3ffd5be2f8641eb694513f2b73e5eb97ffd3 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa AT 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 AT 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 AT 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 AT 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/disk/efivar/patches/glibc-2.36.patch
b/disk/efivar/patches/glibc-2.36.patch
deleted file mode 100644
index fcc83ae..0000000
--- a/disk/efivar/patches/glibc-2.36.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From bc65d63ebf8fe6ac8a099ff15ca200986dba1565 Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood AT redhat.com>
-Date: Thu, 28 Jul 2022 16:11:24 -0400
-Subject: [PATCH] Fix glibc 2.36 build (mount.h conflicts)
-
-glibc has decided that sys/mount.h and linux/mount.h are no longer
-usable at the same time. This broke the build, since linux/fs.h itself
-includes linux/mount.h. For now, fix the build by only including
-sys/mount.h where we need it.
-
-See-also:
https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
-Resolves: #227
-Signed-off-by: Robbie Harwood <rharwood AT redhat.com>
----
- src/gpt.c | 1 +
- src/linux.c | 1 +
- src/util.h | 1 -
- 3 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/gpt.c b/src/gpt.c
-index 1eda0497..21413c3b 100644
---- a/src/gpt.c
-+++ b/src/gpt.c
-@@ -17,6 +17,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <sys/mount.h>
- #include <sys/param.h>
- #include <sys/stat.h>
- #include <sys/utsname.h>
-diff --git a/src/linux.c b/src/linux.c
-index 47e45ae4..1780816f 100644
---- a/src/linux.c
-+++ b/src/linux.c
-@@ -20,6 +20,7 @@
- #include <stdbool.h>
- #include <stdio.h>
- #include <sys/ioctl.h>
-+#include <sys/mount.h>
- #include <sys/socket.h>
- #include <sys/sysmacros.h>
- #include <sys/types.h>
-diff --git a/src/util.h b/src/util.h
-index 3300666f..1e67e447 100644
---- a/src/util.h
-+++ b/src/util.h
-@@ -23,7 +23,6 @@
- #include <stdio.h>
- #include <string.h>
- #include <sys/ioctl.h>
--#include <sys/mount.h>
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <tgmath.h>
diff --git a/disk/mtools/DETAILS b/disk/mtools/DETAILS
index 560ce68..3064741 100755
--- a/disk/mtools/DETAILS
+++ b/disk/mtools/DETAILS
@@ -1,6 +1,6 @@
# Watch: https://ftp.gnu.org/gnu/mtools/
SPELL=mtools
- VERSION=4.0.46
+ VERSION=4.0.47
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE2_IGNORE=signature
diff --git a/disk/mtools/HISTORY b/disk/mtools/HISTORY
index 9beaddb..8424aef 100644
--- a/disk/mtools/HISTORY
+++ b/disk/mtools/HISTORY
@@ -1,3 +1,6 @@
+2025-01-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.0.47
+
2025-01-06 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: enabled staged install again, not problematic anymore
* INSTALL: removed unnecessary code
- [[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (c947c4357aed2121496b6b32661102f116303783), Treeve Jelbert, 01/19/2025
Archive powered by MHonArc 2.6.24.