gentoo auto-resync : 10:05:2023 - 23:44:41

8 files changed, 19 insertions, 57 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index f4b708c432d4..908165a9fabc 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 0094ecae6932..e5c03ec53ae2 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -5,17 +5,16 @@ AUX dmtab 319 BLAKE2B 5753b72e44325e467c0e4ea1bbce8faafe1c5e2509d2e02a5ad428b39e
 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-dmeventd-no-idle-exit.patch 2174 BLAKE2B e5b53504feeac84e0458399b8c94f7c844f0b7a592b3458ef33f5af165a9dd0fa3c21804f0269a0529261af7060640b2efc92c6218c9dbc5d74f53b23e2f8b36 SHA512 5f0f735340a8f24432c0b0ce9b8e67971982a0b6e3c9878b34c05c20f348ce50018acde9944a8505462cfce927322ef264ce20a86dc77d1bad677f3411966aed
 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-freopen-musl.patch 1595 BLAKE2B 4e019fbf8b89f79ca19eb821bc434d84d5c986a10d82b4a33a3cc4b8b6aa30c27e912e2ab0d067cab94feb28b53826725f43dd0973a60482c20e6417149b6a35 SHA512 40e49bb34a9c07493ab6a9948e3ac1a85e22f069b69ad2a1369cb7d30a6ea6d72a27f380ad8951f55d939834e2f29c9da589ae475322ea41b4dfce72060b9557
 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 lvm2-2.03.20-lvm2create_initrd.patch 2133 BLAKE2B 006bca3d88e4f4887d551c86a4de12aee88974dd9f16c211ff045f55d688185197552408640f5e80398cc234a81e6d7d4c98de7605bd874da0129448574083d9 SHA512 c7b11f2307b3d26df86c16c405777f9a6e52c575628b814a67c29243221f06cb518ca4781eafc9b9920d1f8a7505d274fd697ca13094e759b1af216269033cd9
 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.20.ebuild 8958 BLAKE2B 9c71dc0fa40463a9f4fb5a17754c953cc4d5ff3c908059e5d8bc5576acbb9bdaf4f6ff272d4bba01cc722d1c4fc2dbe46ade9a6e135f19e52108792ad1cb2b06 SHA512 5908e12b65aadf2e3ad58b2512cff2257be17476608e4ad36e8e7b02f048fe9876d9acb1985a728fa699287582699e2cdaaac71de90f314598bd7bf864930da9
-EBUILD lvm2-2.03.21.ebuild 8971 BLAKE2B 887bd9bc35898b34c0233f38c41b1ee7f400b41c747230b49428404fa3e6f45562f0883e2d4c85fbc3ced7934104319990811319e2885dd0624630ace7d0fb64 SHA512 19f892a033926e8e1a616fb5290530702118e3ae239649d1b3987b12435c9f9aea61d17fc05f4bc3052d1bad4c6a43d09cf2059b50ac7f4aef390ce4b476d27f
+EBUILD lvm2-2.03.20.ebuild 8902 BLAKE2B 9c05b3d93e5dd024574324619faf5d0907f4aa28a7190b75bdce257c39643b41f267af3c9675784d4b685eeaf5d095415eeb431b621fcf1a2517c6fbe96d330a SHA512 1944f60939380e0f64fa2a99e2e8747d0d2215ae3a8c7630d8f050ea712d5a7c7aec7ffae782ce9c7838f03d2d9421f03127a7f58829151c3fd7a2d5656d9d5a
+EBUILD lvm2-2.03.21.ebuild 8586 BLAKE2B 0b1cfc31851667f849d04b992d5b7df0e43135a6ec4fe1ebb7379e6d133d123525e2abc502c1ec7f38fd54af2bbfd759c1a30cc0aad28db44de4d380bc7d4db1 SHA512 c5042bef4f7d36e8faa2be642493b8fc53f35ff4ad74c0ffbc534d9f2f4c009b0be247ea1c43840b747e897704acd3a2685e399dbde916f4079c15a4b654dbd2
 MISC metadata.xml 922 BLAKE2B 8688e31c04a110d0e522a13724896a2a7c22a9ce33d8d4384a7fbfb54e3c42c231d3b5791ceda976453d54062c5a8318cd514979fcad177ab1ff2a01b791ca65 SHA512 423e499010daffc24141021bc5328b83f9e39e1534bb30fdbbf6839f4ed426897d764d0ca6d0e96267bc67986d3a2cfa9cc5ec3f0e3b2e7aa5ef34095de95a61
