Backport patch for journal storage without USE=lzma, wrt bug #434972.

Package-Manager: portage-2.2.0_alpha127/cvs/Linux x86_64

4 files changed, 47 insertions, 9 deletions

diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index 1e01f1a0a8e8..0615abbc895f 100644
--- a/sys-apps/systemd/ChangeLog
+++ b/sys-apps/systemd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/systemd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.47 2012/09/08 21:10:28 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.48 2012/09/17 09:56:27 mgorny Exp $
+
+*systemd-189-r3 (17 Sep 2012)
+
+  17 Sep 2012; Michał Górny <mgorny@gentoo.org>
+  +files/0004-journal-don-t-try-to-compress-without-XZ.patch,
+  +systemd-189-r3.ebuild, -systemd-189-r2.ebuild:
+  Backport patch for journal storage without USE=lzma, wrt bug #434972.
 
 *systemd-189-r2 (08 Sep 2012)
 
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index df53eb169844..0688c34602a6 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -7,6 +7,7 @@ AUX 0001-util-never-follow-symlinks-in-rm_rf_children.patch 1262 SHA256 4bf6f7d0
 AUX 0002-journal-PAGE_SIZE-is-not-known-on-ppc-and-other-arch.patch 2166 SHA256 935665adb6e6b515fe743463be226b109dabfb46491081ad910eb211fe1922f6 SHA512 74d3c25d170678593215f442a9578b327edb2307caa5299fe70137d80a4a9c4750f4c553a5b04e33f2c5994f57b536bf11bd3b53e12ea907fbb7ad439d94531e WHIRLPOOL b0d8b75325acbbe7a1f27401c85d0dc2fc0b4068b4b9648d9ad73423036024f4abccf0a82775ba98dbf053fc9daa46ca8043c091622e6370fb64f57a78a0c8ec
 AUX 0002-journald-add-missing-includes.patch 2361 SHA256 16706ac16219c815527f919db60584fbbbb77ee3d648c73cdb464504a08ef3cf SHA512 aa325f971dfe64750706ff817b80594a68c98e50e65b1ccc3eec36e5fd825623661016f0c593217129b3049af5f441cceb1673139cfcfb76933ba92ae69ee6e5 WHIRLPOOL 0a3e5cf1d6e2490dcb7dae529f00af6121b40957df186e993d71e80197e8ceb54810aeb6849abf234f47d0d6e4f32de683b6d5c0bcf33c296dca84e9d1f25cc6
 AUX 0003-journal-add-HAVE_XZ-check-to-avoid-build-failure.patch 1223 SHA256 a073095c30e9ec788423b6a474770509c62ae6307ea1282a60b2ca8c1e2fd081 SHA512 fcac5e3039f9ef2762f70b07778948a5d709294d209aa8f8208d80628b482824394662d64fd9ded10a57dfed7ab5f57a1f6d953c3ca28dcdc2d3308368f415b4 WHIRLPOOL 9f071ee137a8fb2e7e9313319c244ddd8a0e5bd4cce1e77b956b9007b3fdac43eefbccfe79bdc6dcfd858ce55508cf4d007d861d9da1c84bc3ee309086d0bba6
+AUX 0004-journal-don-t-try-to-compress-without-XZ.patch 887 SHA256 825324966324f1bd7b207676ef9cd28047bfac566a7fcb6173501ea24e8b2b9a SHA512 5892bac4b57f6c76db6f5c5ea97e9c38be175ba3c5c79d893d2ab6169714a3848a310c119da6a345beb7b243367269349b4261de3fcbe72a6a6661bf52858425 WHIRLPOOL 28c204d55b33aabb42a6b455edfd5a7dada30f658c1964a33fac722531640e0ae24580645351be360b173efcc9386fcba31b304c9de8b46a356a8e1fa86ac6a9
 AUX gentoo-run.conf 226 SHA256 a23fa3b35b4e9d5f1c41dc77cb5be1cec492eb903a57472df3d93a053db28ca7 SHA512 5fe5af27c99426bc1a3494fce9b6f0425cbfe11f6879c95d4efb4ea67b5b036f0573c49ad4396835f15a92a3d7424f6a453d951d63d0ae10d6af92e98e6848db WHIRLPOOL bfaa7425ee4b2c1467bc6fc9dc934d14a4fb43a9b5eaf61a13f5b2229648fe585a6e8d950082e2c2cedab1f938021dd3e29445ecbc72cc4a95056d00b6b7c9ed
 AUX update-etc-systemd-symlinks.path 119 SHA256 4dbbe99fdc4b7922ad6fb4c6f39c975a4b139e04b04a65e3c79650b364fdc02a SHA512 efef4b9a9d34c591b454557ebd35089403a8c01781c52819eba3719dfab527ffe611bcdbe264dffe074a10b5b1472e6c8ac90bd4cd8e5f14b74f441e80b6ea69 WHIRLPOOL f51028fb1bce0d96e3d3c19500687b0ff42144a7234c825b3266db3e1fb8649f5f7fdbdf2af8b565d3ca2a6ee68b9a328087f72aea1d64ee80ed0d2af9b3863a
 AUX update-etc-systemd-symlinks.service 165 SHA256 77f199392367cefc6d70110b955fb5f2ebafaf21ea8ca355b1863a44f130bf69 SHA512 f47ea87e25fbdd201db9b8f4ba4a5b6507c96fded1547d7f090544a00615d75d780fa9724d507c98c24e2b8653ca657af3332ea2cb0f236bfbda1f203cdcb8b5 WHIRLPOOL 4b0c706fe6b3caa512389686378cde9919e4270c8b5db5c49c4f4d45b52c0da89088058989396976aa6bcd22386c0b63d38effae927fc6f57273470587fc2c8b
