From 06bb974d894b86598af155dc76a6fbd76c4fa30c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 13 Jan 2023 17:49:19 +0000 Subject: gentoo auto-resync : 13:01:2023 - 17:49:18 --- .../files/lvm2-2.02.166-HPPA-no-O_DIRECT.patch | 12 ---- sys-fs/lvm2/files/lvm2-2.02.184-mksh_build.patch | 13 ---- sys-fs/lvm2/files/lvm2-2.02.99-locale-muck.patch | 11 ---- .../files/lvm2-2.03.05-pthread-pkgconfig.patch | 48 -------------- .../lvm2/files/lvm2-2.03.06-example.conf.in.patch | 56 ---------------- .../lvm2-2.03.12-dynamic-static-ldflags.patch | 76 ---------------------- .../lvm2-2.03.14-dm_lvm_rules_no_systemd.patch | 37 ----------- sys-fs/lvm2/files/lvm2-2.03.14-r1-add-fcntl.patch | 24 ------- sys-fs/lvm2/files/lvm2-2.03.14-r1-mallinfo.patch | 18 ----- 9 files changed, 295 deletions(-) delete mode 100644 sys-fs/lvm2/files/lvm2-2.02.166-HPPA-no-O_DIRECT.patch delete mode 100644 sys-fs/lvm2/files/lvm2-2.02.184-mksh_build.patch delete mode 100644 sys-fs/lvm2/files/lvm2-2.02.99-locale-muck.patch delete mode 100644 sys-fs/lvm2/files/lvm2-2.03.05-pthread-pkgconfig.patch delete mode 100644 sys-fs/lvm2/files/lvm2-2.03.06-example.conf.in.patch delete mode 100644 sys-fs/lvm2/files/lvm2-2.03.12-dynamic-static-ldflags.patch delete mode 100644 sys-fs/lvm2/files/lvm2-2.03.14-dm_lvm_rules_no_systemd.patch delete mode 100644 sys-fs/lvm2/files/lvm2-2.03.14-r1-add-fcntl.patch delete mode 100644 sys-fs/lvm2/files/lvm2-2.03.14-r1-mallinfo.patch (limited to 'sys-fs/lvm2/files') diff --git a/sys-fs/lvm2/files/lvm2-2.02.166-HPPA-no-O_DIRECT.patch b/sys-fs/lvm2/files/lvm2-2.02.166-HPPA-no-O_DIRECT.patch deleted file mode 100644 index 0f830e428b10..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.02.166-HPPA-no-O_DIRECT.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/lib/device/dev-io.c -+++ b/lib/device/dev-io.c -@@ -505,7 +505,9 @@ - dev->flags |= DEV_NOT_O_NOATIME; - if ((dev->fd = open(name, flags, 0777)) >= 0) { - log_debug_devs("%s: Not using O_NOATIME", name); -+#ifdef O_DIRECT_SUPPORT - goto opened; -+#endif - } - } - #endif diff --git a/sys-fs/lvm2/files/lvm2-2.02.184-mksh_build.patch b/sys-fs/lvm2/files/lvm2-2.02.184-mksh_build.patch deleted file mode 100644 index 49c6853f23a7..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.02.184-mksh_build.patch +++ /dev/null @@ -1,13 +0,0 @@ -https://bugs.gentoo.org/686652 - ---- LVM2.2.02.184/tools/Makefile.in -+++ LVM2.2.02.184/tools/Makefile.in -@@ -220,6 +220,6 @@ - echo "/* Do not edit. This file is generated by the Makefile. */" && \ - echo -en "const char _command_input[] =\n\n\"" && \ - $(EGREP) -v '^#|\-\-\-|^$$' $(srcdir)/command-lines.in | $(AWK) 'BEGIN {ORS = "\\n\"\n\""} //' && \ -- echo "\\n\";" \ -+ printf "%s\n" "\\n\";" \ - ) > $@ - - $(SOURCES:%.c=%.d) $(SOURCES2:%.c=%.d): command-lines-input.h command-count.h cmds.h diff --git a/sys-fs/lvm2/files/lvm2-2.02.99-locale-muck.patch b/sys-fs/lvm2/files/lvm2-2.02.99-locale-muck.patch deleted file mode 100644 index fe7ec87931e3..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.02.99-locale-muck.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- LVM2/make.tmpl.in -+++ LVM2/make.tmpl.in -@@ -395,7 +395,7 @@ - ( cat $(srcdir)/.exported_symbols; \ - if test x$(EXPORTED_HEADER) != x; then \ - $(CC) -E -P $(INCLUDES) $(DEFS) $(EXPORTED_HEADER) | \ -- $(SED) -ne "/^typedef|}/!s/.*[ *]\($(EXPORTED_FN_PREFIX)_[a-z0-9_]*\)(.*/\1/p"; \ -+ LC_ALL=C $(SED) -ne "/^typedef|}/!s/.*[ *]\($(EXPORTED_FN_PREFIX)_[a-z0-9_]*\)(.*/\1/p"; \ - fi \ - ) > $@ - diff --git a/sys-fs/lvm2/files/lvm2-2.03.05-pthread-pkgconfig.patch b/sys-fs/lvm2/files/lvm2-2.03.05-pthread-pkgconfig.patch deleted file mode 100644 index 56aa2a7b79fc..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.03.05-pthread-pkgconfig.patch +++ /dev/null @@ -1,48 +0,0 @@ -From dbb68df8d02eff87f10df331e17bd0940e158f56 Mon Sep 17 00:00:00 2001 -From: "Robin H. Johnson" -Date: Wed, 24 Jul 2019 11:15:59 +0200 -Subject: [PATCH] Add pthread to libdevmapper pkgconfig file - -Forward-ported from 2.02.176 to 2.03.05 -Signed-off-by: Lars Wendler ---- - libdm/libdevmapper.pc.in | 2 +- - tools/Makefile.in | 5 +++++ - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/libdm/libdevmapper.pc.in b/libdm/libdevmapper.pc.in -index a325aeb9e0..aa0980378f 100644 ---- a/libdm/libdevmapper.pc.in -+++ b/libdm/libdevmapper.pc.in -@@ -9,4 +9,4 @@ Version: @DM_LIB_PATCHLEVEL@ - 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@ -diff --git a/tools/Makefile.in b/tools/Makefile.in -index e5fc9c4ae4..12e4de2c63 100644 ---- a/tools/Makefile.in -+++ b/tools/Makefile.in -@@ -87,6 +87,7 @@ ifeq ("@STATIC_LINK@", "yes") - TARGETS += lvm.static - INSTALL_LVM_TARGETS += install_tools_static - INSTALL_CMDLIB_TARGETS += install_cmdlib_static -+ STATIC_LIBS += @PTHREAD_LIBS@ - endif - - LVMLIBS = $(SYSTEMD_LIBS) -L$(top_builddir)/libdm -ldevmapper $(LIBS) -laio -@@ -113,6 +114,10 @@ CFLOW_TARGET = lvm - - include $(top_builddir)/make.tmpl - -+ifeq ("@STATIC_LINK@", "yes") -+ STATIC_LIBS += @PTHREAD_LIBS@ -+endif -+ - device-mapper: - - all: device-mapper --- -2.22.0 - diff --git a/sys-fs/lvm2/files/lvm2-2.03.06-example.conf.in.patch b/sys-fs/lvm2/files/lvm2-2.03.06-example.conf.in.patch deleted file mode 100644 index 329bfde6ca91..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.03.06-example.conf.in.patch +++ /dev/null @@ -1,56 +0,0 @@ -From a26cc1e7e299b61d1877ead03aacafef9fbe81ff Mon Sep 17 00:00:00 2001 -From: "Robin H. Johnson" -Date: Fri, 25 Oct 2019 08:45:17 +0200 -Subject: [PATCH] Add Gentoo specific changes - -Forward-ported from 2.03.05 to 2.03.06 -Signed-off-by: Lars Wendler ---- - conf/example.conf.in | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/conf/example.conf.in b/conf/example.conf.in -index 05b0857920..33ffb0097c 100644 ---- a/conf/example.conf.in -+++ b/conf/example.conf.in -@@ -143,6 +143,9 @@ devices { - # 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: -@@ -1680,7 +1683,7 @@ activation { - - # 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. -@@ -1725,7 +1728,8 @@ activation { - # - # 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. -@@ -1768,7 +1772,7 @@ activation { - # This configuration option is advanced. - # This configuration option has an automatic default value. - # stripesize = 64 --# } -+} - - # Configuration section report. - # LVM report command output formatting. --- -2.24.0.rc1 - diff --git a/sys-fs/lvm2/files/lvm2-2.03.12-dynamic-static-ldflags.patch b/sys-fs/lvm2/files/lvm2-2.03.12-dynamic-static-ldflags.patch deleted file mode 100644 index 80b6bc7a023f..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.03.12-dynamic-static-ldflags.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 4bdd215fd84e83a8119d0b971904221743a87a23 Mon Sep 17 00:00:00 2001 -From: "Robin H. Johnson" -Date: Wed, 24 Jul 2019 11:11:35 +0200 -Subject: [PATCH] Add dynamic static ldflags - -Forward-ported from 2.02.178 to 2.03.05 -Forward-ported from 2.03.05 to 2.03.12 -Signed-off-by: Lars Wendler ---- - configure.ac | 2 ++ - daemons/dmeventd/Makefile.in | 2 +- - make.tmpl.in | 1 + - tools/Makefile.in | 2 +- - 4 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 1a49e7fe7e..354b53b5ec 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -32,6 +32,7 @@ case "$host_os" in - 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" -@@ -1860,6 +1861,7 @@ AC_SUBST(SYSCONFDIR) - AC_SUBST(SYSTEMD_LIBS) - AC_SUBST(SNAPSHOTS) - AC_SUBST(STATICDIR) -+AC_SUBST(STATIC_LDFLAGS) - AC_SUBST(STATIC_LINK) - AC_SUBST(TESTSUITE_DATA) - AC_SUBST(THIN) -diff --git a/daemons/dmeventd/Makefile.in b/daemons/dmeventd/Makefile.in -index af51198aae..f7896e581e 100644 ---- a/daemons/dmeventd/Makefile.in -+++ b/daemons/dmeventd/Makefile.in -@@ -76,7 +76,7 @@ dmeventd: $(LIB_SHARED) dmeventd.o - - 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") -diff --git a/make.tmpl.in b/make.tmpl.in -index 200ea2e05f..99f02e8b77 100644 ---- a/make.tmpl.in -+++ b/make.tmpl.in -@@ -69,6 +69,7 @@ DEFS += @DEFS@ - # 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@ -diff --git a/tools/Makefile.in b/tools/Makefile.in -index ec546ca632..cdede2a058 100644 ---- a/tools/Makefile.in -+++ b/tools/Makefile.in -@@ -137,7 +137,7 @@ man-generator: man-generator.o - - 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 --- -2.31.1 - diff --git a/sys-fs/lvm2/files/lvm2-2.03.14-dm_lvm_rules_no_systemd.patch b/sys-fs/lvm2/files/lvm2-2.03.14-dm_lvm_rules_no_systemd.patch deleted file mode 100644 index 0b4a156c630f..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.03.14-dm_lvm_rules_no_systemd.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 88d5b3d711c8546864e57dbfba7591a19be80c4d Mon Sep 17 00:00:00 2001 -From: Lars Wendler -Date: Mon, 27 Dec 2021 00:53:21 +0100 -Subject: [PATCH] Don't use systemd-run in 69-dm-lvm.rules - -some people don't run systemd ---- - udev/69-dm-lvm.rules.in | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/udev/69-dm-lvm.rules.in b/udev/69-dm-lvm.rules.in -index 39e5b9807..6ba4efa0f 100644 ---- a/udev/69-dm-lvm.rules.in -+++ b/udev/69-dm-lvm.rules.in -@@ -62,8 +62,8 @@ ENV{SYSTEMD_READY}="1" - # LVM_VG_NAME_COMPLETE='foo' - # - # When the VG is complete it can be activated, so --# vgchange -aay is run. It is run via --# systemd since it can take longer to run than -+# vgchange -aay is run. It can take -+# longer to run than - # udev wants to block when processing rules. - # (if there are hundreds of LVs to activate, - # the vgchange can take many seconds.) -@@ -80,7 +80,7 @@ ENV{SYSTEMD_READY}="1" - # it's better suited to appearing in the journal. - - IMPORT{program}="(LVM_EXEC)/lvm pvscan --cache --listvg --checkcomplete --vgonline --udevoutput --journal=output $env{DEVNAME}" --ENV{LVM_VG_NAME_COMPLETE}=="?*", RUN+="/usr/bin/systemd-run -r --no-block --property DefaultDependencies=no --unit lvm-activate-$env{LVM_VG_NAME_COMPLETE} lvm vgchange -aay --nohints $env{LVM_VG_NAME_COMPLETE}" -+ENV{LVM_VG_NAME_COMPLETE}=="?*", RUN+="(LVM_EXEC)/lvm vgchange -aay --nohints $env{LVM_VG_NAME_COMPLETE}" - GOTO="lvm_end" - - LABEL="lvm_end" --- -2.34.1 - diff --git a/sys-fs/lvm2/files/lvm2-2.03.14-r1-add-fcntl.patch b/sys-fs/lvm2/files/lvm2-2.03.14-r1-add-fcntl.patch deleted file mode 100644 index 1b5524a61405..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.03.14-r1-add-fcntl.patch +++ /dev/null @@ -1,24 +0,0 @@ -https://bugs.gentoo.org/712336 -https://bugs.gentoo.org/549506 - -Adds fcntl.h into daemon-server.c to define fcntl and some constants. - ---- - libdaemon/server/daemon-server.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libdaemon/server/daemon-server.c b/libdaemon/server/daemon-server.c -index 88905a7..771b021 100644 ---- a/libdaemon/server/daemon-server.c -+++ b/libdaemon/server/daemon-server.c -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - #include /* FIXME. For the global closelog(). */ - --- -2.35.1 - diff --git a/sys-fs/lvm2/files/lvm2-2.03.14-r1-mallinfo.patch b/sys-fs/lvm2/files/lvm2-2.03.14-r1-mallinfo.patch deleted file mode 100644 index af4cbc0d5aab..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.03.14-r1-mallinfo.patch +++ /dev/null @@ -1,18 +0,0 @@ -https://git.alpinelinux.org/aports/tree/main/lvm2/mallinfo.patch - -Patch from Alpine, disables _allocate_memory since mallinfo isn't defined in musl. -19:17 <@sam_> your caution is well-advised, but it should be safe enough given it's only affecting the non-glibc path - -Should be looked back to! - ---- ./lib/mm/memlock.c.orig 2015-03-09 11:18:41.560028850 -0100 -+++ ./lib/mm/memlock.c 2015-03-09 11:19:54.504373309 -0100 -@@ -137,7 +137,7 @@ - - static void _allocate_memory(void) - { --#ifndef VALGRIND_POOL -+#if !defined(VALGRIND_POOL) && defined(__GLIBC__) - void *stack_mem; - struct rlimit limit; - int i, area = 0, missing = _size_malloc_tmp, max_areas = 32, hblks; -- cgit v1.2.3