From e18d3bcba97f74977c899faca228c7af61c701c3 Mon Sep 17 00:00:00 2001
From: Alasdair Kergon <agk@fedoraproject.org>
Date: Fri, 30 Apr 2010 15:32:39 +0000
Subject: [PATCH] more upstream fixes

---
 .cvsignore           |  2 +-
 LVM2.2.02.63.tgz.asc |  7 -------
 LVM2.2.02.64.tgz.asc |  7 +++++++
 lvm2.spec            | 30 +++++++++++++++++++++++++++---
 sources              |  2 +-
 upstream             |  2 +-
 6 files changed, 37 insertions(+), 13 deletions(-)
 delete mode 100644 LVM2.2.02.63.tgz.asc
 create mode 100644 LVM2.2.02.64.tgz.asc

diff --git a/.cvsignore b/.cvsignore
index b5ba8c3..0526d85 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-LVM2.2.02.63.tgz
+LVM2.2.02.64.tgz
diff --git a/LVM2.2.02.63.tgz.asc b/LVM2.2.02.63.tgz.asc
deleted file mode 100644
index 30f941e..0000000
--- a/LVM2.2.02.63.tgz.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.1 (GNU/Linux)
-
-iD8DBQBLxiBqIoGRwVZ+LBcRAi3iAJ9CO8jVxQ9aypg5DGIzEBwsnuDingCgyHLF
-KzdfNX5hiPfOSUDzxQ7bpI8=
-=lQGX
------END PGP SIGNATURE-----
diff --git a/LVM2.2.02.64.tgz.asc b/LVM2.2.02.64.tgz.asc
new file mode 100644
index 0000000..728855e
--- /dev/null
+++ b/LVM2.2.02.64.tgz.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.1 (GNU/Linux)
+
+iD8DBQBL2vVGIoGRwVZ+LBcRAnQIAKCxp+eUo5uSIUNcL43wkPoGCMHE1ACg1etx
+T+eBJz8tMZJFcXmrsLApN54=
+=Qbv1
+-----END PGP SIGNATURE-----
diff --git a/lvm2.spec b/lvm2.spec
index 68038e2..5e448a8 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -1,4 +1,4 @@
-%define device_mapper_version 1.02.46
+%define device_mapper_version 1.02.47
 %define enable_cluster 1
 
 %if %{enable_cluster}
@@ -15,8 +15,8 @@
 
 Summary: Userland logical volume management tools 
 Name: lvm2
-Version: 2.02.63
-Release: 2%{?dist}
+Version: 2.02.64
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://sources.redhat.com/lvm2
@@ -463,6 +463,30 @@ the device-mapper event library.
 
 
 %changelog
+* Fri Apr 30 2010 Alasdair Kergon <agk@redhat.com> - 2.02.64-1
+- Avoid pointless initialisation when the 'version' command is run directly.
+- Fix memory leak for invalid regex pattern input.
+- Display invalid regex pattern for filter configuration in case of error.
+- Fix -M and --type to use strings, not pointers that change on config refresh.
+- Fix lvconvert error message when existing mirrored LV is not found.
+- Set appropriate udev flags for reserved LVs.
+- Disallow the direct removal of a merging snapshot.
+- Don't preload the origin when removing a snapshot whose merge is pending.
+- Disallow the addition of mirror images while a conversion is happening.
+- Disallow primary mirror image removal when mirror is not in-sync.
+- Remove obsolete --name parameter from vgcfgrestore.
+- Add -S command to clvmd to restart the daemon preserving exclusive locks.
+- Increment lvm2app version from 1 to 2 (memory allocation changes).
+- Change lvm2app memory alloc/free for pv/vg/lv properties.
+- Change daemon lock filename from lvm2_monitor to lvm2-monitor for consistency.
+- Add support for new IMPORT{db} udev rule.
+- Add DM_UDEV_PRIMARY_SOURCE_FLAG udev flag to recognize proper DM events.
+- Also include udev libs in libdevmapper.pc.
+- Cache bitset locations to speed up _calc_states.
+- Add a regex optimisation pass for shared prefixes and suffixes.
+- Add dm_bit_and and dm_bitset_equal to libdevmapper.
+- Speed up dm_bit_get_next with ffs().
+
 * Thu Apr 15 2010 Alasdair Kergon <agk@redhat.com> - 2.02.63-2
 - Remove 'lvmconf --lockinglibdir' from cluster post: locking is now built-in.
 - Move libdevmapper-event-lvm2.so to devel package.
diff --git a/sources b/sources
index 18095bc..d738897 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-74bb3beeefe68d539ab712e92fddfb39  LVM2.2.02.63.tgz
+59fc0f7f6703a8c7f12df6b7d2e509fb  LVM2.2.02.64.tgz
diff --git a/upstream b/upstream
index b5ba8c3..0526d85 100644
--- a/upstream
+++ b/upstream
@@ -1 +1 @@
-LVM2.2.02.63.tgz
+LVM2.2.02.64.tgz