commit: 50cdc115fe2fcf6b96a88e071eccb7b1b0f86586 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Thu May 2 15:19:10 2024 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Thu May 2 15:21:27 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50cdc115
sys-fs/lvm2: backport fix for thin-provisioning-tools version check Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> .../files/lvm2-2.03.22-thin-version-checking.patch | 59 ++++++++++++++++++++++ ...m2-2.03.22-r4.ebuild => lvm2-2.03.22-r5.ebuild} | 1 + 2 files changed, 60 insertions(+) diff --git a/sys-fs/lvm2/files/lvm2-2.03.22-thin-version-checking.patch b/sys-fs/lvm2/files/lvm2-2.03.22-thin-version-checking.patch new file mode 100644 index 000000000000..28d901bc7d61 --- /dev/null +++ b/sys-fs/lvm2/files/lvm2-2.03.22-thin-version-checking.patch @@ -0,0 +1,59 @@ +From f117d47ffa781f7f1ad452505c250b4826cdcc7f Mon Sep 17 00:00:00 2001 +From: Zdenek Kabelac <[email protected]> +Date: Tue, 10 Oct 2023 22:03:50 +0200 +Subject: [PATCH] configure.ac: version checking for new dmpd tools + +New rust version of thin_check returns now also binary name in version, +so adapt the version checking to handle this variant. +--- + configure.ac | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 1550f1f70..59d4b65af 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -426,6 +426,7 @@ AS_CASE(["$THIN"], + ]) + AS_IF([test "$THIN_CHECK_NEEDS_CHECK" = "yes" && test "$THIN_CONFIGURE_WARN" != "y"], [ + THIN_CHECK_VSN=$("$THIN_CHECK_CMD" -V 2>/dev/null) ++ THIN_CHECK_VSN=${THIN_CHECK_VSN##* } # trim away all before the first space + THIN_CHECK_VSN_MAJOR=$(echo "$THIN_CHECK_VSN" | $AWK -F '.' '{print $1}') + THIN_CHECK_VSN_MINOR=$(echo "$THIN_CHECK_VSN" | $AWK -F '.' '{print $2}') + +@@ -467,7 +468,7 @@ AS_CASE(["$THIN"], + ]) + ]) + +- AC_MSG_CHECKING([whether thin_check supports the needs-check flag]) ++ AC_MSG_CHECKING([whether $THIN_CHECK_CMD ($THIN_CHECK_VSN_MAJOR.$THIN_CHECK_VSN_MINOR) supports the needs-check flag]) + AC_MSG_RESULT([$THIN_CHECK_NEEDS_CHECK]) + AS_IF([test "$THIN_CHECK_NEEDS_CHECK" = "yes"], [ + AC_DEFINE([THIN_CHECK_NEEDS_CHECK], 1, [Define to 1 if the external 'thin_check' tool requires the --clear-needs-check-flag option]) +@@ -537,12 +538,13 @@ AS_CASE(["$CACHE"], + ]) + ]) + AS_IF([test "$CACHE_CHECK_NEEDS_CHECK" = "yes" && test "$CACHE_CONFIGURE_WARN" != "y"], [ +- $CACHE_CHECK_CMD -V 2>/dev/null >conftest.tmp ++ "$CACHE_CHECK_CMD" -V 2>/dev/null >conftest.tmp + read -r CACHE_CHECK_VSN < conftest.tmp + IFS=.- read -r CACHE_CHECK_VSN_MAJOR CACHE_CHECK_VSN_MINOR CACHE_CHECK_VSN_PATCH LEFTOVER < conftest.tmp + rm -f conftest.tmp + + # Require version >= 0.5.4 for --clear-needs-check-flag ++ CACHE_CHECK_VSN_MAJOR=${CACHE_CHECK_VSN_MAJOR##* } + AS_IF([test -z "$CACHE_CHECK_VSN_MAJOR" \ + || test -z "$CACHE_CHECK_VSN_MINOR" \ + || test -z "$CACHE_CHECK_VSN_PATCH"], [ +@@ -590,7 +592,7 @@ AS_CASE(["$CACHE"], + ]) + ]) + +- AC_MSG_CHECKING([whether cache_check supports the needs-check flag]) ++ AC_MSG_CHECKING([whether $CACHE_CHECK_CMD ($CACHE_CHECK_VSN_MAJOR.$CACHE_CHECK_VSN_MINOR.$CACHE_CHECK_VSN_PATCH) supports the needs-check flag]) + AC_MSG_RESULT([$CACHE_CHECK_NEEDS_CHECK]) + AS_IF([test "$CACHE_CHECK_NEEDS_CHECK" = "yes"], [ + AC_DEFINE([CACHE_CHECK_NEEDS_CHECK], 1, [Define to 1 if the external 'cache_check' tool requires the --clear-needs-check-flag option]) +-- +2.45.0 + diff --git a/sys-fs/lvm2/lvm2-2.03.22-r4.ebuild b/sys-fs/lvm2/lvm2-2.03.22-r5.ebuild similarity index 99% rename from sys-fs/lvm2/lvm2-2.03.22-r4.ebuild rename to sys-fs/lvm2/lvm2-2.03.22-r5.ebuild index 42b6ae927976..5b95dd0b2940 100644 --- a/sys-fs/lvm2/lvm2-2.03.22-r4.ebuild +++ b/sys-fs/lvm2/lvm2-2.03.22-r5.ebuild @@ -69,6 +69,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.03.20-dmeventd-no-idle-exit.patch "${FILESDIR}"/${PN}-2.03.20-freopen-musl.patch "${FILESDIR}"/${PN}-2.03.22-autoconf-2.72-egrep.patch + "${FILESDIR}"/${PN}-2.03.22-thin-version-checking.patch ) pkg_setup() {
