rpms/e2fsprogs/devel e2fsprogs-1.38-blkid-epoch.patch, NONE, 1.1 e2fsprogs.spec, 1.49, 1.50

[fedora-cvs-commits at redhat.com]

Author: dcantrel

Update of /cvs/dist/rpms/e2fsprogs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31467

Modified Files:
	e2fsprogs.spec 
Added Files:
	e2fsprogs-1.38-blkid-epoch.patch 
Log Message:
Disable /etc/blkid.tab caching if time is set before epoch (#182188)


e2fsprogs-1.38-blkid-epoch.patch:
 devname.c |    7 ++++---
 probe.c   |   14 ++++++++------
 2 files changed, 12 insertions(+), 9 deletions(-)

--- NEW FILE e2fsprogs-1.38-blkid-epoch.patch ---
--- e2fsprogs-1.38/lib/blkid/devname.c.epoch	2006-02-17 12:11:58.000000000 -0500
+++ e2fsprogs-1.38/lib/blkid/devname.c	2006-02-20 16:57:55.000000000 -0500
@@ -448,9 +448,10 @@
 	if (!cache)
 		return -BLKID_ERR_PARAM;
 
-	if (cache->bic_flags & BLKID_BIC_FL_PROBED &&
-	    time(0) - cache->bic_time < BLKID_PROBE_INTERVAL)
-		return 0;
+	if (time(0) > 0)
+		if (cache->bic_flags & BLKID_BIC_FL_PROBED &&
+		    time(0) - cache->bic_time < BLKID_PROBE_INTERVAL)
+			return 0;
 
 	blkid_read_cache(cache);
 #ifdef HAVE_DEVMAPPER
--- e2fsprogs-1.38/lib/blkid/probe.c.epoch	2006-02-17 12:11:57.000000000 -0500
+++ e2fsprogs-1.38/lib/blkid/probe.c	2006-02-20 16:56:48.000000000 -0500
@@ -656,13 +656,15 @@
 		return NULL;
 
 	now = time(0);
-	diff = now - dev->bid_time;
+	if (now > 0) {
+		diff = now - dev->bid_time;
 
-	if ((now < dev->bid_time) ||
-	    (diff < BLKID_PROBE_MIN) || 
-	    (dev->bid_flags & BLKID_BID_FL_VERIFIED &&
-	     diff < BLKID_PROBE_INTERVAL))
-		return dev;
+		if ((now < dev->bid_time) ||
+			 (diff < BLKID_PROBE_MIN) || 
+		    (dev->bid_flags & BLKID_BID_FL_VERIFIED &&
+		     diff < BLKID_PROBE_INTERVAL))
+			return dev;
+	}
 
 	DBG(DEBUG_PROBE,
 	    printf("need to revalidate %s (time since last check %lu)\n", 


Index: e2fsprogs.spec
===================================================================
RCS file: /cvs/dist/rpms/e2fsprogs/devel/e2fsprogs.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- e2fsprogs.spec	24 Feb 2006 16:00:15 -0000	1.49
+++ e2fsprogs.spec	7 Mar 2006 15:38:06 -0000	1.50
@@ -4,7 +4,7 @@
 Summary: Utilities for managing the second extended (ext2) filesystem.
 Name: e2fsprogs
 Version: 1.38
-Release: 9
+Release: 10
 License: GPL
 Group: System Environment/Base
 Source:  ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/e2fsprogs-%{version}.tar.gz
@@ -27,6 +27,7 @@
 Patch32: e2fsprogs-1.38-no_pottcdate.patch
 Patch33: e2fsprogs-1.38-lost+found.patch
 Patch34: e2fsprogs-1.38-blkid-devmapper.patch
+Patch35: e2fsprogs-1.38-blkid-epoch.patch
 Url: http://e2fsprogs.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: e2fsprogs-libs = %{version}-%{release}, device-mapper
@@ -120,6 +121,9 @@
 # look at device mapper devices
 %patch34 -p1 -b .dm
 
+# disable blkid.tab caching if time is set before epoch
+%patch35 -p1 -b .epoch
+
 %build
 aclocal
 autoconf
@@ -297,6 +301,9 @@
 %{_mandir}/man3/uuid_unparse.3*
 
 %changelog
+* Tue Mar 07 2006 David Cantrell <dcantrell at redhat.com> - 1.38-10
+- Disable /etc/blkid.tab caching if time is set before epoch (#182188)
+
 * Fri Feb 24 2006 Peter Jones <pjones at redhat.com> - 1.38-9
 - _don't_ handle selinux context on blkid.tab, dwalsh says this is a no-no.