From 8a14f89e7da4a6378ea1af0138eeb2ede885dd94 Mon Sep 17 00:00:00 2001
From: Alasdair Kergon <agk@fedoraproject.org>
Date: Thu, 8 Mar 2007 21:46:08 +0000
Subject: [PATCH] Move .cache into new /etc/lvm/cache/ dir to assist selinux.  
   vgrename-by-uuid fix

---
 .cvsignore           |  2 +-
 LVM2.2.02.23.tgz.asc |  7 +++++++
 lvm2.spec            | 23 ++++++++++++++++-------
 sources              |  2 +-
 upstream             |  2 +-
 5 files changed, 26 insertions(+), 10 deletions(-)
 create mode 100644 LVM2.2.02.23.tgz.asc

diff --git a/.cvsignore b/.cvsignore
index 62349c7..7fb6f2b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-LVM2.2.02.22.tgz
+LVM2.2.02.23.tgz
diff --git a/LVM2.2.02.23.tgz.asc b/LVM2.2.02.23.tgz.asc
new file mode 100644
index 0000000..514094d
--- /dev/null
+++ b/LVM2.2.02.23.tgz.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.1 (GNU/Linux)
+
+iD8DBQBF8IHXIoGRwVZ+LBcRApQgAJ0WraCjksh15cm4p/xkjjdS+hdSnACeOeRH
+5iYwVwSBn7Fh03vX5yzC0lY=
+=mf6D
+-----END PGP SIGNATURE-----
diff --git a/lvm2.spec b/lvm2.spec
index 69e8e50..5ba0b2b 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -1,15 +1,14 @@
-%define device_mapper_version 1.02.17-6
+%define device_mapper_version 1.02.17-7
 
 Summary: Userland logical volume management tools 
 Name: lvm2
-Version: 2.02.22
-Release: 2%{?dist}
+Version: 2.02.23
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
 URL: http://sources.redhat.com/lvm2
 Source0: LVM2.%{version}.tgz
 Patch0: cluster-locking-built-in.patch
-Patch1: lvm2-nostaticreadline.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: device-mapper-devel >= %{device_mapper_version}
 BuildRequires: libselinux-devel >= 1.30.19-4, libsepol-devel
@@ -34,7 +33,6 @@ or more physical volumes and creating one or more logical volumes
 %prep
 %setup -q -n LVM2.%{version}
 %patch -p1 -b .locking
-%patch1 -p1 -b .nostaticreadline
 
 %build
 %configure --enable-static_link --enable-readline --enable-lvm1_fallback --with-clvmd=cman --with-cluster=internal --with-pool=internal --with-staticdir=/sbin --with-user= --with-group=
@@ -50,8 +48,9 @@ ln -s lvm.static $RPM_BUILD_ROOT/sbin/vgchange
 ln -s lvm.static $RPM_BUILD_ROOT/sbin/vgscan
 install -m 0700 -d $RPM_BUILD_ROOT/etc/lvm/archive
 install -m 0700 -d $RPM_BUILD_ROOT/etc/lvm/backup
+install -m 0700 -d $RPM_BUILD_ROOT/etc/lvm/cache
 install -m 0700 -d $RPM_BUILD_ROOT/var/lock/lvm
-install -m 0600 /dev/null $RPM_BUILD_ROOT/etc/lvm/.cache
+install -m 0600 /dev/null $RPM_BUILD_ROOT/etc/lvm/cache/.cache
 mkdir -p -m755 $RPM_BUILD_ROOT/etc/rc.d/init.d
 install scripts/clvmd_init_rhel4 $RPM_BUILD_ROOT/etc/rc.d/init.d/clvmd
 install -m 0755 scripts/lvmconf.sh $RPM_BUILD_ROOT/usr/sbin/lvmconf
@@ -153,9 +152,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/vgscan.8.gz
 %{_mandir}/man8/vgsplit.8.gz
 %dir /etc/lvm
-%ghost /etc/lvm/.cache
+%ghost /etc/lvm/cache/.cache
 %config(noreplace) /etc/lvm/lvm.conf
 /etc/lvm/backup
+/etc/lvm/cache
 /etc/lvm/archive
 /var/lock/lvm
 
@@ -194,6 +194,15 @@ fi
 
 
 %changelog
+* Thu Mar 08 2007 Alasdair Kergon <agk@redhat.com> - 2.02.23-1
+- Fix vgrename active LV check to ignore differing vgids.
+- Fix two more segfaults if an empty config file section encountered.
+- Fix a leak in a reporting error path.
+- Add devices/cache_dir & devices/cache_file_prefix, deprecating devices/cache.
+
+* Tue Feb 27 2007 Alasdair Kergon <agk@redhat.com> - 2.02.22-3
+- Move .cache file to /etc/lvm/cache.
+
 * Wed Feb 14 2007 Alasdair Kergon <agk@redhat.com> - 2.02.22-2
 - Rebuild after device-mapper package split.
 
diff --git a/sources b/sources
index b3157f2..8f42f42 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2dd9dad43bde244a4ff0e406b5cfb8c5  LVM2.2.02.22.tgz
+a0e631f7bdb75fb4d6486d2b1fa64a40  LVM2.2.02.23.tgz
diff --git a/upstream b/upstream
index 62349c7..7fb6f2b 100644
--- a/upstream
+++ b/upstream
@@ -1 +1 @@
-LVM2.2.02.22.tgz
+LVM2.2.02.23.tgz