Fix busted selinux patch, need to subst SELINUX_STATIC_LIBS

Package-Manager: portage-2.2.4/cvs/Linux x86_64
Manifest-Sign-Key: 0xB4D088B4

3 files changed, 15 insertions, 7 deletions

diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog
index 17f66f83538d..54a108391050 100644
--- a/sys-fs/lvm2/ChangeLog
+++ b/sys-fs/lvm2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/lvm2
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.319 2013/09/14 23:19:03 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.320 2013/09/15 14:36:58 anarchy Exp $
+
+  15 Sep 2013;  <anarchy@gentoo.org>
+  files/lvm2-2.02.100-selinux_and_udev_static.patch:
+  Fix busted selinux patch, need to subst SELINUX_STATIC_LIBS
 
 *lvm2-2.02.100-r2 (14 Sep 2013)
 
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 63f5faec6054..6f394b61405d 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -15,7 +15,7 @@ AUX lvm2-2.02.100-ignored_loop.patch 1442 SHA256 6cc84c9a025434990eb2a94e3782a52
 AUX lvm2-2.02.100-lvm_path.patch 1090 SHA256 f7e183e39071b618c64d68e37bad1d36294d111a7239bccca6fdbf4d1aa20323 SHA512 2eca11e31a7ff2a46553668e8501e4448cd6fd6b6422a36e24a9d526fbf65976e14ddba489a316a568cd3b9307de48ccbf975e0527020356322dd961ecb13107 WHIRLPOOL 28c235dda5875e52a4888788011ab553ba54bafd604253f649283b14854230f3f93e1d8ce6421ec88c06163c2d5bc51b025f11179268903389d2729bfc87dfe8
 AUX lvm2-2.02.100-pvmove_segfault.patch 1187 SHA256 299bf1fb53e89f01ebb7c754d95d5cb6cbc302a4c0b0cf6ad400b5e28a90af00 SHA512 667ccc6127b4c59268326070661246c9c19e02a97ceb51411c2977782d120f8bcd1b277feaab06afeb0d81fa8e1472a19fcd853806d31b0a24bf7f2b04ddcf2b WHIRLPOOL 9a637cf940a67f2f5e00e06b8cacbb5c8b93fb9cdaa252e8cb0c04174857ba9530d0f0081d0936b47ce1b4271f238c75e0c3056439b09952771598a5ef2a7613
 AUX lvm2-2.02.100-respect_ar_and_cc.patch 536 SHA256 7c86a44214f8181dbc248bf2cc13a1254e27bb84b222d750e57e208e9019cebd SHA512 807802a7cda7ced971b7206f86b2b0d2c3cc938ad711bd6c45a95d0d72e207deab73f0b1c00ee31693010eb04f270000fbf8229fc5b844235c62df13db52f64f WHIRLPOOL ff2df6c76e9706a6ac0da17bf8c9fec0e432935e101e4ab4ca819b1f9e5aee26700b57fdb16129a10fe0b677b1e1dd6398b139110c4f72a2d0ac951df84e6d0b
