[packages/systemd] - fix sigsegv during daemon deserialization/reexecution - rel 6

[baggins]

commit 5fc987237d29d410867606027accff2e0a3d50af
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Aug 16 17:58:38 2013 +0200

    - fix sigsegv during daemon deserialization/reexecution
    - rel 6

 dont-hash-null-keys.patch | 16 ++++++++++++++++
 systemd.spec              |  4 +++-
 2 files changed, 19 insertions(+), 1 deletion(-)
---
diff --git a/systemd.spec b/systemd.spec
index d372787..bdddf1f 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -16,7 +16,7 @@ Summary(pl.UTF-8):	systemd - zarządca systemu i usług dla Linuksa
 Name:		systemd
 # Verify ChangeLog and NEWS when updating (since there are incompatible/breaking changes very often)
 Version:	206
-Release:	5
+Release:	6
 Epoch:		1
 License:	GPL v2+ (udev), LGPL v2.1+ (the rest)
 Group:		Base
@@ -59,6 +59,7 @@ Patch10:	net-rename-revert.patch
 Patch11:	nss-in-rootlib.patch
 Patch12:	proc-hidepid.patch
 Patch13:	hwdb-dell-keyboard.patch
+Patch14:	dont-hash-null-keys.patch
 URL:		http://www.freedesktop.org/wiki/Software/systemd
 BuildRequires:	acl-devel
 BuildRequires:	attr-devel
@@ -560,6 +561,7 @@ Wiązania do Systemd dla Pythona.
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
 cp -p %{SOURCE2} src/systemd_booted.c
 
 %build
diff --git a/dont-hash-null-keys.patch b/dont-hash-null-keys.patch
new file mode 100644
index 0000000..b50931a
--- /dev/null
+++ b/dont-hash-null-keys.patch
@@ -0,0 +1,16 @@
+--- systemd-206/src/shared/hashmap.c~	2013-07-22 00:43:28.172182934 +0200
++++ systemd-206/src/shared/hashmap.c	2013-08-16 17:28:17.374796716 +0200
+@@ -272,9 +272,11 @@
+         assert(h);
+         assert(e);
+ 
+-        hash = h->hash_func(e->key) % NBUCKETS;
++	if (e->key) {
++	        hash = h->hash_func(e->key) % NBUCKETS;
+ 
+-        unlink_entry(h, e, hash);
++	        unlink_entry(h, e, hash);
++	}
+ 
+         if (h->from_pool)
+                 deallocate_tile(&first_entry_tile, e);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/systemd.git/commitdiff/5fc987237d29d410867606027accff2e0a3d50af