Bugs for three outstanding fixes

2016-10-04 16:39:16 -04:00 · 2016-10-04 16:39:16 -04:00 · f4cc4c90ab
parent d550c96234
commit f4cc4c90ab
22 changed files with 134 additions and 122 deletions
--- a/0032-core-make-sure-to-close-connection-fd-when-we-fail-t.patch
+++ b/0032-core-make-sure-to-close-connection-fd-when-we-fail-t.patch
@ -1,12 +1,12 @@
-From 68239871c255877a0f0ba9814b399e9adc01d186 Mon Sep 17 00:00:00 2001
+From 17c17ff59518267077632906ac39b7c69bf47f96 Mon Sep 17 00:00:00 2001
 From: Lennart Poettering <lennart@poettering.net>
 Date: Thu, 28 Apr 2016 17:09:50 +0200
-Subject: [PATCH 1/8] core: make sure to close connection fd when we fail to
+Subject: [PATCH] core: make sure to close connection fd when we fail to
 activate a per-connection service

 Fixes: #2993 #2691
 (cherry picked from commit 3e7a1f50e473a374e1657d2051237e2db04c4db2)
-Resolves: #1310608
+Resolves: rhbug#1310608
 ---
 src/core/service.c | 2 +-
 src/core/service.h | 1 +
@ -14,7 +14,7 @@ Resolves: #1310608
 3 files changed, 7 insertions(+), 2 deletions(-)

 diff --git a/src/core/service.c b/src/core/service.c
-index ac7e41d..01d6582 100644
+index ac7e41d777..01d6582aec 100644
 --- a/src/core/service.c
 +++ b/src/core/service.c