-AUX lvm2-2.02.100-selinux_and_udev_static.patch 3220 SHA256 7a4e2eead5d1f16918a1a943294e24ae5a4bb9143f2139244f6e3f82f8a52766 SHA512 9dae5ec1333650807e7d5bd40566b5c8dfdd8fe65b7c057b03678d13a1c055561a694572103aba2bcb5bef217216099745505e97983b66d278e9b64cac328eed WHIRLPOOL d787bddff12c987f1d7c746246176778c634297f784403dc6cd9470cb0e534e44a3e5fa720460b3e7b1444c884e02ab8988bfdaa76c1004c2761f2195b67af5f
+AUX lvm2-2.02.100-selinux_and_udev_static.patch 3223 SHA256 15c20b1e16443932c560164ad9546ab01279601b0f0dd7fdc54f9cf3cd3ffee3 SHA512 232dc2908073254e23878098734cc65449c7be0707f7f0f7e73561e7b204bf71cf75ff5ee143b0f9f301ddabac1595c59cb0ec80c665464e8fe3f1b65a3eb0c2 WHIRLPOOL fdd908aa01cc3790be4ff8e7b2180cd526065c826657924edfccdc53f5c2266a12911c1ebface9de649b1974ff77401e94a64de507b5c72415614e5726dd4a2a
 AUX lvm2-2.02.100-vg_free_segfault.patch 2316 SHA256 287065a798b727d5011644cd174d7b28492ccd0234d238dcfc4cdbb300cc128f SHA512 f5fa6f1e726353fca758fac2a70a2b39611cbad72db5a89ea1da015acd4e53a6e9881c40a9c648d4cf9952b8b8ae3e7847025078c43f9eef0f0da7b4cfb31560 WHIRLPOOL 47f74b534f5db2f94e487c0559d9176dfd9e923a492ab4ff9139bd5faf24ce7ad8cff9a3d1e6bcc68a7a512c5b4ce4509daa5fe2f77e3486484be893a9740e90
 AUX lvm2-2.02.56-lvm2create_initrd.patch 2032 SHA256 b892d0544e05350e78ea400c16e6fd3657671d9bdf50bfae70505fd79bdda081 SHA512 b2a1705fa6b962027ebc5047583547489afe8ef8d8977c6284a28d0a8b0e05e20e6c48bd6c02a8bb02de9cfb40ac2d6e2a4b8ed8ef8c4ae7b6ea9a29bc4194de WHIRLPOOL cb533df528be0aae4bf50966285ef7a238f810d955ee86d5b446f43944d093732eff6ef8178d1654c4a2c075049ffc11994a99de6291bab1140cb8812be8b8a0
 AUX lvm2-2.02.63-always-make-static-libdm.patch 1420 SHA256 1c498b5efce77ed16bbbfcd9e0ec6da404a9c70c7ad0959ed7b60733adfcfc21 SHA512 67735af9e51369d5b3b400cab4f9ffa25f8dea1c1ec3d01855cb3c5aeade5c39a35eeed43f3a665204fe6bbba4ca43baecd845330bf26d023064b94ca3d1317c WHIRLPOOL f273c893acedfd658e7947abb5f4b528f15de9808ae3862ec8a9189ba7de4ea6998dc67dbc7af642ca3a27bba2ef8eabfd48337f532145f88500988f564313b1
@@ -39,12 +39,16 @@ EBUILD lvm2-2.02.100-r1.ebuild 7634 SHA256 a869d076299bf024b2311c1ce9faae960c042
 EBUILD lvm2-2.02.100-r2.ebuild 7634 SHA256 ae4869bd0940b8537b6861040c7f12223605ec5c0a8b361d5409fb400daa5355 SHA512 724399ed596faee7a3d9316e7626c97cf95c51bb7ac3e44847d02064f7aea203667acfdd676802b2b4dc45f46c93d73050f977045b628c8c5fcbd04fcea1303d WHIRLPOOL 8d124b373de5f25077db02156f01255e6b4d36668d63fcad0bf7c448854eecd50ea647a835195377d747b5d7fa5dcead4bb12c34b06b1ae25adfe45d88b78743
 EBUILD lvm2-2.02.97-r1.ebuild 9072 SHA256 616ff463fda707204c5e92c3a22651ec3e87168ead21b859f6ad0f00c2775960 SHA512 d395b0dc1a18846f76bc79f7fef2cbb649bbee179ea800d6b82398ff113d21c84d987107d14397986d2dc7f5127345cde7e1c588ddfcab339e016f3133dc6080 WHIRLPOOL f14c3e31b83d73b4e996e47c1db7e79e293881dfb1bc519383cfdaac35331ff4fb0a735d2c138433855b1795f084552126b340624191ba8aaf0069011eb6d823
 EBUILD lvm2-2.02.99-r2.ebuild 8217 SHA256 3b2b043cb028b55af42e88a5567267ac837f648e4c5f6327b2e97989eb86d444 SHA512 1f831d00e140b6ffe5ba64a48bfef8ec11ae66981451c9d64d50a6e60c04ba05a4bdfda38400a4d1501e7d4c150e745d0e3ed9512e0f4294fa79286237b66f5a WHIRLPOOL a92d6ad1769a239a65312065074730e9ccc7149b4d71dd19cbee5eafa334c703dad24a8a55e039f0ecfa6187d5cf1e69f3ffcd022485f5f7f2498da0d6e8c929
