* [gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/files/
@ 2017-10-20 7:45 Patrice Clement
0 siblings, 0 replies; 9+ messages in thread
From: Patrice Clement @ 2017-10-20 7:45 UTC (permalink / raw
To: gentoo-commits
commit: 34f0a08af2dadbc1c1b196d75d7f9b927aad184e
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Oct 10 13:40:44 2017 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Oct 20 07:45:15 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34f0a08a
sys-apps/util-linux: remove unused patch.
.../util-linux-2.30-pylibmount_segfault.patch | 25 ----------------------
1 file changed, 25 deletions(-)
diff --git a/sys-apps/util-linux/files/util-linux-2.30-pylibmount_segfault.patch b/sys-apps/util-linux/files/util-linux-2.30-pylibmount_segfault.patch
deleted file mode 100644
index 73fbc994923..00000000000
--- a/sys-apps/util-linux/files/util-linux-2.30-pylibmount_segfault.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://bugs.gentoo.org/621176
-
-From 29b721bc9d20ed44858017689ce1745c220bd0d4 Mon Sep 17 00:00:00 2001
-From: Zac Medico <zmedico@gentoo.org>
-Date: Wed, 7 Jun 2017 17:21:33 -0700
-Subject: [PATCH] pylibmount: NULL terminate kwlist in Context_init
-
-Fixes a segfault observed with python3.6.
----
- libmount/python/context.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libmount/python/context.c b/libmount/python/context.c
-index 6d82e1432..982414d01 100644
---- a/libmount/python/context.c
-+++ b/libmount/python/context.c
-@@ -90,7 +90,7 @@ static int Context_init(ContextObjext *self, PyObject *args, PyObject *kwds)
- "source", "target", "fstype",
- "options", "mflags", "fstype_pattern",
- "options_pattern", "fs", "fstab",
-- "optsmode"
-+ "optsmode", NULL
- };
-
- if (!PyArg_ParseTupleAndKeywords(
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/files/
@ 2019-01-21 11:38 Lars Wendler
0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2019-01-21 11:38 UTC (permalink / raw
To: gentoo-commits
commit: ef6abbc6965ef11356a2dc393c2f4917cff4fee3
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Jan 7 15:11:16 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Jan 21 11:37:43 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef6abbc6
sys-apps/util-linux: remove unused patch
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
.../files/util-linux-2.32-python3-tests.patch | 105 ---------------------
1 file changed, 105 deletions(-)
diff --git a/sys-apps/util-linux/files/util-linux-2.32-python3-tests.patch b/sys-apps/util-linux/files/util-linux-2.32-python3-tests.patch
deleted file mode 100644
index 7b8867ba034..00000000000
--- a/sys-apps/util-linux/files/util-linux-2.32-python3-tests.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 8a12ab57755afc36546834f175ef0b9e9376ba59 Mon Sep 17 00:00:00 2001
-From: Frank Schaefer <kelledin@gmail.com>
-Date: Tue, 10 Jul 2018 20:21:02 -0500
-Subject: [PATCH] * break up large strings for PySys_WriteStdout()
-
----
- libmount/python/fs.c | 56 ++++++++++++++++++++++++++++++++++++++++------------
- 1 file changed, 43 insertions(+), 13 deletions(-)
-
-diff --git a/libmount/python/fs.c b/libmount/python/fs.c
-index d6490d248..634a914ef 100644
---- a/libmount/python/fs.c
-+++ b/libmount/python/fs.c
-@@ -63,32 +63,62 @@ static PyObject *Fs_get_devno(FsObject *self)
- return PyObjectResultInt(mnt_fs_get_devno(self->fs));
- }
-
-+static void _dump_debug_string(const char *lead, const char *s, char quote)
-+{
-+ /* PySys_WriteStdout() will automatically truncate any '%s' token
-+ * longer than a certain length (documented as 1000 bytes, but we
-+ * give ourselves some margin here just in case). The only way I
-+ * know to get around this is to print such strings in bite-sized
-+ * chunks.
-+ */
-+ static const unsigned int _PY_MAX_LEN = 900;
-+ static const char *_PY_MAX_LEN_FMT = "%.900s";
-+ unsigned int len;
-+
-+ if (lead != NULL)
-+ PySys_WriteStdout("%s", lead);
-+
-+ if (quote != 0)
-+ PySys_WriteStdout("%c", quote);
-+
-+ for (len = strlen(s); len > _PY_MAX_LEN; len -= _PY_MAX_LEN, s += _PY_MAX_LEN)
-+ PySys_WriteStdout(_PY_MAX_LEN_FMT, s);
-+
-+ if (len > 0)
-+ PySys_WriteStdout(_PY_MAX_LEN_FMT, s);
-+
-+ if (quote != 0)
-+ PySys_WriteStdout("%c\n", quote);
-+ else
-+ PySys_WriteStdout("\n");
-+}
-+
- #define Fs_print_debug_HELP "print_debug()\n\n"
- static PyObject *Fs_print_debug(FsObject *self)
- {
- PySys_WriteStdout("------ fs: %p\n", self->fs);
-- PySys_WriteStdout("source: %s\n", mnt_fs_get_source(self->fs));
-- PySys_WriteStdout("target: %s\n", mnt_fs_get_target(self->fs));
-- PySys_WriteStdout("fstype: %s\n", mnt_fs_get_fstype(self->fs));
-+ _dump_debug_string("source: ", mnt_fs_get_source(self->fs), 0);
-+ _dump_debug_string("target: ", mnt_fs_get_target(self->fs), 0);
-+ _dump_debug_string("fstype: ", mnt_fs_get_fstype(self->fs), 0);
-
- if (mnt_fs_get_options(self->fs))
-- PySys_WriteStdout("optstr: %s\n", mnt_fs_get_options(self->fs));
-+ _dump_debug_string("optstr: ", mnt_fs_get_options(self->fs), 0);
- if (mnt_fs_get_vfs_options(self->fs))
-- PySys_WriteStdout("VFS-optstr: %s\n", mnt_fs_get_vfs_options(self->fs));
-+ _dump_debug_string("VFS-optstr: ", mnt_fs_get_vfs_options(self->fs), 0);
- if (mnt_fs_get_fs_options(self->fs))
-- PySys_WriteStdout("FS-opstr: %s\n", mnt_fs_get_fs_options(self->fs));
-+ _dump_debug_string("FS-opstr: ", mnt_fs_get_fs_options(self->fs), 0);
- if (mnt_fs_get_user_options(self->fs))
-- PySys_WriteStdout("user-optstr: %s\n", mnt_fs_get_user_options(self->fs));
-+ _dump_debug_string("user-optstr: ", mnt_fs_get_user_options(self->fs), 0);
- if (mnt_fs_get_optional_fields(self->fs))
-- PySys_WriteStdout("optional-fields: '%s'\n", mnt_fs_get_optional_fields(self->fs));
-+ _dump_debug_string("optional-fields: ", mnt_fs_get_optional_fields(self->fs), '\'');
- if (mnt_fs_get_attributes(self->fs))
-- PySys_WriteStdout("attributes: %s\n", mnt_fs_get_attributes(self->fs));
-+ _dump_debug_string("attributes: ", mnt_fs_get_attributes(self->fs), 0);
-
- if (mnt_fs_get_root(self->fs))
-- PySys_WriteStdout("root: %s\n", mnt_fs_get_root(self->fs));
-+ _dump_debug_string("root: ", mnt_fs_get_root(self->fs), 0);
-
- if (mnt_fs_get_swaptype(self->fs))
-- PySys_WriteStdout("swaptype: %s\n", mnt_fs_get_swaptype(self->fs));
-+ _dump_debug_string("swaptype: ", mnt_fs_get_swaptype(self->fs), 0);
- if (mnt_fs_get_size(self->fs))
- PySys_WriteStdout("size: %jd\n", mnt_fs_get_size(self->fs));
- if (mnt_fs_get_usedsize(self->fs))
-@@ -97,7 +127,7 @@ static PyObject *Fs_print_debug(FsObject *self)
- PySys_WriteStdout("priority: %d\n", mnt_fs_get_priority(self->fs));
-
- if (mnt_fs_get_bindsrc(self->fs))
-- PySys_WriteStdout("bindsrc: %s\n", mnt_fs_get_bindsrc(self->fs));
-+ _dump_debug_string("bindsrc: ", mnt_fs_get_bindsrc(self->fs), 0);
- if (mnt_fs_get_freq(self->fs))
- PySys_WriteStdout("freq: %d\n", mnt_fs_get_freq(self->fs));
- if (mnt_fs_get_passno(self->fs))
-@@ -112,7 +142,7 @@ static PyObject *Fs_print_debug(FsObject *self)
- if (mnt_fs_get_tid(self->fs))
- PySys_WriteStdout("tid: %d\n", mnt_fs_get_tid(self->fs));
- if (mnt_fs_get_comment(self->fs))
-- PySys_WriteStdout("comment: '%s'\n", mnt_fs_get_comment(self->fs));
-+ _dump_debug_string("comment: ", mnt_fs_get_comment(self->fs), '\'');
- return UL_IncRef(self);
- }
- /*
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/files/
@ 2019-02-16 21:05 Lars Wendler
0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2019-02-16 21:05 UTC (permalink / raw
To: gentoo-commits
commit: d5605ab2d55f933325ce9af9c5e55293c2202b50
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Feb 12 16:20:25 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Feb 16 21:05:31 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5605ab2
sys-apps/util-linux: remove unused patch
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11031
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
.../files/util-linux-2.32-add-missing-lintl.patch | 38 ----------------------
1 file changed, 38 deletions(-)
diff --git a/sys-apps/util-linux/files/util-linux-2.32-add-missing-lintl.patch b/sys-apps/util-linux/files/util-linux-2.32-add-missing-lintl.patch
deleted file mode 100644
index 8cca093d7cb..00000000000
--- a/sys-apps/util-linux/files/util-linux-2.32-add-missing-lintl.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 3188ea9a9292604e537f06f11adddf474fc9e52d Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Mon, 9 Apr 2018 12:11:36 +0200
-Subject: [PATCH] build: Add missing -lintl linkage to lib{smartcols,uuid}
-
-Addresses: https://github.com/karelzak/util-linux/pull/615
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- libsmartcols/src/Makemodule.am | 2 +-
- libuuid/src/Makemodule.am | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libsmartcols/src/Makemodule.am b/libsmartcols/src/Makemodule.am
-index 664aca30b..665b2aa7f 100644
---- a/libsmartcols/src/Makemodule.am
-+++ b/libsmartcols/src/Makemodule.am
-@@ -19,7 +19,7 @@ libsmartcols_la_SOURCES= \
- libsmartcols/src/version.c \
- libsmartcols/src/init.c
-
--libsmartcols_la_LIBADD = libcommon.la
-+libsmartcols_la_LIBADD = $(LDADD) libcommon.la
-
- libsmartcols_la_CFLAGS = \
- $(AM_CFLAGS) \
-diff --git a/libuuid/src/Makemodule.am b/libuuid/src/Makemodule.am
-index 5122622a5..e58fa261c 100644
---- a/libuuid/src/Makemodule.am
-+++ b/libuuid/src/Makemodule.am
-@@ -31,7 +31,7 @@ libuuid_la_SOURCES = \
- EXTRA_libuuid_la_DEPENDENCIES = \
- libuuid/src/libuuid.sym
-
--libuuid_la_LIBADD = $(SOCKET_LIBS)
-+libuuid_la_LIBADD = $(LDADD) $(SOCKET_LIBS)
-
- libuuid_la_CFLAGS = \
- $(AM_CFLAGS) \
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/files/
@ 2021-04-19 21:51 Lars Wendler
0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2021-04-19 21:51 UTC (permalink / raw
To: gentoo-commits
commit: a21804071faec09d7e78775bbaecf71b2133af00
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Apr 19 17:23:12 2021 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Apr 19 21:50:56 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2180407
sys-apps/util-linux: remove unused patches
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/20461
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
...til-linux-2.33.1-fix-struct_termios-check.patch | 30 ----------------
...-linux-2.36.1-libmount_dont_use_symfollow.patch | 40 ----------------------
.../files/util-linux-2.36.1-riscv32.patch | 29 ----------------
3 files changed, 99 deletions(-)
diff --git a/sys-apps/util-linux/files/util-linux-2.33.1-fix-struct_termios-check.patch b/sys-apps/util-linux/files/util-linux-2.33.1-fix-struct_termios-check.patch
deleted file mode 100644
index df52af45049..00000000000
--- a/sys-apps/util-linux/files/util-linux-2.33.1-fix-struct_termios-check.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 963413a1adf6767ab17712097e288e1a346f63a7 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 4 Jan 2019 22:38:25 -0800
-Subject: [PATCH] ldattach: Check for value of _HAVE_STRUCT_TERMIOS_C_ISPEED
-
-in glibc 2.29+ checking for just existence of _HAVE_STRUCT_TERMIOS_C_ISPEED
-won't be enough, the value has to be checked
-
-see
-https://sourceware.org/git/?p=glibc.git;a=commit;h=e5a50db36eaa6e8c6427b3a971563240b633ca85
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- sys-utils/ldattach.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sys-utils/ldattach.c b/sys-utils/ldattach.c
-index d33d68535..fb50711eb 100644
---- a/sys-utils/ldattach.c
-+++ b/sys-utils/ldattach.c
-@@ -242,7 +242,7 @@ static int my_cfsetspeed(struct termios *ts, int speed)
- * -- we have to bypass glibc and set the speed manually (because glibc
- * checks for speed and supports Bxxx bit rates only)...
- */
--#ifdef _HAVE_STRUCT_TERMIOS_C_ISPEED
-+#if _HAVE_STRUCT_TERMIOS_C_ISPEED
- # define BOTHER 0010000 /* non standard rate */
- dbg("using non-standard speeds");
- ts->c_ospeed = ts->c_ispeed = speed;
-
diff --git a/sys-apps/util-linux/files/util-linux-2.36.1-libmount_dont_use_symfollow.patch b/sys-apps/util-linux/files/util-linux-2.36.1-libmount_dont_use_symfollow.patch
deleted file mode 100644
index 7c0b73f49d7..00000000000
--- a/sys-apps/util-linux/files/util-linux-2.36.1-libmount_dont_use_symfollow.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 76bb9b30cfcf54b59591a57a3d2a747e514469b2 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Thu, 19 Nov 2020 09:49:16 +0100
-Subject: [PATCH] libmount: don't use "symfollow" for helpers on user mounts
-
-Addresses: https://github.com/karelzak/util-linux/issues/1193
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- libmount/src/context_mount.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/libmount/src/context_mount.c b/libmount/src/context_mount.c
-index 8c394c1ff..dd1786176 100644
---- a/libmount/src/context_mount.c
-+++ b/libmount/src/context_mount.c
-@@ -415,6 +415,9 @@ static int generate_helper_optstr(struct libmnt_context *cxt, char **optstr)
- * string, because there is nothing like MS_EXEC (we only have
- * MS_NOEXEC in mount flags and we don't care about the original
- * mount string in libmount for VFS options).
-+ *
-+ * This use-case makes sense for MS_SECURE flags only (see
-+ * mnt_optstr_get_flags() and mnt_context_merge_mflags()).
- */
- if (!(cxt->mountflags & MS_NOEXEC))
- mnt_optstr_append_option(optstr, "exec", NULL);
-@@ -422,11 +425,8 @@ static int generate_helper_optstr(struct libmnt_context *cxt, char **optstr)
- mnt_optstr_append_option(optstr, "suid", NULL);
- if (!(cxt->mountflags & MS_NODEV))
- mnt_optstr_append_option(optstr, "dev", NULL);
-- if (!(cxt->mountflags & MS_NOSYMFOLLOW))
-- mnt_optstr_append_option(optstr, "symfollow", NULL);
- }
-
--
- if (cxt->flags & MNT_FL_SAVED_USER)
- rc = mnt_optstr_set_option(optstr, "user", cxt->orig_user);
- if (rc)
---
-2.29.2
-
diff --git a/sys-apps/util-linux/files/util-linux-2.36.1-riscv32.patch b/sys-apps/util-linux/files/util-linux-2.36.1-riscv32.patch
deleted file mode 100644
index b18a01906eb..00000000000
--- a/sys-apps/util-linux/files/util-linux-2.36.1-riscv32.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 367972fae13d170675768d63678577cae1890143 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <toscano.pino@tiscali.it>
-Date: Tue, 17 Nov 2020 11:32:45 +0100
-Subject: [PATCH] hwclock: do not assume __NR_settimeofday_time32
-
-Check that __NR_settimeofday_time32 exists before trying to use it as
-syscall number.
-
-Signed-off-by: Pino Toscano <toscano.pino@tiscali.it>
----
- sys-utils/hwclock.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c
-index 1f7ef3317..db448687d 100644
---- a/sys-utils/hwclock.c
-+++ b/sys-utils/hwclock.c
-@@ -678,7 +678,7 @@ display_time(struct timeval hwctime)
- #ifndef SYS_settimeofday
- # ifdef __NR_settimeofday
- # define SYS_settimeofday __NR_settimeofday
--# else
-+# elif defined(__NR_settimeofday_time32)
- # define SYS_settimeofday __NR_settimeofday_time32
- # endif
- #endif
---
-2.26.2
-
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/files/
@ 2023-04-07 20:06 Conrad Kostecki
0 siblings, 0 replies; 9+ messages in thread
From: Conrad Kostecki @ 2023-04-07 20:06 UTC (permalink / raw
To: gentoo-commits
commit: ac650ffd409003694733d9f1ff003c15a219c9b9
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Apr 6 16:24:27 2023 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Apr 7 20:05:43 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac650ffd
sys-apps/util-linux: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/30501
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../files/util-linux-2.39_rc1-test-build.patch | 33 ----------------------
1 file changed, 33 deletions(-)
diff --git a/sys-apps/util-linux/files/util-linux-2.39_rc1-test-build.patch b/sys-apps/util-linux/files/util-linux-2.39_rc1-test-build.patch
deleted file mode 100644
index 5fdb5a51bb9e..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.39_rc1-test-build.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://github.com/util-linux/util-linux/issues/2119
-https://github.com/util-linux/util-linux/commit/bccae5d85831c4cfa6b5d147acec739bd3c148b9
-
-From bccae5d85831c4cfa6b5d147acec739bd3c148b9 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Fri, 17 Mar 2023 13:11:50 +0100
-Subject: [PATCH] build-sys: fix libblkid fuzz sample test if-endif
-
-All tests have to be covered by BUILD_LIBBLKID_TESTS otherwise
-proper CFLAGS ($blkid_tests_cflags) are undefined.
-
-Fixes: https://github.com/util-linux/util-linux/issues/2119
-Signed-off-by: Karel Zak <kzak@redhat.com>
---- a/libblkid/src/Makemodule.am
-+++ b/libblkid/src/Makemodule.am
-@@ -224,8 +224,6 @@ test_blkid_fuzz_LDFLAGS = $(blkid_tests_ldflags) -lpthread
- test_blkid_fuzz_LDADD = $(blkid_tests_ldadd) $(LIB_FUZZING_ENGINE)
- endif
-
--endif # BUILD_LIBBLKID_TESTS
--
- check_PROGRAMS += test_blkid_fuzz_sample
-
- test_blkid_fuzz_sample_SOURCES = libblkid/src/fuzz.c
-@@ -234,6 +232,7 @@ test_blkid_fuzz_sample_CFLAGS = $(blkid_tests_cflags)
- test_blkid_fuzz_sample_LDFLAGS = $(blkid_tests_ldflags)
- test_blkid_fuzz_sample_LDADD = $(blkid_tests_ldadd)
-
-+endif # BUILD_LIBBLKID_TESTS
-
- # move lib from $(usrlib_execdir) to $(libdir) if needed
- install-exec-hook-libblkid:
-
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/files/
@ 2023-12-31 2:38 Conrad Kostecki
0 siblings, 0 replies; 9+ messages in thread
From: Conrad Kostecki @ 2023-12-31 2:38 UTC (permalink / raw
To: gentoo-commits
commit: 83e6d06addde9b8beac5ab796e7429e7ab5c742c
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri Dec 29 14:19:27 2023 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Dec 31 02:36:37 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83e6d06a
sys-apps/util-linux: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/34540
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../files/util-linux-2.39.1-mount-no-statx.patch | 34 ----------------------
.../files/util-linux-2.39.1-wall-no-tty.patch | 26 -----------------
2 files changed, 60 deletions(-)
diff --git a/sys-apps/util-linux/files/util-linux-2.39.1-mount-no-statx.patch b/sys-apps/util-linux/files/util-linux-2.39.1-mount-no-statx.patch
deleted file mode 100644
index 02e8ef20c416..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.39.1-mount-no-statx.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-https://github.com/util-linux/util-linux/issues/2409
-https://github.com/util-linux/util-linux/commit/91c2cbdf3a04f2f3f4c4bb0d2a6053874bfa11ea
-
-From 91c2cbdf3a04f2f3f4c4bb0d2a6053874bfa11ea Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= <thomas@t-8ch.de>
-Date: Thu, 3 Aug 2023 07:13:28 +0200
-Subject: [PATCH] libmount: (utils) fix statx fallback
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-If the systemcall is not available ENOSYS is returned.
-
-Under glibc the statx implementation also has its own fallback logic.
-As AT_STATX_DONT_SYNC can't be implemented correctly in that fallback
-logic the wrapper will return EINVAL in case the emulation is needed and
-AT_STATX_DONT_SYNC is set.
-So also use our own fallback in that case.
-
-Fixes: #2409
-Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
---- a/libmount/src/utils.c
-+++ b/libmount/src/utils.c
-@@ -133,7 +133,8 @@ static int safe_stat(const char *target, struct stat *st, int nofollow)
- st->st_mode = stx.stx_mode;
- }
-
-- if (rc == 0 || errno != EOPNOTSUPP)
-+ if (rc == 0 ||
-+ (errno != EOPNOTSUPP && errno != ENOSYS && errno != EINVAL))
- return rc;
- }
- #endif
-
diff --git a/sys-apps/util-linux/files/util-linux-2.39.1-wall-no-tty.patch b/sys-apps/util-linux/files/util-linux-2.39.1-wall-no-tty.patch
deleted file mode 100644
index e95dbc358d33..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.39.1-wall-no-tty.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://bugs.gentoo.org/911336
-https://github.com/util-linux/util-linux/pull/2412
-
-From 7d3713a6d541be0bac0bb78cc8fea1620583fd08 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Sat, 29 Jul 2023 17:32:57 -0400
-Subject: [PATCH] wall: do not error for ttys that do not exist
-
-Some wayland display managers (GDM) put strings like "seat0" in the
-ut_line field of utmp entries. These are not valid tty devices.
-
-Avoid writing a confusing error message for ttys that do not exist.
-
-Bug: https://bugs.gentoo.org/911336
-Signed-off-by: Mike Gilbert <floppym@gentoo.org>
---- a/term-utils/ttymsg.c
-+++ b/term-utils/ttymsg.c
-@@ -100,7 +100,7 @@ ttymsg(struct iovec *iov, size_t iovcnt, char *line, int tmout) {
- * if not running as root; not an error.
- */
- if ((fd = open(device, O_WRONLY|O_NONBLOCK, 0)) < 0) {
-- if (errno == EBUSY || errno == EACCES)
-+ if (errno == EBUSY || errno == EACCES || errno == ENOENT)
- return NULL;
-
- len = snprintf(errbuf, sizeof(errbuf), "%s: %m", device);
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/files/
@ 2024-04-04 1:17 Sam James
0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2024-04-04 1:17 UTC (permalink / raw
To: gentoo-commits
commit: 5036479d424f6dd8c6cb2502da3d65c90129c2b8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 4 01:09:39 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 4 01:09:39 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5036479d
sys-apps/util-linux: add refs to patch
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/util-linux/files/util-linux-2.39.3-fix-use-after-free.patch | 3 +++
1 file changed, 3 insertions(+)
diff --git a/sys-apps/util-linux/files/util-linux-2.39.3-fix-use-after-free.patch b/sys-apps/util-linux/files/util-linux-2.39.3-fix-use-after-free.patch
index dac2edaf4791..6ebbd0a430f7 100644
--- a/sys-apps/util-linux/files/util-linux-2.39.3-fix-use-after-free.patch
+++ b/sys-apps/util-linux/files/util-linux-2.39.3-fix-use-after-free.patch
@@ -1,3 +1,6 @@
+https://bugs.gentoo.org/928396
+https://github.com/util-linux/util-linux/commit/4b2e6f5071a4c5beebbd9668d24dc05defc096d7
+
From 4b2e6f5071a4c5beebbd9668d24dc05defc096d7 Mon Sep 17 00:00:00 2001
From: Tanish Yadav <devtany@gmail.com>
Date: Tue, 5 Mar 2024 00:51:41 +0530
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/files/
@ 2024-12-23 20:01 Conrad Kostecki
0 siblings, 0 replies; 9+ messages in thread
From: Conrad Kostecki @ 2024-12-23 20:01 UTC (permalink / raw
To: gentoo-commits
commit: d1ef1d87ce648932160043a32d6c1aed93ab6ee0
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Dec 18 16:23:40 2024 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon Dec 23 19:50:24 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1ef1d87
sys-apps/util-linux: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/39771
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../files/util-linux-2.39.2-backport-pr2251.patch | 268 ---------------------
.../files/util-linux-2.39.3-CVE-2024-28085.patch | 25 --
.../files/util-linux-2.39.3-libblkid-luks.patch | 40 ---
3 files changed, 333 deletions(-)
diff --git a/sys-apps/util-linux/files/util-linux-2.39.2-backport-pr2251.patch b/sys-apps/util-linux/files/util-linux-2.39.2-backport-pr2251.patch
deleted file mode 100644
index b16519bb5142..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.39.2-backport-pr2251.patch
+++ /dev/null
@@ -1,268 +0,0 @@
-https://bugs.gentoo.org/914791
-https://github.com/util-linux/util-linux/issues/2249
-https://github.com/util-linux/util-linux/pull/2251
-
-From 8b36444f447949c3ab477f2c43b45a94c30ee7bf Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= <thomas@t-8ch.de>
-Date: Sun, 21 May 2023 21:42:14 +0200
-Subject: [PATCH 1/4] fadvise: (test) dynamically calculate expected test
- values
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
----
- tests/ts/fadvise/drop | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/tests/ts/fadvise/drop b/tests/ts/fadvise/drop
-index 7c7eee5dc2..86c0d5b0a3 100755
---- a/tests/ts/fadvise/drop
-+++ b/tests/ts/fadvise/drop
-@@ -16,7 +16,7 @@ ts_check_prog "sleep"
- ts_cd "$TS_OUTDIR"
-
- FILE="ddtest"
--BS=4k
-+BS=4096
- COUNT=8
-
- FILE_FS="$("$TS_CMD_FINDMNT" -nr -o FSTYPE -T "$PWD")"
-@@ -41,22 +41,22 @@ create_file() {
- echo
-
- create_file
-- echo "offset: 8192"
-- "$TS_CMD_FADVISE" -o 8192 "$FILE"
-+ echo "offset: $(( 2 * $BS ))"
-+ "$TS_CMD_FADVISE" -o $(( 2 * $BS )) "$FILE"
- echo status: $?
- "$TS_CMD_FINCORE" "$FILE"
- echo
-
- create_file
-- echo "length: 16384"
-- "$TS_CMD_FADVISE" -l 16384 "$FILE"
-+ echo "length: $(( 4 * $BS ))"
-+ "$TS_CMD_FADVISE" -l $(( 4 * $BS )) "$FILE"
- echo status: $?
- "$TS_CMD_FINCORE" "$FILE"
- echo
-
- create_file
-- echo "offset: 8192, length: 16384 fd: 42"
-- "$TS_CMD_FADVISE" -o 8192 -l 16384 --fd 42 42<"$FILE"
-+ echo "offset: $(( 2 * $BS )), length: $(( 4 * $BS )) fd: 42"
-+ "$TS_CMD_FADVISE" -o $(( 2 * $BS )) -l $(( 4 * $BS )) --fd 42 42<"$FILE"
- echo status: $?
- "$TS_CMD_FINCORE" "$FILE"
- echo
-
-From e5009e773fc801eca887dd43b721cd1b1aa327be Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= <thomas@t-8ch.de>
-Date: Sun, 21 May 2023 21:43:38 +0200
-Subject: [PATCH 2/4] fadvise: (tests) factor out calls to "fincore"
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This will make it easier to pass argument later.
-
-Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
----
- tests/ts/fadvise/drop | 14 +++++++++-----
- 1 file changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/tests/ts/fadvise/drop b/tests/ts/fadvise/drop
-index 86c0d5b0a3..8869b7da4d 100755
---- a/tests/ts/fadvise/drop
-+++ b/tests/ts/fadvise/drop
-@@ -28,37 +28,41 @@ create_file() {
- dd if=/dev/zero of="$FILE" bs=$BS count=$COUNT conv=fsync >& /dev/null
- }
-
-+do_fincore() {
-+ "$TS_CMD_FINCORE" "$FILE"
-+}
-+
- {
- create_file
-- "$TS_CMD_FINCORE" "$FILE"
-+ do_fincore
- echo
-
- create_file
- echo "whole file"
- "$TS_CMD_FADVISE" "$FILE"
- echo status: $?
-- "$TS_CMD_FINCORE" "$FILE"
-+ do_fincore
- echo
-
- create_file
- echo "offset: $(( 2 * $BS ))"
- "$TS_CMD_FADVISE" -o $(( 2 * $BS )) "$FILE"
- echo status: $?
-- "$TS_CMD_FINCORE" "$FILE"
-+ do_fincore
- echo
-
- create_file
- echo "length: $(( 4 * $BS ))"
- "$TS_CMD_FADVISE" -l $(( 4 * $BS )) "$FILE"
- echo status: $?
-- "$TS_CMD_FINCORE" "$FILE"
-+ do_fincore
- echo
-
- create_file
- echo "offset: $(( 2 * $BS )), length: $(( 4 * $BS )) fd: 42"
- "$TS_CMD_FADVISE" -o $(( 2 * $BS )) -l $(( 4 * $BS )) --fd 42 42<"$FILE"
- echo status: $?
-- "$TS_CMD_FINCORE" "$FILE"
-+ do_fincore
- echo
-
- rm "$FILE"
-
-From 33980996d0b429fc59c40f8352633c0a21a0f96a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= <thomas@t-8ch.de>
-Date: Sun, 21 May 2023 21:44:20 +0200
-Subject: [PATCH 3/4] fadvise: (test) don't compare fincore page counts
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-These depend on the machines pagesize and are therefore not a good
-comparision.
-
-Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
----
- tests/expected/fadvise/drop | 20 ++++++++++----------
- tests/ts/fadvise/drop | 2 +-
- 2 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/tests/expected/fadvise/drop b/tests/expected/fadvise/drop
-index f2360b56fb..25f23e050a 100644
---- a/tests/expected/fadvise/drop
-+++ b/tests/expected/fadvise/drop
-@@ -1,23 +1,23 @@
-- RES PAGES SIZE FILE
-- 32K 8 32K ddtest
-+ RES SIZE FILE
-+ 32K 32K ddtest
-
- whole file
- status: 0
--RES PAGES SIZE FILE
-- 0B 0 32K ddtest
-+RES SIZE FILE
-+ 0B 32K ddtest
-
- offset: 8192
- status: 0
--RES PAGES SIZE FILE
-- 8K 2 32K ddtest
-+RES SIZE FILE
-+ 8K 32K ddtest
-
- length: 16384
- status: 0
-- RES PAGES SIZE FILE
-- 16K 4 32K ddtest
-+ RES SIZE FILE
-+ 16K 32K ddtest
-
- offset: 8192, length: 16384 fd: 42
- status: 0
-- RES PAGES SIZE FILE
-- 16K 4 32K ddtest
-+ RES SIZE FILE
-+ 16K 32K ddtest
-
-diff --git a/tests/ts/fadvise/drop b/tests/ts/fadvise/drop
-index 8869b7da4d..6c4298e872 100755
---- a/tests/ts/fadvise/drop
-+++ b/tests/ts/fadvise/drop
-@@ -29,7 +29,7 @@ create_file() {
- }
-
- do_fincore() {
-- "$TS_CMD_FINCORE" "$FILE"
-+ "$TS_CMD_FINCORE" -o RES,SIZE,FILE "$FILE"
- }
-
- {
-
-From c0f31b79f5d1c665cdc057fb32f4d161d28aa5b2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= <thomas@t-8ch.de>
-Date: Sun, 21 May 2023 21:45:10 +0200
-Subject: [PATCH 4/4] fadvise: (test) test with 64k blocks
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This will allow the tests to also pass on systems with 64k pagesizes.
-
-Closes #2249
-Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
----
- tests/expected/fadvise/drop | 26 +++++++++++++-------------
- tests/ts/fadvise/drop | 2 +-
- 2 files changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/tests/expected/fadvise/drop b/tests/expected/fadvise/drop
-index 25f23e050a..e7bb26b6e2 100644
---- a/tests/expected/fadvise/drop
-+++ b/tests/expected/fadvise/drop
-@@ -1,23 +1,23 @@
-- RES SIZE FILE
-- 32K 32K ddtest
-+ RES SIZE FILE
-+ 512K 512K ddtest
-
- whole file
- status: 0
--RES SIZE FILE
-- 0B 32K ddtest
-+RES SIZE FILE
-+ 0B 512K ddtest
-
--offset: 8192
-+offset: 131072
- status: 0
--RES SIZE FILE
-- 8K 32K ddtest
-+ RES SIZE FILE
-+ 128K 512K ddtest
-
--length: 16384
-+length: 262144
- status: 0
-- RES SIZE FILE
-- 16K 32K ddtest
-+ RES SIZE FILE
-+ 256K 512K ddtest
-
--offset: 8192, length: 16384 fd: 42
-+offset: 131072, length: 262144 fd: 42
- status: 0
-- RES SIZE FILE
-- 16K 32K ddtest
-+ RES SIZE FILE
-+ 256K 512K ddtest
-
-diff --git a/tests/ts/fadvise/drop b/tests/ts/fadvise/drop
-index 6c4298e872..45dcb9110b 100755
---- a/tests/ts/fadvise/drop
-+++ b/tests/ts/fadvise/drop
-@@ -16,7 +16,7 @@ ts_check_prog "sleep"
- ts_cd "$TS_OUTDIR"
-
- FILE="ddtest"
--BS=4096
-+BS=65536
- COUNT=8
-
- FILE_FS="$("$TS_CMD_FINDMNT" -nr -o FSTYPE -T "$PWD")"
diff --git a/sys-apps/util-linux/files/util-linux-2.39.3-CVE-2024-28085.patch b/sys-apps/util-linux/files/util-linux-2.39.3-CVE-2024-28085.patch
deleted file mode 100644
index 99092c05aa7e..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.39.3-CVE-2024-28085.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://bugs.gentoo.org/927980
-https://people.rit.edu/sjf5462/6831711781/wall_2_27_2024.txt
-https://github.com/util-linux/util-linux/commit/404b0781f52f7c045ca811b2dceec526408ac253
-
-From 404b0781f52f7c045ca811b2dceec526408ac253 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Thu, 21 Mar 2024 11:16:20 +0100
-Subject: [PATCH] wall: fix escape sequence Injection [CVE-2024-28085]
-
-Let's use for all cases the same output function.
-
-Reported-by: Skyler Ferrante <sjf5462@rit.edu>
-Signed-off-by: Karel Zak <kzak@redhat.com>
---- a/term-utils/wall.c
-+++ b/term-utils/wall.c
-@@ -368,7 +368,7 @@ static char *makemsg(char *fname, char **mvec, int mvecsz,
- int i;
-
- for (i = 0; i < mvecsz; i++) {
-- fputs(mvec[i], fs);
-+ fputs_careful(mvec[i], fs, '^', true, TERM_WIDTH);
- if (i < mvecsz - 1)
- fputc(' ', fs);
- }
-
diff --git a/sys-apps/util-linux/files/util-linux-2.39.3-libblkid-luks.patch b/sys-apps/util-linux/files/util-linux-2.39.3-libblkid-luks.patch
deleted file mode 100644
index 222243426d5e..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.39.3-libblkid-luks.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-https://bugs.gentoo.org/926950
-https://gitlab.com/lvmteam/lvm2/-/issues/11
-https://bugzilla.opensuse.org/show_bug.cgi?id=1213227
-https://github.com/util-linux/util-linux/pull/2373
-https://github.com/util-linux/util-linux/commit/93ba7961779789217a1f814ce3110ff8c040c8c3
-
-From 93ba7961779789217a1f814ce3110ff8c040c8c3 Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fvogt@suse.de>
-Date: Wed, 12 Jul 2023 15:48:27 +0200
-Subject: [PATCH] Revert "libblkid: try LUKS2 first when probing"
-
-mdadm superblocks before 1.1 are placed at the end of the device, which
-means that the data contained inside the array starts at offset 0. For
-LUKS inside MD, blkid falsely detects this as plain LUKS instead of a
-linux_raid_member. This causes e.g. dracut to not assemble the array
-during boot and system startup fails.
-
-This reverts commit b8889c0a214aeb3dd47bf1ab280fe5534b64d2aa.
---- a/libblkid/src/superblocks/superblocks.c
-+++ b/libblkid/src/superblocks/superblocks.c
-@@ -94,11 +94,6 @@ static int blkid_probe_set_usage(blkid_probe pr, int usage);
- */
- static const struct blkid_idinfo *idinfos[] =
- {
-- /* In case the volume is locked with OPAL we are going to get
-- * an I/O error when reading past the LUKS header, so try it
-- * first. */
-- &luks_idinfo,
--
- /* RAIDs */
- &linuxraid_idinfo,
- &ddfraid_idinfo,
-@@ -124,6 +119,7 @@ static const struct blkid_idinfo *idinfos[] =
- &snapcow_idinfo,
- &verity_hash_idinfo,
- &integrity_idinfo,
-+ &luks_idinfo,
- &vmfs_volume_idinfo,
- &ubi_idinfo,
- &vdo_idinfo,
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/files/
@ 2025-01-22 7:33 Sam James
0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2025-01-22 7:33 UTC (permalink / raw
To: gentoo-commits
commit: a7fc4432516e9f87d57a2abfb8e1474b4893ecaf
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 22 07:31:54 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan 22 07:31:54 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7fc4432
sys-apps/util-linux: drop upstreamed meson patch
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/util-linux-9999-meson-disabler.patch | 405 ---------------------
1 file changed, 405 deletions(-)
diff --git a/sys-apps/util-linux/files/util-linux-9999-meson-disabler.patch b/sys-apps/util-linux/files/util-linux-9999-meson-disabler.patch
deleted file mode 100644
index 956199a4dc32..000000000000
--- a/sys-apps/util-linux/files/util-linux-9999-meson-disabler.patch
+++ /dev/null
@@ -1,405 +0,0 @@
-https://github.com/util-linux/util-linux/pull/3351
-
-From 528dbe18854fb16dba41af620ee2ca295936a550 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Wed, 8 Jan 2025 06:49:40 +0000
-Subject: [PATCH] meson: add missing `is_disabler` checks
-
-Noticed this when looking at why the `check` target isn't created
-with `-Dauto_features=disabled`. This doesn't fix that but it does
-fix a bunch of issues I noticed along the way after a hint from Eli Schwartz.
----
- meson.build | 133 +++++++++++++++++++++++++++++++++++++---------------
- 1 file changed, 95 insertions(+), 38 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 462ceaae224..b87362c757c 100644
---- a/meson.build
-+++ b/meson.build
-@@ -2026,7 +2026,7 @@ if opt and not is_disabler(exe)
- endif
-
- opt = not get_option('build-switch_root').disabled()
--if opt and not have_dirfd and not have_ddfd
-+if opt and not have_dirfd and not have_ddfd
- error('neither dirfd nor ddfd are available')
- endif
- exe = executable(
-@@ -2520,7 +2520,7 @@ exe4 = executable(
- install_dir : usrsbin_exec_dir,
- install : opt,
- build_by_default : opt)
--if opt
-+if opt and not is_disabler(exe)
- exes += [exe, exe2, exe3, exe4]
- manadocs += ['disk-utils/addpart.8.adoc',
- 'disk-utils/delpart.8.adoc',
-@@ -2568,7 +2568,7 @@ exe4 = executable(
- install : opt,
- build_by_default : opt)
-
--if opt
-+if opt and not is_disabler(exe)
- exes += [exe, exe2, exe3, exe4]
- endif
-
-@@ -2651,7 +2651,7 @@ exe = executable(
- install_dir : sbindir,
- install : opt,
- build_by_default : opt)
--if opt
-+if opt and not is_disabler(exe)
- exes += exe
- manadocs += ['term-utils/agetty.8.adoc']
- endif
-@@ -2666,7 +2666,7 @@ exe = executable(
- install_dir : usrbin_exec_dir,
- install : opt,
- build_by_default : opt)
--if opt
-+if opt and not is_disabler(exe)
- exes += exe
- manadocs += ['term-utils/setterm.1.adoc']
- bashcompletions += ['setterm']
-@@ -2681,7 +2681,7 @@ exe = executable(
- install_dir : usrbin_exec_dir,
- install : opt,
- build_by_default : opt)
--if opt
-+if opt and not is_disabler(exe)
- exes += exe
- manadocs += ['term-utils/mesg.1.adoc']
- bashcompletions += ['mesg']
-@@ -2705,7 +2705,7 @@ exe = executable(
- install_mode : tty_install_mode,
- install : opt,
- build_by_default : opt)
--if opt
-+if opt and not is_disabler(exe)
- exes += exe
- manadocs += ['term-utils/wall.1.adoc']
- bashcompletions += ['wall']
-@@ -2725,7 +2725,7 @@ exe = executable(
- install_mode : tty_install_mode,
- install : opt,
- build_by_default : opt)
--if opt
-+if opt and not is_disabler(exe)
- exes += exe
- manadocs += ['term-utils/write.1.adoc']
- bashcompletions += ['write']
-@@ -3384,7 +3384,9 @@ exe = executable(
- include_directories : dir_include,
- link_with : lib_common,
- build_by_default: program_tests)
--exes += exe
-+if not is_disabler(exe)
-+ exes += exe
-+endif
-
- exe = executable(
- 'test_blkdev',
-@@ -3393,7 +3395,9 @@ exe = executable(
- include_directories : dir_include,
- link_with : lib_common,
- build_by_default: program_tests)
--exes += exe
-+if not is_disabler(exe)
-+ exes += exe
-+endif
-
- exe = executable(
- 'test_ismounted',
-@@ -3402,7 +3406,9 @@ exe = executable(
- include_directories : dir_include,
- link_with : lib_common,
- build_by_default: program_tests)
--exes += exe
-+if not is_disabler(exe)
-+ exes += exe
-+endif
-
- exe = executable(
- 'test_mangle',
-@@ -3410,7 +3416,9 @@ exe = executable(
- c_args : ['-DTEST_PROGRAM_MANGLE'],
- include_directories : dir_include,
- build_by_default: program_tests)
--exes += exe
-+if not is_disabler(exe)
-+ exes += exe
-+endif
-
- exe = executable(
- 'test_strutils',
-@@ -3418,7 +3426,9 @@ exe = executable(
- c_args : ['-DTEST_PROGRAM_STRUTILS'],
- include_directories : dir_include,
- build_by_default: program_tests)
--exes += exe
-+if not is_disabler(exe)
-+ exes += exe
-+endif
-
- exe = executable(
- 'test_colors',
-@@ -3428,7 +3438,9 @@ exe = executable(
- include_directories : dir_include,
- link_with : [lib_common, lib_tcolors],
- build_by_default: program_tests)
--exes += exe
-+if not is_disabler(exe)
-+ exes += exe
-+endif
-
- exe = executable(
- 'test_randutils',
-@@ -3436,7 +3448,9 @@ exe = executable(
- c_args : ['-DTEST_PROGRAM_RANDUTILS'],
- include_directories : dir_include,
- build_by_default: program_tests)
--exes += exe
-+if not is_disabler(exe)
-+ exes += exe
-+endif
-
- if conf.get('HAVE_OPENAT').to_string() == '1' \
- and conf.get('HAVE_DIRFD').to_string() == '1'
-@@ -3447,7 +3461,9 @@ if conf.get('HAVE_OPENAT').to_string() == '1' \
- include_directories : dir_include,
- link_with : lib_common,
- build_by_default: program_tests)
-- exes += exe
-+ if not is_disabler(exe)
-+ exes += exe
-+ endif
-
- exe = executable(
- 'test_path',
-@@ -3458,7 +3474,9 @@ if conf.get('HAVE_OPENAT').to_string() == '1' \
- include_directories : dir_include,
- link_with : lib_common,
- build_by_default: program_tests)
-- exes += exe
-+ if not is_disabler(exe)
-+ exes += exe
-+ endif
- endif
-
- if have_pty
-@@ -3473,7 +3491,9 @@ if have_pty
- realtime_libs,
- lib_util],
- build_by_default: program_tests)
-- exes += exe
-+ if not is_disabler(exe)
-+ exes += exe
-+ endif
- endif
-
- if LINUX
-@@ -3483,7 +3503,9 @@ if LINUX
- c_args : ['-DTEST_PROGRAM_CPUSET'],
- include_directories : dir_include,
- build_by_default: program_tests)
-- exes += exe
-+ if not is_disabler(exe)
-+ exes += exe
-+ endif
- endif
-
- exe = executable(
-@@ -3497,7 +3519,9 @@ exe = executable(
- c_args : ['-DTEST_PROGRAM_SYSFS'],
- include_directories : dir_include,
- build_by_default: program_tests)
--exes += exe
-+if not is_disabler(exe)
-+ exes += exe
-+endif
-
- exe = executable(
- 'test_pager',
-@@ -3505,7 +3529,9 @@ exe = executable(
- c_args : ['-DTEST_PROGRAM_PAGER'],
- include_directories : dir_include,
- build_by_default: program_tests)
--exes += exe
-+if not is_disabler(exe)
-+ exes += exe
-+endif
-
- exe = executable(
- 'test_linux_version',
-@@ -3513,7 +3539,9 @@ exe = executable(
- c_args : ['-DTEST_PROGRAM_LINUXVERSION'],
- include_directories : dir_include,
- build_by_default: program_tests)
--exes += exe
-+if not is_disabler(exe)
-+ exes += exe
-+endif
-
- exe = executable(
- 'test_fileutils',
-@@ -3521,7 +3549,9 @@ exe = executable(
- c_args : ['-DTEST_PROGRAM_FILEUTILS'],
- include_directories : dir_include,
- build_by_default: program_tests)
--exes += exe
-+if not is_disabler(exe)
-+ exes += exe
-+endif
-
- exe = executable(
- 'test_canonicalize',
-@@ -3529,7 +3559,9 @@ exe = executable(
- c_args : ['-DTEST_PROGRAM_CANONICALIZE'],
- include_directories : dir_include,
- build_by_default: program_tests)
--exes += exe
-+if not is_disabler(exe)
-+ exes += exe
-+endif
-
- exe = executable(
- 'test_timeutils',
-@@ -3538,7 +3570,9 @@ exe = executable(
- c_args : ['-DTEST_PROGRAM_TIMEUTILS'],
- include_directories : dir_include,
- build_by_default: program_tests)
--exes += exe
-+if not is_disabler(exe)
-+ exes += exe
-+endif
-
- exe = executable(
- 'test_pwdutils',
-@@ -3547,7 +3581,9 @@ exe = executable(
- include_directories : dir_include,
- link_with : lib_common,
- build_by_default: program_tests)
--exes += exe
-+if not is_disabler(exe)
-+ exes += exe
-+endif
-
- exe = executable(
- 'test_logindefs',
-@@ -3556,8 +3592,9 @@ exe = executable(
- include_directories : dir_include,
- link_with : [lib_common, logindefs_c],
- build_by_default: program_tests)
--exes += exe
--
-+if not is_disabler(exe)
-+ exes += exe
-+endif
-
- ############################################################
-
-@@ -3699,14 +3736,18 @@ exe = executable(
- include_directories : includes,
- link_with : lib_common,
- build_by_default: program_tests)
--exes += exe
-+if not is_disabler(exe)
-+ exes += exe
-+endif
-
- exe = executable(
- 'test_byteswap',
- 'tests/helpers/test_byteswap.c',
- include_directories : includes,
- build_by_default: program_tests)
--exes += exe
-+if not is_disabler(exe)
-+ exes += exe
-+endif
-
- exe = executable(
- 'test_md5',
-@@ -3714,7 +3755,9 @@ exe = executable(
- md5_c,
- include_directories : includes,
- build_by_default: program_tests)
--exes += exe
-+if not is_disabler(exe)
-+ exes += exe
-+endif
-
- exe = executable(
- 'test_sha1',
-@@ -3722,28 +3765,36 @@ exe = executable(
- sha1_c,
- include_directories : includes,
- build_by_default: program_tests)
--exes += exe
-+if not is_disabler(exe)
-+ exes += exe
-+endif
-
- exe = executable(
- 'test_pathnames',
- 'tests/helpers/test_pathnames.c',
- include_directories : includes,
- build_by_default: program_tests)
--exes += exe
-+if not is_disabler(exe)
-+ exes += exe
-+endif
-
- exe = executable(
- 'test_strerror',
- 'tests/helpers/test_strerror.c',
- include_directories : includes,
- build_by_default: program_tests)
--exes += exe
-+if not is_disabler(exe)
-+ exes += exe
-+endif
-
- exe = executable(
- 'test_sysinfo',
- 'tests/helpers/test_sysinfo.c',
- include_directories : includes,
- build_by_default: program_tests)
--exes += exe
-+if not is_disabler(exe)
-+ exes += exe
-+endif
-
- exe = executable(
- 'test_sigreceive',
-@@ -3751,7 +3802,9 @@ exe = executable(
- include_directories : includes,
- link_with : lib_common,
- build_by_default: program_tests)
--exes += exe
-+if not is_disabler(exe)
-+ exes += exe
-+endif
-
- exe = executable(
- 'test_sigstate',
-@@ -3759,14 +3812,18 @@ exe = executable(
- include_directories : includes,
- link_with : lib_common,
- build_by_default: program_tests)
--exes += exe
-+if not is_disabler(exe)
-+ exes += exe
-+endif
-
- exe = executable(
- 'test_tiocsti',
- 'tests/helpers/test_tiocsti.c',
- include_directories : includes,
- build_by_default: program_tests)
--exes += exe
-+if not is_disabler(exe)
-+ exes += exe
-+endif
-
- exe = executable(
- 'test_uuid_namespace',
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2025-01-22 7:33 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-01-22 7:33 [gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-12-23 20:01 Conrad Kostecki
2024-04-04 1:17 Sam James
2023-12-31 2:38 Conrad Kostecki
2023-04-07 20:06 Conrad Kostecki
2021-04-19 21:51 Lars Wendler
2019-02-16 21:05 Lars Wendler
2019-01-21 11:38 Lars Wendler
2017-10-20 7:45 Patrice Clement
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox