Backport patch for USE=-lzma build failure. Bug #432700.

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

4 files changed, 51 insertions, 9 deletions

diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index 118a6802f6be..a406cc9a5ef8 100644
--- a/sys-apps/systemd/ChangeLog
+++ b/sys-apps/systemd/ChangeLog
@@ -1,6 +1,11 @@
 # 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.42 2012/08/24 17:21:06 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.43 2012/08/25 15:48:04 mgorny Exp $
+
+  25 Aug 2012; Michał Górny <mgorny@gentoo.org>
+  +files/0003-journal-add-HAVE_XZ-check-to-avoid-build-failure.patch,
+  systemd-189.ebuild:
+  Backport patch for USE=-lzma build failure. Bug #432700.
 
 *systemd-189 (24 Aug 2012)
 
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 1a3ba5f3e908..898f02fdb927 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -6,6 +6,7 @@ AUX 0001-Disable-udev-targets-for-udev-189.patch 9041 SHA256 cbee32960346f825644
 AUX 0001-util-never-follow-symlinks-in-rm_rf_children.patch 1262 SHA256 4bf6f7d0312f07614d2addece6b48f3301bb85de5f27c8b9729e11b1f4d9e36a SHA512 8ef4a893ad75522a334a5670426c6065da2225a392cde2f8e133b534a724300cb622813730202467ec108b5f527da1642f61d98bc8e604a0a9e11c727dabc24a WHIRLPOOL 250217791893ad70a4855aa3234b601af018ec0bedb2f61d41d0e623f2e49e42c765d53c0da8ea2bb33aa54c98d7710c9fa440983325551bf4c1c79e7c93f1dc
 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 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
@@ -14,16 +15,16 @@ DIST systemd-188.tar.xz 1348144 SHA256 e839ed6061db57933b956f5d6952d9ad9b5ec1608
 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-188-r1.ebuild 5197 SHA256 fb18759ab16b37dd564e23a64983c63ab2aaa09af51c8b8d42bccf4ce04bf449 SHA512 8622b385a4fb3d5fa248c2153fa042d86cba6218bc2cbecc4247075725afecb958de220364d91ca8a90e4c813c64493c005de4bcccc3ec5bb048416ed21cfa1e WHIRLPOOL b0a453597fc7afe82676eb628b78214ee75a8d744b0adc0546bae38f17ff42b8a6b814f06a16a0c9175aab1aa8be415771cb3fa0c9596befbcd2701df8f45193
-EBUILD systemd-189.ebuild 5392 SHA256 ce5ebc74f7cbb4195c839c289b33814e7bc9025dc2c3374c5af56d52eda4e475 SHA512 f4e4968117243e209b19d813a7d0fe28e781797e399aeff588ab4987afc99b8f8fbcb0968fa29363278e9f046526bcae9764a88870a35dd277b4b408bdf6ba65 WHIRLPOOL c41bf172450e9c7c8639e12ddb063b1af72149de46e51f726bf3e614892102622a9eae9c35f9ea89703b2a0f5ba2c1ea835a7741bf971b447b4db8b7eaad7a37
+EBUILD systemd-189.ebuild 5468 SHA256 a72ed1bba0c2c6c3b50b154517e6157f301c44aee7224735f979036813dd8ece SHA512 33cd5ec38b3421e6e1980778dacef04463da5586b3edfb337bde0deb6a65ebd7179139c4ee5f79b6f2fb1e467a7a38257275e91cbf8519f0ed444ef807e6e7f5 WHIRLPOOL 6d6c0e025b491f68f7ade812d99879fc3b15d1687911d4ece027194cb169df5f94b37ebcfc9a6edcedf2d2b917aa09f9943a1d95939261af308af1830f663ebd
 EBUILD systemd-44-r2.ebuild 5802 SHA256 6fc03a866b72d522355b6e8231fb8c500e897a382868fd130d5247dcd5681115 SHA512 e7dcf76c7c55e6a7cce2944ed8615830b597b9f82a06d8ef54264dc09b3366d5abd7fdd21db769d3cb9ae183e266dc5a2fe5eeb6893a797ea92f8454f30775a9 WHIRLPOOL 56348c43ed186754d67acd50dd67cd9860a3724f560dd40ea4ea00eb046010a090f6cf7ea51fefd4476587d2b36a3217adcfb83906b9915be6ba8ce1ca0a40bb
