diff options
Diffstat (limited to 'sys-fs/lvm2/files')
-rw-r--r-- | sys-fs/lvm2/files/device-mapper.conf-r4 (renamed from sys-fs/lvm2/files/device-mapper.conf-1.02.22-r3) | 0 | ||||
-rw-r--r-- | sys-fs/lvm2/files/device-mapper.rc-r3 (renamed from sys-fs/lvm2/files/device-mapper.rc-2.02.105-r2) | 0 | ||||
-rw-r--r-- | sys-fs/lvm2/files/dmeventd.initd-r3 (renamed from sys-fs/lvm2/files/dmeventd.initd-2.02.184-r2) | 0 | ||||
-rw-r--r-- | sys-fs/lvm2/files/lvm-monitoring.initd-r3 (renamed from sys-fs/lvm2/files/lvm-monitoring.initd-2.02.105-r2) | 0 | ||||
-rw-r--r-- | sys-fs/lvm2/files/lvm.confd-r4 (renamed from sys-fs/lvm2/files/lvm.confd-2.02.184-r3) | 0 | ||||
-rw-r--r-- | sys-fs/lvm2/files/lvm.rc-r1 (renamed from sys-fs/lvm2/files/lvm.rc-2.02.187) | 0 | ||||
-rw-r--r-- | sys-fs/lvm2/files/lvm2-2.03.17-pthread-pkgconfig.patch | 31 | ||||
-rw-r--r-- | sys-fs/lvm2/files/lvm2-2.03.19-dynamic-static-ldflags.patch | 50 | ||||
-rw-r--r-- | sys-fs/lvm2/files/lvm2-2.03.19-static-pkgconfig-libs.patch | 130 | ||||
-rw-r--r-- | sys-fs/lvm2/files/lvm2-2.03.20-createinitrd.patch (renamed from sys-fs/lvm2/files/lvm2-2.02.67-createinitrd.patch) | 0 | ||||
-rw-r--r-- | sys-fs/lvm2/files/lvm2-2.03.20-dm_lvm_rules_no_systemd.patch (renamed from sys-fs/lvm2/files/lvm2-2.03.19-dm_lvm_rules_no_systemd.patch) | 0 | ||||
-rw-r--r-- | sys-fs/lvm2/files/lvm2-2.03.20-dmeventd-no-idle-exit.patch (renamed from sys-fs/lvm2/files/lvm2-2.03.19-dmeventd-no-idle-exit.patch) | 0 | ||||
-rw-r--r-- | sys-fs/lvm2/files/lvm2-2.03.20-example.conf.in.patch (renamed from sys-fs/lvm2/files/lvm2-2.03.17-example.conf.in.patch) | 0 | ||||
-rw-r--r-- | sys-fs/lvm2/files/lvm2-2.03.20-freopen-musl.patch (renamed from sys-fs/lvm2/files/lvm2-2.03.19-freopen-musl.patch) | 0 | ||||
-rw-r--r-- | sys-fs/lvm2/files/lvm2-2.03.20-locale-muck.patch (renamed from sys-fs/lvm2/files/lvm2-2.03.17-locale-muck.patch) | 0 | ||||
-rw-r--r-- | sys-fs/lvm2/files/lvm2-2.03.20-lvm2create_initrd.patch (renamed from sys-fs/lvm2/files/lvm2-2.02.56-lvm2create_initrd.patch) | 0 | ||||
-rw-r--r-- | sys-fs/lvm2/files/lvmlockd.initd-r2 (renamed from sys-fs/lvm2/files/lvmlockd.initd-2.02.166-r1) | 0 | ||||
-rw-r--r-- | sys-fs/lvm2/files/lvmpolld.initd-r1 (renamed from sys-fs/lvm2/files/lvmpolld.initd-2.02.183) | 0 |
18 files changed, 0 insertions, 211 deletions
diff --git a/sys-fs/lvm2/files/device-mapper.conf-1.02.22-r3 b/sys-fs/lvm2/files/device-mapper.conf-r4 index bc7a25158635..bc7a25158635 100644 --- a/sys-fs/lvm2/files/device-mapper.conf-1.02.22-r3 +++ b/sys-fs/lvm2/files/device-mapper.conf-r4 diff --git a/sys-fs/lvm2/files/device-mapper.rc-2.02.105-r2 b/sys-fs/lvm2/files/device-mapper.rc-r3 index 79fdff246fb7..79fdff246fb7 100644 --- a/sys-fs/lvm2/files/device-mapper.rc-2.02.105-r2 +++ b/sys-fs/lvm2/files/device-mapper.rc-r3 diff --git a/sys-fs/lvm2/files/dmeventd.initd-2.02.184-r2 b/sys-fs/lvm2/files/dmeventd.initd-r3 index bc08c0a94f41..bc08c0a94f41 100644 --- a/sys-fs/lvm2/files/dmeventd.initd-2.02.184-r2 +++ b/sys-fs/lvm2/files/dmeventd.initd-r3 diff --git a/sys-fs/lvm2/files/lvm-monitoring.initd-2.02.105-r2 b/sys-fs/lvm2/files/lvm-monitoring.initd-r3 index 914d6637c7a6..914d6637c7a6 100644 --- a/sys-fs/lvm2/files/lvm-monitoring.initd-2.02.105-r2 +++ b/sys-fs/lvm2/files/lvm-monitoring.initd-r3 diff --git a/sys-fs/lvm2/files/lvm.confd-2.02.184-r3 b/sys-fs/lvm2/files/lvm.confd-r4 index b29e1702b35d..b29e1702b35d 100644 --- a/sys-fs/lvm2/files/lvm.confd-2.02.184-r3 +++ b/sys-fs/lvm2/files/lvm.confd-r4 diff --git a/sys-fs/lvm2/files/lvm.rc-2.02.187 b/sys-fs/lvm2/files/lvm.rc-r1 index 3468adc90f61..3468adc90f61 100644 --- a/sys-fs/lvm2/files/lvm.rc-2.02.187 +++ b/sys-fs/lvm2/files/lvm.rc-r1 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-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-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" <robbat2@gentoo.org> -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.02.67-createinitrd.patch b/sys-fs/lvm2/files/lvm2-2.03.20-createinitrd.patch index 7f0bfb894f02..7f0bfb894f02 100644 --- a/sys-fs/lvm2/files/lvm2-2.02.67-createinitrd.patch +++ b/sys-fs/lvm2/files/lvm2-2.03.20-createinitrd.patch 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.20-dm_lvm_rules_no_systemd.patch index e39d7959b331..e39d7959b331 100644 --- a/sys-fs/lvm2/files/lvm2-2.03.19-dm_lvm_rules_no_systemd.patch +++ b/sys-fs/lvm2/files/lvm2-2.03.20-dm_lvm_rules_no_systemd.patch diff --git a/sys-fs/lvm2/files/lvm2-2.03.19-dmeventd-no-idle-exit.patch b/sys-fs/lvm2/files/lvm2-2.03.20-dmeventd-no-idle-exit.patch index b7030ccc084d..b7030ccc084d 100644 --- a/sys-fs/lvm2/files/lvm2-2.03.19-dmeventd-no-idle-exit.patch +++ b/sys-fs/lvm2/files/lvm2-2.03.20-dmeventd-no-idle-exit.patch diff --git a/sys-fs/lvm2/files/lvm2-2.03.17-example.conf.in.patch b/sys-fs/lvm2/files/lvm2-2.03.20-example.conf.in.patch index b63b681e5fab..b63b681e5fab 100644 --- a/sys-fs/lvm2/files/lvm2-2.03.17-example.conf.in.patch +++ b/sys-fs/lvm2/files/lvm2-2.03.20-example.conf.in.patch diff --git a/sys-fs/lvm2/files/lvm2-2.03.19-freopen-musl.patch b/sys-fs/lvm2/files/lvm2-2.03.20-freopen-musl.patch index cc231d9251bd..cc231d9251bd 100644 --- a/sys-fs/lvm2/files/lvm2-2.03.19-freopen-musl.patch +++ b/sys-fs/lvm2/files/lvm2-2.03.20-freopen-musl.patch diff --git a/sys-fs/lvm2/files/lvm2-2.03.17-locale-muck.patch b/sys-fs/lvm2/files/lvm2-2.03.20-locale-muck.patch index c672a10e2cf6..c672a10e2cf6 100644 --- a/sys-fs/lvm2/files/lvm2-2.03.17-locale-muck.patch +++ b/sys-fs/lvm2/files/lvm2-2.03.20-locale-muck.patch diff --git a/sys-fs/lvm2/files/lvm2-2.02.56-lvm2create_initrd.patch b/sys-fs/lvm2/files/lvm2-2.03.20-lvm2create_initrd.patch index 59aaa9b34a08..59aaa9b34a08 100644 --- a/sys-fs/lvm2/files/lvm2-2.02.56-lvm2create_initrd.patch +++ b/sys-fs/lvm2/files/lvm2-2.03.20-lvm2create_initrd.patch diff --git a/sys-fs/lvm2/files/lvmlockd.initd-2.02.166-r1 b/sys-fs/lvm2/files/lvmlockd.initd-r2 index 8b5986fae242..8b5986fae242 100644 --- a/sys-fs/lvm2/files/lvmlockd.initd-2.02.166-r1 +++ b/sys-fs/lvm2/files/lvmlockd.initd-r2 diff --git a/sys-fs/lvm2/files/lvmpolld.initd-2.02.183 b/sys-fs/lvm2/files/lvmpolld.initd-r1 index 6b260109a668..6b260109a668 100644 --- a/sys-fs/lvm2/files/lvmpolld.initd-2.02.183 +++ b/sys-fs/lvm2/files/lvmpolld.initd-r1 |