systemd-227-5-x86_64

* relbump * fixes issues about "Connection timed out" see systemd/systemd#1505
frugalware · Nov 7, 2015 · 7113e69 · 7113e69
1 parent d38dd4c
commit 7113e69
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 3 deletions.
diff --git a/source/base/systemd/FrugalBuild b/source/base/systemd/FrugalBuild
@@ -10,7 +10,7 @@ USE_SYSV_COMPAT=${USE_SYSV_COMPAT:-"y"}
 
 pkgname=systemd
 pkgver=227
-pkgrel=4
+pkgrel=5
 pkgdesc="A System and Service Manager"
 url="http://www.freedesktop.org/wiki/Software/systemd"
 rodepends=('scriptlet-core')
@@ -42,7 +42,8 @@ source=(${source[@]}
 	Adjust-systemd-user-pam-config-file-for-Debian.patch \
 	core-ignore-.slice-and-init.scope-when-isolating.patch  \
 	sd-daemon-simply-code-simplification.patch \
-	sd-daemon-wipe-out-memory-before-using-CMSG_NXTHDR.patch)
+	sd-daemon-wipe-out-memory-before-using-CMSG_NXTHDR.patch \
+	Revert-sd_pid_notify_with_fds-fix-computing-msg_cont.patch )
 sha1sums=('ee92ac467bd2fada5495d46e21228851227f4164' \
           'a7e3c8457d514588c426c490c6b518c9ea88f626' \
           'a2f1c341894c4841a64a56138362817ae2c57905' \
@@ -60,7 +61,8 @@ sha1sums=('ee92ac467bd2fada5495d46e21228851227f4164' \
           '81e03dfb1ab9bc01a0dfb787222ef5cbd973dd50' \
           '05da79bdd8d138673fba49751999fc4310cd499c' \
           '6df365d4b94771dd1f3e72716d5aa454bb8b558c' \
-          '65493ebe40e62fb99144df38a62e609e06cbb8b1')
+          '65493ebe40e62fb99144df38a62e609e06cbb8b1' \
+          'ca8bf615eb01e678ac7903415c34c32c44dc0784')
 
 if Fuse $USE_CRYPTSETUP; then
 	depends=("${depends[@]}"  'cryptsetup-luks>=1.6.3-3')

diff --git a/source/base/systemd/Revert-sd_pid_notify_with_fds-fix-computing-msg_cont.patch b/source/base/systemd/Revert-sd_pid_notify_with_fds-fix-computing-msg_cont.patch
@@ -0,0 +1,32 @@
+From: Martin Pitt <martin.pitt@ubuntu.com>
+Date: Fri, 9 Oct 2015 11:19:38 +0200
+Subject: Revert "sd_pid_notify_with_fds: fix computing msg_controllen"
+
+This causes connection errors from various services on boot.
+
+This reverts commit a5bd3c32abb00ad945282568fd1a97c180b68047.
+
+https://github.com/systemd/systemd/issues/1505
+Closes: #801354
+---
+ src/libsystemd/sd-daemon/sd-daemon.c | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/src/libsystemd/sd-daemon/sd-daemon.c b/src/libsystemd/sd-daemon/sd-daemon.c
+index ae534ba..251da04 100644
+--- a/src/libsystemd/sd-daemon/sd-daemon.c
++++ b/src/libsystemd/sd-daemon/sd-daemon.c
+@@ -449,11 +449,8 @@ _public_ int sd_pid_notify_with_fds(pid_t pid, int unset_environment, const char
+         have_pid = pid != 0 && pid != getpid();
+
+         if (n_fds > 0 || have_pid) {
+-                /* CMSG_SPACE(0) may return value different then zero, which results in miscalculated controllen. */
+-                msghdr.msg_controllen =
+-                        (n_fds > 0 ? CMSG_SPACE(sizeof(int) * n_fds) : 0) +
+-                        (have_pid ? CMSG_SPACE(sizeof(struct ucred)) : 0);
+-
++                msghdr.msg_controllen = CMSG_SPACE(sizeof(int) * n_fds) +
++                                        CMSG_SPACE(sizeof(struct ucred) * have_pid);
+                 msghdr.msg_control = alloca0(msghdr.msg_controllen);
+
+                 cmsg = CMSG_FIRSTHDR(&msghdr);