-MISC ChangeLog 61282 SHA256 1e69407dd7ff09090d3491802fa83b6e4bf1fbb7153cf45efd3eea96a7b2975d SHA512 58fffea289fa5dfba2f3a8c15d1a9c2b66ca0c1c6a0c2b11a5745e728c02922110cc2536ce2d39fe61e46538d0a6ba1aafee83501fbc96d1ac1b9a8ed13c0d4e WHIRLPOOL 1dcad311fc97ef81c53a6883e53e6fe3f9066b156f14cb0069b0bab1768c0d313021b63799412c74c3200fe29746ed7241e9dd060717cc14a2e00011b419228c
+MISC ChangeLog 61435 SHA256 99494afb06a657c41315dc14aa2a26f37e6b5029e13e9e402ae8385be3d17f6f SHA512 855309bc0e4dd1fa4fd1dc783f112edcdc8fd4e8015b7a8e0c04f6879eb9a32ffa5873e8916c18ece75220930943edba0d47763bb392a818c036b9d254a8a27d WHIRLPOOL f77448fc6e7ebe2b5bc42e860752709a2a1903c479fbacf6a13f497811a619349299db460d21964a9dbc3511083e82815d6307c2a30aabd4b8bdbf05c691b81d
 MISC metadata.xml 984 SHA256 8f554d97062552d62ce2d81c8e4536b3e97539a497dd8cddda3eeab24b4ef73a SHA512 9c0a10af6149817269590cd28e7dc7eb84539184d41123b12bfada3857f87d813199cfbecd7c8219ce1b6a70f4ee72cf7a911854fcdb1fbfd90e3146122bca7f WHIRLPOOL e98d441e34d6a8fe540c7526da3418417cfc10e31c52b42d7827b151f7e3e20f8b088ee49b3ebd67ec304143593a6319c8ea42094d62315e47f210b0e52fe149
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iF4EAREIAAYFAlI07ukACgkQC77qH+pIQ6SVewD/XN5nWFuu7rcOyvYMYnxQHCeL
-U/dHJehiK67p4/keTesBAKQOx3PT/TIZ/6oJTAy94CHbYQDgGFWPUXzSOSnW4liP
-=V2v7
+iQEcBAEBCAAGBQJSNcX8AAoJEKDMw7q00Ii0+WIIAJ/DEm0m8M58a+SxN7EjKDzB
+Spy6uBqae7acOA1YJYisjvgJeXezhObRYCvCUHMqbxBv8YS06KvMcTbZ8c2VGpAy
+78o752cNWy5DKiLLJlrfdoU57e1jsNaGGlBJpn+8iXJI9uZ/3lJVbeJKKyDMKRsY
+cM4hrhkwDKtlPNLXS35Vh/BREePQsJxp9mnZlaYAmblbGnkmCTuANOLZ294CbcD8
+BGWPRaFk2iUJ2vsOWwIxy5/VRu88fCI67Alu/Equy5RJk/N1brrLOjU4EhMLR/Eb
+FTBybeiAuftnkakJ4WkuRaA3cR5KWgo+lPerCLocheXev1zNp2YWY9ddx3+FZ7Q=
+=jQpI
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/lvm2/files/lvm2-2.02.100-selinux_and_udev_static.patch b/sys-fs/lvm2/files/lvm2-2.02.100-selinux_and_udev_static.patch
index e7a4aea7d0c7..d6c8e5fd45c5 100644
--- a/sys-fs/lvm2/files/lvm2-2.02.100-selinux_and_udev_static.patch
+++ b/sys-fs/lvm2/files/lvm2-2.02.100-selinux_and_udev_static.patch
@@ -57,7 +57,7 @@ diff -ur LVM2.2.02.100.orig/configure.in LVM2.2.02.100/configure.in
  AC_SUBST(SALCK_CFLAGS)
  AC_SUBST(SALCK_LIBS)
  AC_SUBST(SELINUX_LIBS)
-+AC_SUBST(UDEV_STATIC_LIBS)
++AC_SUBST(SELINUX_STATIC_LIBS)
  AC_SUBST(SELINUX_PC)
  AC_SUBST(SNAPSHOTS)
  AC_SUBST(STATICDIR)