From f356af92b88d56b78588e81310493d4f5a2f6d18 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Wed, 10 May 2023 23:44:42 +0100
Subject: gentoo auto-resync : 10:05:2023 - 23:44:41

---
 sys-fs/lvm2/files/lvm2-2.03.20-createinitrd.patch     | 18 ------------------
 .../files/lvm2-2.03.20-dmeventd-no-idle-exit.patch    |  7 -------
 sys-fs/lvm2/files/lvm2-2.03.20-freopen-musl.patch     |  9 ---------
 .../lvm2/files/lvm2-2.03.20-lvm2create_initrd.patch   | 19 +++++++++++++------
 4 files changed, 13 insertions(+), 40 deletions(-)
 delete mode 100644 sys-fs/lvm2/files/lvm2-2.03.20-createinitrd.patch

(limited to 'sys-fs/lvm2/files')

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
--
-- 
cgit v1.2.3