diff --git a/.gitignore b/.gitignore index 91f7498..c59d540 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/lvm2-8801a86.tar.gz +SOURCES/lvm2-9fe7aba.tar.gz diff --git a/.lvm2.metadata b/.lvm2.metadata index 3935ffd..bdd092f 100644 --- a/.lvm2.metadata +++ b/.lvm2.metadata @@ -1 +1 @@ -210aa94efb7d4523b6d095e7ec53ab773a1739a2 SOURCES/lvm2-8801a86.tar.gz +f609abed3b2256c98ae8f4dbc0bdef7967fe2753 SOURCES/lvm2-9fe7aba.tar.gz diff --git a/SOURCES/lvm2-set-default-preferred_names.patch b/SOURCES/lvm2-set-default-preferred_names.patch index 37243e9..26bef54 100644 --- a/SOURCES/lvm2-set-default-preferred_names.patch +++ b/SOURCES/lvm2-set-default-preferred_names.patch @@ -3,7 +3,7 @@ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/conf/example.conf.in b/conf/example.conf.in -index 6b0622a..37bdced 100644 +index fe17942..d149ed9 100644 --- a/conf/example.conf.in +++ b/conf/example.conf.in @@ -122,7 +122,8 @@ devices { @@ -17,7 +17,7 @@ index 6b0622a..37bdced 100644 # Configuration option devices/filter. # Limit the block devices that are used by LVM commands. diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h -index e4e3dcd..b036606 100644 +index 163e014..3c4032e 100644 --- a/lib/config/config_settings.h +++ b/lib/config/config_settings.h @@ -269,7 +269,7 @@ cfg(devices_hints_CFG, "hints", devices_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_ diff --git a/SPECS/lvm2.spec b/SPECS/lvm2.spec index 0080957..4fdb5b4 100644 --- a/SPECS/lvm2.spec +++ b/SPECS/lvm2.spec @@ -51,7 +51,7 @@ # Do not reset Release to 1 unless both lvm2 and device-mapper # versions are increased together. -%global commit 8801a86a3e0c87d92b250a6477f86ef9efdb2ba0 +%global commit 9fe7aba251ff24c14277dfdf9be2d861a7699230 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Summary: Userland logical volume management tools @@ -60,11 +60,11 @@ Name: lvm2 Epoch: %{rhel} %endif Version: 2.03.11 -Release: 0.2.20201103git%{shortcommit}%{?dist} +Release: 0.3.20201210git%{shortcommit}%{?dist} License: GPLv2 URL: http://sourceware.org/lvm2 #Source0: ftp://sourceware.org/pub/lvm2/releases/LVM2.%{version}.tgz -Source0: https://github.com/lvm-team/lvm2/archive/%{commit}/lvm2-%{shortcommit}.tar.gz +Source0: https://github.com/lvmteam/lvm2/archive/%{commit}/lvm2-%{shortcommit}.tar.gz Patch0: lvm2-rhel8.patch Patch1: lvm2-set-default-preferred_names.patch Patch2: lvm2-test-skip-problematic-tests.patch @@ -735,6 +735,9 @@ An extensive functional testsuite for LVM2. %endif %changelog +* Thu Dec 10 2020 Marian Csontos - 2.03.11-0.3.20201210git9fe7aba +- Merge fixes from upstream up to 9fe7aba. + * Wed Nov 04 2020 Marian Csontos - 2.03.11-0.2.20201103git8801a86 - Merge fixes from upstream up to 8801a86.