From 5d6eedd538daff921e7411a5c73ef5bf0bc81d8d Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Jan 31 2017 17:11:17 +0000 Subject: Moar patches --- diff --git a/0001-build-sys-link-test-seccomp-against-seccomp-libs-456.patch b/0001-build-sys-link-test-seccomp-against-seccomp-libs-456.patch index be99128..11fbc90 100644 --- a/0001-build-sys-link-test-seccomp-against-seccomp-libs-456.patch +++ b/0001-build-sys-link-test-seccomp-against-seccomp-libs-456.patch @@ -1,4 +1,4 @@ -From abb0253b3cdc8fb871d88b3ef92e4d9c613bed34 Mon Sep 17 00:00:00 2001 +From 55edef4fb8c4c0b6536ad824ef05ce412a701c6a Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Thu, 3 Nov 2016 23:15:33 +0200 Subject: [PATCH] build-sys: link test-seccomp against seccomp libs (#4560) @@ -26,6 +26,3 @@ index f7652c2346..f2d8bf57f7 100644 test_namespace_LDADD = \ libcore.la --- -2.9.3 - diff --git a/0002-kernel-install-use-exit-instead-of-return-4565.patch b/0002-kernel-install-use-exit-instead-of-return-4565.patch index 709bcc6..cf0ddb1 100644 --- a/0002-kernel-install-use-exit-instead-of-return-4565.patch +++ b/0002-kernel-install-use-exit-instead-of-return-4565.patch @@ -1,4 +1,4 @@ -From 5f48a027cec516b9c5496e5597b10456b676875f Mon Sep 17 00:00:00 2001 +From a9facbdf54ed3397365f1f4203afa4f606ce7234 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 4 Nov 2016 21:58:41 +0900 Subject: [PATCH] kernel-install: use exit instead of return (#4565) @@ -33,6 +33,3 @@ index 0c0ee718ac..a95b9717f0 100644 fi ((ret+=$x)) fi --- -2.9.3 - diff --git a/0003-nspawn-fix-exit-code-for-help-and-version-4609.patch b/0003-nspawn-fix-exit-code-for-help-and-version-4609.patch index eb0cee7..2bfa21d 100644 --- a/0003-nspawn-fix-exit-code-for-help-and-version-4609.patch +++ b/0003-nspawn-fix-exit-code-for-help-and-version-4609.patch @@ -1,4 +1,4 @@ -From 5e8f1f054d332ed955414d16c57dfd406381b3e2 Mon Sep 17 00:00:00 2001 +From 045473ceb4999997f44fd1e4e1a3e5530b6fb828 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 8 Nov 2016 05:31:55 +0100 Subject: [PATCH] nspawn: fix exit code for --help and --version (#4609) @@ -28,6 +28,3 @@ index c56af6e6f4..c8fc011907 100644 char veth_name[IFNAMSIZ] = ""; bool secondary = false, remove_subvol = false; pid_t pid = 0; --- -2.9.3 - diff --git a/0004-core-don-t-use-the-unified-hierarchy-for-the-systemd.patch b/0004-core-don-t-use-the-unified-hierarchy-for-the-systemd.patch index 8e2a562..365a384 100644 --- a/0004-core-don-t-use-the-unified-hierarchy-for-the-systemd.patch +++ b/0004-core-don-t-use-the-unified-hierarchy-for-the-systemd.patch @@ -1,4 +1,4 @@ -From 68b669677dd85eaf789733eee38da3f870b1af51 Mon Sep 17 00:00:00 2001 +From fb36bef4e4884a62b70cd98f7d2d52abf8091106 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Thu, 10 Nov 2016 05:33:13 +0100 Subject: [PATCH] core: don't use the unified hierarchy for the systemd cgroup @@ -35,6 +35,3 @@ index cede835920..134e6e3664 100644 else wanted = parse_boolean(value) <= 0; } --- -2.9.3 - diff --git a/0005-core-make-RootDirectory-and-ProtectKernelModules-wor.patch b/0005-core-make-RootDirectory-and-ProtectKernelModules-wor.patch index 65899d2..f8e262f 100644 --- a/0005-core-make-RootDirectory-and-ProtectKernelModules-wor.patch +++ b/0005-core-make-RootDirectory-and-ProtectKernelModules-wor.patch @@ -1,4 +1,4 @@ -From 5ad2a68bfc8541599aa61420a8507a497d87ac3c Mon Sep 17 00:00:00 2001 +From d14d851c73c1fecbf361db94c48156e02d61c4e8 Mon Sep 17 00:00:00 2001 From: Djalal Harouni Date: Sun, 6 Nov 2016 22:51:49 +0100 Subject: [PATCH] core: make RootDirectory= and ProtectKernelModules= work @@ -330,6 +330,3 @@ index 1195e9a854..c45c120193 100644 return r; } --- -2.9.3 - diff --git a/0006-nspawn-avoid-one-strdup-by-using-free_and_replace.patch b/0006-nspawn-avoid-one-strdup-by-using-free_and_replace.patch index 1c93a7c..21c0cda 100644 --- a/0006-nspawn-avoid-one-strdup-by-using-free_and_replace.patch +++ b/0006-nspawn-avoid-one-strdup-by-using-free_and_replace.patch @@ -1,4 +1,4 @@ -From 14788b363be244f3dce87ccd5447b2d6bb7ce930 Mon Sep 17 00:00:00 2001 +From d7270c1642fa81b34b266d33412a842edc42c64c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 7 Nov 2016 08:54:47 -0500 Subject: [PATCH] nspawn: avoid one strdup by using free_and_replace @@ -32,6 +32,3 @@ index c45c120193..524416ecbd 100644 if (r < 0) return r; } --- -2.9.3 - diff --git a/0007-nspawn-slight-simplification.patch b/0007-nspawn-slight-simplification.patch index 2735a5c..3815908 100644 --- a/0007-nspawn-slight-simplification.patch +++ b/0007-nspawn-slight-simplification.patch @@ -1,4 +1,4 @@ -From a5f0ac8737df6f00cd1827bc2ed78bf6ab1cef48 Mon Sep 17 00:00:00 2001 +From ff699dcd6f4e665119afa7ac0a9446907d02c966 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 7 Nov 2016 08:57:30 -0500 Subject: [PATCH] nspawn: slight simplification @@ -58,6 +58,3 @@ index 524416ecbd..b18fcf3e29 100644 } return 0; --- -2.9.3 - diff --git a/0008-core-namespace-count-and-free-failed-paths-inside-ch.patch b/0008-core-namespace-count-and-free-failed-paths-inside-ch.patch index df06ce9..90b3324 100644 --- a/0008-core-namespace-count-and-free-failed-paths-inside-ch.patch +++ b/0008-core-namespace-count-and-free-failed-paths-inside-ch.patch @@ -1,4 +1,4 @@ -From 6075c25fa4c1411b072955445f0f4a2418f54b0c Mon Sep 17 00:00:00 2001 +From f28e754a5b0400d439cb3a9a3d288191f5a742ed Mon Sep 17 00:00:00 2001 From: Djalal Harouni Date: Thu, 10 Nov 2016 18:11:37 +0100 Subject: [PATCH] core:namespace: count and free failed paths inside @@ -117,6 +117,3 @@ index b18fcf3e29..49a50c7b61 100644 } static unsigned namespace_calculate_mounts( --- -2.9.3 - diff --git a/0009-basic-virt-fix-userns-check-on-CONFIG_USER_NS-n-kern.patch b/0009-basic-virt-fix-userns-check-on-CONFIG_USER_NS-n-kern.patch index 9ae482b..55742ca 100644 --- a/0009-basic-virt-fix-userns-check-on-CONFIG_USER_NS-n-kern.patch +++ b/0009-basic-virt-fix-userns-check-on-CONFIG_USER_NS-n-kern.patch @@ -1,4 +1,4 @@ -From 99a1035c5243535f8ca01aec3b28c09405d09184 Mon Sep 17 00:00:00 2001 +From 7d7017a583a014c239cf8f68d484f22f67ca80ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 11 Nov 2016 10:54:54 -0500 Subject: [PATCH] basic/virt: fix userns check on CONFIG_USER_NS=n kernel @@ -27,6 +27,3 @@ index 69b0f96183..d8d57381ad 100644 } n = getline(&buf, &n_allocated, f); --- -2.9.3 - diff --git a/0010-timesyncd-clear-ADJ_MAXERROR-to-keep-STA_UNSYNC-clea.patch b/0010-timesyncd-clear-ADJ_MAXERROR-to-keep-STA_UNSYNC-clea.patch index 8c7ca11..da72247 100644 --- a/0010-timesyncd-clear-ADJ_MAXERROR-to-keep-STA_UNSYNC-clea.patch +++ b/0010-timesyncd-clear-ADJ_MAXERROR-to-keep-STA_UNSYNC-clea.patch @@ -1,4 +1,4 @@ -From 7c120409dcb6ad0658f06aef660913450e538f6d Mon Sep 17 00:00:00 2001 +From 986e777a9e8f34b16b3bc9ea50479dba8559a845 Mon Sep 17 00:00:00 2001 From: akochetkov Date: Fri, 11 Nov 2016 20:50:46 +0300 Subject: [PATCH] timesyncd: clear ADJ_MAXERROR to keep STA_UNSYNC cleared @@ -39,6 +39,3 @@ index d5e16db3a0..419f0fa279 100644 /* the kernel expects -0.3s as {-1, 7000.000.000} */ if (tmx.time.tv_usec < 0) { --- -2.9.3 - diff --git a/0011-link-fix-offload-features-initialization-4639.patch b/0011-link-fix-offload-features-initialization-4639.patch index bf0b718..d8cf809 100644 --- a/0011-link-fix-offload-features-initialization-4639.patch +++ b/0011-link-fix-offload-features-initialization-4639.patch @@ -1,4 +1,4 @@ -From 6c19e0abceb3c22100edc0ce8be2680a5abd6945 Mon Sep 17 00:00:00 2001 +From 8f8eacd358dcac603173d66525b4741616c76997 Mon Sep 17 00:00:00 2001 From: Maks Naumov Date: Mon, 14 Nov 2016 12:33:43 +0200 Subject: [PATCH] link: fix offload features initialization (#4639) @@ -21,6 +21,3 @@ index ece9248c2a..fa8fe1fb9a 100644 r = config_parse(NULL, filename, file, "Match\0Link\0Ethernet\0", --- -2.9.3 - diff --git a/0012-sd-event-fix-sd_event_source_get_priority-4712.patch b/0012-sd-event-fix-sd_event_source_get_priority-4712.patch index d6d353b..90c0ed9 100644 --- a/0012-sd-event-fix-sd_event_source_get_priority-4712.patch +++ b/0012-sd-event-fix-sd_event_source_get_priority-4712.patch @@ -1,4 +1,4 @@ -From fd2aab7bff3842df53a93e7ab8239a279bb3ad8f Mon Sep 17 00:00:00 2001 +From b291d260e0ebc7a7528f37e97e8b404968f34e18 Mon Sep 17 00:00:00 2001 From: Martin Ejdestig Date: Tue, 22 Nov 2016 01:21:00 +0100 Subject: [PATCH] sd-event: fix sd_event_source_get_priority() (#4712) @@ -46,6 +46,3 @@ index 289114490c..c0e5e06a18 100644 assert_se(sd_event_source_set_enabled(y, SD_EVENT_ONESHOT) >= 0); assert_se(sd_event_source_set_prepare(x, prepare_handler) >= 0); assert_se(sd_event_source_set_priority(z, 50) >= 0); --- -2.9.3 - diff --git a/0013-build-sys-check-for-lz4-in-the-old-and-new-numbering.patch b/0013-build-sys-check-for-lz4-in-the-old-and-new-numbering.patch index 3fd1a44..ae4a4ae 100644 --- a/0013-build-sys-check-for-lz4-in-the-old-and-new-numbering.patch +++ b/0013-build-sys-check-for-lz4-in-the-old-and-new-numbering.patch @@ -1,4 +1,4 @@ -From b6c1a9e4cdea2d3e614125707389bf69c00769b0 Mon Sep 17 00:00:00 2001 +From 25cd9391929a46f1f38daf6aa4421de6a1afc47e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 23 Nov 2016 10:18:30 -0500 Subject: [PATCH] build-sys: check for lz4 in the old and new numbering scheme @@ -40,6 +40,3 @@ index 0b10fc7de7..1928e65bde 100644 AS_IF([test "x$have_lz4" = xno -a "x$enable_lz4" = xyes], [AC_MSG_ERROR([*** LZ4 support requested but libraries not found])]) ]) --- -2.9.3 - diff --git a/0014-networkd-fix-size-of-MTUBytes-so-that-it-does-not-ov.patch b/0014-networkd-fix-size-of-MTUBytes-so-that-it-does-not-ov.patch index f31b015..7081fd2 100644 --- a/0014-networkd-fix-size-of-MTUBytes-so-that-it-does-not-ov.patch +++ b/0014-networkd-fix-size-of-MTUBytes-so-that-it-does-not-ov.patch @@ -1,4 +1,4 @@ -From abe63bfc21e0737b23b5c8f6eeb088c4030cc631 Mon Sep 17 00:00:00 2001 +From 23c3ed8b2c0875c9f2a3e3b4e4d69af8cd49d9a2 Mon Sep 17 00:00:00 2001 From: Susant Sahani Date: Wed, 23 Nov 2016 21:03:01 +0530 Subject: [PATCH] networkd: fix size of MTUBytes so that it does not overwrites @@ -26,6 +26,3 @@ index 42fc82d392..11ff34b5b5 100644 int arp; uint32_t iaid; DUID duid; --- -2.9.3 - diff --git a/0015-core-consider-SIGTERM-as-a-clean-exit-status-for-ini.patch b/0015-core-consider-SIGTERM-as-a-clean-exit-status-for-ini.patch index 46e4bb6..c4271e7 100644 --- a/0015-core-consider-SIGTERM-as-a-clean-exit-status-for-ini.patch +++ b/0015-core-consider-SIGTERM-as-a-clean-exit-status-for-ini.patch @@ -1,4 +1,4 @@ -From 18eb87fdddbcb03940b2009e6cb43852e8735e9a Mon Sep 17 00:00:00 2001 +From 409612865dd716752da4785b5d8cb75a24cebab4 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Wed, 23 Nov 2016 16:31:24 +0100 Subject: [PATCH] core: consider SIGTERM as a clean exit status for @@ -45,6 +45,3 @@ index 82893dafb1..b89f2348c7 100644 +# time to exit properly. Since systemd considers SIGTERM as a failure for +# short-running process (aka Type=oneshot), instruct it to ignore this case. +SuccessExitStatus=SIGTERM --- -2.9.3 - diff --git a/0016-core-make-sure-initrd-switch-root-command-survives-P.patch b/0016-core-make-sure-initrd-switch-root-command-survives-P.patch index 0555e91..780e953 100644 --- a/0016-core-make-sure-initrd-switch-root-command-survives-P.patch +++ b/0016-core-make-sure-initrd-switch-root-command-survives-P.patch @@ -1,4 +1,4 @@ -From 6fbbf006adc4830f0ed956042e54e747168fa879 Mon Sep 17 00:00:00 2001 +From 0e2e7e8269dacd5845150170d3d47c2d677474ab Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Thu, 24 Nov 2016 18:52:04 +0100 Subject: [PATCH] core: make sure initrd-switch-root command survives PID1's @@ -71,6 +71,3 @@ index b89f2348c7..82893dafb1 100644 -# short-running process (aka Type=oneshot), instruct it to ignore this case. -SuccessExitStatus=SIGTERM +KillMode=none --- -2.9.3 - diff --git a/0017-fix-journald-startup-problem-when-code-is-compiled-w.patch b/0017-fix-journald-startup-problem-when-code-is-compiled-w.patch index cbea6d3..82cc8fe 100644 --- a/0017-fix-journald-startup-problem-when-code-is-compiled-w.patch +++ b/0017-fix-journald-startup-problem-when-code-is-compiled-w.patch @@ -1,4 +1,4 @@ -From 95bb77653fe45f8865bae23c46bd1b25f14a35dc Mon Sep 17 00:00:00 2001 +From 4392ebaa516ef068809bb7f3d8a58b68f2face4f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 25 Nov 2016 11:24:58 +0100 Subject: [PATCH] fix journald startup problem when code is compiled with @@ -28,6 +28,3 @@ index 908c7b8eeb..c0987625cd 100644 r = sd_event_add_signal(s->event, &s->sigusr1_event_source, SIGUSR1, dispatch_sigusr1, s); if (r < 0) --- -2.9.3 - diff --git a/0018-device-Avoid-calling-unit_free-NULL-in-device-setup-.patch b/0018-device-Avoid-calling-unit_free-NULL-in-device-setup-.patch index 3ff7458..22add25 100644 --- a/0018-device-Avoid-calling-unit_free-NULL-in-device-setup-.patch +++ b/0018-device-Avoid-calling-unit_free-NULL-in-device-setup-.patch @@ -1,4 +1,4 @@ -From 23c99602bc227de3a4104cb01b655ae6d034e853 Mon Sep 17 00:00:00 2001 +From 9dd94c0ac4b29250e0c06f2bbd8e73cc2072da7d Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Sun, 27 Nov 2016 17:05:39 -0500 Subject: [PATCH] device: Avoid calling unit_free(NULL) in device setup logic @@ -31,6 +31,3 @@ index bd87a447cd..4b9e84aeb6 100644 unit_free(u); return r; --- -2.9.3 - diff --git a/0019-udevd-check-correct-return-value-of-fcntl-4758.patch b/0019-udevd-check-correct-return-value-of-fcntl-4758.patch index 559fea8..c6b544b 100644 --- a/0019-udevd-check-correct-return-value-of-fcntl-4758.patch +++ b/0019-udevd-check-correct-return-value-of-fcntl-4758.patch @@ -1,4 +1,4 @@ -From f20e908529c7005fdc31c9e4e694b8c39291d10d Mon Sep 17 00:00:00 2001 +From 9b01faa700c80007d2a25f92dc704b3e1aaf365d Mon Sep 17 00:00:00 2001 From: Daniel Wagner Date: Mon, 28 Nov 2016 18:24:26 +0100 Subject: [PATCH] udevd: check correct return value of fcntl() (#4758) @@ -22,6 +22,3 @@ index badbab6205..c97c52e962 100644 return log_error_errno(errno, "could not dup netlink fd: %m"); } --- -2.9.3 - diff --git a/0020-systemctl-fix-is-enabled-exit-status-on-failure-when.patch b/0020-systemctl-fix-is-enabled-exit-status-on-failure-when.patch index c520508..1cdd9fe 100644 --- a/0020-systemctl-fix-is-enabled-exit-status-on-failure-when.patch +++ b/0020-systemctl-fix-is-enabled-exit-status-on-failure-when.patch @@ -1,4 +1,4 @@ -From fe2621a4b37b6138bd0734d36e786050799e6e48 Mon Sep 17 00:00:00 2001 +From c9b991db38bc74ad36b1f584c5f7fdafc0278564 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Wed, 30 Nov 2016 18:27:42 +0100 Subject: [PATCH] systemctl: fix 'is-enabled' exit status on failure when @@ -22,6 +22,3 @@ index a2b667481d..4edc690f5c 100644 if (IN_SET(state, UNIT_FILE_ENABLED, --- -2.9.3 - diff --git a/0021-journal-make-sure-to-initially-populate-the-space-in.patch b/0021-journal-make-sure-to-initially-populate-the-space-in.patch index 7175a73..1f1b43e 100644 --- a/0021-journal-make-sure-to-initially-populate-the-space-in.patch +++ b/0021-journal-make-sure-to-initially-populate-the-space-in.patch @@ -1,4 +1,4 @@ -From 7ad53973a94ab6699e52305501362e26af159fd2 Mon Sep 17 00:00:00 2001 +From dc28516400f7f56a4a6fbc8ab6740d2dc98f99ea Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 2 Dec 2016 18:40:10 +0100 Subject: [PATCH] journal: make sure to initially populate the space info cache @@ -28,6 +28,3 @@ index c0987625cd..1d2fce8dc7 100644 return 0; r = determine_path_usage(s, storage->path, &vfs_used, &vfs_avail); --- -2.9.3 - diff --git a/0022-networkd-link_enter_configured-remove-assert-4800.patch b/0022-networkd-link_enter_configured-remove-assert-4800.patch index 73e1b56..6c3fedd 100644 --- a/0022-networkd-link_enter_configured-remove-assert-4800.patch +++ b/0022-networkd-link_enter_configured-remove-assert-4800.patch @@ -1,4 +1,4 @@ -From 6e6a4e9b53c8a9a4efd3a22c8496f5b1d840c969 Mon Sep 17 00:00:00 2001 +From 783168312d5b7b29535488d785fdd4a849436368 Mon Sep 17 00:00:00 2001 From: Susant Sahani Date: Mon, 5 Dec 2016 20:01:48 +0530 Subject: [PATCH] networkd: link_enter_configured remove assert (#4800) @@ -45,6 +45,3 @@ index aefe7335b9..4dfbe0bf7e 100644 } void link_check_ready(Link *link) { --- -2.9.3 - diff --git a/0023-rules-consider-MMC-device-partitions-with-partition-.patch b/0023-rules-consider-MMC-device-partitions-with-partition-.patch index 6700e0a..10c3c5c 100644 --- a/0023-rules-consider-MMC-device-partitions-with-partition-.patch +++ b/0023-rules-consider-MMC-device-partitions-with-partition-.patch @@ -1,4 +1,4 @@ -From d51c2d12dc965fbde394e56a1a3484793c72ef1f Mon Sep 17 00:00:00 2001 +From 09dc7999c275723f7e364386cd85e8f698e744c9 Mon Sep 17 00:00:00 2001 From: Kieran Colford Date: Tue, 6 Dec 2016 04:46:13 -0500 Subject: [PATCH] rules: consider MMC device partitions with partition number > @@ -23,6 +23,3 @@ index c13d05cdb1..bbd52e825e 100644 # Memstick KERNEL=="msblk[0-9]|mspblk[0-9]", SUBSYSTEMS=="memstick", ATTRS{name}=="?*", ATTRS{serial}=="?*", \ --- -2.9.3 - diff --git a/0024-nspawn-add-missing-E-to-getopt_long-4860.patch b/0024-nspawn-add-missing-E-to-getopt_long-4860.patch index 60f2387..5b3624f 100644 --- a/0024-nspawn-add-missing-E-to-getopt_long-4860.patch +++ b/0024-nspawn-add-missing-E-to-getopt_long-4860.patch @@ -1,4 +1,4 @@ -From de52d82792835bb4f81802dc4cab6dc9c031f154 Mon Sep 17 00:00:00 2001 +From 331ea131a5d1b942603c01225758c29f9ca98feb Mon Sep 17 00:00:00 2001 From: Wim de With Date: Sat, 10 Dec 2016 05:33:58 +0100 Subject: [PATCH] nspawn: add missing -E to getopt_long (#4860) @@ -21,6 +21,3 @@ index c8fc011907..81573be95a 100644 switch (c) { --- -2.9.3 - diff --git a/0025-build-sys-define-arm-as-secondary-architecture-for-a.patch b/0025-build-sys-define-arm-as-secondary-architecture-for-a.patch index 7e133aa..016ddd3 100644 --- a/0025-build-sys-define-arm-as-secondary-architecture-for-a.patch +++ b/0025-build-sys-define-arm-as-secondary-architecture-for-a.patch @@ -1,4 +1,4 @@ -From 9dcc80915fc571f926aeeb5afae47aa2a03cb7d1 Mon Sep 17 00:00:00 2001 +From f04a5c9d6a733f44d8f88dcea4ec340ec2d1d2c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 10 Dec 2016 13:01:22 -0500 Subject: [PATCH] build-sys: define arm as secondary architecture for arm64 @@ -22,6 +22,3 @@ index 5a77c31932..b329df2f6d 100644 # endif #elif defined(__arm__) # if __BYTE_ORDER == __BIG_ENDIAN --- -2.9.3 - diff --git a/0026-nspawn-when-getting-SIGCHLD-make-sure-it-s-from-the-.patch b/0026-nspawn-when-getting-SIGCHLD-make-sure-it-s-from-the-.patch index 3f74d27..d19e762 100644 --- a/0026-nspawn-when-getting-SIGCHLD-make-sure-it-s-from-the-.patch +++ b/0026-nspawn-when-getting-SIGCHLD-make-sure-it-s-from-the-.patch @@ -1,4 +1,4 @@ -From 7046c0424a0c521169f258ab02d90739dade6269 Mon Sep 17 00:00:00 2001 +From 92f6078aeadec4dfd0e4e9e2ef14b0f7794141cc Mon Sep 17 00:00:00 2001 From: Andrey Ulanov Date: Mon, 12 Dec 2016 17:38:18 -0800 Subject: [PATCH] nspawn: when getting SIGCHLD make sure it's from the first @@ -73,6 +73,3 @@ index 81573be95a..503265545b 100644 if (arg_expose_ports) { r = expose_port_watch_rtnl(event, rtnl_socket_pair[0], on_address_change, exposed, &rtnl); --- -2.9.3 - diff --git a/0027-machinectl-make-machinectl-E-shell-work.patch b/0027-machinectl-make-machinectl-E-shell-work.patch index 9416c19..32d6663 100644 --- a/0027-machinectl-make-machinectl-E-shell-work.patch +++ b/0027-machinectl-make-machinectl-E-shell-work.patch @@ -1,4 +1,4 @@ -From 60f9c0937c0a24b7d1e4147ec4354d26bf6b092b Mon Sep 17 00:00:00 2001 +From 1fd8d16fb95b883c927fc8ec73b343b4edba5e6b Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 6 Dec 2016 19:35:31 +0100 Subject: [PATCH] =?UTF-8?q?machinectl:=20make=20"machinectl=20-E=20?= @@ -26,6 +26,3 @@ index 7b9be3b425..d54caecf46 100644 c = getopt_long(argc, argv, option_string + reorder, options, NULL); if (c < 0) --- -2.9.3 - diff --git a/0028-sysv-generator-properly-translate-sysv-facilities.patch b/0028-sysv-generator-properly-translate-sysv-facilities.patch index f08d302..8254360 100644 --- a/0028-sysv-generator-properly-translate-sysv-facilities.patch +++ b/0028-sysv-generator-properly-translate-sysv-facilities.patch @@ -1,4 +1,4 @@ -From 827c431cad554cd4d5c477b0f6e608e36edb1301 Mon Sep 17 00:00:00 2001 +From 59ebe5b42ccd7cacbf5975f8ddc1aa42c78e45db Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 6 Dec 2016 19:36:30 +0100 Subject: [PATCH] sysv-generator: properly translate sysv facilities @@ -52,6 +52,3 @@ index c2c80175a2..212cf7a988 100644 /* Everything else we assume to be normal service names */ m = sysv_translate_name(n); --- -2.9.3 - diff --git a/0029-core-downgrade-Time-has-been-changed-to-debug-4906.patch b/0029-core-downgrade-Time-has-been-changed-to-debug-4906.patch index cf374f2..4f93591 100644 --- a/0029-core-downgrade-Time-has-been-changed-to-debug-4906.patch +++ b/0029-core-downgrade-Time-has-been-changed-to-debug-4906.patch @@ -1,4 +1,4 @@ -From 9f4c52f375beeea987d4ca19920a8bb9d18e69ca Mon Sep 17 00:00:00 2001 +From eac04c9feff868c79f7d8438ef66aeb6f2a8a6c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 18 Dec 2016 07:21:19 -0500 Subject: [PATCH] core: downgrade "Time has been changed" to debug (#4906) @@ -38,6 +38,3 @@ index ffccfdcd5e..322e69a69c 100644 LOG_MESSAGE_ID(SD_MESSAGE_TIME_CHANGE), LOG_MESSAGE("Time has been changed"), NULL); --- -2.9.3 - diff --git a/0030-machinectl-handle-EOPNOTSUPP-from-print_addresses-49.patch b/0030-machinectl-handle-EOPNOTSUPP-from-print_addresses-49.patch index b69d670..dabb4eb 100644 --- a/0030-machinectl-handle-EOPNOTSUPP-from-print_addresses-49.patch +++ b/0030-machinectl-handle-EOPNOTSUPP-from-print_addresses-49.patch @@ -1,4 +1,4 @@ -From f8b6aec183d393c6932c0ac75c106646cd33d3af Mon Sep 17 00:00:00 2001 +From d3d04283c458c1313ed87a12af538d8e0540e88d Mon Sep 17 00:00:00 2001 From: Graeme Lawes Date: Sun, 25 Dec 2016 06:14:41 -0500 Subject: [PATCH] machinectl: handle EOPNOTSUPP from print_addresses (#4979) @@ -23,6 +23,3 @@ index d54caecf46..f84226f58f 100644 printf("-\n"); } --- -2.9.3 - diff --git a/0031-units-fix-condition-for-systemd-journal-catalog-upda.patch b/0031-units-fix-condition-for-systemd-journal-catalog-upda.patch index 96e61e1..f7ff982 100644 --- a/0031-units-fix-condition-for-systemd-journal-catalog-upda.patch +++ b/0031-units-fix-condition-for-systemd-journal-catalog-upda.patch @@ -1,4 +1,4 @@ -From b089ddffd2eef138a80849f6cdb35c330747ad27 Mon Sep 17 00:00:00 2001 +From 511b40e49641a8f59014472ce8e96a7ef61f3cad Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 29 Dec 2016 10:38:52 +0100 Subject: [PATCH] units: fix condition for @@ -25,6 +25,3 @@ index 6370dd478f..276f052b1a 100644 [Service] Type=oneshot --- -2.9.3 - diff --git a/0032-core-fix-sockaddr-length-calculation-for-sockaddr_pr.patch b/0032-core-fix-sockaddr-length-calculation-for-sockaddr_pr.patch index 19c3c52..4c39616 100644 --- a/0032-core-fix-sockaddr-length-calculation-for-sockaddr_pr.patch +++ b/0032-core-fix-sockaddr-length-calculation-for-sockaddr_pr.patch @@ -1,4 +1,4 @@ -From 93836ed31bf91d10667b67f445af374c2e513bae Mon Sep 17 00:00:00 2001 +From 6eda08fbff4f911c5884876a33708cf17fa28a8b Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 29 Dec 2016 11:21:37 +0100 Subject: [PATCH] core: fix sockaddr length calculation for sockaddr_pretty() @@ -55,6 +55,3 @@ index 0b1c4acfec..fe2020008f 100644 log_unit_warning(UNIT(s), "Too many incoming connections (%u) from source %s, dropping connection.", --- -2.9.3 - diff --git a/0033-shared-fix-double-free-in-unmask-5005.patch b/0033-shared-fix-double-free-in-unmask-5005.patch index 2c43e5c..e9ef9b7 100644 --- a/0033-shared-fix-double-free-in-unmask-5005.patch +++ b/0033-shared-fix-double-free-in-unmask-5005.patch @@ -1,4 +1,4 @@ -From ff9411f6d3f63e765bf29853b920605965a16794 Mon Sep 17 00:00:00 2001 +From 83d9a6e89af9caebe109c5f309c7bc2d82bd8fc4 Mon Sep 17 00:00:00 2001 From: Jan Synacek Date: Tue, 3 Jan 2017 21:34:36 +0100 Subject: [PATCH] shared: fix double free in unmask (#5005) @@ -38,6 +38,3 @@ index 96fba6e25b..5f0eec3ccb 100644 } strv_uniq(todo); --- -2.9.3 - diff --git a/0034-shared-fix-double-free-in-link.patch b/0034-shared-fix-double-free-in-link.patch index dbf26e6..4c5c274 100644 --- a/0034-shared-fix-double-free-in-link.patch +++ b/0034-shared-fix-double-free-in-link.patch @@ -1,4 +1,4 @@ -From 588e4827d274279941533a9708101835b2d2e986 Mon Sep 17 00:00:00 2001 +From a4ead9514b411945f9525ac33901db2b557ce9d0 Mon Sep 17 00:00:00 2001 From: Evgeny Vereshchagin Date: Mon, 9 Jan 2017 04:46:11 +0000 Subject: [PATCH] shared: fix double free in link @@ -115,6 +115,3 @@ index 5f0eec3ccb..64fe522ebb 100644 } strv_uniq(todo); --- -2.9.3 - diff --git a/0035-shared-check-strdup-NULL.patch b/0035-shared-check-strdup-NULL.patch index 98295e4..7897611 100644 --- a/0035-shared-check-strdup-NULL.patch +++ b/0035-shared-check-strdup-NULL.patch @@ -1,4 +1,4 @@ -From a60dee7506c9f8895f3cdeea9dbf48f134072470 Mon Sep 17 00:00:00 2001 +From acfeb54e985d6f4d589c574ba5d467fbe4d556b7 Mon Sep 17 00:00:00 2001 From: Evgeny Vereshchagin Date: Mon, 9 Jan 2017 22:45:41 +0000 Subject: [PATCH] shared: check strdup != NULL @@ -27,6 +27,3 @@ index 64fe522ebb..0bb47ac527 100644 } strv_uniq(todo); --- -2.9.3 - diff --git a/0036-rpm-triggers-do-nothing-if-systemd-is-not-running-50.patch b/0036-rpm-triggers-do-nothing-if-systemd-is-not-running-50.patch index 66f51a9..25871f2 100644 --- a/0036-rpm-triggers-do-nothing-if-systemd-is-not-running-50.patch +++ b/0036-rpm-triggers-do-nothing-if-systemd-is-not-running-50.patch @@ -1,4 +1,4 @@ -From b3ac083a877c6cd1153f7e99e7304e6eccfd6c8b Mon Sep 17 00:00:00 2001 +From fba761f0bc86d37119bd18f7bc231e2d9f5d94a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 12 Jan 2017 04:16:20 -0500 Subject: [PATCH] rpm triggers: do nothing if systemd is not running (#5065) @@ -55,6 +55,3 @@ index 0d8c303136..f8c8cbc5f9 100644 %filetriggerpostun -P 1000100 -p -- @systemunitdir@ /etc/systemd/system if posix.access("%{_localstatedir}/lib/rpm-state/systemd/needs-reload") then --- -2.9.3 - diff --git a/0037-kernel-install-avoid-process-substitution.patch b/0037-kernel-install-avoid-process-substitution.patch index 1cc9ea6..5e466ff 100644 --- a/0037-kernel-install-avoid-process-substitution.patch +++ b/0037-kernel-install-avoid-process-substitution.patch @@ -1,4 +1,4 @@ -From 5d98b45dac05bfde38c68d86e286bb8ce34bf932 Mon Sep 17 00:00:00 2001 +From f1e5bbe0ef234b5e6c8a2cd7f601a75a7678cd27 Mon Sep 17 00:00:00 2001 From: Michal Schmidt Date: Fri, 16 Dec 2016 18:14:47 +0100 Subject: [PATCH] kernel-install: avoid process substitution @@ -51,6 +51,3 @@ index a95b9717f0..c7d9f4eea9 100644 case $COMMAND in add) --- -2.9.3 - diff --git a/0038-shell-completion-redirect-all-errors-from-systemctl-.patch b/0038-shell-completion-redirect-all-errors-from-systemctl-.patch index 80ec35d..81666a6 100644 --- a/0038-shell-completion-redirect-all-errors-from-systemctl-.patch +++ b/0038-shell-completion-redirect-all-errors-from-systemctl-.patch @@ -1,4 +1,4 @@ -From da44d79b06cdfbcf77fb2e1c9ce8b826c2826748 Mon Sep 17 00:00:00 2001 +From 3f40c958104c4a83a32ad303cd7153f79cb7a6a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 11 Jan 2017 14:45:19 -0500 Subject: [PATCH] shell-completion: redirect all errors from systemctl to @@ -39,6 +39,3 @@ index 03a1c930b0..d77a2df74e 100644 } --- -2.9.3 - diff --git a/0039-cryptsetup-fix-unitialized-variable.patch b/0039-cryptsetup-fix-unitialized-variable.patch index b3360b9..634118b 100644 --- a/0039-cryptsetup-fix-unitialized-variable.patch +++ b/0039-cryptsetup-fix-unitialized-variable.patch @@ -1,4 +1,4 @@ -From 6c089c4f0c306e2192ec17f85c12c71f8ee87794 Mon Sep 17 00:00:00 2001 +From 7770e9fc69d7545b4ebf77567cce3f8b85c7ccf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 15 Jan 2017 11:51:48 -0500 Subject: [PATCH] cryptsetup: fix unitialized variable @@ -24,6 +24,3 @@ index ff5a3f36fb..a90bee81bb 100644 goto finish; } --- -2.9.3 - diff --git a/0040-systemctl-uninitalized-variable.patch b/0040-systemctl-uninitalized-variable.patch index dbf5876..99631a6 100644 --- a/0040-systemctl-uninitalized-variable.patch +++ b/0040-systemctl-uninitalized-variable.patch @@ -1,4 +1,4 @@ -From 05db1e6a7adc1ce6e95bbee1751f1f5b124f3d20 Mon Sep 17 00:00:00 2001 +From 3a087e730c2be5d6abe8f9775a707af925e2520b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 15 Jan 2017 13:27:37 -0500 Subject: [PATCH] systemctl: uninitalized variable @@ -26,6 +26,3 @@ index 4edc690f5c..1a4a201740 100644 } else { id_len = max_id_len; desc_len = max_desc_len; --- -2.9.3 - diff --git a/0041-bash_completion-journalctl-add-missing-options.patch b/0041-bash_completion-journalctl-add-missing-options.patch index 636b217..fe11c1d 100644 --- a/0041-bash_completion-journalctl-add-missing-options.patch +++ b/0041-bash_completion-journalctl-add-missing-options.patch @@ -1,4 +1,4 @@ -From c11e97561716e1378f7812e880269638b4130d26 Mon Sep 17 00:00:00 2001 +From 176e36e83f44d5486945afa9beffc1e32799d546 Mon Sep 17 00:00:00 2001 From: Namhyung Kim Date: Sat, 21 Jan 2017 16:36:20 +0900 Subject: [PATCH] bash_completion: journalctl: add missing options @@ -27,6 +27,3 @@ index a999a10df1..ded92cb73a 100644 [ARGUNKNOWN]='-c --cursor --interval -n --lines -S --since -U --until --after-cursor --verify-key -t --identifier --root' --- -2.9.3 - diff --git a/0042-bash_completion-journalctl-Complete-t-option-values.patch b/0042-bash_completion-journalctl-Complete-t-option-values.patch index 6af4f9b..119f3ac 100644 --- a/0042-bash_completion-journalctl-Complete-t-option-values.patch +++ b/0042-bash_completion-journalctl-Complete-t-option-values.patch @@ -1,4 +1,4 @@ -From 7123cd16a4cb8c25d16d0b366e79598a22fa0dc5 Mon Sep 17 00:00:00 2001 +From 5efdac319bea6c000b17af77b7d1b3ba1dce6432 Mon Sep 17 00:00:00 2001 From: Namhyung Kim Date: Sat, 21 Jan 2017 16:38:23 +0900 Subject: [PATCH] bash_completion: journalctl: Complete -t option values @@ -24,6 +24,3 @@ index ded92cb73a..c90a114497 100644 *) return 0 ;; --- -2.9.3 - diff --git a/0043-Fixi-caching-in-zsh-completion-5122.patch b/0043-Fixi-caching-in-zsh-completion-5122.patch index 6f3f669..b0242ac 100644 --- a/0043-Fixi-caching-in-zsh-completion-5122.patch +++ b/0043-Fixi-caching-in-zsh-completion-5122.patch @@ -1,4 +1,4 @@ -From 44d387cadd019d812bbed0f79360f9e66b7e96c2 Mon Sep 17 00:00:00 2001 +From d8386bfd28676e1c6fd88deaf203eb1cd7585233 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?= =?UTF-8?q?=D0=A2=D0=B8=D1=85=D0=BE=D0=BD=D0=BE=D0=B2?= @@ -72,6 +72,3 @@ index d77a2df74e..553216da5e 100644 fi _values -s , "${_sys_all_properties[@]}" } --- -2.9.3 - diff --git a/0044-bash-completion-add-support-for-now-5155.patch b/0044-bash-completion-add-support-for-now-5155.patch index 8fb3101..8b8f295 100644 --- a/0044-bash-completion-add-support-for-now-5155.patch +++ b/0044-bash-completion-add-support-for-now-5155.patch @@ -1,4 +1,4 @@ -From a0a44b26b5438fc45c28b6918542ebd84810fbd2 Mon Sep 17 00:00:00 2001 +From 59ce906fbeabbf3c519ee22fb4b653b2acb8fff1 Mon Sep 17 00:00:00 2001 From: Jan Synacek Date: Wed, 25 Jan 2017 13:44:04 +0100 Subject: [PATCH] bash-completion: add support for --now (#5155) @@ -21,6 +21,3 @@ index 34589e2888..7765010869 100644 --quiet -q --privileged -P --system --user --version --runtime --recursive -r --firmware-setup --show-types -i --ignore-inhibitors --plain' [ARG]='--host -H --kill-who --property -p --signal -s --type -t --state --job-mode --root --- -2.9.3 - diff --git a/0045-core-dbus-fix-two-strv-memleaks.patch b/0045-core-dbus-fix-two-strv-memleaks.patch index 4162ef6..5ff03dc 100644 --- a/0045-core-dbus-fix-two-strv-memleaks.patch +++ b/0045-core-dbus-fix-two-strv-memleaks.patch @@ -1,4 +1,4 @@ -From 6c179c1c15b7a0289bd77681353475fd40d3f877 Mon Sep 17 00:00:00 2001 +From 0cb96989634afde3f1b7b86420e003a34dcf5551 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 24 Jan 2017 22:21:16 -0500 Subject: [PATCH] core/dbus: fix two strv memleaks @@ -33,6 +33,3 @@ index 070974fe66..c6fcd01138 100644 Manager *m = userdata; unsigned k = 0; Iterator i; --- -2.9.3 - diff --git a/0046-core-execute-fix-strv-memleak.patch b/0046-core-execute-fix-strv-memleak.patch index b23471c..d162ccd 100644 --- a/0046-core-execute-fix-strv-memleak.patch +++ b/0046-core-execute-fix-strv-memleak.patch @@ -1,4 +1,4 @@ -From 9fa10892653f7a23939356d018c62beb2044349f Mon Sep 17 00:00:00 2001 +From f2f5c4de715e65db93d57d7bcafe9caef3f7a79e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 24 Jan 2017 22:24:07 -0500 Subject: [PATCH] core/execute: fix strv memleak @@ -35,6 +35,3 @@ index f13ca30395..38cd486d82 100644 char *tmp = NULL, *var = NULL; const char *root_dir = NULL; NameSpaceInfo ns_info = { --- -2.9.3 - diff --git a/0047-resolve-fix-strv-memleak.patch b/0047-resolve-fix-strv-memleak.patch index 1698add..1eb32c7 100644 --- a/0047-resolve-fix-strv-memleak.patch +++ b/0047-resolve-fix-strv-memleak.patch @@ -1,4 +1,4 @@ -From 31d6f68def2f824a21190013e17445094f106e2b Mon Sep 17 00:00:00 2001 +From f0dc398e4862dffc768be3a8fc59c5c5a012a5e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 24 Jan 2017 22:27:21 -0500 Subject: [PATCH] resolve: fix strv memleak @@ -23,6 +23,3 @@ index 364812250f..59cd6cf1cb 100644 Link *l = userdata; int r; char **i; --- -2.9.3 - diff --git a/0048-nspawn-fix-clobbering-of-selinux-context-arg.patch b/0048-nspawn-fix-clobbering-of-selinux-context-arg.patch index 9630b04..6198fce 100644 --- a/0048-nspawn-fix-clobbering-of-selinux-context-arg.patch +++ b/0048-nspawn-fix-clobbering-of-selinux-context-arg.patch @@ -1,4 +1,4 @@ -From f9b89affee12bf7383cf2210798489c7197c5765 Mon Sep 17 00:00:00 2001 +From b6700f38b414fa8e97a29fae221d8f02af4b3375 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 27 Jan 2017 00:45:38 -0500 Subject: [PATCH] nspawn: fix clobbering of selinux context arg @@ -25,6 +25,3 @@ index 503265545b..0e2f4d59a5 100644 case 'Z': arg_selinux_context = optarg; --- -2.9.3 - diff --git a/0049-parse_hwdb-fix-to-work-with-pyparsing-2.1.10.patch b/0049-parse_hwdb-fix-to-work-with-pyparsing-2.1.10.patch index 7861fee..88bac70 100644 --- a/0049-parse_hwdb-fix-to-work-with-pyparsing-2.1.10.patch +++ b/0049-parse_hwdb-fix-to-work-with-pyparsing-2.1.10.patch @@ -1,4 +1,4 @@ -From bcb9684d0cdb56e4924da6a7dc36d74bd8ef5faf Mon Sep 17 00:00:00 2001 +From d30213c50db935f63987447d44d637bc9a00bf71 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Wed, 30 Nov 2016 09:20:15 +0100 Subject: [PATCH] parse_hwdb: fix to work with pyparsing 2.1.10 @@ -27,6 +27,3 @@ index 5d4c5ea64d..5856d12af7 100755 COMMENTLINE = pythonStyleComment + EOL INTEGER = Word(nums) REAL = Combine((INTEGER + Optional('.' + Optional(INTEGER))) ^ ('.' + INTEGER)) --- -2.9.3 - diff --git a/0050-journald-don-t-flush-to-var-log-journal-before-we-ge.patch b/0050-journald-don-t-flush-to-var-log-journal-before-we-ge.patch index 50d34f5..79f9b9d 100644 --- a/0050-journald-don-t-flush-to-var-log-journal-before-we-ge.patch +++ b/0050-journald-don-t-flush-to-var-log-journal-before-we-ge.patch @@ -1,4 +1,4 @@ -From 9a9a2deb4b5c7dcd07ba64e1d01a21d00fbe08f3 Mon Sep 17 00:00:00 2001 +From 53ae6296386a754ed74a1d3fbd88f39ab7a89f0d Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 12 Dec 2016 20:54:45 +0100 Subject: [PATCH] journald: don't flush to /var/log/journal before we get asked @@ -131,6 +131,3 @@ index 7f47ca22dd..9ac21457f6 100644 server_flush_dev_kmsg(&server); log_debug("systemd-journald running as pid "PID_FMT, getpid()); --- -2.9.3 - diff --git a/0051-tree-wide-drop-NULL-sentinel-from-strjoin.patch b/0051-tree-wide-drop-NULL-sentinel-from-strjoin.patch index 85a870c..72bea3a 100644 --- a/0051-tree-wide-drop-NULL-sentinel-from-strjoin.patch +++ b/0051-tree-wide-drop-NULL-sentinel-from-strjoin.patch @@ -1,4 +1,4 @@ -From dc5813c259a23678a6521c5d52af50f2825ceacd Mon Sep 17 00:00:00 2001 +From 3fe7a210f1277a61b1281c91684103c730234429 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 23 Oct 2016 11:43:27 -0400 Subject: [PATCH] tree-wide: drop NULL sentinel from strjoin @@ -2116,6 +2116,3 @@ index 1bffe8e8ab..70a5fa4d7a 100644 if (!hwdb_bin) { rc = EXIT_FAILURE; goto out; --- -2.9.3 - diff --git a/0052-core-add-new-RestrictNamespaces-unit-file-setting.patch b/0052-core-add-new-RestrictNamespaces-unit-file-setting.patch index 718b1ed..16ac34a 100644 --- a/0052-core-add-new-RestrictNamespaces-unit-file-setting.patch +++ b/0052-core-add-new-RestrictNamespaces-unit-file-setting.patch @@ -1,4 +1,4 @@ -From 9b51665a3d2cd2678c78e2dc42ec6b40e83232f7 Mon Sep 17 00:00:00 2001 +From d262fb5809de27d51e9d6b97c6b114804c2b95c5 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 1 Nov 2016 20:25:19 -0600 Subject: [PATCH] core: add new RestrictNamespaces= unit file setting @@ -867,6 +867,3 @@ index 43d1567288..beb6a7f422 100644 return 0; } --- -2.9.3 - diff --git a/0053-seccomp-rework-seccomp-code-to-improve-compat-with-s.patch b/0053-seccomp-rework-seccomp-code-to-improve-compat-with-s.patch index e49617d..797a992 100644 --- a/0053-seccomp-rework-seccomp-code-to-improve-compat-with-s.patch +++ b/0053-seccomp-rework-seccomp-code-to-improve-compat-with-s.patch @@ -1,4 +1,4 @@ -From 8296437564980199342f4fd9f2c85312570ba060 Mon Sep 17 00:00:00 2001 +From 71357f8a2ac8b1435e81b11e123c7223340a94c8 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 27 Dec 2016 15:28:25 +0100 Subject: [PATCH] seccomp: rework seccomp code, to improve compat with some @@ -2016,6 +2016,3 @@ index beb6a7f422..6f15879c45 100644 return 0; } --- -2.9.3 - diff --git a/0054-build-sys-add-check-for-gperf-lookup-function-signat.patch b/0054-build-sys-add-check-for-gperf-lookup-function-signat.patch index 15c0d0f..847a95c 100644 --- a/0054-build-sys-add-check-for-gperf-lookup-function-signat.patch +++ b/0054-build-sys-add-check-for-gperf-lookup-function-signat.patch @@ -1,4 +1,4 @@ -From a6bb2c249be58469888cf3b1502f1a01de06bd33 Mon Sep 17 00:00:00 2001 +From 79a5d862a7abe903f456a75d6d1ca3c11adfa379 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Tue, 10 Jan 2017 02:39:05 -0500 Subject: [PATCH] build-sys: add check for gperf lookup function signature @@ -298,6 +298,3 @@ index aa10beafb0..09024116f2 100644 #include "keyboard-keys-from-name.h" static int install_force_release(struct udev_device *dev, const unsigned *release, unsigned release_count) { --- -2.9.3 - diff --git a/0055-journal-gatewayd-actually-recognize-D-as-a-synonym-f.patch b/0055-journal-gatewayd-actually-recognize-D-as-a-synonym-f.patch new file mode 100644 index 0000000..66c1e58 --- /dev/null +++ b/0055-journal-gatewayd-actually-recognize-D-as-a-synonym-f.patch @@ -0,0 +1,24 @@ +From ce4f32f42dcb91120445d2858baa9fd81abd5292 Mon Sep 17 00:00:00 2001 +From: Ivan Shapovalov +Date: Sun, 29 Jan 2017 23:33:37 +0400 +Subject: [PATCH] journal-gatewayd: actually recognize -D as a synonym for + --directory (#5180) + +(cherry picked from commit 554597a1b27ad0a81f4ad0884b348d475e89cb9e) +--- + src/journal-remote/journal-gatewayd.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c +index f75a6f06d2..be6d41c31b 100644 +--- a/src/journal-remote/journal-gatewayd.c ++++ b/src/journal-remote/journal-gatewayd.c +@@ -912,7 +912,7 @@ static int parse_argv(int argc, char *argv[]) { + assert(argc >= 0); + assert(argv); + +- while ((c = getopt_long(argc, argv, "h", options, NULL)) >= 0) ++ while ((c = getopt_long(argc, argv, "hD:", options, NULL)) >= 0) + + switch(c) { + diff --git a/0056-journal-gatewayd-return-EINVAL-if-ARG_TRUST-and-HAVE.patch b/0056-journal-gatewayd-return-EINVAL-if-ARG_TRUST-and-HAVE.patch new file mode 100644 index 0000000..4f8135d --- /dev/null +++ b/0056-journal-gatewayd-return-EINVAL-if-ARG_TRUST-and-HAVE.patch @@ -0,0 +1,24 @@ +From ff1720307554405a422281591dba9b79f085799b Mon Sep 17 00:00:00 2001 +From: Yi EungJun +Date: Tue, 31 Jan 2017 00:24:06 +0900 +Subject: [PATCH] journal-gatewayd: return -EINVAL if ARG_TRUST and HAVE_GNUTLS + (#5181) + +This bug was introduced by 1aa1e59. +(cherry picked from commit 3ab2feefd7d1918e8f0d0edaea46a87cbed0f211) +--- + src/journal-remote/journal-gatewayd.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c +index be6d41c31b..c7c6224421 100644 +--- a/src/journal-remote/journal-gatewayd.c ++++ b/src/journal-remote/journal-gatewayd.c +@@ -958,6 +958,7 @@ static int parse_argv(int argc, char *argv[]) { + break; + #else + log_error("Option --trust is not available."); ++ return -EINVAL; + #endif + case 'D': + arg_directory = optarg; diff --git a/0057-systemctl-always-avoid-being-killed-when-doing-switc.patch b/0057-systemctl-always-avoid-being-killed-when-doing-switc.patch new file mode 100644 index 0000000..5e425c2 --- /dev/null +++ b/0057-systemctl-always-avoid-being-killed-when-doing-switc.patch @@ -0,0 +1,32 @@ +From 228523c0b9f077d60a4744776a73ff29b4c18dd2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Sat, 28 Jan 2017 21:18:31 -0500 +Subject: [PATCH] systemctl: always avoid being killed when doing switch-root + +The same logic as described in acc28e2e3037d689d6481e applies to any time we are +switching root, to just set the flag unconditionally. + +(cherry picked from commit b3ad0ff48c154ed056a6bded2adac609395a9439) +--- + src/systemctl/systemctl.c | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c +index b598a2a19d..4f528f6079 100644 +--- a/src/systemctl/systemctl.c ++++ b/src/systemctl/systemctl.c +@@ -5587,11 +5587,9 @@ static int switch_root(int argc, char *argv[], void *userdata) { + } + + /* Instruct PID1 to exclude us from its killing spree applied during +- * the transition from the initrd to the main system otherwise we would +- * exit with a failure status even though the switch to the new root +- * has succeed. */ +- if (in_initrd()) +- argv_cmdline[0] = '@'; ++ * the transition. Otherwise we would exit with a failure status even ++ * though the switch to the new root has succeed. */ ++ argv_cmdline[0] = '@'; + + r = acquire_bus(BUS_MANAGER, &bus); + if (r < 0) diff --git a/0058-systemctl-ignore-SIGTERM-after-switch-root.patch b/0058-systemctl-ignore-SIGTERM-after-switch-root.patch new file mode 100644 index 0000000..82112f0 --- /dev/null +++ b/0058-systemctl-ignore-SIGTERM-after-switch-root.patch @@ -0,0 +1,43 @@ +From 60532427251167b8cb2a733e19eb25ecac5c1632 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Mon, 30 Jan 2017 13:06:10 -0500 +Subject: [PATCH] systemctl: ignore SIGTERM after switch root + +https://bugzilla.redhat.com/show_bug.cgi?id=1414904#c14 and #c15. +(cherry picked from commit 8a7a9ceab204fb02fd5d93a765b36b31efeb9beb) +--- + src/systemctl/systemctl.c | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c +index 4f528f6079..d68c06d9d4 100644 +--- a/src/systemctl/systemctl.c ++++ b/src/systemctl/systemctl.c +@@ -5595,6 +5595,14 @@ static int switch_root(int argc, char *argv[], void *userdata) { + if (r < 0) + return r; + ++ /* If we are slow to exit after the root switch, the new systemd instance ++ * will send us a signal to terminate. Just ignore it and exit normally. ++ * This way the unit does not end up as failed. ++ */ ++ r = ignore_signals(SIGTERM, -1); ++ if (r < 0) ++ log_warning_errno(r, "Failed to change disposition of SIGTERM to ignore: %m"); ++ + log_debug("Switching root - root: %s; init: %s", root, strna(init)); + + r = sd_bus_call_method( +@@ -5606,8 +5614,11 @@ static int switch_root(int argc, char *argv[], void *userdata) { + &error, + NULL, + "ss", root, init); +- if (r < 0) ++ if (r < 0) { ++ (void) default_signals(SIGTERM, -1); ++ + return log_error_errno(r, "Failed to switch root: %s", bus_error_message(&error, r)); ++ } + + return 0; + } diff --git a/0059-units-restore-Before-dependencies-for-systemd-vconso.patch b/0059-units-restore-Before-dependencies-for-systemd-vconso.patch new file mode 100644 index 0000000..ffe787d --- /dev/null +++ b/0059-units-restore-Before-dependencies-for-systemd-vconso.patch @@ -0,0 +1,34 @@ +From 007cdfc4cd2ce5ffe0a1b5eb6a5481d1b06c5184 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Tue, 31 Jan 2017 00:34:33 -0500 +Subject: [PATCH] units: restore Before dependencies for + systemd-vconsole-setup.service + +When the service is run in the initramfs, it is possible for it to get started +and not be fast enough to exit before the root switch happens. It is started +multiple times (depending on the consoles being detected), and runs +asynchronously, so this is quite likely. It'll then get killed by killall(), +and systemd will consider the service failed. To avoid all this, just wait +for the service to terminate on it's own. + +Before=initrd-switch-root.target should be good for the initramfs, and +Before=shutdown.tuarget should be good for the real system, although it's +unlikely to make any difference there. + +(cherry picked from commit 750e550eba362096d56a35104c6a32631aa67b8e) +--- + units/systemd-vconsole-setup.service.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/units/systemd-vconsole-setup.service.in b/units/systemd-vconsole-setup.service.in +index 2bd1fd1a5d..8bb75c6a4f 100644 +--- a/units/systemd-vconsole-setup.service.in ++++ b/units/systemd-vconsole-setup.service.in +@@ -9,6 +9,7 @@ + Description=Setup Virtual Console + Documentation=man:systemd-vconsole-setup.service(8) man:vconsole.conf(5) + DefaultDependencies=no ++Before=initrd-switch-root.target shutdown.target + ConditionPathExists=/dev/tty0 + + [Service] diff --git a/0060-coredump-really-extract-container-cmdline-5167.patch b/0060-coredump-really-extract-container-cmdline-5167.patch new file mode 100644 index 0000000..b992494 --- /dev/null +++ b/0060-coredump-really-extract-container-cmdline-5167.patch @@ -0,0 +1,49 @@ +From 79efa8e7ab4282c8c5e3a917531d5c42452377a5 Mon Sep 17 00:00:00 2001 +From: Evgeny Vereshchagin +Date: Tue, 31 Jan 2017 19:04:20 +0300 +Subject: [PATCH] coredump: really extract container cmdline (#5167) + +Fixes: +``` +root# systemd-nspawn -D ./cont/ --register=no /bin/sh -c '/bin/sh -c "kill -ABRT \$\$"' +... +Container cont failed with error code 134. + +root# journalctl MESSAGE_ID=fc2e22bc6ee647b6b90729ab34a250b1 -o verbose | grep -i container_cmdline +...prints nothing... +...should be COREDUMP_CONTAINER_CMDLINE=systemd-nspawn -D ./cont/ --register=no /bin/sh -c /bin/sh -c "kill -ABRT \$\$" +``` + +Also, fixes CID #1368263 +``` +==352== 130 bytes in 1 blocks are definitely lost in loss record 1 of 2 +==352== at 0x4C2ED5F: realloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) +==352== by 0x4ED8581: greedy_realloc (alloc-util.c:57) +==352== by 0x4ECAAD5: get_process_cmdline (process-util.c:147) +==352== by 0x10E385: get_process_container_parent_cmdline (coredump.c:645) +==352== by 0x112949: process_kernel (coredump.c:1240) +==352== by 0x113003: main (coredump.c:1297) +==352== +``` +(cherry picked from commit d3cba4eaf618ced1935a96e721b2fbcbad7694bb) +--- + src/coredump/coredump.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/coredump/coredump.c b/src/coredump/coredump.c +index 6bd0e925eb..1c5e72c835 100644 +--- a/src/coredump/coredump.c ++++ b/src/coredump/coredump.c +@@ -642,7 +642,11 @@ static int get_process_container_parent_cmdline(pid_t pid, char** cmdline) { + if (r < 0) + return r; + +- return get_process_cmdline(container_pid, 0, false, cmdline); ++ r = get_process_cmdline(container_pid, 0, false, cmdline); ++ if (r < 0) ++ return r; ++ ++ return 1; + } + + static int change_uid_gid(const char *context[]) { diff --git a/systemd.spec b/systemd.spec index 64f7c6e..06c8b29 100644 --- a/systemd.spec +++ b/systemd.spec @@ -12,7 +12,7 @@ Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd Version: 232 -Release: 11%{?gitcommit:.git%{gitcommitshort}}%{?dist} +Release: 12%{?gitcommit:.git%{gitcommitshort}}%{?dist} # For a breakdown of the licensing, see README License: LGPLv2+ and MIT and GPLv2+ Summary: System and Service Manager @@ -39,7 +39,7 @@ Source10: systemd-udev-trigger-no-reload.conf Source11: 20-grubby.install Source12: https://raw.githubusercontent.com/systemd/systemd/1000522a60ceade446773c67031b47a566d4a70d/src/login/systemd-user.m4 -# GIT_DIR=../../src/systemd/.git git format-patch-ab -M -N v232..v232-stable +# GIT_DIR=../../src/systemd/.git git format-patch-ab --no-signature -M -N v232..v232-stable # i=1; for j in 00*patch; do printf "Patch%04d: %s\n" $i $j; i=$((i+1));done|xclip Patch0001: 0001-build-sys-link-test-seccomp-against-seccomp-libs-456.patch @@ -96,6 +96,12 @@ Patch0051: 0051-tree-wide-drop-NULL-sentinel-from-strjoin.patch Patch0052: 0052-core-add-new-RestrictNamespaces-unit-file-setting.patch Patch0053: 0053-seccomp-rework-seccomp-code-to-improve-compat-with-s.patch Patch0054: 0054-build-sys-add-check-for-gperf-lookup-function-signat.patch +Patch0055: 0055-journal-gatewayd-actually-recognize-D-as-a-synonym-f.patch +Patch0056: 0056-journal-gatewayd-return-EINVAL-if-ARG_TRUST-and-HAVE.patch +Patch0057: 0057-systemctl-always-avoid-being-killed-when-doing-switc.patch +Patch0058: 0058-systemctl-ignore-SIGTERM-after-switch-root.patch +Patch0059: 0059-units-restore-Before-dependencies-for-systemd-vconso.patch +Patch0060: 0060-coredump-really-extract-container-cmdline-5167.patch # GIT_DIR=../../src/systemd/.git git diffab -M v232..master@{2017-01-30} hwdb/[67]* > hwdb.patch Patch0997: hwdb.patch @@ -1018,6 +1024,11 @@ getent passwd systemd-journal-upload &>/dev/null || useradd -r -l -g systemd-jou %{_mandir}/man[1578]/systemd-journal-gateway* %changelog +* Tue Jan 31 2017 Zbigniew Jędrzejewski-Szmek - 232-12 +- Backport patch for initrd-switch-root.service getting killed (#1414904) +- Fix sd-journal-gatewayd -D, --trust, and COREDUMP_CONTAINER_CMDLINE + extraction by sd-coredump. + * Sun Jan 29 2017 zbyszek - 232-11 - Backport a number of patches (#1411299, #1413075, #1415745, ##1415358, #1416588, #1408884)