From 18b110b1fe8dbac9bc67ed1c2fff6a045a98c75a Mon Sep 17 00:00:00 2001 From: Subhaditya Nath Date: Thu, 16 Feb 2023 01:30:48 +0530 Subject: [PATCH 1/4] libnvme: update to 1.5. --- srcpkgs/libnvme/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libnvme/template b/srcpkgs/libnvme/template index b628be9cabb9..cec7587c3e3a 100644 --- a/srcpkgs/libnvme/template +++ b/srcpkgs/libnvme/template @@ -1,9 +1,9 @@ # Template file for 'libnvme' pkgname=libnvme -version=1.2 +version=1.5 revision=1 build_style=meson -configure_args="-Ddocs=man" +configure_args="-Ddocs=man -Dlibdbus=disabled" hostmakedepends="pkg-config swig" makedepends="json-c-devel openssl-devel python3-devel" checkdepends="perl" @@ -11,8 +11,9 @@ short_desc="C Library for NVM Express on Linux" maintainer="Subhaditya Nath " license="LGPL-2.1-or-later" homepage="https://github.com/linux-nvme/libnvme" +changelog="https://github.com/linux-nvme/libnvme/releases" 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" From cb6cb6ea27f90edc17bb4e8585d7e3943a4b702a Mon Sep 17 00:00:00 2001 From: Subhaditya Nath Date: Thu, 16 Feb 2023 01:31:01 +0530 Subject: [PATCH 2/4] nvme-cli: update to 2.5. --- srcpkgs/nvme-cli/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/nvme-cli/template b/srcpkgs/nvme-cli/template index 9564926f7555..8b5c4bc3d96c 100644 --- a/srcpkgs/nvme-cli/template +++ b/srcpkgs/nvme-cli/template @@ -1,17 +1,18 @@ # Template file for 'nvme-cli' pkgname=nvme-cli -version=2.2.1 +version=2.5 revision=1 build_style=meson configure_args="-Ddocs=man -Dudevrulesdir=lib/udev/rules.d" hostmakedepends="pkg-config" -makedepends="libnvme-devel zlib-devel json-c-devel" +makedepends="libnvme-devel json-c-devel" short_desc="NVMe management command line interface" maintainer="Subhaditya Nath " license="GPL-2.0-only" -homepage="http://nvmexpress.org" +homepage="https://nvmexpress.org" +changelog="https://github.com/linux-nvme/nvme-cli/releases" distfiles="https://github.com/linux-nvme/nvme-cli/archive/v${version}.tar.gz" -checksum=68720bc25c68adb93dafe1186de4fabbe40f8390ff1416256b52fe74f78259ae +checksum=e84bdba276aadcddda8cf5d412e934cc5673af15132ea02180deb5d06af73146 conf_files="/etc/nvme/*.conf" if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then From b0531a458b14d32906d17a513aad4d25f475763a Mon Sep 17 00:00:00 2001 From: triallax Date: Tue, 4 Jul 2023 13:38:42 +0100 Subject: [PATCH 3/4] libblockdev: update to 3.0. --- common/shlibs | 4 ++-- srcpkgs/libblockdev/template | 18 +++++++++++------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/common/shlibs b/common/shlibs index 4e6a5a663fa0..c032cbcbf049 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1034,8 +1034,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_1 +libbd_utils.so.3 libblockdev-3.0_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 c3287673749e..2071a838a15f 100644 --- a/srcpkgs/libblockdev/template +++ b/srcpkgs/libblockdev/template @@ -1,35 +1,39 @@ # Template file for 'libblockdev' pkgname=libblockdev -version=2.28 +version=3.0 revision=1 build_style=gnu-configure +make_check_target="test" 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" + libglib-devel libkmod-devel libparted-devel libfdisk-devel nss-devel + volume_key-devel pcre2-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 +checksum=80a07c9649907b7dd04dd7be535581c173a69f1aa4b65d3d352fdaddfee22d34 conf_files="/etc/libblockdev/conf.d/10-lvm-dbus.cfg /etc/libblockdev/conf.d/00-default.cfg" +# Requires root. +make_check=no CFLAGS="-Wl,-lpcre2-8" #ndctl not present on ppc case "$XBPS_TARGET_MACHINE" in - ppc|ppc-musl) + ppc*) configure_args+=" --without-nvdimm" ;; *) makedepends+=" libndctl-devel" ;; esac libblockdev-devel_package() { - depends="libblockdev>=${version}_${revision} ${makedepends}" + depends="${sourcepkg}>=${version}_${revision} libglib-devel" short_desc+=" - development files" pkg_install() { vmove usr/include From 06955fc3aab34ff6c755f8fef992d198619d6977 Mon Sep 17 00:00:00 2001 From: triallax Date: Tue, 4 Jul 2023 14:23:45 +0100 Subject: [PATCH 4/4] udisks2: update to 2.10.0. --- srcpkgs/udisks2/template | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/srcpkgs/udisks2/template b/srcpkgs/udisks2/template index 419a732657e7..90732e5a5360 100644 --- a/srcpkgs/udisks2/template +++ b/srcpkgs/udisks2/template @@ -1,15 +1,14 @@ # Template file for 'udisks2' pkgname=udisks2 -version=2.9.4 +version=2.10.0 revision=1 build_style=gnu-configure build_helper="gir" # zram module is disabled, since it requires systemd units configure_args="--disable-static --with-udevdir=/usr/lib/udev - --enable-lvm2 --enable-btrfs --enable-bcache --enable-vdo - --enable-lvmcache $(vopt_enable gir introspection)" + --enable-lvm2 --enable-btrfs $(vopt_enable gir introspection)" hostmakedepends="docbook-xsl gettext glib-devel libxslt pkg-config - $(vopt_if gir 'gobject-introspection') polkit" + polkit" makedepends="acl-devel libatasmart-devel libgudev-devel libparted-devel polkit-devel sg3_utils-devel libblockdev-devel libbtrfs-devel elogind-devel" short_desc="Disk Management Service, version 2" @@ -18,7 +17,7 @@ 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=4f5a7a592526f7f32795a1f2211c67b9a649ab40386752f9a71ebaa2fc2090bc make_dirs="/var/lib/udisks2 0750 root root" conf_files="/etc/udisks2/udisks2.conf"