From: Marcin Krol <hawk@tld-linux.org>
Date: Mon, 10 Jul 2023 09:37:52 +0000 (+0200)
Subject: - updated to 2.03.21
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=2fc0c23eb249e042d2bd5892b4b14e618b4e043a;p=packages%2Flvm2.git

- updated to 2.03.21
---

diff --git a/lvm2-run-dir.patch b/lvm2-run-dir.patch
index 8ff63ab..103be53 100644
--- a/lvm2-run-dir.patch
+++ b/lvm2-run-dir.patch
@@ -1,12 +1,12 @@
-diff -ur LVM2.2.03.19/configure.ac lvm2-2_03_19/configure.ac
---- LVM2.2.03.19/configure.ac	2023-03-03 22:58:49.813964537 +0100
-+++ LVM2.2.03.19/configure.ac	2023-03-03 22:59:34.844579648 +0100
-@@ -714,8 +714,7 @@
+diff -ur LVM2.2.03.21.orig/configure.ac LVM2.2.03.21/configure.ac
+--- LVM2.2.03.21.orig/configure.ac	2023-07-10 11:28:44.248485213 +0200
++++ LVM2.2.03.21/configure.ac	2023-07-10 11:29:32.276164664 +0200
+@@ -706,8 +706,7 @@
  
  ################################################################################
  AC_MSG_CHECKING([for default run directory])
 -RUN_DIR="/run"
--test -d "/run" || RUN_DIR="/var/run"
+-AS_IF([test ! -d "$RUN_DIR"], [RUN_DIR="/var/run"])
 +RUN_DIR="/var/run"
  AC_MSG_RESULT([$RUN_DIR])
  dnl -- Set up pidfile and run directory
diff --git a/lvm2-selinux.patch b/lvm2-selinux.patch
index 9f87a47..dbcf515 100644
--- a/lvm2-selinux.patch
+++ b/lvm2-selinux.patch
@@ -1,8 +1,8 @@
-diff -ur LVM2.2.03.02.orig/tools/Makefile.in LVM2.2.03.02/tools/Makefile.in
---- LVM2.2.03.02.orig/tools/Makefile.in	2018-12-18 15:22:34.000000000 +0100
-+++ LVM2.2.03.02/tools/Makefile.in	2019-03-22 16:54:15.870000000 +0100
-@@ -92,6 +92,9 @@
- LVMLIBS = $(SYSTEMD_LIBS) -L$(top_builddir)/libdm -ldevmapper $(LIBS) -laio
+diff -urNp -x '*.orig' LVM2.2.03.21.org/tools/Makefile.in LVM2.2.03.21/tools/Makefile.in
+--- LVM2.2.03.21.org/tools/Makefile.in	2023-04-21 10:42:24.000000000 +0200
++++ LVM2.2.03.21/tools/Makefile.in	2023-07-10 00:29:26.522385169 +0200
+@@ -93,6 +93,9 @@ endif
+ 
  LIB_VERSION = $(LIB_VERSION_LVM)
  INCLUDES = -I$(top_builddir)/tools
 +ifneq ("@STATIC_LINK@", "yes")
diff --git a/lvm2.spec b/lvm2.spec
index 47bc1e3..2972ebd 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -29,19 +29,18 @@
 Summary:	The new version of Logical Volume Manager for Linux
 Summary(pl.UTF-8):	Nowa wersja Logical Volume Managera dla Linuksa
 Name:		lvm2
-Version:	2.03.19
+Version:	2.03.21
 Release:	1
 License:	GPL v2 and LGPL v2.1
 Group:		Applications/System
 Source0:	ftp://sourceware.org/pub/lvm2/LVM2.%{version}.tgz
-# Source0-md5:	e805199669c5fb2d87fba9a4082ecada
+# Source0-md5:	1730b322321bed204487ba241105e005
 Patch0:		%{name}-selinux.patch
 Patch1:		device-mapper-dmsetup-export.patch
 Patch2:		%{name}-tld_init.patch
 Patch3:		%{name}-run-dir.patch
-Patch4:		device-mapper-dmsetup-deps-export.patch
-Patch5:		%{name}-thin.patch
-Patch6:		link.patch
+Patch4:		%{name}-thin.patch
+Patch5:		link.patch
 URL:		http://www.sourceware.org/lvm2/
 BuildRequires:	autoconf >= 2.69
 BuildRequires:	autoconf-archive
@@ -280,7 +279,6 @@ Statyczna biblioteka devmapper zbudowana z dietlibc.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 
 %build
 %{__aclocal}