rpms/e2fsprogs/devel e2fsprogs-1.40.8-blkid-swap-tests.patch, 1.2, 1.3 e2fsprogs.spec, 1.108, 1.109

[Eric Sandeen (sandeen)]

Author: sandeen

Update of /cvs/pkgs/rpms/e2fsprogs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8059

Modified Files:
	e2fsprogs-1.40.8-blkid-swap-tests.patch e2fsprogs.spec 
Log Message:
* Mon May 12 2008 Eric Sandeen <esandeen at redhat.com> 1.40.9-2
- Fix blkid swap recognition on big-endian boxes (#445786)


e2fsprogs-1.40.8-blkid-swap-tests.patch:

Index: e2fsprogs-1.40.8-blkid-swap-tests.patch
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/devel/e2fsprogs-1.40.8-blkid-swap-tests.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- e2fsprogs-1.40.8-blkid-swap-tests.patch	18 Apr 2008 15:24:31 -0000	1.2
+++ e2fsprogs-1.40.8-blkid-swap-tests.patch	12 May 2008 18:27:27 -0000	1.3
@@ -27,17 +27,33 @@
  		       unsigned char *buf __BLKID_ATTR((unused)))
  {
  	struct swap_id_block *sws;
-@@ -843,6 +843,12 @@ static int probe_swap1(struct blkid_probe *probe,
+@@ -843,6 +843,11 @@ static int probe_swap1(struct blkid_probe *probe,
  	if (!sws)
  		return 1;
  
 +	/* check for wrong version or zeroed pagecount, for sanity */
 +	if (!memcmp(id->bim_magic, "SWAPSPACE2", id->bim_len) &&
-+			(blkid_le32(sws->sws_version) != 1 ||
-+			 sws->sws_lastpage == 0))
++			(sws->sws_version != 1 || sws->sws_lastpage == 0))
 +		return 1;
 +
  	/* arbitrary sanity check.. is there any garbage down there? */
  	if (sws->sws_pad[32] == 0 && sws->sws_pad[33] == 0)  {
  		if (sws->sws_volume[0])
--- 1.5.4.1 
+--- a/lib/blkid/test_probe.in	2008-05-12 11:50:41.580983841 -0500
++++ b/lib/blkid/test_probe.in	2008-05-12 11:51:21.323436536 -0500
+@@ -20,6 +20,15 @@ do
+ 		continue
+ 	fi
+ 	bunzip2 < $SRCDIR/tests/$i.img.bz2 > /tmp/test.img.$$
++	# swap is native-endian, so regenerate before testing
++	if [ "$i" == "swap0" ]; then
++		dd if=/dev/zero of=/tmp/test.img.$$ bs=1024 count=1 seek=1024
++		mkswap -v0 /tmp/test.img.$$ > /dev/null
++	elif [ "$i" == "swap1" ]; then
++		dd if=/dev/zero of=/tmp/test.img.$$ bs=1024 count=1 seek=1024
++		mkswap -v1 -L SWAP-TEST -U 8ff8e77f-8553-485e-8656-58be67a81666 /tmp/test.img.$$ >/dev/null
++	fi
++
+ 	./tst_probe /tmp/test.img.$$ > tests/$i.out
+ 	/bin/rm -f /tmp/test.img.$$ tests/$i.ok tests/$i.failed
+ 	cmp -s tests/$i.out $SRCDIR/tests/$i.results


Index: e2fsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/devel/e2fsprogs.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- e2fsprogs.spec	27 Apr 2008 14:12:21 -0000	1.108
+++ e2fsprogs.spec	12 May 2008 18:27:27 -0000	1.109
@@ -4,7 +4,7 @@
 Summary: Utilities for managing the second and third extended (ext2/ext3) filesystems
 Name: e2fsprogs
 Version: 1.40.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 # License based on upstream-modified COPYING file,
 # which clearly states "V2" intent.
 License: GPLv2
@@ -21,7 +21,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: e2fsprogs-libs = %{version}-%{release}, device-mapper
 BuildRequires: pkgconfig, texinfo, libselinux-devel
-BuildRequires: libsepol-devel, device-mapper-devel
+BuildRequires: libsepol-devel, device-mapper-devel, util-linux
 
 %description
 The e2fsprogs package contains a number of utilities for creating,
@@ -281,6 +281,9 @@
 %dir %attr(2775, uuidd, uuidd) /var/lib/libuuid
 
 %changelog
+* Mon May 12 2008 Eric Sandeen <esandeen at redhat.com> 1.40.9-2
+- Fix blkid swap recognition on big-endian boxes (#445786)
+
 * Sun Apr 27 2008 Eric Sandeen <esandeen at redhat.com> 1.40.9-1
 - New upstream version