From 47c61507d72eae2bad157dd5eededc71faa6055e Mon Sep 17 00:00:00 2001
From: Marian Csontos <mcsontos@redhat.com>
Date: Wed, 18 May 2022 18:36:45 +0200
Subject: [PATCH] Update lvm2 to upstream version 2.03.16

Resolves: #2087781
---
 LVM2.2.03.15.tgz.asc | 16 ----------------
 LVM2.2.03.16.tgz.asc | 16 ++++++++++++++++
 lvm2.spec            | 13 ++++++++-----
 sources              |  2 +-
 upstream             |  2 +-
 5 files changed, 26 insertions(+), 23 deletions(-)
 delete mode 100644 LVM2.2.03.15.tgz.asc
 create mode 100644 LVM2.2.03.16.tgz.asc

diff --git a/LVM2.2.03.15.tgz.asc b/LVM2.2.03.15.tgz.asc
deleted file mode 100644
index f32d36c..0000000
--- a/LVM2.2.03.15.tgz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEE1QGkeEQK4v0TChvouREkMeUJA58FAmIBUeQACgkQuREkMeUJ
-A58DthAA16VW+k8lVVAkX+PfcpqVgvO9M4Rhj4qPAcmwKX2z8wMo5hYnrsG3cQDg
-NIbtlD05FZuFFMA7GFBdV+LtHCRF6lCe2LbuSsRWmbxz8Z8yn/h801d4Fp/SaZpm
-2Itq0Ve6HLysNqA9P6Yl6YE7U6hWnR6PxoS4jl1C5ttpOlmgDHcIM5xl8Dn3PQbZ
-S6ujlWl4OX+E0bG5Qg5iwpUcfZMboJ7VGGCKmXzO0Z/7ABw4Os9dgApHGFlHEsKm
-XBmeKT77AQxgozPefiqve1CHFNZG8HmSyMhhstUFNl1qMvxGD3CAObdHIiGT1uQL
-z6HrxANZ+5EU+sGgCtJtSBfxzPP3s8RPhUiN0WD3rgkJdshc2qBXsOfkNEUKycnq
-wCZtJdh6CPsSEfRv83TrGKTKiNT4DyIzPLBh+goV5SpMc/e1kijv6uUMRwEFGb5Y
-LZsMRrO8GmwhkkdIDWhdvhGtzJVhd6n80fNPuQTDm7Rp+1+fhgnV6teRNXxO9aWC
-eKeZkpaj0/fjpbDc9o+y5DGpvXdbY4KfNx6nGUGEPsqnTYBnq3Ud/V1fZuaOC2AV
-iZK4bXXVQoFVkLGnl3sHx2SQInuui0nDo4i2nIwI2rqIMNClb59hAotDEYdlCQc7
-GlAnvWBqrJFjPhVYj8x933lbOyie5GO4qSTI7n0O72c80f8dcbY=
-=EPS0
------END PGP SIGNATURE-----
diff --git a/LVM2.2.03.16.tgz.asc b/LVM2.2.03.16.tgz.asc
new file mode 100644
index 0000000..60befb6
--- /dev/null
+++ b/LVM2.2.03.16.tgz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEE1QGkeEQK4v0TChvouREkMeUJA58FAmKFHcYACgkQuREkMeUJ
+A58CdQ//UthHUyGSHS2LiNKPhpr4vKuxstwlOclxHjvardZ1QW7ry5Ype5Elrnfb
+GVot/9oZPzoYzuHaMp6E8rRTfdsmiuSU9mQ3sTDAzPcuB9QbiZUW9oTCLfACTRqK
+bP8XdKVE/sJgllUFz93kQke69GntBuvrvXFzUF4yMSSRwvWMtZ4jTs2KSfCdFJUB
+3r4d9ynxTdcskexYQ0fnXubl5FRokKlmi7k5G0n2BnI/eqMMMsJg8lGYiw7kmkPc
+7cqE9FJzVhzEv3rLYz0+gc7/6JymAJAJcUD5jaToI3eyA6KhqauH03HZhc5JDtxL
+nthpURhCETDp/St/DsXWffVCKXBKq5TIa44Hh/n1TgFKVvgshEwOCWMmsh4P1MKI
+ilvwkjmpzGbVOAgFUIJnMPOpg5aQ8jatFDbzcFwUXpIXdfSS+0ghMyc4Vihh1sa0
+wAM7hYSvzjYAXPb+UjRrwRunmU36SgvUpg8ZI8ZxvFgLw57IAxqlx41MbQjtPg4B
+3hI/ibtiWckVwROmga1daeLe696h4lrXjRCjj85EG8FsAuZpUikuSf1ym/3uF0aP
+142Dd8lvWjfjl9nXDU8cl3Ke7JFfEtQUplswaaIpwKXv37dlwyfaCrgR/laLTs4V
+xLh50C5Hxr1RPQwt1qPzM6tNYS+R3O8B56iWzcF8WIBiOOG5XWc=
+=HIKn
+-----END PGP SIGNATURE-----
diff --git a/lvm2.spec b/lvm2.spec
index 2f12831..f47460c 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -1,4 +1,4 @@
-%global device_mapper_version 1.02.183
+%global device_mapper_version 1.02.185
 
 %global enable_cache 1
 %global enable_cluster 1
