rpms/rpm/FC-3 rpm-sparse.patch,NONE,1.1 rpm.spec,1.128,1.129

[fedora-cvs-commits at redhat.com]

Author: pnasrat

Update of /cvs/dist/rpms/rpm/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv28230

Modified Files:
	rpm.spec 
Added Files:
	rpm-sparse.patch 
Log Message:
sparse patch for lastlog (#155730)

rpm-sparse.patch:
 rpmfi.c       |    2 ++
 transaction.c |    1 +
 2 files changed, 3 insertions(+)

--- NEW FILE rpm-sparse.patch ---
Index: lib/rpmfi.c
===================================================================
RCS file: /cvs/devel/rpm/lib/rpmfi.c,v
retrieving revision 2.54.2.2
diff -u -u -r2.54.2.2 rpmfi.c
--- lib/rpmfi.c	5 Jul 2004 19:20:37 -0000	2.54.2.2
+++ lib/rpmfi.c	23 Nov 2004 17:31:50 -0000
@@ -592,6 +592,8 @@
      */
     if (dbWhat == REG) {
 	const unsigned char * omd5, * nmd5;
+	/* XXX avoid md5 on sparse /var/log/lastlog file. */
+	if (strcmp(fn, "/var/log/lastlog"))
 	if (domd5(fn, buffer, 0, NULL))
 	    return FA_CREATE;	/* assume file has been removed */
 	omd5 = rpmfiMD5(ofi);
Index: lib/transaction.c
===================================================================
RCS file: /cvs/devel/rpm/lib/transaction.c,v
retrieving revision 1.302.2.5
diff -u -u -r1.302.2.5 transaction.c
--- lib/transaction.c	29 Sep 2004 18:28:29 -0000	1.302.2.5
+++ lib/transaction.c	23 Nov 2004 17:31:50 -0000
@@ -613,6 +613,7 @@
 	    }
 		
 	    /* Here is a pre-existing modified config file that needs saving. */
+	    if (strcmp(fn, "/var/log/lastlog"))	/* XXX sparse file avoidance */
 	    {	char md5sum[50];
 		const unsigned char * MD5 = rpmfiMD5(fi);
 		if (!domd5(fn, md5sum, 0, NULL) && memcmp(MD5, md5sum, 16)) {


Index: rpm.spec
===================================================================
RCS file: /cvs/dist/rpms/rpm/FC-3/rpm.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- rpm.spec	17 Nov 2004 21:50:43 -0000	1.128
+++ rpm.spec	13 Jun 2005 17:12:44 -0000	1.129
@@ -20,9 +20,11 @@
 %define version 4.3.3
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 3
+Release: 3.0.fc3.1
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz
+Patch0:  rpm-4.3.2-noverbosity.patch
+Patch1:  rpm-sparse.patch
 License: GPL
 Conflicts: patch < 2.5
 %ifos linux
@@ -124,6 +126,8 @@
 
 %prep
 %setup -q
+%patch0 -b .verbosity
+%patch1 -b .sparse
 
 %build
 
@@ -495,6 +499,9 @@
 %{__includedir}/popt.h
 
 %changelog
+* Mon Jun 13 2005 Paul Nasrat <pnasrat at redhat.com> 4.3.3-3.0.fc3.1
+- sparse patch for lastlog (#155730)
+
 * Mon Nov 15 2004 Dan Walsh <dwalsh at redhat.com> 4.3.3-3
 - bump micro version.
 - make peace with libtool-1.5.10 and automake-1.9.3.