summaryrefslogtreecommitdiffstats
path: root/debian/patches/upstream/0003-uuidd-fix-random-UUIDs.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-07 14:30:36 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-07 14:30:36 +0000
commitd731b1222e17e0081e5e4e1fc9603b67ba0b72e3 (patch)
treee0426bca9e6173cf00b0ee2573aa2c0cf96b8a25 /debian/patches/upstream/0003-uuidd-fix-random-UUIDs.patch
parentAdding upstream version 2.38.1. (diff)
downloadutil-linux-d731b1222e17e0081e5e4e1fc9603b67ba0b72e3.tar.xz
util-linux-d731b1222e17e0081e5e4e1fc9603b67ba0b72e3.zip
Adding debian version 2.38.1-5.debian/2.38.1-5debian
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/upstream/0003-uuidd-fix-random-UUIDs.patch')
-rw-r--r--debian/patches/upstream/0003-uuidd-fix-random-UUIDs.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/debian/patches/upstream/0003-uuidd-fix-random-UUIDs.patch b/debian/patches/upstream/0003-uuidd-fix-random-UUIDs.patch
new file mode 100644
index 0000000..a94e967
--- /dev/null
+++ b/debian/patches/upstream/0003-uuidd-fix-random-UUIDs.patch
@@ -0,0 +1,28 @@
+From: Karel Zak <kzak@redhat.com>
+Date: Mon, 10 Oct 2022 09:37:51 +0200
+Subject: [PATCH 03/24] uuidd: fix random UUIDs
+
+Commit f27876f introduces copy & past bug and replaces
+__uuid_generate_random() with __uuid_generate_time().
+
+Fixes: https://github.com/util-linux/util-linux/issues/1837
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ misc-utils/uuidd.c | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/misc-utils/uuidd.c b/misc-utils/uuidd.c
+index b25439d..18fbbb6 100644
+--- a/misc-utils/uuidd.c
++++ b/misc-utils/uuidd.c
+@@ -519,9 +519,7 @@ static void server_loop(const char *socket_path, const char *pidfile_path,
+ break;
+ case UUIDD_OP_RANDOM_UUID:
+ num = 1;
+- ret = __uuid_generate_time_cont(uu, &num, uuidd_cxt->cont_clock_offset);
+- if (ret < 0 && !uuidd_cxt->quiet)
+- warnx(_("failed to open/lock clock counter"));
++ __uuid_generate_random(uu, &num);
+ if (uuidd_cxt->debug) {
+ uuid_unparse(uu, str);
+ fprintf(stderr, _("Generated random UUID: %s\n"), str);