From 37d22eeb1a7f3e8389de67a23fa2282384a0683c Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 24 Apr 2018 17:44:26 -0300 Subject: [PATCH] libblockdev: update to 2.17. --- srcpkgs/libblockdev/patches/fix-musl.patch | 34 ---------------------- srcpkgs/libblockdev/template | 7 +++-- 2 files changed, 4 insertions(+), 37 deletions(-) delete mode 100644 srcpkgs/libblockdev/patches/fix-musl.patch diff --git a/srcpkgs/libblockdev/patches/fix-musl.patch b/srcpkgs/libblockdev/patches/fix-musl.patch deleted file mode 100644 index 7000fabc235..00000000000 --- a/srcpkgs/libblockdev/patches/fix-musl.patch +++ /dev/null @@ -1,34 +0,0 @@ -Source: upstream -Reason: Fixes compilation in musl libc - ---- src/plugins/crypto.c -+++ src/plugins/crypto.c -@@ -22,7 +22,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- src/plugins/part.c -+++ src/plugins/part.c -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -1354,7 +1355,7 @@ static gboolean set_gpt_flags (const gchar *device, int part_num, guint64 flags, - real_flags |= 0x4000000000000000; /* 1 << 62 */ - if (flags & BD_PART_FLAG_GPT_NO_AUTOMOUNT) - real_flags |= 0x8000000000000000; /* 1 << 63 */ -- mask_str = g_strdup_printf ("%.16"__PRI64_PREFIX"x", real_flags); -+ mask_str = g_strdup_printf ("%.16"PRIx64, real_flags); - - args[2] = g_strdup_printf ("%d:=:%s", part_num, mask_str); - g_free (mask_str); - diff --git a/srcpkgs/libblockdev/template b/srcpkgs/libblockdev/template index 85108dbde82..868878cf2e4 100644 --- a/srcpkgs/libblockdev/template +++ b/srcpkgs/libblockdev/template @@ -1,17 +1,18 @@ # Template file for 'libblockdev' pkgname=libblockdev -version=2.16 +version=2.17 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" + libglib-devel libkmod-devel libparted-devel libndctl-devel nss-devel + volume_key-devel" short_desc="A library for manipulating block devices" maintainer="maxice8 " license="LGPL-2.1-or-later" homepage="https://github.com/storaged-project/libblockdev" distfiles="https://github.com/storaged-project/libblockdev/releases/download/${version}-1/libblockdev-${version}.tar.gz" -checksum=d841ae446cf6dc545e4f7386e13dfd8c3e07c4b6a962536b7c0fcd20e3a4d9e4 +checksum=49ed2ae9c5edf4f717560bbc9aa43b0a1ce9a0f2836350602fd8c2fc4a81f651 conf_files="/etc/libblockdev/conf.d/10-lvm-dbus.cfg /etc/libblockdev/conf.d/00-default.cfg"