From bef83a3c0e5e222fe046f7b95abaf4bd022abbfe Mon Sep 17 00:00:00 2001
From: Alasdair G Kergon <agk@redhat.com>
Date: Jul 31 2010 01:01:18 +0000
Subject: Latest upstream release, fixing lvm2-cluster CVE-2010-2526.


---

diff --git a/LVM2.2.02.70.tgz.asc b/LVM2.2.02.70.tgz.asc
deleted file mode 100644
index 85a06a9..0000000
--- a/LVM2.2.02.70.tgz.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.1 (GNU/Linux)
-
-iD8DBQBMM+WqIoGRwVZ+LBcRAgK2AJ4rh+24RLUFkuDyKhZPWsYZrgW5bwCdFqhL
-oz+2yboqRDlXkYy+a42/+E8=
-=DdNN
------END PGP SIGNATURE-----
diff --git a/LVM2.2.02.72.tgz.asc b/LVM2.2.02.72.tgz.asc
new file mode 100644
index 0000000..b70c597
--- /dev/null
+++ b/LVM2.2.02.72.tgz.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.1 (GNU/Linux)
+
+iD8DBQBMUDmbIoGRwVZ+LBcRAtqFAJsGv2xsspvC4GskuEfap8NF3BR3yQCg7saR
+50pTyxMvirUMtbSgoaZ99eY=
+=JwxI
+-----END PGP SIGNATURE-----
diff --git a/lvm2.spec b/lvm2.spec
index 88a08bb..3c88eca 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -1,4 +1,4 @@
-%define device_mapper_version 1.02.52
+%define device_mapper_version 1.02.53
 %define enable_cluster 1
 
 %if %{enable_cluster}
@@ -15,8 +15,8 @@
 
 Summary: Userland logical volume management tools 
 Name: lvm2
-Version: 2.02.70
-Release: 1%{?dist}
+Version: 2.02.72
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://sources.redhat.com/lvm2
@@ -67,6 +67,7 @@ make %{?_smp_mflags}
 make install DESTDIR=$RPM_BUILD_ROOT
 make install_system_dirs DESTDIR=$RPM_BUILD_ROOT
 make install_initscripts DESTDIR=$RPM_BUILD_ROOT
+/usr/bin/install -m 0700 -d $RPM_BUILD_ROOT/var/run/lvm
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -83,6 +84,7 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc COPYING COPYING.LIB INSTALL README VERSION WHATS_NEW
+%doc doc/lvm_fault_handling.txt
 %{_sbindir}/fsadm
 %{_sbindir}/lvchange
 %{_sbindir}/lvconvert
@@ -186,6 +188,7 @@ fi
 %dir /etc/lvm/cache
 %dir /etc/lvm/archive
 %dir /var/lock/lvm
+%dir /var/run/lvm
 /etc/rc.d/init.d/lvm2-monitor
 
 ##############################################################################
@@ -435,6 +438,35 @@ the device-mapper event library.
 
 
 %changelog
+* Sat Jul 31 2010 Alasdair Kergon <agk@redhat.com> - 2.02.72-2
+- Address lvm2-cluster security flaw CVE-2010-2526.
+    https://bugzilla.redhat.com/CVE-2010-2526
+- Change clvmd to communicate with lvm2 via a socket in /var/run/lvm.
+- Return controlled error if clvmd is run by non-root user.
+- Add configure --default-run-dir for /var/run/lvm.
+- Never use clvmd singlenode unless explicitly requested with -Isinglenode.
+
+* Wed Jul 28 2010 Alasdair Kergon <agk@redhat.com> - 2.02.71-1
+- Make vgck warn about missing PVs.
+- Revert failed table load preparation after "create, load and resume".
+- Check if cluster log daemon is running before allowing cmirror create.
+- Add dm_create_lockfile to libdm and use for pidfiles for all daemons.
+- Correct LV list order used by lvconvert when splitting a mirror.
+- Check if LV with specified name already exists when splitting a mirror.
+- Fix suspend/resume logic for LVs resulting from splitting a mirror.
+- Fix possible hang when all mirror images of a mirrored log fail.
+- Adjust auto-metadata repair and caching logic to try to cope with empty mdas.
+- Update pvcreate, {pv|vg}change, and lvm.conf man pages about metadataignore.
+- Prompt if metadataignore with vgextend or pvchange would adjust vg_mda_copies.
+- Adjust vg_mda_copies if metadataignore given with vgextend or pvchange.
+- Speed up the regex matcher.
+- Use "nowatch" udev rule for inappropriate devices.
+- Document LVM fault handling in lvm_fault_handling.txt.
+- Clarify help text for vg_mda_count.
+- Add more verbose messages while checking volume_list and hosttags settings.
+- Add log_error when strdup fails in {vg|lv}_change_tag().
+- Do not log backtrace in valid _lv_resume() code path.
+
 * Wed Jul 7 2010 Alasdair Kergon <agk@redhat.com> - 2.02.70-1
 - Remove log directly if all mirror images of a mirrored log fail.
 - Randomly select which mdas to use or ignore.
diff --git a/upstream b/upstream
index 75a325b..eacb8bd 100644
--- a/upstream
+++ b/upstream
@@ -1 +1 @@
-LVM2.2.02.70.tgz
+LVM2.2.02.72.tgz