@@ -15,16 +16,16 @@ AUX var-lock.mount 541 SHA256 2929247db87c75b82d651ae902183b2a9fab48052b422008fa
 AUX var-run.mount 536 SHA256 55b9e277560b875475535f8121ad45e7fcee836bb48efe2c4f361ff89d450888 SHA512 173097fc2318be854b09ee5244d1dd6291cf6c6ad0c18f1bbbb12b186d309a4299d3866e52659f91a37ff2541583d85754841e55c35ea93dd1916dce0bebb1f6 WHIRLPOOL 47cfff43bdadd7ea59d920dee102283d5eeae6ecfb64aeaf7ee23890f3483cb3f3fdb43ad014bb074122b34d86bf6a6a707a42819b6ee7fd66506808a0557a01
 DIST systemd-189.tar.xz 1371872 SHA256 fec0efd82c9f1bdff6cb9d9811c00830ed890dbe915e79c90ae306cdbd8c4529 SHA512 a275dc93ad68a95f6695cd4d5472d15c3a3a0439944ce54b5dc6bd14500755d769e708510877e5681b4906ef2b8eb0d67c3d77a161db717e6e9a43888c3b50af WHIRLPOOL cd3377da687f12e0a07cbf6fe74b362bbd4118905a7b2e3488170b9b0ca88238a0379df9b18e9cd506e6544311ae83cd26f493568d85b457a1a2469e06083713
 DIST systemd-44.tar.xz 885636 SHA256 7a5aac4b4b8b3a82bf59292f10e43d8f2c2d7039f34e95714f81d8edcb42233c SHA512 e1b9b69ce5381da04cd25154de45945cfbdbac061ff663c30a9d5ba063facfb6e42b876b7c12d72c217e71de812e95c7135683b2389dad292827a9711f746c5e WHIRLPOOL 684c00d1d63522264e999cb8eda7a4d28c76e4b7af77fe1da46a8706a95904d2abe20399ccec5443dca2c6a5f5e6ecc80620fd89431111244b66cb1a6cb3724e
-EBUILD systemd-189-r2.ebuild 5604 SHA256 4d48ed51193d4a4d475c10c72561b70a86a114b3d64cd414358d40e0d488bd25 SHA512 9d77d8e7532b30dbea6cf47cce8ab21c480611cf0c849e18bfd596e53331f64686edc99b3c9813b234bdb682d34f02136377f61c77cda905c09a29350ca432a1 WHIRLPOOL f4dec07568bd7cf31d41978d63a6d378d2585d4dd91ef9cc64a7af7fe93b10bf275f956d6c3f35687dc63ccb23495cf109372765ab7ffea4e025a02de9dd20c3
+EBUILD systemd-189-r3.ebuild 5672 SHA256 31312135e9fc3e13995250e87a2e22aeaf50f06b3fd5d95fac6d50c75cafab11 SHA512 4fca2fe58799c867b441fcd333a302873966ef3f40fc5114b54eab6aa0541038e88327da48f4174a0706a0a94dca341e3d26c2dbb4af09c38d24186dec02f9f7 WHIRLPOOL 1dcfb21fd29b2e0571c077933c036600416fb29ae1e1a833874408335be67173d27f6c9c0e70b7e2d21d44e6911a93b5a5535cee1b0d62ba8716fdf485648a19
 EBUILD systemd-44-r2.ebuild 5802 SHA256 6fc03a866b72d522355b6e8231fb8c500e897a382868fd130d5247dcd5681115 SHA512 e7dcf76c7c55e6a7cce2944ed8615830b597b9f82a06d8ef54264dc09b3366d5abd7fdd21db769d3cb9ae183e266dc5a2fe5eeb6893a797ea92f8454f30775a9 WHIRLPOOL 56348c43ed186754d67acd50dd67cd9860a3724f560dd40ea4ea00eb046010a090f6cf7ea51fefd4476587d2b36a3217adcfb83906b9915be6ba8ce1ca0a40bb
