From 43cee554ab03796880cc52e064aeb37e51542204 Mon Sep 17 00:00:00 2001
From: Alasdair Kergon <agk@fedoraproject.org>
Date: Fri, 24 Aug 2007 21:13:52 +0000
Subject: [PATCH] new upstream

---
 .cvsignore                     |  2 +-
 LVM2.2.02.27.tgz.asc           |  7 -------
 LVM2.2.02.28.tgz.asc           |  7 +++++++
 lvm2-2_02_28-add-ps3disk.patch | 21 ---------------------
 lvm2.spec                      | 23 ++++++++++++++++++-----
 sources                        |  2 +-
 upstream                       |  2 +-
 7 files changed, 28 insertions(+), 36 deletions(-)
 delete mode 100644 LVM2.2.02.27.tgz.asc
 create mode 100644 LVM2.2.02.28.tgz.asc
 delete mode 100644 lvm2-2_02_28-add-ps3disk.patch

diff --git a/.cvsignore b/.cvsignore
index 703688d..5d5b195 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-LVM2.2.02.27.tgz
+LVM2.2.02.28.tgz
diff --git a/LVM2.2.02.27.tgz.asc b/LVM2.2.02.27.tgz.asc
deleted file mode 100644
index 80a3e59..0000000
--- a/LVM2.2.02.27.tgz.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.1 (GNU/Linux)
-
-iD8DBQBGnSwjIoGRwVZ+LBcRArEbAJ9jJyjL/K8qy6XM2ED+mwGph0ApawCgvCXo
-Q+wgkfFWWZLak3+oJyamNQg=
-=pDVg
------END PGP SIGNATURE-----
diff --git a/LVM2.2.02.28.tgz.asc b/LVM2.2.02.28.tgz.asc
new file mode 100644
index 0000000..be649f5
--- /dev/null
+++ b/LVM2.2.02.28.tgz.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.1 (GNU/Linux)
+
+iD8DBQBGz0ecIoGRwVZ+LBcRAtrwAJ99maZB1LcDneURsZVIS0wbLWTlbwCfY2fE
+6dAvBaQf2v1W2I6wlfFAZi0=
+=KZCp
+-----END PGP SIGNATURE-----
diff --git a/lvm2-2_02_28-add-ps3disk.patch b/lvm2-2_02_28-add-ps3disk.patch
deleted file mode 100644
index b40e9e5..0000000
--- a/lvm2-2_02_28-add-ps3disk.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- LVM2.2.02.27.old/lib/filters/filter.c	2007-01-26 00:03:48.000000000 +0100
-+++ LVM2.2.02.27/lib/filters/filter.c	2007-08-01 11:13:27.000000000 +0200
-@@ -75,6 +75,8 @@ static const device_info_t device_info[]
- 	{"aoe", 16},		/* ATA over Ethernet */
- 	{"device-mapper", 1},	/* Other mapped devices */
- 	{"xvd", 16},		/* Xen virtual block device */
-+ 	{"vdisk", 8},		/* SUN's LDOM virtual block device */
-+	{"ps3disk", 16},	/* PlayStation 3 internal disk */
- 	{NULL, 0}
- };
- 
---- LVM2.2.02.27.old/WHATS_NEW	2007-07-17 22:45:17.000000000 +0200
-+++ LVM2.2.02.27/WHATS_NEW	2007-08-01 11:14:36.000000000 +0200
-@@ -1,3 +1,7 @@
-+Version 2.02.28 -
-+================================
-+  Add SUN's LDOM virtual block device (vdisk) and ps3disk to filters.
-+                          
- Version 2.02.27 - 17th July 2007
- ================================
-   Fix snapshot cow area deactivation if origin is not active. (2.02.13)
diff --git a/lvm2.spec b/lvm2.spec
index bea74d6..734fe53 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -1,15 +1,14 @@
-%define device_mapper_version 1.02.21-1
+%define device_mapper_version 1.02.22-1
 
 Summary: Userland logical volume management tools 
 Name: lvm2
-Version: 2.02.27
-Release: 4%{?dist}
+Version: 2.02.28
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://sources.redhat.com/lvm2
 Source0: LVM2.%{version}.tgz
 Patch0: cluster-locking-built-in.patch
-Patch1: lvm2-2_02_28-add-ps3disk.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 .ps3disk
 
 %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=
@@ -199,6 +197,21 @@ fi
 
 
 %changelog
+* Thu Aug 24 2007 Alasdair Kergon <agk@redhat.com> - 2.02.28-1
+- vgscan and pvscan now trigger clvmd -R, which should now work.
+- Fix clvmd logging so you can get lvm-level debugging out of it.
+- Allow clvmd debug to be turned on in a running daemon using clvmd -d [-C].
+- Add more cluster info to lvmdump.
+- Fix lvdisplay man page to say LV size is reported in sectors, not KB.
+- Fix loading of persistent cache if cache_dir is used.
+- Only permit --force, --verbose and --debug arguments to be repeated.
+- Add support for renaming mirrored LVs.
+- Add --mirrorlog argument to specify log type for mirrors.
+- Don't leak a file descriptor if flock or fcntl fails.
+- Detect stream write failure reliably.
+- Reduce severity of lstat error messages to very_verbose.
+- Update to use autoconf 2.61, while still supporting 2.57.
+
 * Thu Aug 09 2007 Alasdair Kergon <agk@redhat.com> - 2.02.27-3
 - Clarify GPL licence as being version 2.
 
diff --git a/sources b/sources
index a143ea7..d532672 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f3655af297a2b1ce6a3390ab1c264e68  LVM2.2.02.27.tgz
+940a882a71cae84f6befc8069a260ad1  LVM2.2.02.28.tgz
diff --git a/upstream b/upstream
index 703688d..5d5b195 100644
--- a/upstream
+++ b/upstream
@@ -1 +1 @@
-LVM2.2.02.27.tgz
+LVM2.2.02.28.tgz