commit: 51b0c9a4812615501458b662e2f25554a77d87e0 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Thu Apr 13 11:10:36 2023 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Thu Apr 13 11:10:36 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51b0c9a4
sys-fs/lvm2: drop 2.03.17-r2 Signed-off-by: David Seifert <soap <AT> gentoo.org> sys-fs/lvm2/Manifest | 1 - .../files/lvm2-2.03.05-dmeventd-no-idle-exit.patch | 81 ------ sys-fs/lvm2/files/lvm2-2.03.12-static-libm.patch | 25 -- .../lvm2-2.03.12-static-pkgconfig-libs-2.patch | 38 --- sys-fs/lvm2/files/lvm2-2.03.14-freopen_n2.patch | 34 --- .../files/lvm2-2.03.14-r1-fopen-to-freopen.patch | 43 --- .../files/lvm2-2.03.14-static-pkgconfig-libs.patch | 124 -------- .../lvm2-2.03.16-dm_lvm_rules_no_systemd.patch | 11 - .../lvm2/files/lvm2-2.03.16-musl-strerror_r.patch | 23 -- .../lvm2-2.03.17-dynamic-static-ldflags.patch | 50 ---- sys-fs/lvm2/files/lvm2-2.03.17-musl-LOCK_EX.patch | 20 -- sys-fs/lvm2/files/lvm2-2.03.17-readelf.patch | 56 ---- sys-fs/lvm2/lvm2-2.03.17-r2.ebuild | 320 --------------------- 13 files changed, 826 deletions(-) diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest index c3f6f492d6d4..43acdc74f34c 100644 --- a/sys-fs/lvm2/Manifest +++ b/sys-fs/lvm2/Manifest @@ -1,3 +1,2 @@ -DIST LVM2.2.03.17.tgz 2726793 BLAKE2B 425e52fe2d7832f8440203d2b6ffc3a097903abea8be07bbbf4864001d5f55083954e561a92b0fe4fc467533e465af3958b25cf33d2693f50f077dc3d9b74bd2 SHA512 ce9f4c10a7e89b397fa021098976117c062227da4f25996296dd3678c0aeb826edf9b7e4f5d3992f42156865ae47cb98671ec37a26868710174a473b42cc70a9 DIST LVM2.2.03.19.tgz 2732219 BLAKE2B 7a5bd024312f149d95361ea24a282c8c68e371687fe8f7c853fa0748ce854bc991cdade999835666a5ece569e80dd9be85d4fae7fc5cc75b912de00f170cf66e SHA512 a40691f6f4c9300c95784be0fcb055a2b8e07bfdc87f000f2357ccb54fdb814a679fb79f5c9790a7440ef538e9997e46d56e539814bfdf138b4e76603aeb2994 DIST LVM2.2.03.20.tgz 2739763 BLAKE2B 4dc223eca1a370450c3985a5f962a2450a2ed08f1fa40af98d181a1530960a7caa3e896a3b54f0f333e2d6818bf35378b9c491a1488a4d3815959ab0e1f987de SHA512 202ff19f6ab1e1ecdf448beec6c7db1a80885efda1a6eeabf44cd2cea40577405c388eabd86f59f34c6e9e400188050bc6d1a5d5daf02f2beda87eee73cd1a2d diff --git a/sys-fs/lvm2/files/lvm2-2.03.05-dmeventd-no-idle-exit.patch b/sys-fs/lvm2/files/lvm2-2.03.05-dmeventd-no-idle-exit.patch deleted file mode 100644 index ec37e5da1dc7..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.03.05-dmeventd-no-idle-exit.patch +++ /dev/null @@ -1,81 +0,0 @@ -From ab3ae0a22dfbe20e2d17e7dc60e0f76184ec098c Mon Sep 17 00:00:00 2001 -From: "Robin H. Johnson" <robb...@gentoo.org> -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 <robb...@gentoo.org> -Fixes: https://bugs.gentoo.org/682556 - -Forward-ported from 2.02.184 to 2.03.05 -Signed-off-by: Lars Wendler <polynomia...@gentoo.org> ---- - 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 -@@ -2158,6 +2158,18 @@ int main(int argc, char *argv[]) - .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; - -@@ -2253,7 +2265,7 @@ int main(int argc, char *argv[]) - _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 */ -@@ -2262,7 +2274,7 @@ int main(int argc, char *argv[]) - (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? */ -diff --git a/man/dmeventd.8_main b/man/dmeventd.8_main -index dc4abf627e..4b0e522041 100644 ---- a/man/dmeventd.8_main -+++ b/man/dmeventd.8_main -@@ -178,6 +178,10 @@ is processed. - Variable is set by thin and vdo plugin to prohibit recursive interation - 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 - . --- -2.22.0 - diff --git a/sys-fs/lvm2/files/lvm2-2.03.12-static-libm.patch b/sys-fs/lvm2/files/lvm2-2.03.12-static-libm.patch deleted file mode 100644 index 5bb776c9b5ed..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.03.12-static-libm.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 4917d9c8b6227256a4a83ff937119d6aa53d654e Mon Sep 17 00:00:00 2001 -From: "Robin H. Johnson" <robb...@gentoo.org> -Date: Sun, 9 May 2021 11:02:54 +0200 -Subject: [PATCH] Add libm to static libs - ---- - make.tmpl.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/make.tmpl.in b/make.tmpl.in -index ae189546d0..8ee00bd9e8 100644 ---- a/make.tmpl.in -+++ b/make.tmpl.in -@@ -64,7 +64,7 @@ PYCOMPILE = $(top_srcdir)/autoconf/py-compile - LIBS += @LIBS@ $(SELINUX_LIBS) $(UDEV_LIBS) $(RT_LIBS) $(M_LIBS) - LVMLIBS = $(DMEVENT_LIBS) $(READLINE_LIBS) $(EDITLINE_LIBS) $(SYSTEMD_LIBS) $(BLKID_LIBS) $(AIO_LIBS) $(LIBS) - # Extra libraries always linked with static binaries --STATIC_LIBS = $(PTHREAD_LIBS) $(SELINUX_STATIC_LIBS) $(UDEV_STATIC_LIBS) $(BLKID_STATIC_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@ --- -2.31.1 - diff --git a/sys-fs/lvm2/files/lvm2-2.03.12-static-pkgconfig-libs-2.patch b/sys-fs/lvm2/files/lvm2-2.03.12-static-pkgconfig-libs-2.patch deleted file mode 100644 index a3a4642e8281..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.03.12-static-pkgconfig-libs-2.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 27ab05863dc56fcd7254bccf30797f9e3c448cac Mon Sep 17 00:00:00 2001 -From: Mike Gilbert <flop...@gentoo.org> -Date: Mon, 12 Jul 2021 10:36:04 -0400 -Subject: [PATCH] libdm: add SELINUX_STATIC_LIBS and UDEV_STATIC_LIBS to - make.tmpl.in - -Fixes link failure for dmsetup.static. ---- - libdm/make.tmpl.in | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/libdm/make.tmpl.in b/libdm/make.tmpl.in -index a306101d5..2309fb3e5 100644 ---- a/libdm/make.tmpl.in -+++ b/libdm/make.tmpl.in -@@ -55,7 +55,7 @@ RM = rm -f - - 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 @@ PTHREAD_LIBS = @PTHREAD_LIBS@ - 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@ - SYSTEMD_LIBS = @SYSTEMD_LIBS@ --- -2.32.0 - diff --git a/sys-fs/lvm2/files/lvm2-2.03.14-freopen_n2.patch b/sys-fs/lvm2/files/lvm2-2.03.14-freopen_n2.patch deleted file mode 100644 index 5ca32f19fc54..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.03.14-freopen_n2.patch +++ /dev/null @@ -1,34 +0,0 @@ -In musl, the standard streams are read-only. To modify them we need to -use freopen. This patch does the same as lvm2-2.03.14-r1-fopen-to-freopen.patch - -https://listman.redhat.com/archives/lvm-devel/2022-June/024203.html - -See also: -https://wiki.gentoo.org/wiki/User:Sam/Musl_porting_notes#error:_assignment_of_read-only_variable_.27.5Bstdout.7Cstdin.7Cstderr.5D.27 -https://www.gnu.org/software/libc/manual/html_node/Standard-Streams.html - ---- - lib/log/log.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/lib/log/log.c b/lib/log/log.c -index 7b4d537..897c183 100644 ---- a/lib/log/log.c -+++ b/lib/log/log.c -@@ -207,8 +207,12 @@ 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; - } - --- -2.35.1 - diff --git a/sys-fs/lvm2/files/lvm2-2.03.14-r1-fopen-to-freopen.patch b/sys-fs/lvm2/files/lvm2-2.03.14-r1-fopen-to-freopen.patch deleted file mode 100644 index 56248e10e5d6..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.03.14-r1-fopen-to-freopen.patch +++ /dev/null @@ -1,43 +0,0 @@ -In musl stdout, stdin and stderr are read-only unlike in glibc. -This patch changes std* = fopen(...) to freopen(..., std*). - -See: https://www.gnu.org/software/libc/manual/html_node/Standard-Streams.html and https://wiki.gentoo.org/wiki/User:Sam/Musl_porting_notes - ---- - tools/lvmcmdline.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c -index 1e12bed..19da1e5 100644 ---- a/tools/lvmcmdline.c -+++ b/tools/lvmcmdline.c -@@ -3384,7 +3384,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 -@@ -3394,7 +3394,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 */ -@@ -3402,7 +3402,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.35.1 - diff --git a/sys-fs/lvm2/files/lvm2-2.03.14-static-pkgconfig-libs.patch b/sys-fs/lvm2/files/lvm2-2.03.14-static-pkgconfig-libs.patch deleted file mode 100644 index e259547a47b0..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.03.14-static-pkgconfig-libs.patch +++ /dev/null @@ -1,124 +0,0 @@ -From ac7cce039825ff779795b5c2ae0ecf00ba43a401 Mon Sep 17 00:00:00 2001 -From: "Robin H. Johnson" <robb...@gentoo.org> -Date: Sun, 9 May 2021 11:00:22 +0200 -Subject: [PATCH] Use pkgconfig to detect static libs - ---- - configure.ac | 20 ++++++++++++++++++-- - make.tmpl.in | 5 ++++- - 2 files changed, 22 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 6cdf1a7e65..90452ebf7c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1168,6 +1168,7 @@ if test "$BLKID_WIPING" != no; then - PKG_CHECK_MODULES(BLKID, blkid >= 2.24, - [ 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.]) - ], [if test "$BLKID_WIPING" = maybe; then -@@ -1213,6 +1214,7 @@ AC_MSG_RESULT($UDEV_SYNC) - if test "$UDEV_SYNC" = yes; then - pkg_config_init - PKG_CHECK_MODULES(UDEV, libudev >= 143, [UDEV_PC="libudev"]) -+ UDEV_STATIC_LIBS=`$PKG_CONFIG --static --libs libudev` - AC_DEFINE([UDEV_SYNC_SUPPORT], 1, [Define to 1 to enable synchronisation with udev processing.]) - - AC_CHECK_LIB(udev, udev_device_get_is_initialized, AC_DEFINE([HAVE_LIBUDEV_UDEV_DEVICE_GET_IS_INITIALIZED], 1, -@@ -1432,19 +1434,30 @@ dnl -- Check for selinux - if test "$SELINUX" = yes; then - AC_CHECK_LIB([sepol], [sepol_check_context], [ - AC_DEFINE([HAVE_SEPOL], 1, [Define to 1 if sepol_check_context is available.]) -- SELINUX_LIBS="-lsepol"]) -+ SEPOL_LIBS="-lsepol"]) -+ -+ dnl -- init pkgconfig if required -+ AS_IF([test x$PKGCONFIG_INIT != x1], [pkg_config_init]) -+ PKG_CHECK_MODULES(SELINUX, libselinux, [ -+ SELINUX_PC="libselinux" -+ SELINUX_STATIC_LIBS=`$PKG_CONFIG --static --libs libselinux` -+ SELINUX_LIBS="$SELINUX_LIBS $SEPOL_LIBS" -+ AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.]) -+ ], [ -+ dnl -- old non-pkgconfig method, is buggy with static builds - - AC_CHECK_LIB([selinux], [is_selinux_enabled], [ - AC_CHECK_HEADERS([selinux/selinux.h],, hard_bailout) - AC_CHECK_HEADERS([selinux/label.h]) - AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.]) -- SELINUX_LIBS="-lselinux $SELINUX_LIBS" -+ SELINUX_LIBS="-lselinux $SEPOL_LIBS" - SELINUX_PC="libselinux" - HAVE_SELINUX=yes ], [ - AC_MSG_WARN(Disabling selinux) - SELINUX_LIBS= - SELINUX_PC= - HAVE_SELINUX=no ]) -+ ]) - fi - - ################################################################################ -@@ -1834,6 +1847,7 @@ AC_ARG_VAR([UDEV_LIBS], [linker flags for udev]) - ################################################################################ - AC_SUBST(AWK) - AC_SUBST(BLKID_PC) -+AC_SUBST(BLKID_STATIC_LIBS) - AC_SUBST(BUILD_CMIRRORD) - AC_SUBST(BUILD_DMEVENTD) - AC_SUBST(BUILD_LVMDBUSD) -@@ -1934,6 +1948,7 @@ AC_SUBST(SALCK_LIBS) - AC_SUBST(SBINDIR) - AC_SUBST(SELINUX_LIBS) - AC_SUBST(SELINUX_PC) -+AC_SUBST(SELINUX_STATIC_LIBS) - AC_SUBST(SYSCONFDIR) - AC_SUBST(SNAPSHOTS) - AC_SUBST(STATICDIR) -@@ -1950,6 +1965,7 @@ AC_SUBST(CACHE_REPAIR_CMD) - 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_SYSTEMD_BACKGROUND_JOBS) - AC_SUBST(UDEV_RULE_EXEC_DETECTION) -diff --git a/make.tmpl.in b/make.tmpl.in -index cccda10d6f..bf6c3e5596 100644 ---- a/make.tmpl.in -+++ b/make.tmpl.in -@@ -64,7 +64,7 @@ PYCOMPILE = $(top_srcdir)/autoconf/py-compile - LIBS += @LIBS@ $(SELINUX_LIBS) $(UDEV_LIBS) $(RT_LIBS) $(M_LIBS) - LVMLIBS = $(DMEVENT_LIBS) $(READLINE_LIBS) $(EDITLINE_LIBS) $(SYSTEMD_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) - DEFS += @DEFS@ - # FIXME set this only where it's needed, not globally? - CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@ -@@ -82,6 +82,7 @@ AIO_CFLAGS = @AIO_CFLAGS@ - 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@ -@@ -90,10 +91,12 @@ PTHREAD_LIBS = @PTHREAD_LIBS@ - READLINE_CFLAGS = @READLINE_CFLAGS@ - READLINE_LIBS = @READLINE_LIBS@ - SELINUX_LIBS = @SELINUX_LIBS@ -+SELINUX_STATIC_LIBS = @SELINUX_STATIC_LIBS@ - SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ - SYSTEMD_LIBS = @SYSTEMD_LIBS@ - UDEV_CFLAGS = @UDEV_CFLAGS@ - UDEV_LIBS = @UDEV_LIBS@ -+UDEV_STATIC_LIBS = @UDEV_STATIC_LIBS@ - VALGRIND_CFLAGS = @VALGRIND_CFLAGS@ - VALGRIND_LIBS = @VALGRIND_LIBS@ - --- -2.33.1 - diff --git a/sys-fs/lvm2/files/lvm2-2.03.16-dm_lvm_rules_no_systemd.patch b/sys-fs/lvm2/files/lvm2-2.03.16-dm_lvm_rules_no_systemd.patch deleted file mode 100644 index c4f74a49b8d0..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.03.16-dm_lvm_rules_no_systemd.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- LVM2.2.03.16/udev/69-dm-lvm.rules.in.orig 2022-10-26 15:58:07.504434946 -0700 -+++ LVM2.2.03.16/udev/69-dm-lvm.rules.in 2022-10-26 16:01:52.122204592 -0700 -@@ -80,7 +80,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+="/usr/bin/systemd-run --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.16-musl-strerror_r.patch b/sys-fs/lvm2/files/lvm2-2.03.16-musl-strerror_r.patch deleted file mode 100644 index d485e75ca811..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.03.16-musl-strerror_r.patch +++ /dev/null @@ -1,23 +0,0 @@ -From a06e401bd0479f25631bdfeffaa01d150e5efe59 Mon Sep 17 00:00:00 2001 -From: Sam James <s...@gentoo.org> -Date: Fri, 18 Nov 2022 17:57:34 +0000 -Subject: [PATCH] Fix strerror_r check for musl - -We can't assume that strerror_r returns char* just because _GNU_SOURCE is defined. We already call the appropriate autoconf test, so let's use its result -(STRERROR_R_CHAR_P). - -Note that in configure, _GNU_SOURCE is always set, but we add a defined guard just in case for futureproofing. - -Bug: https://bugs.gentoo.org/869404 -Signed-off-by: Sam James <s...@gentoo.org> ---- a/daemons/lvmpolld/lvmpolld-core.c -+++ b/daemons/lvmpolld/lvmpolld-core.c -@@ -52,7 +52,7 @@ static pthread_key_t key; - - static const char *_strerror_r(int errnum, struct lvmpolld_thread_data *data) - { --#ifdef _GNU_SOURCE -+#if defined(_GNU_SOURCE) && defined(STRERROR_R_CHAR_P) - return strerror_r(errnum, data->buf, sizeof(data->buf)); /* never returns NULL */ - #elif (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) - return strerror_r(errnum, data->buf, sizeof(data->buf)) ? "" : data->buf; diff --git a/sys-fs/lvm2/files/lvm2-2.03.17-dynamic-static-ldflags.patch b/sys-fs/lvm2/files/lvm2-2.03.17-dynamic-static-ldflags.patch deleted file mode 100644 index e3228945a325..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.03.17-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" -@@ -1945,6 +1946,7 @@ - AC_SUBST(SYSCONFDIR) - 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 -@@ -64,6 +64,7 @@ - # FIXME set this only where it's needed, not globally? - CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@ - 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.17-musl-LOCK_EX.patch b/sys-fs/lvm2/files/lvm2-2.03.17-musl-LOCK_EX.patch deleted file mode 100644 index acb5e903b45a..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.03.17-musl-LOCK_EX.patch +++ /dev/null @@ -1,20 +0,0 @@ -https://bugs.gentoo.org/887259 - -From ab715e56feec4bbb135cc97d2d1e8e7340a8ee44 Mon Sep 17 00:00:00 2001 -From: Jory Pratt <anar...@gentoo.org> -Date: Tue, 20 Dec 2022 08:12:49 -0600 -Subject: [PATCH] Add missing include for LOCK_EX - -Signed-off-by: Jory Pratt <anar...@gentoo.org> ---- a/tools/vgimportdevices.c -+++ b/tools/vgimportdevices.c -@@ -15,6 +15,7 @@ - #include "tools.h" - #include "lib/cache/lvmcache.h" - #include "lib/device/device_id.h" -+#include <sys/file.h> - - struct vgimportdevices_params { - uint32_t added_devices; --- -2.38.2 diff --git a/sys-fs/lvm2/files/lvm2-2.03.17-readelf.patch b/sys-fs/lvm2/files/lvm2-2.03.17-readelf.patch deleted file mode 100644 index 82870b108e09..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.03.17-readelf.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 2de7e5c222ff114f41dadcf904061d6c2a77eae2 Mon Sep 17 00:00:00 2001 -From: David Seifert <s...@gentoo.org> -Date: Sat, 19 Nov 2022 17:05:31 +0100 -Subject: [PATCH 1/2] Allow for overriding of `readelf` - -* This allows users to use e.g. `llvm-readelf` on systems with binutils as default. - -Bug: https://bugs.gentoo.org/840628 ---- - configure.ac | 1 + - libdm/Makefile.in | 4 ++-- - libdm/make.tmpl.in | 1 + - 3 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 704772b62..f39c87d08 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -83,6 +83,7 @@ AC_PROG_LN_S - AC_PROG_MAKE_SET - AC_PROG_MKDIR_P - AC_PROG_RANLIB -+AC_CHECK_TOOL([READELF], [readelf]) - AC_CHECK_TOOL(AR, ar) - AC_PATH_TOOL(CFLOW_CMD, cflow) - AC_PATH_TOOL(CSCOPE_CMD, cscope) -diff --git a/libdm/Makefile.in b/libdm/Makefile.in -index 35115d7f0..2758648e6 100644 ---- a/libdm/Makefile.in -+++ b/libdm/Makefile.in -@@ -71,8 +71,8 @@ libdevmapper.$(LIB_SUFFIX) libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION): $(LIB_SHAR - # also the older symbol is built-in - .symver_check: $(LIB_SHARED) - @echo " [CHECK] $<" -- $(Q) if readelf -Ws $< | grep -q dm_stats_create_region@@; then \ -- SYM=$$(readelf -Ws $< | grep dm_stats_create_region@DM_1_02_106); \ -+ $(Q) if $(READELF) -Ws $< | grep -q dm_stats_create_region@@; then \ -+ SYM=$$($(READELF) -Ws $< | grep dm_stats_create_region@DM_1_02_106); \ - if test -n "$$SYM"; then touch $@; \ - else echo >&2 "Missing versioned symbols in $<"; false; fi; \ - else touch $@; fi -diff --git a/libdm/make.tmpl.in b/libdm/make.tmpl.in -index f1c88fac0..095fb028a 100644 ---- a/libdm/make.tmpl.in -+++ b/libdm/make.tmpl.in -@@ -34,6 +34,7 @@ ifeq ($(CC), cc) - endif - - RANLIB = @RANLIB@ -+READELF = @READELF@ - INSTALL = @INSTALL@ - MKDIR_P = @MKDIR_P@ - MSGFMT = @MSGFMT@ --- -2.38.1 - diff --git a/sys-fs/lvm2/lvm2-2.03.17-r2.ebuild b/sys-fs/lvm2/lvm2-2.03.17-r2.ebuild deleted file mode 100644 index 27f458ee325f..000000000000 --- a/sys-fs/lvm2/lvm2-2.03.17-r2.ebuild +++ /dev/null @@ -1,320 +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.17-dynamic-static-ldflags.patch #332905 - "${FILESDIR}"/${PN}-2.03.14-static-pkgconfig-libs.patch #370217, #439414 + blkid - "${FILESDIR}"/${PN}-2.03.12-static-pkgconfig-libs-2.patch - "${FILESDIR}"/${PN}-2.03.17-pthread-pkgconfig.patch #492450 - "${FILESDIR}"/${PN}-2.03.12-static-libm.patch #617756 - "${FILESDIR}"/${PN}-2.03.05-dmeventd-no-idle-exit.patch - "${FILESDIR}"/${PN}-2.03.14-r1-fopen-to-freopen.patch - "${FILESDIR}"/${PN}-2.03.14-freopen_n2.patch - "${FILESDIR}"/${PN}-2.03.16-musl-strerror_r.patch - "${FILESDIR}"/${PN}-2.03.17-readelf.patch - "${FILESDIR}"/${PN}-2.03.17-musl-LOCK_EX.patch #887259 -) - -QA_CONFIGURE_OPTIONS="--disable-static" - -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.16-dm_lvm_rules_no_systemd.patch - sed -i -e '/^USE_SD_NOTIFY=yes$/s/yes/no/' daemons/lvmlockd/Makefile.in || die - fi - - sed -i -e "s:/usr/bin/true:$(type -P true):" scripts/blk_availability_systemd_red_hat.service.in || die #517514 - - 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) - $(usev !lvm --disable-udev-systemd-background-jobs) - - # 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 udev-systemd-background-jobs) - $(use_enable systemd notify-dbus) - $(use_enable systemd app-machineid) - $(use_enable systemd systemd-journal) - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - CLDFLAGS="${LDFLAGS}" - ) - - # Hard-wire this to bash as some shells (dash) don't know - # "-o pipefail" #682404 - CONFIG_SHELL="${BROOT}"/bin/bash 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/\<udev\>//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 -}
