RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: jbj@rpm5.org
Module: rpm Date: 28-Nov-2007 01:19:45
Branch: HEAD Handle: 2007112800194401
Modified files:
rpm CHANGES
rpm/build pack.c
rpm/lib psm.c
Log:
- jbj: fix: ditto, for *.src.rpm as well.
Summary:
Revision Changes Path
1.1896 +1 -0 rpm/CHANGES
2.262 +1 -1 rpm/build/pack.c
2.271 +2 -0 rpm/lib/psm.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.1895 -r1.1896 CHANGES
--- rpm/CHANGES 27 Nov 2007 23:00:20 -0000 1.1895
+++ rpm/CHANGES 28 Nov 2007 00:19:44 -0000 1.1896
@@ -1,4 +1,5 @@
5.0a2 -> 5.0a3:
+ - jbj: fix: ditto, for *.src.rpm as well.
- jbj: fix: RPMTAG_BUILDTIME is type RPM_UINT32_TYPE, not RPM_STRING_TYPE.
- jbj: fix: getBuildTime returns uint32_t *, not uint32_t.
- jbj: rpmbuild: more memory leak plugging.
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/pack.c
============================================================================
$ cvs diff -u -r2.261 -r2.262 pack.c
--- rpm/build/pack.c 27 Nov 2007 23:53:37 -0000 2.261
+++ rpm/build/pack.c 28 Nov 2007 00:19:45 -0000 2.262
@@ -1104,7 +1104,7 @@
xx = headerPut(spec->sourceHeader, he, 0);
he->tag = RPMTAG_BUILDTIME;
- he->t = RPM_STRING_TYPE;
+ he->t = RPM_UINT32_TYPE;
he->p.ui32p = getBuildTime();
he->c = 1;
xx = headerPut(spec->sourceHeader, he, 0);
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/psm.c
============================================================================
$ cvs diff -u -r2.270 -r2.271 psm.c
--- rpm/lib/psm.c 26 Nov 2007 05:42:24 -0000 2.270
+++ rpm/lib/psm.c 28 Nov 2007 00:19:45 -0000 2.271
@@ -391,7 +391,9 @@
(void) Fclose(fi->te->fd);
fi->te->fd = NULL;
fi->te = NULL;
+#if 0
fi = rpmfiFree(fi);
+#endif
}
/* XXX nuke the added package(s). */
@@ .
Received on Wed Nov 28 01:19:45 2007