Fix compilation

This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2015-05-20 10:53:40 -04:00
parent 5d3e2085f5
commit 05c90300b1
7 changed files with 41 additions and 17 deletions

View File

@ -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 <lennart@poettering.net> From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 18 May 2015 23:23:17 +0200 Date: Mon, 18 May 2015 23:23:17 +0200
Subject: [PATCH] resolved: fix crash when shutting down 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 http://lists.freedesktop.org/archives/systemd-devel/2015-May/031626.html
(cherry picked from commit cab5b05903096e1c9cf5575ccc73f89d15c8db69) (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-dns-server.c | 15 ++++++++-------
src/resolve/resolved-link.c | 6 +++--- src/resolve/resolved-link.c | 6 +++---
src/resolve/resolved-manager.c | 4 ++-- src/resolve/resolved-manager.c | 4 ++--
src/shared/prioq.c | 6 ++++-- src/shared/prioq.c | 6 ++++--
src/shared/prioq.h | 2 +- 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 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 --- a/src/resolve/resolved-dns-cache.c
+++ b/src/resolve/resolved-dns-cache.c +++ b/src/resolve/resolved-dns-cache.c
@@ -91,11 +91,8 @@ void dns_cache_flush(DnsCache *c) { @@ -93,9 +93,7 @@ void dns_cache_flush(DnsCache *c) {
assert(hashmap_size(c->by_key) == 0);
assert(prioq_size(c->by_expiry) == 0);
- hashmap_free(c->by_key); hashmap_free(c->by_key);
- c->by_key = NULL; c->by_key = NULL;
- -
- prioq_free(c->by_expiry); - prioq_free(c->by_expiry);
- c->by_expiry = NULL; - c->by_expiry = NULL;
+ c->by_key = hashmap_free(c->by_key);
+ c->by_expiry = prioq_free(c->by_expiry); + c->by_expiry = prioq_free(c->by_expiry);
} }

View File

@ -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 <lennart@poettering.net> From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 18 May 2015 23:38:47 +0200 Date: Mon, 18 May 2015 23:38:47 +0200
Subject: [PATCH] resolved: allow DnsAnswer objects with no space for RRs Subject: [PATCH] resolved: allow DnsAnswer objects with no space for RRs

View File

@ -0,0 +1,25 @@
From a9303ae3af9bbf482842c084cc7ba49e206538c2 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
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;

View File

@ -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 <medhefgo@web.de> From: Jan Janssen <medhefgo@web.de>
Date: Fri, 1 May 2015 15:15:16 +0200 Date: Fri, 1 May 2015 15:15:16 +0200
Subject: [PATCH] journalctl: Improve boot ID lookup Subject: [PATCH] journalctl: Improve boot ID lookup

View File

@ -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 <phomes@gmail.com> From: Thomas Hindoe Paaboel Andersen <phomes@gmail.com>
Date: Tue, 19 May 2015 06:33:54 +0200 Date: Tue, 19 May 2015 06:33:54 +0200
Subject: [PATCH] test-hashmap: fix an assert Subject: [PATCH] test-hashmap: fix an assert

View File

@ -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 <lennart@poettering.net> From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 19 May 2015 19:47:52 +0200 Date: Tue, 19 May 2015 19:47:52 +0200
Subject: [PATCH] units: make sure systemd-nspawn@.slice instances are actually Subject: [PATCH] units: make sure systemd-nspawn@.slice instances are actually

View File

@ -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 Patch0173: 0173-zsh-completion-make-the-arrays-_sys_active_units-_sy.patch
Patch0174: 0174-resolved-fix-crash-when-shutting-down.patch Patch0174: 0174-resolved-fix-crash-when-shutting-down.patch
Patch0175: 0175-resolved-allow-DnsAnswer-objects-with-no-space-for-R.patch Patch0175: 0175-resolved-allow-DnsAnswer-objects-with-no-space-for-R.patch
Patch0176: 0176-journalctl-Improve-boot-ID-lookup.patch Patch0176: 0176-id128-add-new-sd_id128_is_null-call.patch
Patch0177: 0177-test-hashmap-fix-an-assert.patch Patch0177: 0177-journalctl-Improve-boot-ID-lookup.patch
Patch0178: 0178-units-make-sure-systemd-nspawn-.slice-instances-are-.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 # 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/sysctl.d/50-coredump.conf
%{_prefix}/lib/sysusers.d/basic.conf %{_prefix}/lib/sysusers.d/basic.conf
%{_prefix}/lib/sysusers.d/systemd.conf %{_prefix}/lib/sysusers.d/systemd.conf
%{pkgdir}/system-preset/90-systemd.preset
%{pkgdir}/catalog/systemd.catalog %{pkgdir}/catalog/systemd.catalog
%{_prefix}/lib/kernel/install.d/50-depmod.install %{_prefix}/lib/kernel/install.d/50-depmod.install
%{_prefix}/lib/kernel/install.d/90-loaderentry.install %{_prefix}/lib/kernel/install.d/90-loaderentry.install