Hello community, here is the log from the commit of package systemd for openSUSE:Factory checked in at 2018-10-02 19:42:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/systemd (Old) and /work/SRC/openSUSE:Factory/.systemd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "systemd" Tue Oct 2 19:42:38 2018 rev:286 rq:638971 version:237 Changes: -------- --- /work/SRC/openSUSE:Factory/systemd/systemd-mini.changes 2018-09-18 11:39:45.988141536 +0200 +++ /work/SRC/openSUSE:Factory/.systemd.new/systemd-mini.changes 2018-10-02 19:42:40.150122101 +0200 @@ -1,0 +2,13 @@ +Fri Sep 28 06:16:06 UTC 2018 - [email protected] + +- Import commit a67b516d49115a5be0f2ac27a2874cee6c59a7ae + + f8457adf9d emergency: make sure console password agents don't interfere with the emergency shell + b8bbb50634 man: document that 'nofail' also has an effect on ordering + a5410b2229 journald: take leading spaces into account in syslog_parse_identifier + b793c312c7 journal: do not remove multiple spaces after identifier in syslog message + f9595f0481 syslog: fix segfault in syslog_parse_priority() + d464f06934 journal: fix syslog_parse_identifier() + e70422883a socket-util: attempt SO_RCVBUFFORCE/SO_SNDBUFFORCE only if SO_RCVBUF/SO_SNDBUF fails (bsc#991901) + +------------------------------------------------------------------- systemd.changes: same change Old: ---- systemd-v237+suse.85.gcc55f1ea9.tar.xz New: ---- systemd-v237+suse.93.ga67b516d4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemd-mini.spec ++++++ --- /var/tmp/diff_new_pack.tAGCR0/_old 2018-10-02 19:42:41.018121225 +0200 +++ /var/tmp/diff_new_pack.tAGCR0/_new 2018-10-02 19:42:41.022121221 +0200 @@ -26,7 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.85.gcc55f1ea9 +%define suse_version +suse.93.ga67b516d4 %bcond_with gnuefi %if 0%{?bootstrap} ++++++ systemd.spec ++++++ --- /var/tmp/diff_new_pack.tAGCR0/_old 2018-10-02 19:42:41.050121192 +0200 +++ /var/tmp/diff_new_pack.tAGCR0/_new 2018-10-02 19:42:41.050121192 +0200 @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.85.gcc55f1ea9 +%define suse_version +suse.93.ga67b516d4 %bcond_with gnuefi %if 0%{?bootstrap} ++++++ systemd-v237+suse.85.gcc55f1ea9.tar.xz -> systemd-v237+suse.93.ga67b516d4.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-v237+suse.85.gcc55f1ea9/man/systemd.mount.xml new/systemd-v237+suse.93.ga67b516d4/man/systemd.mount.xml --- old/systemd-v237+suse.85.gcc55f1ea9/man/systemd.mount.xml 2018-09-14 09:09:22.000000000 +0200 +++ new/systemd-v237+suse.93.ga67b516d4/man/systemd.mount.xml 2018-09-28 08:16:18.000000000 +0200 @@ -392,12 +392,10 @@ <varlistentry> <term><option>nofail</option></term> - <listitem><para>With <option>nofail</option>, this mount will - be only wanted, not required, by - <filename>local-fs.target</filename> or - <filename>remote-fs.target</filename>. This means that the - boot will continue even if this mount point is not mounted - successfully.</para> + <listitem><para>With <option>nofail</option>, this mount will be only wanted, not required, by + <filename>local-fs.target</filename> or <filename>remote-fs.target</filename>. Moreover the mount unit is not + ordered before these target units. This means that the boot will continue without waiting for the mount unit + and regardless whether the mount point can be mounted successfully.</para> </listitem> </varlistentry> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-v237+suse.85.gcc55f1ea9/src/basic/socket-util.c new/systemd-v237+suse.93.ga67b516d4/src/basic/socket-util.c --- old/systemd-v237+suse.85.gcc55f1ea9/src/basic/socket-util.c 2018-09-14 09:09:22.000000000 +0200 +++ new/systemd-v237+suse.93.ga67b516d4/src/basic/socket-util.c 2018-09-28 08:16:18.000000000 +0200 @@ -859,8 +859,8 @@ /* If we have the privileges we will ignore the kernel limit. */ value = (int) n; - if (setsockopt(fd, SOL_SOCKET, SO_SNDBUFFORCE, &value, sizeof(value)) < 0) - if (setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &value, sizeof(value)) < 0) + if (setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &value, sizeof(value)) < 0) + if (setsockopt(fd, SOL_SOCKET, SO_SNDBUFFORCE, &value, sizeof(value)) < 0) return -errno; return 1; @@ -877,8 +877,8 @@ /* If we have the privileges we will ignore the kernel limit. */ value = (int) n; - if (setsockopt(fd, SOL_SOCKET, SO_RCVBUFFORCE, &value, sizeof(value)) < 0) - if (setsockopt(fd, SOL_SOCKET, SO_RCVBUF, &value, sizeof(value)) < 0) + if (setsockopt(fd, SOL_SOCKET, SO_RCVBUF, &value, sizeof(value)) < 0) + if (setsockopt(fd, SOL_SOCKET, SO_RCVBUFFORCE, &value, sizeof(value)) < 0) return -errno; return 1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-v237+suse.85.gcc55f1ea9/src/basic/syslog-util.c new/systemd-v237+suse.93.ga67b516d4/src/basic/syslog-util.c --- old/systemd-v237+suse.85.gcc55f1ea9/src/basic/syslog-util.c 2018-09-14 09:09:22.000000000 +0200 +++ new/systemd-v237+suse.93.ga67b516d4/src/basic/syslog-util.c 2018-09-28 08:16:18.000000000 +0200 @@ -28,7 +28,8 @@ int syslog_parse_priority(const char **p, int *priority, bool with_facility) { int a = 0, b = 0, c = 0; - int k; + const char *end; + size_t k; assert(p); assert(*p); @@ -37,21 +38,22 @@ if ((*p)[0] != '<') return 0; - if (!strchr(*p, '>')) + end = strchr(*p, '>'); + if (!end) return 0; - if ((*p)[2] == '>') { + k = end - *p; + assert(k > 0); + + if (k == 2) c = undecchar((*p)[1]); - k = 3; - } else if ((*p)[3] == '>') { + else if (k == 3) { b = undecchar((*p)[1]); c = undecchar((*p)[2]); - k = 4; - } else if ((*p)[4] == '>') { + } else if (k == 4) { a = undecchar((*p)[1]); b = undecchar((*p)[2]); c = undecchar((*p)[3]); - k = 5; } else return 0; @@ -64,7 +66,7 @@ else *priority = (*priority & LOG_FACMASK) | c; - *p += k; + *p += k + 1; return 1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-v237+suse.85.gcc55f1ea9/src/journal/journald-syslog.c new/systemd-v237+suse.93.ga67b516d4/src/journal/journald-syslog.c --- old/systemd-v237+suse.85.gcc55f1ea9/src/journal/journald-syslog.c 2018-09-14 09:09:22.000000000 +0200 +++ new/systemd-v237+suse.93.ga67b516d4/src/journal/journald-syslog.c 2018-09-28 08:16:18.000000000 +0200 @@ -212,7 +212,7 @@ e = l; l--; - if (p[l-1] == ']') { + if (l > 0 && p[l-1] == ']') { size_t k = l-1; for (;;) { @@ -237,10 +237,13 @@ if (t) *identifier = t; - if (strchr(WHITESPACE, p[e])) + /* Single space is used as separator */ + if (p[e] != '\0' && strchr(WHITESPACE, p[e])) e++; + + l = (p - *buf) + e; *buf = p + e; - return e; + return l; } static void syslog_skip_date(char **buf) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-v237+suse.85.gcc55f1ea9/src/journal/test-journal-syslog.c new/systemd-v237+suse.93.ga67b516d4/src/journal/test-journal-syslog.c --- old/systemd-v237+suse.85.gcc55f1ea9/src/journal/test-journal-syslog.c 2018-09-14 09:09:22.000000000 +0200 +++ new/systemd-v237+suse.93.ga67b516d4/src/journal/test-journal-syslog.c 2018-09-28 08:16:18.000000000 +0200 @@ -22,9 +22,10 @@ #include "journald-syslog.h" #include "macro.h" #include "string-util.h" +#include "syslog-util.h" -static void test_syslog_parse_identifier(const char* str, - const char *ident, const char*pid, int ret) { +static void test_syslog_parse_identifier(const char *str, + const char *ident, const char *pid, const char *rest, int ret) { const char *buf = str; _cleanup_free_ char *ident2 = NULL, *pid2 = NULL; int ret2; @@ -34,12 +35,43 @@ assert_se(ret == ret2); assert_se(ident == ident2 || streq_ptr(ident, ident2)); assert_se(pid == pid2 || streq_ptr(pid, pid2)); + assert_se(streq(buf, rest)); +} + +static void test_syslog_parse_priority(const char *str, int priority, int ret) { + const char *buf = str; + int priority2, ret2; + + ret2 = syslog_parse_priority(&buf, &priority2, false); + + assert_se(ret == ret2); + if (ret2 == 1) + assert_se(priority == priority2); } int main(void) { - test_syslog_parse_identifier("pidu[111]: xxx", "pidu", "111", 11); - test_syslog_parse_identifier("pidu: xxx", "pidu", NULL, 6); - test_syslog_parse_identifier("pidu xxx", NULL, NULL, 0); + test_syslog_parse_identifier("pidu[111]: xxx", "pidu", "111", "xxx", 11); + test_syslog_parse_identifier("pidu: xxx", "pidu", NULL, "xxx", 6); + test_syslog_parse_identifier("pidu: xxx", "pidu", NULL, " xxx", 6); + test_syslog_parse_identifier("pidu xxx", NULL, NULL, "pidu xxx", 0); + test_syslog_parse_identifier(" pidu xxx", NULL, NULL, " pidu xxx", 0); + test_syslog_parse_identifier("", NULL, NULL, "", 0); + test_syslog_parse_identifier(" ", NULL, NULL, " ", 0); + test_syslog_parse_identifier(":", "", NULL, "", 1); + test_syslog_parse_identifier(": ", "", NULL, " ", 2); + test_syslog_parse_identifier(" :", "", NULL, "", 2); + test_syslog_parse_identifier(" pidu:", "pidu", NULL, "", 8); + test_syslog_parse_identifier("pidu:", "pidu", NULL, "", 5); + test_syslog_parse_identifier("pidu: ", "pidu", NULL, "", 6); + test_syslog_parse_identifier("pidu : ", NULL, NULL, "pidu : ", 0); + + test_syslog_parse_priority("<>", 0, 0); + test_syslog_parse_priority("<>aaa", 0, 0); + test_syslog_parse_priority("<aaaa>", 0, 0); + test_syslog_parse_priority("<aaaa>aaa", 0, 0); + test_syslog_parse_priority(" <aaaa>", 0, 0); + test_syslog_parse_priority(" <aaaa>aaa", 0, 0); + /* TODO: add test cases of valid priorities */ return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-v237+suse.85.gcc55f1ea9/units/systemd-ask-password-console.path new/systemd-v237+suse.93.ga67b516d4/units/systemd-ask-password-console.path --- old/systemd-v237+suse.85.gcc55f1ea9/units/systemd-ask-password-console.path 2018-09-14 09:09:22.000000000 +0200 +++ new/systemd-v237+suse.93.ga67b516d4/units/systemd-ask-password-console.path 2018-09-28 08:16:18.000000000 +0200 @@ -11,7 +11,7 @@ Description=Dispatch Password Requests to Console Directory Watch Documentation=man:systemd-ask-password-console.service(8) DefaultDependencies=no -Conflicts=shutdown.target +Conflicts=shutdown.target emergency.service After=plymouth-start.service Before=paths.target shutdown.target cryptsetup.target ConditionPathExists=!/run/plymouth/pid diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-v237+suse.85.gcc55f1ea9/units/systemd-ask-password-console.service.in new/systemd-v237+suse.93.ga67b516d4/units/systemd-ask-password-console.service.in --- old/systemd-v237+suse.85.gcc55f1ea9/units/systemd-ask-password-console.service.in 2018-09-14 09:09:22.000000000 +0200 +++ new/systemd-v237+suse.93.ga67b516d4/units/systemd-ask-password-console.service.in 2018-09-28 08:16:18.000000000 +0200 @@ -11,7 +11,7 @@ Description=Dispatch Password Requests to Console Documentation=man:systemd-ask-password-console.service(8) DefaultDependencies=no -Conflicts=shutdown.target +Conflicts=shutdown.target emergency.service After=plymouth-start.service systemd-vconsole-setup.service Before=shutdown.target ConditionPathExists=!/run/plymouth/pid diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-v237+suse.85.gcc55f1ea9/units/systemd-ask-password-wall.path new/systemd-v237+suse.93.ga67b516d4/units/systemd-ask-password-wall.path --- old/systemd-v237+suse.85.gcc55f1ea9/units/systemd-ask-password-wall.path 2018-09-14 09:09:22.000000000 +0200 +++ new/systemd-v237+suse.93.ga67b516d4/units/systemd-ask-password-wall.path 2018-09-28 08:16:18.000000000 +0200 @@ -11,7 +11,7 @@ Description=Forward Password Requests to Wall Directory Watch Documentation=man:systemd-ask-password-console.service(8) DefaultDependencies=no -Conflicts=shutdown.target +Conflicts=shutdown.target emergency.service Before=paths.target shutdown.target cryptsetup.target [Path]
