diff -Nru util-linux-2.31.1/debian/changelog util-linux-2.31.1/debian/changelog --- util-linux-2.31.1/debian/changelog 2020-01-08 18:31:23.000000000 +0000 +++ util-linux-2.31.1/debian/changelog 2020-03-05 17:23:23.000000000 +0000 @@ -1,3 +1,10 @@ +util-linux (2.31.1-0.4ubuntu3.6) bionic; urgency=medium + + * d/p/hwclock_fix_audit_status.patch: reverse hwclock exit status + so to match audit_log_user_message(3) semantics. (LP: #1865504) + + -- Joy Latten Thu, 05 Mar 2020 11:23:23 -0600 + util-linux (2.31.1-0.4ubuntu3.5) bionic; urgency=medium * d/p/libblkid-xfs-log-check-for-reg-xfs-on-more-sectors.patch: diff -Nru util-linux-2.31.1/debian/patches/hwclock_fix_audit_status.patch util-linux-2.31.1/debian/patches/hwclock_fix_audit_status.patch --- util-linux-2.31.1/debian/patches/hwclock_fix_audit_status.patch 1970-01-01 00:00:00.000000000 +0000 +++ util-linux-2.31.1/debian/patches/hwclock_fix_audit_status.patch 2020-03-05 17:23:23.000000000 +0000 @@ -0,0 +1,30 @@ +Origin: upstream, https://github.com/karelzak/util-linux/commit/189edf1fe501ea39b35911337eab1740888fae7a +Bug: https://github.com/karelzak/util-linux/issues/966 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1865504 +Bug-Debian: https://bugs.debian.org/953065 +Author: Karel Zak +Date: Thu Feb 27 14:04:55 2020 +0100 +Description: hwclock reports incorrect status in audit message + + hwclock: fix audit exit status + + According to audit_log_user_message(3) result 1 is "success" and 0 is + "failed", we use standard EXIT_{SUCCESS,FAILURE} macros with reverse + status. + + Addresses: https://github.com/karelzak/util-linux/issues/966 + Signed-off-by: Karel Zak + +Index: util-linux-2.31.1/sys-utils/hwclock.c +=================================================================== +--- util-linux-2.31.1.orig/sys-utils/hwclock.c ++++ util-linux-2.31.1/sys-utils/hwclock.c +@@ -1367,7 +1367,7 @@ hwclock_exit(const struct hwclock_contro + if (ctl->hwaudit_on && !ctl->testing) { + audit_log_user_message(hwaudit_fd, AUDIT_USYS_CONFIG, + "op=change-system-time", NULL, NULL, NULL, +- status); ++ status == EXIT_SUCCESS ? 1 : 0); + } + close(hwaudit_fd); + #endif diff -Nru util-linux-2.31.1/debian/patches/series util-linux-2.31.1/debian/patches/series --- util-linux-2.31.1/debian/patches/series 2020-01-08 18:29:40.000000000 +0000 +++ util-linux-2.31.1/debian/patches/series 2020-03-05 17:23:23.000000000 +0000 @@ -17,3 +17,4 @@ support_alternate_partition_sep.patch prevent-fstrim-inside-container.patch libblkid-xfs-log-check-for-reg-xfs-on-more-sectors.patch +hwclock_fix_audit_status.patch