diff --git a/sudo-parse_boottime_properly.patch b/sudo-parse_boottime_properly.patch new file mode 100644 index 0000000..6867074 --- /dev/null +++ b/sudo-parse_boottime_properly.patch @@ -0,0 +1,13 @@ +From https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=762465 + +--- a/plugins/sudoers/boottime.c ++++ b/plugins/sudoers/boottime.c +@@ -80,6 +80,8 @@ + if (fp != NULL) { + while ((len = getline(&line, &linesize, fp)) != -1) { + if (strncmp(line, "btime ", 6) == 0) { ++ if (line[len - 1] == '\n') ++ line[len - 1] = '\0'; + long long llval = strtonum(line + 6, 1, LLONG_MAX, NULL); + if (llval > 0) { + tv->tv_sec = (time_t)llval; diff --git a/sudo.changes b/sudo.changes index b0ba5fd..19e9b01 100644 --- a/sudo.changes +++ b/sudo.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Dec 17 09:52:47 UTC 2014 - vcizek@suse.com + +- correctly parse /proc/stat for boottime (bnc#899252) + * added sudo-parse_boottime_properly.patch from Debian + ------------------------------------------------------------------- Thu Nov 6 12:35:03 UTC 2014 - fstrba@suse.com diff --git a/sudo.spec b/sudo.spec index dbb46d0..25f1c3e 100644 --- a/sudo.spec +++ b/sudo.spec @@ -31,6 +31,7 @@ Source4: README_313276.test Patch0: sudoers2ldif-env.patch # PATCH-OPENSUSE: the "SUSE" branding of the default sudo config Patch1: sudo-sudoers.patch +Patch2: sudo-parse_boottime_properly.patch BuildRequires: audit-devel BuildRequires: groff BuildRequires: libselinux-devel @@ -70,6 +71,7 @@ Tests for fate#313276 %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %ifarch s390 s390x %sparc