commit: 06f57fe3cc02c4140bc2d79553e4fd740f0cc5da Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Jun 24 20:16:15 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Jun 30 18:08:00 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06f57fe3
sys-libs/libblockdev: drop 3.1.1-r1, 3.3.0-r1 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> sys-libs/libblockdev/Manifest | 2 - .../files/libblockdev-3.3.0-CVE-2025-6019.patch | 24 --- sys-libs/libblockdev/libblockdev-3.1.1-r1.ebuild | 138 ----------------- sys-libs/libblockdev/libblockdev-3.3.0-r1.ebuild | 166 --------------------- 4 files changed, 330 deletions(-) diff --git a/sys-libs/libblockdev/Manifest b/sys-libs/libblockdev/Manifest index a6f9bfe5dfb0..759198e5e9eb 100644 --- a/sys-libs/libblockdev/Manifest +++ b/sys-libs/libblockdev/Manifest @@ -1,4 +1,2 @@ DIST libblockdev-2.29.tar.gz 935117 BLAKE2B 774062459602a6f3730ac6e694b3f535daf0258cc5f509ff138bb8c15f44ff46bdc08e32ae1957909b51a191726cf5e9cb418c0317e5178300687947704cf5e0 SHA512 0d9637800b189f3824483010d2ff079da11b15ed0b42c578352a0d3cd9c35dab4e5945a3cc31c17ea6f88637548151fc7cf237ac8e9c98edfc7b7bce1a756e01 -DIST libblockdev-3.1.1.tar.gz 1056270 BLAKE2B b3dbdc7226524d544193b609ced8a9fee725268ba2201b639c22103fcae6d047c94fb1b848e489525300242cb235d688934193894a06279a4dc0e0b33dff6e96 SHA512 44628d9e68a467f8a5d5e65e12d5d6ffb4d9b953c846acd9f6da257eab5ccd79309651d6b20092fa700fb4340f1f718ceef11141203da676d088824aa9d03481 -DIST libblockdev-3.3.0.tar.gz 1157061 BLAKE2B 42166d0a370b0370b32992208727ba99ae20ac8eee0243d29954f2f45339563e5ca2531f015f5b02dc73e0b10faa637b12adeec0568e5c3fbbf840ef69741b44 SHA512 01a980e64ef628ab0f82626a3501f4c157401b56f0ef6e34f91e9f33cb1fd663eb1f56b3563fdee6cd6b431c118bc9be141226867ea765cc703bf3010f10378f DIST libblockdev-3.3.1.tar.gz 1160139 BLAKE2B 4baf4f980df4a71faf085f9e94cd18b0eb64f3f8f0fd68c3bd20b54109709c7cd3aca26cedfa1a8ec9ae4fd44df55a5d4237c3d3fc61a58dbd5288da6f0c0189 SHA512 f9cc15bf19120a8bb77efe82889b15c9435f4c94a1ed677839a1bcfe5bd242719f40221ba2685f4376cc52ec1e8a044f93840cb504fd7574fff1a8dd5e85d477 diff --git a/sys-libs/libblockdev/files/libblockdev-3.3.0-CVE-2025-6019.patch b/sys-libs/libblockdev/files/libblockdev-3.3.0-CVE-2025-6019.patch deleted file mode 100644 index f893e0ab00e9..000000000000 --- a/sys-libs/libblockdev/files/libblockdev-3.3.0-CVE-2025-6019.patch +++ /dev/null @@ -1,24 +0,0 @@ -https://bugs.gentoo.org/958339 -https://www.openwall.com/lists/oss-security/2025/06/17/5 -https://www.openwall.com/lists/oss-security/2025/06/17/5/1 - -From 8e072f794744bd17c57cceabb3884d3f0f6a1602 Mon Sep 17 00:00:00 2001 -From: Thomas Blume <[email protected]> -Date: Fri, 16 May 2025 14:27:10 +0200 -Subject: [PATCH] dont allow suid and dev set on fs resize - ---- a/src/plugins/fs/generic.c -+++ b/src/plugins/fs/generic.c -@@ -683,7 +683,9 @@ static gchar* fs_mount (const gchar *device, gchar *fstype, gboolean read_only, - "Failed to create temporary directory for mounting '%s'.", device); - return NULL; - } -- ret = bd_fs_mount (device, mountpoint, fstype, read_only ? "ro" : NULL, NULL, &l_error); -+ -+ ret = bd_fs_mount (device, mountpoint, fstype, read_only ? "nosuid,nodev,ro" : "nosuid,nodev", NULL, &l_error); -+ - if (!ret) { - g_propagate_prefixed_error (error, l_error, "Failed to mount '%s': ", device); - g_rmdir (mountpoint); --- -2.48.1 diff --git a/sys-libs/libblockdev/libblockdev-3.1.1-r1.ebuild b/sys-libs/libblockdev/libblockdev-3.1.1-r1.ebuild deleted file mode 100644 index 9eb8890f9b53..000000000000 --- a/sys-libs/libblockdev/libblockdev-3.1.1-r1.ebuild +++ /dev/null @@ -1,138 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..13} ) -inherit autotools python-single-r1 xdg-utils - -DESCRIPTION="A library for manipulating block devices" -HOMEPAGE="https://github.com/storaged-project/libblockdev"; -if [[ "${PV}" == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/storaged-project/libblockdev.git"; - BDEPEND=" - dev-build/autoconf-archive - " -else - MY_PV="${PV}-1" - SRC_URI="https://github.com/storaged-project/${PN}/releases/download/${MY_PV}/${P}.tar.gz"; - KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86" -fi -LICENSE="LGPL-2+" -SLOT="0/3" # subslot is SOVERSION -IUSE="+cryptsetup device-mapper escrow gtk-doc introspection lvm +nvme test +tools" -RESTRICT="!test? ( test )" - -# sys-fs/e2fsprogs: required by --with-fs -# virtual/libudev: required at top-level -RDEPEND=" - >=dev-libs/glib-2.42.2 - dev-libs/libbytesize - sys-apps/gptfdisk - >=sys-apps/kmod-19 - >=sys-apps/util-linux-2.27 - sys-fs/e2fsprogs:= - virtual/libudev:= - cryptsetup? ( - escrow? ( - >=dev-libs/nss-3.18.0 - dev-libs/volume_key - ) - >=sys-apps/keyutils-1.5.0:= - >=sys-fs/cryptsetup-2.3.0:= - ) - device-mapper? ( sys-fs/lvm2 ) - lvm? ( - sys-fs/lvm2 - virtual/udev - ) - nvme? ( sys-libs/libnvme ) - tools? ( - >=sys-block/parted-3.1 - ) - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/pygobject:3[${PYTHON_USEDEP}] - ') -" - -DEPEND="${RDEPEND}" - -BDEPEND+=" - dev-build/gtk-doc-am - gtk-doc? ( dev-util/gtk-doc ) - introspection? ( >=dev-libs/gobject-introspection-1.3.0 ) - test? ( - $(python_gen_cond_dep ' - dev-libs/libbytesize[python,${PYTHON_USEDEP}] - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - ') - sys-apps/lsb-release - sys-block/targetcli-fb - ) -" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - escrow? ( cryptsetup ) - test? ( introspection lvm ) -" - -PATCHES=( - "${FILESDIR}/libblockdev-3.0.4-add-non-systemd-method-for-distro-info.patch" -) - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - xdg_environment_reset #623992 - default - - # https://bugs.gentoo.org/744289 - find -type f \( -name "Makefile.am" -o -name "configure.ac" \) -print0 \ - | xargs --null sed "s@ -Werror@@" -i || die - - eautoreconf -} - -src_configure() { - local myeconfargs=( - --with-btrfs - --with-fs - --with-part - --with-python3 - --without-mpath - --without-nvdimm - $(use_enable introspection) - $(use_enable test tests) - $(use_with cryptsetup crypto) - $(use_with device-mapper dm) - $(use_with escrow) - $(use_with gtk-doc) - $(use_with lvm lvm) - $(use_with lvm lvm-dbus) - $(use_with nvme) - $(use_with tools) - ) - econf "${myeconfargs[@]}" -} - -src_test() { - # See http://storaged.org/libblockdev/ch03.html - # Largest subset which doesn't require root priviledges - ${EPYTHON} tests/run_tests.py --include-tags extradeps sourceonly || die -} - -src_install() { - default - find "${ED}" -type f -name "*.la" -delete || die - # This is installed even with USE=-lvm, but libbd_lvm are omitted so it - # doesn't work at all. - if ! use lvm ; then - rm -f "${ED}"/usr/bin/lvm-cache-stats || die - fi - python_optimize #718576 -} diff --git a/sys-libs/libblockdev/libblockdev-3.3.0-r1.ebuild b/sys-libs/libblockdev/libblockdev-3.3.0-r1.ebuild deleted file mode 100644 index 8a5972b2e740..000000000000 --- a/sys-libs/libblockdev/libblockdev-3.3.0-r1.ebuild +++ /dev/null @@ -1,166 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{11..13} ) -inherit autotools python-single-r1 xdg-utils - -DESCRIPTION="Library for manipulating block devices" -HOMEPAGE="https://github.com/storaged-project/libblockdev"; - -if [[ ${PV} == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/storaged-project/libblockdev.git"; - BDEPEND=" - dev-build/autoconf-archive - " -else - SRC_URI="https://github.com/storaged-project/${PN}/releases/download/${PV}/${P}.tar.gz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" -fi - -LICENSE="LGPL-2+" -SLOT="0/3" # subslot is SOVERSION -IUSE="+cryptsetup device-mapper escrow gtk-doc introspection lvm +nvme python smart test +tools" -RESTRICT="!test? ( test )" - -# sys-fs/e2fsprogs: required by --with-fs -# virtual/libudev: required at top-level -RDEPEND=" - >=dev-libs/glib-2.42.2 - >=dev-libs/libbytesize-0.1 - sys-apps/gptfdisk - >=sys-apps/kmod-19 - >=sys-apps/util-linux-2.30 - sys-fs/e2fsprogs:= - virtual/libudev:= - cryptsetup? ( - >=sys-apps/keyutils-1.5.0:= - >=sys-fs/cryptsetup-2.7.0:= - escrow? ( - >=dev-libs/nss-3.18.0 - dev-libs/volume_key - ) - ) - device-mapper? ( sys-fs/lvm2 ) - lvm? ( - dev-libs/libyaml - sys-fs/lvm2 - virtual/udev - ) - nvme? ( >=sys-libs/libnvme-1.3:= ) - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/pygobject:3[${PYTHON_USEDEP}] - ') - ) - smart? ( - >=dev-libs/json-glib-1.0 - sys-apps/smartmontools - ) - tools? ( - >=sys-block/parted-3.2 - ) -" -DEPEND="${RDEPEND}" -BDEPEND+=" - dev-build/gtk-doc-am - gtk-doc? ( dev-util/gtk-doc ) - introspection? ( >=dev-libs/gobject-introspection-1.3.0 ) - test? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-libs/libbytesize[python,${PYTHON_USEDEP}] - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - ') - sys-apps/lsb-release - sys-block/targetcli-fb - ) -" - -REQUIRED_USE=" - python? ( ${PYTHON_REQUIRED_USE} ) - test? ( ${PYTHON_REQUIRED_USE} ) - escrow? ( cryptsetup ) - test? ( introspection lvm ) -" - -PATCHES=( - "${FILESDIR}/${PN}-3.0.4-add-non-systemd-method-for-distro-info.patch" - "${FILESDIR}/${PN}-3.3.0-fix-bashism.patch" - "${FILESDIR}/${PN}-3.3.0-tests-skip-vdo.patch" - "${FILESDIR}/${PN}-3.3.0-tests-nvme.patch" - "${FILESDIR}/${PN}-3.3.0-CVE-2025-6019.patch" -) - -pkg_setup() { - if use python || use test ; then - python-single-r1_pkg_setup - fi -} - -src_prepare() { - default - - xdg_environment_reset # bug #623992 - - # bug #744289 - find -type f \( -name "Makefile.am" -o -name "configure.ac" \) -print0 \ - | xargs --null sed "s@ -Werror@@" -i || die - - eautoreconf -} - -src_configure() { - local myeconfargs=( - --with-btrfs - --with-fs - --with-part - --without-mpath - --without-nvdimm - # dev-libs/libatasmart is inactive upstream, so we just - # have USE=smart control sys-apps/smartmontools use. - --without-smart - - $(use_enable introspection) - $(use_enable test tests) - $(use_with cryptsetup crypto) - $(use_with device-mapper dm) - $(use_with escrow) - $(use_with gtk-doc) - $(use_with lvm lvm) - $(use_with lvm lvm-dbus) - $(use_with nvme) - $(use_with python python3) - $(use_with smart smartmontools) - $(use_with tools) - ) - - econf "${myeconfargs[@]}" -} - -src_test() { - # See http://storaged.org/libblockdev/ch03.html - # Largest subset which doesn't require root priviledges - "${EPYTHON}" tests/run_tests.py --include-tags extradeps sourceonly || die -} - -src_install() { - default - - find "${ED}" -type f -name "*.la" -delete || die - - # This is installed even with USE=-lvm, but libbd_lvm are omitted so it - # doesn't work at all. - if ! use lvm ; then - rm -f "${ED}"/usr/bin/lvm-cache-stats || die - fi - - # bug #718576 - if use python ; then - python_optimize - fi -}