-MISC ChangeLog 9276 SHA256 a765329ced4973d89f2ddad8b1ef85b6cdd5a9cbae9edc780a318ccec1e13441 SHA512 0a2b15e4b33eb2e7f041c17b3980fad04753d9b5428f524070cccc9c3ac271294a64f72a7637904acf0dc4c92346d6bfc89012d5ac58085fd10728abae101065 WHIRLPOOL 56f5142fe813e532ce51d1b23e1629b99c361d5b75985ff5cc0971d98b2f18c8f7321154d5644f95cbdd46f949a995c42297edc44cc49927e7097b03c7d28f59
+MISC ChangeLog 9542 SHA256 4ac5ff8fac0ad12cb2afc3ef0fad37bb0f179cc94211fa724357a1e1a6ce8320 SHA512 fe46dd4439509fffb7cda29d8774b46e621c1b316b57f982142b8056abd10882e8d9907623627b8b5848218d59ca36db7697d534126da1030851094b5e8196ec WHIRLPOOL 897b391078ae89517f67325f5a4038fcc44fd42e10b5dbd39b45667aaef3e65a9793444f9ce6ea418e68b7b589f69a0cf4525282327f121adaf080f75f12b4b4
 MISC metadata.xml 566 SHA256 5b00ceccd213a57c6f1a81dd9fb026aa914aefe444bd9f60480efc2bb46a1ed7 SHA512 ea7579c1c22711253f6411cbf47333d26df384ae2a2fc1b50ad3df39332e2839aae1c3356397e5806830dda264cdb9d26f6cb54d172f840f5e518218766fe268 WHIRLPOOL a910da4dab04376307f327bd6a06e479e145eb5ba836496ec180ca7d536265d261545618103da3afb8ff1e5ef3529294d502cd81562c267355b8501aba8325a4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAlBLtJcACgkQfXuS5UK5QB1xeAP+NIMbP33JZuqWcwzf7fvpMw6J
-GOrolxvGjkqMIuznJeLOtcYiCqMAWcmFdrwRm0R5COiTweRpJhsHs32Bxq5VogN0
-cWD4E/wFb9c+uxA7hCxU9SgPBLZ9i3FeScRhYiTfEwWkNPhG8P3Yj4K2CpCCGsyS
-Q8XCbzeFVGWYicQVLG8=
-=24Qz
+iJwEAQEIAAYFAlBW89wACgkQfXuS5UK5QB3iKQP/c4rs9q04S1bLFqcmIcTGL0Tx
+BYGl8x0WwXWycuOzqzQrsGPaJQM37o4twNvkTAlsPmzkI/G4f+kVggD//VjNYIVf
+BSdmSPtge4QIXXcdEejp4UWU8w37PGCa4dfSexqBucd4mfH0eVCy3zQoyLYvgJOe
+dzW3aweSWNAHRXih410=
+=Jm/b
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/systemd/files/0004-journal-don-t-try-to-compress-without-XZ.patch b/sys-apps/systemd/files/0004-journal-don-t-try-to-compress-without-XZ.patch
new file mode 100644
index 000000000000..475766544bfb
--- /dev/null
+++ b/sys-apps/systemd/files/0004-journal-don-t-try-to-compress-without-XZ.patch
@@ -0,0 +1,29 @@
+From 48b617399d7d8446c5310b2568b2af6f13331b4c Mon Sep 17 00:00:00 2001
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Mon, 3 Sep 2012 15:46:44 +0200
+Subject: [PATCH] journal: don't try to compress without XZ
+
+otherwise the header contains the HEADER_INCOMPATIBLE_COMPRESSED
+flag even though the data is not compressed and reading the journal
+fails.
+---
+ src/journal/journal-file.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
+index c8193ba..8bd5273 100644
+--- a/src/journal/journal-file.c
++++ b/src/journal/journal-file.c
+@@ -2021,7 +2021,9 @@ int journal_file_open(
+         f->flags = flags;
+         f->prot = prot_from_flags(flags);
+         f->writable = (flags & O_ACCMODE) != O_RDONLY;
++#ifdef HAVE_XZ
+         f->compress = compress;
++#endif
+         f->seal = seal;
+ 
+         if (mmap_cache)
+-- 
+1.7.12
+
diff --git a/sys-apps/systemd/systemd-189-r2.ebuild b/sys-apps/systemd/systemd-189-r3.ebuild
index f47eaedfeaba..177828604942 100644
--- a/sys-apps/systemd/systemd-189-r2.ebuild
+++ b/sys-apps/systemd/systemd-189-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-189-r2.ebuild,v 1.1 2012/09/08 21:10:28 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-189-r3.ebuild,v 1.1 2012/09/17 09:56:27 mgorny Exp $
 
 EAPI=4
 
@@ -66,6 +66,7 @@ src_prepare() {
 		"${FILESDIR}"/0001-Disable-udev-targets-for-udev-189.patch
 		"${FILESDIR}"/0002-journald-add-missing-includes.patch
 		"${FILESDIR}"/0003-journal-add-HAVE_XZ-check-to-avoid-build-failure.patch
+		"${FILESDIR}"/0004-journal-don-t-try-to-compress-without-XZ.patch
 	)
 
 	autotools-utils_src_prepare