From 1d412f04b6e137f20cbe616b3203d2cbc8dfd5ad Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 10 May 2023 11:43:22 +0100 Subject: gentoo auto-resync : 10:05:2023 - 11:43:22 --- sys-fs/lvm2/Manifest | 39 ++- sys-fs/lvm2/files/device-mapper.conf-1.02.22-r3 | 1 - sys-fs/lvm2/files/device-mapper.conf-r4 | 1 + sys-fs/lvm2/files/device-mapper.rc-2.02.105-r2 | 146 ---------- sys-fs/lvm2/files/device-mapper.rc-r3 | 146 ++++++++++ sys-fs/lvm2/files/dmeventd.initd-2.02.184-r2 | 21 -- sys-fs/lvm2/files/dmeventd.initd-r3 | 21 ++ sys-fs/lvm2/files/lvm-monitoring.initd-2.02.105-r2 | 38 --- sys-fs/lvm2/files/lvm-monitoring.initd-r3 | 38 +++ sys-fs/lvm2/files/lvm.confd-2.02.184-r3 | 9 - sys-fs/lvm2/files/lvm.confd-r4 | 9 + sys-fs/lvm2/files/lvm.rc-2.02.187 | 173 ------------ sys-fs/lvm2/files/lvm.rc-r1 | 173 ++++++++++++ .../files/lvm2-2.02.56-lvm2create_initrd.patch | 72 ----- sys-fs/lvm2/files/lvm2-2.02.67-createinitrd.patch | 18 -- .../lvm2/files/lvm2-2.03.17-example.conf.in.patch | 42 --- sys-fs/lvm2/files/lvm2-2.03.17-locale-muck.patch | 11 - .../files/lvm2-2.03.17-pthread-pkgconfig.patch | 31 --- .../lvm2-2.03.19-dm_lvm_rules_no_systemd.patch | 11 - .../files/lvm2-2.03.19-dmeventd-no-idle-exit.patch | 73 ----- .../lvm2-2.03.19-dynamic-static-ldflags.patch | 50 ---- sys-fs/lvm2/files/lvm2-2.03.19-freopen-musl.patch | 63 ----- .../files/lvm2-2.03.19-static-pkgconfig-libs.patch | 130 --------- sys-fs/lvm2/files/lvm2-2.03.20-createinitrd.patch | 18 ++ .../lvm2-2.03.20-dm_lvm_rules_no_systemd.patch | 11 + .../files/lvm2-2.03.20-dmeventd-no-idle-exit.patch | 73 +++++ .../lvm2/files/lvm2-2.03.20-example.conf.in.patch | 42 +++ sys-fs/lvm2/files/lvm2-2.03.20-freopen-musl.patch | 63 +++++ sys-fs/lvm2/files/lvm2-2.03.20-locale-muck.patch | 11 + .../files/lvm2-2.03.20-lvm2create_initrd.patch | 72 +++++ sys-fs/lvm2/files/lvmlockd.initd-2.02.166-r1 | 17 -- sys-fs/lvm2/files/lvmlockd.initd-r2 | 17 ++ sys-fs/lvm2/files/lvmpolld.initd-2.02.183 | 17 -- sys-fs/lvm2/files/lvmpolld.initd-r1 | 17 ++ sys-fs/lvm2/lvm2-2.03.19.ebuild | 306 --------------------- sys-fs/lvm2/lvm2-2.03.20.ebuild | 30 +- sys-fs/lvm2/lvm2-2.03.21.ebuild | 30 +- 37 files changed, 759 insertions(+), 1281 deletions(-) delete mode 100644 sys-fs/lvm2/files/device-mapper.conf-1.02.22-r3 create mode 100644 sys-fs/lvm2/files/device-mapper.conf-r4 delete mode 100644 sys-fs/lvm2/files/device-mapper.rc-2.02.105-r2 create mode 100644 sys-fs/lvm2/files/device-mapper.rc-r3 delete mode 100644 sys-fs/lvm2/files/dmeventd.initd-2.02.184-r2 create mode 100644 sys-fs/lvm2/files/dmeventd.initd-r3 delete mode 100644 sys-fs/lvm2/files/lvm-monitoring.initd-2.02.105-r2 create mode 100644 sys-fs/lvm2/files/lvm-monitoring.initd-r3 delete mode 100644 sys-fs/lvm2/files/lvm.confd-2.02.184-r3 create mode 100644 sys-fs/lvm2/files/lvm.confd-r4 delete mode 100644 sys-fs/lvm2/files/lvm.rc-2.02.187 create mode 100644 sys-fs/lvm2/files/lvm.rc-r1 delete mode 100644 sys-fs/lvm2/files/lvm2-2.02.56-lvm2create_initrd.patch delete mode 100644 sys-fs/lvm2/files/lvm2-2.02.67-createinitrd.patch delete mode 100644 sys-fs/lvm2/files/lvm2-2.03.17-example.conf.in.patch delete mode 100644 sys-fs/lvm2/files/lvm2-2.03.17-locale-muck.patch delete mode 100644 sys-fs/lvm2/files/lvm2-2.03.17-pthread-pkgconfig.patch delete mode 100644 sys-fs/lvm2/files/lvm2-2.03.19-dm_lvm_rules_no_systemd.patch delete mode 100644 sys-fs/lvm2/files/lvm2-2.03.19-dmeventd-no-idle-exit.patch delete mode 100644 sys-fs/lvm2/files/lvm2-2.03.19-dynamic-static-ldflags.patch delete mode 100644 sys-fs/lvm2/files/lvm2-2.03.19-freopen-musl.patch delete mode 100644 sys-fs/lvm2/files/lvm2-2.03.19-static-pkgconfig-libs.patch create mode 100644 sys-fs/lvm2/files/lvm2-2.03.20-createinitrd.patch create mode 100644 sys-fs/lvm2/files/lvm2-2.03.20-dm_lvm_rules_no_systemd.patch create mode 100644 sys-fs/lvm2/files/lvm2-2.03.20-dmeventd-no-idle-exit.patch create mode 100644 sys-fs/lvm2/files/lvm2-2.03.20-example.conf.in.patch create mode 100644 sys-fs/lvm2/files/lvm2-2.03.20-freopen-musl.patch create mode 100644 sys-fs/lvm2/files/lvm2-2.03.20-locale-muck.patch create mode 100644 sys-fs/lvm2/files/lvm2-2.03.20-lvm2create_initrd.patch delete mode 100644 sys-fs/lvm2/files/lvmlockd.initd-2.02.166-r1 create mode 100644 sys-fs/lvm2/files/lvmlockd.initd-r2 delete mode 100644 sys-fs/lvm2/files/lvmpolld.initd-2.02.183 create mode 100644 sys-fs/lvm2/files/lvmpolld.initd-r1 delete mode 100644 sys-fs/lvm2/lvm2-2.03.19.ebuild (limited to 'sys-fs/lvm2') diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest index 6069f93ff636..0094ecae6932 100644 --- a/sys-fs/lvm2/Manifest +++ b/sys-fs/lvm2/Manifest @@ -1,26 +1,21 @@ -AUX device-mapper.conf-1.02.22-r3 15 BLAKE2B c8954f4cad3090e95c8ab985f7f93b65add66b9014351aab82d270c371c3b7571a73b37b2002664b50c21bb7dd494c7196857de75b41ca534cb15e0127f080ae SHA512 1846e0ca1be7170d4c0beb694a23aea4d19b24b99a248bb0f4e034286a6beede0a8efc474b0c237e33ee72c86c93b6238f2d5ea23e224765acba99c90633261e -AUX device-mapper.rc-2.02.105-r2 3704 BLAKE2B 7113396a7b7da28a82de68142504e3f2aefd53ab3e8c91a231fc47b1ad58925f6a6a68085ecc676d4d6ca277d7f456da1143e9dcca631a68e93c83b975085e46 SHA512 e3ddbfa3c273646f22b0f8d1ebeb8632c6c5bd165b0d990d7b3c6468da7e229f66f532eaf0ca4b73018d64781a21f2d2769c5307ca40c5981af2a935c31daed2 -AUX dmeventd.initd-2.02.184-r2 595 BLAKE2B fe87c9a034f9a9924c4c6e31365619cf5809a9756112925ca50233198ab052139f8151a81ee8db69fa6a7eda8e3aacaa128faa30e5d99a52d15f5a07a9da4179 SHA512 f46fa3d0a0a0047801c0d3a3817f9d7c5dbe0daa2237c2537f5a3faef3dd2d7030780471bb1ba19746c26ce6035092477c06806156718a7526e5222339fa01ec +AUX device-mapper.conf-r4 15 BLAKE2B c8954f4cad3090e95c8ab985f7f93b65add66b9014351aab82d270c371c3b7571a73b37b2002664b50c21bb7dd494c7196857de75b41ca534cb15e0127f080ae SHA512 1846e0ca1be7170d4c0beb694a23aea4d19b24b99a248bb0f4e034286a6beede0a8efc474b0c237e33ee72c86c93b6238f2d5ea23e224765acba99c90633261e +AUX device-mapper.rc-r3 3704 BLAKE2B 7113396a7b7da28a82de68142504e3f2aefd53ab3e8c91a231fc47b1ad58925f6a6a68085ecc676d4d6ca277d7f456da1143e9dcca631a68e93c83b975085e46 SHA512 e3ddbfa3c273646f22b0f8d1ebeb8632c6c5bd165b0d990d7b3c6468da7e229f66f532eaf0ca4b73018d64781a21f2d2769c5307ca40c5981af2a935c31daed2 +AUX dmeventd.initd-r3 595 BLAKE2B fe87c9a034f9a9924c4c6e31365619cf5809a9756112925ca50233198ab052139f8151a81ee8db69fa6a7eda8e3aacaa128faa30e5d99a52d15f5a07a9da4179 SHA512 f46fa3d0a0a0047801c0d3a3817f9d7c5dbe0daa2237c2537f5a3faef3dd2d7030780471bb1ba19746c26ce6035092477c06806156718a7526e5222339fa01ec AUX dmtab 319 BLAKE2B 5753b72e44325e467c0e4ea1bbce8faafe1c5e2509d2e02a5ad428b39e531c655014a3b151f7bc57513aae74983a60cfe3034432ffd21d39716fc6893ec7da8f SHA512 a8cc69ff832eafd64d7e45854df3380a9c5f9648297e2606c5b9b47e0015c93c7da6ef3dfd35800f36a3371635fa1906605c524be82d6740fd435c7f6bf2807b -AUX lvm-monitoring.initd-2.02.105-r2 960 BLAKE2B 82e1d55032827b7b330bbdb09c74ffbd46503c6631c3eada7130f7bac540561c9dec0acffe331fef83315a47d006843de3bd2ff4ffb4c8be81a2d61cd47222d2 SHA512 75f24ce947335eb9726e73c19fc3bd6e60b3ed1253c483a8ce69f5dce26ca61756bb49fcaf75d1634263faf52a0bf10451a2717913c79594636dffaa4d4e336b -AUX lvm.confd-2.02.184-r3 282 BLAKE2B dcc65a1e9634becb8a79d74fbadc5fa9880a1e497546817418f0df7668454d8cad1f52c9516f251833874ca5bac1a530970b8a94860057b05361c736935047ce SHA512 05818e09fc6d8fe8287283b832fa73b4d3ef539837f956b9bfa394d206c1e379a3227148040934ac690d77524f3f7b16ba0d262a11de268914b1d11afe3a3c97 -AUX lvm.rc-2.02.187 4237 BLAKE2B d7d8ccc2c06ac7d4804de22363a48008c63e03f06ab737ed73555cd1f2c81eb627552531f2fc72df7cb76a88229ba13c9996a18140bc97d107ee77047dfb0055 SHA512 e09bd769f6be0ae8af337fe2bc1e4165edb77a74e2b411c981481254f4aabe5c06e387d655aacce0eba619a1b3e9e50900d0638d4db2a3fef9034621861f20a5 -AUX lvm2-2.02.56-lvm2create_initrd.patch 2032 BLAKE2B 5533ceb7a601d58995e7a90b1355508907edb30d14704b397a8c8ba0d66dbcd3d6b02ace1cadef1dfbb1d927449403f76f0f38e5d034344b3232deb512507cb6 SHA512 b2a1705fa6b962027ebc5047583547489afe8ef8d8977c6284a28d0a8b0e05e20e6c48bd6c02a8bb02de9cfb40ac2d6e2a4b8ed8ef8c4ae7b6ea9a29bc4194de -AUX lvm2-2.02.67-createinitrd.patch 660 BLAKE2B 23e784e6769bc1f47fa57d690e6bebdf16d784d775a06af1c8eb7c54dd63a12abb0edd8331c8d033d7a0dda058252453a46dd35bd820fd47ba1407e9568b3858 SHA512 17fbba5d34ece5c1c25ef35fa3bbc3d6fcd20b44bd766c049bbc120853a8d60c9544db5790645a7814db5c272fd12d383699a8a9be6f4e9c56a7c0a1bb29ade2 -AUX lvm2-2.03.17-example.conf.in.patch 1317 BLAKE2B dee2843e512bb16e4d64c7e76141133222c46a7b6776418f19af56139ed0764401cc8b49be06d18358f3e32277fbcc34b644e8e4e104a8eca25eb6f90e2b362d SHA512 1d724b75e441bd7ff0836ab1ae685401817aeccfc5c312c7ce73b3ef70bf4413829f7e07f13399cae6d7085503eaf8566df936fc79185ef9d6f9ad773fcc9fef -AUX lvm2-2.03.17-locale-muck.patch 398 BLAKE2B adb1c2bcd216acb413733d9f3f3618cad14019cf090bf2204d384b85fb37c6ce2a35bff2af3ab12dd977ce38c8485bf4c254973e2f0381f62462a28b30898a95 SHA512 8573bd1305061b2262b29096a7eb64871aa5179c6ca20689bb1a9078cc2245555fc35927a5696d8872141c78365c4f1a858672889595f333091aab353f498fb0 -AUX lvm2-2.03.17-pthread-pkgconfig.patch 732 BLAKE2B 1c179420d8cc3efaff24f03a5356469222da360c407445e30c51cde3d055de0245bd2387e934ca6bbd8518d6cc4110fccecbf430d3ba580159ac300c8570e34a SHA512 d0a800017c00cc954567900331436f9ddf30f48c7eb14d1c5e181ec9e8485702d76ebb5e981b519b97bc91ac2f5ff182e4e9ad04363c20f759b6f221c8911486 -AUX lvm2-2.03.19-dm_lvm_rules_no_systemd.patch 673 BLAKE2B ac8eec01814bced1b172793207764536907a439b76d006c2e41486048edeecd6a780795a98f52584053923ae060de5b72df0cf9abf11052ba1b6a474d47cc83e SHA512 1a5dbbf3e2bb2bee4fa918a4553f0f99afd3606ddf05cfbaca5476faeb1ed727ab9aa2d2b3662e7c6e3c82b1b859e77f290e579320f158d1def8044804fb969c -AUX lvm2-2.03.19-dmeventd-no-idle-exit.patch 2427 BLAKE2B 4dbe0a1d059cefe6f01571244bcf7a287c51cfe287c174e30ef3a1c684176b1385c2d43f5aeef8b2262c2309cfae8eef4eb1c323fb14d01dbf59474576ae72bd SHA512 c965a9ecb96b9a71392eb9d81acae797143b7614bf73de6cc1ee37bb5df921c764cd3e4163a0adf26aa8e9efee58953500d595133a45a4a4318cd5d09bb42a12 -AUX lvm2-2.03.19-dynamic-static-ldflags.patch 1548 BLAKE2B 43a36a628ae2a82139898da81bd70f1b1a45a88c81c3e18568fe6b6b6d300992719689bec2718e2a6eecfa6cde344b037d02d06c60702b54d350cc6c65b210ed SHA512 e2f99a9d4d45e2386e36353182d6e0b6c96c4e8978b65688bd6d0e2ed1c8bd488bb9f3986bc7aefaa0c023d107d4ce54756cc661704866c35ef1f4046fb4dd27 -AUX lvm2-2.03.19-freopen-musl.patch 1874 BLAKE2B f7ffcf114784f89624b25876d96f0458659b61032ed84bb1c266d5d1110483672f3fb29c715af3ca05363c53b2c79cc9223287a263475ba284439d9566b24fb3 SHA512 ffecfb9df855a2d0f27226b95b536845e65c6b5587b9a146b323736772a7b85a4772562d55e0ab54b3fc477abf8ff11c132b62d33844aacd1330630bc093fbeb -AUX lvm2-2.03.19-static-pkgconfig-libs.patch 4574 BLAKE2B 193cdcef1b0744a176bf22611b2dda6718dc6c00d85c53b82be4825208796dda063b9aa91ec2a34edfa0da456c9a7137d2d40e74532c35123f4a89dd63b0e62d SHA512 ccb3d9c65da9994f51e8fe1cf0f74aa5464259f5c3371e15538e9d1203cf911cd28c676a8053c59625fa858a75d146a53e78bfeb66eb285ec904e88fa2746b6b -AUX lvmlockd.initd-2.02.166-r1 390 BLAKE2B aebfa2a654eca784da24fd4e4d46b3e6c97256a42b725e015a13c9673e79c0d1a10213d1eecb6c75d4ce1ebd99e6200010f19c36d758018bdef303ea08ee5549 SHA512 6359b3cbff1fa05944fb69582234220cac593b2c8f8317162a728bac72ced4f8b492ce11e6ced6d848a7654fa4a506c1e658f546cff302344a739646479a62dc -AUX lvmpolld.initd-2.02.183 348 BLAKE2B cba0419add6591320dc60ef7616b66706e042b566284a4ec42002fbb5331a7173fc8b4b39be7198426fe4bbdcd3ad94b69fc3d8950705b6331c5f3f4cda4ad66 SHA512 b9b8376cbc8b6703868afab18e5baa4ef5354569e57f0596d38a8005fa725299f6858ac86b39fcca10e5a0f1adbd3a4cfa6cc6b62405e78916cc1287d8b36d0d -DIST LVM2.2.03.19.tgz 2732219 BLAKE2B 7a5bd024312f149d95361ea24a282c8c68e371687fe8f7c853fa0748ce854bc991cdade999835666a5ece569e80dd9be85d4fae7fc5cc75b912de00f170cf66e SHA512 a40691f6f4c9300c95784be0fcb055a2b8e07bfdc87f000f2357ccb54fdb814a679fb79f5c9790a7440ef538e9997e46d56e539814bfdf138b4e76603aeb2994 +AUX lvm-monitoring.initd-r3 960 BLAKE2B 82e1d55032827b7b330bbdb09c74ffbd46503c6631c3eada7130f7bac540561c9dec0acffe331fef83315a47d006843de3bd2ff4ffb4c8be81a2d61cd47222d2 SHA512 75f24ce947335eb9726e73c19fc3bd6e60b3ed1253c483a8ce69f5dce26ca61756bb49fcaf75d1634263faf52a0bf10451a2717913c79594636dffaa4d4e336b +AUX lvm.confd-r4 282 BLAKE2B dcc65a1e9634becb8a79d74fbadc5fa9880a1e497546817418f0df7668454d8cad1f52c9516f251833874ca5bac1a530970b8a94860057b05361c736935047ce SHA512 05818e09fc6d8fe8287283b832fa73b4d3ef539837f956b9bfa394d206c1e379a3227148040934ac690d77524f3f7b16ba0d262a11de268914b1d11afe3a3c97 +AUX lvm.rc-r1 4237 BLAKE2B d7d8ccc2c06ac7d4804de22363a48008c63e03f06ab737ed73555cd1f2c81eb627552531f2fc72df7cb76a88229ba13c9996a18140bc97d107ee77047dfb0055 SHA512 e09bd769f6be0ae8af337fe2bc1e4165edb77a74e2b411c981481254f4aabe5c06e387d655aacce0eba619a1b3e9e50900d0638d4db2a3fef9034621861f20a5 +AUX lvm2-2.03.20-createinitrd.patch 660 BLAKE2B 23e784e6769bc1f47fa57d690e6bebdf16d784d775a06af1c8eb7c54dd63a12abb0edd8331c8d033d7a0dda058252453a46dd35bd820fd47ba1407e9568b3858 SHA512 17fbba5d34ece5c1c25ef35fa3bbc3d6fcd20b44bd766c049bbc120853a8d60c9544db5790645a7814db5c272fd12d383699a8a9be6f4e9c56a7c0a1bb29ade2 +AUX lvm2-2.03.20-dm_lvm_rules_no_systemd.patch 673 BLAKE2B ac8eec01814bced1b172793207764536907a439b76d006c2e41486048edeecd6a780795a98f52584053923ae060de5b72df0cf9abf11052ba1b6a474d47cc83e SHA512 1a5dbbf3e2bb2bee4fa918a4553f0f99afd3606ddf05cfbaca5476faeb1ed727ab9aa2d2b3662e7c6e3c82b1b859e77f290e579320f158d1def8044804fb969c +AUX lvm2-2.03.20-dmeventd-no-idle-exit.patch 2427 BLAKE2B 4dbe0a1d059cefe6f01571244bcf7a287c51cfe287c174e30ef3a1c684176b1385c2d43f5aeef8b2262c2309cfae8eef4eb1c323fb14d01dbf59474576ae72bd SHA512 c965a9ecb96b9a71392eb9d81acae797143b7614bf73de6cc1ee37bb5df921c764cd3e4163a0adf26aa8e9efee58953500d595133a45a4a4318cd5d09bb42a12 +AUX lvm2-2.03.20-example.conf.in.patch 1317 BLAKE2B dee2843e512bb16e4d64c7e76141133222c46a7b6776418f19af56139ed0764401cc8b49be06d18358f3e32277fbcc34b644e8e4e104a8eca25eb6f90e2b362d SHA512 1d724b75e441bd7ff0836ab1ae685401817aeccfc5c312c7ce73b3ef70bf4413829f7e07f13399cae6d7085503eaf8566df936fc79185ef9d6f9ad773fcc9fef +AUX lvm2-2.03.20-freopen-musl.patch 1874 BLAKE2B f7ffcf114784f89624b25876d96f0458659b61032ed84bb1c266d5d1110483672f3fb29c715af3ca05363c53b2c79cc9223287a263475ba284439d9566b24fb3 SHA512 ffecfb9df855a2d0f27226b95b536845e65c6b5587b9a146b323736772a7b85a4772562d55e0ab54b3fc477abf8ff11c132b62d33844aacd1330630bc093fbeb +AUX lvm2-2.03.20-locale-muck.patch 398 BLAKE2B adb1c2bcd216acb413733d9f3f3618cad14019cf090bf2204d384b85fb37c6ce2a35bff2af3ab12dd977ce38c8485bf4c254973e2f0381f62462a28b30898a95 SHA512 8573bd1305061b2262b29096a7eb64871aa5179c6ca20689bb1a9078cc2245555fc35927a5696d8872141c78365c4f1a858672889595f333091aab353f498fb0 +AUX lvm2-2.03.20-lvm2create_initrd.patch 2032 BLAKE2B 5533ceb7a601d58995e7a90b1355508907edb30d14704b397a8c8ba0d66dbcd3d6b02ace1cadef1dfbb1d927449403f76f0f38e5d034344b3232deb512507cb6 SHA512 b2a1705fa6b962027ebc5047583547489afe8ef8d8977c6284a28d0a8b0e05e20e6c48bd6c02a8bb02de9cfb40ac2d6e2a4b8ed8ef8c4ae7b6ea9a29bc4194de +AUX lvmlockd.initd-r2 390 BLAKE2B aebfa2a654eca784da24fd4e4d46b3e6c97256a42b725e015a13c9673e79c0d1a10213d1eecb6c75d4ce1ebd99e6200010f19c36d758018bdef303ea08ee5549 SHA512 6359b3cbff1fa05944fb69582234220cac593b2c8f8317162a728bac72ced4f8b492ce11e6ced6d848a7654fa4a506c1e658f546cff302344a739646479a62dc +AUX lvmpolld.initd-r1 348 BLAKE2B cba0419add6591320dc60ef7616b66706e042b566284a4ec42002fbb5331a7173fc8b4b39be7198426fe4bbdcd3ad94b69fc3d8950705b6331c5f3f4cda4ad66 SHA512 b9b8376cbc8b6703868afab18e5baa4ef5354569e57f0596d38a8005fa725299f6858ac86b39fcca10e5a0f1adbd3a4cfa6cc6b62405e78916cc1287d8b36d0d DIST LVM2.2.03.20.tgz 2739763 BLAKE2B 4dc223eca1a370450c3985a5f962a2450a2ed08f1fa40af98d181a1530960a7caa3e896a3b54f0f333e2d6818bf35378b9c491a1488a4d3815959ab0e1f987de SHA512 202ff19f6ab1e1ecdf448beec6c7db1a80885efda1a6eeabf44cd2cea40577405c388eabd86f59f34c6e9e400188050bc6d1a5d5daf02f2beda87eee73cd1a2d DIST LVM2.2.03.21.tgz 2742294 BLAKE2B 529bc01b3d1ba6207c9ddc95309b39e6293fcd0286334240b9fdc076da0b7bc7e026338ec0243564ec153f2fb5009014149c3f8e0db0cd47a29418af62068728 SHA512 6024811c3fa92afd2fc13a10d1c3542352aa9a016f40c3ef588bd2f5f3e41245fed4b36c8a87d9f7f8dddc6e13b7253396f5c811f99665df27751676dc7b5bde -EBUILD lvm2-2.03.19.ebuild 9241 BLAKE2B f114cf3c515ed4190579ba66bda5a5c535e303127cf53df990249776459b84dc50baabcdbea75203d9bfa6baf6739dc7514a980627f592f97e539f35fd3a3038 SHA512 5dd73a9e6d611813b3058ba532b666fcc9fcd5b8d3b37a45a944a931b2c3bf622c6309cfab5c8a6a7e526f60d96d8d3101a6177cc1b4a13c47e77c422c63d659 -EBUILD lvm2-2.03.20.ebuild 9023 BLAKE2B 69e0c103535f80071e6f060696919f05bc64d55c57a9882521a78ac0526999ff05dbc21d51d07c797a7b66e2b239db5fa8111ec82daee2f6ad7453cf7778d7bf SHA512 69ab43402222d48c2d4a6bc202c546f7a8016a7c3e0b630397b845ddb1edf41bd471c1d2caf1cca6d5e88d172e35e51a6ee93e20de1d1753af55e33b2f8a0100 -EBUILD lvm2-2.03.21.ebuild 9036 BLAKE2B 580358da638d0db89447c63186811c1224210648491265656a50ebb39c6d4e03d43fa940799bcdae6b305fa9fd0bf2ac553467207799101c68ad6cabfdc0effa SHA512 39d94908af99920e3130de180a6511782981d028e5ae5256bd1f0bcc2db05de958de8583ef6c4bfca30cca081ea4f4cab385f09ce1add4958d0cd2fc386ebf2f +EBUILD lvm2-2.03.20.ebuild 8958 BLAKE2B 9c71dc0fa40463a9f4fb5a17754c953cc4d5ff3c908059e5d8bc5576acbb9bdaf4f6ff272d4bba01cc722d1c4fc2dbe46ade9a6e135f19e52108792ad1cb2b06 SHA512 5908e12b65aadf2e3ad58b2512cff2257be17476608e4ad36e8e7b02f048fe9876d9acb1985a728fa699287582699e2cdaaac71de90f314598bd7bf864930da9 +EBUILD lvm2-2.03.21.ebuild 8971 BLAKE2B 887bd9bc35898b34c0233f38c41b1ee7f400b41c747230b49428404fa3e6f45562f0883e2d4c85fbc3ced7934104319990811319e2885dd0624630ace7d0fb64 SHA512 19f892a033926e8e1a616fb5290530702118e3ae239649d1b3987b12435c9f9aea61d17fc05f4bc3052d1bad4c6a43d09cf2059b50ac7f4aef390ce4b476d27f MISC metadata.xml 922 BLAKE2B 8688e31c04a110d0e522a13724896a2a7c22a9ce33d8d4384a7fbfb54e3c42c231d3b5791ceda976453d54062c5a8318cd514979fcad177ab1ff2a01b791ca65 SHA512 423e499010daffc24141021bc5328b83f9e39e1534bb30fdbbf6839f4ed426897d764d0ca6d0e96267bc67986d3a2cfa9cc5ec3f0e3b2e7aa5ef34095de95a61 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 deleted file mode 100644 index bc7a25158635..000000000000 --- a/sys-fs/lvm2/files/device-mapper.conf-1.02.22-r3 +++ /dev/null @@ -1 +0,0 @@ -RC_AFTER="lvm" diff --git a/sys-fs/lvm2/files/device-mapper.conf-r4 b/sys-fs/lvm2/files/device-mapper.conf-r4 new file mode 100644 index 000000000000..bc7a25158635 --- /dev/null +++ b/sys-fs/lvm2/files/device-mapper.conf-r4 @@ -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 deleted file mode 100644 index 79fdff246fb7..000000000000 --- a/sys-fs/lvm2/files/device-mapper.rc-2.02.105-r2 +++ /dev/null @@ -1,146 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -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-r3 b/sys-fs/lvm2/files/device-mapper.rc-r3 new file mode 100644 index 000000000000..79fdff246fb7 --- /dev/null +++ b/sys-fs/lvm2/files/device-mapper.rc-r3 @@ -0,0 +1,146 @@ +#!/sbin/openrc-run +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +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/dmeventd.initd-2.02.184-r2 b/sys-fs/lvm2/files/dmeventd.initd-2.02.184-r2 deleted file mode 100644 index bc08c0a94f41..000000000000 --- a/sys-fs/lvm2/files/dmeventd.initd-2.02.184-r2 +++ /dev/null @@ -1,21 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -command=/sbin/dmeventd -command_args_foreground='-f' -extra_started_commands=reload -pidfile=/run/dmeventd.pid -# Control idle exit behavior of daemon -export DMEVENTD_IDLE_EXIT_TIMEOUT=${DMEVENTD_IDLE_EXIT_TIMEOUT:=-1} - -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 -} - -reload() { - # TODO: this is not supported under supervisors - ${command} -R -} diff --git a/sys-fs/lvm2/files/dmeventd.initd-r3 b/sys-fs/lvm2/files/dmeventd.initd-r3 new file mode 100644 index 000000000000..bc08c0a94f41 --- /dev/null +++ b/sys-fs/lvm2/files/dmeventd.initd-r3 @@ -0,0 +1,21 @@ +#!/sbin/openrc-run +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +command=/sbin/dmeventd +command_args_foreground='-f' +extra_started_commands=reload +pidfile=/run/dmeventd.pid +# Control idle exit behavior of daemon +export DMEVENTD_IDLE_EXIT_TIMEOUT=${DMEVENTD_IDLE_EXIT_TIMEOUT:=-1} + +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 +} + +reload() { + # TODO: this is not supported under supervisors + ${command} -R +} 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 deleted file mode 100644 index 914d6637c7a6..000000000000 --- a/sys-fs/lvm2/files/lvm-monitoring.initd-2.02.105-r2 +++ /dev/null @@ -1,38 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# 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-r3 b/sys-fs/lvm2/files/lvm-monitoring.initd-r3 new file mode 100644 index 000000000000..914d6637c7a6 --- /dev/null +++ b/sys-fs/lvm2/files/lvm-monitoring.initd-r3 @@ -0,0 +1,38 @@ +#!/sbin/openrc-run +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# 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.confd-2.02.184-r3 b/sys-fs/lvm2/files/lvm.confd-2.02.184-r3 deleted file mode 100644 index b29e1702b35d..000000000000 --- a/sys-fs/lvm2/files/lvm.confd-2.02.184-r3 +++ /dev/null @@ -1,9 +0,0 @@ -# If LVM is built with udev, you must ensure udev is running first! -# Otherwise it will hang -rc_need="udev" - -# 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.confd-r4 b/sys-fs/lvm2/files/lvm.confd-r4 new file mode 100644 index 000000000000..b29e1702b35d --- /dev/null +++ b/sys-fs/lvm2/files/lvm.confd-r4 @@ -0,0 +1,9 @@ +# If LVM is built with udev, you must ensure udev is running first! +# Otherwise it will hang +rc_need="udev" + +# 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.187 b/sys-fs/lvm2/files/lvm.rc-2.02.187 deleted file mode 100644 index 3468adc90f61..000000000000 --- a/sys-fs/lvm2/files/lvm.rc-2.02.187 +++ /dev/null @@ -1,173 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -_get_lvm_path() { - local lvm_path= - for lvm_path in /bin/lvm /sbin/lvm ; do - [ -x "${lvm_path}" ] && break - done - echo "${lvm_path}" -} - -_use_lvmetad() { - local lvm_path="$(_get_lvm_path)" - [ ! -x "${lvm_path}" ] && return 1 - ${lvm_path} dumpconfig global 2>/dev/null | grep -q 'use_lvmetad=1' -} - -_use_lvmlockd() { - local lvm_path="$(_get_lvm_path)" - [ ! -x "${lvm_path}" ] && return 1 - ${lvm_path} dumpconfig global 2>/dev/null | grep -q 'use_lvmlockd=1' -} - -depend() { - before checkfs fsck - after modules device-mapper - # We may want lvmetad based on the configuration. If we added lvmetad - # support while lvm2 is running then we aren't dependent on it. For the - # more common case, if its disabled in the config we aren't dependent - # on it. - config /etc/lvm/lvm.conf - local _want= - - if service_started ; then - _want=$(service_get_value want) - else - if _use_lvmetad ; then - _want="${_want} lvmetad" - fi - - if _use_lvmlockd ; then - _want="${_want} lvmlockd" - fi - fi - - # Make sure you review /etc/conf.d/lvm as well! - # Depending on your system, it might also introduce udev & mdraid - need sysfs - - if [ -n "${_want}" ] ; then - want ${_want} - fi -} - -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 - - lvm_path="$(_get_lvm_path)" - if [ -z "${lvm_path}" ] ; then - eerror "Failed to find lvm binary in /bin or /sbin!" - return 1 - fi - - if [ -z "${CDBOOT}" ] ; then - if [ -e /proc/modules ] && ! dm_in_proc ; then - ebegin "Trying to load dm-mod module" - modprobe dm-mod 2>/dev/null - eend $? - fi - - if [ -d /proc/lvm ] || dm_in_proc ; then - local has_errors=0 verbose_command - - yesno "${rc_verbose}" && verbose_command=" -v" - - ebegin "Starting the Logical Volume Manager" - - if _use_lvmetad ; then - # Extra PV find pass because some devices might not have been available until very recently - ${lvm_path} pvscan${verbose_command} --config "${config}" --cache - [ $? -ne 0 ] && has_errors=1 - fi - - # Now make the nodes - ${lvm_path} vgscan${verbose_command} --config "${config}" --mknodes - [ $? -ne 0 ] && has_errors=1 - - # Enable all VGs - ${lvm_path} vgchange${verbose_command} --config "${config}" --sysinit --activate y - [ $? -ne 0 ] && has_errors=1 - - if _use_lvmlockd ; then - # Start lockd VGs as required - ${lvm_path} vgchange${verbose_command} --config "${config}" --lock-start --lock-opt auto - [ $? -ne 0 ] && has_errors=1 - fi - - eend ${has_errors} "Failed to start the Logical Volume Manager" - fi - fi -} - -start_post() { - local _want= - if _use_lvmetad ; then - _want="${_want} lvmetad" - fi - - if _use_lvmlockd ; then - _want="${_want} lvmlockd" - fi - - service_set_value want "${_want}" -} - -stop() { - lvm_path="$(_get_lvm_path)" - if [ -z "${lvm_path}" ] ; then - eerror "Failed to find lvm binary in /bin or /sbin!" - return 1 - fi - - # Stop LVM2 - if [ -f /etc/lvmtab -o -d /etc/lvm ] \ - && [ -d /proc/lvm -o "$(grep device-mapper /proc/misc 2>/dev/null)" ] - then - local VGS=$($lvm_path vgs --config "${config}" -o vg_name --noheadings --nosuffix --rows 2> /dev/null) - if [ -z "${VGS}" ] ; then - # nothing to do for us - return 0 - fi - - local has_errors=0 verbose_command eend_cmd="eend" - - yesno "${rc_verbose}" && verbose_command=" -v" - - local msg="Failed to stop Logical Volume Manager" - if [ "${RC_RUNLEVEL}" = shutdown ] ; then - # failures on shutdown are non-fatal - eend_cmd="ewend" - msg="${msg} (possibly some LVs still needed for /usr or root)" - fi - - ebegin "Stopping the Logical Volume Manager" - - ${lvm_path} vgchange${verbose_command} --config "${config}" --sysinit --activate n - [ $? -ne 0 ] && has_errors=1 - - ${eend_cmd} ${has_errors} "${msg}" - fi - - # at this point make sure we always exit without indicating an error - return 0 -} - -# vim:ts=4 diff --git a/sys-fs/lvm2/files/lvm.rc-r1 b/sys-fs/lvm2/files/lvm.rc-r1 new file mode 100644 index 000000000000..3468adc90f61 --- /dev/null +++ b/sys-fs/lvm2/files/lvm.rc-r1 @@ -0,0 +1,173 @@ +#!/sbin/openrc-run +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +_get_lvm_path() { + local lvm_path= + for lvm_path in /bin/lvm /sbin/lvm ; do + [ -x "${lvm_path}" ] && break + done + echo "${lvm_path}" +} + +_use_lvmetad() { + local lvm_path="$(_get_lvm_path)" + [ ! -x "${lvm_path}" ] && return 1 + ${lvm_path} dumpconfig global 2>/dev/null | grep -q 'use_lvmetad=1' +} + +_use_lvmlockd() { + local lvm_path="$(_get_lvm_path)" + [ ! -x "${lvm_path}" ] && return 1 + ${lvm_path} dumpconfig global 2>/dev/null | grep -q 'use_lvmlockd=1' +} + +depend() { + before checkfs fsck + after modules device-mapper + # We may want lvmetad based on the configuration. If we added lvmetad + # support while lvm2 is running then we aren't dependent on it. For the + # more common case, if its disabled in the config we aren't dependent + # on it. + config /etc/lvm/lvm.conf + local _want= + + if service_started ; then + _want=$(service_get_value want) + else + if _use_lvmetad ; then + _want="${_want} lvmetad" + fi + + if _use_lvmlockd ; then + _want="${_want} lvmlockd" + fi + fi + + # Make sure you review /etc/conf.d/lvm as well! + # Depending on your system, it might also introduce udev & mdraid + need sysfs + + if [ -n "${_want}" ] ; then + want ${_want} + fi +} + +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 + + lvm_path="$(_get_lvm_path)" + if [ -z "${lvm_path}" ] ; then + eerror "Failed to find lvm binary in /bin or /sbin!" + return 1 + fi + + if [ -z "${CDBOOT}" ] ; then + if [ -e /proc/modules ] && ! dm_in_proc ; then + ebegin "Trying to load dm-mod module" + modprobe dm-mod 2>/dev/null + eend $? + fi + + if [ -d /proc/lvm ] || dm_in_proc ; then + local has_errors=0 verbose_command + + yesno "${rc_verbose}" && verbose_command=" -v" + + ebegin "Starting the Logical Volume Manager" + + if _use_lvmetad ; then + # Extra PV find pass because some devices might not have been available until very recently + ${lvm_path} pvscan${verbose_command} --config "${config}" --cache + [ $? -ne 0 ] && has_errors=1 + fi + + # Now make the nodes + ${lvm_path} vgscan${verbose_command} --config "${config}" --mknodes + [ $? -ne 0 ] && has_errors=1 + + # Enable all VGs + ${lvm_path} vgchange${verbose_command} --config "${config}" --sysinit --activate y + [ $? -ne 0 ] && has_errors=1 + + if _use_lvmlockd ; then + # Start lockd VGs as required + ${lvm_path} vgchange${verbose_command} --config "${config}" --lock-start --lock-opt auto + [ $? -ne 0 ] && has_errors=1 + fi + + eend ${has_errors} "Failed to start the Logical Volume Manager" + fi + fi +} + +start_post() { + local _want= + if _use_lvmetad ; then + _want="${_want} lvmetad" + fi + + if _use_lvmlockd ; then + _want="${_want} lvmlockd" + fi + + service_set_value want "${_want}" +} + +stop() { + lvm_path="$(_get_lvm_path)" + if [ -z "${lvm_path}" ] ; then + eerror "Failed to find lvm binary in /bin or /sbin!" + return 1 + fi + + # Stop LVM2 + if [ -f /etc/lvmtab -o -d /etc/lvm ] \ + && [ -d /proc/lvm -o "$(grep device-mapper /proc/misc 2>/dev/null)" ] + then + local VGS=$($lvm_path vgs --config "${config}" -o vg_name --noheadings --nosuffix --rows 2> /dev/null) + if [ -z "${VGS}" ] ; then + # nothing to do for us + return 0 + fi + + local has_errors=0 verbose_command eend_cmd="eend" + + yesno "${rc_verbose}" && verbose_command=" -v" + + local msg="Failed to stop Logical Volume Manager" + if [ "${RC_RUNLEVEL}" = shutdown ] ; then + # failures on shutdown are non-fatal + eend_cmd="ewend" + msg="${msg} (possibly some LVs still needed for /usr or root)" + fi + + ebegin "Stopping the Logical Volume Manager" + + ${lvm_path} vgchange${verbose_command} --config "${config}" --sysinit --activate n + [ $? -ne 0 ] && has_errors=1 + + ${eend_cmd} ${has_errors} "${msg}" + fi + + # at this point make sure we always exit without indicating an error + return 0 +} + +# vim:ts=4 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 deleted file mode 100644 index 59aaa9b34a08..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.02.56-lvm2create_initrd.patch +++ /dev/null @@ -1,72 +0,0 @@ ---- 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.67-createinitrd.patch b/sys-fs/lvm2/files/lvm2-2.02.67-createinitrd.patch deleted file mode 100644 index 7f0bfb894f02..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.02.67-createinitrd.patch +++ /dev/null @@ -1,18 +0,0 @@ -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.03.17-example.conf.in.patch b/sys-fs/lvm2/files/lvm2-2.03.17-example.conf.in.patch deleted file mode 100644 index b63b681e5fab..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.03.17-example.conf.in.patch +++ /dev/null @@ -1,42 +0,0 @@ -Add Gentoo specific changes - ---- a/conf/example.conf.in -+++ b/conf/example.conf.in -@@ -170,6 +170,9 @@ - # Example - # 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|.*|" ] - # Reject the cdrom drive: - # filter = [ "r|/dev/cdrom|" ] - # Work with just loopback devices, e.g. for testing: -@@ -1843,7 +1846,7 @@ - - # Configuration section metadata. - # This configuration section has an automatic default value. --# metadata { -+metadata { - - # Configuration option metadata/check_pv_device_sizes. - # Check device sizes are not smaller than corresponding PV sizes. -@@ -1888,7 +1891,8 @@ - # - # This configuration option is advanced. - # This configuration option has an automatic default value. -- # pvmetadatacopies = 1 -+ # Gentoo: enable for data safety, but PV resize is then disabled. -+ # pvmetadatacopies = 2 - - # Configuration option metadata/vgmetadatacopies. - # Number of copies of metadata to maintain for each VG. -@@ -1931,7 +1935,7 @@ - # This configuration option is advanced. - # This configuration option has an automatic default value. - # stripesize = 64 --# } -+} - - # Configuration section report. - # LVM report command output formatting. diff --git a/sys-fs/lvm2/files/lvm2-2.03.17-locale-muck.patch b/sys-fs/lvm2/files/lvm2-2.03.17-locale-muck.patch deleted file mode 100644 index c672a10e2cf6..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.03.17-locale-muck.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/make.tmpl.in -+++ b/make.tmpl.in -@@ -571,7 +571,7 @@ - ( cat $(srcdir)/.exported_symbols; \ - if test -n "$(EXPORTED_HEADER)"; 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-2.03.17-pthread-pkgconfig.patch b/sys-fs/lvm2/files/lvm2-2.03.17-pthread-pkgconfig.patch deleted file mode 100644 index 828cf66667b1..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.03.17-pthread-pkgconfig.patch +++ /dev/null @@ -1,31 +0,0 @@ -Add pthread to libdevmapper pkgconfig file - ---- a/libdm/libdevmapper.pc.in -+++ b/libdm/libdevmapper.pc.in -@@ -9,4 +9,4 @@ - Cflags: -I${includedir} - Libs: -L${libdir} -ldevmapper - Requires.private: @SELINUX_PC@ @UDEV_PC@ --Libs.private: -lm @RT_LIBS@ -+Libs.private: -lm @RT_LIBS@ @PTHREAD_LIBS@ ---- a/tools/Makefile.in -+++ b/tools/Makefile.in -@@ -89,6 +89,7 @@ - TARGETS += lvm.static - INSTALL_LVM_TARGETS += install_tools_static - INSTALL_CMDLIB_TARGETS += install_cmdlib_static -+ STATIC_LIBS += @PTHREAD_LIBS@ - endif - - LIB_VERSION = $(LIB_VERSION_LVM) -@@ -114,6 +115,10 @@ - - include $(top_builddir)/make.tmpl - -+ifeq ("@STATIC_LINK@", "yes") -+ STATIC_LIBS += @PTHREAD_LIBS@ -+endif -+ - device-mapper: - - all: device-mapper diff --git a/sys-fs/lvm2/files/lvm2-2.03.19-dm_lvm_rules_no_systemd.patch b/sys-fs/lvm2/files/lvm2-2.03.19-dm_lvm_rules_no_systemd.patch deleted file mode 100644 index e39d7959b331..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.03.19-dm_lvm_rules_no_systemd.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/udev/69-dm-lvm.rules.in -+++ b/udev/69-dm-lvm.rules.in -@@ -76,7 +76,7 @@ - # it's better suited to appearing in the journal. - - IMPORT{program}="(LVM_EXEC)/lvm pvscan --cache --listvg --checkcomplete --vgonline --autoactivation event --udevoutput --journal=output $env{DEVNAME}" --ENV{LVM_VG_NAME_COMPLETE}=="?*", RUN+="(SYSTEMDRUN) --no-block --property DefaultDependencies=no --unit lvm-activate-$env{LVM_VG_NAME_COMPLETE} (LVM_EXEC)/lvm vgchange -aay --autoactivation event $env{LVM_VG_NAME_COMPLETE}" -+ENV{LVM_VG_NAME_COMPLETE}=="?*", RUN+="(LVM_EXEC)/lvm vgchange -aay --nohints --autoactivation event $env{LVM_VG_NAME_COMPLETE}" - GOTO="lvm_end" - - LABEL="lvm_end" diff --git a/sys-fs/lvm2/files/lvm2-2.03.19-dmeventd-no-idle-exit.patch b/sys-fs/lvm2/files/lvm2-2.03.19-dmeventd-no-idle-exit.patch deleted file mode 100644 index b7030ccc084d..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.03.19-dmeventd-no-idle-exit.patch +++ /dev/null @@ -1,73 +0,0 @@ -From ab3ae0a22dfbe20e2d17e7dc60e0f76184ec098c Mon Sep 17 00:00:00 2001 -From: "Robin H. Johnson" -Date: Wed, 24 Jul 2019 11:22:32 +0200 -Subject: [PATCH] dmeventd configurable idle exit time - -dmeventd nominally exits after 1 hour of idle time. There are use cases for -this, esp. with socket activation, but also cases where users don't expect -dmeventd to exit. - -Provide a tuning knob via environment variable, DMEVENTD_IDLE_EXIT_TIMEOUT, -that can be -1 to not exit, or a configurable time for different idle exit. - -Signed-off-by: Robin H. Johnson -Fixes: https://bugs.gentoo.org/682556 ---- - daemons/dmeventd/dmeventd.c | 16 ++++++++++++++-- - man/dmeventd.8_main | 4 ++++ - 2 files changed, 18 insertions(+), 2 deletions(-) - -diff --git a/daemons/dmeventd/dmeventd.c b/daemons/dmeventd/dmeventd.c -index 33859ef414..ac0b9743fc 100644 ---- a/daemons/dmeventd/dmeventd.c -+++ b/daemons/dmeventd/dmeventd.c -@@ -2169,6 +2169,18 @@ - .server_path = DM_EVENT_FIFO_SERVER - }; - time_t now, idle_exit_timeout = DMEVENTD_IDLE_EXIT_TIMEOUT; -+ -+ /* Provide a basic way to config the idle timeout */ -+ char* idle_exit_timeout_env = getenv("DMEVENTD_IDLE_EXIT_TIMEOUT") ? : NULL; -+ if(NULL != idle_exit_timeout_env) { -+ char* endptr; -+ idle_exit_timeout = strtol(idle_exit_timeout_env, &endptr, 10); -+ if (errno == ERANGE || *endptr != '\0') { -+ fprintf(stderr, "DMEVENTD_IDLE_EXIT_TIMEOUT: bad time input\n"); -+ exit(EXIT_FAILURE); -+ } -+ } -+ - opterr = 0; - optind = 0; - -@@ -2265,7 +2277,7 @@ - _process_initial_registrations(); - - for (;;) { -- if (_idle_since) { -+ if (_idle_since || _exit_now) { - if (_exit_now) { - if (_exit_now == DM_SCHEDULED_EXIT) - break; /* Only prints shutdown message */ -@@ -2274,7 +2286,7 @@ - (long) (time(NULL) - _idle_since)); - break; - } -- if (idle_exit_timeout) { -+ if (idle_exit_timeout && idle_exit_timeout > 0) { - now = time(NULL); - if (now < _idle_since) - _idle_since = now; /* clock change? */ ---- a/man/dmeventd.8_main -+++ b/man/dmeventd.8_main -@@ -169,6 +169,10 @@ - Variable is set by thin and vdo plugin to prohibit recursive interaction - with dmeventd by any executed lvm2 command from - a thin_command, vdo_command environment. -+.TP -+.B DMEVENTD_IDLE_EXIT_TIMEOUT -+Configure the dmeventd idle exit timeout behavior, value in seconds. Default -+is 3600 (1 hour). -1 means do not exit. - . - .SH SEE ALSO - . diff --git a/sys-fs/lvm2/files/lvm2-2.03.19-dynamic-static-ldflags.patch b/sys-fs/lvm2/files/lvm2-2.03.19-dynamic-static-ldflags.patch deleted file mode 100644 index 3aae81984506..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.03.19-dynamic-static-ldflags.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -32,6 +32,7 @@ - [linux*], [ - # equivalent to -rdynamic - 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" -@@ -1875,6 +1876,7 @@ - AC_SUBST(SYSTEMD_RUN_CMD) - AC_SUBST(SNAPSHOTS) - AC_SUBST(STATICDIR) -+AC_SUBST(STATIC_LDFLAGS) - AC_SUBST(STATIC_LINK) - AC_SUBST(TESTSUITE_DATA) - AC_SUBST(THIN) ---- a/daemons/dmeventd/Makefile.in -+++ b/daemons/dmeventd/Makefile.in -@@ -76,7 +76,7 @@ - - dmeventd.static: $(LIB_STATIC) dmeventd.o - @echo " [CC] $@" -- $(Q) $(CC) $(CFLAGS) $(LDFLAGS) -static dmeventd.o \ -+ $(Q) $(CC) $(CFLAGS) $(LDFLAGS) $(STATIC_LDFLAGS) -static dmeventd.o \ - -o $@ $(DL_LIBS) $(DMEVENT_LIBS) $(LIBS) $(STATIC_LIBS) - - ifeq ("@PKGCONFIG@", "yes") ---- a/make.tmpl.in -+++ b/make.tmpl.in -@@ -65,6 +65,7 @@ - CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@ - CPPFLAGS ?= @CPPFLAGS@ - LDFLAGS ?= @LDFLAGS@ -+STATIC_LDFLAGS += @STATIC_LDFLAGS@ - CLDFLAGS += @CLDFLAGS@ - ELDFLAGS += @ELDFLAGS@ - LDDEPS += @LDDEPS@ ---- a/tools/Makefile.in -+++ b/tools/Makefile.in -@@ -137,7 +137,7 @@ - - lvm.static: $(OBJECTS) lvm-static.o $(LVMINTERNAL_LIBS) - @echo " [CC] $@" -- $(Q) $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) \ -+ $(Q) $(CC) $(CFLAGS) $(LDFLAGS) $(STATIC_LDFLAGS) -static -L$(interfacebuilddir) \ - -o $@ $+ $(LVMLIBS) $(STATIC_LIBS) - - liblvm2cmd.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o diff --git a/sys-fs/lvm2/files/lvm2-2.03.19-freopen-musl.patch b/sys-fs/lvm2/files/lvm2-2.03.19-freopen-musl.patch deleted file mode 100644 index cc231d9251bd..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.03.19-freopen-musl.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 4cf08811e112100a2b10c60047f3c537ad21d674 Mon Sep 17 00:00:00 2001 -From: David Seifert -Date: Sat, 28 Jan 2023 14:22:42 +0100 -Subject: [PATCH] Use `freopen()` on {stdin,stdout,stderr} - -* ISO C does not guarantee that the standard streams are modifiable - lvalues. Glibc even calls out this behaviour as non-portable: - https://www.gnu.org/software/libc/manual/html_node/Standard-Streams.html ---- - lib/log/log.c | 4 ++++ - tools/lvmcmdline.c | 6 +++--- - 2 files changed, 7 insertions(+), 3 deletions(-) - -diff --git a/lib/log/log.c b/lib/log/log.c -index 118a3ba42..a94016d81 100644 ---- a/lib/log/log.c -+++ b/lib/log/log.c -@@ -208,7 +208,11 @@ int reopen_standard_stream(FILE **stream, const char *mode) - - _check_and_replace_standard_log_streams(old_stream, new_stream); - -+#ifdef __GLIBC__ - *stream = new_stream; -+#else -+ freopen(NULL, mode, *stream); -+#endif - return 1; - } - -diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c -index a5bb6a5c5..0ebfa375c 100644 ---- a/tools/lvmcmdline.c -+++ b/tools/lvmcmdline.c -@@ -3422,7 +3422,7 @@ static int _check_standard_fds(void) - 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 -@@ -3432,7 +3432,7 @@ static int _check_standard_fds(void) - } - - 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 */ -@@ -3440,7 +3440,7 @@ static int _check_standard_fds(void) - } - - 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; --- -2.39.2 - diff --git a/sys-fs/lvm2/files/lvm2-2.03.19-static-pkgconfig-libs.patch b/sys-fs/lvm2/files/lvm2-2.03.19-static-pkgconfig-libs.patch deleted file mode 100644 index 52f2cc0cb7fe..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.03.19-static-pkgconfig-libs.patch +++ /dev/null @@ -1,130 +0,0 @@ -From ac7cce039825ff779795b5c2ae0ecf00ba43a401 Mon Sep 17 00:00:00 2001 -From: "Robin H. Johnson" -Date: Sun, 9 May 2021 11:00:22 +0200 -Subject: [PATCH] Use pkgconfig to detect static libs - ---- a/configure.ac -+++ b/configure.ac -@@ -1139,6 +1139,7 @@ - AS_IF([test "$HAVE_BLKID" = "yes"], [ - BLKID_WIPING="yes" - BLKID_PC="blkid" -+ BLKID_STATIC_LIBS=`$PKG_CONFIG --static --libs $BLKID_PC` - DEFAULT_USE_BLKID_WIPING=1 - AC_DEFINE([BLKID_WIPING_SUPPORT], 1, [Define to 1 to use libblkid detection of signatures when wiping.]) - ], [ -@@ -1165,6 +1166,7 @@ - - AS_IF([test "$UDEV_SYNC" = "yes"], [ - 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.]) - - AC_CHECK_LIB(udev, udev_device_get_is_initialized, AC_DEFINE([HAVE_LIBUDEV_UDEV_DEVICE_GET_IS_INITIALIZED], 1, -@@ -1382,19 +1384,28 @@ - AS_IF([test "$SELINUX" = "yes"], [ - 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"]) -+ -+ 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 ]) -+ ]) - ]) - - ################################################################################ -@@ -1790,6 +1801,7 @@ - ################################################################################ - AC_SUBST(AWK) - AC_SUBST(BLKID_PC) -+AC_SUBST(BLKID_STATIC_LIBS) - AC_SUBST(BUILD_CMIRRORD) - AC_SUBST(BUILD_DMEVENTD) - AC_SUBST(BUILD_LVMDBUSD) -@@ -1872,6 +1884,7 @@ - AC_SUBST(SBINDIR) - AC_SUBST(SELINUX_LIBS) - AC_SUBST(SELINUX_PC) -+AC_SUBST(SELINUX_STATIC_LIBS) - AC_SUBST(SYSCONFDIR) - AC_SUBST(SYSTEMD_RUN_CMD) - AC_SUBST(SNAPSHOTS) -@@ -1890,6 +1903,7 @@ - AC_SUBST(CACHE_RESTORE_CMD) - AC_SUBST(UDEV_PC) - AC_SUBST(UDEV_RULES) -+AC_SUBST(UDEV_STATIC_LIBS) - AC_SUBST(UDEV_SYNC) - AC_SUBST(UDEV_RULE_EXEC_DETECTION) - AC_SUBST(UDEV_HAS_BUILTIN_BLKID) ---- a/libdm/make.tmpl.in -+++ b/libdm/make.tmpl.in -@@ -54,7 +54,7 @@ - - LIBS += @LIBS@ $(PTHREAD_LIBS) $(SELINUX_LIBS) $(UDEV_LIBS) $(RT_LIBS) $(M_LIBS) - # Extra libraries always linked with static binaries --STATIC_LIBS = $(PTHREAD_LIBS) -+STATIC_LIBS = $(PTHREAD_LIBS) $(SELINUX_STATIC_LIBS) $(UDEV_STATIC_LIBS) - DEFS += @DEFS@ - # FIXME set this only where it's needed, not globally? - CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@ -@@ -71,8 +71,10 @@ - READLINE_LIBS = @READLINE_LIBS@ - EDITLINE_LIBS = @EDITLINE_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@ - LIBSYSTEMD_LIBS = @LIBSYSTEMD_LIBS@ ---- a/make.tmpl.in -+++ b/make.tmpl.in -@@ -59,7 +59,7 @@ - LIBS += @LIBS@ $(SELINUX_LIBS) $(UDEV_LIBS) $(RT_LIBS) $(M_LIBS) - LVMLIBS = $(DMEVENT_LIBS) $(READLINE_LIBS) $(EDITLINE_LIBS) $(LIBSYSTEMD_LIBS) $(BLKID_LIBS) $(AIO_LIBS) $(LIBS) - # Extra libraries always linked with static binaries --STATIC_LIBS = $(PTHREAD_LIBS) -+STATIC_LIBS = $(PTHREAD_LIBS) $(SELINUX_STATIC_LIBS) $(UDEV_STATIC_LIBS) $(BLKID_STATIC_LIBS) $(M_LIBS) - DEFS += @DEFS@ - # FIXME set this only where it's needed, not globally? - CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@ -@@ -79,6 +79,7 @@ - AIO_LIBS = @AIO_LIBS@ - BLKID_CFLAGS = @BLKID_CFLAGS@ - BLKID_LIBS = @BLKID_LIBS@ -+BLKID_STATIC_LIBS = @BLKID_STATIC_LIBS@ - CPG_CFLAGS = @CPG_CFLAGS@ - CPG_LIBS = @CPG_LIBS@ - EDITLINE_CFLAGS = @EDITLINE_CFLAGS@ -@@ -97,8 +98,10 @@ - READLINE_CFLAGS = @READLINE_CFLAGS@ - 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@ - VALGRIND_CFLAGS = @VALGRIND_CFLAGS@ - VALGRIND_LIBS = @VALGRIND_LIBS@ - diff --git a/sys-fs/lvm2/files/lvm2-2.03.20-createinitrd.patch b/sys-fs/lvm2/files/lvm2-2.03.20-createinitrd.patch new file mode 100644 index 000000000000..7f0bfb894f02 --- /dev/null +++ b/sys-fs/lvm2/files/lvm2-2.03.20-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.03.20-dm_lvm_rules_no_systemd.patch b/sys-fs/lvm2/files/lvm2-2.03.20-dm_lvm_rules_no_systemd.patch new file mode 100644 index 000000000000..e39d7959b331 --- /dev/null +++ b/sys-fs/lvm2/files/lvm2-2.03.20-dm_lvm_rules_no_systemd.patch @@ -0,0 +1,11 @@ +--- a/udev/69-dm-lvm.rules.in ++++ b/udev/69-dm-lvm.rules.in +@@ -76,7 +76,7 @@ + # it's better suited to appearing in the journal. + + IMPORT{program}="(LVM_EXEC)/lvm pvscan --cache --listvg --checkcomplete --vgonline --autoactivation event --udevoutput --journal=output $env{DEVNAME}" +-ENV{LVM_VG_NAME_COMPLETE}=="?*", RUN+="(SYSTEMDRUN) --no-block --property DefaultDependencies=no --unit lvm-activate-$env{LVM_VG_NAME_COMPLETE} (LVM_EXEC)/lvm vgchange -aay --autoactivation event $env{LVM_VG_NAME_COMPLETE}" ++ENV{LVM_VG_NAME_COMPLETE}=="?*", RUN+="(LVM_EXEC)/lvm vgchange -aay --nohints --autoactivation event $env{LVM_VG_NAME_COMPLETE}" + GOTO="lvm_end" + + LABEL="lvm_end" diff --git a/sys-fs/lvm2/files/lvm2-2.03.20-dmeventd-no-idle-exit.patch b/sys-fs/lvm2/files/lvm2-2.03.20-dmeventd-no-idle-exit.patch new file mode 100644 index 000000000000..b7030ccc084d --- /dev/null +++ b/sys-fs/lvm2/files/lvm2-2.03.20-dmeventd-no-idle-exit.patch @@ -0,0 +1,73 @@ +From ab3ae0a22dfbe20e2d17e7dc60e0f76184ec098c Mon Sep 17 00:00:00 2001 +From: "Robin H. Johnson" +Date: Wed, 24 Jul 2019 11:22:32 +0200 +Subject: [PATCH] dmeventd configurable idle exit time + +dmeventd nominally exits after 1 hour of idle time. There are use cases for +this, esp. with socket activation, but also cases where users don't expect +dmeventd to exit. + +Provide a tuning knob via environment variable, DMEVENTD_IDLE_EXIT_TIMEOUT, +that can be -1 to not exit, or a configurable time for different idle exit. + +Signed-off-by: Robin H. Johnson +Fixes: https://bugs.gentoo.org/682556 +--- + daemons/dmeventd/dmeventd.c | 16 ++++++++++++++-- + man/dmeventd.8_main | 4 ++++ + 2 files changed, 18 insertions(+), 2 deletions(-) + +diff --git a/daemons/dmeventd/dmeventd.c b/daemons/dmeventd/dmeventd.c +index 33859ef414..ac0b9743fc 100644 +--- a/daemons/dmeventd/dmeventd.c ++++ b/daemons/dmeventd/dmeventd.c +@@ -2169,6 +2169,18 @@ + .server_path = DM_EVENT_FIFO_SERVER + }; + time_t now, idle_exit_timeout = DMEVENTD_IDLE_EXIT_TIMEOUT; ++ ++ /* Provide a basic way to config the idle timeout */ ++ char* idle_exit_timeout_env = getenv("DMEVENTD_IDLE_EXIT_TIMEOUT") ? : NULL; ++ if(NULL != idle_exit_timeout_env) { ++ char* endptr; ++ idle_exit_timeout = strtol(idle_exit_timeout_env, &endptr, 10); ++ if (errno == ERANGE || *endptr != '\0') { ++ fprintf(stderr, "DMEVENTD_IDLE_EXIT_TIMEOUT: bad time input\n"); ++ exit(EXIT_FAILURE); ++ } ++ } ++ + opterr = 0; + optind = 0; + +@@ -2265,7 +2277,7 @@ + _process_initial_registrations(); + + for (;;) { +- if (_idle_since) { ++ if (_idle_since || _exit_now) { + if (_exit_now) { + if (_exit_now == DM_SCHEDULED_EXIT) + break; /* Only prints shutdown message */ +@@ -2274,7 +2286,7 @@ + (long) (time(NULL) - _idle_since)); + break; + } +- if (idle_exit_timeout) { ++ if (idle_exit_timeout && idle_exit_timeout > 0) { + now = time(NULL); + if (now < _idle_since) + _idle_since = now; /* clock change? */ +--- a/man/dmeventd.8_main ++++ b/man/dmeventd.8_main +@@ -169,6 +169,10 @@ + Variable is set by thin and vdo plugin to prohibit recursive interaction + with dmeventd by any executed lvm2 command from + a thin_command, vdo_command environment. ++.TP ++.B DMEVENTD_IDLE_EXIT_TIMEOUT ++Configure the dmeventd idle exit timeout behavior, value in seconds. Default ++is 3600 (1 hour). -1 means do not exit. + . + .SH SEE ALSO + . diff --git a/sys-fs/lvm2/files/lvm2-2.03.20-example.conf.in.patch b/sys-fs/lvm2/files/lvm2-2.03.20-example.conf.in.patch new file mode 100644 index 000000000000..b63b681e5fab --- /dev/null +++ b/sys-fs/lvm2/files/lvm2-2.03.20-example.conf.in.patch @@ -0,0 +1,42 @@ +Add Gentoo specific changes + +--- a/conf/example.conf.in ++++ b/conf/example.conf.in +@@ -170,6 +170,9 @@ + # Example + # 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|.*|" ] + # Reject the cdrom drive: + # filter = [ "r|/dev/cdrom|" ] + # Work with just loopback devices, e.g. for testing: +@@ -1843,7 +1846,7 @@ + + # Configuration section metadata. + # This configuration section has an automatic default value. +-# metadata { ++metadata { + + # Configuration option metadata/check_pv_device_sizes. + # Check device sizes are not smaller than corresponding PV sizes. +@@ -1888,7 +1891,8 @@ + # + # This configuration option is advanced. + # This configuration option has an automatic default value. +- # pvmetadatacopies = 1 ++ # Gentoo: enable for data safety, but PV resize is then disabled. ++ # pvmetadatacopies = 2 + + # Configuration option metadata/vgmetadatacopies. + # Number of copies of metadata to maintain for each VG. +@@ -1931,7 +1935,7 @@ + # This configuration option is advanced. + # This configuration option has an automatic default value. + # stripesize = 64 +-# } ++} + + # Configuration section report. + # LVM report command output formatting. diff --git a/sys-fs/lvm2/files/lvm2-2.03.20-freopen-musl.patch b/sys-fs/lvm2/files/lvm2-2.03.20-freopen-musl.patch new file mode 100644 index 000000000000..cc231d9251bd --- /dev/null +++ b/sys-fs/lvm2/files/lvm2-2.03.20-freopen-musl.patch @@ -0,0 +1,63 @@ +From 4cf08811e112100a2b10c60047f3c537ad21d674 Mon Sep 17 00:00:00 2001 +From: David Seifert +Date: Sat, 28 Jan 2023 14:22:42 +0100 +Subject: [PATCH] Use `freopen()` on {stdin,stdout,stderr} + +* ISO C does not guarantee that the standard streams are modifiable + lvalues. Glibc even calls out this behaviour as non-portable: + https://www.gnu.org/software/libc/manual/html_node/Standard-Streams.html +--- + lib/log/log.c | 4 ++++ + tools/lvmcmdline.c | 6 +++--- + 2 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/lib/log/log.c b/lib/log/log.c +index 118a3ba42..a94016d81 100644 +--- a/lib/log/log.c ++++ b/lib/log/log.c +@@ -208,7 +208,11 @@ int reopen_standard_stream(FILE **stream, const char *mode) + + _check_and_replace_standard_log_streams(old_stream, new_stream); + ++#ifdef __GLIBC__ + *stream = new_stream; ++#else ++ freopen(NULL, mode, *stream); ++#endif + return 1; + } + +diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c +index a5bb6a5c5..0ebfa375c 100644 +--- a/tools/lvmcmdline.c ++++ b/tools/lvmcmdline.c +@@ -3422,7 +3422,7 @@ static int _check_standard_fds(void) + 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 +@@ -3432,7 +3432,7 @@ static int _check_standard_fds(void) + } + + 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 */ +@@ -3440,7 +3440,7 @@ static int _check_standard_fds(void) + } + + 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; +-- +2.39.2 + diff --git a/sys-fs/lvm2/files/lvm2-2.03.20-locale-muck.patch b/sys-fs/lvm2/files/lvm2-2.03.20-locale-muck.patch new file mode 100644 index 000000000000..c672a10e2cf6 --- /dev/null +++ b/sys-fs/lvm2/files/lvm2-2.03.20-locale-muck.patch @@ -0,0 +1,11 @@ +--- a/make.tmpl.in ++++ b/make.tmpl.in +@@ -571,7 +571,7 @@ + ( cat $(srcdir)/.exported_symbols; \ + if test -n "$(EXPORTED_HEADER)"; 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-2.03.20-lvm2create_initrd.patch b/sys-fs/lvm2/files/lvm2-2.03.20-lvm2create_initrd.patch new file mode 100644 index 000000000000..59aaa9b34a08 --- /dev/null +++ b/sys-fs/lvm2/files/lvm2-2.03.20-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/lvmlockd.initd-2.02.166-r1 b/sys-fs/lvm2/files/lvmlockd.initd-2.02.166-r1 deleted file mode 100644 index 8b5986fae242..000000000000 --- a/sys-fs/lvm2/files/lvmlockd.initd-2.02.166-r1 +++ /dev/null @@ -1,17 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -pidfile="/run/lvmlockd.pid" -command="/sbin/lvmlockd" -command_args="${LVMLOCKD_OPTS:--p ${pidfile}} ${LVMLOCKD_TYPE:--g sanlock}" -start_stop_daemon_args="--pidfile ${pidfile}" - -depend() { - before sanlock -} - -start_pre() -{ - checkpath --directory /run/lvm || return 1 -} diff --git a/sys-fs/lvm2/files/lvmlockd.initd-r2 b/sys-fs/lvm2/files/lvmlockd.initd-r2 new file mode 100644 index 000000000000..8b5986fae242 --- /dev/null +++ b/sys-fs/lvm2/files/lvmlockd.initd-r2 @@ -0,0 +1,17 @@ +#!/sbin/openrc-run +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +pidfile="/run/lvmlockd.pid" +command="/sbin/lvmlockd" +command_args="${LVMLOCKD_OPTS:--p ${pidfile}} ${LVMLOCKD_TYPE:--g sanlock}" +start_stop_daemon_args="--pidfile ${pidfile}" + +depend() { + before sanlock +} + +start_pre() +{ + checkpath --directory /run/lvm || return 1 +} diff --git a/sys-fs/lvm2/files/lvmpolld.initd-2.02.183 b/sys-fs/lvm2/files/lvmpolld.initd-2.02.183 deleted file mode 100644 index 6b260109a668..000000000000 --- a/sys-fs/lvm2/files/lvmpolld.initd-2.02.183 +++ /dev/null @@ -1,17 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -pidfile="/run/lvmpolld.pid" -command="/sbin/lvmpolld" -command_args="${LVMPOLLD_OPTS:=-p ${pidfile}}" -start_stop_daemon_args="--pidfile ${pidfile}" - -depend() { - : -} - -start_pre() -{ - checkpath --directory /run/lvm || return 1 -} diff --git a/sys-fs/lvm2/files/lvmpolld.initd-r1 b/sys-fs/lvm2/files/lvmpolld.initd-r1 new file mode 100644 index 000000000000..6b260109a668 --- /dev/null +++ b/sys-fs/lvm2/files/lvmpolld.initd-r1 @@ -0,0 +1,17 @@ +#!/sbin/openrc-run +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +pidfile="/run/lvmpolld.pid" +command="/sbin/lvmpolld" +command_args="${LVMPOLLD_OPTS:=-p ${pidfile}}" +start_stop_daemon_args="--pidfile ${pidfile}" + +depend() { + : +} + +start_pre() +{ + checkpath --directory /run/lvm || return 1 +} diff --git a/sys-fs/lvm2/lvm2-2.03.19.ebuild b/sys-fs/lvm2/lvm2-2.03.19.ebuild deleted file mode 100644 index f58841267b59..000000000000 --- a/sys-fs/lvm2/lvm2-2.03.19.ebuild +++ /dev/null @@ -1,306 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -TMPFILES_OPTIONAL=1 -inherit autotools linux-info systemd toolchain-funcs tmpfiles udev flag-o-matic - -DESCRIPTION="User-land utilities for LVM2 (device-mapper) software" -HOMEPAGE="https://sourceware.org/lvm2/" -SRC_URI="https://sourceware.org/ftp/lvm2/${PN^^}.${PV}.tgz" -S="${WORKDIR}/${PN^^}.${PV}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="lvm lvm2create-initrd readline sanlock selinux static static-libs systemd thin +udev" -REQUIRED_USE=" - static? ( !systemd !udev ) - static-libs? ( static !udev ) - systemd? ( udev ) - thin? ( lvm )" - -DEPEND_COMMON=" - udev? ( virtual/libudev:= ) - lvm? ( - dev-libs/libaio - sys-apps/util-linux - readline? ( sys-libs/readline:= ) - sanlock? ( sys-cluster/sanlock ) - systemd? ( sys-apps/systemd:= ) - )" -# /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 - lvm? ( - virtual/tmpfiles - lvm2create-initrd? ( sys-apps/makedev ) - thin? ( sys-block/thin-provisioning-tools ) - )" -# note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check -DEPEND="${DEPEND_COMMON} - static? ( - lvm? ( - dev-libs/libaio[static-libs] - sys-apps/util-linux[static-libs] - readline? ( sys-libs/readline[static-libs] ) - ) - selinux? ( sys-libs/libselinux[static-libs] ) - )" -BDEPEND=" - sys-devel/autoconf-archive - virtual/pkgconfig" - -PATCHES=( - # Gentoo specific modification(s): - "${FILESDIR}"/${PN}-2.03.17-example.conf.in.patch - - # For upstream -- review and forward: - "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch - "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331 - "${FILESDIR}"/${PN}-2.03.17-locale-muck.patch #330373 - "${FILESDIR}"/${PN}-2.03.19-dynamic-static-ldflags.patch #332905 - "${FILESDIR}"/${PN}-2.03.19-static-pkgconfig-libs.patch #370217, #439414 + blkid, #617756 - "${FILESDIR}"/${PN}-2.03.17-pthread-pkgconfig.patch #492450 - "${FILESDIR}"/${PN}-2.03.19-dmeventd-no-idle-exit.patch - "${FILESDIR}"/${PN}-2.03.19-freopen-musl.patch -) - -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() { - default - - # Users without systemd get no auto-activation of any logical volume - if ! use systemd ; then - eapply "${FILESDIR}"/${PN}-2.03.19-dm_lvm_rules_no_systemd.patch - fi - - eautoreconf -} - -src_configure() { - filter-flags -flto - - # Workaround for bug #822210 - tc-ld-disable-gold - - # Most of this package does weird stuff. - # The build options are tristate, and --without is NOT supported - # options: 'none', 'internal', 'shared' - local myeconfargs=( - $(use_enable lvm dmfilemapd) - $(use_enable lvm dmeventd) - $(use_enable lvm cmdlib) - $(use_enable lvm fsadm) - $(use_enable lvm lvmpolld) - - # This only causes the .static versions to become available - $(usev static --enable-static_link) - - # dmeventd requires mirrors to be internal, and snapshot available - # so we cannot disable them - --with-mirrors="$(usex lvm internal none)" - --with-snapshots="$(usex lvm internal none)" - ) - - if use lvm && use thin; then - myeconfargs+=( --with-thin=internal --with-cache=internal ) - local texec - for texec in check dump repair restore; do - myeconfargs+=( --with-thin-${texec}="${EPREFIX}"/sbin/thin_${texec} ) - myeconfargs+=( --with-cache-${texec}="${EPREFIX}"/sbin/cache_${texec} ) - done - else - myeconfargs+=( --with-thin=none --with-cache=none ) - fi - - myeconfargs+=( - # musl doesn't do symbol versioning so can end up with - # runtime breakage. - --with-symvers=$(usex elibc_glibc 'gnu' 'no') - $(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 "${EPREFIX}$(get_udevdir)"/rules.d) - # USE=sanlock requires USE=lvm - $(use_enable $(usex lvm sanlock lvm) lvmlockd-sanlock) - $(use_enable systemd notify-dbus) - $(use_enable systemd app-machineid) - $(use_enable systemd systemd-journal) - $(use_with systemd systemd-run "/usr/bin/systemd-run") - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - CLDFLAGS="${LDFLAGS}" - ) - - econf "${myeconfargs[@]}" -} - -src_compile() { - emake V=1 -C include - - if use lvm ; then - emake V=1 - emake V=1 CC="$(tc-getCC)" -C scripts - else - emake V=1 device-mapper - # https://bugs.gentoo.org/878131 - emake V=1 -C libdm/dm-tools device-mapper - fi -} - -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" -} - -src_install() { - local INSTALL_TARGETS=( - # full LVM2 - $(usev lvm "install install_tmpfiles_configuration") - # install systemd related files only when requested, bug #522430 - $(usev $(usex lvm systemd lvm) "SYSTEMD_GENERATOR_DIR=$(systemd_get_systemgeneratordir) install_systemd_units install_systemd_generators") - - # install dm unconditionally - install_device-mapper - ) - emake V=1 DESTDIR="${D}" "${INSTALL_TARGETS[@]}" - - newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper - newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper - - if use lvm ; then - newinitd "${FILESDIR}"/dmeventd.initd-2.02.184-r2 dmeventd - newinitd "${FILESDIR}"/lvm.rc-2.02.187 lvm - newconfd "${FILESDIR}"/lvm.confd-2.02.184-r3 lvm - if ! use udev ; then - # We keep the variable but remove udev from it. - sed -r -i \ - -e '/^rc_need=/s/\//g' \ - "${ED}"/etc/conf.d/lvm || die "Could not drop udev from rc_need" - fi - - newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 lvm-monitoring - newinitd "${FILESDIR}"/lvmpolld.initd-2.02.183 lvmpolld - - 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 - - if use sanlock; then - newinitd "${FILESDIR}"/lvmlockd.initd-2.02.166-r1 lvmlockd - fi - fi - - if use static-libs; then - dolib.a libdm/ioctl/libdevmapper.a - if use lvm; then - # depends on lvmetad - dolib.a libdaemon/client/libdaemonclient.a #462908 - # depends on dmeventd - dolib.a daemons/dmeventd/libdevmapper-event.a - fi - else - rm -f "${ED}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a || die - fi - - insinto /etc - doins "${FILESDIR}"/dmtab - - dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf -} - -pkg_preinst() { - HAD_LVM=0 - - if has_version 'sys-fs/lvm2[lvm(+)]' ; then - HAD_LVM=1 - fi -} - -pkg_postinst() { - use lvm && tmpfiles_process lvm2.conf - use udev && udev_reload - - # This is a new installation - if [[ -z "${REPLACING_VERSIONS}" ]]; then - if use lvm ; then - 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 ${EROOT}/etc/lvm/lvm.conf if you want" - ewarn "to enable lvm autoactivation and metadata caching." - else - ewarn "Please enable USE=lvm if you need the LVM daemon and" - ewarn "tools like 'lvchange', 'vgchange', etc!" - fi - else - if ! use lvm && [[ ${HAD_LVM} -eq 1 ]] ; then - ewarn "LVM was previously enabled but is now disabled." - ewarn "Please enable USE=lvm if you need the LVM daemon and" - ewarn "tools like 'lvchange', 'vgchange', etc!" - ewarn "See the 2022-11-19-lvm2-default-USE-flags news item for more details." - fi - fi - - if use udev && [[ -d /run ]] ; then - local permission_run_expected="drwxr-xr-x" - local permission_run=$(stat -c "%A" /run) - if [[ "${permission_run}" != "${permission_run_expected}" ]] ; then - ewarn "Found the following problematic permissions:" - ewarn "" - ewarn " ${permission_run} /run" - ewarn "" - ewarn "Expected:" - ewarn "" - ewarn " ${permission_run_expected} /run" - ewarn "" - ewarn "This is known to cause problems for udev-enabled LVM services." - fi - fi -} - -pkg_postrm() { - if use udev && [[ -z ${REPLACED_BY_VERSION} ]]; then - udev_reload - fi -} diff --git a/sys-fs/lvm2/lvm2-2.03.20.ebuild b/sys-fs/lvm2/lvm2-2.03.20.ebuild index 84c67872e4f6..4ea94fc558fe 100644 --- a/sys-fs/lvm2/lvm2-2.03.20.ebuild +++ b/sys-fs/lvm2/lvm2-2.03.20.ebuild @@ -56,14 +56,14 @@ BDEPEND=" PATCHES=( # Gentoo specific modification(s): - "${FILESDIR}"/${PN}-2.03.17-example.conf.in.patch + "${FILESDIR}"/${PN}-2.03.20-example.conf.in.patch # For upstream -- review and forward: - "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch - "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331 - "${FILESDIR}"/${PN}-2.03.17-locale-muck.patch #330373 - "${FILESDIR}"/${PN}-2.03.19-dmeventd-no-idle-exit.patch - "${FILESDIR}"/${PN}-2.03.19-freopen-musl.patch + "${FILESDIR}"/${PN}-2.03.20-lvm2create_initrd.patch + "${FILESDIR}"/${PN}-2.03.20-createinitrd.patch #301331 + "${FILESDIR}"/${PN}-2.03.20-locale-muck.patch #330373 + "${FILESDIR}"/${PN}-2.03.20-dmeventd-no-idle-exit.patch + "${FILESDIR}"/${PN}-2.03.20-freopen-musl.patch ) pkg_setup() { @@ -95,7 +95,7 @@ src_prepare() { # Users without systemd get no auto-activation of any logical volume if ! use systemd ; then - eapply "${FILESDIR}"/${PN}-2.03.19-dm_lvm_rules_no_systemd.patch + eapply "${FILESDIR}"/${PN}-2.03.20-dm_lvm_rules_no_systemd.patch fi eautoreconf @@ -200,13 +200,13 @@ src_install() { ) emake V=1 DESTDIR="${D}" "${INSTALL_TARGETS[@]}" - newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper - newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper + newinitd "${FILESDIR}"/device-mapper.rc-r3 device-mapper + newconfd "${FILESDIR}"/device-mapper.conf-r4 device-mapper if use lvm ; then - newinitd "${FILESDIR}"/dmeventd.initd-2.02.184-r2 dmeventd - newinitd "${FILESDIR}"/lvm.rc-2.02.187 lvm - newconfd "${FILESDIR}"/lvm.confd-2.02.184-r3 lvm + newinitd "${FILESDIR}"/dmeventd.initd-r3 dmeventd + newinitd "${FILESDIR}"/lvm.rc-r1 lvm + newconfd "${FILESDIR}"/lvm.confd-r4 lvm if ! use udev ; then # We keep the variable but remove udev from it. sed -r -i \ @@ -214,8 +214,8 @@ src_install() { "${ED}"/etc/conf.d/lvm || die "Could not drop udev from rc_need" fi - newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 lvm-monitoring - newinitd "${FILESDIR}"/lvmpolld.initd-2.02.183 lvmpolld + newinitd "${FILESDIR}"/lvm-monitoring.initd-r3 lvm-monitoring + newinitd "${FILESDIR}"/lvmpolld.initd-r1 lvmpolld if use lvm2create-initrd; then dosbin scripts/lvm2create_initrd/lvm2create_initrd @@ -224,7 +224,7 @@ src_install() { fi if use sanlock; then - newinitd "${FILESDIR}"/lvmlockd.initd-2.02.166-r1 lvmlockd + newinitd "${FILESDIR}"/lvmlockd.initd-r2 lvmlockd fi fi diff --git a/sys-fs/lvm2/lvm2-2.03.21.ebuild b/sys-fs/lvm2/lvm2-2.03.21.ebuild index 5d9eb0ac9398..12b85fc8045c 100644 --- a/sys-fs/lvm2/lvm2-2.03.21.ebuild +++ b/sys-fs/lvm2/lvm2-2.03.21.ebuild @@ -56,14 +56,14 @@ BDEPEND=" PATCHES=( # Gentoo specific modification(s): - "${FILESDIR}"/${PN}-2.03.17-example.conf.in.patch + "${FILESDIR}"/${PN}-2.03.20-example.conf.in.patch # For upstream -- review and forward: - "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch - "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331 - "${FILESDIR}"/${PN}-2.03.17-locale-muck.patch #330373 - "${FILESDIR}"/${PN}-2.03.19-dmeventd-no-idle-exit.patch - "${FILESDIR}"/${PN}-2.03.19-freopen-musl.patch + "${FILESDIR}"/${PN}-2.03.20-lvm2create_initrd.patch + "${FILESDIR}"/${PN}-2.03.20-createinitrd.patch #301331 + "${FILESDIR}"/${PN}-2.03.20-locale-muck.patch #330373 + "${FILESDIR}"/${PN}-2.03.20-dmeventd-no-idle-exit.patch + "${FILESDIR}"/${PN}-2.03.20-freopen-musl.patch ) pkg_setup() { @@ -95,7 +95,7 @@ src_prepare() { # Users without systemd get no auto-activation of any logical volume if ! use systemd ; then - eapply "${FILESDIR}"/${PN}-2.03.19-dm_lvm_rules_no_systemd.patch + eapply "${FILESDIR}"/${PN}-2.03.20-dm_lvm_rules_no_systemd.patch fi eautoreconf @@ -201,13 +201,13 @@ src_install() { ) emake V=1 DESTDIR="${D}" "${INSTALL_TARGETS[@]}" - newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper - newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper + newinitd "${FILESDIR}"/device-mapper.rc-r3 device-mapper + newconfd "${FILESDIR}"/device-mapper.conf-r4 device-mapper if use lvm ; then - newinitd "${FILESDIR}"/dmeventd.initd-2.02.184-r2 dmeventd - newinitd "${FILESDIR}"/lvm.rc-2.02.187 lvm - newconfd "${FILESDIR}"/lvm.confd-2.02.184-r3 lvm + newinitd "${FILESDIR}"/dmeventd.initd-r3 dmeventd + newinitd "${FILESDIR}"/lvm.rc-r1 lvm + newconfd "${FILESDIR}"/lvm.confd-r4 lvm if ! use udev ; then # We keep the variable but remove udev from it. sed -r -i \ @@ -215,8 +215,8 @@ src_install() { "${ED}"/etc/conf.d/lvm || die "Could not drop udev from rc_need" fi - newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 lvm-monitoring - newinitd "${FILESDIR}"/lvmpolld.initd-2.02.183 lvmpolld + newinitd "${FILESDIR}"/lvm-monitoring.initd-r3 lvm-monitoring + newinitd "${FILESDIR}"/lvmpolld.initd-r1 lvmpolld if use lvm2create-initrd; then dosbin scripts/lvm2create_initrd/lvm2create_initrd @@ -225,7 +225,7 @@ src_install() { fi if use sanlock; then - newinitd "${FILESDIR}"/lvmlockd.initd-2.02.166-r1 lvmlockd + newinitd "${FILESDIR}"/lvmlockd.initd-r2 lvmlockd fi fi -- cgit v1.2.3