From 0eab21cb2b994df6fbe923a23cc968752df28f86 Mon Sep 17 00:00:00 2001
From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Jan 26 2019 16:51:43 +0000
Subject: Update to v241-rc1


---

diff --git a/0003-Ignore-failure-to-setup-private-dev.patch b/0003-Ignore-failure-to-setup-private-dev.patch
deleted file mode 100644
index 9ccb81c..0000000
--- a/0003-Ignore-failure-to-setup-private-dev.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From dbe7ff3240dd30240402632dfa9d95a71f425267 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Tue, 15 Jan 2019 10:34:10 +0100
-Subject: [PATCH] Ignore failure to setup private /dev
-
-This partially reverts 1beab8b0d0.
----
- src/core/namespace.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/core/namespace.c b/src/core/namespace.c
-index c2ca3e0334..6113b9a5ea 100644
---- a/src/core/namespace.c
-+++ b/src/core/namespace.c
-@@ -58,6 +58,7 @@ typedef struct MountEntry {
-         bool has_prefix:1;        /* Already is prefixed by the root dir? */
-         bool read_only:1;         /* Shall this mount point be read-only? */
-         bool applied:1;           /* Already applied */
-+        bool xxx:1;
-         char *path_malloc;        /* Use this instead of 'path_const' if we had to allocate memory */
-         const char *source_const; /* The source path, for bind mounts */
-         char *source_malloc;
-@@ -1413,7 +1414,10 @@ int setup_namespace(
-                                 }
- 
-                                 r = apply_mount(root, m);
--                                if (r < 0)
-+                                if (m->mode == PRIVATE_DEV && IN_SET(r, -EPERM, -EACCES)) {
-+                                        m->xxx = true;
-+                                        log_warning_errno(r, "Failed to prepare private /dev, ignoring: %m");
-+                                } else if (r < 0)
-                                         goto finish;
- 
-                                 m->applied = true;
-@@ -1433,6 +1437,8 @@ int setup_namespace(
- 
-                 /* Second round, flip the ro bits if necessary. */
-                 for (m = mounts; m < mounts + n_mounts; ++m) {
-+                        if (m->xxx)
-+                                continue;
-                         r = make_read_only(m, blacklist, proc_self_mountinfo);
-                         if (r < 0)
-                                 goto finish;
--- 
-2.19.2
-
diff --git a/sources b/sources
index d7959bb..4f71939 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (systemd-f02b547.tar.gz) = a7d774ed00d572eb2d9313ff25a09c707112443020d173d4d350bdb9b269fcef519da8efc2d93b3b72f4ebdd3ff295716e2f640f8c1e679cb24b26e71fca56ee
+SHA512 (systemd-241-rc1.tar.gz) = 168ba80d6e8abadbf1ed84270f2b02e257f1490b61021bb6fb704d9b5fad2670b63e0fc0cb26071e8d56c993faa30274e80d53cf49154cce2b609f47c73b30e0
diff --git a/systemd.spec b/systemd.spec
index ae12798..e0c0d4c 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -1,7 +1,7 @@
-%global commit f02b5472c6f0c41e5dc8dc2c84590866baf937ff
+#global commit f02b5472c6f0c41e5dc8dc2c84590866baf937ff
 %{?commit:%global shortcommit %(c=%{commit}; echo ${c:0:7})}
 
-%global stable 1
+#global stable 1
 
 # We ship a .pc file but don't want to have a dep on pkg-config. We
 # strip the automatically generated dep here and instead co-own the
@@ -14,17 +14,19 @@
 
 Name:           systemd
 Url:            https://www.freedesktop.org/wiki/Software/systemd
-Version:        240
-Release:        6%{?commit:.git%{shortcommit}}%{?dist}
+Version:        241~rc1
+Release:        1%{?commit:.git%{shortcommit}}%{?dist}
 # For a breakdown of the licensing, see README
 License:        LGPLv2+ and MIT and GPLv2+
 Summary:        System and Service Manager
 
+%global github_version %(c=%{version}; echo ${c}|tr '~' '-')
+
 # download tarballs with "spectool -g systemd.spec"
 %if %{defined commit}
 Source0:        https://github.com/systemd/systemd%{?stable:-stable}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz
 %else
-Source0:        https://github.com/systemd/systemd/archive/v%{version}/%{name}-%{version}.tar.gz
+Source0:        https://github.com/systemd/systemd/archive/v%{github_version}/%{name}-%{github_version}.tar.gz
 %endif
 # This file must be available before %%prep.
 # It is generated during systemd build and can be found in build/src/core/.
@@ -51,7 +53,6 @@ GIT_DIR=../../src/systemd/.git git diffab -M v233..master@{2017-06-15} -- hwdb/[
 %endif
 
 Patch0002:      0002-Revert-units-set-NoNewPrivileges-for-all-long-runnin.patch
-Patch0003:      0003-Ignore-failure-to-setup-private-dev.patch
 
 Patch0998:      0998-resolved-create-etc-resolv.conf-symlink-at-runtime.patch
 
@@ -272,7 +273,7 @@ License:       LGPLv2+
 They can be useful to test systemd internals.
 
 %prep
-%autosetup %{?commit:-n %{name}%{?stable:-stable}-%{commit}} -p1 -Sgit
+%autosetup -n %{?commit:%{name}%{?stable:-stable}-%{commit}}%{!?commit:%{name}%{?stable:-stable}-%{github_version}} -p1 -Sgit
 
 %build
 %define ntpvendor %(source /etc/os-release; echo ${ID})
@@ -693,6 +694,9 @@ fi
 %files tests -f .file-list-tests
 
 %changelog
+* Sat Jan 26 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 241~rc1-1
+- Update to latest release -rc1
+
 * Tue Jan 15 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 240-6.gitf02b547
 - Add a work-around for #1663040