From 05c90300b1a5d0c21281259866ea71982d7e8353 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 20 May 2015 10:53:40 -0400 Subject: [PATCH] Fix compilation --- ...esolved-fix-crash-when-shutting-down.patch | 17 ++++++------- ...nsAnswer-objects-with-no-space-for-R.patch | 2 +- ...-id128-add-new-sd_id128_is_null-call.patch | 25 +++++++++++++++++++ ...77-journalctl-Improve-boot-ID-lookup.patch | 2 +- ...h => 0178-test-hashmap-fix-an-assert.patch | 2 +- ...systemd-nspawn-.slice-instances-are-.patch | 2 +- systemd.spec | 8 +++--- 7 files changed, 41 insertions(+), 17 deletions(-) create mode 100644 0176-id128-add-new-sd_id128_is_null-call.patch rename 0176-journalctl-Improve-boot-ID-lookup.patch => 0177-journalctl-Improve-boot-ID-lookup.patch (99%) rename 0177-test-hashmap-fix-an-assert.patch => 0178-test-hashmap-fix-an-assert.patch (93%) rename 0178-units-make-sure-systemd-nspawn-.slice-instances-are-.patch => 0179-units-make-sure-systemd-nspawn-.slice-instances-are-.patch (92%) diff --git a/0174-resolved-fix-crash-when-shutting-down.patch b/0174-resolved-fix-crash-when-shutting-down.patch index e4d0963..843224a 100644 --- a/0174-resolved-fix-crash-when-shutting-down.patch +++ b/0174-resolved-fix-crash-when-shutting-down.patch @@ -1,4 +1,4 @@ -From 8851f051210fa9c18ffb94ebe601261bacaf37d4 Mon Sep 17 00:00:00 2001 +From 94fa50b44f5b23a075df80bfd4854865ca0b649b Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 18 May 2015 23:23:17 +0200 Subject: [PATCH] resolved: fix crash when shutting down @@ -11,28 +11,25 @@ Reported by Cristian Rodríguez http://lists.freedesktop.org/archives/systemd-devel/2015-May/031626.html (cherry picked from commit cab5b05903096e1c9cf5575ccc73f89d15c8db69) --- - src/resolve/resolved-dns-cache.c | 7 ++----- + src/resolve/resolved-dns-cache.c | 4 +--- src/resolve/resolved-dns-server.c | 15 ++++++++------- src/resolve/resolved-link.c | 6 +++--- src/resolve/resolved-manager.c | 4 ++-- src/shared/prioq.c | 6 ++++-- src/shared/prioq.h | 2 +- - 6 files changed, 20 insertions(+), 20 deletions(-) + 6 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/resolve/resolved-dns-cache.c b/src/resolve/resolved-dns-cache.c -index 33ca4d1a45..be52891681 100644 +index 33ca4d1a45..874207cfb8 100644 --- a/src/resolve/resolved-dns-cache.c +++ b/src/resolve/resolved-dns-cache.c -@@ -91,11 +91,8 @@ void dns_cache_flush(DnsCache *c) { - assert(hashmap_size(c->by_key) == 0); - assert(prioq_size(c->by_expiry) == 0); +@@ -93,9 +93,7 @@ void dns_cache_flush(DnsCache *c) { -- hashmap_free(c->by_key); -- c->by_key = NULL; + hashmap_free(c->by_key); + c->by_key = NULL; - - prioq_free(c->by_expiry); - c->by_expiry = NULL; -+ c->by_key = hashmap_free(c->by_key); + c->by_expiry = prioq_free(c->by_expiry); } diff --git a/0175-resolved-allow-DnsAnswer-objects-with-no-space-for-R.patch b/0175-resolved-allow-DnsAnswer-objects-with-no-space-for-R.patch index 1a25038..63c64d6 100644 --- a/0175-resolved-allow-DnsAnswer-objects-with-no-space-for-R.patch +++ b/0175-resolved-allow-DnsAnswer-objects-with-no-space-for-R.patch @@ -1,4 +1,4 @@ -From c374a32aa317517702ee3531f6fa59be52c4a9f0 Mon Sep 17 00:00:00 2001 +From c3c65351593dde09a2d37b571e0737af94386fe6 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 18 May 2015 23:38:47 +0200 Subject: [PATCH] resolved: allow DnsAnswer objects with no space for RRs diff --git a/0176-id128-add-new-sd_id128_is_null-call.patch b/0176-id128-add-new-sd_id128_is_null-call.patch new file mode 100644 index 0000000..efda7ed --- /dev/null +++ b/0176-id128-add-new-sd_id128_is_null-call.patch @@ -0,0 +1,25 @@ +From a9303ae3af9bbf482842c084cc7ba49e206538c2 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Tue, 24 Feb 2015 00:10:35 +0100 +Subject: [PATCH] id128: add new sd_id128_is_null() call + +(cherry picked from commit 15e80c7b75c3a3188bfaaa0baddccf31ae661a7a) +--- + src/systemd/sd-id128.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/systemd/sd-id128.h b/src/systemd/sd-id128.h +index 48fd87671b..9f445278bb 100644 +--- a/src/systemd/sd-id128.h ++++ b/src/systemd/sd-id128.h +@@ -106,6 +106,10 @@ _sd_pure_ static inline int sd_id128_equal(sd_id128_t a, sd_id128_t b) { + return memcmp(&a, &b, 16) == 0; + } + ++_sd_pure_ static inline int sd_id128_is_null(sd_id128_t a) { ++ return a.qwords[0] == 0 && a.qwords[1] == 0; ++} ++ + #define SD_ID128_NULL ((const sd_id128_t) { .qwords = { 0, 0 }}) + + _SD_END_DECLARATIONS; diff --git a/0176-journalctl-Improve-boot-ID-lookup.patch b/0177-journalctl-Improve-boot-ID-lookup.patch similarity index 99% rename from 0176-journalctl-Improve-boot-ID-lookup.patch rename to 0177-journalctl-Improve-boot-ID-lookup.patch index 1ac0dbf..e183d47 100644 --- a/0176-journalctl-Improve-boot-ID-lookup.patch +++ b/0177-journalctl-Improve-boot-ID-lookup.patch @@ -1,4 +1,4 @@ -From a1b1bfdb3e18c69fe7b7665ac9f7256cf4485bbc Mon Sep 17 00:00:00 2001 +From fb2b7ef1b9a4247adae4a9c85516c72674327488 Mon Sep 17 00:00:00 2001 From: Jan Janssen Date: Fri, 1 May 2015 15:15:16 +0200 Subject: [PATCH] journalctl: Improve boot ID lookup diff --git a/0177-test-hashmap-fix-an-assert.patch b/0178-test-hashmap-fix-an-assert.patch similarity index 93% rename from 0177-test-hashmap-fix-an-assert.patch rename to 0178-test-hashmap-fix-an-assert.patch index 4484e8c..a436178 100644 --- a/0177-test-hashmap-fix-an-assert.patch +++ b/0178-test-hashmap-fix-an-assert.patch @@ -1,4 +1,4 @@ -From 094ea5dd03ece57d3162caf33755d76ff2399bb3 Mon Sep 17 00:00:00 2001 +From 089491f20443a48ad3b65c24b7e98115fe955805 Mon Sep 17 00:00:00 2001 From: Thomas Hindoe Paaboel Andersen Date: Tue, 19 May 2015 06:33:54 +0200 Subject: [PATCH] test-hashmap: fix an assert diff --git a/0178-units-make-sure-systemd-nspawn-.slice-instances-are-.patch b/0179-units-make-sure-systemd-nspawn-.slice-instances-are-.patch similarity index 92% rename from 0178-units-make-sure-systemd-nspawn-.slice-instances-are-.patch rename to 0179-units-make-sure-systemd-nspawn-.slice-instances-are-.patch index a108570..a664d62 100644 --- a/0178-units-make-sure-systemd-nspawn-.slice-instances-are-.patch +++ b/0179-units-make-sure-systemd-nspawn-.slice-instances-are-.patch @@ -1,4 +1,4 @@ -From 97f36b10cbbcc61c6c8194be0af3bb526bab6df2 Mon Sep 17 00:00:00 2001 +From c1d39ccd066356ef5581081a97acfbe847103de7 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 19 May 2015 19:47:52 +0200 Subject: [PATCH] units: make sure systemd-nspawn@.slice instances are actually diff --git a/systemd.spec b/systemd.spec index 86f73e2..2f94859 100644 --- a/systemd.spec +++ b/systemd.spec @@ -213,9 +213,10 @@ Patch0172: 0172-zsh-completion-removing-more-pointless-forks.patch Patch0173: 0173-zsh-completion-make-the-arrays-_sys_active_units-_sy.patch Patch0174: 0174-resolved-fix-crash-when-shutting-down.patch Patch0175: 0175-resolved-allow-DnsAnswer-objects-with-no-space-for-R.patch -Patch0176: 0176-journalctl-Improve-boot-ID-lookup.patch -Patch0177: 0177-test-hashmap-fix-an-assert.patch -Patch0178: 0178-units-make-sure-systemd-nspawn-.slice-instances-are-.patch +Patch0176: 0176-id128-add-new-sd_id128_is_null-call.patch +Patch0177: 0177-journalctl-Improve-boot-ID-lookup.patch +Patch0178: 0178-test-hashmap-fix-an-assert.patch +Patch0179: 0179-units-make-sure-systemd-nspawn-.slice-instances-are-.patch # kernel-install patch for grubby, drop if grubby is obsolete @@ -907,6 +908,7 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd %{_prefix}/lib/sysctl.d/50-coredump.conf %{_prefix}/lib/sysusers.d/basic.conf %{_prefix}/lib/sysusers.d/systemd.conf +%{pkgdir}/system-preset/90-systemd.preset %{pkgdir}/catalog/systemd.catalog %{_prefix}/lib/kernel/install.d/50-depmod.install %{_prefix}/lib/kernel/install.d/90-loaderentry.install