Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 403282 Details for
Bug 549506
sys-fs/lvm2: fails to compile against sys-libs/musl
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Git formatted patch for inclusion in hardened-dev:musl overlay
lvm2-musl-hardened-dev.patch (text/plain), 81.07 KB, created by
Fredric Johansson
on 2015-05-14 22:58:18 UTC
(
hide
)
Description:
Git formatted patch for inclusion in hardened-dev:musl overlay
Filename:
MIME Type:
Creator:
Fredric Johansson
Created:
2015-05-14 22:58:18 UTC
Size:
81.07 KB
patch
obsolete
>From 8105b77e8cbca17ff08e1a56553ddd5985a06ae3 Mon Sep 17 00:00:00 2001 >From: Fredric Johansson <fredric.miscmail@gmail.com> >Date: Thu, 14 May 2015 22:11:22 +0000 >Subject: [PATCH] Two separate patches for building lvm2 with musl Patch 1 > (lvm2-fix-stdio-usage.patch) is taken directly from alpine linux and fixes > usage of stdio constants Patch 2 fixes issues not covered by patch 1, missing > include and pthread constants > >--- > sys-fs/lvm2/Manifest | 30 +++ > sys-fs/lvm2/files/clvmd.confd-2.02.39 | 9 + > sys-fs/lvm2/files/clvmd.rc-2.02.39 | 146 +++++++++++ > sys-fs/lvm2/files/device-mapper.conf-1.02.22-r3 | 1 + > sys-fs/lvm2/files/device-mapper.rc-2.02.105-r2 | 147 +++++++++++ > sys-fs/lvm2/files/device-mapper.rc-2.02.95-r2 | 111 +++++++++ > sys-fs/lvm2/files/dmeventd.initd-2.02.67-r1 | 26 ++ > sys-fs/lvm2/files/dmtab | 12 + > sys-fs/lvm2/files/lvm-monitoring.initd-2.02.105-r2 | 39 +++ > sys-fs/lvm2/files/lvm-monitoring.initd-2.02.67-r2 | 46 ++++ > sys-fs/lvm2/files/lvm.confd-2.02.28-r2 | 5 + > sys-fs/lvm2/files/lvm.rc-2.02.105-r2 | 97 ++++++++ > sys-fs/lvm2/files/lvm.rc-2.02.95-r2 | 96 +++++++ > .../lvm2-2.02.100-selinux_and_udev_static.patch | 93 +++++++ > .../files/lvm2-2.02.106-pthread-pkgconfig.patch | 32 +++ > .../lvm2-2.02.107-static-pkgconfig-libs.patch | 104 ++++++++ > .../lvm2/files/lvm2-2.02.108-example.conf.in.patch | 50 ++++ > .../lvm2-2.02.108-static-pkgconfig-libs.patch | 104 ++++++++ > .../files/lvm2-2.02.56-lvm2create_initrd.patch | 72 ++++++ > .../lvm2-2.02.63-always-make-static-libdm.patch | 42 ++++ > sys-fs/lvm2/files/lvm2-2.02.67-createinitrd.patch | 18 ++ > sys-fs/lvm2/files/lvm2-2.02.70-asneeded.patch | 15 ++ > .../lvm2-2.02.92-dynamic-static-ldflags.patch | 63 +++++ > .../lvm2/files/lvm2-2.02.99-example.conf.in.patch | 47 ++++ > sys-fs/lvm2/files/lvm2-2.02.99-locale-muck.patch | 11 + > sys-fs/lvm2/files/lvm2-fix-stdio-usage.patch | 111 +++++++++ > sys-fs/lvm2/files/lvm2-musl-fixes.patch | 33 +++ > sys-fs/lvm2/files/lvmetad.initd-2.02.105-r2 | 13 + > sys-fs/lvm2/lvm2-2.02.110-r99.ebuild | 275 +++++++++++++++++++++ > sys-fs/lvm2/metadata.xml | 24 ++ > 30 files changed, 1872 insertions(+) > create mode 100644 sys-fs/lvm2/Manifest > create mode 100644 sys-fs/lvm2/files/clvmd.confd-2.02.39 > create mode 100755 sys-fs/lvm2/files/clvmd.rc-2.02.39 > create mode 100644 sys-fs/lvm2/files/device-mapper.conf-1.02.22-r3 > create mode 100644 sys-fs/lvm2/files/device-mapper.rc-2.02.105-r2 > create mode 100644 sys-fs/lvm2/files/device-mapper.rc-2.02.95-r2 > create mode 100644 sys-fs/lvm2/files/dmeventd.initd-2.02.67-r1 > create mode 100644 sys-fs/lvm2/files/dmtab > create mode 100644 sys-fs/lvm2/files/lvm-monitoring.initd-2.02.105-r2 > create mode 100644 sys-fs/lvm2/files/lvm-monitoring.initd-2.02.67-r2 > create mode 100644 sys-fs/lvm2/files/lvm.confd-2.02.28-r2 > create mode 100644 sys-fs/lvm2/files/lvm.rc-2.02.105-r2 > create mode 100644 sys-fs/lvm2/files/lvm.rc-2.02.95-r2 > create mode 100644 sys-fs/lvm2/files/lvm2-2.02.100-selinux_and_udev_static.patch > create mode 100644 sys-fs/lvm2/files/lvm2-2.02.106-pthread-pkgconfig.patch > create mode 100644 sys-fs/lvm2/files/lvm2-2.02.107-static-pkgconfig-libs.patch > create mode 100644 sys-fs/lvm2/files/lvm2-2.02.108-example.conf.in.patch > create mode 100644 sys-fs/lvm2/files/lvm2-2.02.108-static-pkgconfig-libs.patch > create mode 100644 sys-fs/lvm2/files/lvm2-2.02.56-lvm2create_initrd.patch > create mode 100644 sys-fs/lvm2/files/lvm2-2.02.63-always-make-static-libdm.patch > create mode 100644 sys-fs/lvm2/files/lvm2-2.02.67-createinitrd.patch > create mode 100644 sys-fs/lvm2/files/lvm2-2.02.70-asneeded.patch > create mode 100644 sys-fs/lvm2/files/lvm2-2.02.92-dynamic-static-ldflags.patch > create mode 100644 sys-fs/lvm2/files/lvm2-2.02.99-example.conf.in.patch > create mode 100644 sys-fs/lvm2/files/lvm2-2.02.99-locale-muck.patch > create mode 100644 sys-fs/lvm2/files/lvm2-fix-stdio-usage.patch > create mode 100644 sys-fs/lvm2/files/lvm2-musl-fixes.patch > create mode 100755 sys-fs/lvm2/files/lvmetad.initd-2.02.105-r2 > create mode 100644 sys-fs/lvm2/lvm2-2.02.110-r99.ebuild > create mode 100644 sys-fs/lvm2/metadata.xml > >diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest >new file mode 100644 >index 0000000..0ff3eda >--- /dev/null >+++ b/sys-fs/lvm2/Manifest >@@ -0,0 +1,30 @@ >+AUX clvmd.confd-2.02.39 213 SHA256 68442d5c9da81bad79fa6b1beaede290f24ea6a4e4415f3d9f4e37ccca6c524a SHA512 9614c4188c9a5bcf398d1f521b52d7e2281fcdf76265fdaca4acda22be282d8468e82b54a2661d5753f4b9a442ebe93a60daf87c846db4e275a283f71c9fd8e2 WHIRLPOOL b429d06a5200d37f46e72190060bc2fe866575ba441b5f92d12d939bdc5d411ef37e895a7369bbaaf733b1a0d0305a05d499c7ae6c7360fe8767e902d2a3bfc4 >+AUX clvmd.rc-2.02.39 3684 SHA256 476289b24539eeff4ff94c34c129da755d8cff11f1e950b40f9fad212ca5c05d SHA512 18879fa7925d6181b9ebfd7a6379ee4f25c9c83474ba69684e63811867754b1c52dd6568324aafd9fe391fd2fd4aadf931870cefc21b72d2f81f9e04ef123f41 WHIRLPOOL 095a313a6c66f0dec1d42233dd1853879ade6334c474ac747c2cd87c24b433381547a6fdecedf784db060549ece8dc24870d4981bcf590bf39e57dd7bad92120 >+AUX device-mapper.conf-1.02.22-r3 15 SHA256 57777904f12a35617e5a4193c964ebb32396452487fd02353e71e16e7b46bc22 SHA512 1846e0ca1be7170d4c0beb694a23aea4d19b24b99a248bb0f4e034286a6beede0a8efc474b0c237e33ee72c86c93b6238f2d5ea23e224765acba99c90633261e WHIRLPOOL a0de185e849cd4d1aab9f145a6330f267ca547ba4ec7720be6f33e2c3c4c182b8674ea220b894f0fc806fe6637ba7bcabd739ca57b53b3efa5fad0cf1e57ba2e >+AUX device-mapper.rc-2.02.105-r2 3828 SHA256 036b6de05e6cbd921a667d6fc6b01d30c8f9b720e1a0d0e2453ecd62d32573fb SHA512 aa5c73a91a85069782384ab9ecec299d9f036ed8c069ebef66bbedfa9d9ce7c63baa70692148cf4f1b06d6b4e53fc1916ae576ecc005323154a25a686bef33fd WHIRLPOOL bebba4faf498d400c68b8e79a64c90f0b71a3df350895ea4b78efb802600f4179ec0b7507be7ca61bd7444ca8d5c8f8156112a2fa3083e51a6fe8f552db583ba >+AUX device-mapper.rc-2.02.95-r2 2765 SHA256 e0bff689040746480e2479d1ad57adb5ab23cc0415ab9a8356503aed7a14c658 SHA512 f6e653c6af92debe543bcb48ee36c2bfa0f1ad08d2dfe40455cf9d3b104a1f825a295b43de2a5fa64367c6c2eadb2b36004c7cf51fd3b15191ea6be21d0c5a4f WHIRLPOOL 298548daebf413ea8739c979c23b9ea7cfbcf12437debb8ce7d570b6a8269fbcd4d7b27816734f3728e2d591ef9658a4f4bb0c43299dbf408aeac10ef87e5bf0 >+AUX dmeventd.initd-2.02.67-r1 683 SHA256 0c051388991ba69afbf2f6baf36ba227d7c26fc8f0d7588d8de76d9a74886d79 SHA512 523b54d63592c500394243632f4ed60838d04a8c386a85bb2a0fda6f756607467ec025c1490104d8c73035e37646eeea55dcafd3f05eab85e035bbedcebf0406 WHIRLPOOL 5dcf777e9c736eb4101649e5b0bbb43016c3b7ece77c1bb8afdda63b23b15a37257cdd29c05f82b0ae4f98405067c85a9a6ee8a35d98c4b5fb647ed015c11da7 >+AUX dmtab 416 SHA256 e2e22bbe13fb97ec9a68659daa275b1d22fd0a3fd21e76b1f4bfba504a8bd7b5 SHA512 392b4bd85745bc774245195a1c416ae68efbe5f7b2498f6bfc40021cd2c9f6372fd1c3d346198c7749635b5d9b3f66ba1b963a2e144b4f522d87016ab4777de2 WHIRLPOOL f48c0fda382c7d57bad2ad4a8155189735236d13f24f39b3969736c3ad54d28f92c82174cae5c6775f8bc58506f19025f2cba6433f389c84505552fc8b4d3ed4 >+AUX lvm-monitoring.initd-2.02.105-r2 1088 SHA256 d7655cadd3a3a9d3683a540413365310ca9503c38fd21a9bfccec40630ca72f1 SHA512 3c3f7ec1868e3634be3bb82689d30065dbe0fac3e2dfa22a14acb76c82b102022c280f995f82a1f7c91c905c0ba961bbb2707ddf60ad5fa9d717acdf942855d5 WHIRLPOOL 92e7eedf6add5cba645f74281912713928f694f18155db222352ba8e4a70ac89696f9db3cc2c9fc79fb9ff0f98cb176da8aedb1c5b7b47eecd4ee36360df41f0 >+AUX lvm-monitoring.initd-2.02.67-r2 1183 SHA256 b89971a4f163e1a91df2416ff442cae7209f8343e6c8612eb3174ed8f5c5c788 SHA512 e99d8e0ed2f22e8f3f1e36581ce92bc2196dbebdeb7c301070c5f2e78079804de3ac782c732929e23a3a01536a270236513c849ec1574ff4c72045b8f69c98ed WHIRLPOOL 71eb7d1203bc2b6be22ebb0eb20e3d2e0786036bea9f0beda91c517f47b99374b52ca4c7d5cd76ae6338ddab187b68a7a371a437e5501996454e125e12e998a8 >+AUX lvm.confd-2.02.28-r2 173 SHA256 28370c089c39c248d7ded0960b8d8a9256bada44d44c22ce3cec87d512ef6844 SHA512 67b153cbc5c2327c15f042b3b5590c1d8fdf9823efb19c80192ac4dcf98e530efea8ecae0aaaa4a54b0e3e4907565aa21455b364df1dbe8f2e7dffa1c5d355d0 WHIRLPOOL 06467b28ad2acf36984eef1b7b7e3d88277505760f848a808d85820cd1cccf6bb7397c00624d36961d9bdbb994e55de03444a7cfc97ecefd9bd3b785a3c6fdbf >+AUX lvm.rc-2.02.105-r2 3071 SHA256 a5754ffa0a05a0c29a9f6b5acf1b21dd313581fd6156c1ef722dc620e0114676 SHA512 9dd321b6d76628376b324de1ff47c4a37b98d3bf406abbf1b1755e20d957a9f1d77ff2e50a99b0c77ca8200800cd6071da5ab83c2f5afb9ff97f31e75671a617 WHIRLPOOL 6ba25a5152bf6f5052481e6ad2b1dc3ea65a818d11bff49e9688f537245c471f5446d4b8d381dba69ab8ece8f16340220f4c8173be096c7cb3d7c4c7fd10cebd >+AUX lvm.rc-2.02.95-r2 3001 SHA256 66844a70cedf61b2cd3373cdbd8f8c1afa817bde0764fdf5cf488857532d4553 SHA512 e5d34447db2fc050256222eff427703341b839a80c833c8ca2a814663b790bdffad967fa41bda8c182d5217dda629057a571520cb0a2e4cb06d5a8a241746ea3 WHIRLPOOL 102baf82bd5573ce90bdb19307ccf71026b6e03fd9e471a123f17072e0ac3785ecf017bb2cd81adf7a5332f33b42330e7c484c8804ed57d4ad6fb1cdd4c119f7 >+AUX lvm2-2.02.100-selinux_and_udev_static.patch 3223 SHA256 15c20b1e16443932c560164ad9546ab01279601b0f0dd7fdc54f9cf3cd3ffee3 SHA512 232dc2908073254e23878098734cc65449c7be0707f7f0f7e73561e7b204bf71cf75ff5ee143b0f9f301ddabac1595c59cb0ec80c665464e8fe3f1b65a3eb0c2 WHIRLPOOL fdd908aa01cc3790be4ff8e7b2180cd526065c826657924edfccdc53f5c2266a12911c1ebface9de649b1974ff77401e94a64de507b5c72415614e5726dd4a2a >+AUX lvm2-2.02.106-pthread-pkgconfig.patch 860 SHA256 aaf04bdb140cbedebe731a04846cbb7459cdd002ee4616a3d0725136edb5ef02 SHA512 ae073936ee15fdeabde4d3948a65f6a435b82e62aa0ddadbad399b69bd5c9bfc181d5e0be1beae9f6e899a6e8b9d7c21add13f7a1606cb5ed4762ed5aa5aa223 WHIRLPOOL 9e822f0f1c7c67b5443fb9e62547a1893d8c91f91d63f03c9f4b3d9a20cd24c377f5697f2fe24028f10949550af6f2a05d95db6d5e29700dfaa05f1c3d615773 >+AUX lvm2-2.02.107-static-pkgconfig-libs.patch 3607 SHA256 b3efe76e670fd45e363c62bc8a9965eff4bb1c12e98b6eebdf3b8690de24ddca SHA512 6cd6bbe2ff2dbbe012c20043f3b31e42cacc3379838358c58891ec8ce9593ced29a14fbb9e96b9c76e1b245c5aec2e38a26d3a599c78ff18c3d920e89f1d2f72 WHIRLPOOL 4acf0777694df20886b4e6bf06c91a86041f6e4d888c49dc26f582cd6220504550f54ea5d94c220a3a16b4768933e45e901f274dfaf616083db741aab81b612b >+AUX lvm2-2.02.108-example.conf.in.patch 1681 SHA256 c9e0b46965f68c25495e21ca9504699031ed88dbb69407a08d53569ddc88ae4c SHA512 b4e983892b7ff47e5e7617376197daa62cfd063cf398235dc4a436fd9025ec4b1e263d7418e2c2943d53be494cba4209e9d4230d54a78762b0ca526f92e9746c WHIRLPOOL 0fc73d8e6f47596fa1789118aefebf931fb217342259da838d701bdeb96f21d7de59f29ac81c3c0f4a00db711e86b9fac6b4c889cf05ffc90ad8fd5a9ef77cd1 >+AUX lvm2-2.02.108-static-pkgconfig-libs.patch 3302 SHA256 5cbdb4c4db1a77767a8cf3a89490eb0e21a2d4cc7729a8ffb099e4d0746e2775 SHA512 246f1029f9346d6bc57c2062c8a223535d0b832fa6bd86947b8b91b094dbc388706a9914f9ca0531666f77e73544612e2819335435b7576b4e91cdb1b0e4f041 WHIRLPOOL 53e723bdcfe07f668abf6fe9e6093ae38d81b01bd10ade0b40a037d44c367a6945ed86d14d70c2af8af6e7063763fd3620591b5c7384bd255b98cceb7ee192f3 >+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 >+AUX lvm2-2.02.67-createinitrd.patch 660 SHA256 d59f5642fff9d9575227bfd0b3d103d928a6f7b08b417d6c458704171f11da39 SHA512 17fbba5d34ece5c1c25ef35fa3bbc3d6fcd20b44bd766c049bbc120853a8d60c9544db5790645a7814db5c272fd12d383699a8a9be6f4e9c56a7c0a1bb29ade2 WHIRLPOOL b358a31a9ee669a4fccf42280da5342c214932bfd83deee92d41351eb37dc6c0b2e5dc7419f2304128b5d285fed92db5b2e1634a71bbf1310d36b54d1a353bb0 >+AUX lvm2-2.02.70-asneeded.patch 326 SHA256 b0f84dadc213a9daaa97ae7815f624f0bcdc883d627659c7fcf8b7131538b43e SHA512 e38d8ef5d13c8861f7d1ca5c16271b3da138e8747ba01442de3f55aab45265fdaf42513e596f5af1d024fa2cf0c959bd3e47da52bbe8b13c75e665dd95f81279 WHIRLPOOL 77143f2dafeca221f8b3cda4df1669111de44a4ae4916d9aa2228aa76d94b4d1c556cf90a6f90cae2f1938f7474fb678ec6eab1b4e57f7fd20eab473de667cda >+AUX lvm2-2.02.92-dynamic-static-ldflags.patch 3031 SHA256 90b880572186d4d1abf049d39e5f11e4cfedb3707c29eeb9740ceccdb3b62468 SHA512 edb78081d12bebaccd31c2474cb531563b729f1ad966afaff7892556177ee7a68217cc699c65383318066139ba62183adc8334f46f8f8933d62b6b5dcd11a023 WHIRLPOOL 6880a29dfb6747f167c41506e1472c0d48ef7af3a545238c733949f85f3f8f36110fb6908c6f626260f7ed975e56a4e8ccf42ece4d758fa3570154cbe970f2a3 >+AUX lvm2-2.02.99-example.conf.in.patch 1489 SHA256 55273a2bc6df33057f4efdd947b75f0282a7993acd5e57f0019f8ca57ca7df38 SHA512 0c92a0e454505219653500d4fb2ee57626bb30375782be941bda17d7b841cb05eeebb87bfc4f7aa397b26fb4908bcbd0f69d2c07e63bf4f070756a1894851869 WHIRLPOOL 3f6c94dd63fcf5e2d1406aa074aee27997fa6d58da3db9d22281b3080ec36277bc5225c3b62f042b38f5d0870fb1e3e19433f218f01e03323c7ad1210d45d4b3 >+AUX lvm2-2.02.99-locale-muck.patch 395 SHA256 14e7c65fd9aa71b7f09cc1aecfaccb3048dbb09dd4eb4c342556708aa6adba77 SHA512 4014abbaeb1106dbaa360e2573340651adc0cccc6c0c05cc57695e74e7a3d0b5a73e2b72242bab0d0a10c2506a7c30c2a4de0275c0f81a14dfb068ec91492497 WHIRLPOOL 3383e94ca4dbaefd2c628d3a95b17a14602481c98425caf48f490185289eb3f1af2ef234ff5b5c431ea4624edd8e48764252bdf5b7159ab3bbbad699c3f936ab >+AUX lvm2-fix-stdio-usage.patch 3666 SHA256 79c5379cbf660f8dabd45359463c77a40b5a83153b54c67ce36049260dac9071 SHA512 c4d55b366a60926baadf431dd382012eb808490c0bb514e01503d526cfd7ae573efa2d60a92bd5f6f451b54b11fb5cf827f45cec35cfcdee6aa291674cc776dd WHIRLPOOL 48be6a1205c2293fda51bb8b103db0eebe4b28794a6983c910e5761bb50712da4552eb339a485258f0f79032e10aa7589f65411de282f83ab910881c52a356ed >+AUX lvm2-musl-fixes.patch 1537 SHA256 6516f64faeccaf87641f7c29823344baea0f3af9ac14701e98fa768cbccb703d SHA512 87bd64a0c7525cbf5d49f1fbdd4a86f23bade065362580a1f2ef3b73b5e76e865e620800c922aa6819ace78daf3d4e2ce96b7990c63dcdbf504d03e636d26c00 WHIRLPOOL 9aeabec1f8b0e3487cad583e359c729b5c45ecbc426b48c19260d1f3a8e377fe5e8f09297d893dc2588b9ee11537148558a372c029ac84c02282011cc07440fe >+AUX lvmetad.initd-2.02.105-r2 405 SHA256 60accb4b6114753232f2db0adf3fc3f46d4459bfedf79b888801a13c55d79fa9 SHA512 d9c6f6c68a83b8f391ded7ebe900009a61ff06e92eb68ccb3dcdc8f41e61bbcdf47246e523ea8cfd6e71790376b316b219d4afaf66cf11477e2b54d526b74998 WHIRLPOOL d959d8c8b5f4ef84c26f8e585fe1761ef9bfd37f590e783e937679a863982e7cc4a4e320c3e2e3bd635dbd3486c15baf7c24e1a21325521f4320e643a57fb0e7 >+DIST LVM2.2.02.110.tgz 1487448 SHA256 3dad1aa04a71b8420b15f44c53f041001436539d3f8073490c2d0c52f6fecd11 SHA512 5b4dfa5ed877d34efa5b109dc712e8fa9154b4954b267b0243f1925f9d2fa8c67f4ce8da36a85f3bba6c117f6153fdbf150e3753587ab90584a86d2654dc0812 WHIRLPOOL ea221ed3e9d3f79009d7c341a7a75b52eacc5be79e28f2498e7cdc0f4a97c2bebff405b032eb8086d3b5b5aaf79da2f281c5734562355bddbe6004058e114ced >+EBUILD lvm2-2.02.110-r99.ebuild 9477 SHA256 0005f0d2e3c85c7d00648fd7c56526564fc6cabcfd17fbfe495035a2de0024cf SHA512 e170af6ee4b8b9b1ac31ae67abe04736e36d1e0550f4f4689665fa895b77879d5ec23621e9afdc3c9e74d3ac691ca999968f2379744694c8ada021d67bae935c WHIRLPOOL 58549bf7414360770fff8050ce777c1af382333be2700f8206eb9bec0a413750579d7815c7e8bd15cc0306106eb17105d5230c4423ee6a413d6beb7aaeddeaaf >+MISC metadata.xml 995 SHA256 a2be36b695dab8ef65772af8d808cdc7a5c5855e2c9104060e7232e21b984216 SHA512 642abe2a196ffeaf3a67530befa8dc123f1e3e1238bf55d38c0affea82ab5b2f9e56da6b303410845c625494a59323ac8570f40e0f8a406db76295059958361a WHIRLPOOL cba3a6dd12fafc4719050082ee740d03ef0ed68e074b556a0c1f15f4a7b328d9b826d2b7ab3d3f19546de92e907a3fd466792db67423cb8630d5313154d5b6f2 >diff --git a/sys-fs/lvm2/files/clvmd.confd-2.02.39 b/sys-fs/lvm2/files/clvmd.confd-2.02.39 >new file mode 100644 >index 0000000..5782170 >--- /dev/null >+++ b/sys-fs/lvm2/files/clvmd.confd-2.02.39 >@@ -0,0 +1,9 @@ >+# CLVMD_CLUSTER_TIMEOUT -- amount of time to wait for cluster quorum. >+ >+CLVMD_CLUSTER_TIMEOUT=30 >+ >+ >+# CLVMD_NODES_TIMEOUT -- amount of time to wait for the other nodes to >+# join the cluster. >+ >+CLVMD_NODES_TIMEOUT=60 >diff --git a/sys-fs/lvm2/files/clvmd.rc-2.02.39 b/sys-fs/lvm2/files/clvmd.rc-2.02.39 >new file mode 100755 >index 0000000..9647623 >--- /dev/null >+++ b/sys-fs/lvm2/files/clvmd.rc-2.02.39 >@@ -0,0 +1,146 @@ >+#!/sbin/runscript >+# Copyright 1999-2013 Gentoo Foundation >+# Distributed under the terms of the GNU General Public License v2 >+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/clvmd.rc-2.02.39,v 1.3 2013/04/09 11:00:26 ssuominen Exp $ >+ >+[ -x /usr/sbin/clvmd ] && CLVMD_BIN="/usr/sbin/clvmd" || CLVMD_BIN="/sbin/clvmd" >+ >+[ -z "$CLVMD_CLUSTER_TIMEOUT" ] && CLVMD_CLUSTER_TIMEOUT=30 >+[ -n "$CLVMD_NODES_TIMEOUT" ] || CLVMD_NODES_TIMEOUT=60 >+ >+VGCHANGE="/sbin/vgchange" >+VGSCAN="/sbin/vgscan" >+VGDISPLAY="/sbin/vgdisplay" >+CLVMD_PIDFILE="/var/run/clvmd.pid" >+ >+depend() { >+ use net dns logger dmeventd >+ need cman >+} >+ >+load_modules() { >+ local module modules >+ modules=$1 >+ >+ for module in ${modules}; do >+ ebegin "Loading ${module} kernel module" >+ modprobe ${module} >+ eend $? "Failed to load ${module} kernel module" >+ done >+} >+ >+unload_modules() { >+ local module modules >+ modules=$1 >+ >+ for module in ${modules}; do >+ ebegin "Unloading ${module} kernel module" >+ modprobe -r ${module} >+ eend $? "Failed to unload ${module} kernel module" >+ done >+} >+ >+umount_gfs_filesystems() { >+ local sig retry >+ local remaining="$(awk '$3 == "gfs" { print $2 }' /proc/mounts | sort -r)" >+ >+ if [ -n "${remaining}" ] >+ then >+ sig= >+ retry=3 >+ while [ -n "${remaining}" -a "${retry}" -gt 0 ] >+ do >+ if [ "${retry}" -lt 3 ] >+ then >+ ebegin "Unmounting GFS filesystems (retry)" >+ umount ${remaining} &>/dev/null >+ eend $? "Failed to unmount GFS filesystems this retry" >+ else >+ ebegin "Unmounting GFS filesystems" >+ umount ${remaining} &>/dev/null >+ eend $? "Failed to unmount GFS filesystems" >+ fi >+ remaining="$(awk '$3 == "gfs" { print $2 }' /proc/mounts | sort -r)" >+ [ -z "${remaining}" ] && break >+ /bin/fuser -k -m ${sig} ${remaining} &>/dev/null >+ sleep 5 >+ retry=$((${retry} -1)) >+ sig=-9 >+ done >+ fi >+} >+ >+ >+start_volumes() { >+ ebegin "Scanning LVM volumes" >+ $VGSCAN > /dev/null 2>&1 >+ eend $? >+ >+ ret=$? >+ if [ "$ret" -eq 5 ] >+ then >+ einfo " Waiting for other nodes to join the cluster ($CLVMD_NODES_TIMEOUT seconds)" >+ fi >+ >+ clustervgs=`$VGDISPLAY 2> /dev/null | awk 'BEGIN {RS="VG Name"} {if (/Clustered/) print $1;}'` >+ for vg in $clustervgs; do >+ ebegin " Activating Clustered VG: ${vg} " >+ >+ wait=0 >+ while [ -n "$($VGCHANGE -a y ${vg} 2>&1 |grep "clvmd not running")" ]; do >+ if [ $wait -lt $CLVMD_NODES_TIMEOUT ]; then >+ sleep 3 >+ wait=$(($wait + 3)) >+ else >+ eend 1 >+ fi >+ done >+ eend 0 >+ done >+} >+ >+stop_volumes() { >+ # Deactivate only clustered volumes >+ clustervgs=`$VGDISPLAY 2> /dev/null | awk 'BEGIN {RS="VG Name"} {if (/Clustered/) print $1;}'` >+ for vg in $clustervgs; do >+ ebegin " Shutting Down Clustered VG: ${vg} " >+ $VGCHANGE -anl ${vg} >/dev/null >+ eend $? >+ done >+} >+ >+ >+start() { >+ local module=$(awk '$1 == "dm_mod" { print $1 }' /proc/{modules,devices}) >+ >+ if [ -z "${module}" ]; then >+ load_modules "dm-mod" >+ sleep 1s >+ fi >+ >+ ebegin "Starting clvmd ($CLVMD_CLUSTER_TIMEOUT seconds)" >+ >+ start-stop-daemon --start --quiet --exec ${CLVMD_BIN} -- -T ${CLVMD_CLUSTER_TIMEOUT} >+ eend $? >+ >+ start_volumes >+} >+ >+stop() { >+ >+ # umount GFS filesystems >+ umount_gfs_filesystems >+ >+ #stop_volumes >+ >+ ebegin "Stopping clvmd" >+ #start-stop-daemon --stop -s TERM --quiet --exec ${CLVMD_BIN} --name clvmd >+ killall -TERM ${CLVMD_BIN} >/dev/null >+ eend $? >+ >+ #local module=$(awk '$1 == "dm_mod" { print $1 }' /proc/modules) >+ >+ #if [[ "$?" -eq 0 && ! -z "${module}" ]]; then >+ # unload_modules "dm-mod" >+ #fi >+} >diff --git a/sys-fs/lvm2/files/device-mapper.conf-1.02.22-r3 b/sys-fs/lvm2/files/device-mapper.conf-1.02.22-r3 >new file mode 100644 >index 0000000..bc7a251 >--- /dev/null >+++ b/sys-fs/lvm2/files/device-mapper.conf-1.02.22-r3 >@@ -0,0 +1 @@ >+RC_AFTER="lvm" >diff --git a/sys-fs/lvm2/files/device-mapper.rc-2.02.105-r2 b/sys-fs/lvm2/files/device-mapper.rc-2.02.105-r2 >new file mode 100644 >index 0000000..56e7503 >--- /dev/null >+++ b/sys-fs/lvm2/files/device-mapper.rc-2.02.105-r2 >@@ -0,0 +1,147 @@ >+#!/sbin/runscript >+# Copyright 1999-2014 Gentoo Foundation >+# Distributed under the terms of the GNU General Public License v2 >+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/device-mapper.rc-2.02.105-r2,v 1.1 2014/02/02 19:52:34 robbat2 Exp $ >+ >+depend() { >+ # As of .67-r1, we call ALL lvm start/stop scripts with --sysinit, that >+ # means dmeventd is NOT notified, as it cannot be safely running >+ before dmeventd checkfs fsck >+ after modules >+} >+ >+dm_in_proc() { >+ local retval=0 >+ for x in devices misc ; do >+ grep -qs 'device-mapper' /proc/${x} >+ retval=$((${retval} + $?)) >+ done >+ return ${retval} >+} >+ >+# char **build_dmsetup_command(volume) >+# >+# Returns complete dmsetup command given single volume name >+build_dmsetup_command() { >+ local count dmsetup_cmd >+ >+ # Number of lines mentioning volume name >+ count=$(grep -v -e '^[[:space:]]*\(#\|$\)' /etc/dmtab | grep -c ${1}) >+ >+ # If there's just one line: >+ if [ ${count} -eq 1 ] ; then >+ echo "echo $(grep -v -e '^[[:space:]]*\(#\|$\)' /etc/dmtab | \ >+ grep ${1} | awk '{$1=""; print $0}') | /sbin/dmsetup create ${1}" >+ >+ # For all cases with more lines: >+ elif [ ${count} -gt 1 ] ; then >+ for c in $( seq 1 ${count} ) ; do >+ if [ ${c} -eq 1 ] ; then >+ # Heavy escaping in awk-statement because we cannot use apostrophes >+ dmsetup_cmd="echo -e $(grep -v -e '^[[:space:]]*\(#\|$\)' /etc/dmtab | \ >+ grep ${1} | awk NR==${c}\ \{\$1=\"\"\;\ print\ \$0\})" >+ else >+ # Append starting with newline >+ dmsetup_cmd="${dmsetup_cmd}\\\\n \ >+ $(grep -v -e '^[[:space:]]*\(#\|$\)' /etc/dmtab | \ >+ grep ${1} | awk NR==${c}\ \{\$1=\"\"\;\ print\ \$0\})" >+ fi >+ done >+ echo "${dmsetup_cmd} | /sbin/dmsetup create ${1}" >+ fi >+ >+ return 0 >+} >+ >+# char **get_new_dm_volumes(void) >+# >+# Return unique volumes from /etc/dmtab >+get_new_dm_volumes() { >+ local volume >+ >+ # Filter comments and blank lines >+ grep -v -e '^[[:space:]]*\(#\|$\)' /etc/dmtab | \ >+ awk '{ print $1 }' | \ >+ uniq | \ >+ while read volume ; do >+ # If it exists, skip it >+ dmvolume_exists "${volume%:}" && continue >+ >+ echo "${volume%:}" >+ done >+ >+ return 0 >+} >+ >+# int dmvolume_exists(volume) >+# >+# Return true if volume exists in DM table >+dmvolume_exists() { >+ local x line volume=$1 >+ >+ [ -z "${volume}" ] && return 1 >+ >+ /sbin/dmsetup ls 2>/dev/null | \ >+ while read line ; do >+ for x in ${line} ; do >+ # the following conditonal return only breaks out >+ # of the while loop, as it is running in a pipe. >+ [ "${x}" = "${volume}" ] && return 1 >+ # We only want to check the volume name >+ break >+ done >+ done >+ >+ # if 1 was returned from the above loop, then indicate that >+ # volume exists >+ [ $? = 1 ] && return 0 >+ >+ # otherwise the loop exited normally and the volume does not >+ # exist >+ return 1 >+} >+ >+# int is_empty_dm_volume(volume) >+# >+# Return true if the volume exists in DM table, but is empty/non-valid >+is_empty_dm_volume() { >+ local table volume=$1 >+ >+ set -- $(/sbin/dmsetup table 2>/dev/null | grep -e "^${volume}:") >+ [ "${volume}" = "$1" -a -z "$2" ] >+} >+ >+ >+start() { >+ if [ -e /proc/modules ] && ! dm_in_proc ; then >+ modprobe dm-mod 2>/dev/null >+ fi >+ # Ensure the dirs exist for locking and running >+ checkpath -q -d -m 0700 -o root:root /run/lvm /run/lock/lvm >+ >+ local x volume >+ >+ if [ -x /sbin/dmsetup -a -c /dev/mapper/control -a -f /etc/dmtab ] ; then >+ [ -n "$(get_new_dm_volumes)" ] && \ >+ einfo " Setting up device-mapper volumes:" >+ >+ get_new_dm_volumes | \ >+ while read x ; do >+ [ -n "${x}" ] || continue >+ >+ volume="${x##* }" >+ >+ ebegin " Creating volume: ${volume}" >+ if ! eval $(build_dmsetup_command ${volume}) >/dev/null 2>/dev/null ; then >+ eend 1 " Error creating volume: ${volume}" >+ # dmsetup still adds an empty volume in some cases, >+ # so lets remove it >+ is_empty_dm_volume "${volume}" && \ >+ /sbin/dmsetup remove "${volume}" 2>/dev/null >+ else >+ eend 0 >+ fi >+ done >+ fi >+} >+ >diff --git a/sys-fs/lvm2/files/device-mapper.rc-2.02.95-r2 b/sys-fs/lvm2/files/device-mapper.rc-2.02.95-r2 >new file mode 100644 >index 0000000..9ac8cdb >--- /dev/null >+++ b/sys-fs/lvm2/files/device-mapper.rc-2.02.95-r2 >@@ -0,0 +1,111 @@ >+#!/sbin/runscript >+# Copyright 1999-2013 Gentoo Foundation >+# Distributed under the terms of the GNU General Public License v2 >+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/device-mapper.rc-2.02.95-r2,v 1.2 2013/04/09 11:00:26 ssuominen Exp $ >+ >+depend() { >+ # As of .67-r1, we call ALL lvm start/stop scripts with --sysinit, that >+ # means dmeventd is NOT notified, as it cannot be safely running >+ before dmeventd checkfs fsck >+ after modules >+} >+ >+dm_in_proc() { >+ local retval=0 >+ for x in devices misc ; do >+ grep -qs 'device-mapper' /proc/${x} >+ retval=$((${retval} + $?)) >+ done >+ return ${retval} >+} >+ >+# char **get_new_dm_volumes(void) >+# >+# Return dmsetup commands to setup volumes >+get_new_dm_volumes() { >+ local volume params >+ >+ # Filter comments and blank lines >+ grep -v -e '^[[:space:]]*\(#\|$\)' /etc/dmtab | \ >+ while read volume params ; do >+ # If it exists, skip it >+ dmvolume_exists "${volume%:}" && continue >+ # Assemble the command to run to create volume >+ echo "echo ${params} | /sbin/dmsetup create ${volume%:}" >+ done >+ >+ return 0 >+} >+ >+# int dmvolume_exists(volume) >+# >+# Return true if volume exists in DM table >+dmvolume_exists() { >+ local x line volume=$1 >+ >+ [ -z "${volume}" ] && return 1 >+ >+ /sbin/dmsetup ls 2>/dev/null | \ >+ while read line ; do >+ for x in ${line} ; do >+ # the following conditonal return only breaks out >+ # of the while loop, as it is running in a pipe. >+ [ "${x}" = "${volume}" ] && return 1 >+ # We only want to check the volume name >+ break >+ done >+ done >+ >+ # if 1 was returned from the above loop, then indicate that >+ # volume exists >+ [ $? = 1 ] && return 0 >+ >+ # otherwise the loop exited normally and the volume does not >+ # exist >+ return 1 >+} >+ >+# int is_empty_dm_volume(volume) >+# >+# Return true if the volume exists in DM table, but is empty/non-valid >+is_empty_dm_volume() { >+ local table volume=$1 >+ >+ set -- $(/sbin/dmsetup table 2>/dev/null | grep -e "^${volume}:") >+ [ "${volume}" = "$1" -a -z "$2" ] >+} >+ >+ >+start() { >+ if [ -e /proc/modules ] && ! dm_in_proc ; then >+ modprobe dm-mod 2>/dev/null >+ fi >+ # Ensure the dirs exist for locking and running >+ checkpath -q -d -m 0700 -o root:root /run/lvm /run/lock/lvm >+ >+ local x volume >+ >+ if [ -x /sbin/dmsetup -a -c /dev/mapper/control -a -f /etc/dmtab ] ; then >+ [ -n "$(get_new_dm_volumes)" ] && \ >+ einfo " Setting up device-mapper volumes:" >+ >+ get_new_dm_volumes | \ >+ while read x ; do >+ [ -n "${x}" ] || continue >+ >+ volume="${x##* }" >+ >+ ebegin " Creating volume: ${volume}" >+ if ! eval "${x}" >/dev/null 2>/dev/null ; then >+ eend 1 " Error creating volume: ${volume}" >+ # dmsetup still adds an empty volume in some cases, >+ # so lets remove it >+ is_empty_dm_volume "${volume}" && \ >+ /sbin/dmsetup remove "${volume}" 2>/dev/null >+ else >+ eend 0 >+ fi >+ done >+ fi >+} >+ >diff --git a/sys-fs/lvm2/files/dmeventd.initd-2.02.67-r1 b/sys-fs/lvm2/files/dmeventd.initd-2.02.67-r1 >new file mode 100644 >index 0000000..3c2f5f3 >--- /dev/null >+++ b/sys-fs/lvm2/files/dmeventd.initd-2.02.67-r1 >@@ -0,0 +1,26 @@ >+#!/sbin/runscript >+# Copyright 1999-2014 Gentoo Foundation >+# Distributed under the terms of the GNU General Public License v2 >+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/dmeventd.initd-2.02.67-r1,v 1.3 2014/02/08 21:17:46 robbat2 Exp $ >+ >+PIDFILE=/run/dmeventd.pid >+BIN=/sbin/dmeventd >+ >+depend() { >+ # As of .67-r1, we call ALL lvm start/stop scripts with --sysinit, that >+ # means dmeventd is NOT notified, as it cannot be safely running >+ after lvm device-mapper >+} >+ >+start() { >+ ebegin "Starting dmeventd" >+ start-stop-daemon --start --exec $BIN --pidfile $PIDFILE >+ eend $? >+} >+ >+stop() { >+ ebegin "Stopping dmeventd" >+ start-stop-daemon --stop --exec $BIN --pidfile $PIDFILE >+ eend $? >+} >+ >diff --git a/sys-fs/lvm2/files/dmtab b/sys-fs/lvm2/files/dmtab >new file mode 100644 >index 0000000..5fc1d79 >--- /dev/null >+++ b/sys-fs/lvm2/files/dmtab >@@ -0,0 +1,12 @@ >+#/etc/dmraid: config file for adding device-mapper volumes at boot >+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/dmtab,v 1.1 2009/04/09 23:00:10 caleb Exp $ >+ >+# Format: <volume name>: <table> >+# Example: isw0: 0 312602976 striped 2 128 /dev/sda 0 /dev/sdb 0 >+# >+# Alternatively you can create all your volumes the first time, and just run: >+# >+# dmsetup table >> /etc/dmtab >+# >+# and verify that they are correct. >+ >diff --git a/sys-fs/lvm2/files/lvm-monitoring.initd-2.02.105-r2 b/sys-fs/lvm2/files/lvm-monitoring.initd-2.02.105-r2 >new file mode 100644 >index 0000000..c53a604 >--- /dev/null >+++ b/sys-fs/lvm2/files/lvm-monitoring.initd-2.02.105-r2 >@@ -0,0 +1,39 @@ >+#!/sbin/runscript >+# Copyright 1999-2014 Gentoo Foundation >+# Distributed under the terms of the GNU General Public License v2 >+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvm-monitoring.initd-2.02.105-r2,v 1.1 2014/02/02 19:52:34 robbat2 Exp $ >+ >+# This script is based on upstream file >+# LVM2.2.02.67/scripts/lvm2_monitoring_init_red_hat.in >+ >+depend() { >+ # As of .67-r1, we call ALL lvm start/stop scripts with --sysinit, that >+ # means dmeventd is NOT notified, as it cannot be safely running >+ need lvm dmeventd >+} >+ >+VGCHANGE=/sbin/vgchange >+VGS=/sbin/vgs >+ >+start() { >+ ret=0 >+ # TODO do we want to separate out already active groups only? >+ VGSLIST=`$VGS --noheadings -o name --rows 2> /dev/null` >+ ebegin "Starting LVM monitoring for VGs ${VGSLIST}:" >+ $VGCHANGE --monitor y --poll y ${VGSLIST} >+ ret=$? >+ eend $ret >+ return $ret >+ >+} >+ >+stop() { >+ ret=0 >+ # TODO do we want to separate out already active groups only? >+ VGSLIST=`$VGS --noheadings -o name --rows 2> /dev/null` >+ ebegin "Stopping LVM monitoring for VGs ${VGSLIST}:" >+ $VGCHANGE --monitor n ${VGSLIST} >+ ret=$? >+ eend $ret >+ return $ret >+} >diff --git a/sys-fs/lvm2/files/lvm-monitoring.initd-2.02.67-r2 b/sys-fs/lvm2/files/lvm-monitoring.initd-2.02.67-r2 >new file mode 100644 >index 0000000..6a41bb6 >--- /dev/null >+++ b/sys-fs/lvm2/files/lvm-monitoring.initd-2.02.67-r2 >@@ -0,0 +1,46 @@ >+#!/sbin/runscript >+# Copyright 1999-2013 Gentoo Foundation >+# Distributed under the terms of the GNU General Public License v2 >+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvm-monitoring.initd-2.02.67-r2,v 1.4 2013/04/09 11:00:26 ssuominen Exp $ >+ >+# This script is based on upstream file >+# LVM2.2.02.67/scripts/lvm2_monitoring_init_red_hat.in >+ >+depend() { >+ # As of .67-r1, we call ALL lvm start/stop scripts with --sysinit, that >+ # means dmeventd is NOT notified, as it cannot be safely running >+ need lvm dmeventd >+} >+ >+VGCHANGE=/sbin/vgchange >+VGS=/sbin/vgs >+ >+start() { >+ ret=0 >+ # TODO do we want to separate out already active groups only? >+ VGSLIST=`$VGS --noheadings -o name 2> /dev/null` >+ for vg in $VGSLIST >+ do >+ ebegin "Starting LVM monitoring for VG $vg:" >+ $VGCHANGE --monitor y --poll y $vg >+ ret2=$? >+ eend $ret2 >+ [ $ret2 -ne 0 ] && ret=$ret2 >+ done >+ return $ret >+} >+ >+stop() { >+ ret=0 >+ # TODO do we want to separate out already active groups only? >+ VGSLIST=`$VGS --noheadings -o name 2> /dev/null` >+ for vg in $VGSLIST >+ do >+ ebegin "Stopping LVM monitoring for VG $vg:" >+ $VGCHANGE --monitor n $vg >+ ret2=$? >+ eend $ret2 >+ [ $ret2 -ne 0 ] && ret=$ret2 >+ done >+ return $ret >+} >diff --git a/sys-fs/lvm2/files/lvm.confd-2.02.28-r2 b/sys-fs/lvm2/files/lvm.confd-2.02.28-r2 >new file mode 100644 >index 0000000..2fbd866 >--- /dev/null >+++ b/sys-fs/lvm2/files/lvm.confd-2.02.28-r2 >@@ -0,0 +1,5 @@ >+# LVM should normally only be started after mdraid is available >+# this is because LVM physical volumes are very often MD devices. >+RC_AFTER="mdraid" >+ >+# vim: ft=gentoo-conf-d >diff --git a/sys-fs/lvm2/files/lvm.rc-2.02.105-r2 b/sys-fs/lvm2/files/lvm.rc-2.02.105-r2 >new file mode 100644 >index 0000000..7fdf50e >--- /dev/null >+++ b/sys-fs/lvm2/files/lvm.rc-2.02.105-r2 >@@ -0,0 +1,97 @@ >+#!/sbin/runscript >+# Copyright 1999-2014 Gentoo Foundation >+# Distributed under the terms of the GNU General Public License v2 >+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvm.rc-2.02.105-r2,v 1.1 2014/02/02 19:52:34 robbat2 Exp $ >+ >+depend() { >+ before checkfs fsck >+ after modules device-mapper >+ need lvmetad sysfs >+} >+ >+config='global { locking_dir = "/run/lock/lvm" }' >+ >+dm_in_proc() { >+ local retval=0 >+ for x in devices misc ; do >+ grep -qs 'device-mapper' /proc/${x} >+ retval=$((${retval} + $?)) >+ done >+ return ${retval} >+} >+ >+start() { >+ # LVM support for /usr, /home, /opt .... >+ # This should be done *before* checking local >+ # volumes, or they never get checked. >+ >+ # NOTE: Add needed modules for LVM or RAID, etc >+ # to /etc/modules.autoload if needed >+ for lvm_path in /bin/lvm /sbin/lvm ; do >+ [ -x "$lvm_path" ] && break >+ done >+ if [ ! -x "$lvm_path" ]; then >+ eerror "Cannot find lvm binary in /sbin or /bin!" >+ return 1 >+ fi >+ if [ -z "${CDBOOT}" ] ; then >+ if [ -e /proc/modules ] && ! dm_in_proc ; then >+ modprobe dm-mod 2>/dev/null >+ fi >+ if [ -d /proc/lvm ] || dm_in_proc ; then >+ ebegin "Setting up the Logical Volume Manager" >+ #still echo stderr for debugging >+ lvm_commands="#! ${lvm_path} --config '${config}'\n" >+ # Extra PV find pass because some devices might not have been available until very recently >+ lvm_commands="${lvm_commands}pvscan\n" >+ # Now make the nodes >+ lvm_commands="${lvm_commands}vgscan --mknodes\n" >+ # And turn them on! >+ lvm_commands="${lvm_commands}vgchange --sysinit -a ly\n" >+ # Order of this is important, have to work around dash and LVM readline >+ printf "%b\n" "${lvm_commands}" | $lvm_path /proc/self/fd/0 --config "${config}" >/dev/null >+ eend $? "Failed to setup the LVM" >+ fi >+ fi >+} >+ >+stop() { >+ for lvm_path in /bin/lvm /sbin/lvm ; do >+ [ -x "$lvm_path" ] && break >+ done >+ if [ ! -x "$lvm_path" ]; then >+ eerror "Cannot find lvm binary in /sbin or /bin!" >+ return 1 >+ fi >+# Stop LVM2 >+if [ -x /sbin/vgs ] && \ >+ [ -x /sbin/vgchange ] && \ >+ [ -x /sbin/lvchange ] && \ >+ [ -f /etc/lvmtab -o -d /etc/lvm ] && \ >+ [ -d /proc/lvm -o "`grep device-mapper /proc/misc 2>/dev/null`" ] >+then >+ einfo "Shutting down the Logical Volume Manager" >+ >+ >+ VGS=$($lvm_path vgs --config "${config}" -o vg_name --noheadings --nosuffix --rows 2> /dev/null) >+ >+ if [ "$VGS" ] >+ then >+ ebegin " Shutting Down LVs & VGs" >+ #still echo stderr for debugging >+ lvm_commands="#! ${lvm_path} --config '${config}'\n" >+ # Extra PV find pass because some devices might not have been available until very recently >+ lvm_commands="${lvm_commands}lvchange --sysinit -a ln ${VGS}\n" >+ # Now make the nodes >+ lvm_commands="${lvm_commands}vgchange --sysinit -a ln ${VGS}\n" >+ # Order of this is important, have to work around dash and LVM readline >+ printf "%b\n" "${lvm_commands}" | $lvm_path /proc/self/fd/0 --config "${config}" >/dev/null >+ eend $? "Failed (possibly some LVs still needed for /usr or root)" >+ fi >+ >+ einfo "Finished shutting down the Logical Volume Manager" >+ return 0 >+fi >+} >+ >+# vim:ts=4 >diff --git a/sys-fs/lvm2/files/lvm.rc-2.02.95-r2 b/sys-fs/lvm2/files/lvm.rc-2.02.95-r2 >new file mode 100644 >index 0000000..76d90f3 >--- /dev/null >+++ b/sys-fs/lvm2/files/lvm.rc-2.02.95-r2 >@@ -0,0 +1,96 @@ >+#!/sbin/runscript >+# Copyright 1999-2013 Gentoo Foundation >+# Distributed under the terms of the GNU General Public License v2 >+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvm.rc-2.02.95-r2,v 1.2 2013/04/09 11:00:26 ssuominen Exp $ >+ >+depend() { >+ use dmeventd >+ before checkfs fsck >+ after dmeventd modules device-mapper >+} >+ >+config='global { locking_dir = "/run/lock/lvm" }' >+ >+dm_in_proc() { >+ local retval=0 >+ for x in devices misc ; do >+ grep -qs 'device-mapper' /proc/${x} >+ retval=$((${retval} + $?)) >+ done >+ return ${retval} >+} >+ >+start() { >+ # LVM support for /usr, /home, /opt .... >+ # This should be done *before* checking local >+ # volumes, or they never get checked. >+ >+ # NOTE: Add needed modules for LVM or RAID, etc >+ # to /etc/modules.autoload if needed >+ for lvm_path in /bin/lvm /sbin/lvm ; do >+ [ -x "$lvm_path" ] && break >+ done >+ if [ ! -x "$lvm_path" ]; then >+ eerror "Cannot find lvm binary in /sbin or /bin!" >+ return 1 >+ fi >+ if [ -z "${CDBOOT}" ] ; then >+ if [ -e /proc/modules ] && ! dm_in_proc ; then >+ modprobe dm-mod 2>/dev/null >+ fi >+ if [ -d /proc/lvm ] || dm_in_proc ; then >+ ebegin "Setting up the Logical Volume Manager" >+ #still echo stderr for debugging >+ lvm_commands="#! ${lvm_path} --config '${config}'\n" >+ # Extra PV find pass because some devices might not have been available until very recently >+ lvm_commands="${lvm_commands}pvscan\n" >+ # Now make the nodes >+ lvm_commands="${lvm_commands}vgscan --mknodes\n" >+ # And turn them on! >+ lvm_commands="${lvm_commands}vgchange --sysinit -a ly\n" >+ # Order of this is important, have to work around dash and LVM readline >+ printf "%b\n" "${lvm_commands}" | $lvm_path /proc/self/fd/0 --config "${config}" >/dev/null >+ eend $? "Failed to setup the LVM" >+ fi >+ fi >+} >+ >+stop() { >+ for lvm_path in /bin/lvm /sbin/lvm ; do >+ [ -x "$lvm_path" ] && break >+ done >+ if [ ! -x "$lvm_path" ]; then >+ eerror "Cannot find lvm binary in /sbin or /bin!" >+ return 1 >+ fi >+# Stop LVM2 >+if [ -x /sbin/vgs ] && \ >+ [ -x /sbin/vgchange ] && \ >+ [ -x /sbin/lvchange ] && \ >+ [ -f /etc/lvmtab -o -d /etc/lvm ] && \ >+ [ -d /proc/lvm -o "`grep device-mapper /proc/misc 2>/dev/null`" ] >+then >+ einfo "Shutting down the Logical Volume Manager" >+ >+ >+ VGS=$($lvm_path vgs --config "${config}" -o vg_name --noheadings --nosuffix 2> /dev/null) >+ >+ if [ "$VGS" ] >+ then >+ ebegin " Shutting Down LVs & VGs" >+ #still echo stderr for debugging >+ lvm_commands="#! ${lvm_path} --config '${config}'\n" >+ # Extra PV find pass because some devices might not have been available until very recently >+ lvm_commands="${lvm_commands}lvchange --sysinit -a ln ${VGS}\n" >+ # Now make the nodes >+ lvm_commands="${lvm_commands}vgchange --sysinit -a ln\n" >+ # Order of this is important, have to work around dash and LVM readline >+ printf "%b\n" "${lvm_commands}" | $lvm_path /proc/self/fd/0 --config "${config}" >/dev/null >+ eend $? "Failed" >+ fi >+ >+ einfo "Finished Shutting down the Logical Volume Manager" >+fi >+} >+ >+# vim:ts=4 >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 >new file mode 100644 >index 0000000..d6c8e5f >--- /dev/null >+++ b/sys-fs/lvm2/files/lvm2-2.02.100-selinux_and_udev_static.patch >@@ -0,0 +1,93 @@ >+diff -ur LVM2.2.02.100.orig/configure.in LVM2.2.02.100/configure.in >+--- LVM2.2.02.100.orig/configure.in 2013-08-13 13:44:43.000000000 +0300 >++++ LVM2.2.02.100/configure.in 2013-09-12 23:23:19.365329440 +0300 >+@@ -954,6 +954,7 @@ >+ pkg_config_init >+ fi >+ PKG_CHECK_MODULES(UDEV, libudev >= 143, [UDEV_PC="libudev"]) >++ UDEV_STATIC_LIBS=`$PKG_CONFIG --static --libs libudev` >+ AC_DEFINE([UDEV_SYNC_SUPPORT], 1, [Define to 1 to enable synchronisation with udev processing.]) >+ fi >+ >+@@ -1199,19 +1200,32 @@ >+ if test x$SELINUX = xyes; then >+ AC_CHECK_LIB([sepol], [sepol_check_context], [ >+ AC_DEFINE([HAVE_SEPOL], 1, [Define to 1 if sepol_check_context is available.]) >+- SELINUX_LIBS="-lsepol"]) >++ SEPOL_LIBS="-lsepol"]) >+ >+- AC_CHECK_LIB([selinux], [is_selinux_enabled], [ >+- AC_CHECK_HEADERS([selinux/selinux.h],, hard_bailout) >+- AC_CHECK_HEADERS([selinux/label.h]) >+- AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.]) >+- SELINUX_LIBS="-lselinux $SELINUX_LIBS" >++ dnl -- init pkgconfig if required >++ if test x$PKGCONFIG_INIT != x1; then >++ pkg_config_init >++ fi >++ PKG_CHECK_MODULES(SELINUX, libselinux, [ >+ SELINUX_PC="libselinux" >+- HAVE_SELINUX=yes ], [ >+- AC_MSG_WARN(Disabling selinux) >+- SELINUX_LIBS= >+- SELINUX_PC= >+- HAVE_SELINUX=no ]) >++ SELINUX_STATIC_LIBS=`$PKG_CONFIG --static --libs libselinux` >++ SELINUX_LIBS="$SELINUX_LIBS $SEPOL_LIBS" >++ AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.]) >++ ],[ >++ dnl -- old non-pkgconfig method, is buggy with static builds >++ AC_CHECK_LIB([selinux], [is_selinux_enabled], [ >++ AC_CHECK_HEADERS([selinux/selinux.h],, hard_bailout) >++ AC_CHECK_HEADERS([selinux/label.h]) >++ AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.]) >++ SELINUX_LIBS="-lselinux $SEPOL_LIBS" >++ SELINUX_STATIC_LIBS="$SELINUX_LIBS" >++ SELINUX_PC="libselinux" >++ HAVE_SELINUX=yes ], [ >++ AC_MSG_WARN(Disabling selinux) >++ SELINUX_LIBS= >++ SELINUX_PC= >++ HAVE_SELINUX=no ]) >++ ]) >+ fi >+ >+ ################################################################################ >+@@ -1615,6 +1629,7 @@ >+ AC_SUBST(SALCK_CFLAGS) >+ AC_SUBST(SALCK_LIBS) >+ AC_SUBST(SELINUX_LIBS) >++AC_SUBST(SELINUX_STATIC_LIBS) >+ AC_SUBST(SELINUX_PC) >+ AC_SUBST(SNAPSHOTS) >+ AC_SUBST(STATICDIR) >+@@ -1625,6 +1640,7 @@ >+ AC_SUBST(THIN_DUMP_CMD) >+ AC_SUBST(THIN_REPAIR_CMD) >+ AC_SUBST(UDEV_LIBS) >++AC_SUBST(UDEV_STATIC_LIBS) >+ AC_SUBST(UDEV_PC) >+ AC_SUBST(UDEV_RULES) >+ AC_SUBST(UDEV_SYNC) >+diff -ur LVM2.2.02.100.orig/make.tmpl.in LVM2.2.02.100/make.tmpl.in >+--- LVM2.2.02.100.orig/make.tmpl.in 2013-08-13 13:44:43.000000000 +0300 >++++ LVM2.2.02.100/make.tmpl.in 2013-09-12 23:22:58.125328808 +0300 >+@@ -32,7 +32,7 @@ >+ >+ LIBS = @LIBS@ >+ # Extra libraries always linked with static binaries >+-STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) >++STATIC_LIBS = $(SELINUX_STATIC_LIBS) $(UDEV_STATIC_LIBS) >+ DEFS += @DEFS@ >+ # FIXME set this only where it's needed, not globally? >+ CFLAGS += @CFLAGS@ @UDEV_CFLAGS@ >+@@ -46,7 +46,9 @@ >+ PTHREAD_LIBS = @PTHREAD_LIBS@ >+ READLINE_LIBS = @READLINE_LIBS@ >+ SELINUX_LIBS = @SELINUX_LIBS@ >++SELINUX_STATIC_LIBS = @SELINUX_STATIC_LIBS@ >+ UDEV_LIBS = @UDEV_LIBS@ >++UDEV_STATIC_LIBS = @UDEV_STATIC_LIBS@ >+ TESTING = @TESTING@ >+ >+ # Setup directory variables >diff --git a/sys-fs/lvm2/files/lvm2-2.02.106-pthread-pkgconfig.patch b/sys-fs/lvm2/files/lvm2-2.02.106-pthread-pkgconfig.patch >new file mode 100644 >index 0000000..594d606 >--- /dev/null >+++ b/sys-fs/lvm2/files/lvm2-2.02.106-pthread-pkgconfig.patch >@@ -0,0 +1,32 @@ >+Make sure that libdm usage always brings in pthread libraries, both in >+pkgconfig and during manual build. >+ >+--- tools/Makefile.in >++++ tools/Makefile.in >+@@ -87,6 +87,7 @@ >+ INSTALL_LVM_TARGETS += install_tools_static >+ INSTALL_DMSETUP_TARGETS += install_dmsetup_static >+ INSTALL_CMDLIB_TARGETS += install_cmdlib_static >++ STATIC_LIBS += @PTHREAD_LIBS@ >+ endif >+ >+ LVMLIBS = $(LVMINTERNAL_LIBS) >+@@ -118,6 +119,10 @@ >+ >+ include $(top_builddir)/make.tmpl >+ >++ifeq ("@STATIC_LINK@", "yes") >++ STATIC_LIBS += @PTHREAD_LIBS@ >++endif >++ >+ device-mapper: $(TARGETS_DM) >+ >+ CFLAGS_dmsetup.o += $(UDEV_CFLAGS) $(EXTRA_EXEC_CFLAGS) >+--- libdm/libdevmapper.pc.in >++++ libdm/libdevmapper.pc.in >+@@ -8,4 +8,5 @@ >+ Version: @DM_LIB_PATCHLEVEL@ >+ Cflags: -I${includedir} >+ Libs: -L${libdir} -ldevmapper >++Libs.private: -L${libdir} @PTHREAD_LIBS@ >+ Requires.private: @SELINUX_PC@ @UDEV_PC@ >diff --git a/sys-fs/lvm2/files/lvm2-2.02.107-static-pkgconfig-libs.patch b/sys-fs/lvm2/files/lvm2-2.02.107-static-pkgconfig-libs.patch >new file mode 100644 >index 0000000..723cd0e >--- /dev/null >+++ b/sys-fs/lvm2/files/lvm2-2.02.107-static-pkgconfig-libs.patch >@@ -0,0 +1,104 @@ >+diff -Nuar --exclude '*.orig' --exclude '*.rej' LVM2.2.02.107.orig/configure.in LVM2.2.02.107/configure.in >+--- LVM2.2.02.107.orig/configure.in 2014-07-15 12:57:55.867439868 -0700 >++++ LVM2.2.02.107/configure.in 2014-07-15 17:24:02.662666091 -0700 >+@@ -997,6 +997,7 @@ >+ fi]) >+ if test "$BLKID_WIPING" = yes; then >+ BLKID_PC="blkid" >++ BLKID_STATIC_LIBS=`$PKG_CONFIG --static --libs $BLKID_PC` >+ AC_DEFINE([BLKID_WIPING_SUPPORT], 1, [Define to 1 to use libblkid detection of signatures when wiping.]) >+ fi >+ fi >+@@ -1022,6 +1023,7 @@ >+ if test "$UDEV_SYNC" = yes; then >+ pkg_config_init >+ PKG_CHECK_MODULES(UDEV, libudev >= 143, [UDEV_PC="libudev"]) >++ UDEV_STATIC_LIBS=`$PKG_CONFIG --static --libs libudev` >+ AC_DEFINE([UDEV_SYNC_SUPPORT], 1, [Define to 1 to enable synchronisation with udev processing.]) >+ fi >+ >+@@ -1242,19 +1244,32 @@ >+ if test "$SELINUX" = yes; then >+ AC_CHECK_LIB([sepol], [sepol_check_context], [ >+ AC_DEFINE([HAVE_SEPOL], 1, [Define to 1 if sepol_check_context is available.]) >+- SELINUX_LIBS="-lsepol"]) >++ SEPOL_LIBS="-lsepol"]) >++ >++ dnl -- init pkgconfig if required >++ if test x$PKGCONFIG_INIT != x1; then >++ pkg_config_init >++ fi >++ PKG_CHECK_MODULES(SELINUX, libselinux, [ >++ SELINUX_PC="libselinux" >++ SELINUX_STATIC_LIBS=`$PKG_CONFIG --static --libs libselinux` >++ SELINUX_LIBS="$SELINUX_LIBS $SEPOL_LIBS" >++ AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.]) >++ ],[ >++ dnl -- old non-pkgconfig method, is buggy with static builds >+ >+ AC_CHECK_LIB([selinux], [is_selinux_enabled], [ >+ AC_CHECK_HEADERS([selinux/selinux.h],, hard_bailout) >+ AC_CHECK_HEADERS([selinux/label.h]) >+ AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.]) >+- SELINUX_LIBS="-lselinux $SELINUX_LIBS" >++ SELINUX_LIBS="-lselinux $SEPOL_LIBS" >+ SELINUX_PC="libselinux" >+ HAVE_SELINUX=yes ], [ >+ AC_MSG_WARN(Disabling selinux) >+ SELINUX_LIBS= >+ SELINUX_PC= >+ HAVE_SELINUX=no ]) >++ ]) >+ fi >+ >+ ################################################################################ >+@@ -1556,6 +1571,7 @@ >+ ################################################################################ >+ AC_SUBST(APPLIB) >+ AC_SUBST(AWK) >++AC_SUBST(BLKID_STATIC_LIBS) >+ AC_SUBST(BLKID_PC) >+ AC_SUBST(BLKID_WIPING) >+ AC_SUBST(BUILD_CMIRRORD) >+@@ -1651,6 +1667,7 @@ >+ AC_SUBST(SALCK_CFLAGS) >+ AC_SUBST(SALCK_LIBS) >+ AC_SUBST(SELINUX_LIBS) >++AC_SUBST(SELINUX_STATIC_LIBS) >+ AC_SUBST(SELINUX_PC) >+ AC_SUBST(SNAPSHOTS) >+ AC_SUBST(STATICDIR) >+@@ -1662,6 +1679,7 @@ >+ AC_SUBST(THIN_DUMP_CMD) >+ AC_SUBST(THIN_REPAIR_CMD) >+ AC_SUBST(THIN_RESTORE_CMD) >++AC_SUBST(UDEV_STATIC_LIBS) >+ AC_SUBST(UDEV_PC) >+ AC_SUBST(UDEV_RULES) >+ AC_SUBST(UDEV_SYNC) >+diff -Nuar --exclude '*.orig' --exclude '*.rej' LVM2.2.02.107.orig/make.tmpl.in LVM2.2.02.107/make.tmpl.in >+--- LVM2.2.02.107.orig/make.tmpl.in 2014-07-15 12:57:55.868439884 -0700 >++++ LVM2.2.02.107/make.tmpl.in 2014-07-15 17:23:24.060055838 -0700 >+@@ -44,7 +44,7 @@ >+ >+ LIBS = @LIBS@ >+ # Extra libraries always linked with static binaries >+-STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) >++STATIC_LIBS = $(SELINUX_STATIC_LIBS) $(UDEV_STATIC_LIBS) $(BLKID_STATIC_LIBS) >+ DEFS += @DEFS@ >+ # FIXME set this only where it's needed, not globally? >+ CFLAGS += @CFLAGS@ >+@@ -59,10 +59,13 @@ >+ PTHREAD_LIBS = @PTHREAD_LIBS@ >+ READLINE_LIBS = @READLINE_LIBS@ >+ SELINUX_LIBS = @SELINUX_LIBS@ >++SELINUX_STATIC_LIBS = @SELINUX_STATIC_LIBS@ >+ UDEV_CFLAGS = @UDEV_CFLAGS@ >+ UDEV_LIBS = @UDEV_LIBS@ >++UDEV_STATIC_LIBS = @UDEV_STATIC_LIBS@ >+ BLKID_CFLAGS = @BLKID_CFLAGS@ >+ BLKID_LIBS = @BLKID_LIBS@ >++BLKID_STATIC_LIBS = @BLKID_STATIC_LIBS@ >+ TESTING = @TESTING@ >+ >+ # Setup directory variables >diff --git a/sys-fs/lvm2/files/lvm2-2.02.108-example.conf.in.patch b/sys-fs/lvm2/files/lvm2-2.02.108-example.conf.in.patch >new file mode 100644 >index 0000000..af5a5af >--- /dev/null >+++ b/sys-fs/lvm2/files/lvm2-2.02.108-example.conf.in.patch >@@ -0,0 +1,50 @@ >+Maintainer note: Forward ported without editing from lvm2-2.02.99-example.conf.in.patch to apply cleanly. >+ >+--- conf/example.conf.in >++++ conf/example.conf.in >+@@ -105,6 +105,10 @@ >+ # By default we accept every block device: >+ # filter = [ "a/.*/" ] >+ >++ # Gentoo: we exclude /dev/nbd by default, because it makes a lot of kernel >++ # noise when you probed while not available. >++ filter = [ "r|/dev/nbd.*|", "a/.*/" ] >++ >+ # Exclude the cdrom drive >+ # filter = [ "r|/dev/cdrom|" ] >+ >+@@ -522,7 +526,8 @@ >+ # e.g. vgscan.lvm1 and they will stop working after you start using >+ # the new lvm2 on-disk metadata format. >+ # The default value is set when the tools are built. >+- # fallback_to_lvm1 = 0 >++ # Gentoo: the LVM tools are a seperate package. >++ fallback_to_lvm1 = 0 >+ >+ # The default metadata format that commands should use - "lvm1" or "lvm2". >+ # The command line override is -M1 or -M2. >+@@ -1182,12 +1187,13 @@ >+ >+ # Metadata settings >+ # >+-# metadata { >++metadata { >+ # Default number of copies of metadata to hold on each PV. 0, 1 or 2. >+ # You might want to override it from the command line with 0 >+ # when running pvcreate on new PVs which are to be added to large VGs. >+ >+- # pvmetadatacopies = 1 >++ # Gentoo: enable for data safety, but PV resize is then disabled. >++ # pvmetadatacopies = 2 >+ >+ # Default number of copies of metadata to maintain for each VG. >+ # If set to a non-zero value, LVM automatically chooses which of >+@@ -1222,7 +1228,7 @@ >+ # the supplied toolset to make changes (e.g. vgcfgrestore). >+ >+ # dirs = [ "/etc/lvm/metadata", "/mnt/disk2/lvm/metadata2" ] >+-#} >++} >+ >+ # Event daemon >+ # >diff --git a/sys-fs/lvm2/files/lvm2-2.02.108-static-pkgconfig-libs.patch b/sys-fs/lvm2/files/lvm2-2.02.108-static-pkgconfig-libs.patch >new file mode 100644 >index 0000000..3ab6998 >--- /dev/null >+++ b/sys-fs/lvm2/files/lvm2-2.02.108-static-pkgconfig-libs.patch >@@ -0,0 +1,104 @@ >+Maintainer note: Forward ported without editing from lvm2-2.02.107-static-pkgconfig-libs.patch to apply cleanly. >+ >+--- configure.in >++++ configure.in >+@@ -1067,6 +1067,7 @@ >+ fi]) >+ if test "$BLKID_WIPING" = yes; then >+ BLKID_PC="blkid" >++ BLKID_STATIC_LIBS=`$PKG_CONFIG --static --libs $BLKID_PC` >+ AC_DEFINE([BLKID_WIPING_SUPPORT], 1, [Define to 1 to use libblkid detection of signatures when wiping.]) >+ fi >+ fi >+@@ -1092,6 +1093,7 @@ >+ if test "$UDEV_SYNC" = yes; then >+ pkg_config_init >+ PKG_CHECK_MODULES(UDEV, libudev >= 143, [UDEV_PC="libudev"]) >++ UDEV_STATIC_LIBS=`$PKG_CONFIG --static --libs libudev` >+ AC_DEFINE([UDEV_SYNC_SUPPORT], 1, [Define to 1 to enable synchronisation with udev processing.]) >+ fi >+ >+@@ -1312,19 +1314,32 @@ >+ if test "$SELINUX" = yes; then >+ AC_CHECK_LIB([sepol], [sepol_check_context], [ >+ AC_DEFINE([HAVE_SEPOL], 1, [Define to 1 if sepol_check_context is available.]) >+- SELINUX_LIBS="-lsepol"]) >++ SEPOL_LIBS="-lsepol"]) >++ >++ dnl -- init pkgconfig if required >++ if test x$PKGCONFIG_INIT != x1; then >++ pkg_config_init >++ fi >++ PKG_CHECK_MODULES(SELINUX, libselinux, [ >++ SELINUX_PC="libselinux" >++ SELINUX_STATIC_LIBS=`$PKG_CONFIG --static --libs libselinux` >++ SELINUX_LIBS="$SELINUX_LIBS $SEPOL_LIBS" >++ AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.]) >++ ],[ >++ dnl -- old non-pkgconfig method, is buggy with static builds >+ >+ AC_CHECK_LIB([selinux], [is_selinux_enabled], [ >+ AC_CHECK_HEADERS([selinux/selinux.h],, hard_bailout) >+ AC_CHECK_HEADERS([selinux/label.h]) >+ AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.]) >+- SELINUX_LIBS="-lselinux $SELINUX_LIBS" >++ SELINUX_LIBS="-lselinux $SEPOL_LIBS" >+ SELINUX_PC="libselinux" >+ HAVE_SELINUX=yes ], [ >+ AC_MSG_WARN(Disabling selinux) >+ SELINUX_LIBS= >+ SELINUX_PC= >+ HAVE_SELINUX=no ]) >++ ]) >+ fi >+ >+ ################################################################################ >+@@ -1626,6 +1641,7 @@ >+ ################################################################################ >+ AC_SUBST(APPLIB) >+ AC_SUBST(AWK) >++AC_SUBST(BLKID_STATIC_LIBS) >+ AC_SUBST(BLKID_PC) >+ AC_SUBST(BLKID_WIPING) >+ AC_SUBST(BUILD_CMIRRORD) >+@@ -1721,6 +1737,7 @@ >+ AC_SUBST(SALCK_CFLAGS) >+ AC_SUBST(SALCK_LIBS) >+ AC_SUBST(SELINUX_LIBS) >++AC_SUBST(SELINUX_STATIC_LIBS) >+ AC_SUBST(SELINUX_PC) >+ AC_SUBST(SNAPSHOTS) >+ AC_SUBST(STATICDIR) >+@@ -1735,6 +1752,7 @@ >+ AC_SUBST(CACHE_DUMP_CMD) >+ AC_SUBST(CACHE_REPAIR_CMD) >+ AC_SUBST(CACHE_RESTORE_CMD) >++AC_SUBST(UDEV_STATIC_LIBS) >+ AC_SUBST(UDEV_PC) >+ AC_SUBST(UDEV_RULES) >+ AC_SUBST(UDEV_SYNC) >+--- make.tmpl.in >++++ make.tmpl.in >+@@ -43,7 +43,7 @@ >+ >+ LIBS = @LIBS@ >+ # Extra libraries always linked with static binaries >+-STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) >++STATIC_LIBS = $(SELINUX_STATIC_LIBS) $(UDEV_STATIC_LIBS) $(BLKID_STATIC_LIBS) >+ DEFS += @DEFS@ >+ # FIXME set this only where it's needed, not globally? >+ CFLAGS += @CFLAGS@ >+@@ -57,10 +57,13 @@ >+ PTHREAD_LIBS = @PTHREAD_LIBS@ >+ READLINE_LIBS = @READLINE_LIBS@ >+ SELINUX_LIBS = @SELINUX_LIBS@ >++SELINUX_STATIC_LIBS = @SELINUX_STATIC_LIBS@ >+ UDEV_CFLAGS = @UDEV_CFLAGS@ >+ UDEV_LIBS = @UDEV_LIBS@ >++UDEV_STATIC_LIBS = @UDEV_STATIC_LIBS@ >+ BLKID_CFLAGS = @BLKID_CFLAGS@ >+ BLKID_LIBS = @BLKID_LIBS@ >++BLKID_STATIC_LIBS = @BLKID_STATIC_LIBS@ >+ TESTING = @TESTING@ >+ >+ # Setup directory variables >diff --git a/sys-fs/lvm2/files/lvm2-2.02.56-lvm2create_initrd.patch b/sys-fs/lvm2/files/lvm2-2.02.56-lvm2create_initrd.patch >new file mode 100644 >index 0000000..59aaa9b >--- /dev/null >+++ b/sys-fs/lvm2/files/lvm2-2.02.56-lvm2create_initrd.patch >@@ -0,0 +1,72 @@ >+--- LVM2.2.02.56/scripts/lvm2create_initrd/lvm2create_initrd.orig 2006-11-21 22:41:56.000000000 +0000 >++++ LVM2.2.02.56/scripts/lvm2create_initrd/lvm2create_initrd 2009-12-26 01:47:08.025224602 +0000 >+@@ -54,7 +54,9 @@ >+ DEVRAM=/tmp/initrd.$$ >+ >+ # set defaults >+-BINFILES=${BINFILES:-"`which lvm` `which bash` `which busybox` `which pivot_root`"} >++LVM=`which lvm.static` >++LVM=${LVM:-"`which lvm`"} >++BINFILES=${BINFILES:-"${LVM} `which bash` `which busybox` `which pivot_root`"} >+ BASICDEVICES=${BASICDEVICES:-"std consoleonly fd"} >+ BLOCKDEVICES=${BLOCKDEVICES:-"md hda hdb hdc hdd sda sdb sdc sdd"} >+ MAKEDEV=${MAKEDEV:-"debian"} >+@@ -119,6 +121,10 @@ >+ echo "$PRE Mounting /proc" >+ mount -t proc none /proc >+ >++# We need /sys for lvm >++echo "$PRE Mounting /sys" >++mount -t sysfs sysfs /sys >++ >+ # plug in modules listed in /etc/modules >+ if [ -f /etc/modules ]; then >+ echo -n "$PRE plugging in kernel modules:" >+@@ -179,26 +185,29 @@ >+ # run a shell if we're passed lvm2rescue on commandline >+ grep lvm2rescue /proc/cmdline 1>/dev/null 2>&1 >+ if [ $? -eq 0 ]; then >+- lvm vgchange --ignorelockingfailure -P -a y >++ $LVM vgchange --ignorelockingfailure -P -a y >+ do_shell >+ else >+- lvm vgchange --ignorelockingfailure -a y >++ $LVM vgchange --ignorelockingfailure -a y >+ fi >+ >+ echo "$PRE Mounting root filesystem $rootvol ro" >+ mkdir /rootvol >+ if ! mount -t auto -o ro $rootvol /rootvol; then >+- echo "\t*FAILED*"; >++ echo "\t*FAILED TRYING TO MOUNT ROOTVOL*"; >+ do_shell >+ fi >+ >+ echo "$PRE Umounting /proc" >+ umount /proc >+ >++echo "$PRE Umounting /sys" >++umount /sys >++ >+ echo "$PRE Changing roots" >+ cd /rootvol >+ if ! pivot_root . initrd ; then >+- echo "\t*FAILED*" >++ echo "\t*FAILED PIVOT TO NEW ROOT*" >+ do_shell >+ fi >+ >+@@ -356,7 +365,7 @@ >+ fi >+ >+ verbose "creating basic set of directories in $TMPMNT" >+-(cd $TMPMNT; mkdir bin dev etc lib proc sbin var) >++(cd $TMPMNT; mkdir bin dev etc lib proc sbin sys var) >+ if [ $? -ne 0 ]; then >+ echo "$cmd -- ERROR creating directories in $TMPMNT" >+ cleanup 1 >+@@ -499,4 +508,3 @@ >+ FINALTXT >+ >+ cleanup 0 >+- >diff --git a/sys-fs/lvm2/files/lvm2-2.02.63-always-make-static-libdm.patch b/sys-fs/lvm2/files/lvm2-2.02.63-always-make-static-libdm.patch >new file mode 100644 >index 0000000..5ddcb4e >--- /dev/null >+++ b/sys-fs/lvm2/files/lvm2-2.02.63-always-make-static-libdm.patch >@@ -0,0 +1,42 @@ >+diff -Nuar --exclude '*~' LVM2.2.02.63.orig/daemons/dmeventd/Makefile.in LVM2.2.02.63/daemons/dmeventd/Makefile.in >+--- LVM2.2.02.63.orig/daemons/dmeventd/Makefile.in 2010-04-09 14:42:48.000000000 -0700 >++++ LVM2.2.02.63/daemons/dmeventd/Makefile.in 2010-04-19 11:53:27.000000000 -0700 >+@@ -28,11 +28,12 @@ >+ INSTALL_LIB_TARGETS = install_lib_dynamic >+ >+ LIB_NAME = libdevmapper-event >++LIB_STATIC = $(LIB_NAME).a >++INSTALL_LIB_TARGETS += install_lib_static >++TARGETS += $(LIB_STATIC) >+ ifeq ("@STATIC_LINK@", "yes") >+- LIB_STATIC = $(LIB_NAME).a >+- TARGETS += $(LIB_STATIC) dmeventd.static >++ TARGETS += dmeventd.static >+ INSTALL_DMEVENTD_TARGETS += install_dmeventd_static >+- INSTALL_LIB_TARGETS += install_lib_static >+ endif >+ >+ LIB_VERSION = $(LIB_VERSION_DM) >+diff -Nuar --exclude '*~' LVM2.2.02.63.orig/libdm/Makefile.in LVM2.2.02.63/libdm/Makefile.in >+--- LVM2.2.02.63.orig/libdm/Makefile.in 2010-04-09 14:42:51.000000000 -0700 >++++ LVM2.2.02.63/libdm/Makefile.in 2010-04-19 11:52:20.000000000 -0700 >+@@ -34,8 +34,8 @@ >+ >+ INCLUDES = -I$(srcdir)/$(interface) -I$(srcdir) >+ >+-ifeq ("@STATIC_LINK@", "yes") >+ LIB_STATIC = $(interface)/libdevmapper.a >++ifeq ("@STATIC_LINK@", "yes") >+ endif >+ >+ LIB_SHARED = $(interface)/libdevmapper.$(LIB_SUFFIX) >+@@ -63,8 +63,8 @@ >+ >+ INSTALL_TYPE = install_dynamic >+ >+-ifeq ("@STATIC_LINK@", "yes") >+ INSTALL_TYPE += install_static >++ifeq ("@STATIC_LINK@", "yes") >+ endif >+ >+ ifeq ("@PKGCONFIG@", "yes") >diff --git a/sys-fs/lvm2/files/lvm2-2.02.67-createinitrd.patch b/sys-fs/lvm2/files/lvm2-2.02.67-createinitrd.patch >new file mode 100644 >index 0000000..7f0bfb8 >--- /dev/null >+++ b/sys-fs/lvm2/files/lvm2-2.02.67-createinitrd.patch >@@ -0,0 +1,18 @@ >+X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=301331 >+X-Gentoo-Bug: 301331 >+ >+diff -Nuar LVM2.2.02.67.orig/scripts/lvm2create_initrd/lvm2create_initrd LVM2.2.02.67/scripts/lvm2create_initrd/lvm2create_initrd >+--- LVM2.2.02.67.orig/scripts/lvm2create_initrd/lvm2create_initrd 2010-06-07 18:44:34.182980475 +0000 >++++ LVM2.2.02.67/scripts/lvm2create_initrd/lvm2create_initrd 2010-06-07 18:51:27.636312899 +0000 >+@@ -469,9 +469,9 @@ >+ rmdir $TMPMNT/lost+found >+ >+ echo "$cmd -- ummounting ram disk" >+-umount $DEVRAM >++umount $TMPMNT >+ if [ $? -ne 0 ]; then >+- echo "$cmd -- ERROR umounting $DEVRAM" >++ echo "$cmd -- ERROR umounting $TMPMNT" >+ cleanup 1 >+ fi >+ >diff --git a/sys-fs/lvm2/files/lvm2-2.02.70-asneeded.patch b/sys-fs/lvm2/files/lvm2-2.02.70-asneeded.patch >new file mode 100644 >index 0000000..7576e19 >--- /dev/null >+++ b/sys-fs/lvm2/files/lvm2-2.02.70-asneeded.patch >@@ -0,0 +1,15 @@ >+http://bugs.gentoo.org/330255 >+ >+liblvm2app.so: undefined reference to `floor' >+ >+--- liblvm/Makefile.in >++++ liblvm/Makefile.in >+@@ -39,7 +39,7 @@ >+ >+ include $(top_builddir)/make.tmpl >+ >+-LIBS += $(LVMINTERNAL_LIBS) -ldevmapper >++LIBS += $(LVMINTERNAL_LIBS) -ldevmapper -lm >+ >+ ifeq ("@DMEVENTD@", "yes") >+ LIBS += -ldevmapper-event >diff --git a/sys-fs/lvm2/files/lvm2-2.02.92-dynamic-static-ldflags.patch b/sys-fs/lvm2/files/lvm2-2.02.92-dynamic-static-ldflags.patch >new file mode 100644 >index 0000000..de2b294 >--- /dev/null >+++ b/sys-fs/lvm2/files/lvm2-2.02.92-dynamic-static-ldflags.patch >@@ -0,0 +1,63 @@ >+diff -Nuar --exclude '*.rej' --exclude '*.orig' LVM2.2.02.92.orig/configure.in LVM2.2.02.92/configure.in >+--- LVM2.2.02.92.orig/configure.in 2012-02-20 11:36:27.000000000 -0800 >++++ LVM2.2.02.92/configure.in 2012-02-20 15:53:40.700124222 -0800 >+@@ -32,6 +32,7 @@ >+ COPTIMISE_FLAG="-O2" >+ CLDFLAGS="$CLDFLAGS -Wl,--version-script,.export.sym" >+ ELDFLAGS="-Wl,--export-dynamic" >++ STATIC_LDFLAGS="-Wl,--no-export-dynamic" >+ # FIXME Generate list and use --dynamic-list=.dlopen.sym >+ CLDWHOLEARCHIVE="-Wl,-whole-archive" >+ CLDNOWHOLEARCHIVE="-Wl,-no-whole-archive" >+@@ -1458,6 +1459,7 @@ >+ AC_SUBST(SELINUX_PC) >+ AC_SUBST(SNAPSHOTS) >+ AC_SUBST(STATICDIR) >++AC_SUBST(STATIC_LDFLAGS) >+ AC_SUBST(STATIC_LINK) >+ AC_SUBST(TESTING) >+ AC_SUBST(THIN) >+diff -Nuar --exclude '*.rej' --exclude '*.orig' LVM2.2.02.92.orig/daemons/dmeventd/Makefile.in LVM2.2.02.92/daemons/dmeventd/Makefile.in >+--- LVM2.2.02.92.orig/daemons/dmeventd/Makefile.in 2012-02-20 15:48:04.861683196 -0800 >++++ LVM2.2.02.92/daemons/dmeventd/Makefile.in 2012-02-20 15:52:50.732314588 -0800 >+@@ -65,7 +65,7 @@ >+ $(DL_LIBS) $(LVMLIBS) $(LIBS) -rdynamic >+ >+ dmeventd.static: $(LIB_STATIC) dmeventd.o $(interfacebuilddir)/libdevmapper.a >+- $(CC) $(CFLAGS) $(LDFLAGS) $(ELDFLAGS) -static -L. -L$(interfacebuilddir) -o $@ \ >++ $(CC) $(CFLAGS) $(LDFLAGS) $(ELDFLAGS) $(STATIC_LDFLAGS) -static -L. -L$(interfacebuilddir) -o $@ \ >+ dmeventd.o $(DL_LIBS) $(LVMLIBS) $(LIBS) $(STATIC_LIBS) >+ >+ ifeq ("@PKGCONFIG@", "yes") >+diff -Nuar --exclude '*.rej' --exclude '*.orig' LVM2.2.02.92.orig/make.tmpl.in LVM2.2.02.92/make.tmpl.in >+--- LVM2.2.02.92.orig/make.tmpl.in 2012-02-20 15:48:05.034685963 -0800 >++++ LVM2.2.02.92/make.tmpl.in 2012-02-20 15:48:58.622550855 -0800 >+@@ -38,6 +38,7 @@ >+ ELDFLAGS += @ELDFLAGS@ >+ LDDEPS += @LDDEPS@ >+ LDFLAGS += @LDFLAGS@ >++STATIC_LDFLAGS += @STATIC_LDFLAGS@ >+ LIB_SUFFIX = @LIB_SUFFIX@ >+ LVMINTERNAL_LIBS = -llvm-internal $(UDEV_LIBS) $(DL_LIBS) >+ DL_LIBS = @DL_LIBS@ >+diff -Nuar --exclude '*.rej' --exclude '*.orig' LVM2.2.02.92.orig/tools/Makefile.in LVM2.2.02.92/tools/Makefile.in >+--- LVM2.2.02.92.orig/tools/Makefile.in 2011-11-14 13:30:36.000000000 -0800 >++++ LVM2.2.02.92/tools/Makefile.in 2012-02-20 15:52:25.242901501 -0800 >+@@ -126,7 +126,7 @@ >+ -o $@ dmsetup.o -ldevmapper $(LIBS) >+ >+ dmsetup.static: dmsetup.o $(interfacebuilddir)/libdevmapper.a >+- $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) \ >++ $(CC) $(CFLAGS) $(LDFLAGS) $(STATIC_LDFLAGS) -static -L$(interfacebuilddir) \ >+ -o $@ dmsetup.o -ldevmapper $(STATIC_LIBS) $(LIBS) >+ >+ all: device-mapper >+@@ -136,7 +136,7 @@ >+ $(LVMLIBS) $(READLINE_LIBS) $(LIBS) -rdynamic >+ >+ lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a $(interfacebuilddir)/libdevmapper.a >+- $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ \ >++ $(CC) $(CFLAGS) $(LDFLAGS) $(STATIC_LDFLAGS) -static -L$(interfacebuilddir) -o $@ \ >+ $(OBJECTS) lvm-static.o $(LVMLIBS) $(STATIC_LIBS) $(LIBS) >+ >+ liblvm2cmd.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o >diff --git a/sys-fs/lvm2/files/lvm2-2.02.99-example.conf.in.patch b/sys-fs/lvm2/files/lvm2-2.02.99-example.conf.in.patch >new file mode 100644 >index 0000000..38be5df >--- /dev/null >+++ b/sys-fs/lvm2/files/lvm2-2.02.99-example.conf.in.patch >@@ -0,0 +1,47 @@ >+--- conf/example.conf.in >++++ conf/example.conf.in >+@@ -50,7 +50,9 @@ >+ >+ >+ # By default we accept every block device: >+- filter = [ "a/.*/" ] >++ # Gentoo: we exclude /dev/nbd by default, because it makes a lot of kernel >++ # noise when you probed while not available. >++ filter = [ "r|/dev/nbd.*|", "a/.*/" ] >+ >+ # Exclude the cdrom drive >+ # filter = [ "r|/dev/cdrom|" ] >+@@ -259,6 +261,8 @@ >+ # the new lvm2 on-disk metadata format. >+ # The default value is set when the tools are built. >+ # fallback_to_lvm1 = 0 >++ # Gentoo: the LVM tools are a seperate package. >++ fallback_to_lvm1 = 0 >+ >+ # The default metadata format that commands should use - "lvm1" or "lvm2". >+ # The command line override is -M1 or -M2. >+@@ -449,12 +453,12 @@ >+ >+ # Metadata settings >+ # >+-# metadata { >++metadata { >+ # Default number of copies of metadata to hold on each PV. 0, 1 or 2. >+ # You might want to override it from the command line with 0 >+ # when running pvcreate on new PVs which are to be added to large VGs. >+- >+- # pvmetadatacopies = 1 >++ # Gentoo: enable for data safety, but PV resize is then disabled. >++ #pvmetadatacopies = 2 >+ >+ # Approximate default size of on-disk metadata areas in sectors. >+ # You should increase this if you have large volume groups or >+@@ -476,7 +480,7 @@ >+ # the supplied toolset to make changes (e.g. vgcfgrestore). >+ >+ # dirs = [ "/etc/lvm/metadata", "/mnt/disk2/lvm/metadata2" ] >+-#} >++} >+ >+ # Event daemon >+ # >diff --git a/sys-fs/lvm2/files/lvm2-2.02.99-locale-muck.patch b/sys-fs/lvm2/files/lvm2-2.02.99-locale-muck.patch >new file mode 100644 >index 0000000..364fbd4 >--- /dev/null >+++ b/sys-fs/lvm2/files/lvm2-2.02.99-locale-muck.patch >@@ -0,0 +1,11 @@ >+--- make.tmpl.in >++++ make.tmpl.in >+@@ -395,7 +395,7 @@ >+ ( cat $(srcdir)/.exported_symbols; \ >+ if test x$(EXPORTED_HEADER) != x; then \ >+ $(CC) -E -P $(INCLUDES) $(DEFS) $(EXPORTED_HEADER) | \ >+- $(SED) -ne "/^typedef|}/!s/.*[ *]\($(EXPORTED_FN_PREFIX)_[a-z0-9_]*\)(.*/\1/p"; \ >++ LC_ALL=C $(SED) -ne "/^typedef|}/!s/.*[ *]\($(EXPORTED_FN_PREFIX)_[a-z0-9_]*\)(.*/\1/p"; \ >+ fi \ >+ ) > $@ >+ >diff --git a/sys-fs/lvm2/files/lvm2-fix-stdio-usage.patch b/sys-fs/lvm2/files/lvm2-fix-stdio-usage.patch >new file mode 100644 >index 0000000..71fa5bf >--- /dev/null >+++ b/sys-fs/lvm2/files/lvm2-fix-stdio-usage.patch >@@ -0,0 +1,111 @@ >+--- LVM2.2.02.103.orig/lib/commands/toolcontext.c >++++ LVM2.2.02.103/lib/commands/toolcontext.c >+@@ -1336,7 +1336,10 @@ >+ /* >+ * Close and reopen stream on file descriptor fd. >+ */ >+-static int _reopen_stream(FILE *stream, int fd, const char *mode, const char *name, FILE **new_stream) >++#ifdef __GLIBC__ >++#define _reopen_stream(stream, fd, mode, name) __reopen_stream(stream, fd, mode, name, &stream) >++ >++static int __reopen_stream(FILE *stream, int fd, const char *mode, const char *name, FILE **new_stream) >+ { >+ int fd_copy, new_fd; >+ >+@@ -1363,6 +1366,9 @@ >+ >+ return 1; >+ } >++#else >++#define _reopen_stream(stream, fd, mode, name) (freopen(NULL, mode, stream) != NULL) >++#endif >+ >+ /* Entry point */ >+ struct cmd_context *create_toolcontext(unsigned is_long_lived, >+@@ -1371,7 +1377,6 @@ >+ unsigned threaded) >+ { >+ struct cmd_context *cmd; >+- FILE *new_stream; >+ int flags; >+ >+ #ifdef M_MMAP_MAX >+@@ -1421,9 +1426,8 @@ >+ if (is_valid_fd(STDIN_FILENO) && >+ ((flags = fcntl(STDIN_FILENO, F_GETFL)) > 0) && >+ (flags & O_ACCMODE) != O_WRONLY) { >+- if (!_reopen_stream(stdin, STDIN_FILENO, "r", "stdin", &new_stream)) >++ if (!_reopen_stream(stdin, STDIN_FILENO, "r", "stdin")) >+ goto_out; >+- stdin = new_stream; >+ if (setvbuf(stdin, cmd->linebuffer, _IOLBF, linebuffer_size)) { >+ log_sys_error("setvbuf", ""); >+ goto out; >+@@ -1433,9 +1437,8 @@ >+ if (is_valid_fd(STDOUT_FILENO) && >+ ((flags = fcntl(STDOUT_FILENO, F_GETFL)) > 0) && >+ (flags & O_ACCMODE) != O_RDONLY) { >+- if (!_reopen_stream(stdout, STDOUT_FILENO, "w", "stdout", &new_stream)) >++ if (!_reopen_stream(stdout, STDOUT_FILENO, "w", "stdout")) >+ goto_out; >+- stdout = new_stream; >+ if (setvbuf(stdout, cmd->linebuffer + linebuffer_size, >+ _IOLBF, linebuffer_size)) { >+ log_sys_error("setvbuf", ""); >+@@ -1715,7 +1718,6 @@ >+ void destroy_toolcontext(struct cmd_context *cmd) >+ { >+ struct dm_config_tree *cft_cmdline; >+- FILE *new_stream; >+ int flags; >+ >+ if (cmd->dump_filter && cmd->filter && cmd->filter->dump && >+@@ -1752,8 +1754,7 @@ >+ if (is_valid_fd(STDIN_FILENO) && >+ ((flags = fcntl(STDIN_FILENO, F_GETFL)) > 0) && >+ (flags & O_ACCMODE) != O_WRONLY) { >+- if (_reopen_stream(stdin, STDIN_FILENO, "r", "stdin", &new_stream)) { >+- stdin = new_stream; >++ if (_reopen_stream(stdin, STDIN_FILENO, "r", "stdin")) { >+ setlinebuf(stdin); >+ } else >+ cmd->linebuffer = NULL; /* Leave buffer in place (deliberate leak) */ >+@@ -1762,8 +1763,7 @@ >+ if (is_valid_fd(STDOUT_FILENO) && >+ ((flags = fcntl(STDOUT_FILENO, F_GETFL)) > 0) && >+ (flags & O_ACCMODE) != O_RDONLY) { >+- if (_reopen_stream(stdout, STDOUT_FILENO, "w", "stdout", &new_stream)) { >+- stdout = new_stream; >++ if (_reopen_stream(stdout, STDOUT_FILENO, "w", "stdout")) { >+ setlinebuf(stdout); >+ } else >+ cmd->linebuffer = NULL; /* Leave buffer in place (deliberate leak) */ >+--- LVM2.2.02.103.orig/tools/lvmcmdline.c >++++ LVM2.2.02.103/tools/lvmcmdline.c >+@@ -1252,7 +1252,7 @@ >+ int err = is_valid_fd(STDERR_FILENO); >+ >+ if (!is_valid_fd(STDIN_FILENO) && >+- !(stdin = fopen(_PATH_DEVNULL, "r"))) { >++ !freopen(_PATH_DEVNULL, "r", stdin)) { >+ if (err) >+ perror("stdin stream open"); >+ else >+@@ -1262,7 +1262,7 @@ >+ } >+ >+ if (!is_valid_fd(STDOUT_FILENO) && >+- !(stdout = fopen(_PATH_DEVNULL, "w"))) { >++ !freopen(_PATH_DEVNULL, "w", stdout)) { >+ if (err) >+ perror("stdout stream open"); >+ /* else no stdout */ >+@@ -1270,7 +1270,7 @@ >+ } >+ >+ if (!is_valid_fd(STDERR_FILENO) && >+- !(stderr = fopen(_PATH_DEVNULL, "w"))) { >++ !freopen(_PATH_DEVNULL, "w", stderr)) { >+ printf("stderr stream open: %s\n", >+ strerror(errno)); >+ return 0; >diff --git a/sys-fs/lvm2/files/lvm2-musl-fixes.patch b/sys-fs/lvm2/files/lvm2-musl-fixes.patch >new file mode 100644 >index 0000000..b62e80a >--- /dev/null >+++ b/sys-fs/lvm2/files/lvm2-musl-fixes.patch >@@ -0,0 +1,33 @@ >+diff -uar LVM2.2.02.110-old/daemons/lvmetad/lvmetad-core.c LVM2.2.02.110/daemons/lvmetad/lvmetad-core.c >+--- LVM2.2.02.110-old/daemons/lvmetad/lvmetad-core.c 2015-05-14 21:37:01.226755157 +0000 >++++ LVM2.2.02.110/daemons/lvmetad/lvmetad-core.c 2015-05-14 21:44:08.098585801 +0000 >+@@ -124,7 +124,7 @@ >+ if (!(vg = dm_hash_lookup(s->lock.vg, id))) { >+ if (!(vg = malloc(sizeof(pthread_mutex_t))) || >+ pthread_mutexattr_init(&rec) || >+- pthread_mutexattr_settype(&rec, PTHREAD_MUTEX_RECURSIVE_NP) || >++ pthread_mutexattr_settype(&rec, PTHREAD_MUTEX_RECURSIVE) || >+ pthread_mutex_init(vg, &rec)) >+ goto bad; >+ if (!dm_hash_insert(s->lock.vg, id, vg)) { >+@@ -1152,7 +1152,7 @@ >+ ls->log = s->log; >+ >+ pthread_mutexattr_init(&rec); >+- pthread_mutexattr_settype(&rec, PTHREAD_MUTEX_RECURSIVE_NP); >++ pthread_mutexattr_settype(&rec, PTHREAD_MUTEX_RECURSIVE); >+ pthread_mutex_init(&ls->lock.pvid_to_pvmeta, &rec); >+ pthread_mutex_init(&ls->lock.vgid_to_metadata, &rec); >+ pthread_mutex_init(&ls->lock.pvid_to_vgid, NULL); >+Only in LVM2.2.02.110/lib/commands: toolcontext.c.orig >+diff -uar LVM2.2.02.110-old/libdaemon/server/daemon-server.c LVM2.2.02.110/libdaemon/server/daemon-server.c >+--- LVM2.2.02.110-old/libdaemon/server/daemon-server.c 2015-05-14 21:37:01.256755555 +0000 >++++ LVM2.2.02.110/libdaemon/server/daemon-server.c 2015-05-14 21:37:51.108437752 +0000 >+@@ -26,6 +26,7 @@ >+ #include <sys/un.h> >+ #include <unistd.h> >+ #include <signal.h> >++#include <fcntl.h> >+ >+ #include <syslog.h> /* FIXME. For the global closelog(). */ >+ >diff --git a/sys-fs/lvm2/files/lvmetad.initd-2.02.105-r2 b/sys-fs/lvm2/files/lvmetad.initd-2.02.105-r2 >new file mode 100755 >index 0000000..e16d55c >--- /dev/null >+++ b/sys-fs/lvm2/files/lvmetad.initd-2.02.105-r2 >@@ -0,0 +1,13 @@ >+#!/sbin/runscript >+# Copyright 1999-2014 Gentoo Foundation >+# Distributed under the terms of the GNU General Public License v2 >+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvmetad.initd-2.02.105-r2,v 1.2 2014/02/08 21:17:46 robbat2 Exp $ >+ >+pidfile="/run/lvmetad.pid" >+command="/sbin/lvmetad" >+command_args="${LVMETAD_OPTS:=-p ${pidfile}}" >+start_stop_daemon_args="--pidfile ${pidfile}" >+ >+depend() { >+ : >+} >diff --git a/sys-fs/lvm2/lvm2-2.02.110-r99.ebuild b/sys-fs/lvm2/lvm2-2.02.110-r99.ebuild >new file mode 100644 >index 0000000..4cffcec >--- /dev/null >+++ b/sys-fs/lvm2/lvm2-2.02.110-r99.ebuild >@@ -0,0 +1,275 @@ >+# Copyright 1999-2014 Gentoo Foundation >+# Distributed under the terms of the GNU General Public License v2 >+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.110.ebuild,v 1.3 2014/08/29 07:15:02 ssuominen Exp $ >+ >+EAPI=5 >+inherit autotools eutils linux-info multilib systemd toolchain-funcs udev flag-o-matic >+ >+DESCRIPTION="User-land utilities for LVM2 (device-mapper) software" >+HOMEPAGE="http://sources.redhat.com/lvm2/" >+SRC_URI="ftp://sources.redhat.com/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz >+ ftp://sources.redhat.com/pub/lvm2/old/${PN/lvm/LVM}.${PV}.tgz" >+ >+LICENSE="GPL-2" >+SLOT="0" >+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" >+IUSE="readline static static-libs systemd clvm cman lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only" >+REQUIRED_USE="device-mapper-only? ( !clvm !cman !lvm1 !lvm2create_initrd !thin ) >+ systemd? ( udev ) >+ static? ( !udev )" #520450 >+ >+DEPEND_COMMON="clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* ) >+ readline? ( sys-libs/readline ) >+ udev? ( >=virtual/libudev-208:=[static-libs?] )" >+# /run is now required for locking during early boot. /var cannot be assumed to >+# be available -- thus, pull in recent enough baselayout for /run. >+# This version of LVM is incompatible with cryptsetup <1.1.2. >+RDEPEND="${DEPEND_COMMON} >+ >=sys-apps/baselayout-2.2 >+ !<sys-apps/openrc-0.11 >+ !<sys-fs/cryptsetup-1.1.2 >+ !!sys-fs/clvm >+ !!sys-fs/lvm-user >+ >=sys-apps/util-linux-2.16 >+ lvm2create_initrd? ( sys-apps/makedev ) >+ thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )" >+# note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check >+DEPEND="${DEPEND_COMMON} >+ virtual/pkgconfig >+ >=sys-devel/binutils-2.20.1-r1 >+ static? ( >+ selinux? ( sys-libs/libselinux[static-libs] ) >+ udev? ( >=virtual/libudev-208:=[static-libs] ) >+ >=sys-apps/util-linux-2.16[static-libs] >+ )" >+ >+S=${WORKDIR}/${PN/lvm/LVM}.${PV} >+ >+pkg_setup() { >+ local CONFIG_CHECK="~SYSVIPC" >+ >+ if use udev; then >+ local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n" >+ if linux_config_exists; then >+ local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH) >+ if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then >+ ewarn "It's recommended to set an empty value to the following kernel config option:" >+ ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}" >+ fi >+ fi >+ fi >+ >+ check_extra_config >+ >+ # 1. Genkernel no longer copies /sbin/lvm blindly. >+ if use static; then >+ elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with" >+ elog "their static versions. If you need the static binaries," >+ elog "you must append .static to the filename!" >+ fi >+} >+ >+src_prepare() { >+ # Gentoo specific modification(s): >+ epatch "${FILESDIR}"/${PN}-2.02.108-example.conf.in.patch >+ >+ sed -i \ >+ -e "1iAR = $(tc-getAR)" \ >+ -e "s:CC ?= @CC@:CC = $(tc-getCC):" \ >+ make.tmpl.in || die #444082 >+ >+ sed -i -e '/FLAG/s:-O2::' configure{.in,} || die #480212 >+ >+ if use udev && ! use device-mapper-only; then >+ sed -i -e '/use_lvmetad =/s:0:1:' conf/example.conf.in || die #514196 >+ elog "Notice that \"use_lvmetad\" setting is enabled with USE=\"udev\" in" >+ elog "/etc/lvm/lvm.conf, which will require restart of udev, lvm, and lvmetad" >+ elog "if it was previously disabled." >+ fi >+ >+ sed -i -e "s:/usr/bin/true:$(type -P true):" scripts/blk_availability_systemd_red_hat.service.in || die #517514 >+ >+ # For upstream -- review and forward: >+ epatch "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch >+ epatch "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch >+ epatch "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331 >+ epatch "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373 >+ epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed >+ epatch "${FILESDIR}"/${PN}-2.02.92-dynamic-static-ldflags.patch #332905 >+ epatch "${FILESDIR}"/${PN}-2.02.108-static-pkgconfig-libs.patch #370217, #439414 + blkid >+ epatch "${FILESDIR}"/${PN}-2.02.106-pthread-pkgconfig.patch #492450 >+ # Patches for musl >+ epatch "${FILESDIR}"/${PN}-fix-stdio-usage.patch # Patch from alpine linux >+ epatch "${FILESDIR}"/${PN}-musl-fixes.patch >+ >+ # Without thin-privision-tools, there is nothing to install for target install_man7: >+ use thin || { sed -i -e '/^install_lvm2/s:install_man7::' man/Makefile.in || die; } >+ >+ eautoreconf >+} >+ >+src_configure() { >+ filter-flags -flto >+ local myconf >+ local buildmode >+ >+ myconf="${myconf} $(use_enable !device-mapper-only dmeventd)" >+ myconf="${myconf} $(use_enable !device-mapper-only cmdlib)" >+ myconf="${myconf} $(use_enable !device-mapper-only applib)" >+ myconf="${myconf} $(use_enable !device-mapper-only fsadm)" >+ myconf="${myconf} $(use_enable !device-mapper-only lvmetad)" >+ use device-mapper-only && myconf="${myconf} --disable-udev-systemd-background-jobs" >+ >+ # Most of this package does weird stuff. >+ # The build options are tristate, and --without is NOT supported >+ # options: 'none', 'internal', 'shared' >+ if use static; then >+ buildmode="internal" >+ # This only causes the .static versions to become available >+ myconf="${myconf} --enable-static_link" >+ else >+ buildmode="shared" >+ fi >+ dmbuildmode=$(use !device-mapper-only && echo internal || echo none) >+ >+ # dmeventd requires mirrors to be internal, and snapshot available >+ # so we cannot disable them >+ myconf="${myconf} --with-mirrors=${dmbuildmode}" >+ myconf="${myconf} --with-snapshots=${dmbuildmode}" >+ if use thin; then >+ myconf="${myconf} --with-thin=internal --with-cache=internal" >+ local texec >+ for texec in check dump repair restore; do >+ myconf="${myconf} --with-thin-${texec}=${EPREFIX}/sbin/thin_${texec}" >+ myconf="${myconf} --with-cache-${texec}=${EPREFIX}/sbin/cache_${texec}" >+ done >+ else >+ myconf="${myconf} --with-thin=none --with-cache=none" >+ fi >+ >+ if use lvm1; then >+ myconf="${myconf} --with-lvm1=${buildmode}" >+ else >+ myconf="${myconf} --with-lvm1=none" >+ fi >+ >+ # disable O_DIRECT support on hppa, breaks pv detection (#99532) >+ use hppa && myconf="${myconf} --disable-o_direct" >+ >+ if use clvm; then >+ myconf="${myconf} --with-cluster=${buildmode}" >+ # 4-state! Make sure we get it right, per bug 210879 >+ # Valid options are: none, cman, gulm, all >+ # >+ # 2009/02: >+ # gulm is removed now, now dual-state: >+ # cman, none >+ # all still exists, but is not needed >+ # >+ # 2009/07: >+ # TODO: add corosync and re-enable ALL >+ local clvmd="" >+ use cman && clvmd="cman" >+ #clvmd="${clvmd/cmangulm/all}" >+ [ -z "${clvmd}" ] && clvmd="none" >+ myconf="${myconf} --with-clvmd=${clvmd}" >+ myconf="${myconf} --with-pool=${buildmode}" >+ else >+ myconf="${myconf} --with-clvmd=none --with-cluster=none" >+ fi >+ >+ econf \ >+ $(use_enable readline) \ >+ $(use_enable selinux) \ >+ --enable-pkgconfig \ >+ --with-confdir="${EPREFIX}"/etc \ >+ --exec-prefix="${EPREFIX}" \ >+ --sbindir="${EPREFIX}/sbin" \ >+ --with-staticdir="${EPREFIX}"/sbin \ >+ --libdir="${EPREFIX}/$(get_libdir)" \ >+ --with-usrlibdir="${EPREFIX}/usr/$(get_libdir)" \ >+ --with-default-dm-run-dir=/run \ >+ --with-default-run-dir=/run/lvm \ >+ --with-default-locking-dir=/run/lock/lvm \ >+ --with-default-pid-dir=/run \ >+ $(use_enable udev udev_rules) \ >+ $(use_enable udev udev_sync) \ >+ $(use_with udev udevdir "$(get_udevdir)"/rules.d) \ >+ $(use_enable systemd udev-systemd-background-jobs) \ >+ "$(systemd_with_unitdir)" \ >+ ${myconf} \ >+ CLDFLAGS="${LDFLAGS}" >+} >+ >+src_compile() { >+ pushd include >/dev/null >+ emake >+ popd >/dev/null >+ >+ if use device-mapper-only ; then >+ emake device-mapper >+ else >+ emake >+ emake CC="$(tc-getCC)" -C scripts lvm2_activation_generator_systemd_red_hat >+ fi >+} >+ >+src_install() { >+ local inst >+ INSTALL_TARGETS="install install_systemd_units install_systemd_generators install_tmpfiles_configuration" >+ use device-mapper-only && INSTALL_TARGETS="install_device-mapper" >+ for inst in ${INSTALL_TARGETS}; do >+ emake DESTDIR="${D}" ${inst} >+ done >+ >+ newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper >+ newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper >+ >+ if use !device-mapper-only ; then >+ newinitd "${FILESDIR}"/dmeventd.initd-2.02.67-r1 dmeventd >+ newinitd "${FILESDIR}"/lvm.rc-2.02.105-r2 lvm >+ newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm >+ >+ newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 lvm-monitoring >+ newinitd "${FILESDIR}"/lvmetad.initd-2.02.105-r2 lvmetad >+ fi >+ >+ if use clvm; then >+ newinitd "${FILESDIR}"/clvmd.rc-2.02.39 clvmd >+ newconfd "${FILESDIR}"/clvmd.confd-2.02.39 clvmd >+ fi >+ >+ if use static-libs; then >+ dolib.a libdm/ioctl/libdevmapper.a >+ dolib.a libdaemon/client/libdaemonclient.a #462908 >+ #gen_usr_ldscript libdevmapper.so >+ dolib.a daemons/dmeventd/libdevmapper-event.a >+ #gen_usr_ldscript libdevmapper-event.so >+ else >+ rm -f "${ED}"usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a >+ fi >+ >+ if use lvm2create_initrd; then >+ dosbin scripts/lvm2create_initrd/lvm2create_initrd >+ doman scripts/lvm2create_initrd/lvm2create_initrd.8 >+ newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd >+ fi >+ >+ insinto /etc >+ doins "${FILESDIR}"/dmtab >+ >+ dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf >+} >+ >+pkg_postinst() { >+ ewarn "Make sure the \"lvm\" init script is in the runlevels:" >+ ewarn "# rc-update add lvm boot" >+ ewarn >+ ewarn "Make sure to enable lvmetad in /etc/lvm/lvm.conf if you want" >+ ewarn "to enable lvm autoactivation and metadata caching." >+} >+ >+src_test() { >+ einfo "Tests are disabled because of device-node mucking, if you want to" >+ einfo "run tests, compile the package and see ${S}/tests" >+} >diff --git a/sys-fs/lvm2/metadata.xml b/sys-fs/lvm2/metadata.xml >new file mode 100644 >index 0000000..74f768f >--- /dev/null >+++ b/sys-fs/lvm2/metadata.xml >@@ -0,0 +1,24 @@ >+<?xml version="1.0" encoding="UTF-8"?> >+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> >+<pkgmetadata> >+ <maintainer> >+ <email>robbat2@gentoo.org</email> >+ <name>Robin H. Johnson</name> >+ </maintainer> >+ <maintainer> >+ <email>agk@redhat.com</email> >+ <name>Alasdair Kergon</name> >+ <description>Upstream Maintainer (please CC on bugs)</description> >+ </maintainer> >+ <use> >+ <flag name='clvm'>Allow users to build clustered lvm2</flag> >+ <flag name='cman'>Cman support for clustered lvm</flag> >+ <flag name='lvm1'>Allow users to build lvm2 with lvm1 support</flag> >+ <flag name='lvm2create_initrd'>Install lvm2create_initrd script and pull in <pkg>sys-apps/makedev</pkg> for the /sbin/MAKEDEV command</flag> >+ <flag name='thin'>Support for thin volumes</flag> >+ <flag name='device-mapper-only'>Build only device-mapper and not the rest of LVM2 (UNSUPPORTED)</flag> >+ </use> >+ <upstream> >+ <remote-id type="cpe">cpe:/a:heinz_mauelshagen:lvm2</remote-id> >+ </upstream> >+</pkgmetadata> >-- >2.3.6 >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=403282">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 549506
:
403278
|
403280
| 403282