@@ -44,7 +44,7 @@
     %global configure_cluster --with-cluster=internal
 %endif
 
-%global from_snapshot 1
+%global from_snapshot 0
 %if 0%{?from_snapshot}
 %global commit 4a1f6173d29a7d7ecab14a9313000aa5f81170d0
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
@@ -58,7 +58,7 @@ Name: lvm2
 %if 0%{?rhel}
 Epoch: %{rhel}
 %endif
-Version: 2.03.14
+Version: 2.03.16
 %if 0%{?from_snapshot}
 #Release: 0.1.20211115git%{shortcommit}%{?dist}%{?rel_suffix}
 Release: 4%{?dist}
@@ -72,7 +72,6 @@ Source0: lvm2-%{shortcommit}.tgz
 %else
 Source0: ftp://sourceware.org/pub/lvm2/releases/LVM2.%{version}.tgz
 %endif
-Patch1: 0001-devices-file-do-not-clear-PVID-of-unread-devices.patch
 
 BuildRequires: make
 BuildRequires: gcc
@@ -133,7 +132,7 @@ or more physical volumes and creating one or more logical volumes
 %else
 %setup -q -n LVM2.%{version}
 %endif
-%patch1 -p1 -b .backup1
+#%%patch1 -p1 -b .backup1
 
 %build
 %global _default_pid_dir /run
@@ -704,6 +703,10 @@ An extensive functional testsuite for LVM2.
 %endif
 
 %changelog
+* Wed May 18 2022 Marian Csontos <mcsontos@redhat.com> - 2.03.16-1
+- Update to upstream version 2.03.16.
+- See WHATS_NEW and WHATS_NEW_DM for more information.
+
 * Tue Feb 15 2022 Marian Csontos <mcsontos@redhat.com> - 2.03.14-4
 - Remove service based autoactivation.
 - New lvmautoactivation(7) man page.
diff --git a/sources b/sources
index b444555..301ffbf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (lvm2-4a1f617.tgz) = 4d9b1a028fa0f024efcc9d826256a7405eb7d26479ca114d6e68079dedd2ea9efaa30ce96f50fcbcd5669a06993ab1034d5f08fc433a63e4c73e418ffbbfa35c
+SHA512 (LVM2.2.03.16.tgz) = 084ba4080537359458db936637fc7f83bb9bfcf2de9f3660882551b5c31c7e9900c7d381b238ce1bb7629942c740c121f0dea5e404c302d31ed028b5c65efaa5
diff --git a/upstream b/upstream
index 1548ae5..fbf04e7 100644
--- a/upstream
+++ b/upstream
@@ -1 +1 @@
-LVM2.2.03.15.tgz
+LVM2.2.03.16.tgz