Hello community, here is the log from the commit of package systemd for openSUSE:Factory checked in at 2013-02-02 19:36:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/systemd (Old) and /work/SRC/openSUSE:Factory/.systemd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "systemd", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/systemd/systemd.changes 2013-01-30 11:20:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.systemd.new/systemd.changes 2013-02-02 19:36:33.000000000 +0100 @@ -1,0 +2,8 @@ +Fri Feb 1 16:27:45 UTC 2013 - [email protected] + +- Add cryptsetup-accept-read-only.patch: accept "read-only" in + addition to "readonly" in crypttab +- Update parse-multiline-env-file.patch to correctly handle + commented lines (bnc#793411) + +------------------------------------------------------------------- New: ---- cryptsetup-accept-read-only.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemd.spec ++++++ --- /var/tmp/diff_new_pack.WYE8sd/_old 2013-02-02 19:36:35.000000000 +0100 +++ /var/tmp/diff_new_pack.WYE8sd/_new 2013-02-02 19:36:35.000000000 +0100 @@ -257,6 +257,8 @@ Patch124: systemd-fix-merge-ignore-dependencies.patch # PATCH-FIX-UPSTREAM journalctl-require-argument-for-priority Patch125: journalctl-require-argument-for-priority +# PATCH-FIX-UPSTREAM cryptsetup-accept-read-only.patch [email protected] -- Accept read-only as well as readonly as parameters for crypttab +Patch126: cryptsetup-accept-read-only.patch # udev patches # PATCH-FIX-OPENSUSE 1001-Reinstate-TIMEOUT-handling.patch @@ -565,6 +567,7 @@ %patch123 -p1 %patch124 -p1 %patch125 -p1 +%patch126 -p1 %build autoreconf -fiv ++++++ cryptsetup-accept-read-only.patch ++++++ >From 18cf1a1be5ae6985f211ec6f02504506da36b223 Mon Sep 17 00:00:00 2001 From: Michal Schmidt <[email protected]> Date: Thu, 31 Jan 2013 11:03:09 +0100 Subject: [PATCH] cryptsetup: accept both "read-only" and "readonly" spellings Mukund Sivaraman pointed out that cryptsetup(5) mentions the "read-only" option, while the code understands "readonly". We could just fix the manpage, but for consistency in naming of multi-word options it would be prettier to have "read-only". So let's accept both spellings. BZ: https://bugzilla.redhat.com/show_bug.cgi?id=903463 --- man/crypttab.xml | 2 +- src/cryptsetup/cryptsetup.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/man/crypttab.xml b/man/crypttab.xml index 2379fc0..f976bda 100644 --- a/man/crypttab.xml +++ b/man/crypttab.xml @@ -182,7 +182,7 @@ </varlistentry> <varlistentry> - <term><varname>read-only</varname></term> + <term><varname>read-only</varname></term><term><varname>readonly</varname></term> <listitem><para>Set up the encrypted block device in read-only diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c index f332843..a8cdf10 100644 --- a/src/cryptsetup/cryptsetup.c +++ b/src/cryptsetup/cryptsetup.c @@ -111,7 +111,7 @@ static int parse_one_option(const char *option) { return 0; } - } else if (streq(option, "readonly")) + } else if (streq(option, "readonly") || streq(option, "read-only")) opt_readonly = true; else if (streq(option, "verify")) opt_verify = true; -- 1.7.10.4 ++++++ parse-multiline-env-file.patch ++++++ --- /var/tmp/diff_new_pack.WYE8sd/_old 2013-02-02 19:36:35.000000000 +0100 +++ /var/tmp/diff_new_pack.WYE8sd/_new 2013-02-02 19:36:35.000000000 +0100 @@ -41,7 +41,7 @@ =================================================================== --- systemd-195.orig/src/shared/util.c +++ systemd-195/src/shared/util.c -@@ -876,33 +876,55 @@ fail: +@@ -876,69 +876,89 @@ fail: return r; } @@ -101,30 +101,38 @@ + b = strappend(c, l); + if (!b) + return log_oom(); -+ + +- if (!*p) +- continue; + free(c); + c = b; + } + + p = strstrip(c ? c : l); - if (!*p) - continue; -@@ -910,35 +932,27 @@ int load_env_file( - if (strchr(COMMENTS, *p)) +- if (strchr(COMMENTS, *p)) ++ if (!*p) { ++ free(c); ++ c = NULL; continue; ++ } - if (!(u = normalize_env_assignment(p))) { - r = log_oom(); - goto finish; -- } ++ if (strchr(COMMENTS, *p)) { ++ free(c); ++ c = NULL; ++ continue; + } + + u = normalize_env_assignment(p); + if (!u) + return log_oom(); + + free(c); + c = NULL; - ++ t = strv_append(m, u); free(u); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
