rpms/e2fsprogs/F-9 e2fsprogs-1.40-list_for_each_safe.patch, NONE, 1.1 e2fsprogs.spec, 1.111, 1.112

[Eric Sandeen (sandeen)]

Author: sandeen

Update of /cvs/pkgs/rpms/e2fsprogs/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32115

Modified Files:
	e2fsprogs.spec 
Added Files:
	e2fsprogs-1.40-list_for_each_safe.patch 
Log Message:
* Fri Jun 20 2008 Eric Sandeen <sandeen at redhat.com> 1.40.10-4
- Fix blkid -g segfault when clearing entries (#452333)


e2fsprogs-1.40-list_for_each_safe.patch:

--- NEW FILE e2fsprogs-1.40-list_for_each_safe.patch ---
Index: e2fsprogs-1.41/lib/blkid/cache.c
===================================================================
--- e2fsprogs-1.41.orig/lib/blkid/cache.c
+++ e2fsprogs-1.41/lib/blkid/cache.c
@@ -154,13 +154,13 @@ void blkid_put_cache(blkid_cache cache)
 
 void blkid_gc_cache(blkid_cache cache)
 {
-	struct list_head *p;
+	struct list_head *p, *n;
 	struct stat st;
 
 	if (!cache)
 		return;
 
-	list_for_each(p, &cache->bic_devs) {
+	list_for_each_safe(p, n, &cache->bic_devs) {
 		blkid_dev dev = list_entry(p, struct blkid_struct_dev, bid_devs);
 		if (!p)
 			break;



Index: e2fsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/F-9/e2fsprogs.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- e2fsprogs.spec	4 Jun 2008 19:29:01 -0000	1.111
+++ e2fsprogs.spec	21 Jun 2008 03:17:31 -0000	1.112
@@ -4,7 +4,7 @@
 Summary: Utilities for managing the second and third extended (ext2/ext3) filesystems
 Name: e2fsprogs
 Version: 1.40.10
-Release: 3%{?dist}
+Release: 4%{?dist}
 # License based on upstream-modified COPYING file,
 # which clearly states "V2" intent.
 License: GPLv2
@@ -16,6 +16,7 @@
 Patch1: e2fsprogs-1.38-etcblkid.patch
 Patch2: e2fsprogs-1.40.4-sb_feature_check_ignore.patch
 Patch3: e2fsprogs-1.40.8-blkid-swap-tests.patch
+Patch4: e2fsprogs-1.40-list_for_each_safe.patch
 
 Url: http://e2fsprogs.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -94,6 +95,7 @@
 %patch2 -p1 -b .featurecheck
 # check a bit more in swapv1 headers before recognizing as swap
 %patch3 -p1 -b .swapchecks
+%patch4 -p1 -b .listsafe
 
 %build
 %configure --enable-elf-shlibs --enable-nls --disable-e2initrd-helper  --enable-blkid-devmapper --enable-blkid-selinux
@@ -282,6 +284,9 @@
 %dir %attr(2775, uuidd, uuidd) /var/lib/libuuid
 
 %changelog
+* Fri Jun 20 2008 Eric Sandeen <sandeen at redhat.com> 1.40.10-4
+- Fix blkid -g segfault when clearing entries (#452333)
+
 * Wed Jun 04 2008 Eric Sandeen <sandeen at redhat.com> 1.40.10-3
 - Tidy up multilib hack for non-multilib arches (#446016)
 - Fix up %postun script (#449868)