From 1bde02995c017ffdc5d3ab75a5847f2808eb96e2 Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Jan 11 2021 13:34:07 +0000
Subject: Merged update from upstream sources


This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/libblockdev.git#08a065cdfde8ec79dcc3b83500741815eb1e617b

---

diff --git a/.gitignore b/.gitignore
index 0a50b5c..ae739c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,4 @@
 /libblockdev-2.22.tar.gz
 /libblockdev-2.23.tar.gz
 /libblockdev-2.24.tar.gz
+/libblockdev-2.25.tar.gz
diff --git a/libblockdev.spec b/libblockdev.spec
index 814bc8b..f0d6dbd 100644
--- a/libblockdev.spec
+++ b/libblockdev.spec
@@ -124,16 +124,16 @@
 %define configure_opts %{?python2_copts} %{?python3_copts} %{?bcache_copts} %{?lvm_dbus_copts} %{?btrfs_copts} %{?crypto_copts} %{?dm_copts} %{?loop_copts} %{?lvm_copts} %{?lvm_dbus_copts} %{?mdraid_copts} %{?mpath_copts} %{?swap_copts} %{?kbd_copts} %{?part_copts} %{?fs_copts} %{?nvdimm_copts} %{?vdo_copts} %{?tools_copts} %{?gi_copts}
 
 Name:        libblockdev
-Version:     2.24
-Release:     7%{?dist}
+Version:     2.25
+Release:     1%{?dist}
 Summary:     A library for low-level manipulation with block devices
 License:     LGPLv2+
 URL:         https://github.com/storaged-project/libblockdev
 Source0:     https://github.com/storaged-project/libblockdev/releases/download/%{version}-%{release}/%{name}-%{version}.tar.gz
 Patch0:      libblockdev-gcc11.patch
 Patch1:      0001-Fix-comparing-DM-RAID-member-devices-UUID.patch
-Patch2:      0002-Fix-setting-locale-for-util-calls.patch
 
+BuildRequires: make
 BuildRequires: glib2-devel
 %if %{with_gi}
 BuildRequires: gobject-introspection-devel
@@ -685,7 +685,6 @@ A meta-package that pulls all the libblockdev plugins as dependencies.
 %setup -q -n %{name}-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 autoreconf -ivf
@@ -989,6 +988,24 @@ find %{buildroot} -type f -name "*.la" | xargs %{__rm}
 %files plugins-all
 
 %changelog
+* Mon Jan 11 2021 Vojtech Trefny <vtrefny@redhat.com> - 2.25-1
+- loop: Retry LOOP_SET_STATUS64 on EAGAIN (vtrefny)
+- Fix max size limit for LVM thinpool metadata (vtrefny)
+- lvm: Use the UNUSED macro instead of __attribute__((unused)) (vtrefny)
+- lvm: Do not use thin_metadata_size to recommend thin metadata size (vtrefny)
+- lvm: Set thin metadata limits to match limits LVM uses in lvcreate (vtrefny)
+- Mark all GIR file constants as guint64 (vtrefny)
+- lvm: Fix bd_lvm_vdopooldata_* symbols (tbzatek)
+- fs: Fix compile error in ext_repair caused by cherry pick from master (vtrefny)
+- README: Use CI status image for 2.x-branch on 2.x (vtrefny)
+- fs: Do not report error when errors were fixed by e2fsck (vtrefny)
+- tests: Add null-byte exec tests (tbzatek)
+- tests: Add bufferbloat exec tests (tbzatek)
+- exec: Clarify the BDUtilsProgExtract callback documentation (tbzatek)
+- exec: Use non-blocking read and process the buffer manually (tbzatek)
+- exec: Fix polling for stdout and stderr (tbzatek)
+- exec: Fix setting locale for util calls (vtrefny)
+
 * Thu Oct 01 2020 Vojtech Trefny <vtrefny@redhat.com> - 2.24-7
 - Do not build VDO plugin
 
diff --git a/sources b/sources
index 79bff78..2c30c6a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libblockdev-2.24.tar.gz) = 92b7d734ea2cefbb67e626bef369d6785ba2a4bbbf09a4f59345febe977bc32319fb44f38b3c3177b8652abbc1f87b6cc76d41fdd2d70783c1c168049bdcb1d6
+SHA512 (libblockdev-2.25.tar.gz) = 628d05f3a257b44208a9d0b5d84ae248fefd415812d9a93d132c03039b09fefc4d6110beb9aa0d3072e3f0c992e642d7867d0241209056538f132f86a748e195