From e063c40c82d24f1ea081bf5305373c74fc0fb790 Mon Sep 17 00:00:00 2001 From: Hunter Ellett Date: Mon, 25 Sep 2023 21:26:34 -0500 Subject: [PATCH 1/3] Update udisks2, libblockdev, and libnvme --- common/shlibs | 4 ++-- srcpkgs/libblockdev/template | 12 ++++++------ srcpkgs/libnvme/template | 4 ++-- srcpkgs/udisks2/template | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/common/shlibs b/common/shlibs index 9c2060bc45a67..ce9ef9e530e90 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1032,8 +1032,8 @@ libcryptsetup.so.12 libcryptsetup-2.3.4_2 libgusb.so.2 libgusb-0.1.3_1 libmash-0.2.so.0 mash-0.2.0_4 libbytesize.so.1 libbytesize-1.2_1 -libblockdev.so.2 libblockdev-2.16_1 -libbd_utils.so.2 libblockdev-2.16_1 +libblockdev.so.3 libblockdev-3.0.3_1 +libbd_utils.so.3 libblockdev-3.0.3_1 libndctl.so.6 libndctl-60.3_1 libdaxctl.so.1 libdaxctl-60.3_1 libudisks2.so.0 udisks2-1.93.0_1 diff --git a/srcpkgs/libblockdev/template b/srcpkgs/libblockdev/template index c3287673749eb..b1583dc46d2cb 100644 --- a/srcpkgs/libblockdev/template +++ b/srcpkgs/libblockdev/template @@ -1,22 +1,22 @@ # Template file for 'libblockdev' pkgname=libblockdev -version=2.28 +version=3.0.3 revision=1 build_style=gnu-configure hostmakedepends="pkg-config python3" makedepends="cryptsetup-devel device-mapper-devel dmraid-devel libbytesize-devel libglib-devel libkmod-devel libparted-devel nss-devel - volume_key-devel libyaml-devel pcre2-devel" + volume_key-devel libyaml-devel pcre2-devel libfdisk-devel + e2fsprogs-devel libnvme-devel keyutils-devel" short_desc="Library for manipulating block devices" maintainer="Orphaned " license="LGPL-2.1-or-later" homepage="https://github.com/storaged-project/libblockdev" # changelog needs to be adjusted on major version changes -changelog="https://raw.githubusercontent.com/storaged-project/libblockdev/2.x-branch/NEWS.rst" +changelog="https://raw.githubusercontent.com/storaged-project/libblockdev/master/NEWS.rst" distfiles="https://github.com/storaged-project/libblockdev/releases/download/${version}-1/libblockdev-${version}.tar.gz" -checksum=82c9c841e28a74fecadedebfae6a772df623cecdf652e5376650fa26da5b7df4 -conf_files="/etc/libblockdev/conf.d/10-lvm-dbus.cfg - /etc/libblockdev/conf.d/00-default.cfg" +checksum=0f2872830293f3e222832903d80de4c38e06a9c3ea18915b3263272a72095ea8 +conf_files="/etc/libblockdev/3/conf.d/10-lvm-dbus.cfg /etc/libblockdev/3/conf.d/00-default.cfg" CFLAGS="-Wl,-lpcre2-8" diff --git a/srcpkgs/libnvme/template b/srcpkgs/libnvme/template index b0bccfcf5cd36..afc8b5599cec0 100644 --- a/srcpkgs/libnvme/template +++ b/srcpkgs/libnvme/template @@ -1,6 +1,6 @@ # Template file for 'libnvme' pkgname=libnvme -version=1.2 +version=1.5 revision=2 build_style=meson configure_args="-Ddocs=man" @@ -12,7 +12,7 @@ maintainer="Subhaditya Nath " license="LGPL-2.1-or-later" homepage="https://github.com/linux-nvme/libnvme" distfiles="https://github.com/linux-nvme/libnvme/archive/v${version}.tar.gz" -checksum=2697c86e9d8597fcd264f8bf8af57a529346efa4f611ca2be855e3aa89b9eb2c +checksum=f73ba1edde059b2d5e7c1048ad4f895e6047bff241c94b34a7aff5894779d086 libnvme-devel_package() { depends="${sourcepkg}>=${version}_${revision} json-c-devel openssl-devel" diff --git a/srcpkgs/udisks2/template b/srcpkgs/udisks2/template index 419a732657e74..88a5df6398647 100644 --- a/srcpkgs/udisks2/template +++ b/srcpkgs/udisks2/template @@ -1,6 +1,6 @@ # Template file for 'udisks2' pkgname=udisks2 -version=2.9.4 +version=2.10.1 revision=1 build_style=gnu-configure build_helper="gir" @@ -11,14 +11,14 @@ configure_args="--disable-static --with-udevdir=/usr/lib/udev hostmakedepends="docbook-xsl gettext glib-devel libxslt pkg-config $(vopt_if gir 'gobject-introspection') polkit" makedepends="acl-devel libatasmart-devel libgudev-devel libparted-devel - polkit-devel sg3_utils-devel libblockdev-devel libbtrfs-devel elogind-devel" + polkit-devel sg3_utils-devel libblockdev-devel libbtrfs-devel" short_desc="Disk Management Service, version 2" maintainer="Érico Nogueira " license="GPL-2.0-or-later" homepage="https://www.freedesktop.org/wiki/Software/udisks" changelog="https://raw.githubusercontent.com/storaged-project/udisks/master/NEWS" distfiles="https://github.com/storaged-project/udisks/releases/download/udisks-${version}/udisks-${version}.tar.bz2" -checksum=b6b60ebab0d5e09624120c5d158882e87d8c2473db60783b63deeba74cb18d1c +checksum=b75734ccf602540dedb4068bec206adcb508a4c003725e117ae8f994d92d8ece make_dirs="/var/lib/udisks2 0750 root root" conf_files="/etc/udisks2/udisks2.conf" From 72990b2d0e264e5d4da61ef6b1f21ddfb727d9c2 Mon Sep 17 00:00:00 2001 From: Hunter Ellett Date: Tue, 26 Sep 2023 08:46:50 -0500 Subject: [PATCH 2/3] Fix revision error in lint process --- srcpkgs/libnvme/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libnvme/template b/srcpkgs/libnvme/template index afc8b5599cec0..a0159afedbb9c 100644 --- a/srcpkgs/libnvme/template +++ b/srcpkgs/libnvme/template @@ -1,7 +1,7 @@ # Template file for 'libnvme' pkgname=libnvme version=1.5 -revision=2 +revision=1 build_style=meson configure_args="-Ddocs=man" hostmakedepends="pkg-config swig" From b77d5340573532d3c3f2e76c1ba9b243f8413510 Mon Sep 17 00:00:00 2001 From: Hunter Ellett Date: Wed, 27 Sep 2023 08:57:15 -0500 Subject: [PATCH 3/3] Re-add elogind dependency as default option --- srcpkgs/udisks2/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/udisks2/template b/srcpkgs/udisks2/template index 88a5df6398647..c9dca0dfa0ee2 100644 --- a/srcpkgs/udisks2/template +++ b/srcpkgs/udisks2/template @@ -11,7 +11,7 @@ configure_args="--disable-static --with-udevdir=/usr/lib/udev hostmakedepends="docbook-xsl gettext glib-devel libxslt pkg-config $(vopt_if gir 'gobject-introspection') polkit" makedepends="acl-devel libatasmart-devel libgudev-devel libparted-devel - polkit-devel sg3_utils-devel libblockdev-devel libbtrfs-devel" + polkit-devel sg3_utils-devel libblockdev-devel libbtrfs-devel $(vopt_if elogind elogind-devel)" short_desc="Disk Management Service, version 2" maintainer="Érico Nogueira " license="GPL-2.0-or-later" @@ -23,8 +23,8 @@ make_dirs="/var/lib/udisks2 0750 root root" conf_files="/etc/udisks2/udisks2.conf" # Package build options -build_options="gir" -build_options_default="gir" +build_options="gir elogind" +build_options_default="gir elogind" udisks2-devel_package() { depends="libglib-devel ${sourcepkg}>=${version}_${revision}"