diff --git a/sys-fs/lvm2/files/lvm2-2.03.20-createinitrd.patch b/sys-fs/lvm2/files/lvm2-2.03.20-createinitrd.patch
deleted file mode 100644
index 7f0bfb894f02..000000000000
--- a/sys-fs/lvm2/files/lvm2-2.03.20-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.20-dmeventd-no-idle-exit.patch b/sys-fs/lvm2/files/lvm2-2.03.20-dmeventd-no-idle-exit.patch
index b7030ccc084d..8f3cb5534d95 100644
--- 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
@@ -12,13 +12,6 @@ that can be -1 to not exit, or a configurable time for different idle exit.
 
 Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
 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 @@
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
index cc231d9251bd..2b3f0a91f2a7 100644
--- a/sys-fs/lvm2/files/lvm2-2.03.20-freopen-musl.patch
+++ b/sys-fs/lvm2/files/lvm2-2.03.20-freopen-musl.patch
@@ -6,13 +6,6 @@ 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)
@@ -27,8 +20,6 @@ index 118a3ba42..a94016d81 100644
  	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)
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
index 59aaa9b34a08..007b2b5c1e3a 100644
--- a/sys-fs/lvm2/files/lvm2-2.03.20-lvm2create_initrd.patch
+++ b/sys-fs/lvm2/files/lvm2-2.03.20-lvm2create_initrd.patch
@@ -1,5 +1,5 @@
---- 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
+--- a/scripts/lvm2create_initrd/lvm2create_initrd
++++ b/scripts/lvm2create_initrd/lvm2create_initrd
 @@ -54,7 +54,9 @@
  DEVRAM=/tmp/initrd.$$
  
@@ -65,8 +65,15 @@
  if [ $? -ne 0 ]; then
     echo "$cmd -- ERROR creating directories in $TMPMNT"
     cleanup 1
-@@ -499,4 +508,3 @@
- FINALTXT
+@@ -460,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
  
- cleanup 0
--
diff --git a/sys-fs/lvm2/lvm2-2.03.20.ebuild b/sys-fs/lvm2/lvm2-2.03.20.ebuild
index 4ea94fc558fe..1c7fd041e178 100644
--- a/sys-fs/lvm2/lvm2-2.03.20.ebuild
+++ b/sys-fs/lvm2/lvm2-2.03.20.ebuild
@@ -60,7 +60,6 @@ PATCHES=(
 
 	# For upstream -- review and forward:
 	"${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
diff --git a/sys-fs/lvm2/lvm2-2.03.21.ebuild b/sys-fs/lvm2/lvm2-2.03.21.ebuild
index 12b85fc8045c..c322d60907e5 100644
--- a/sys-fs/lvm2/lvm2-2.03.21.ebuild
+++ b/sys-fs/lvm2/lvm2-2.03.21.ebuild
@@ -14,7 +14,7 @@ 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"
+IUSE="lvm readline sanlock selinux static static-libs systemd thin +udev"
 REQUIRED_USE="
 	static? ( !systemd !udev )
 	static-libs? ( static !udev )
@@ -37,7 +37,6 @@ 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
@@ -59,8 +58,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.03.20-example.conf.in.patch
 
 	# For upstream -- review and forward:
-	"${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
@@ -218,12 +215,6 @@ src_install() {
 		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
-			doman scripts/lvm2create_initrd/lvm2create_initrd.8
-			newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd
-		fi
-
 		if use sanlock; then
 			newinitd "${FILESDIR}"/lvmlockd.initd-r2 lvmlockd
 		fi