From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 256D6158086 for ; Wed, 20 Oct 2021 12:20:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 74BBDE083D; Wed, 20 Oct 2021 12:20:34 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4A70AE083D for ; Wed, 20 Oct 2021 12:20:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1E4CF343617 for ; Wed, 20 Oct 2021 12:20:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8BF9710A for ; Wed, 20 Oct 2021 12:20:31 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1634732425.64f3d67b87fc69c50d285b463e533173208f0f7f.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/lvm2/files/, sys-fs/lvm2/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/lvm2/Manifest sys-fs/lvm2/files/lvm2-2.03.12-static-pkgconfig-libs.patch sys-fs/lvm2/files/lvm2-2.03.14-static-pkgconfig-libs.patch sys-fs/lvm2/lvm2-2.03.13-r2.ebuild sys-fs/lvm2/lvm2-2.03.14.ebuild X-VCS-Directories: sys-fs/lvm2/ sys-fs/lvm2/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 64f3d67b87fc69c50d285b463e533173208f0f7f X-VCS-Branch: master Date: Wed, 20 Oct 2021 12:20:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8c2ce42f-c09f-444a-9a39-b5efa4dafc95 X-Archives-Hash: e222444c84f195c1119d2d984e03b070 commit: 64f3d67b87fc69c50d285b463e533173208f0f7f Author: Lars Wendler gentoo org> AuthorDate: Wed Oct 20 12:19:27 2021 +0000 Commit: Lars Wendler gentoo org> CommitDate: Wed Oct 20 12:20:25 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64f3d67b sys-fs/lvm2: Bump to version 2.03.14. Removed old Signed-off-by: Lars Wendler gentoo.org> sys-fs/lvm2/Manifest | 2 +- ...ch => lvm2-2.03.14-static-pkgconfig-libs.patch} | 43 +++++++++++++--------- ...{lvm2-2.03.13-r2.ebuild => lvm2-2.03.14.ebuild} | 2 +- 3 files changed, 27 insertions(+), 20 deletions(-) diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest index 184ba81578f..f62db729f46 100644 --- a/sys-fs/lvm2/Manifest +++ b/sys-fs/lvm2/Manifest @@ -1,2 +1,2 @@ DIST LVM2.2.02.188.tgz 2421550 BLAKE2B bed90c8454cd4b20fdeec6dcbf5a9f97c9310671aea3b2252f8069cfa439fcb050f5ad95f928a7125a1734a4dc5ac985da99a4a570538e377a7205191a505476 SHA512 8c9db17c49dc8ebcab6c7f246ab85870a80658be811cf7f4d8f36abbebafa355b030bfc1e3bcbad73ccccb7fcd06d4a95ac547ca15d18d33715126da92703dca -DIST LVM2.2.03.13.tgz 2619537 BLAKE2B 8f93896105e4d392ab88f027bbc0ea874b179a73d10ff8d0850ead2625e86468fe69d55c6fb0108f57a1efc1d3e8cc94647f1bc06636e4a714d0817224bbbfd7 SHA512 8b4fb6da5dd46ddeb754436189072bea79be594fab6d57d9be63c6ce3e3cb68d38601a2c031c493681321281cfb1f1459ace19974c00beb569364f44863cfc4a +DIST LVM2.2.03.14.tgz 2639538 BLAKE2B 806f5e9cb76a05febef6f8ce8cfc42c92927b9538f62a21029c5ffc426a4fd7c3f32709be08dbd8028b53891b1075d1d13cb3b0d7b1815071ee8eb927d8f3ed3 SHA512 6a93bed1d5cf36f0f48d4d413d028b0e480cd4fc20e25d173770a892f265d2a0cc68d01a720b1513469953649e989532cd0c45f9538f92a4190eb3dc4555857d diff --git a/sys-fs/lvm2/files/lvm2-2.03.12-static-pkgconfig-libs.patch b/sys-fs/lvm2/files/lvm2-2.03.14-static-pkgconfig-libs.patch similarity index 82% rename from sys-fs/lvm2/files/lvm2-2.03.12-static-pkgconfig-libs.patch rename to sys-fs/lvm2/files/lvm2-2.03.14-static-pkgconfig-libs.patch index 083a7327c6a..e259547a47b 100644 --- a/sys-fs/lvm2/files/lvm2-2.03.12-static-pkgconfig-libs.patch +++ b/sys-fs/lvm2/files/lvm2-2.03.14-static-pkgconfig-libs.patch @@ -1,4 +1,4 @@ -From 88aeb306dfd1e0174bf02cc208d46f0d722204dc Mon Sep 17 00:00:00 2001 +From ac7cce039825ff779795b5c2ae0ecf00ba43a401 Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sun, 9 May 2021 11:00:22 +0200 Subject: [PATCH] Use pkgconfig to detect static libs @@ -9,10 +9,10 @@ Subject: [PATCH] Use pkgconfig to detect static libs 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac -index 354b53b5ec..e872d70256 100644 +index 6cdf1a7e65..90452ebf7c 100644 --- a/configure.ac +++ b/configure.ac -@@ -1097,6 +1097,7 @@ if test "$BLKID_WIPING" != no; then +@@ -1168,6 +1168,7 @@ if test "$BLKID_WIPING" != no; then PKG_CHECK_MODULES(BLKID, blkid >= 2.24, [ BLKID_WIPING=yes BLKID_PC="blkid" @@ -20,7 +20,7 @@ index 354b53b5ec..e872d70256 100644 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 -@@ -1145,6 +1146,7 @@ AC_MSG_RESULT($UDEV_SYNC) +@@ -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"]) @@ -28,7 +28,7 @@ index 354b53b5ec..e872d70256 100644 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, -@@ -1369,19 +1371,30 @@ dnl -- Check for selinux +@@ -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.]) @@ -61,7 +61,7 @@ index 354b53b5ec..e872d70256 100644 fi ################################################################################ -@@ -1755,6 +1768,7 @@ AC_DEFINE_UNQUOTED(LVM_CONFIGURE_LINE, "$CONFIGURE_LINE", [configure command lin +@@ -1834,6 +1847,7 @@ AC_ARG_VAR([UDEV_LIBS], [linker flags for udev]) ################################################################################ AC_SUBST(AWK) AC_SUBST(BLKID_PC) @@ -69,15 +69,15 @@ index 354b53b5ec..e872d70256 100644 AC_SUBST(BUILD_CMIRRORD) AC_SUBST(BUILD_DMEVENTD) AC_SUBST(BUILD_LVMDBUSD) -@@ -1857,6 +1871,7 @@ AC_SUBST(SALCK_LIBS) +@@ -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(SYSTEMD_LIBS) AC_SUBST(SNAPSHOTS) -@@ -1875,6 +1890,7 @@ AC_SUBST(CACHE_REPAIR_CMD) + 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) @@ -86,7 +86,7 @@ index 354b53b5ec..e872d70256 100644 AC_SUBST(UDEV_SYSTEMD_BACKGROUND_JOBS) AC_SUBST(UDEV_RULE_EXEC_DETECTION) diff --git a/make.tmpl.in b/make.tmpl.in -index 99f02e8b77..ae189546d0 100644 +index cccda10d6f..bf6c3e5596 100644 --- a/make.tmpl.in +++ b/make.tmpl.in @@ -64,7 +64,7 @@ PYCOMPILE = $(top_srcdir)/autoconf/py-compile @@ -98,20 +98,27 @@ index 99f02e8b77..ae189546d0 100644 DEFS += @DEFS@ # FIXME set this only where it's needed, not globally? CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@ -@@ -83,10 +83,13 @@ PTHREAD_LIBS = @PTHREAD_LIBS@ +@@ -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@ - EDITLINE_LIBS = @EDITLINE_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@ - BLKID_CFLAGS = @BLKID_CFLAGS@ - BLKID_LIBS = @BLKID_LIBS@ -+BLKID_STATIC_LIBS = @BLKID_STATIC_LIBS@ - SYSTEMD_LIBS = @SYSTEMD_LIBS@ VALGRIND_CFLAGS = @VALGRIND_CFLAGS@ - USE_TRACKING = @USE_TRACKING@ + VALGRIND_LIBS = @VALGRIND_LIBS@ + -- -2.31.1 +2.33.1 diff --git a/sys-fs/lvm2/lvm2-2.03.13-r2.ebuild b/sys-fs/lvm2/lvm2-2.03.14.ebuild similarity index 99% rename from sys-fs/lvm2/lvm2-2.03.13-r2.ebuild rename to sys-fs/lvm2/lvm2-2.03.14.ebuild index f23621e8619..1cc2795b71b 100644 --- a/sys-fs/lvm2/lvm2-2.03.13-r2.ebuild +++ b/sys-fs/lvm2/lvm2-2.03.14.ebuild @@ -63,7 +63,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373 #"${FILESDIR}"/${PN}-2.02.178-asneeded.patch # -Wl,--as-needed "${FILESDIR}"/${PN}-2.03.12-dynamic-static-ldflags.patch #332905 - "${FILESDIR}"/${PN}-2.03.12-static-pkgconfig-libs.patch #370217, #439414 + blkid + "${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.05-pthread-pkgconfig.patch #492450 "${FILESDIR}"/${PN}-2.03.12-static-libm.patch #617756