@@ -181,7 +181,7 @@ static int service_set_main_pid(Service *s, pid_t pid) {
@ -27,7 +27,7 @@ index ac7e41d..01d6582 100644
 
         s->socket_fd = asynchronous_close(s->socket_fd);
 diff --git a/src/core/service.h b/src/core/service.h
-index d342e00..20bfd06 100644
+index d342e000bb..20bfd0662b 100644
 --- a/src/core/service.h
 +++ b/src/core/service.h
@@ -200,6 +200,7 @@ struct Service {
@ -39,7 +39,7 @@ index d342e00..20bfd06 100644
 const char* service_restart_to_string(ServiceRestart i) _const_;
 ServiceRestart service_restart_from_string(const char *s) _pure_;
 diff --git a/src/core/socket.c b/src/core/socket.c
-index 976687a..60906b1 100644
+index 976687af41..60906b196c 100644
 --- a/src/core/socket.c
 +++ b/src/core/socket.c
@@ -1994,8 +1994,12 @@ static void socket_enter_running(Socket *s, int cfd) {
@ -56,6 +56,3 @@ index 976687a..60906b1 100644
 
                 /* Notify clients about changed counters */
                 unit_add_to_dbus_queue(UNIT(s));
-- 
-2.7.4
-
--- a/0033-device-Ensure-we-have-sysfs-path-before-comparing.patch
+++ b/0033-device-Ensure-we-have-sysfs-path-before-comparing.patch
@ -1,7 +1,7 @@
-From 7b175c402c0da5a8cc6fdbfc005ec43c0f5d00d4 Mon Sep 17 00:00:00 2001
+From 53f2649652c3e0ec756e3a4545a88f6bda24cbce Mon Sep 17 00:00:00 2001
 From: Colin Guthrie <colin@mageia.org>
 Date: Mon, 14 Mar 2016 09:42:07 +0000
-Subject: [PATCH 2/8] device: Ensure we have sysfs path before comparing.
+Subject: [PATCH] device: Ensure we have sysfs path before comparing.

 In some cases we do not have a udev device when setting up a unit
 (certainly the code gracefully handles this). However, we do
@ -13,13 +13,13 @@ See https://bugs.mageia.org/show_bug.cgi?id=17766
 Not sure if this is the correct fix, but it avoids the crash

 (cherry picked from commit 5e1558f4a09e596561c9168384f2258e7c0718a1)
-Resolves: #1321392
+Resolves: rhbug#1321392
 ---
 src/core/device.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/src/core/device.c b/src/core/device.c
-index d201dc5..c64e01c 100644
+index d201dc5e4b..c64e01c2aa 100644
 --- a/src/core/device.c
 +++ b/src/core/device.c
@@ -318,7 +318,7 @@ static int device_setup_unit(Manager *m, struct udev_device *dev, const char *pa
@ -31,6 +31,3 @@ index d201dc5..c64e01c 100644
                 /* This unit is in plugged state: we're sure it's
                  * attached to a device. */
                 if (!path_equal(DEVICE(u)->sysfs, sysfs)) {
-- 
-2.7.4
-
--- a/0034-networkctl-split-out-system-status-stuff-into-its-ow.patch
+++ b/0034-networkctl-split-out-system-status-stuff-into-its-ow.patch
@ -1,17 +1,17 @@
-From 07a676a01a3157073629692213fcd5e458cf9150 Mon Sep 17 00:00:00 2001
+From c910d4a516c002f68f9d30a6457cbad0f02fed16 Mon Sep 17 00:00:00 2001
 From: Lennart Poettering <lennart@poettering.net>
 Date: Fri, 19 Feb 2016 18:20:40 +0100
-Subject: [PATCH 3/8] networkctl: split out system status stuff into its own
+Subject: [PATCH] networkctl: split out system status stuff into its own
 function

 (cherry picked from commit 0070333f26543a319a17aee8b22bdde4071630c4)
-Resolves: #1325462
+Resolves: rhbug#1325462
 ---
 src/network/networkctl.c | 67 ++++++++++++++++++++++++++----------------------
 1 file changed, 36 insertions(+), 31 deletions(-)

 diff --git a/src/network/networkctl.c b/src/network/networkctl.c
-index 60724fc..9640e30 100644
+index 60724fce80..9640e30499 100644
 --- a/src/network/networkctl.c
 +++ b/src/network/networkctl.c
@@ -660,12 +660,46 @@ static int link_status_one(
@ -101,6 +101,3 @@ index 60724fc..9640e30 100644
 
         if (arg_all) {
                 _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL, *reply = NULL;
-- 
-2.7.4
-
--- a/0035-systemd-user-call-pam_loginuid-when-creating-user-.s.patch
+++ b/0035-systemd-user-call-pam_loginuid-when-creating-user-.s.patch
@ -1,8 +1,8 @@
-From 3d52ea376b88d6edf6ba8176deae999c89344192 Mon Sep 17 00:00:00 2001
+From fa53f32e949f6d8722b371480fea7d2258785309 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
 Date: Tue, 26 Apr 2016 05:19:10 -0400
-Subject: [PATCH 4/8] systemd --user: call pam_loginuid when creating
- user@.service (#3120)
+Subject: [PATCH] systemd --user: call pam_loginuid when creating user@.service
+ (#3120)

 This way the user service will have a loginuid, and it will be inherited by
 child services. This shouldn't change anything as far as systemd itself is
@ -15,13 +15,13 @@ concerned.

 https://bugzilla.redhat.com/show_bug.cgi?id=1328947#c28
 (cherry picked from commit 1000522a60ceade446773c67031b47a566d4a70d)
-Resolves: #1328947
+Resolves: rhbug#1328947
 ---
 src/login/systemd-user.m4 | 1 +
 1 file changed, 1 insertion(+)

 diff --git a/src/login/systemd-user.m4 b/src/login/systemd-user.m4
-index 7933508..f188a8e 100644
+index 7933508f2b..f188a8e548 100644
 --- a/src/login/systemd-user.m4
 +++ b/src/login/systemd-user.m4
@@ -8,4 +8,5 @@ m4_ifdef(`HAVE_SELINUX',
@ -30,6 +30,3 @@ index 7933508..f188a8e 100644
 )m4_dnl
 +session  required pam_loginuid.so
 session  include system-auth
-- 
-2.7.4
-
--- a/0036-systemctl-suppress-no-Install-hint-when-quiet-is-use.patch
+++ b/0036-systemctl-suppress-no-Install-hint-when-quiet-is-use.patch
@ -1,18 +1,18 @@
-From b01ab427e13e5f780ab7d0af8e9e0f8975b03170 Mon Sep 17 00:00:00 2001
+From 599fc965a46c36b9be06bcfd026e2dadeefbbbf5 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
 Date: Thu, 19 May 2016 15:08:41 -0400
-Subject: [PATCH 5/8] systemctl: suppress no-[Install] hint when --quiet is
- used (#3295)
+Subject: [PATCH] systemctl: suppress no-[Install] hint when --quiet is used
+ (#3295)

 https://bugzilla.redhat.com/show_bug.cgi?id=1336960
 (cherry picked from commit 35b132e8ad3c50614605e00cf8ff20988094d21c)
-Resolves: #1336960
+Resolves: rhbug#1336960
 ---
 src/systemctl/systemctl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
-index 908ccab..b4581fe 100644
+index 908ccabf8a..b4581fe542 100644
 --- a/src/systemctl/systemctl.c
 +++ b/src/systemctl/systemctl.c
@@ -5521,7 +5521,7 @@ static int enable_unit(int argc, char *argv[], void *userdata) {
@ -24,6 +24,3 @@ index 908ccab..b4581fe 100644
                 log_warning("The unit files have no [Install] section. They are not meant to be enabled\n"
                             "using systemctl.\n"
                             "Possible reasons for having this kind of units are:\n"
-- 
-2.7.4
-
--- a/0037-systemctl-make-sure-we-terminate-the-bus-connection-.patch
+++ b/0037-systemctl-make-sure-we-terminate-the-bus-connection-.patch
@ -1,8 +1,8 @@
-From e62432d67c5a4c1a9315179aa92119cf15f4210a Mon Sep 17 00:00:00 2001
+From 95802bf0349e70d56eb00f7183a5dc4ff4655f09 Mon Sep 17 00:00:00 2001
 From: Lennart Poettering <lennart@poettering.net>
 Date: Thu, 16 Jun 2016 15:29:16 +0200
-Subject: [PATCH 6/8] systemctl: make sure we terminate the bus connection
- first, and then close the pager (#3550)
+Subject: [PATCH] systemctl: make sure we terminate the bus connection first,
+ and then close the pager (#3550)

 If "systemctl -H" is used, let's make sure we first terminate the bus
 connection, and only then close the pager. If done in this order ssh will get
@ -16,7 +16,7 @@ all clients closing its input pipe.

 Fixes: #3543
 (cherry picked from commit cf647b69baee4c478d3909c327e3d917e1563f44)
-Resolves: #1341179
+Resolves: rhbug#1341179
 ---
 src/libsystemd/sd-bus/busctl.c | 3 ++-
 src/locale/localectl.c         | 3 ++-
@ -27,7 +27,7 @@ Resolves: #1341179
 6 files changed, 13 insertions(+), 7 deletions(-)

 diff --git a/src/libsystemd/sd-bus/busctl.c b/src/libsystemd/sd-bus/busctl.c
-index 35fabf0..c806d6f 100644
+index 35fabf038c..c806d6fe96 100644
 --- a/src/libsystemd/sd-bus/busctl.c
 +++ b/src/libsystemd/sd-bus/busctl.c
@@ -1974,7 +1974,7 @@ static int busctl_main(sd_bus *bus, int argc, char *argv[]) {
@ -48,7 +48,7 @@ index 35fabf0..c806d6f 100644
 
         strv_free(arg_matches);
 diff --git a/src/locale/localectl.c b/src/locale/localectl.c
-index 365c79a..45404f1 100644
+index 365c79aa51..45404f1fa7 100644
 --- a/src/locale/localectl.c
 +++ b/src/locale/localectl.c
@@ -664,7 +664,7 @@ static int localectl_main(sd_bus *bus, int argc, char *argv[]) {
@ -69,7 +69,7 @@ index 365c79a..45404f1 100644
 
         return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
 diff --git a/src/login/loginctl.c b/src/login/loginctl.c
-index 6ad3d08..601d180 100644
+index 6ad3d089bd..601d18063e 100644
 --- a/src/login/loginctl.c
 +++ b/src/login/loginctl.c
@@ -1532,7 +1532,7 @@ static int loginctl_main(int argc, char *argv[], sd_bus *bus) {
@ -91,7 +91,7 @@ index 6ad3d08..601d180 100644
         polkit_agent_close();
 
 diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
-index 4853139..4798228 100644
+index 4853139321..479822880c 100644
 --- a/src/machine/machinectl.c
 +++ b/src/machine/machinectl.c
@@ -2646,7 +2646,7 @@ static int machinectl_main(int argc, char *argv[], sd_bus *bus) {
@ -112,7 +112,7 @@ index 4853139..4798228 100644
         polkit_agent_close();
 
 diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
-index b4581fe..0996920 100644
+index b4581fe542..0996920241 100644
 --- a/src/systemctl/systemctl.c
 +++ b/src/systemctl/systemctl.c
@@ -7684,6 +7684,8 @@ int main(int argc, char*argv[]) {
@ -134,7 +134,7 @@ index b4581fe..0996920 100644
 
         return r < 0 ? EXIT_FAILURE : r;
 diff --git a/src/timedate/timedatectl.c b/src/timedate/timedatectl.c
-index 097963b..7e88fd1 100644
+index 097963b41b..7e88fd15c8 100644
 --- a/src/timedate/timedatectl.c
 +++ b/src/timedate/timedatectl.c
@@ -488,7 +488,7 @@ static int timedatectl_main(sd_bus *bus, int argc, char *argv[]) {
@ -154,6 +154,3 @@ index 097963b..7e88fd1 100644
         pager_close();
 
         return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
-- 
-2.7.4
-
--- a/0038-core-move-start-ratelimiting-check-after-condition-c.patch
+++ b/0038-core-move-start-ratelimiting-check-after-condition-c.patch
@ -1,8 +1,7 @@
-From 7f67b70a9ff9ae99beb8175791f2b3e19d2274b9 Mon Sep 17 00:00:00 2001
+From 4322539b5cfe3f5b43d6377dcaa65221744bf4fb Mon Sep 17 00:00:00 2001
 From: Lennart Poettering <lennart@poettering.net>
 Date: Tue, 26 Apr 2016 20:34:33 +0200
-Subject: [PATCH 7/8] core: move start ratelimiting check after condition
- checks
+Subject: [PATCH] core: move start ratelimiting check after condition checks

 With #2564 unit start rate limiting was moved from after the condition checks
 are to before they are made, in an attempt to fix #2467. This however resulted
@ -12,7 +11,7 @@ start limit can be moved after the condition checks again, thus fixing #2684.

 Fixes: #2684
 (cherry picked from commit 7629ec4642b03517742d09b7303c204fddf82108)
-Resolves: #1350686
+Resolves: rhbug#1350686
 ---
 man/systemd.unit.xml                  |  3 ++-
 src/core/load-fragment-gperf.gperf.m4 |  1 +
@ -20,7 +19,7 @@ Resolves: #1350686
 3 files changed, 8 insertions(+), 6 deletions(-)

 diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
-index 5794681..39cb525 100644
+index 5794681963..39cb5250f7 100644
 --- a/man/systemd.unit.xml
 +++ b/man/systemd.unit.xml
@@ -768,7 +768,8 @@
@ -34,7 +33,7 @@ index 5794681..39cb525 100644
 
       <varlistentry>
 diff --git a/src/core/load-fragment-gperf.gperf.m4 b/src/core/load-fragment-gperf.gperf.m4
-index 5024fd1..479f5e3 100644
+index 5024fd19a5..479f5e30f3 100644
 --- a/src/core/load-fragment-gperf.gperf.m4
 +++ b/src/core/load-fragment-gperf.gperf.m4
@@ -220,6 +220,7 @@ Service.TimeoutStartSec,         config_parse_service_timeout,       0,
@ -46,7 +45,7 @@ index 5024fd1..479f5e3 100644
 Service.StartLimitBurst,         config_parse_unsigned,              0,                             offsetof(Unit, start_limit.burst)
 Service.StartLimitAction,        config_parse_failure_action,        0,                             offsetof(Unit, start_limit_action)
 diff --git a/src/core/unit.c b/src/core/unit.c
-index 3c4f85e..d3d3720 100644
+index 3c4f85e744..d3d372029f 100644
 --- a/src/core/unit.c
 +++ b/src/core/unit.c
@@ -1472,11 +1472,6 @@ int unit_start(Unit *u) {
@ -73,6 +72,3 @@ index 3c4f85e..d3d3720 100644
         /* We don't suppress calls to ->start() here when we are
          * already starting, to allow this request to be used as a
          * "hurry up" call, for example when the unit is in some "auto
-- 
-2.7.4
-
--- a/0039-strbuf-set-the-proper-character-when-creating-new-no.patch
+++ b/0039-strbuf-set-the-proper-character-when-creating-new-no.patch
@ -1,7 +1,7 @@
-From c8db0d7662af5aa4d43c4e61fb09715b8436bdab Mon Sep 17 00:00:00 2001
+From 43ea6d88a06f32dd714eacdcaf0a4656ffb02d30 Mon Sep 17 00:00:00 2001
 From: Lubomir Rintel <lkundrak@v3.sk>
 Date: Tue, 3 May 2016 22:15:49 +0200
-Subject: [PATCH 8/8] strbuf: set the proper character when creating new nodes
+Subject: [PATCH] strbuf: set the proper character when creating new nodes

 Commit 82501b3fc added an early break when a terminal node is found to
 incorrect place -- before setting c. This caused trie to be built that
@ -35,13 +35,13 @@ This in effect caused the usb_modeswitch rule for Huawei modems to never
 match and this never be switched to serial mode from mass storage.

 (cherry picked from commit c45606eb95a7171b0dc801e91d35034957ad5e9e)
-Resolves: #1357822
+Resolves: rhbug#1357822
 ---
 src/basic/strbuf.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

 diff --git a/src/basic/strbuf.c b/src/basic/strbuf.c
-index dac2881..79eef6c 100644
+index dac2881603..79eef6c05d 100644
 --- a/src/basic/strbuf.c
 +++ b/src/basic/strbuf.c
@@ -156,12 +156,13 @@ ssize_t strbuf_add_string(struct strbuf *str, const char *s, size_t len) {
@ -59,6 +59,3 @@ index dac2881..79eef6c 100644
                 search.c = c;
                 child = bsearch(&search, node->children, node->children_count,
                                 sizeof(struct strbuf_child_entry),
-- 
-2.7.4
-
--- a/0040-networkd-bump-MTU-to-1280-for-interfaces-which-have-.patch
+++ b/0040-networkd-bump-MTU-to-1280-for-interfaces-which-have-.patch
@ -1,7 +1,7 @@
-From 8cb2654db12ef043c3e93bae21d421de420a064d Mon Sep 17 00:00:00 2001
+From 715b55d9253c25bd6c463a2959eb33f12e9ecd1b Mon Sep 17 00:00:00 2001
 From: Susant Sahani <ssahani@users.noreply.github.com>
 Date: Thu, 21 Apr 2016 06:04:13 +0530
-Subject: [PATCH 1/2] networkd: bump MTU to 1280 for interfaces which have IPv6
+Subject: [PATCH] networkd: bump MTU to 1280 for interfaces which have IPv6
 enabled (#3077)

 IPv6 protocol requires a minimum MTU of 1280 bytes on the interface.
@ -14,7 +14,7 @@ If IPv6 is not configured on any interface that is SLAAC, DHCPv6 and static
 IPv6 addresses not configured, then IPv6 will be automatically disabled for that
 interface, that is we write "1" to /proc/sys/net/ipv6/conf//disable_ipv6.
 (cherry picked from commit 439689c6ec48faba67565562d75701d5736567e7)
-Related: #1352378
+Related: rhbug#1352378
 ---
 man/systemd.network.xml        |  2 ++
 src/basic/missing.h            |  4 ++++
@ -24,7 +24,7 @@ Related: #1352378
 5 files changed, 70 insertions(+), 1 deletion(-)

 diff --git a/man/systemd.network.xml b/man/systemd.network.xml
-index f88751b..e3df1b3 100644
+index f88751b672..e3df1b3d14 100644
 --- a/man/systemd.network.xml
 +++ b/man/systemd.network.xml
@@ -202,6 +202,8 @@
@ -37,7 +37,7 @@ index f88751b..e3df1b3 100644
       </varlistentry>
     </variablelist>
 diff --git a/src/basic/missing.h b/src/basic/missing.h
-index 36b0604..048b3fb 100644
+index 36b060496a..048b3fbc42 100644
 --- a/src/basic/missing.h
 +++ b/src/basic/missing.h
@@ -912,6 +912,10 @@ static inline int setns(int fd, int nstype) {
@ -52,7 +52,7 @@ index 36b0604..048b3fb 100644
 #define IFF_MULTI_QUEUE 0x100
 #endif
 diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
-index 692c0bf..a6039dd 100644
+index 692c0bf63d..a6039dd3b2 100644
 --- a/src/network/networkd-link.c
 +++ b/src/network/networkd-link.c
@@ -88,6 +88,15 @@ bool link_ipv6ll_enabled(Link *link) {
@ -135,7 +135,7 @@ index 692c0bf..a6039dd 100644
                 r = sd_netlink_message_open_container(req, AF_INET6);
                 if (r < 0)
 diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
-index 54f76fe..9f2cbce 100644
+index 54f76fe206..9f2cbcec30 100644
 --- a/src/network/networkd-network.c
 +++ b/src/network/networkd-network.c
@@ -394,6 +394,19 @@ int network_apply(Manager *manager, Network *network, Link *link) {
@ -159,7 +159,7 @@ index 54f76fe..9f2cbce 100644
                 const char *filename,
                 unsigned line,
 diff --git a/src/network/networkd-network.h b/src/network/networkd-network.h
-index 03c3f20..16533a7 100644
+index 03c3f206c3..16533a7ec2 100644
 --- a/src/network/networkd-network.h
 +++ b/src/network/networkd-network.h
@@ -168,6 +168,8 @@ int network_get_by_name(Manager *manager, const char *name, Network **ret);
@ -171,6 +171,3 @@ index 03c3f20..16533a7 100644
 int config_parse_netdev(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
 int config_parse_domains(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
 int config_parse_tunnel(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
-- 
-2.7.4
-
--- a/0041-networkd-disable-IPv6-for-bridge-slave.patch
+++ b/0041-networkd-disable-IPv6-for-bridge-slave.patch
@ -1,18 +1,18 @@
-From e6fa5ce26d67724cf94addbf14aa100965b78a05 Mon Sep 17 00:00:00 2001
+From ba639500547a9bce37be494fcdeff5958a6ac5e0 Mon Sep 17 00:00:00 2001
 From: Tom Yan <tom.ty89@gmail.com>
 Date: Sat, 28 May 2016 13:35:01 +0800
-Subject: [PATCH 2/2] networkd: disable IPv6 for bridge slave
+Subject: [PATCH] networkd: disable IPv6 for bridge slave

 If an interface is managed as a bridge slave, we don't want any IP configuration for it. Therefore, disable IPv6 in such case.

 (cherry picked from commit 2b00a4e03dc375465de7f60f3a6937cbe8ffdf31)
-Resolves: #1352378
+Resolves: rhbug#1352378
 ---
 src/network/networkd-link.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

 diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
-index a6039dd..13f9e89 100644
+index a6039dd3b2..13f9e895ab 100644
 --- a/src/network/networkd-link.c
 +++ b/src/network/networkd-link.c
@@ -94,7 +94,11 @@ static bool link_ipv6_enabled(Link *link) {
@ -39,6 +39,3 @@ index a6039dd..13f9e89 100644
         (void) link_enable_ipv6(link);
 
         if (link->network->mtu) {
-- 
-2.7.4
-
--- a/0042-udev-bump-TasksMax-to-inifinity-3593.patch
+++ b/0042-udev-bump-TasksMax-to-inifinity-3593.patch
@ -1,4 +1,4 @@
-From de2edc008a612e152f0690d5063d53001c4e13ff Mon Sep 17 00:00:00 2001
+From 8f01e7ac78e51c8fd2e2a285cb16cbec72006c3b Mon Sep 17 00:00:00 2001
 From: Franck Bui <fbui@suse.com>
 Date: Thu, 23 Jun 2016 22:31:01 +0200
 Subject: [PATCH] udev: bump TasksMax to inifinity (#3593)
@ -27,6 +27,3 @@ index 79f28c87c6..67e4c5fcd7 100644
 KillMode=mixed
 WatchdogSec=3min
 +TasksMax=infinity
-- 
-2.9.0
-
--- a/0043-networkd-disable-IPv6-for-bridge-slave.patch
+++ b/0043-networkd-disable-IPv6-for-bridge-slave.patch
@ -1,4 +1,4 @@
-From 01f57264055f83bbb7f9e1ca6d51e260768d1b5f Mon Sep 17 00:00:00 2001
+From c5fb55e7ae979d376d18b28d323905a4703e8cc3 Mon Sep 17 00:00:00 2001
 From: Tom Yan <tom.ty89@gmail.com>
 Date: Sat, 28 May 2016 13:35:01 +0800
 Subject: [PATCH] networkd: disable IPv6 for bridge slave
@ -11,7 +11,7 @@ If an interface is managed as a bridge slave, we don't want any IP configuration
 1 file changed, 3 insertions(+)

 diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
-index 692c0bf63d..4fe3b888d2 100644
+index 13f9e895ab..2268d31374 100644
 --- a/src/network/networkd-link.c
 +++ b/src/network/networkd-link.c
@@ -45,6 +45,9 @@ bool link_dhcp6_enabled(Link *link) {
@ -24,6 +24,3 @@ index 692c0bf63d..4fe3b888d2 100644
         return link->network->dhcp & ADDRESS_FAMILY_IPV6;
 }
 
-- 
-2.9.0
-
--- a/0044-networkd-add-route-expiration-handler-3242.patch
+++ b/0044-networkd-add-route-expiration-handler-3242.patch
@ -1,4 +1,4 @@
-From 3f1b2afc490a79ca4c9f592bc7615248a5fb7dba Mon Sep 17 00:00:00 2001
+From 9582dba16dc4fa990b86a915b74a67566c9acf84 Mon Sep 17 00:00:00 2001
 From: Susant Sahani <ssahani@users.noreply.github.com>
 Date: Wed, 18 May 2016 07:06:43 +0530
 Subject: [PATCH] networkd: add route expiration handler (#3242)
@ -60,6 +60,3 @@ index e065a5a5a9..aa9c71550f 100644
 
         return 1;
 }
-- 
-2.9.0
-
--- a/0045-coredump-ignore-RLIMIT_CORE.patch
+++ b/0045-coredump-ignore-RLIMIT_CORE.patch
@ -1,4 +1,4 @@
-From 3085120636da344db53ba32d3f3509e0f8a2080d Mon Sep 17 00:00:00 2001
+From 5f9856fbccf249fd13fbcbc180aff9ec0a871ca7 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
 Date: Tue, 9 Aug 2016 10:54:05 -0400
 Subject: [PATCH] coredump: ignore RLIMIT_CORE
@ -28,6 +28,3 @@ index 085909c20c..aa07e68627 100644
         /* Never store more than the process configured, or than we actually shall keep or process */
         max_size = MIN(rlimit, MAX(arg_process_size_max, arg_external_size_max));
 
-- 
-2.9.0
-
--- a/0046-networkd-link-fix-handler-typo-for-route_remove-3433.patch
+++ b/0046-networkd-link-fix-handler-typo-for-route_remove-3433.patch
@ -1,4 +1,4 @@
-From b741fc48693ce1bc72179eababf7acd691230409 Mon Sep 17 00:00:00 2001
+From f9832c283ba8e6e4089639646fb0249bb55f5e6e Mon Sep 17 00:00:00 2001
 From: tomty89 <tom.ty89@gmail.com>
 Date: Sat, 4 Jun 2016 18:31:07 +0800
 Subject: [PATCH] networkd-link: fix handler typo for route_remove() (#3433)
@ -10,10 +10,10 @@ Obviously we've been using the wrong handler here. Fixes #3352.
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
-index 4fe3b888d2..9a2de0126e 100644
+index 2268d31374..5545a5ada3 100644
 --- a/src/network/networkd-link.c
 +++ b/src/network/networkd-link.c
-@@ -2025,7 +2025,7 @@ static int link_drop_foreign_config(Link *link) {
+@@ -2077,7 +2077,7 @@ static int link_drop_foreign_config(Link *link) {
                 if (route->protocol == RTPROT_KERNEL)
                         continue;
 
@ -22,6 +22,3 @@ index 4fe3b888d2..9a2de0126e 100644
                 if (r < 0)
                         return r;
         }
-- 
-2.9.0
-
--- a/0047-macros.systemd.in-add-systemd_ordering-3776.patch
+++ b/0047-macros.systemd.in-add-systemd_ordering-3776.patch
@ -1,4 +1,4 @@
-From 2c3f5a607188d876b3dcfb0075dab79eda914803 Mon Sep 17 00:00:00 2001
+From d485b5cd7153f146d7efd18c24ca09b5ddfe15e5 Mon Sep 17 00:00:00 2001
 From: Harald Hoyer <harald@redhat.com>
 Date: Fri, 22 Jul 2016 15:33:13 +0200
 Subject: [PATCH] macros.systemd.in: add %systemd_ordering (#3776)
@ -32,6 +32,3 @@ index 2cace3d3ba..f3089cbcc9 100644
 %systemd_post() \
 if [ $1 -eq 1 ] ; then \
         # Initial installation \
-- 
-2.9.0
-
--- a/0048-If-the-notification-message-length-is-0-ignore-the-m.patch
+++ b/0048-If-the-notification-message-length-is-0-ignore-the-m.patch
@ -1,4 +1,4 @@
-From 3373cbd0846a89f27e09ae88e31912122f161112 Mon Sep 17 00:00:00 2001
+From 7148c9c26658cefc88e0c17841c2399be36b2361 Mon Sep 17 00:00:00 2001
 From: Jorge Niedbalski <jorge.niedbalski@canonical.com>
 Date: Wed, 28 Sep 2016 18:25:50 -0300
 Subject: [PATCH] If the notification message length is 0, ignore the message
--- a/0049-pid1-don-t-return-any-error-in-manager_dispatch_noti.patch
+++ b/0049-pid1-don-t-return-any-error-in-manager_dispatch_noti.patch
@ -1,4 +1,4 @@
-From b16caba80a926b16a9a3377fbe856125436500df Mon Sep 17 00:00:00 2001
+From c7ba28481495df54477c54ee14bb6e7737ef772b Mon Sep 17 00:00:00 2001
 From: Franck Bui <fbui@suse.com>
 Date: Thu, 29 Sep 2016 19:44:34 +0200
 Subject: [PATCH] pid1: don't return any error in manager_dispatch_notify_fd()
--- a/0050-pid1-process-zero-length-notification-messages-again.patch
+++ b/0050-pid1-process-zero-length-notification-messages-again.patch
@ -1,4 +1,4 @@
-From 7597de4208a828e4bdccaf848a00c290fc0ad957 Mon Sep 17 00:00:00 2001
+From 62a4a4bca549ee6020aec90e540ce393a34c5605 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
 Date: Thu, 29 Sep 2016 16:06:02 +0200
 Subject: [PATCH] pid1: process zero-length notification messages again
--- a/0051-logind-fix-crash-when-shutdown-is-not-issued-from-a-.patch
+++ b/0051-logind-fix-crash-when-shutdown-is-not-issued-from-a-.patch
@ -0,0 +1,30 @@
+From e6054d681031953ce7e7150efc441fd2f6f64ae3 Mon Sep 17 00:00:00 2001
+From: Martin Pitt <martin.pitt@ubuntu.com>
+Date: Wed, 23 Mar 2016 08:46:58 +0100
+Subject: [PATCH] logind: fix crash when shutdown is not issued from a tty
+
+It's possible that sd_bus_creds_get_tty() fails and thus
+scheduled_shutdown_tty is NULL in method_schedule_shutdown().
+
+Fix logind_wall_tty_filter() to get along with that, by showing the message on
+all TTYs, instead of crashing in strcmp().
+
+https://launchpad.net/bugs/1553040
+(cherry picked from commit b4944d2df248fbd2f96a4b9b4fe02fe0c1af7499)
+---
+ src/login/logind-utmp.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/login/logind-utmp.c b/src/login/logind-utmp.c
+index 11a91c3947..29ab00eb1f 100644
+--- a/src/login/logind-utmp.c
+++ b/src/login/logind-utmp.c
+@@ -65,7 +65,7 @@ bool logind_wall_tty_filter(const char *tty, void *userdata) {
+ 
+         assert(m);
+ 
+-        if (!startswith(tty, "/dev/"))
+        if (!startswith(tty, "/dev/") || !m->scheduled_shutdown_tty)
+                 return true;
+ 
+         return !streq(tty + 5, m->scheduled_shutdown_tty);
--- a/0052-hwdb-add-axis-ranges-for-the-MacBook-4-1-4030.patch
+++ b/0052-hwdb-add-axis-ranges-for-the-MacBook-4-1-4030.patch
@ -0,0 +1,24 @@
+From e0801b90cd355b65ee42ebc916293465d7bef4fd Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed, 24 Aug 2016 20:11:48 +1000
+Subject: [PATCH] hwdb: add axis ranges for the MacBook 4,1 (#4030)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1357990
+(cherry picked from commit 769c29d5d12532e81c983d9946961ce084609571)
+---
+ hwdb/60-evdev.hwdb | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/hwdb/60-evdev.hwdb b/hwdb/60-evdev.hwdb
+index d060d81f61..c672df2dc4 100644
+--- a/hwdb/60-evdev.hwdb
+++ b/hwdb/60-evdev.hwdb
+@@ -45,6 +45,8 @@
+ 
+ #  Macbook2,1 (late 2006), single-button touchpad
+ evdev:input:b0003v05ACp021B*
+# Macbook4,1
+evdev:input:b0003v05ACp0229*
+  EVDEV_ABS_00=256:1471:12
+  EVDEV_ABS_01=256:831:12
+ 
--- a/systemd.spec
+++ b/systemd.spec
@ -12,7 +12,7 @@
 Name:           systemd
 Url:            http://www.freedesktop.org/wiki/Software/systemd
 Version:        229
-Release:        15%{?gitcommit:.git%{gitcommitshort}}%{?dist}
+Release:        16%{?gitcommit:.git%{gitcommitshort}}%{?dist}
 # For a breakdown of the licensing, see README
 License:        LGPLv2+ and MIT and GPLv2+
 Summary:        A System and Service Manager
@ -80,9 +80,11 @@ Patch0044:      0044-networkd-add-route-expiration-handler-3242.patch
 Patch0045:      0045-coredump-ignore-RLIMIT_CORE.patch
 Patch0046:      0046-networkd-link-fix-handler-typo-for-route_remove-3433.patch
 Patch0047:      0047-macros.systemd.in-add-systemd_ordering-3776.patch
-Patch0048:      0037-If-the-notification-message-length-is-0-ignore-the-m.patch
-Patch0049:      0038-pid1-don-t-return-any-error-in-manager_dispatch_noti.patch
-Patch0050:      0039-pid1-process-zero-length-notification-messages-again.patch
+Patch0048:      0048-If-the-notification-message-length-is-0-ignore-the-m.patch
+Patch0049:      0049-pid1-don-t-return-any-error-in-manager_dispatch_noti.patch
+Patch0050:      0050-pid1-process-zero-length-notification-messages-again.patch
+Patch0051:      0051-logind-fix-crash-when-shutdown-is-not-issued-from-a-.patch
+Patch0052:      0052-hwdb-add-axis-ranges-for-the-MacBook-4-1-4030.patch

 Patch0999:      0999-resolved-create-etc-resolv.conf-symlink-at-runtime.patch

@ -612,7 +614,9 @@ udevadm hwdb --update >/dev/null 2>&1 || :
 %systemd_preun systemd-udev-{settle,trigger}.service systemd-udevd-{control,kernel}.socket systemd-udevd.service

 %postun udev
-%systemd_postun_with_restart systemd-udev-{settle,trigger}.service systemd-udevd-{control,kernel}.socket systemd-udevd.service
+# Only restart systemd-udev, to run the upgraded dameon.
+# Others are either oneshot services, or sockets, and restarting them causes issues (#1378974)
+%systemd_postun_with_restart systemd-udevd.service

 %pre journal-remote
 getent group systemd-journal-gateway >/dev/null 2>&1 || groupadd -r -g 191 systemd-journal-gateway 2>&1 || :
@ -967,6 +971,9 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd
 /usr/lib/firewalld/services/*

 %changelog
+* Tue Oct  4 2016 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 229-16
+- Fixes for #1357990, #1371596, #1378974
+
 * Thu Sep 29 2016 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 229-15
 - Better fix for #1380286