-MISC ChangeLog 8355 SHA256 2aee38f0f125b8f160b826c9c12f10fa5bbd34928f6b16c7537875b800796008 SHA512 b4b2ddba5b02390f638fb3d48d6fd486596d09d6c2b37df783f697a8c8f3c150568af5f7f2304fd56b981223671c47c72f092fba924fca2e987410ab8a15dcea WHIRLPOOL 2bc32c058739869088d15f3269f1b15e68748f541d1b432be8e01876d26500fbfe7319001d777d74e59a9385c83c9c9de4eb1058b279865791063b5820e13829
+MISC ChangeLog 8557 SHA256 e72793b78ed63cbbaa0dda3e54a7bba012e2b58cadd0910719e15c11b04f7830 SHA512 3dae314a38e08e6117ef36f5963e96489e2c5e46e9a74d1bb19166503bd2dc63b04add49bfb43fcad66cd6382057b1cd68e278eac57e3b6d1a00f200cc3a253f WHIRLPOOL 3539e771828785d05da5f1421efde38fcfc51aab0f8f880f5f6b34e087ec46172d73962497005a3e0b2df948796ecd943c1ddb333e99b11dd8bbd56c870295df
 MISC metadata.xml 566 SHA256 5b00ceccd213a57c6f1a81dd9fb026aa914aefe444bd9f60480efc2bb46a1ed7 SHA512 ea7579c1c22711253f6411cbf47333d26df384ae2a2fc1b50ad3df39332e2839aae1c3356397e5806830dda264cdb9d26f6cb54d172f840f5e518218766fe268 WHIRLPOOL a910da4dab04376307f327bd6a06e479e145eb5ba836496ec180ca7d536265d261545618103da3afb8ff1e5ef3529294d502cd81562c267355b8501aba8325a4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAlA3uEQACgkQfXuS5UK5QB1xUwP5AaXpiNpjdOj9aKkMp3DMb6DR
-eUwGJbzclMRGyRp57cQBt5oj7JLwEjajkVaVeLnwm1T2ol+2zhDbcCWiUMryEVVh
-fG7tL/z2g3yWjH8tGK5GLPGE/p3uaCnF/RLpA+dMBOc9smUpYkz5XQIOaYzxi1vr
-ESvJ+ocgRK9rAsbKWlo=
-=xdSO
+iJwEAQEIAAYFAlA48/YACgkQfXuS5UK5QB3U+wP9Em2+3zKWQf8C/mWDMMxJ9p62
+C6Fi2n1J4+pc/nDj7uDXv2aDKd8ZWWZtJVu+0T/UDKGOyliuBHW1ZNOeIjtlYGlg
+aJxzqwCOsF0FLuvipfx5nAsKfyFXF5q3dXzQsDa0zMRKPjYjeHh4rIj9j3chFIQC
+P85lpeUGXdI8lM89D68=
+=ckNM
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/systemd/files/0003-journal-add-HAVE_XZ-check-to-avoid-build-failure.patch b/sys-apps/systemd/files/0003-journal-add-HAVE_XZ-check-to-avoid-build-failure.patch
new file mode 100644
index 000000000000..ea1b185236db
--- /dev/null
+++ b/sys-apps/systemd/files/0003-journal-add-HAVE_XZ-check-to-avoid-build-failure.patch
@@ -0,0 +1,35 @@
+From 70f09301d5d47577cfa4fe70c7b3cba336529cdf Mon Sep 17 00:00:00 2001
+From: Yin Kangkai <kangkai.yin@intel.com>
+Date: Fri, 24 Aug 2012 16:52:58 +0800
+Subject: [PATCH] journal: add HAVE_XZ check to avoid build failure
+
+Without this, build fail with --disable-xz or xz not installed.
+---
+ src/journal/journal-verify.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/journal/journal-verify.c b/src/journal/journal-verify.c
+index 2401293..5d134bd 100644
+--- a/src/journal/journal-verify.c
++++ b/src/journal/journal-verify.c
+@@ -63,6 +63,7 @@ static int journal_file_object_verify(JournalFile *f, Object *o) {
+                 h1 = le64toh(o->data.hash);
+ 
+                 if (o->object.flags & OBJECT_COMPRESSED) {
++#ifdef HAVE_XZ
+                         void *b = NULL;
+                         uint64_t alloc = 0, b_size;
+ 
+@@ -73,6 +74,9 @@ static int journal_file_object_verify(JournalFile *f, Object *o) {
+ 
+                         h2 = hash64(b, b_size);
+                         free(b);
++#else
++                        return -EPROTONOSUPPORT;
++#endif
+                 } else
+                         h2 = hash64(o->data.payload, le64toh(o->object.size) - offsetof(Object, data.payload));
+ 
+-- 
+1.7.12
+
diff --git a/sys-apps/systemd/systemd-189.ebuild b/sys-apps/systemd/systemd-189.ebuild
index 0b8f28cb0266..291267d531e2 100644
--- a/sys-apps/systemd/systemd-189.ebuild
+++ b/sys-apps/systemd/systemd-189.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.ebuild,v 1.1 2012/08/24 17:21:06 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-189.ebuild,v 1.2 2012/08/25 15:48:04 mgorny Exp $
 
 EAPI=4
 
@@ -66,6 +66,7 @@ src_prepare() {
 	local PATCHES=(
 		"${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
 	)
 
 	autotools-utils_src_prepare