[CVS] RPM: rpm/ CHANGES rpm/build/ files.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: rpm Date: 17-Jul-2012 15:02:02
Branch: HEAD Handle: 2012071713020200
Modified files:
rpm CHANGES
rpm/build files.c
Log:
Accept owner as an alias to user %verify attribute
This fix rhbz#838657. Already fixed in the master branch @rpm.org
The latest MAXIMUM RPM and RedHat RPM Guide
(http://docs.fedoraproject.org/en-US/Fedora_Draft_Documentation/0.1/html/RPM_Guide/ch09s05s05.html)
describe owner instead of user as a %verify attribute
Summary:
RevisionChanges Path
1.3689 +2 -0 rpm/CHANGES
1.370 +1 -0 rpm/build/files.c
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3688 -r1.3689 CHANGES
--- rpm/CHANGES 27 Apr 2012 07:36:31 - 1.3688
+++ rpm/CHANGES 17 Jul 2012 13:02:02 - 1.3689
@@ -1,4 +1,6 @@
HEAD:
+- devzero2000: Accept owner as an alias to user %verify attribute
+ (fix rhbz #838657). Already fixed in the master branch @rpm.org
- devzero2000: add more Fedorable gpg keys to thkp.c test program
- devzero2000: call with safety some python API that
can segfault if called with a NULL pointer.
@@ .
patch -p0 '@@ .'
Index: rpm/build/files.c
$ cvs diff -u -r1.369 -r1.370 files.c
--- rpm/build/files.c 28 Aug 2010 16:07:04 - 1.369
+++ rpm/build/files.c 17 Jul 2012 13:02:02 - 1.370
@@ -310,6 +310,7 @@
{ size,0, RPMVERIFY_FILESIZE },
{ link,0, RPMVERIFY_LINKTO },
{ user,0, RPMVERIFY_USER },
+{ owner, 0, RPMVERIFY_USER },
{ group, 0, RPMVERIFY_GROUP },
{ mtime, 0, RPMVERIFY_MTIME },
{ mode,0, RPMVERIFY_MODE },
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES rpm/build/ files.c rpm/lib/ rpmcli.h rpm/rpmdb...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 29-Aug-2009 19:34:00
Branch: HEAD Handle: 2009082917335802
Modified files:
rpm CHANGES
rpm/build files.c
rpm/lib rpmcli.h
rpm/rpmdb legacy.c legacy.h
rpm/rpmio digest.c
rpm/tools rpmdigest.c
Log:
- permit HMAC's to be substituted for digests in *.rpm.
Summary:
RevisionChanges Path
1.3096 +1 -0 rpm/CHANGES
1.361 +28 -9 rpm/build/files.c
2.96+9 -7 rpm/lib/rpmcli.h
1.43+30 -18 rpm/rpmdb/legacy.c
1.13+5 -5 rpm/rpmdb/legacy.h
2.90+0 -2 rpm/rpmio/digest.c
2.17+12 -12 rpm/tools/rpmdigest.c
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3095 -r1.3096 CHANGES
--- rpm/CHANGES 28 Aug 2009 19:15:10 - 1.3095
+++ rpm/CHANGES 29 Aug 2009 17:33:58 - 1.3096
@@ -1,5 +1,6 @@
5.2b1 - 5.3a1
+- jbj: permit HMAC's to be substituted for digests in *.rpm.
- jbj: reserve a bit to mark file HMAC's.
- jbj: rpmdigest: add --fips140 to verify Fedorable HMAC's.
- jbj: rpmio: add fdInitHmac()/rpmHmacInit() methods for HMAC generation.
@@ .
patch -p0 '@@ .'
Index: rpm/build/files.c
$ cvs diff -u -r1.360 -r1.361 files.c
--- rpm/build/files.c 20 Aug 2009 16:28:22 - 1.360
+++ rpm/build/files.c 29 Aug 2009 17:33:58 - 1.361
@@ -137,11 +137,11 @@
int inFtw;
int currentFlags;
specdFlags currentSpecdFlags;
-int currentVerifyFlags;
+unsigned currentVerifyFlags;
struct AttrRec_s cur_ar;
struct AttrRec_s def_ar;
specdFlags defSpecdFlags;
-int defVerifyFlags;
+unsigned defVerifyFlags;
int nLangs;
/*...@only@*/ /*...@null@*/
const char ** currentLangs;
@@ -304,7 +304,7 @@
/*...@-exportlocal -exportheader...@*/
/*...@unchecked@*/
static VFA_t verifyAttrs[] = {
-{ md5, 0, RPMVERIFY_MD5 },
+{ md5, 0, RPMVERIFY_FDIGEST },/* XXX legacy syntax */
{ size,0, RPMVERIFY_FILESIZE },
{ link,0, RPMVERIFY_LINKTO },
{ user,0, RPMVERIFY_USER },
@@ -312,6 +312,8 @@
{ mtime, 0, RPMVERIFY_MTIME },
{ mode,0, RPMVERIFY_MODE },
{ rdev,0, RPMVERIFY_RDEV },
+{ digest, 0, RPMVERIFY_FDIGEST },
+{ hmac,0, RPMVERIFY_HMAC },
{ NULL, 0, 0 }
};
/*...@=exportlocal =exportheader...@*/
@@ -329,9 +331,9 @@
{
char *p, *pe, *q;
const char *name;
-int *resultVerify;
+unsigned *resultVerify;
int negated;
-int verifyFlags;
+unsigned verifyFlags;
specdFlags * specdFlags;
if ((p = strstr(buf, (name = %verify))) != NULL) {
@@ -389,6 +391,7 @@
if (strcmp(p, vfa-attribute))
/*...@innercontinue@*/ continue;
verifyFlags |= vfa-flag;
+ verifyFlags = ~RPMVERIFY_FDIGEST;
/*...@innerbreak@*/ break;
}
if (vfa-attribute)
@@ -405,6 +408,15 @@
}
*resultVerify = negated ? ~(verifyFlags) : verifyFlags;
+if (negated) {
+ /* Make sure no digest implies no hmac */
+ if (!(*resultVerify RPMVERIFY_FDIGEST))
+ *resultVerify = ~RPMVERIFY_HMAC;
+} else {
+ /* Make sure hmac implies no digest */
+ if (*resultVerify RPMVERIFY_HMAC)
+ *resultVerify = ~RPMVERIFY_FDIGEST;
+}
*specdFlags |= SPECD_VERIFY;
return RPMRC_OK;
@@ -1001,7 +1013,7 @@
/* XXX WATCHOUT: buf is an arg */
{
/*...@only@*/
- static char *_docdir_fmt = NULL;
+ static char *_docdir_fmt = NULL;/* XXX memleak */
static int oneshot = 0;
const char *ddir, *fmt, *errstr;
if (!oneshot) {
@@ -1506,8 +1518,15 @@
he-append = 0;
buf[0] = '\0';
- if (S_ISREG(flp-fl_mode))
- (void) dodigest(dalgo, flp-diskURL, (unsigned char *)buf, 1, NULL);
+ if (S_ISREG(flp-fl_mode)) {
+ unsigned dflags = 0x01; /* asAscii */
+#define _mask (RPMVERIFY_FDIGEST|RPMVERIFY_HMAC)
+
[CVS] RPM: rpm/ CHANGES rpm/build/ files.c rpm/js/ rpmsx-js.c rpm/lib/...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 11-Jul-2009 23:32:36
Branch: HEAD Handle: 2009071121323303
Modified files:
rpm CHANGES system.h
rpm/build files.c
rpm/js rpmsx-js.c
rpm/lib Makefile.am formats.c fsm.c poptALL.c psm.c
rpmfi.c rpmfi.h rpmts.c rpmts.h transaction.c
rpm/rpmdb rpmdb.c
rpm/rpmio iosm.c librpmio.vers poptIO.c rpmsx.c rpmsx.h
rpmtcl.h
Removed files:
rpm/lib rpmsx.c rpmsx.h
Log:
- rpmsx: refactor the existing SELinux implementation.
Summary:
RevisionChanges Path
1.3049 +1 -0 rpm/CHANGES
1.359 +15 -34 rpm/build/files.c
1.2 +2 -1 rpm/js/rpmsx-js.c
2.190 +2 -2 rpm/lib/Makefile.am
2.132 +8 -0 rpm/lib/formats.c
2.186 +14 -31 rpm/lib/fsm.c
2.136 +0 -8 rpm/lib/poptALL.c
2.377 +2 -3 rpm/lib/psm.c
2.150 +2 -0 rpm/lib/rpmfi.c
2.76+2 -0 rpm/lib/rpmfi.h
2.28+0 -690rpm/lib/rpmsx.c
2.20+0 -274rpm/lib/rpmsx.h
2.172 +2 -4 rpm/lib/rpmts.c
2.120 +0 -4 rpm/lib/rpmts.h
1.404 +6 -10 rpm/lib/transaction.c
1.308 +3 -16 rpm/rpmdb/rpmdb.c
1.41+14 -28 rpm/rpmio/iosm.c
2.131 +7 -4 rpm/rpmio/librpmio.vers
1.56+1 -1 rpm/rpmio/poptIO.c
2.2 +174 -47rpm/rpmio/rpmsx.c
2.2 +56 -29 rpm/rpmio/rpmsx.h
2.9 +4 -0 rpm/rpmio/rpmtcl.h
2.122 +0 -69 rpm/system.h
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3048 -r1.3049 CHANGES
--- rpm/CHANGES 11 Jul 2009 07:09:09 - 1.3048
+++ rpm/CHANGES 11 Jul 2009 21:32:33 - 1.3049
@@ -1,5 +1,6 @@
5.2b1 - 5.3a1
+- jbj: rpmsx: refactor the existing SELinux implementation.
- jbj: python: fix: missing changelog in repo-md can segfault (David
Smid).
- jbj: rpmdav: oops, WebDAV is different code path, revert some changes.
- jbj: rpmdav: compute st_nlink correctly for plain HTTP dirs.
@@ .
patch -p0 '@@ .'
Index: rpm/build/files.c
$ cvs diff -u -r1.358 -r1.359 files.c
--- rpm/build/files.c 10 Jun 2009 18:21:09 - 1.358
+++ rpm/build/files.c 11 Jul 2009 21:32:34 - 1.359
@@ -18,6 +18,7 @@
#include rpmiotypes.h
#include rpmio_internal.h /* XXX fdGetFp */
#include rpmcb.h
+#include rpmsx.h
#include fts.h
#include argv.h
@@ -1329,8 +1330,7 @@
int apathlen = 0;
int dpathlen = 0;
int skipLen = 0;
-security_context_t scon = NULL;
-const char * sxfn;
+rpmsx sx = rpmsxNew(%{?_build_file_context_path}, 0);
FileListRec flp;
rpmuint32_t dalgo = getDigestAlgo(h, isSrc);
char buf[BUFSIZ];
@@ -1347,12 +1347,6 @@
skipLen += strlen(fl-prefix);
}
-sxfn = rpmGetPath(%{?_build_file_context_path}, NULL);
-/*...@-moduncon@*/
-if (sxfn != NULL *sxfn != '\0')
- xx = matchpathcon_init(sxfn);
-/*...@=moduncon@*/
-
for (i = 0, flp = fl-fileList; i fl-fileListRecsUsed; i++, flp++) {
const char *s;
@@ -1591,35 +1585,22 @@
he-append = 0;
/* Add file security context to package. */
- if (sxfn != NULL *sxfn != '\0' !(_rpmbuildFlags 4)) {
- /*...@observer@*/
- static char *nocon = ;
-/*...@-moduncon@*/
- if (matchpathcon(flp-fileURL, flp-fl_mode, scon) || scon == NULL)
- scon = nocon;
-/*...@=moduncon@*/
-
- he-tag = RPMTAG_FILECONTEXTS;
- he-t = RPM_STRING_ARRAY_TYPE;
- he-p.argv = (const char **)scon; /* XXX NOCAST */
- he-c = 1;
- he-append = 1;
- xx = headerPut(h, he, 0);
- he-append = 0;
-
-/*...@-modobserver@*//* observer nocon not modified. */
- if (scon != nocon) {
- freecon(scon);
+ if (sx !(_rpmbuildFlags 4)) {
+ const char * scon = rpmsxMatch(sx, flp-fileURL, flp-fl_mode);
+ if (scon) {
+ he-tag = RPMTAG_FILECONTEXTS;
+ he-t = RPM_STRING_ARRAY_TYPE;
+ he-p.argv = scon;
+
[CVS] RPM: rpm/ CHANGES rpm/build/ files.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 10-Jun-2009 20:21:09
Branch: HEAD Handle: 2009061018210801
Modified files:
rpm CHANGES
rpm/build files.c
Log:
- add the Fedorable tag(s) for file digests.
Summary:
RevisionChanges Path
1.3016 +1 -0 rpm/CHANGES
1.358 +53 -38 rpm/build/files.c
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3015 -r1.3016 CHANGES
--- rpm/CHANGES 6 Jun 2009 20:35:11 - 1.3015
+++ rpm/CHANGES 10 Jun 2009 18:21:08 - 1.3016
@@ -1,5 +1,6 @@
5.2b1 - 5.3a1
+- jbj: add the Fedorable tag(s) for file digests.
- jbj: reserve ~1K in RPMSIGTAG_PADDING for now.
- jbj: squirrel: capture stdout in an iob.
- jbj: squirrel: add --with-squirrel for embedding squirrel.
@@ .
patch -p0 '@@ .'
Index: rpm/build/files.c
$ cvs diff -u -r1.357 -r1.358 files.c
--- rpm/build/files.c 30 May 2009 15:41:07 - 1.357
+++ rpm/build/files.c 10 Jun 2009 18:21:09 - 1.358
@@ -1254,6 +1254,57 @@
xx = headerDel(h, he, 0);
}
+static rpmuint32_t getDigestAlgo(Header h, int isSrc)
+ /*...@modifies h @*/
+{
+HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
+static rpmuint32_t source_file_dalgo = 0;
+static rpmuint32_t binary_file_dalgo = 0;
+static int oneshot = 0;
+rpmuint32_t dalgo = 0;
+int xx;
+
+if (!oneshot) {
+ source_file_dalgo =
+ rpmExpandNumeric(%{?_build_source_file_digest_algo});
+ binary_file_dalgo =
+ rpmExpandNumeric(%{?_build_binary_file_digest_algo});
+ oneshot++;
+}
+
+dalgo = (isSrc ? source_file_dalgo : binary_file_dalgo);
+switch (dalgo) {
+case PGPHASHALGO_SHA1:
+case PGPHASHALGO_MD2:
+case PGPHASHALGO_SHA256:
+case PGPHASHALGO_SHA384:
+case PGPHASHALGO_SHA512:
+ (void) rpmlibNeedsFeature(h, FileDigests, 4.6.0-1);
+ he-tag = RPMTAG_FILEDIGESTALGO;
+ he-t = RPM_UINT32_TYPE;
+ he-p.ui32p = dalgo;
+ he-c = 1;
+ xx = headerPut(h, he, 0);
+ /*...@fallthgrough@*/
+case PGPHASHALGO_RIPEMD160:
+case PGPHASHALGO_TIGER192:
+case PGPHASHALGO_MD4:
+case PGPHASHALGO_RIPEMD128:
+case PGPHASHALGO_CRC32:
+case PGPHASHALGO_ADLER32:
+case PGPHASHALGO_CRC64:
+ (void) rpmlibNeedsFeature(h, FileDigestParameterized, 4.4.6-1);
+ /*...@switchbreak@*/ break;
+case PGPHASHALGO_MD5:
+case PGPHASHALGO_HAVAL_5_160:/* XXX unimplemented */
+default:
+ dalgo = PGPHASHALGO_MD5;
+ /*...@switchbreak@*/ break;
+}
+
+return dalgo;
+}
+
/**
* Add file entries to header.
* @todo Should directories have %doc/%config attributes? (#14531)
@@ -1281,9 +1332,10 @@
security_context_t scon = NULL;
const char * sxfn;
FileListRec flp;
+rpmuint32_t dalgo = getDigestAlgo(h, isSrc);
char buf[BUFSIZ];
int i, xx;
-
+
/* Sort the big list */
qsort(fl-fileList, fl-fileListRecsUsed,
sizeof(*(fl-fileList)), compareFileListRecs);
@@ -1459,42 +1511,6 @@
xx = headerPut(h, he, 0);
he-append = 0;
- { static rpmuint32_t source_file_dalgo = 0;
- static rpmuint32_t binary_file_dalgo = 0;
- static int oneshot = 0;
- rpmuint32_t dalgo = 0;
-
- if (!oneshot) {
- source_file_dalgo =
- rpmExpandNumeric(%{?_build_source_file_digest_algo});
- binary_file_dalgo =
- rpmExpandNumeric(%{?_build_binary_file_digest_algo});
- oneshot++;
- }
-
- dalgo = (isSrc ? source_file_dalgo : binary_file_dalgo);
- switch (dalgo) {
- case PGPHASHALGO_SHA1:
- case PGPHASHALGO_RIPEMD160:
- case PGPHASHALGO_MD2:
- case PGPHASHALGO_TIGER192:
- case PGPHASHALGO_SHA256:
- case PGPHASHALGO_SHA384:
- case PGPHASHALGO_SHA512:
- case PGPHASHALGO_MD4:
- case PGPHASHALGO_RIPEMD128:
- case PGPHASHALGO_CRC32:
- case PGPHASHALGO_ADLER32:
- case PGPHASHALGO_CRC64:
- (void) rpmlibNeedsFeature(h, FileDigestParameterized, 4.4.6-1);
- /*...@switchbreak@*/ break;
- case PGPHASHALGO_MD5:
- case PGPHASHALGO_HAVAL_5_160: /* XXX
[CVS] RPM: rpm/ CHANGES rpm/build/ files.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 03-May-2009 18:57:33
Branch: HEAD Handle: 2009050316573300
Modified files:
rpm CHANGES
rpm/build files.c
Log:
revert previous %{disttag} change since src.rpm filename isn't
carrying it anyways..
Summary:
RevisionChanges Path
1.2964 +0 -1 rpm/CHANGES
1.356 +0 -1 rpm/build/files.c
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.2963 -r1.2964 CHANGES
--- rpm/CHANGES 2 May 2009 22:56:32 - 1.2963
+++ rpm/CHANGES 3 May 2009 16:57:33 - 1.2964
@@ -1,6 +1,5 @@
5.2a4 - 5.2b1:
-- proyvind: add %{disttag} to source package header.
- jbj: js: add AutoFu to build --with-js=internal.
- jbj: ruby: fix: global interpreter with contained object refcnts needs
early cleanup in rpmcliFini(), not in rpmioClean().
@@ .
patch -p0 '@@ .'
Index: rpm/build/files.c
$ cvs diff -u -r1.355 -r1.356 files.c
--- rpm/build/files.c 2 May 2009 22:56:33 - 1.355
+++ rpm/build/files.c 3 May 2009 16:57:33 - 1.356
@@ -2543,7 +2543,6 @@
case RPMTAG_DESCRIPTION:
case RPMTAG_PACKAGER:
case RPMTAG_DISTRIBUTION:
- case RPMTAG_DISTTAG:
case RPMTAG_DISTURL:
case RPMTAG_VENDOR:
case RPMTAG_LICENSE:
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES rpm/build/ files.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 03-May-2009 00:56:33
Branch: HEAD Handle: 2009050222563201
Modified files:
rpm CHANGES
rpm/build files.c
Log:
add %{disttag} to source package header.
Summary:
RevisionChanges Path
1.2963 +1 -0 rpm/CHANGES
1.355 +1 -0 rpm/build/files.c
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.2962 -r1.2963 CHANGES
--- rpm/CHANGES 2 May 2009 20:06:27 - 1.2962
+++ rpm/CHANGES 2 May 2009 22:56:32 - 1.2963
@@ -1,5 +1,6 @@
5.2a4 - 5.2b1:
+- proyvind: add %{disttag} to source package header.
- jbj: js: add AutoFu to build --with-js=internal.
- jbj: ruby: fix: global interpreter with contained object refcnts needs
early cleanup in rpmcliFini(), not in rpmioClean().
@@ .
patch -p0 '@@ .'
Index: rpm/build/files.c
$ cvs diff -u -r1.354 -r1.355 files.c
--- rpm/build/files.c 18 Mar 2009 15:25:45 - 1.354
+++ rpm/build/files.c 2 May 2009 22:56:33 - 1.355
@@ -2543,6 +2543,7 @@
case RPMTAG_DESCRIPTION:
case RPMTAG_PACKAGER:
case RPMTAG_DISTRIBUTION:
+ case RPMTAG_DISTTAG:
case RPMTAG_DISTURL:
case RPMTAG_VENDOR:
case RPMTAG_LICENSE:
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES rpm/build/ files.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 17-Jan-2009 01:11:00 Branch: HEAD Handle: 2009011700105900 Modified files: rpm CHANGES rpm/build files.c Log: - rpm.org: Fix buffer overflow on oversized filelist entries(susebz#397006). Summary: RevisionChanges Path 1.2738 +1 -0 rpm/CHANGES 1.350 +2 -1 rpm/build/files.c patch -p0 '@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.2737 -r1.2738 CHANGES --- rpm/CHANGES 16 Jan 2009 20:47:10 - 1.2737 +++ rpm/CHANGES 17 Jan 2009 00:10:59 - 1.2738 @@ -1,5 +1,6 @@ 5.2a2 - 5.2a3: +- rpm.org: Fix buffer overflow on oversized filelist entries(susebz#397006). - jbj: rpmdigest: avoid segfault on named pipes and other uglix fauna. - jbj: pcre: finalize --with-pcre=internal building. - jbj: pcre: punish PLD with internal bloat until the trivial AutoFu exists. @@ . patch -p0 '@@ .' Index: rpm/build/files.c $ cvs diff -u -r1.349 -r1.350 files.c --- rpm/build/files.c 22 Dec 2008 15:46:44 - 1.349 +++ rpm/build/files.c 17 Jan 2009 00:10:59 - 1.350 @@ -2364,7 +2364,8 @@ continue; fileName = NULL; /*...@-nullpass@*/ /* LCL: buf is NULL ?!? */ - strcpy(buf, s); + strncpy(buf, s, sizeof(buf)-1); + buf[sizeof(buf)-1] = '\0'; /*...@=nullpass@*/ /* Reset for a new line in %files */ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES rpm/build/ files.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 17-Jan-2009 01:33:30
Branch: HEAD Handle: 2009011700332900
Modified files:
rpm CHANGES
rpm/build files.c
Log:
- rpm.org: Don't bother calculating string sizes manually.
Summary:
RevisionChanges Path
1.2741 +1 -0 rpm/CHANGES
1.351 +1 -0 rpm/build/files.c
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.2740 -r1.2741 CHANGES
--- rpm/CHANGES 17 Jan 2009 00:22:54 - 1.2740
+++ rpm/CHANGES 17 Jan 2009 00:33:29 - 1.2741
@@ -1,5 +1,6 @@
5.2a2 - 5.2a3:
+- rpm.org: Don't bother calculating string sizes manually.
- rpm.org: memory used by lua gets freed (just remove comment).
- rpm.org: repeated read config - free config needs globalLuaState ==
NULL.
- rpm.org: Fix buffer overflow on oversized filelist
entries(susebz#397006).
@@ .
patch -p0 '@@ .'
Index: rpm/build/files.c
$ cvs diff -u -r1.350 -r1.351 files.c
--- rpm/build/files.c 17 Jan 2009 00:10:59 - 1.350
+++ rpm/build/files.c 17 Jan 2009 00:33:29 - 1.351
@@ -2720,6 +2720,7 @@
memset(fl, 0, sizeof(fl));
if (_srcdefattr *_srcdefattr) {
xx = snprintf(_srcdefattr_buf, sizeof(_srcdefattr_buf), %%defattr
%s, _srcdefattr);
+ _srcdefattr_buf[sizeof(_srcdefattr_buf)-1] = '\0';
xx = parseForAttr(_srcdefattr_buf, fl);
}
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES rpm/build/ files.c rpm/lib/ rpmfi.h
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 08-Dec-2008 02:48:38
Branch: HEAD Handle: 2008120801483700
Modified files:
rpm CHANGES
rpm/build files.c
rpm/lib rpmfi.h
Log:
- sketch in %remove file flag, surely gonna change before finished.
Summary:
RevisionChanges Path
1.2672 +1 -0 rpm/CHANGES
1.347 +1 -0 rpm/build/files.c
2.66+2 -1 rpm/lib/rpmfi.h
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.2671 -r1.2672 CHANGES
--- rpm/CHANGES 8 Dec 2008 01:20:01 - 1.2671
+++ rpm/CHANGES 8 Dec 2008 01:48:37 - 1.2672
@@ -1,5 +1,6 @@
5.2a2 - 5.2a3:
+- jbj: sketch in %remove file flag, surely gonna change before finished.
- jbj: eliminate --nomd5, use --nofdigests instead.
- jbj: sketch in arbitrary per-package Transflags: tag.
- jbj: add RPMTRANS_FLAGS_NORPMDB and --norpmdb disablers.
@@ .
patch -p0 '@@ .'
Index: rpm/build/files.c
$ cvs diff -u -r1.346 -r1.347 files.c
--- rpm/build/files.c 3 Aug 2008 19:59:08 - 1.346
+++ rpm/build/files.c 8 Dec 2008 01:48:37 - 1.347
@@ -865,6 +865,7 @@
{ %pubkey,0, RPMFILE_PUBKEY },
{ %policy,0, RPMFILE_POLICY },
{ %optional, 0, RPMFILE_OPTIONAL },
+ { %remove,0, RPMFILE_REMOVE },
#if WHY_NOT
{ %icon, 0, RPMFILE_ICON },
@@ .
patch -p0 '@@ .'
Index: rpm/lib/rpmfi.h
$ cvs diff -u -r2.65 -r2.66 rpmfi.h
--- rpm/lib/rpmfi.h 23 Sep 2008 19:00:09 - 2.65
+++ rpm/lib/rpmfi.h 8 Dec 2008 01:48:37 - 2.66
@@ -65,7 +65,8 @@
RPMFILE_TYPED= (1 15),/*! (unimplemented) from %%spook */
RPMFILE_SOURCE = (1 16),/*! from SourceN: (srpm only). */
RPMFILE_PATCH= (1 17),/*! from PatchN: (srpm only). */
-RPMFILE_OPTIONAL = (1 18) /*! from %%optional. */
+RPMFILE_OPTIONAL = (1 18),/*! from %%optional. */
+RPMFILE_REMOVE = (1 19) /*! remove file (after %post). */
} rpmfileAttrs;
#define RPMFILE_SPOOK (RPMFILE_GHOST|RPMFILE_TYPED)
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES rpm/build/ files.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 07-Jul-2008 23:23:09
Branch: HEAD Handle: 2008070721230900
Modified files:
rpm CHANGES
rpm/build files.c
Log:
- rpm.org: Make verifyAttrs and virtualFileAttributes static.
Summary:
RevisionChanges Path
1.2472 +1 -0 rpm/CHANGES
1.339 +2 -2 rpm/build/files.c
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.2471 -r1.2472 CHANGES
--- rpm/CHANGES 7 Jul 2008 21:16:53 - 1.2471
+++ rpm/CHANGES 7 Jul 2008 21:23:09 - 1.2472
@@ -1,5 +1,6 @@
5.1.0 - 5.2a0:
+- rpm.org: Make verifyAttrs and virtualFileAttributes static.
- rpm.org: Teach Fflush about lzdio.
- jbj: add _flush to FDIO_t, make bzdio.c standalone.
- jbj: rpmio: start deconstructing the ancient URL callback.
@@ .
patch -p0 '@@ .'
Index: rpm/build/files.c
$ cvs diff -u -r1.338 -r1.339 files.c
--- rpm/build/files.c 7 Jul 2008 04:25:34 - 1.338
+++ rpm/build/files.c 7 Jul 2008 21:23:09 - 1.339
@@ -299,7 +299,7 @@
*/
/[EMAIL PROTECTED] [EMAIL PROTECTED]/
/[EMAIL PROTECTED]@*/
-VFA_t verifyAttrs[] = {
+static VFA_t verifyAttrs[] = {
{ md5, 0, RPMVERIFY_MD5 },
{ size,0, RPMVERIFY_FILESIZE },
{ link,0, RPMVERIFY_LINKTO },
@@ -852,7 +852,7 @@
*/
/[EMAIL PROTECTED] [EMAIL PROTECTED]/
/[EMAIL PROTECTED]@*/
-VFA_t virtualFileAttributes[] = {
+static VFA_t virtualFileAttributes[] = {
{ %dir, 0, 0 },/* XXX why not RPMFILE_DIR? */
{ %doc, 0, RPMFILE_DOC },
{ %ghost, 0, RPMFILE_GHOST },
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES rpm/build/ files.c rpm/lib/ librpm.vers rpmfi....
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Alexey Tourbin
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 07-Jul-2008 06:25:34
Branch: HEAD Handle: 2008070704253301
Modified files:
rpm CHANGES
rpm/build files.c
rpm/lib librpm.vers rpmfi.c rpmfi.h
Log:
s/rpmfiFMaxLen/rpmfiFNMaxLen/g
Summary:
RevisionChanges Path
1.2467 +1 -1 rpm/CHANGES
1.338 +1 -1 rpm/build/files.c
1.46+1 -1 rpm/lib/librpm.vers
2.126 +1 -1 rpm/lib/rpmfi.c
2.58+1 -1 rpm/lib/rpmfi.h
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.2466 -r1.2467 CHANGES
--- rpm/CHANGES 6 Jul 2008 21:16:45 - 1.2466
+++ rpm/CHANGES 7 Jul 2008 04:25:33 - 1.2467
@@ -4,7 +4,7 @@
- jbj: rpmwget: wire up --progress; only bar|none args implemented.
- jbj: rpmwget: add rate/eta calculation to progress bar and logging.
- jbj: rpmdav: prepare to tie wget logging into davNotify transitions.
-- at: rpmfi: new function: size_t rpmfiFMaxLen(rpmfi).
+- at: rpmfi: new function: size_t rpmfiFNMaxLen(rpmfi).
- at: rpmbuild: check for unpackaged subdirectories.
- jbj: fix: resurrect cpuinfo() probe, hack-o-rounds for both /proc
libio.
- jbj: rpmio: remove fdSize, rewrite rpmioSlurp to use Fstat(2) instead.
@@ .
patch -p0 '@@ .'
Index: rpm/build/files.c
$ cvs diff -u -r1.337 -r1.338 files.c
--- rpm/build/files.c 7 Jul 2008 04:11:16 - 1.337
+++ rpm/build/files.c 7 Jul 2008 04:25:34 - 1.338
@@ -2971,7 +2971,7 @@
fi = rpmfiFree(fi);
return 0;
}
-fn = alloca(rpmfiFMaxLen(fi) + 1);
+fn = alloca(rpmfiFNMaxLen(fi) + 1);
fi = rpmfiInit(fi, 0);
while ((i = rpmfiNext(fi)) = 0) {
@@ .
patch -p0 '@@ .'
Index: rpm/lib/librpm.vers
$ cvs diff -u -r1.45 -r1.46 librpm.vers
--- rpm/lib/librpm.vers 6 Jul 2008 04:24:42 - 1.45
+++ rpm/lib/librpm.vers 7 Jul 2008 04:25:34 - 1.46
@@ -160,7 +160,7 @@
rpmfiFGroup;
rpmfiFInode;
rpmfiFLink;
-rpmfiFMaxLen;
+rpmfiFNMaxLen;
rpmfiFMode;
rpmfiFMtime;
rpmfiFN;
@@ .
patch -p0 '@@ .'
Index: rpm/lib/rpmfi.c
$ cvs diff -u -r2.125 -r2.126 rpmfi.c
--- rpm/lib/rpmfi.c 6 Jul 2008 04:24:42 - 2.125
+++ rpm/lib/rpmfi.c 7 Jul 2008 04:25:34 - 2.126
@@ -153,7 +153,7 @@
return FN;
}
-size_t rpmfiFMaxLen(rpmfi fi)
+size_t rpmfiFNMaxLen(rpmfi fi)
{
if (fi != NULL)
return fi-fnlen;
@@ .
patch -p0 '@@ .'
Index: rpm/lib/rpmfi.h
$ cvs diff -u -r2.57 -r2.58 rpmfi.h
--- rpm/lib/rpmfi.h 6 Jul 2008 05:31:03 - 2.57
+++ rpm/lib/rpmfi.h 7 Jul 2008 04:25:34 - 2.58
@@ -398,7 +398,7 @@
* @return maximum file name length (not including '\0')
*/
/[EMAIL PROTECTED]@*/
-extern size_t rpmfiFMaxLen(/[EMAIL PROTECTED]@*/ rpmfi fi);
+extern size_t rpmfiFNMaxLen(/[EMAIL PROTECTED]@*/ rpmfi fi);
/**
* Return current file flags from file info set.
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES rpm/build/ files.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Alexey Tourbin
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 06-Jul-2008 02:26:19
Branch: HEAD Handle: 2008070600261900
Modified files:
rpm CHANGES
rpm/build files.c
Log:
build/files.c: check for unpackaged subdirectories
Summary:
RevisionChanges Path
1.2464 +1 -0 rpm/CHANGES
1.331 +122 -0 rpm/build/files.c
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.2463 -r1.2464 CHANGES
--- rpm/CHANGES 5 Jul 2008 23:35:11 - 1.2463
+++ rpm/CHANGES 6 Jul 2008 00:26:19 - 1.2464
@@ -1,5 +1,6 @@
5.1.0 - 5.2a0:
+- at: rpmbuild: check for unpackaged subdirectories.
- jbj: fix: resurrect cpuinfo() probe, hack-o-rounds for both /proc
libio.
- jbj: rpmio: remove fdSize, rewrite rpmioSlurp to use Fstat(2) instead.
- jbj: rpmdav: display connection state transitions while debugging.
@@ .
patch -p0 '@@ .'
Index: rpm/build/files.c
$ cvs diff -u -r1.330 -r1.331 files.c
--- rpm/build/files.c 5 Jul 2008 02:52:14 - 1.330
+++ rpm/build/files.c 6 Jul 2008 00:26:19 - 1.331
@@ -2923,6 +2923,127 @@
return n;
}
+/* auxiliary function: check if directory d is packaged */
+static int packagedDir(Package pkg, const char *d)
+{
+int i;
+int found = 0;
+const char *fn;
+rpmfi fi = rpmfiNew(NULL, pkg-header, RPMTAG_BASENAMES, 0);
+
+fi = rpmfiInit(fi, 0);
+while ((i = rpmfiNext(fi)) = 0) {
+ if (!S_ISDIR(rpmfiFMode(fi)))
+ continue;
+ fn = rpmfiFN(fi);
+ if (strcmp(fn, d) == 0) {
+ found = 1;
+ break;
+ }
+}
+fi = rpmfiFree(fi);
+return found;
+}
+
+/* auxiliary function: find unpackaged subdirectories
+ *
+ * E.g. consider this %files section:
+ * %dir /A
+ * /A/B/C/D
+ * Now directories /A/B and /A/B/C should also be packaged.
+ */
+static int pkgUnpackagedSubdirs(Package pkg)
+{
+int n = 0;
+int i, j;
+char **unpackaged = NULL;
+rpmfi fi = rpmfiNew(NULL, pkg-header, RPMTAG_BASENAMES, 0);
+
+fi = rpmfiInit(fi, 0);
+while ((i = rpmfiNext(fi)) = 0) {
+ int found = 0;
+ /* make local copy of file name */
+ const char *fn_ = rpmfiFN(fi);
+ size_t fn_len = strlen(fn_);
+ char *fn = alloca(fn_len + 1);
+ char *p = fn;
+ strcpy(fn, fn_);
+ /* find the first path component that is packaged */
+ while ((p = strchr(p + 1, '/'))) {
+ *p = '\0';
+ found = packagedDir(pkg, fn);
+ *p = '/';
+ if (found)
+ break;
+ }
+ if (!found)
+ continue;
+ /* other path components should be packaged, too */
+ while ((p = strchr(p + 1, '/'))) {
+ *p = '\0';
+ if (packagedDir(pkg, fn)) {
+ *p = '/';
+ continue;
+ }
+ /* might be already added */
+ found = 0;
+ for (j = 0; j n; j++)
+ if (strcmp(fn, unpackaged[j]) == 0) {
+ found = 1;
+ break;
+ }
+ if (found) {
+ *p = '/';
+ continue;
+ }
+ unpackaged = xrealloc(unpackaged, sizeof(*unpackaged) * (n + 1));
+ unpackaged[n++] = xstrdup(fn);
+ *p = '/';
+ }
+}
+
+if (n 0) {
+ const char *N;
+ HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
+ StringBuf list = newStringBuf();
+
+ he-tag = RPMTAG_NVRA;
+ N = (headerGet(pkg-header, he, 0) ? he-p.str : NULL);
+
+ for (i = 0; i n; i++) {
+ appendStringBuf(list, \t);
+ appendStringBuf(list, unpackaged[i]);
+ appendStringBuf(list, \n);
+ unpackaged[i] = _free(unpackaged[i]);
+ }
+ unpackaged = _free(unpackaged);
+
+ rpmlog(RPMLOG_WARNING,
+_(Unpackaged subdir(s) in %s:\n%s),
+N, getStringBuf(list));
+
+ N = _free(N);
+ list = freeStringBuf(list);
+}
+
+return n;
+}
+
+/**
+ * Check for unpackaged subdirectories.
+ * @param spec spec file control structure
+ * @return number of unpackaged subdirectories
+ */
+static int checkUnpackagedSubdirs(Spec spec)
[CVS] RPM: rpm/ CHANGES rpm/build/ files.c rpm/lib/ librpm.vers rpmfi....
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Alexey Tourbin
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 06-Jul-2008 06:24:43
Branch: HEAD Handle: 2008070604244200
Modified files:
rpm CHANGES
rpm/build files.c
rpm/lib librpm.vers rpmfi.c rpmfi.h
Log:
rpmfi: changed fi-fnlen meaning, added rpmfiFMaxLen() function
- fi-fnlen: now indicates max file name lengith, without '\0' (like strlen)
- rpmfiNew: find the exact max file name lengith, not dnlmax + bnlmax
- rpmfiFN: allocate (fi-fnlen + 1) bytes
- rpmfiFMaxLen: new function
- librpm.vers: added rpmfiFMaxLen
- pkgUnpackagedSubdirs: use rpmfiFMaxLen
- genCpioListAndHeader: when setting fi-fnlen, use fileURL, not diskURL
- genCpioListAndHeader: also assert that fi-fn has not been allocated yet
Summary:
RevisionChanges Path
1.2465 +1 -0 rpm/CHANGES
1.336 +10 -4 rpm/build/files.c
1.45+1 -0 rpm/lib/librpm.vers
2.125 +13 -13 rpm/lib/rpmfi.c
2.56+8 -0 rpm/lib/rpmfi.h
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.2464 -r1.2465 CHANGES
--- rpm/CHANGES 6 Jul 2008 00:26:19 - 1.2464
+++ rpm/CHANGES 6 Jul 2008 04:24:42 - 1.2465
@@ -1,5 +1,6 @@
5.1.0 - 5.2a0:
+- at: rpmfi: new function: size_t rpmfiFMaxLen(rpmfi).
- at: rpmbuild: check for unpackaged subdirectories.
- jbj: fix: resurrect cpuinfo() probe, hack-o-rounds for both /proc
libio.
- jbj: rpmio: remove fdSize, rewrite rpmioSlurp to use Fstat(2) instead.
@@ .
patch -p0 '@@ .'
Index: rpm/build/files.c
$ cvs diff -u -r1.335 -r1.336 files.c
--- rpm/build/files.c 6 Jul 2008 02:07:14 - 1.335
+++ rpm/build/files.c 6 Jul 2008 04:24:42 - 1.336
@@ -1275,7 +1275,6 @@
int skipLen = 0;
security_context_t scon = NULL;
const char * sxfn;
-size_t fnlen;
FileListRec flp;
char buf[BUFSIZ];
int i, xx;
@@ -1667,8 +1666,15 @@
continue;
}
- if ((fnlen = strlen(flp-diskURL) + 1) fi-fnlen)
- fi-fnlen = fnlen;
+ {
+ size_t fnlen = strlen(flp-fileURL);
+ if (fnlen fi-fnlen) {
+ /* fnlen-sized buffer must not be allocated yet */
+ assert(fi-fn == NULL);
+ fi-fnlen = fnlen;
+ }
+ }
+
/* Create disk directory and base name. */
fi-dil[i] = i;
@@ -2964,7 +2970,7 @@
fi = rpmfiFree(fi);
return 0;
}
-fn = alloca(fi-fnlen);
+fn = alloca(rpmfiFMaxLen(fi) + 1);
fi = rpmfiInit(fi, 0);
while ((i = rpmfiNext(fi)) = 0) {
@@ .
patch -p0 '@@ .'
Index: rpm/lib/librpm.vers
$ cvs diff -u -r1.44 -r1.45 librpm.vers
--- rpm/lib/librpm.vers 5 Jul 2008 23:35:11 - 1.44
+++ rpm/lib/librpm.vers 6 Jul 2008 04:24:42 - 1.45
@@ -160,6 +160,7 @@
rpmfiFGroup;
rpmfiFInode;
rpmfiFLink;
+rpmfiFMaxLen;
rpmfiFMode;
rpmfiFMtime;
rpmfiFN;
@@ .
patch -p0 '@@ .'
Index: rpm/lib/rpmfi.c
$ cvs diff -u -r2.124 -r2.125 rpmfi.c
--- rpm/lib/rpmfi.c 3 Jul 2008 15:08:05 - 2.124
+++ rpm/lib/rpmfi.c 6 Jul 2008 04:24:42 - 2.125
@@ -143,7 +143,7 @@
const char *dn;
char * t;
if (fi-fn == NULL)
- fi-fn = xmalloc(fi-fnlen);
+ fi-fn = xmalloc(fi-fnlen + 1);
FN = t = fi-fn;
(void) urlPath(fi-dnl[fi-dil[fi-i]], dn);
*t = '\0';
@@ -153,6 +153,13 @@
return FN;
}
+size_t rpmfiFMaxLen(rpmfi fi)
+{
+if (fi != NULL)
+ return fi-fnlen;
+return 0;
+}
+
uint32_t rpmfiFFlags(rpmfi fi)
{
uint32_t FFlags = 0;
@@ -1278,9 +1285,7 @@
rpmte p;
rpmfi fi = NULL;
const char * Type;
-int dnlmax, bnlmax;
unsigned char * t;
-int len;
int xx;
int i;
@@ -1554,18 +1559,13 @@
if (!scareMem)
fi-h = headerFree(fi-h);
-dnlmax = -1;
-for (i = 0; i (int)fi-dc; i++) {
- if ((len = strlen(fi-dnl[i])) dnlmax)
- dnlmax = len;
-}
-bnlmax = -1;
+fi-fn =
[CVS] RPM: rpm/ CHANGES rpm/build/ files.c pack.c poptBT.c rpmbuild.h ...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 19-Jan-2008 00:04:08
Branch: HEAD Handle: 2008011823040500
Modified files:
rpm CHANGES rpmpopt.in
rpm/build files.c pack.c poptBT.c rpmbuild.h spec.c
Log:
- proof-of-concept rpmbuild --lsb implementation. ptooey!
Summary:
RevisionChanges Path
1.2078 +1 -0 rpm/CHANGES
1.312 +3 -0 rpm/build/files.c
2.282 +4 -0 rpm/build/pack.c
2.22+5 -3 rpm/build/poptBT.c
2.93+3 -0 rpm/build/rpmbuild.h
2.177 +2 -5 rpm/build/spec.c
2.49+5 -1 rpm/rpmpopt.in
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.2077 -r1.2078 CHANGES
--- rpm/CHANGES 18 Jan 2008 17:41:28 - 1.2077
+++ rpm/CHANGES 18 Jan 2008 23:04:05 - 1.2078
@@ -1,4 +1,5 @@
5.0.0 - 5.1a1:
+- jbj: proof-of-concept rpmbuild --lsb implementation. ptooey!
- jbj: unbreak rpm-python, preserve existing symbol in released versions.
- jbj: fix several typos noticed by the translation project.
- jbj: add -noautoreq/--noautoprov options to rpmbuild.
@@ .
patch -p0 '@@ .'
Index: rpm/build/files.c
$ cvs diff -u -r1.311 -r1.312 files.c
--- rpm/build/files.c 9 Jan 2008 00:36:01 - 1.311
+++ rpm/build/files.c 18 Jan 2008 23:04:05 - 1.312
@@ -1504,6 +1504,7 @@
xx = headerPut(h, he, 0);
he-append = 0;
+if (!(_rpmbuildFlags 4)) {
ui32 = dalgo;
he-tag = RPMTAG_FILEDIGESTALGOS;
he-t = RPM_UINT32_TYPE;
@@ -1512,6 +1513,7 @@
he-append = 1;
xx = headerPut(h, he, 0);
he-append = 0;
+}
}
buf[0] = '\0';
@@ -1570,6 +1572,7 @@
he-append = 0;
/* Add file security context to package. */
+if (!(_rpmbuildFlags 4))
{
static char *nocon = ;
/[EMAIL PROTECTED]@*/
@@ .
patch -p0 '@@ .'
Index: rpm/build/pack.c
$ cvs diff -u -r2.281 -r2.282 pack.c
--- rpm/build/pack.c 2 Jan 2008 10:26:04 - 2.281
+++ rpm/build/pack.c 18 Jan 2008 23:04:05 - 2.282
@@ -946,6 +946,7 @@
he-c = 1;
xx = headerPut(h, he, 0);
+if (!(_rpmbuildFlags 4)) {
val = rpmlibTimestamp();
he-tag = RPMTAG_RPMLIBTIMESTAMP;
he-t = RPM_UINT32_TYPE;
@@ -966,6 +967,7 @@
he-p.ui32p = val;
he-c = 1;
xx = headerPut(h, he, 0);
+}
he-tag = RPMTAG_BUILDHOST;
he-t = RPM_STRING_TYPE;
@@ -1034,6 +1036,7 @@
he-c = 1;
xx = headerPut(pkg-header, he, 0);
+if (!(_rpmbuildFlags)) {
if (spec-sourcePkgId != NULL) {
he-tag = RPMTAG_SOURCEPKGID;
he-t = RPM_BIN_TYPE;
@@ -1041,6 +1044,7 @@
he-c = 16;
xx = headerPut(pkg-header, he, 0);
}
+}
{ const char *binFormat = rpmGetPath(%{_rpmfilename}, NULL);
char *binRpm, *binDir;
@@ .
patch -p0 '@@ .'
Index: rpm/build/poptBT.c
$ cvs diff -u -r2.21 -r2.22 poptBT.c
--- rpm/build/poptBT.c18 Jan 2008 17:00:52 - 2.21
+++ rpm/build/poptBT.c18 Jan 2008 23:04:05 - 2.22
@@ -48,7 +48,7 @@
#define POPT_TS 0x7473
/[EMAIL PROTECTED]@*/
-int _rpmbuildAutoFlags = 3;
+int _rpmbuildFlags = 3;
/[EMAIL PROTECTED]@*/
/[EMAIL PROTECTED]@*/
@@ -202,10 +202,12 @@
N_(do not execute any stages of the build), NULL },
{ nodeps, '\0', 0, NULL, RPMCLI_POPT_NODEPS,
N_(do not verify build dependencies), NULL },
- { noautoprov, '\0', POPT_BIT_CLR|POPT_ARGFLAG_DOC_HIDDEN,
_rpmbuildAutoFlags, 1,
+ { noautoprov, '\0', POPT_BIT_CLR|POPT_ARGFLAG_DOC_HIDDEN,
_rpmbuildFlags, 1,
N_(disable automagic Provides: extraction), NULL },
- { noautoreq, '\0', POPT_BIT_CLR|POPT_ARGFLAG_DOC_HIDDEN,
_rpmbuildAutoFlags, 2,
+ { noautoreq, '\0', POPT_BIT_CLR|POPT_ARGFLAG_DOC_HIDDEN, _rpmbuildFlags,
2,
N_(disable automagic Requires: extraction), NULL },
+ { notinlsb, '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN, _rpmbuildFlags,
4,
+ N_(disable tags forbidden by LSB), NULL },
{ nodigest, '\0',
[CVS] RPM: rpm/ CHANGES rpm/build/ files.c rpm/lib/ fsm.c poptQV.c psm...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 09-Jan-2008 01:36:02
Branch: HEAD Handle: 2008010900360101
Modified files:
rpm CHANGES
rpm/build files.c
rpm/lib fsm.c poptQV.c psm.c rpmfi.h transaction.c
Log:
- rpm.org: Assorted int - size_t corrections for string lengths.
Summary:
RevisionChanges Path
1.2057 +1 -0 rpm/CHANGES
1.311 +1 -1 rpm/build/files.c
2.141 +5 -4 rpm/lib/fsm.c
2.49+1 -1 rpm/lib/poptQV.c
2.279 +4 -4 rpm/lib/psm.c
2.48+3 -3 rpm/lib/rpmfi.h
1.361 +6 -6 rpm/lib/transaction.c
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.2056 -r1.2057 CHANGES
--- rpm/CHANGES 9 Jan 2008 00:21:36 - 1.2056
+++ rpm/CHANGES 9 Jan 2008 00:36:01 - 1.2057
@@ -1,4 +1,5 @@
5.0.0 - 5.1a1:
+- rpm.org: Assorted int - size_t corrections for string lengths.
- rpm.org: More assorted int - size_t uses.
=
@@ .
patch -p0 '@@ .'
Index: rpm/build/files.c
$ cvs diff -u -r1.310 -r1.311 files.c
--- rpm/build/files.c 23 Dec 2007 01:56:40 - 1.310
+++ rpm/build/files.c 9 Jan 2008 00:36:01 - 1.311
@@ -1198,7 +1198,7 @@
const char ** needle;
char savechar;
char * baseName;
- int len;
+ size_t len;
if (fileNames[i] == NULL) /* XXX can't happen */
continue;
@@ .
patch -p0 '@@ .'
Index: rpm/lib/fsm.c
$ cvs diff -u -r2.140 -r2.141 fsm.c
--- rpm/lib/fsm.c 6 Dec 2007 14:47:49 - 2.140
+++ rpm/lib/fsm.c 9 Jan 2008 00:36:02 - 2.141
@@ -301,7 +301,8 @@
/* Exclude parent directories that are explicitly included. */
for (i = 0; i fi-fc; i++) {
- int dil, dnlen, bnlen;
+ int dil;
+ size_t dnlen, bnlen;
if (!S_ISDIR(fi-fmodes[i]))
continue;
@@ -311,7 +312,7 @@
bnlen = strlen(fi-bnl[i]);
for (j = 0; j fi-dc; j++) {
- int jlen;
+ size_t jlen;
if (!dnli-active[j] || j == dil)
/[EMAIL PROTECTED]@*/ continue;
@@ -1245,7 +1246,7 @@
/[EMAIL PROTECTED] [EMAIL PROTECTED]/
if (fsm-ldn != NULL fsm-dnlx != NULL)
while ((fsm-path = dnlNextIterator(dnli)) != NULL) {
- int dnlen = strlen(fsm-path);
+ size_t dnlen = strlen(fsm-path);
char * te;
dc = dnlIndex(dnli);
@@ -1317,7 +1318,7 @@
/[EMAIL PROTECTED] [EMAIL PROTECTED]/
if (fsm-dnlx != NULL)
while ((fsm-path = dnlNextIterator(dnli)) != NULL) {
- int dnlen = strlen(fsm-path);
+ size_t dnlen = strlen(fsm-path);
char * te;
dc = dnlIndex(dnli);
@@ .
patch -p0 '@@ .'
Index: rpm/lib/poptQV.c
$ cvs diff -u -r2.48 -r2.49 poptQV.c
--- rpm/lib/poptQV.c 24 Nov 2007 18:48:15 - 2.48
+++ rpm/lib/poptQV.c 9 Jan 2008 00:36:02 - 2.49
@@ -201,7 +201,7 @@
if (arg) {
char * qf = (char *)qva-qva_queryFormat;
if (qf) {
- int len = strlen(qf) + strlen(arg) + 1;
+ size_t len = strlen(qf) + strlen(arg) + 1;
qf = xrealloc(qf, len);
strcat(qf, arg);
} else {
@@ .
patch -p0 '@@ .'
Index: rpm/lib/psm.c
$ cvs diff -u -r2.278 -r2.279 psm.c
--- rpm/lib/psm.c 16 Dec 2007 17:39:20 - 2.278
+++ rpm/lib/psm.c 9 Jan 2008 00:36:02 - 2.279
@@ -352,8 +352,8 @@
/* Build dnl/dil with {_sourcedir, _specdir} as values. */
if (i fi-fc) {
- int speclen = strlen(_specdir) + 2;
- int sourcelen = strlen(_sourcedir) + 2;
+ size_t speclen = strlen(_specdir) + 2;
+ size_t sourcelen = strlen(_sourcedir) + 2;
char * t;
/[EMAIL PROTECTED]@*/fi-dnl = _free(fi-dnl);
@@ -662,8 +662,8 @@
int argc = 0;
const char ** prefixes = NULL;
int numPrefixes;
-int
[CVS] RPM: rpm/ CHANGES rpm/build/ files.c pack.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 23-Dec-2007 02:56:40
Branch: HEAD Handle: 2007122301563901
Modified files:
rpm CHANGES
rpm/build files.c pack.c
Log:
- jbj: permit rpm -q --qf '%{track}\n' --specsrpm foo.spec queries.
Summary:
RevisionChanges Path
1.2008 +1 -0 rpm/CHANGES
1.310 +43 -0 rpm/build/files.c
2.280 +0 -42 rpm/build/pack.c
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.2007 -r1.2008 CHANGES
--- rpm/CHANGES 23 Dec 2007 00:14:01 - 1.2007
+++ rpm/CHANGES 23 Dec 2007 01:56:39 - 1.2008
@@ -1,4 +1,5 @@
5.0b3 - 5.0b4:
+- jbj: permit rpm -q --qf '%{track}\n' --specsrpm foo.spec queries.
- jbj: fix: supply additional indentation for forced array[1] with
--yaml.
5.0b2 - 5.0b3:
@@ .
patch -p0 '@@ .'
Index: rpm/build/files.c
$ cvs diff -u -r1.309 -r1.310 files.c
--- rpm/build/files.c 19 Dec 2007 03:00:23 - 1.309
+++ rpm/build/files.c 23 Dec 2007 01:56:40 - 1.310
@@ -17,6 +17,7 @@
#include rpmio_internal.h /* XXX fdGetFp */
#include fts.h
+#define _RPMTAG_INTERNAL/* XXX rpmTags-aTags */
#define _RPMFI_INTERNAL
#define _RPMTE_INTERNAL
#include rpmbuild.h
@@ -2489,6 +2490,7 @@
struct Source *srcPtr;
static rpmTag classTag = 0x;
int xx;
+int i;
if (classTag == 0x)
classTag = tagValue(Class);
@@ -2546,6 +2548,47 @@
he-c = spec-BACount;
xx = headerPut(spec-sourceHeader, he, 0);
}
+
+/* Load arbitrary tags into srpm header. */
+if (spec-foo)
+for (i = 0; i spec-nfoo; i++) {
+ const char * str = spec-foo[i].str;
+ rpmTag tag = spec-foo[i].tag;
+ StringBuf sb = spec-foo[i].val;
+ char * s;
+
+ if (str == NULL || sb == NULL)
+ continue;
+
+ /* XXX Special case %track interpreter for now. */
+ if (!xstrcasecmp(str, track)) {
+ he-p.str = rpmExpand(%{?__vcheck}, NULL);
+ if (!(he-p.str != NULL he-p.str[0] != '\0')) {
+ he-p.str = _free(he-p.str);
+ continue;
+ }
+ he-tag = tagValue(Trackprog);
+ he-t = RPM_STRING_TYPE;
+ he-c = 1;
+ xx = headerPut(spec-sourceHeader, he, 0);
+ he-p.str = _free(he-p.str);
+ }
+
+ s = getStringBuf(sb);
+ he-tag = tag;
+ he-append = headerIsEntry(spec-sourceHeader, tag);
+ if (he-append) {
+ he-t = RPM_STRING_ARRAY_TYPE;
+ he-p.argv = (const char **) s;
+ he-c = 1;
+ } else {
+ he-t = RPM_STRING_TYPE;
+ he-p.str = s;
+ he-c = 1;
+ }
+ xx = headerPut(spec-sourceHeader, he, 0);
+ he-append = 0;
+}
}
if (sfp != NULL *sfp != NULL)
@@ .
patch -p0 '@@ .'
Index: rpm/build/pack.c
$ cvs diff -u -r2.279 -r2.280 pack.c
--- rpm/build/pack.c 19 Dec 2007 03:03:39 - 2.279
+++ rpm/build/pack.c 23 Dec 2007 01:56:40 - 2.280
@@ -,7 +,6 @@
CSA_t csa = csabuf;
rpmRC rc;
int xx;
-int i;
/* Add rpmlib markers for tracking. */
(void) rpmlibMarkers(spec-sourceHeader);
@@ -1130,47 +1129,6 @@
av = argvFree(av);
}
-/* Load arbitrary tags into srpm header. */
-if (spec-foo)
-for (i = 0; i spec-nfoo; i++) {
- const char * str = spec-foo[i].str;
- rpmTag tag = spec-foo[i].tag;
- StringBuf sb = spec-foo[i].val;
- char * s;
-
- if (str == NULL || sb == NULL)
- continue;
-
- /* XXX Special case %track interpreter for now. */
- if (!xstrcasecmp(str, track)) {
- he-p.str = rpmExpand(%{?__vcheck}, NULL);
- if (!(he-p.str != NULL he-p.str[0] != '\0')) {
- he-p.str = _free(he-p.str);
- continue;
- }
- he-tag = tagValue(Trackprog);
- he-t = RPM_STRING_TYPE;
- he-c = 1;
- xx = headerPut(spec-sourceHeader, he, 0);
- he-p.str = _free(he-p.str);
- }
-
- s = getStringBuf(sb);
- he-tag = tag;
- he-append =
[CVS] RPM: rpm/ CHANGES rpm/build/ files.c pack.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 19-Dec-2007 04:00:23
Branch: HEAD Handle: 2007121903002201
Modified files:
rpm CHANGES
rpm/build files.c pack.c
Log:
- using tagValue() rather than tagGenerate() permits changing the tagno
to from arbitrary transparent. likely more needs doing.
Summary:
RevisionChanges Path
1.1998 +2 -0 rpm/CHANGES
1.309 +1 -1 rpm/build/files.c
2.278 +2 -1 rpm/build/pack.c
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.1997 -r1.1998 CHANGES
--- rpm/CHANGES 18 Dec 2007 19:40:52 - 1.1997
+++ rpm/CHANGES 19 Dec 2007 03:00:22 - 1.1998
@@ -1,4 +1,6 @@
5.0b2 - 5.0b3:
+- jbj: using tagValue() rather than tagGenerate() permits changing the
tagno
+ to from arbitrary transparent. likely more needs doing.
- jbj: reimplement %track as an arbitrary section.
- jbj: generalize tagStore to keep track of arbitrary tag name/content.
- jbj: move stringbuf lib - rpmio for use by tagStore.
@@ .
patch -p0 '@@ .'
Index: rpm/build/files.c
$ cvs diff -u -r1.308 -r1.309 files.c
--- rpm/build/files.c 17 Dec 2007 07:07:41 - 1.308
+++ rpm/build/files.c 19 Dec 2007 03:00:23 - 1.309
@@ -2491,7 +2491,7 @@
int xx;
if (classTag == 0x)
- classTag = tagGenerate(Class);
+ classTag = tagValue(Class);
/* Only specific tags are added to the source package header */
if (!spec-sourceHdrInit) {
@@ .
patch -p0 '@@ .'
Index: rpm/build/pack.c
$ cvs diff -u -r2.277 -r2.278 pack.c
--- rpm/build/pack.c 18 Dec 2007 19:40:52 - 2.277
+++ rpm/build/pack.c 19 Dec 2007 03:00:23 - 2.278
@@ -1130,6 +1130,7 @@
av = argvFree(av);
}
+/* Load arbitrary tags into srpm header. */
if (spec-foo)
for (i = 0; i spec-nfoo; i++) {
const char * str = spec-foo[i].str;
@@ -1147,7 +1148,7 @@
he-p.str = _free(he-p.str);
continue;
}
- he-tag = tagGenerate(Trackprog);
+ he-tag = tagValue(Trackprog);
he-t = RPM_STRING_TYPE;
he-c = 1;
xx = headerPut(spec-sourceHeader, he, 0);
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES rpm/build/ files.c rpm/lib/ rpmcli.h rpmrc.c r...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 05-Dec-2007 00:49:27
Branch: HEAD Handle: 2007120423492402
Modified files:
rpm CHANGES
rpm/build files.c
rpm/lib rpmcli.h rpmrc.c rpmts.h
rpm/rpmdb pkgio.c rpmdb.c signature.c
rpm/rpmio rpmbc.c rpmio.c rpmio_internal.h rpmnss.c rpmpgp.c
rpmpgp.h
Log:
- eliminate dueling typdef byte, beecrypt owns the typedef.
Summary:
RevisionChanges Path
1.1938 +1 -0 rpm/CHANGES
1.302 +2 -2 rpm/build/files.c
2.77+2 -0 rpm/lib/rpmcli.h
2.218 +1 -1 rpm/lib/rpmrc.c
2.92+2 -0 rpm/lib/rpmts.h
1.66+2 -2 rpm/rpmdb/pkgio.c
1.225 +6 -6 rpm/rpmdb/rpmdb.c
1.42+5 -5 rpm/rpmdb/signature.c
2.7 +8 -8 rpm/rpmio/rpmbc.c
1.113 +4 -4 rpm/rpmio/rpmio.c
2.99+1 -1 rpm/rpmio/rpmio_internal.h
1.4 +4 -4 rpm/rpmio/rpmnss.c
2.78+43 -43 rpm/rpmio/rpmpgp.c
2.64+74 -87 rpm/rpmio/rpmpgp.h
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.1937 -r1.1938 CHANGES
--- rpm/CHANGES 4 Dec 2007 22:53:54 - 1.1937
+++ rpm/CHANGES 4 Dec 2007 23:49:24 - 1.1938
@@ -1,4 +1,5 @@
5.0a4 - 5.0b1:
+- jbj: eliminate dueling typdef byte, beecrypt owns the typedef.
- jbj: make sure that yum can upgrade zlib-devel. Trash the DEAD code.
- jbj: resurrect rpmMergeHeadersFromFD goop. Yah, mon, DEAD code ...
- jbj: re-add symbols needed for rpm-python import to loader map.
@@ .
patch -p0 '@@ .'
Index: rpm/build/files.c
$ cvs diff -u -r1.301 -r1.302 files.c
--- rpm/build/files.c 3 Dec 2007 21:11:52 - 1.301
+++ rpm/build/files.c 4 Dec 2007 23:49:24 - 1.302
@@ -2069,7 +2069,7 @@
const char * buildURL = %{_builddir}/%{?buildsubdir}/;
const char * fn = NULL;
const char * apkt = NULL;
-byte * pkt = NULL;
+uint8_t * pkt = NULL;
ssize_t pktlen = 0;
int absolute = 0;
int rc = 1;
@@ -2090,7 +2090,7 @@
goto exit;
/[EMAIL PROTECTED]@*/ break;
case RPMTAG_PUBKEYS:
- if ((rc = pgpReadPkts(fn, (const byte **)pkt, (size_t *)pktlen)) =
0) {
+ if ((rc = pgpReadPkts(fn, (const uint8_t **)pkt, (size_t *)pktlen))
= 0) {
rpmlog(RPMLOG_ERR, _(%s: public key read failed.\n), fn);
goto exit;
}
@@ .
patch -p0 '@@ .'
Index: rpm/lib/rpmcli.h
$ cvs diff -u -r2.76 -r2.77 rpmcli.h
--- rpm/lib/rpmcli.h 3 Dec 2007 17:37:23 - 2.76
+++ rpm/lib/rpmcli.h 4 Dec 2007 23:49:25 - 2.77
@@ -446,8 +446,10 @@
INSTALL_ALLMATCHES = (1 9) /*! from --allmatches (erase)
*/
} rpmInstallInterfaceFlags;
+/[EMAIL PROTECTED]@*/
/[EMAIL PROTECTED]@*/
extern int rpmcliPackagesTotal;
+/[EMAIL PROTECTED]@*/
/[EMAIL PROTECTED]@*/
extern int rpmcliHashesCurrent;
/[EMAIL PROTECTED]@*/
@@ .
patch -p0 '@@ .'
Index: rpm/lib/rpmrc.c
$ cvs diff -u -r2.217 -r2.218 rpmrc.c
--- rpm/lib/rpmrc.c 19 Nov 2007 18:57:54 - 2.217
+++ rpm/lib/rpmrc.c 4 Dec 2007 23:49:25 - 2.218
@@ -440,7 +440,7 @@
rpmGlobalMacroContext, fileSystem, internalState @*/
{
CVOG_t cvog = NULL;
-byte * b = NULL;
+uint8_t * b = NULL;
ssize_t blen = 0;
int init_platform = 0;
miRE mi_re = NULL;
@@ .
patch -p0 '@@ .'
Index: rpm/lib/rpmts.h
$ cvs diff -u -r2.91 -r2.92 rpmts.h
--- rpm/lib/rpmts.h 4 Dec 2007 21:24:00 - 2.91
+++ rpm/lib/rpmts.h 4 Dec 2007 23:49:25 - 2.92
@@ -1052,8 +1052,10 @@
/[EMAIL PROTECTED] rpmGlobalMacroContext, h_errno, fileSystem,
internalState @*/
/[EMAIL PROTECTED] rpmGlobalMacroContext, fileSystem, internalState @*/;
+/[EMAIL PROTECTED]@*/
/[EMAIL PROTECTED]@*/
extern int rpmcliPackagesTotal;
+/[EMAIL PROTECTED]@*/
/** \ingroup rpmts
* Add package to be installed to transaction
[CVS] RPM: rpm/ CHANGES rpm/build/ files.c rpm/lib/ depends.c rpmcli.h...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 03-Dec-2007 18:37:23
Branch: HEAD Handle: 2007120317372201
Modified files:
rpm CHANGES
rpm/build files.c
rpm/lib depends.c rpmcli.h rpminstall.c rpmlib.h
rpmrollback.c rpmts.h transaction.c
Log:
- rpm.org: Move rpmtransFlags enums to rpmts.h where it logically
belongs.
Summary:
RevisionChanges Path
1.1916 +1 -0 rpm/CHANGES
1.299 +1 -3 rpm/build/files.c
1.368 +2 -6 rpm/lib/depends.c
2.76+2 -0 rpm/lib/rpmcli.h
1.187 +1 -2 rpm/lib/rpminstall.c
2.451 +0 -82 rpm/lib/rpmlib.h
1.30+3 -6 rpm/lib/rpmrollback.c
2.88+82 -0 rpm/lib/rpmts.h
1.358 +3 -6 rpm/lib/transaction.c
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.1915 -r1.1916 CHANGES
--- rpm/CHANGES 3 Dec 2007 17:19:27 - 1.1915
+++ rpm/CHANGES 3 Dec 2007 17:37:22 - 1.1916
@@ -1,4 +1,5 @@
5.0a4 - 5.0b1:
+- rpm.org: Move rpmtransFlags enums to rpmts.h where it logically
belongs.
- jbj: hijack rse's versioning name space, add to *.rpm packages too.
- jbj: fix: rpmbuild -ba dir/foo.spec was broken.
- jbj: arbitrary tags w RPM_STRING_ARRAY_TYPE default type, append
assumed.
@@ .
patch -p0 '@@ .'
Index: rpm/build/files.c
$ cvs diff -u -r1.298 -r1.299 files.c
--- rpm/build/files.c 27 Nov 2007 02:29:27 - 1.298
+++ rpm/build/files.c 3 Dec 2007 17:37:23 - 1.299
@@ -17,6 +17,7 @@
#include rpmio_internal.h
#include fts.h
+#define _RPMTE_INTERNAL
#include rpmbuild.h
#include cpio.h
@@ -27,9 +28,6 @@
#define _RPMFI_INTERNAL
#include rpmfi.h
-#define _RPMTE_INTERNAL
-#include rpmte.h
-
#include buildio.h
#include legacy.h /* XXX dodigest */
@@ .
patch -p0 '@@ .'
Index: rpm/lib/depends.c
$ cvs diff -u -r1.367 -r1.368 depends.c
--- rpm/lib/depends.c 26 Nov 2007 05:16:50 - 1.367
+++ rpm/lib/depends.c 3 Dec 2007 17:37:23 - 1.368
@@ -5,6 +5,8 @@
#include system.h
#include rpmio_internal.h /* XXX PGPHASHALGO_MD5 */
+#define _RPMTE_INTERNAL
+#define _RPMTS_INTERNAL
#include rpmcli.h /* XXX rpmcliPackagesTotal */
#include rpmmacro.h/* XXX
rpmExpand(%{_dependency_whiteout} */
@@ -22,12 +24,6 @@
#include rpmds.h
#include rpmfi.h
-#define _RPMTE_INTERNAL
-#include rpmte.h
-
-#define _RPMTS_INTERNAL
-#include rpmts.h
-
#include debug.h
/[EMAIL PROTECTED] tsortInfo @*/
@@ .
patch -p0 '@@ .'
Index: rpm/lib/rpmcli.h
$ cvs diff -u -r2.75 -r2.76 rpmcli.h
--- rpm/lib/rpmcli.h 24 Nov 2007 19:46:05 - 2.75
+++ rpm/lib/rpmcli.h 3 Dec 2007 17:37:23 - 2.76
@@ -12,6 +12,8 @@
#include rpmurl.h
#include rpmlib.h
#include rpmps.h
+#include rpmte.h
+#include rpmts.h
/** \ingroup rpmcli
* Should version 3 packages be produced?
@@ .
patch -p0 '@@ .'
Index: rpm/lib/rpminstall.c
$ cvs diff -u -r1.186 -r1.187 rpminstall.c
--- rpm/lib/rpminstall.c 24 Nov 2007 23:55:01 - 1.186
+++ rpm/lib/rpminstall.c 3 Dec 2007 17:37:23 - 1.187
@@ -6,6 +6,7 @@
#include rpmio.h
#include rpmtag.h
+#define _RPMTS_INTERNAL /* XXX ts-suggests */
#include rpmcli.h
#include rpmdb.h
@@ -14,8 +15,6 @@
#endif
#include rpmte.h /* XXX rpmtsPrint() */
-#define _RPMTS_INTERNAL /* XXX ts-suggests */
-#include rpmts.h
#include manifest.h
#include rpmgi.h
@@ .
patch -p0 '@@ .'
Index: rpm/lib/rpmlib.h
$ cvs diff -u -r2.450 -r2.451 rpmlib.h
--- rpm/lib/rpmlib.h 2 Dec 2007 15:33:54 - 2.450
+++ rpm/lib/rpmlib.h 3 Dec 2007 17:37:23 - 2.451
@@ -380,88 +380,6 @@
/[EMAIL PROTECTED] ts, _fd, *specFilePtr, *cookie,
rpmGlobalMacroContext,
[CVS] RPM: rpm/ CHANGES rpm/build/ files.c pack.c rpm/lib/ fsm.c fsm.h...
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 03-Dec-2007 19:11:09 Branch: HEAD Handle: 2007120318110801 Modified files: rpm CHANGES rpm/build files.c pack.c rpm/lib fsm.c fsm.h psm.c rpmfi.c rpmfi.h rpmlib.h rpmts.h transaction.c verify.c Log: - rpm.org: Move file action enums to rpmfi where they logically belong. Summary: RevisionChanges Path 1.1918 +1 -0 rpm/CHANGES 1.300 +1 -3 rpm/build/files.c 2.265 +1 -4 rpm/build/pack.c 2.139 +1 -2 rpm/lib/fsm.c 2.33+1 -0 rpm/lib/fsm.h 2.272 +1 -3 rpm/lib/psm.c 2.108 +1 -3 rpm/lib/rpmfi.c 2.46+21 -0 rpm/lib/rpmfi.h 2.453 +0 -21 rpm/lib/rpmlib.h 2.89+1 -0 rpm/lib/rpmts.h 1.359 +1 -3 rpm/lib/transaction.c 2.181 +1 -4 rpm/lib/verify.c patch -p0 '@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.1917 -r1.1918 CHANGES --- rpm/CHANGES 3 Dec 2007 17:42:24 - 1.1917 +++ rpm/CHANGES 3 Dec 2007 18:11:08 - 1.1918 @@ -1,4 +1,5 @@ 5.0a4 - 5.0b1: +- rpm.org: Move file action enums to rpmfi where they logically belong. - rpm.org: Move rpmprobFilterFlag enums to rpmps where they logically belong - rpm.org: Move rpmtransFlags enums to rpmts.h where it logically belongs. - jbj: hijack rse's versioning name space, add to *.rpm packages too. @@ . patch -p0 '@@ .' Index: rpm/build/files.c $ cvs diff -u -r1.299 -r1.300 files.c --- rpm/build/files.c 3 Dec 2007 17:37:23 - 1.299 +++ rpm/build/files.c 3 Dec 2007 18:11:08 - 1.300 @@ -17,6 +17,7 @@ #include rpmio_internal.h #include fts.h +#define _RPMFI_INTERNAL #define _RPMTE_INTERNAL #include rpmbuild.h @@ -25,9 +26,6 @@ #include argv.h #include rpmfc.h -#define _RPMFI_INTERNAL -#include rpmfi.h - #include buildio.h #include legacy.h /* XXX dodigest */ @@ . patch -p0 '@@ .' Index: rpm/build/pack.c $ cvs diff -u -r2.264 -r2.265 pack.c --- rpm/build/pack.c 3 Dec 2007 17:19:28 - 2.264 +++ rpm/build/pack.c 3 Dec 2007 18:11:08 - 2.265 @@ -6,6 +6,7 @@ #include system.h #include rpmio_internal.h +#define _RPMFI_INTERNAL /* XXX fi-fsm */ #define _RPMEVR_INTERNAL/* XXX RPMSENSE_ANY */ #include rpmbuild.h #include signature.h /* XXX rpmTempFile */ @@ -13,10 +14,6 @@ #include cpio.h #include fsm.h -#define _RPMFI_INTERNAL /* XXX fi-fsm */ -#include rpmfi.h -#include rpmts.h - #include buildio.h #include signature.h @@ . patch -p0 '@@ .' Index: rpm/lib/fsm.c $ cvs diff -u -r2.138 -r2.139 fsm.c --- rpm/lib/fsm.c 24 Nov 2007 23:55:01 - 2.138 +++ rpm/lib/fsm.c 3 Dec 2007 18:11:09 - 2.139 @@ -13,11 +13,10 @@ #include cpio.h #include tar.h +#define _RPMFI_INTERNAL #include fsm.h #define fsmUNSAFE fsmStage -#define _RPMFI_INTERNAL -#include rpmfi.h #include rpmte.h #include rpmts.h #include rpmsq.h @@ . patch -p0 '@@ .' Index: rpm/lib/fsm.h $ cvs diff -u -r2.32 -r2.33 fsm.h --- rpm/lib/fsm.h 25 May 2007 17:36:02 - 2.32 +++ rpm/lib/fsm.h 3 Dec 2007 18:11:09 - 2.33 @@ -7,6 +7,7 @@ */ #include cpio.h +#include rpmfi.h /* XXX fileAction typedef */ /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ @@ . patch -p0 '@@ .' Index: rpm/lib/psm.c $ cvs diff -u -r2.271 -r2.272 psm.c --- rpm/lib/psm.c 28 Nov 2007 00:19:45 - 2.271 +++ rpm/lib/psm.c 3 Dec 2007 18:11:09 - 2.272 @@ -14,6 +14,7 @@ #include rpmlib.h #include cpio.h +#define _RPMFI_INTERNAL #include fsm.h /* XXX CPIO_FOO/FSM_FOO constants */ #define _RPMSQ_INTERNAL #include psm.h @@ -21,9 +22,6 @@ #define
[CVS] RPM: rpm/ CHANGES rpm/build/ files.c pack.c parsePrep.c rpm/rpmd...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 27-Nov-2007 03:29:27
Branch: HEAD Handle: 2007112702292601
Modified files:
rpm CHANGES
rpm/build files.c pack.c parsePrep.c
rpm/rpmdb header.c legacy.c
Log:
- rpmbuild: plug some memory leaks.
- fix: return 0, not -1, with unsigned changes as error.
Summary:
RevisionChanges Path
1.1893 +2 -0 rpm/CHANGES
1.298 +3 -1 rpm/build/files.c
2.258 +15 -5 rpm/build/pack.c
2.95+6 -3 rpm/build/parsePrep.c
1.140 +12 -12 rpm/rpmdb/header.c
1.37+3 -3 rpm/rpmdb/legacy.c
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.1892 -r1.1893 CHANGES
--- rpm/CHANGES 26 Nov 2007 06:52:52 - 1.1892
+++ rpm/CHANGES 27 Nov 2007 02:29:26 - 1.1893
@@ -1,4 +1,6 @@
5.0a2 - 5.0a3:
+- jbj: rpmbuild: plug some memory leaks.
+- jbj: fix: return 0, not -1, with unsigned changes as error.
- jbj: add HEADERGET_NOEXTENSION disabler, kill off headerGetEntry.
- jbj: 1 down, 2 to go, to get rid of headerGetEntry.
- jbj: limit headerGetEntry usage to -lrpmdb only.
@@ .
patch -p0 '@@ .'
Index: rpm/build/files.c
$ cvs diff -u -r1.297 -r1.298 files.c
--- rpm/build/files.c 26 Nov 2007 06:15:34 - 1.297
+++ rpm/build/files.c 27 Nov 2007 02:29:27 - 1.298
@@ -1025,8 +1025,10 @@
const char *ddir, *fmt, *errstr;
if (!oneshot) {
_docdir_fmt = rpmExpand(%{?_docdir_fmt}, NULL);
- if (!_docdir_fmt || !*_docdir_fmt)
+ if (!_docdir_fmt || !*_docdir_fmt) {
+ _docdir_fmt = _free(_docdir_fmt);
_docdir_fmt = %{NAME}-%{VERSION};
+ }
oneshot = 1;
}
fmt = headerSprintf(pkg-header, _docdir_fmt, NULL,
rpmHeaderFormats, errstr);
@@ .
patch -p0 '@@ .'
Index: rpm/build/pack.c
$ cvs diff -u -r2.257 -r2.258 pack.c
--- rpm/build/pack.c 24 Nov 2007 23:15:31 - 2.257
+++ rpm/build/pack.c 27 Nov 2007 02:29:27 - 2.258
@@ -43,12 +43,16 @@
/[EMAIL PROTECTED] spec-sourceRpmName @*/
{
if (spec-sourceRpmName == NULL) {
- const char *name, *version, *release;
+ const char *N, *V, *R;
char fileName[BUFSIZ];
- (void) headerNEVRA(spec-packages-header, name, NULL, version,
release, NULL);
- sprintf(fileName, %s-%s-%s.%ssrc.rpm, name, version, release,
+ (void) headerNEVRA(spec-packages-header, N, NULL, V, R, NULL);
+ snprintf(fileName, sizeof(fileName), %s-%s-%s.%ssrc.rpm, N, V, R,
spec-noSource ? no : );
+ fileName[sizeof(fileName)-1] = '\0';
+ N = _free(N);
+ V = _free(V);
+ R = _free(R);
spec-sourceRpmName = xstrdup(fileName);
}
@@ -495,6 +499,8 @@
p += strlen(p);
}
(void) stpcpy( stpcpy( stpcpy(p, V) , -) , R);
+V = _free(V);
+R = _free(R);
/*
* Rpm prior to 3.0.3 does not have versioned provides.
@@ -584,6 +590,7 @@
xx = headerPut(h, he, 0);
he-append = 0;
}
+N = _free(N);
}
/[EMAIL PROTECTED]@*/
@@ -687,8 +694,8 @@
/* Create and add the cookie */
if (cookie) {
- sprintf(buf, %s %d, buildHost(), (int) (*getBuildTime()));
- *cookie = xstrdup(buf);
+ sprintf(buf, %s %u, buildHost(), (unsigned) (*getBuildTime()));
+ *cookie = xstrdup(buf); /* XXX memory leak */
he-tag = RPMTAG_COOKIE;
he-t = RPM_STRING_TYPE;
he-p.str = *cookie;
@@ -813,6 +820,9 @@
(void) headerNEVRA(h, N, NULL, V, R, NULL);
sprintf(buf, %s-%s-%s, N, V, R);
rc = rpmpkgWrite(item, fd, l, msg);
+ N = _free(N);
+ V = _free(V);
+ R = _free(R);
}
if (rc != RPMRC_OK) {
@@ .
patch -p0 '@@ .'
Index: rpm/build/parsePrep.c
$ cvs diff -u -r2.94 -r2.95 parsePrep.c
--- rpm/build/parsePrep.c 26 Nov 2007 05:16:49 - 2.94
+++ rpm/build/parsePrep.c 27 Nov 2007 02:29:27 -
[CVS] RPM: rpm/ CHANGES rpm/build/ files.c rpm/rpmdb/ hdrfmt.c pkgio.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 26-Nov-2007 07:15:34
Branch: HEAD Handle: 2007112606153400
Modified files:
rpm CHANGES
rpm/build files.c
rpm/rpmdb hdrfmt.c pkgio.c
Log:
- 1 down, 2 to go, to get rid of headerGetEntry.
Summary:
RevisionChanges Path
1.1891 +1 -0 rpm/CHANGES
1.297 +3 -3 rpm/build/files.c
1.45+8 -6 rpm/rpmdb/hdrfmt.c
1.61+1 -1 rpm/rpmdb/pkgio.c
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.1890 -r1.1891 CHANGES
--- rpm/CHANGES 26 Nov 2007 05:42:23 - 1.1890
+++ rpm/CHANGES 26 Nov 2007 06:15:34 - 1.1891
@@ -1,4 +1,5 @@
5.0a2 - 5.0a3:
+- jbj: 1 down, 2 to go, to get rid of headerGetEntry.
- jbj: limit headerGetEntry usage to -lrpmdb only.
- jbj: Eliminate header.h and hdrinline.h.
- jbj: insure that HE_t in headerGet/headerNext is initialized sanely.
@@ .
patch -p0 '@@ .'
Index: rpm/build/files.c
$ cvs diff -u -r1.296 -r1.297 files.c
--- rpm/build/files.c 26 Nov 2007 05:16:49 - 1.296
+++ rpm/build/files.c 26 Nov 2007 06:15:34 - 1.297
@@ -1647,10 +1647,10 @@
*d = '\0';
fi-bnl = xmalloc(fi-fc * (sizeof(*fi-bnl) + sizeof(*fi-dil)));
-/[EMAIL PROTECTED]@*/ /* FIX: artifact of spoofing headerGetEntry */
+/[EMAIL PROTECTED]@*/ /* FIX: artifact of spoofing header tag store */
fi-dil = (!scareMem)
? xcalloc(sizeof(*fi-dil), fi-fc)
- : (int *)(fi-bnl + fi-fc);
+ : (uint32_t *)(fi-bnl + fi-fc);
/[EMAIL PROTECTED]@*/
/* XXX Insure at least 1 byte is always allocated. */
@@ -1688,7 +1688,7 @@
/* Create disk directory and base name. */
fi-dil[i] = i;
-/[EMAIL PROTECTED]@*/ /* FIX: artifact of spoofing headerGetEntry */
+/[EMAIL PROTECTED]@*/ /* FIX: artifact of spoofing header tag store */
fi-dnl[fi-dil[i]] = d;
/[EMAIL PROTECTED]@*/
d = stpcpy(d, flp-diskURL);
@@ .
patch -p0 '@@ .'
Index: rpm/rpmdb/hdrfmt.c
$ cvs diff -u -r1.44 -r1.45 hdrfmt.c
--- rpm/rpmdb/hdrfmt.c26 Nov 2007 05:16:52 - 1.44
+++ rpm/rpmdb/hdrfmt.c26 Nov 2007 06:15:34 - 1.45
@@ -1254,16 +1254,18 @@
const char * msgkey;
const char * msgid;
- { const char * tn = tagName(he-tag);
- rpmTagData n = { .ptr = NULL };
+ { HE_t nhe = memset(alloca(sizeof(*nhe)), 0, sizeof(*nhe));
+ const char * tn = tagName(he-tag);
char * mk;
size_t nb = sizeof(());
- int xx = headerGetEntry(h, RPMTAG_NAME, NULL, n, NULL);
- xx = 0; /* XXX keep gcc quiet */
+ int xx;
+ nhe-tag = RPMTAG_NAME;
+ xx = headerGet(h, nhe, 0);
if (tn) nb += strlen(tn);
- if (n.str) nb += strlen(n.str);
+ if (nhe-p.str) nb += strlen(nhe-p.str);
mk = alloca(nb);
- sprintf(mk, %s(%s), (n.str ? n.str : ), (tn ? tn : ));
+ sprintf(mk, %s(%s), (nhe-p.str ? nhe-p.str : ), (tn ? tn :
));
+ nhe-p.ptr = _free(nhe-p.ptr);
msgkey = mk;
}
@@ .
patch -p0 '@@ .'
Index: rpm/rpmdb/pkgio.c
$ cvs diff -u -r1.60 -r1.61 pkgio.c
--- rpm/rpmdb/pkgio.c 24 Nov 2007 22:07:30 - 1.60
+++ rpm/rpmdb/pkgio.c 26 Nov 2007 06:15:34 - 1.61
@@ -867,7 +867,7 @@
/*===*/
/**
- * Check header consistency, performing headerGetEntry() the hard way.
+ * Check header consistency, performing headerGet() the hard way.
*
* Sanity checks on the header are performed while looking for a
* header-only digest or signature to verify the blob. If found,
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES rpm/build/ files.c pack.c parsePreamble.c pars...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 10-Nov-2007 19:06:44
Branch: HEAD Handle: 2007111018064102
Modified files:
rpm CHANGES
rpm/build files.c pack.c parsePreamble.c parseSpec.c
reqprov.c spec.c
rpm/lib depends.c formats.c package.c psm.c rpmchecksig.c
rpmds.c rpmfc.c rpmfi.c rpminstall.c rpmrollback.c
rpmte.c rpmts.c transaction.c
rpm/python header-py.c
rpm/rpmdb fprint.c hdrNVR.c pkgio.c rpmdb.c signature.c
Log:
- remove HGE_t casts everywhere.
Summary:
RevisionChanges Path
1.1797 +1 -0 rpm/CHANGES
1.288 +3 -3 rpm/build/files.c
2.249 +4 -4 rpm/build/pack.c
2.144 +2 -2 rpm/build/parsePreamble.c
2.113 +1 -1 rpm/build/parseSpec.c
1.80+1 -1 rpm/build/reqprov.c
2.160 +2 -2 rpm/build/spec.c
1.360 +3 -3 rpm/lib/depends.c
2.117 +1 -1 rpm/lib/formats.c
2.180 +1 -1 rpm/lib/package.c
2.259 +8 -8 rpm/lib/psm.c
1.170 +3 -3 rpm/lib/rpmchecksig.c
2.80+3 -3 rpm/lib/rpmds.c
1.35+1 -1 rpm/lib/rpmfc.c
2.99+1 -1 rpm/lib/rpmfi.c
1.181 +1 -1 rpm/lib/rpminstall.c
1.25+3 -3 rpm/lib/rpmrollback.c
2.66+3 -3 rpm/lib/rpmte.c
2.119 +1 -1 rpm/lib/rpmts.c
1.352 +3 -3 rpm/lib/transaction.c
1.75+3 -3 rpm/python/header-py.c
1.20+1 -1 rpm/rpmdb/fprint.c
1.27+3 -3 rpm/rpmdb/hdrNVR.c
1.25+2 -2 rpm/rpmdb/pkgio.c
1.203 +6 -6 rpm/rpmdb/rpmdb.c
1.18+1 -1 rpm/rpmdb/signature.c
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.1796 -r1.1797 CHANGES
--- rpm/CHANGES 10 Nov 2007 15:41:26 - 1.1796
+++ rpm/CHANGES 10 Nov 2007 18:06:41 - 1.1797
@@ -1,4 +1,5 @@
4.5 - 5.0:
+- jbj: remove HGE_t casts everywhere.
- jbj: hmmm, rpm-perl seems to have issues on BIGENDIAN non-int32
retrieves.
- jbj: use HE_t instead of individual args. dunno HGE_t et al desired ...
- jbj: eek, rpm-perl not being built here.
@@ .
patch -p0 '@@ .'
Index: rpm/build/files.c
$ cvs diff -u -r1.287 -r1.288 files.c
--- rpm/build/files.c 9 Nov 2007 21:32:36 - 1.287
+++ rpm/build/files.c 10 Nov 2007 18:06:41 - 1.288
@@ -275,7 +275,7 @@
/[EMAIL PROTECTED] internalState @*/
/[EMAIL PROTECTED] internalState @*/
{
-HGE_t hge = (HGE_t)headerGetExtension;
+HGE_t hge = headerGetExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
uint32_t currentTime = time(NULL);
uint32_t * mtime;
@@ -2245,7 +2245,7 @@
pkg-cpioList, pkg-fileList, pkg-specialDoc, pkg-header,
rpmGlobalMacroContext, fileSystem, internalState @*/
{
-HGE_t hge = (HGE_t)headerGetExtension;
+HGE_t hge = headerGetExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
struct FileList_s fl;
char *s, **files, **fp;
@@ -2792,7 +2792,7 @@
/[EMAIL PROTECTED] check_fileList @*/
/[EMAIL PROTECTED] check_fileList @*/
{
-HGE_t hge = (HGE_t)headerGetExtension;
+HGE_t hge = headerGetExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
Package pkg;
int res = 0;
@@ .
patch -p0 '@@ .'
Index: rpm/build/pack.c
$ cvs diff -u -r2.248 -r2.249 pack.c
--- rpm/build/pack.c 9 Nov 2007 21:18:43 - 2.248
+++ rpm/build/pack.c 10 Nov 2007 18:06:41 - 2.249
@@ -174,7 +174,7 @@
/[EMAIL PROTECTED] rpmGlobalMacroContext, h_errno, fileSystem,
internalState @*/
/[EMAIL PROTECTED] h, rpmGlobalMacroContext, fileSystem, internalState
@*/
{
-HGE_t hge = (HGE_t)headerGetExtension;
+HGE_t hge = headerGetExtension;
HAE_t hae = headerAddExtension;
HRE_t hre = headerRemoveExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
@@ -468,7 +468,7 @@
void providePackageNVR(Header h)
{
-HGE_t hge =
[CVS] RPM: rpm/ CHANGES rpm/build/ files.c rpm/lib/ manifest.c package...
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 09-Nov-2007 22:32:38 Branch: HEAD Handle: 2007110921323602 Modified files: rpm CHANGES rpm/build files.c rpm/lib manifest.c package.c psm.c query.c rpmps.c rpmrc.c transaction.c rpm/python header-py.c Log: - rpm.org: Remove bunch of unnecessary misc.h includes, document others. Summary: RevisionChanges Path 1.1786 +1 -0 rpm/CHANGES 1.287 +1 -1 rpm/build/files.c 2.21+0 -1 rpm/lib/manifest.c 2.179 +0 -1 rpm/lib/package.c 2.258 +1 -1 rpm/lib/psm.c 2.188 +1 -1 rpm/lib/query.c 2.16+0 -1 rpm/lib/rpmps.c 2.216 +0 -1 rpm/lib/rpmrc.c 1.351 +1 -1 rpm/lib/transaction.c 1.74+0 -1 rpm/python/header-py.c patch -p0 '@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.1785 -r1.1786 CHANGES --- rpm/CHANGES 9 Nov 2007 21:23:51 - 1.1785 +++ rpm/CHANGES 9 Nov 2007 21:32:36 - 1.1786 @@ -1,4 +1,5 @@ 4.5 - 5.0: +- rpm.org: Remove bunch of unnecessary misc.h includes, document others. - rpm.org: Remove useless var parameter from setup helpers. - rpm.org: Remove dead unused RPMTAG_ARCHIVESIZE addition code ... - rpm.org: Remove rpmSetMachine() from API. @@ . patch -p0 '@@ .' Index: rpm/build/files.c $ cvs diff -u -r1.286 -r1.287 files.c --- rpm/build/files.c 8 Nov 2007 16:20:12 - 1.286 +++ rpm/build/files.c 9 Nov 2007 21:32:36 - 1.287 @@ -33,7 +33,7 @@ #include buildio.h #include legacy.h /* XXX dodigest */ -#include misc.h +#include misc.h/* for splitString, freeSplitString */ #include debug.h /[EMAIL PROTECTED] Header @*/ @@ . patch -p0 '@@ .' Index: rpm/lib/manifest.c $ cvs diff -u -r2.20 -r2.21 manifest.c --- rpm/lib/manifest.c11 Oct 2007 19:44:22 - 2.20 +++ rpm/lib/manifest.c9 Nov 2007 21:32:37 - 2.21 @@ -10,7 +10,6 @@ #include stringbuf.h #include manifest.h -#include misc.h #include debug.h /[EMAIL PROTECTED] StringBuf @*/ @@ . patch -p0 '@@ .' Index: rpm/lib/package.c $ cvs diff -u -r2.178 -r2.179 package.c --- rpm/lib/package.c 8 Nov 2007 19:40:40 - 2.178 +++ rpm/lib/package.c 9 Nov 2007 21:32:37 - 2.179 @@ -11,7 +11,6 @@ #include rpmts.h -#include misc.h/* XXX stripTrailingChar() */ #include pkgio.h #include header_internal.h /* XXX headerCheck */ @@ . patch -p0 '@@ .' Index: rpm/lib/psm.c $ cvs diff -u -r2.257 -r2.258 psm.c --- rpm/lib/psm.c 8 Nov 2007 20:33:18 - 2.257 +++ rpm/lib/psm.c 9 Nov 2007 21:32:37 - 2.258 @@ -29,7 +29,7 @@ #include rpmts.h #include pkgio.h -#include misc.h/* XXX rpmMkdirPath */ +#include misc.h/* XXX rpmMkdirPath, makeTempFile, doputenv */ #include rpmdb.h /* XXX for db_chrootDone */ #include signature.h /* signature constants */ #include debug.h @@ . patch -p0 '@@ .' Index: rpm/lib/query.c $ cvs diff -u -r2.187 -r2.188 query.c --- rpm/lib/query.c 11 Oct 2007 19:44:22 - 2.187 +++ rpm/lib/query.c 9 Nov 2007 21:32:37 - 2.188 @@ -21,7 +21,7 @@ #include rpmts.h #include manifest.h -#include misc.h/* XXX for rpmGlob() */ +#include misc.h/* XXX for currentDirectory() */ #include debug.h @@ . patch -p0 '@@ .' Index: rpm/lib/rpmps.c $ cvs diff -u -r2.15 -r2.16 rpmps.c --- rpm/lib/rpmps.c 3 Nov 2007 23:44:01 - 2.15 +++ rpm/lib/rpmps.c 9 Nov 2007 21:32:37 - 2.16 @@ -10,7 +10,6 @@ #define _RPMPS_INTERNAL #include rpmps.h -#include misc.h #include debug.h /[EMAIL PROTECTED] fnpyKey @*/ @@ . patch -p0 '@@ .' Index:
[CVS] RPM: rpm/ CHANGES rpm/build/ files.c pack.c parseChangelog.c par...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 08-Nov-2007 16:15:41
Branch: HEAD Handle: 2007110815153704
Modified files:
rpm CHANGES
rpm/build files.c pack.c parseChangelog.c parsePreamble.c
reqprov.c
rpm/lib formats.c psm.c rpmchecksig.c rpmfc.c rpmfi.c
rpm/python header-py.c
rpm/rpmdb Makefile.am hdrNVR.c hdrfmt.c header.c header.h
header_internal.c rpmdb.c signature.c sqlite.c
rpm/tools rpmcache.c
Log:
- finish converting to headerAddExtension() everywhere.
- change names of header tag integer types: s/INT32/UINT32/ etc.
Summary:
RevisionChanges Path
1.1773 +2 -0 rpm/CHANGES
1.285 +13 -13 rpm/build/files.c
2.245 +4 -4 rpm/build/pack.c
2.35+1 -1 rpm/build/parseChangelog.c
2.143 +1 -1 rpm/build/parsePreamble.c
1.79+2 -2 rpm/build/reqprov.c
2.116 +1 -1 rpm/lib/formats.c
2.255 +4 -4 rpm/lib/psm.c
1.165 +5 -5 rpm/lib/rpmchecksig.c
1.32+7 -7 rpm/lib/rpmfc.c
2.96+1 -1 rpm/lib/rpmfi.c
1.71+96 -43 rpm/python/header-py.c
1.85+1 -1 rpm/rpmdb/Makefile.am
1.24+11 -11 rpm/rpmdb/hdrNVR.c
1.28+20 -20 rpm/rpmdb/hdrfmt.c
1.114 +31 -31 rpm/rpmdb/header.c
1.58+4 -4 rpm/rpmdb/header.h
1.12+16 -14 rpm/rpmdb/header_internal.c
1.200 +16 -16 rpm/rpmdb/rpmdb.c
1.16+1 -1 rpm/rpmdb/signature.c
1.19+8 -8 rpm/rpmdb/sqlite.c
2.22+36 -12 rpm/tools/rpmcache.c
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.1772 -r1.1773 CHANGES
--- rpm/CHANGES 4 Nov 2007 20:51:26 - 1.1772
+++ rpm/CHANGES 8 Nov 2007 15:15:37 - 1.1773
@@ -1,4 +1,6 @@
4.5 - 5.0:
+- jbj: finish converting to headerAddExtension() everywhere.
+- jbj: change names of header tag integer types: s/INT32/UINT32/ etc.
- jbj: finish bulldozing headerAddEntry throughout rpmbuild.
- jbj: start bulldozing headerAddEntry throughout rpmbuild.
- jbj: use HAE_t for signature tags, change int_32 to uint32_t where
needed.
@@ .
patch -p0 '@@ .'
Index: rpm/build/files.c
$ cvs diff -u -r1.284 -r1.285 files.c
--- rpm/build/files.c 6 Nov 2007 19:17:00 - 1.284
+++ rpm/build/files.c 8 Nov 2007 15:15:38 - 1.285
@@ -1252,7 +1252,7 @@
exit:
if (count 0) {
he-tag = RPMTAG_DIRINDEXES;
- he-t = RPM_INT32_TYPE;
+ he-t = RPM_UINT32_TYPE;
he-p.ui32p = dirIndexes;
he-c = count;
xx = hae(h, he, 0);
@@ -1403,7 +1403,7 @@
/[EMAIL PROTECTED]@*/
ui32 = flp-fl_size;
he-tag = RPMTAG_FILESIZES;
- he-t = RPM_INT32_TYPE;
+ he-t = RPM_UINT32_TYPE;
he-p.ui32p = ui32;
he-c = 1;
he-append = 1;
@@ -1428,7 +1428,7 @@
ui32 = flp-fl_mtime;
he-tag = RPMTAG_FILEMTIMES;
- he-t = RPM_INT32_TYPE;
+ he-t = RPM_UINT32_TYPE;
he-p.ui32p = ui32;
he-c = 1;
he-append = 1;
@@ -1437,7 +1437,7 @@
ui16 = flp-fl_mode;
he-tag = RPMTAG_FILEMODES;
- he-t = RPM_INT16_TYPE;
+ he-t = RPM_UINT16_TYPE;
he-p.ui16p = ui16;
he-c = 1;
he-append = 1;
@@ -1446,7 +1446,7 @@
ui16 = flp-fl_rdev;
he-tag = RPMTAG_FILERDEVS;
- he-t = RPM_INT16_TYPE;
+ he-t = RPM_UINT16_TYPE;
he-p.ui16p = ui16;
he-c = 1;
he-append = 1;
@@ -1455,7 +1455,7 @@
ui32 = flp-fl_dev;
he-tag = RPMTAG_FILEDEVICES;
- he-t = RPM_INT32_TYPE;
+ he-t = RPM_UINT32_TYPE;
he-p.ui32p = ui32;
he-c = 1;
he-append = 1;
@@ -1464,7 +1464,7 @@
ui32 = flp-fl_ino;
he-tag = RPMTAG_FILEINODES;
- he-t = RPM_INT32_TYPE;
+ he-t = RPM_UINT32_TYPE;
he-p.ui32p = ui32;
he-c = 1;
he-append = 1;
@@ -1532,7 +1532,7 @@
ui32 = dalgo;
he-tag = RPMTAG_FILEDIGESTALGOS;
- he-t = RPM_INT32_TYPE;
+ he-t = RPM_UINT32_TYPE;
he-p.ui32p = ui32;
he-c = 1;
he-append = 1;
[CVS] RPM: rpm/ CHANGES rpm/build/ files.c pack.c rpm/lib/ rpmchecksig...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 08-Nov-2007 17:20:13
Branch: HEAD Handle: 2007110816201102
Modified files:
rpm CHANGES
rpm/build files.c pack.c
rpm/lib rpmchecksig.c rpmfc.c
rpm/python header-py.c
rpm/rpmdb hdrinline.h header.h rpmdb.c
Log:
- add headerRemoveExtension everywhere.
Summary:
RevisionChanges Path
1.1774 +1 -0 rpm/CHANGES
1.286 +5 -3 rpm/build/files.c
2.246 +2 -1 rpm/build/pack.c
1.166 +35 -17 rpm/lib/rpmchecksig.c
1.33+13 -6 rpm/lib/rpmfc.c
1.73+18 -13 rpm/python/header-py.c
1.26+16 -0 rpm/rpmdb/hdrinline.h
1.59+1 -1 rpm/rpmdb/header.h
1.201 +5 -1 rpm/rpmdb/rpmdb.c
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.1773 -r1.1774 CHANGES
--- rpm/CHANGES 8 Nov 2007 15:15:37 - 1.1773
+++ rpm/CHANGES 8 Nov 2007 16:20:11 - 1.1774
@@ -1,4 +1,5 @@
4.5 - 5.0:
+- jbj: add headerRemoveExtension everywhere.
- jbj: finish converting to headerAddExtension() everywhere.
- jbj: change names of header tag integer types: s/INT32/UINT32/ etc.
- jbj: finish bulldozing headerAddEntry throughout rpmbuild.
@@ .
patch -p0 '@@ .'
Index: rpm/build/files.c
$ cvs diff -u -r1.285 -r1.286 files.c
--- rpm/build/files.c 8 Nov 2007 15:15:38 - 1.285
+++ rpm/build/files.c 8 Nov 2007 16:20:12 - 1.286
@@ -1172,7 +1172,7 @@
{
HGE_t hge = headerGetExtension;
HAE_t hae = headerAddExtension;
-HRE_t hre = (HRE_t)headerRemoveEntry;
+HRE_t hre = headerRemoveExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
const char ** fileNames;
const char * fn;
@@ -1191,7 +1191,8 @@
*/
if (headerIsEntry(h, RPMTAG_DIRNAMES)) {
- xx = hre(h, RPMTAG_OLDFILENAMES);
+ he-tag = RPMTAG_OLDFILENAMES;
+ xx = hre(h, he, 0);
return; /* Already converted. */
}
@@ -1272,7 +1273,8 @@
fileNames = _free(fileNames);
-xx = hre(h, RPMTAG_OLDFILENAMES);
+he-tag = RPMTAG_OLDFILENAMES;
+xx = hre(h, he, 0);
}
/[EMAIL PROTECTED]@*/
@@ .
patch -p0 '@@ .'
Index: rpm/build/pack.c
$ cvs diff -u -r2.245 -r2.246 pack.c
--- rpm/build/pack.c 8 Nov 2007 15:15:38 - 2.245
+++ rpm/build/pack.c 8 Nov 2007 16:20:12 - 2.246
@@ -175,6 +175,7 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
HAE_t hae = headerAddExtension;
+HRE_t hre = headerRemoveExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
StringBuf sb = newStringBuf();
int xx;
@@ -183,7 +184,7 @@
xx = hge(h, he, 0);
if (xx) {
appendLineStringBuf(sb, he-p.str);
- (void) headerRemoveEntry(h, tag);
+ (void) hre(h, he, 0);
}
he-p.ptr = _free(he-p.ptr);
@@ .
patch -p0 '@@ .'
Index: rpm/lib/rpmchecksig.c
$ cvs diff -u -r1.165 -r1.166 rpmchecksig.c
--- rpm/lib/rpmchecksig.c 8 Nov 2007 15:15:39 - 1.165
+++ rpm/lib/rpmchecksig.c 8 Nov 2007 16:20:12 - 1.166
@@ -179,6 +179,7 @@
{
HGE_t hge = headerGetExtension;
HAE_t hae = headerAddExtension;
+HRE_t hre = headerRemoveExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
rpmgi gi = NULL;
FD_t fd = NULL;
@@ -296,25 +297,37 @@
if (sigh != NULL) {
/* Eliminate broken digest values. */
- xx = headerRemoveEntry(sigh, RPMSIGTAG_LEMD5_1);
- xx = headerRemoveEntry(sigh, RPMSIGTAG_LEMD5_2);
- xx = headerRemoveEntry(sigh, RPMSIGTAG_BADSHA1_1);
- xx = headerRemoveEntry(sigh, RPMSIGTAG_BADSHA1_2);
+ he-tag = RPMSIGTAG_LEMD5_1;
+ xx = hre(sigh, he, 0);
+ he-tag = RPMSIGTAG_LEMD5_2;
+ xx = hre(sigh, he, 0);
+ he-tag = RPMSIGTAG_BADSHA1_1;
+ xx = hre(sigh, he, 0);
+ he-tag = RPMSIGTAG_BADSHA1_2;
+ xx = hre(sigh, he, 0);
/* Toss and recalculate header+payload size and digests. */
- xx = headerRemoveEntry(sigh,
[CVS] RPM: rpm/ CHANGES rpm/build/ files.c pack.c parsePreamble.c pars...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 17-Oct-2007 22:04:53
Branch: HEAD Handle: 2007101721045003
Modified files:
rpm CHANGES
rpm/build files.c pack.c parsePreamble.c parseSpec.c
reqprov.c
rpm/lib depends.c formats.c package.c psm.c rpmchecksig.c
rpmds.c rpmfc.c rpmfi.c rpminstall.c rpmrollback.c
rpmte.c rpmts.c transaction.c
rpm/python header-py.c
rpm/rpmdb hdrNVR.c hdrinline.h header.h pkgio.c rpmdb.c
signature.c
rpm/tools rpmcache.c
Log:
- commit to hge(h, he, ...) extraction in API. ABI not yet.
Summary:
RevisionChanges Path
1.1724 +1 -0 rpm/CHANGES
1.275 +5 -5 rpm/build/files.c
2.239 +6 -6 rpm/build/pack.c
2.137 +3 -3 rpm/build/parsePreamble.c
2.110 +1 -1 rpm/build/parseSpec.c
1.75+4 -4 rpm/build/reqprov.c
1.353 +7 -7 rpm/lib/depends.c
2.114 +12 -3 rpm/lib/formats.c
2.176 +3 -3 rpm/lib/package.c
2.247 +32 -32 rpm/lib/psm.c
1.160 +4 -4 rpm/lib/rpmchecksig.c
2.75+9 -9 rpm/lib/rpmds.c
1.27+2 -2 rpm/lib/rpmfc.c
2.91+17 -17 rpm/lib/rpmfi.c
1.177 +3 -3 rpm/lib/rpminstall.c
1.22+5 -5 rpm/lib/rpmrollback.c
2.62+10 -10 rpm/lib/rpmte.c
2.113 +2 -2 rpm/lib/rpmts.c
1.346 +3 -3 rpm/lib/transaction.c
1.66+8 -8 rpm/python/header-py.c
1.19+3 -3 rpm/rpmdb/hdrNVR.c
1.20+5 -10 rpm/rpmdb/hdrinline.h
1.41+6 -15 rpm/rpmdb/header.h
1.20+2 -2 rpm/rpmdb/pkgio.c
1.191 +20 -16 rpm/rpmdb/rpmdb.c
1.13+1 -2 rpm/rpmdb/signature.c
2.20+1 -1 rpm/tools/rpmcache.c
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.1723 -r1.1724 CHANGES
--- rpm/CHANGES 17 Oct 2007 18:32:53 - 1.1723
+++ rpm/CHANGES 17 Oct 2007 20:04:50 - 1.1724
@@ -1,4 +1,5 @@
4.5 - 5.0:
+- jbj: commit to hge(h, he, ...) extraction in API. ABI not yet.
- jbj: remove the pointless ;-) indirection in *(HE_t) for type/count.
- jbj: drill rpmTagData everywhere.
- jbj: start regularizing hae/hme calls.
@@ .
patch -p0 '@@ .'
Index: rpm/build/files.c
$ cvs diff -u -r1.274 -r1.275 files.c
--- rpm/build/files.c 17 Oct 2007 18:32:54 - 1.274
+++ rpm/build/files.c 17 Oct 2007 20:04:50 - 1.275
@@ -280,10 +280,10 @@
int i;
he-tag = RPMTAG_FILEMTIMES;
-xx = hge(h, he-tag, he-t, he-p, he-c);
+xx = hge(h, he, 0);
mtime = he_p.i32p;
he-tag = RPMTAG_OLDFILENAMES;
-xx = hge(h, he-tag, he-t, he-p, he-c);
+xx = hge(h, he, 0);
for (i = 0; i he-c; i++) {
xx = currentTime - mtime[i];
@@ -1195,7 +1195,7 @@
}
he-tag = RPMTAG_OLDFILENAMES;
-xx = hge(h, he-tag, he-t, he-p, he-c);
+xx = hge(h, he, 0);
fileNames = he_p.argv;
count = he-c;
if (!xx || fileNames == NULL || count = 0)
@@ -2227,7 +2227,7 @@
fl.buildRootURL = rpmGenPath(spec-rootURL, %{?buildroot}, NULL);
he-tag = RPMTAG_DEFAULTPREFIX;
-xx = hge(pkg-header, he-tag, he-t, he-p, he-c);
+xx = hge(pkg-header, he, 0);
fl.prefix = he_p.str;
fl.fileCount = 0;
@@ -2707,7 +2707,7 @@
(void) headerMacrosLoad(pkg-header);
he-tag = RPMTAG_NVRA;
- xx = hge(pkg-header, he-tag, he-t, he-p, he-c);
+ xx = hge(pkg-header, he, 0);
rpmlog(RPMLOG_NOTICE, _(Processing files: %s\n), he_p.str);
he_p.ptr = _free(he_p.ptr);
@@ .
patch -p0 '@@ .'
Index: rpm/build/pack.c
$ cvs diff -u -r2.238 -r2.239 pack.c
--- rpm/build/pack.c 17 Oct 2007 18:32:54 - 2.238
+++ rpm/build/pack.c 17 Oct 2007 20:04:50 - 2.239
@@ -181,7 +181,7 @@
int xx;
he-tag = tag;
-xx = hge(h, he-tag, he-t, he-p, he-c);
+xx = hge(h, he, 0);
if (xx) {
[CVS] RPM: rpm/ CHANGES rpm/build/ files.c pack.c parsePreamble.c pars...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 17-Oct-2007 03:45:50
Branch: HEAD Handle: 2007101702454505
Modified files:
rpm CHANGES
rpm/build files.c pack.c parsePreamble.c parseSpec.c
reqprov.c
rpm/lib depends.c package.c psm.c rpmchecksig.c rpmds.c
rpmfc.c rpmfi.c rpminstall.c rpmrollback.c rpmte.c
rpmts.c transaction.c
rpm/python header-py.c spec-py.c
rpm/rpmdb header.h rpmdb.c
rpm/tools rpmcache.c
Log:
- start regularizing hae/hme calls.
- drill rpmTagCount everywhere.
Summary:
RevisionChanges Path
1.1721 +2 -0 rpm/CHANGES
1.272 +19 -9 rpm/build/files.c
2.236 +3 -3 rpm/build/pack.c
2.134 +3 -3 rpm/build/parsePreamble.c
2.107 +1 -1 rpm/build/parseSpec.c
1.72+1 -1 rpm/build/reqprov.c
1.350 +3 -3 rpm/lib/depends.c
2.173 +1 -1 rpm/lib/package.c
2.244 +32 -20 rpm/lib/psm.c
1.157 +4 -4 rpm/lib/rpmchecksig.c
2.72+3 -3 rpm/lib/rpmds.c
1.24+1 -1 rpm/lib/rpmfc.c
2.88+37 -20 rpm/lib/rpmfi.c
1.174 +1 -1 rpm/lib/rpminstall.c
1.19+3 -3 rpm/lib/rpmrollback.c
2.59+3 -3 rpm/lib/rpmte.c
2.110 +1 -1 rpm/lib/rpmts.c
1.343 +3 -3 rpm/lib/transaction.c
1.63+8 -8 rpm/python/header-py.c
1.7 +2 -2 rpm/python/spec-py.c
1.38+3 -3 rpm/rpmdb/header.h
1.188 +2 -2 rpm/rpmdb/rpmdb.c
2.18+2 -2 rpm/tools/rpmcache.c
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.1720 -r1.1721 CHANGES
--- rpm/CHANGES 17 Oct 2007 00:32:26 - 1.1720
+++ rpm/CHANGES 17 Oct 2007 01:45:45 - 1.1721
@@ -1,4 +1,6 @@
4.5 - 5.0:
+- jbj: start regularizing hae/hme calls.
+- jbj: drill rpmTagCount everywhere.
- jbj: change hPTR_t to hRET_t in ABI, revert to const void * in API.
- jbj: drill hPTR_t through prototypes. hRET_t * refactor next.
- jbj: drill rpmTagCount through rpmdb/* files.
@@ .
patch -p0 '@@ .'
Index: rpm/build/files.c
$ cvs diff -u -r1.271 -r1.272 files.c
--- rpm/build/files.c 14 Oct 2007 22:53:56 - 1.271
+++ rpm/build/files.c 17 Oct 2007 01:45:45 - 1.272
@@ -273,7 +273,7 @@
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
-int_32 he_c = 0;
+rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = he_t, .p = he_p, .c = he_c, .freeData =
0 };
HE_t he = he_s;
int_32 currentTime = time(NULL);
@@ -1172,7 +1172,7 @@
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
-int_32 he_c = 0;
+rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = he_t, .p = he_p, .c = he_c, .freeData =
0 };
HE_t he = he_s;
HAE_t hae = (HAE_t)headerAddEntry;
@@ -1254,11 +1254,21 @@
exit:
if (count 0) {
- xx = hae(h, RPMTAG_DIRINDEXES, RPM_INT32_TYPE, dirIndexes, count);
- xx = hae(h, RPMTAG_BASENAMES, RPM_STRING_ARRAY_TYPE,
- baseNames, count);
- xx = hae(h, RPMTAG_DIRNAMES, RPM_STRING_ARRAY_TYPE,
- dirNames, dirIndex + 1);
+ he-tag = RPMTAG_DIRINDEXES;
+ he_t = RPM_INT32_TYPE;
+ he_p.i32p = dirIndexes;
+ he_c = count;
+ xx = hae(h, he-tag, he_t, he_p, he_c);
+ he-tag = RPMTAG_BASENAMES;
+ he_t = RPM_STRING_ARRAY_TYPE;
+ he_p.argv = baseNames;
+ he_c = count;
+ xx = hae(h, he-tag, he_t, he_p, he_c);
+ he-tag = RPMTAG_DIRNAMES;
+ he_t = RPM_STRING_ARRAY_TYPE;
+ he_p.argv = dirNames;
+ he_c = dirIndex + 1;
+ xx = hae(h, he-tag, he_t, he_p, he_c);
}
fileNames = _free(fileNames);
@@ -2157,7 +2167,7 @@
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
-int_32 he_c = 0;
+rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = he_t, .p = he_p, .c = he_c, .freeData =
0 };
HE_t he = he_s;
[CVS] RPM: rpm/ CHANGES rpm/build/ files.c rpm/lib/ rpmlib.h rpmte.c r...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 14-Oct-2007 17:15:15
Branch: HEAD Handle: 2007101416151401
Modified files:
rpm CHANGES
rpm/build files.c
rpm/lib rpmlib.h rpmte.c
rpm/python header-py.c
Log:
- clean up some warnings.
- change HGE_t prototype to see what remains to be fixed.
Summary:
RevisionChanges Path
1.1694 +2 -0 rpm/CHANGES
1.269 +1 -1 rpm/build/files.c
2.441 +4 -4 rpm/lib/rpmlib.h
2.57+0 -1 rpm/lib/rpmte.c
1.59+0 -3 rpm/python/header-py.c
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.1693 -r1.1694 CHANGES
--- rpm/CHANGES 14 Oct 2007 01:24:05 - 1.1693
+++ rpm/CHANGES 14 Oct 2007 15:15:14 - 1.1694
@@ -1,4 +1,6 @@
4.5 - 5.0:
+- jbj: clean up some warnings.
+- jbj: change HGE_t prototype to see what remains to be fixed.
- jbj: rpmsignature.c: use headerGetExtension everywhere.
- jbj: rpmrollback.c: use headerGetExtension everywhere.
- jbj: use (*hge), not headerGetExtension, everywhere.
@@ .
patch -p0 '@@ .'
Index: rpm/build/files.c
$ cvs diff -u -r1.268 -r1.269 files.c
--- rpm/build/files.c 14 Oct 2007 00:36:21 - 1.268
+++ rpm/build/files.c 14 Oct 2007 15:15:14 - 1.269
@@ -2194,7 +2194,7 @@
}
}
(void) Fclose(fd);
- } while(token=strtok_r(NULL, ,, saveptr));
+ } while((token = strtok_r(NULL, ,, saveptr)) != NULL);
free(filesFiles);
}
@@ .
patch -p0 '@@ .'
Index: rpm/lib/rpmlib.h
$ cvs diff -u -r2.440 -r2.441 rpmlib.h
--- rpm/lib/rpmlib.h 12 Oct 2007 18:53:48 - 2.440
+++ rpm/lib/rpmlib.h 14 Oct 2007 15:15:14 - 2.441
@@ -616,10 +616,10 @@
* @return 1 on success, 0 on failure
*/
typedef int (*HGE_t) (Header h, rpmTag tag,
- /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ rpmTagType
* type,
- /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ void * p,
- /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ int_32 * c)
- /[EMAIL PROTECTED] *type, *p, *c @*/;
+ /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ hTYP_t t,
+ /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ hRET_t * p,
+ /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ hCNT_t c)
+ /[EMAIL PROTECTED] *t, *p, *c @*/;
/**
* Prototype for headerAddEntry() vector.
@@ .
patch -p0 '@@ .'
Index: rpm/lib/rpmte.c
$ cvs diff -u -r2.56 -r2.57 rpmte.c
--- rpm/lib/rpmte.c 13 Oct 2007 23:57:36 - 2.56
+++ rpm/lib/rpmte.c 14 Oct 2007 15:15:14 - 2.57
@@ -225,7 +225,6 @@
HE_s he_s = { .tag = 0, .t = he_t, .p = he_p, .c = he_c, .freeData =
0 };
HE_t he = he_s;
rpmte p = xcalloc(1, sizeof(*p));
-int_32 * ep;
int xx;
p-type = type;
@@ .
patch -p0 '@@ .'
Index: rpm/python/header-py.c
$ cvs diff -u -r1.58 -r1.59 header-py.c
--- rpm/python/header-py.c14 Oct 2007 00:36:22 - 1.58
+++ rpm/python/header-py.c14 Oct 2007 15:15:15 - 1.59
@@ -179,8 +179,6 @@
HE_t he = he_s;
HAE_t hae = (HAE_t)headerAddEntry;
HRE_t hre = (HRE_t)headerRemoveEntry;
-hRET_t fileNames = { .ptr = NULL };
-int count = 0;
int xx;
/[EMAIL PROTECTED]@*/
@@ -308,7 +306,6 @@
int_32 he_c = 0;
HE_s he_s = { .tag = 0, .t = he_t, .p = he_p, .c = he_c, .freeData =
0 };
HE_t he = he_s;
-int count = 0;
int xx;
if (!headerIsEntry (h, RPMTAG_BASENAMES)
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES rpm/build/ files.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 14-Oct-2007 19:47:22
Branch: HEAD Handle: 2007101418472200
Modified files:
rpm CHANGES
rpm/build files.c
Log:
- files.c: fix: append to pkg-fileList.
- files.c: use headerGetExtension everywhere.
Summary:
RevisionChanges Path
1.1700 +2 -0 rpm/CHANGES
1.270 +52 -34 rpm/build/files.c
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.1699 -r1.1700 CHANGES
--- rpm/CHANGES 14 Oct 2007 17:22:19 - 1.1699
+++ rpm/CHANGES 14 Oct 2007 17:47:22 - 1.1700
@@ -1,4 +1,6 @@
4.5 - 5.0:
+- jbj: files.c: fix: append to pkg-fileList.
+- jbj: files.c: use headerGetExtension everywhere.
- jbj: transaction.c: eliminate hge warning.
- jbj: rpmds.c: eliminate hge warning.
- jbj: psm.c: eliminate a warning, simplify hge usage.
@@ .
patch -p0 '@@ .'
Index: rpm/build/files.c
$ cvs diff -u -r1.269 -r1.270 files.c
--- rpm/build/files.c 14 Oct 2007 15:15:14 - 1.269
+++ rpm/build/files.c 14 Oct 2007 17:47:22 - 1.270
@@ -270,24 +270,31 @@
/[EMAIL PROTECTED] internalState @*/
/[EMAIL PROTECTED] internalState @*/
{
-HGE_t hge = (HGE_t)headerGetEntryMinMemory;
-HFD_t hfd = headerFreeData;
-int * mtime;
-const char ** files;
-rpmTagType fnt;
-int count, x;
-time_t currentTime = time(NULL);
+HGE_t hge = (HGE_t)headerGetExtension;
+int_32 he_t = 0;
+hRET_t he_p = { .ptr = NULL };
+int_32 he_c = 0;
+HE_s he_s = { .tag = 0, .t = he_t, .p = he_p, .c = he_c, .freeData =
0 };
+HE_t he = he_s;
+int_32 currentTime = time(NULL);
+int_32 * mtime;
+int xx;
+int i;
-x = hge(h, RPMTAG_OLDFILENAMES, fnt, files, count);
-x = hge(h, RPMTAG_FILEMTIMES, NULL, mtime, NULL);
-
-/[EMAIL PROTECTED]@*/
-for (x = 0; x count; x++) {
- if ((currentTime - mtime[x]) tc)
- rpmlog(RPMLOG_WARNING, _(TIMECHECK failure: %s\n), files[x]);
+he-tag = RPMTAG_FILEMTIMES;
+xx = hge(h, he-tag, he-t, he-p, he-c);
+mtime = he_p.i32p;
+he-tag = RPMTAG_OLDFILENAMES;
+xx = hge(h, he-tag, he-t, he-p, he-c);
+
+for (i = 0; i he_c; i++) {
+ xx = currentTime - mtime[i];
+ if (xx 0) xx = -xx;
+ if (xx tc)
+ rpmlog(RPMLOG_WARNING, _(TIMECHECK failure: %s\n), he_p.argv[i]);
}
-files = hfd(files, fnt);
-/[EMAIL PROTECTED]@*/
+he_p.ptr = _free(he_p.ptr);
+mtime = _free(mtime);
}
/**
@@ -1162,19 +1169,23 @@
static void compressFilelist(Header h)
/[EMAIL PROTECTED] h @*/
{
-HGE_t hge = (HGE_t)headerGetEntryMinMemory;
+HGE_t hge = (HGE_t)headerGetExtension;
+int_32 he_t = 0;
+hRET_t he_p = { .ptr = NULL };
+int_32 he_c = 0;
+HE_s he_s = { .tag = 0, .t = he_t, .p = he_p, .c = he_c, .freeData =
0 };
+HE_t he = he_s;
HAE_t hae = (HAE_t)headerAddEntry;
HRE_t hre = (HRE_t)headerRemoveEntry;
-HFD_t hfd = headerFreeData;
-char ** fileNames;
+const char ** fileNames;
const char * fn;
const char ** dirNames;
const char ** baseNames;
int_32 * dirIndexes;
-rpmTagType fnt;
int count;
-int i, xx;
int dirIndex = -1;
+int xx;
+int i;
/*
* This assumes the file list is already sorted, and begins with a
@@ -1187,10 +1198,12 @@
return; /* Already converted. */
}
-if (!hge(h, RPMTAG_OLDFILENAMES, fnt, fileNames, count))
+he-tag = RPMTAG_OLDFILENAMES;
+xx = hge(h, he-tag, he-t, he-p, he-c);
+fileNames = he_p.argv;
+count = he_c;
+if (!xx || fileNames == NULL || count = 0)
return; /* no file list */
-if (fileNames == NULL || count = 0)
- return;
dirNames = alloca(sizeof(*dirNames) * count);/* worst case */
baseNames = alloca(sizeof(*dirNames) * count);
@@ -1248,7 +1261,7 @@
dirNames, dirIndex + 1);
}
-fileNames = hfd(fileNames, fnt);
+fileNames = _free(fileNames);
xx = hre(h, RPMTAG_OLDFILENAMES);
}
@@ -2141,7 +2154,12 @@
pkg-cpioList, pkg-fileList, pkg-specialDoc, pkg-header,
[CVS] RPM: rpm/ CHANGES rpm/build/ files.c pack.c parseSpec.c rpm/lib/...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 14-Oct-2007 02:36:22
Branch: HEAD Handle: 2007101401362101
Modified files:
rpm CHANGES
rpm/build files.c pack.c parseSpec.c
rpm/lib transaction.c
rpm/python header-py.c
Log:
- use (*hge), not headerGetExtension, everywhere.
Summary:
RevisionChanges Path
1.1691 +1 -0 rpm/CHANGES
1.268 +11 -4 rpm/build/files.c
2.233 +11 -5 rpm/build/pack.c
2.105 +11 -5 rpm/build/parseSpec.c
1.340 +24 -10 rpm/lib/transaction.c
1.58+41 -23 rpm/python/header-py.c
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.1690 -r1.1691 CHANGES
--- rpm/CHANGES 13 Oct 2007 23:57:36 - 1.1690
+++ rpm/CHANGES 14 Oct 2007 00:36:21 - 1.1691
@@ -1,4 +1,5 @@
4.5 - 5.0:
+- jbj: use (*hge), not headerGetExtension, everywhere.
- jbj: psm.c: use headerGetExtension everywhere.
- jbj: rpminstall.c: use headerGetExtension everywhere.
- jbj: rpmfc.c: use headerGetExtension everywhere.
@@ .
patch -p0 '@@ .'
Index: rpm/build/files.c
$ cvs diff -u -r1.267 -r1.268 files.c
--- rpm/build/files.c 12 Oct 2007 18:53:48 - 1.267
+++ rpm/build/files.c 14 Oct 2007 00:36:21 - 1.268
@@ -2664,13 +2664,19 @@
/[EMAIL PROTECTED] check_fileList @*/
/[EMAIL PROTECTED] check_fileList @*/
{
+HGE_t hge = (HGE_t)headerGetExtension;
+int_32 he_t = 0;
+hRET_t he_p = { .ptr = NULL };
+int_32 he_c = 0;
+HE_s he_s = { .tag = 0, .t = he_t, .p = he_p, .c = he_c, .freeData =
0 };
+HE_t he = he_s;
Package pkg;
int res = 0;
+int xx;
check_fileList = newStringBuf();
for (pkg = spec-packages; pkg != NULL; pkg = pkg-next) {
- const char *NVRA = NULL;
int rc;
if (pkg-fileList == NULL)
@@ -2678,9 +2684,10 @@
(void) headerMacrosLoad(pkg-header);
- (void) headerGetExtension(pkg-header, RPMTAG_NVRA, NULL, NVRA, NULL);
- rpmlog(RPMLOG_NOTICE, _(Processing files: %s\n), NVRA);
- NVRA = _free(NVRA);
+ he-tag = RPMTAG_NVRA;
+ xx = hge(pkg-header, he-tag, he-t, he-p, he-c);
+ rpmlog(RPMLOG_NOTICE, _(Processing files: %s\n), he_p.str);
+ he_p.ptr = _free(he_p.ptr);
if ((rc = processPackageFiles(spec, pkg, installSpecialDoc, test)))
res = rc;
@@ .
patch -p0 '@@ .'
Index: rpm/build/pack.c
$ cvs diff -u -r2.232 -r2.233 pack.c
--- rpm/build/pack.c 11 Oct 2007 19:44:21 - 2.232
+++ rpm/build/pack.c 14 Oct 2007 00:36:21 - 2.233
@@ -837,11 +837,18 @@
/[EMAIL PROTECTED]@*/
int packageBinaries(Spec spec)
{
+HGE_t hge = (HGE_t)headerGetExtension;
+int_32 he_t = 0;
+hRET_t he_p = { .ptr = NULL };
+int_32 he_c = 0;
+HE_s he_s = { .tag = 0, .t = he_t, .p = he_p, .c = he_c, .freeData =
0 };
+HE_t he = he_s;
struct cpioSourceArchive_s csabuf;
CSA_t csa = csabuf;
int rc;
const char *errorString;
Package pkg;
+int xx;
for (pkg = spec-packages; pkg != NULL; pkg = pkg-next) {
const char *fn;
@@ -884,12 +891,11 @@
rpmHeaderFormats, errorString);
binFormat = _free(binFormat);
if (binRpm == NULL) {
- const char *NVRA = NULL;
- (void) headerGetExtension(pkg-header, RPMTAG_NVRA,
- NULL, NVRA, NULL);
+ he-tag = RPMTAG_NVRA;
+ xx = hge(pkg-header, he-tag, he-t, he-p, he-c);
rpmlog(RPMLOG_ERR, _(Could not generate output
- filename for package %s: %s\n), NVRA, errorString);
- NVRA = _free(NVRA);
+ filename for package %s: %s\n), he_p.str, errorString);
+ he_p.ptr = _free(he_p.ptr);
return RPMRC_FAIL;
}
fn = rpmGetPath(%{_rpmdir}/, binRpm, NULL);
@@ .
patch -p0 '@@ .'
Index: rpm/build/parseSpec.c
$ cvs diff -u -r2.104 -r2.105 parseSpec.c
--- rpm/build/parseSpec.c 11
[CVS] RPM: rpm/ CHANGES rpm/build/ files.c pack.c parsePreamble.c pars...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 19-Aug-2007 19:43:04
Branch: HEAD Handle: 2007081918430103
Modified files:
rpm CHANGES
rpm/build files.c pack.c parsePreamble.c parsePrep.c
parseSpec.c spec.c
rpm/lib psm.c rpmds.c rpminstall.c
rpm/python header-py.c rpmts-py.c
rpm/rpmdb hdrNVR.c hdrfmt.c librpmdb.vers rpmdb.c
Log:
- eliminate headerNVR, use headerNEVRA instead.
Summary:
RevisionChanges Path
1.1591 +1 -0 rpm/CHANGES
1.262 +4 -3 rpm/build/files.c
2.223 +8 -6 rpm/build/pack.c
2.130 +2 -1 rpm/build/parsePreamble.c
2.89+1 -1 rpm/build/parsePrep.c
2.102 +5 -3 rpm/build/parseSpec.c
2.153 +5 -3 rpm/build/spec.c
2.221 +57 -67 rpm/lib/psm.c
2.63+2 -2 rpm/lib/rpmds.c
1.162 +6 -7 rpm/lib/rpminstall.c
1.51+1 -1 rpm/python/header-py.c
1.68+1 -1 rpm/python/rpmts-py.c
1.9 +0 -5 rpm/rpmdb/hdrNVR.c
1.5 +5 -3 rpm/rpmdb/hdrfmt.c
1.11+0 -1 rpm/rpmdb/librpmdb.vers
1.153 +5 -4 rpm/rpmdb/rpmdb.c
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.1590 -r1.1591 CHANGES
--- rpm/CHANGES 19 Aug 2007 15:26:11 - 1.1590
+++ rpm/CHANGES 19 Aug 2007 17:43:01 - 1.1591
@@ -1,4 +1,5 @@
4.5 - 5.0:
+- jbj: eliminate headerNVR, use headerNEVRA instead.
- jbj: eliminate the rpmrbFoo, use rpmcliInstallFoo instead.
- jbj: load/unload header macros for %{_sourcedir} et al expansions.
- jbj: don't open rpmdb O_RDWR iff srpm to permit non-root installs.
@@ .
patch -p0 '@@ .'
Index: rpm/build/files.c
$ cvs diff -u -r1.261 -r1.262 files.c
--- rpm/build/files.c 18 Aug 2007 21:32:29 - 1.261
+++ rpm/build/files.c 19 Aug 2007 17:43:01 - 1.262
@@ -2650,7 +2650,7 @@
check_fileList = newStringBuf();
for (pkg = spec-packages; pkg != NULL; pkg = pkg-next) {
- const char *n, *v, *r;
+ const char *NVRA = NULL;
int rc;
if (pkg-fileList == NULL)
@@ -2658,8 +2658,9 @@
(void) headerMacrosLoad(pkg-header);
- (void) headerNVR(pkg-header, n, v, r);
- rpmMessage(RPMMESS_NORMAL, _(Processing files: %s-%s-%s\n), n, v, r);
+ (void) headerGetExtension(pkg-header, RPMTAG_NVRA, NULL, NVRA, NULL);
+ rpmMessage(RPMMESS_NORMAL, _(Processing files: %s\n), NVRA);
+ NVRA = _free(NVRA);
if ((rc = processPackageFiles(spec, pkg, installSpecialDoc, test)))
res = rc;
@@ .
patch -p0 '@@ .'
Index: rpm/build/pack.c
$ cvs diff -u -r2.222 -r2.223 pack.c
--- rpm/build/pack.c 17 Aug 2007 16:04:50 - 2.222
+++ rpm/build/pack.c 19 Aug 2007 17:43:01 - 2.223
@@ -45,7 +45,7 @@
const char *name, *version, *release;
char fileName[BUFSIZ];
- (void) headerNVR(spec-packages-header, name, version, release);
+ (void) headerNEVRA(spec-packages-header, name, NULL, version,
release, NULL);
sprintf(fileName, %s-%s-%s.%ssrc.rpm, name, version, release,
spec-noSource ? no : );
spec-sourceRpmName = xstrdup(fileName);
@@ -430,7 +430,7 @@
int bingo = 1;
/* Generate provides for this package name-version-release. */
-xx = headerNVR(h, name, version, release);
+xx = headerNEVRA(h, name, NULL, version, release, NULL);
if (!(name version release))
return;
pEVR = p = alloca(21 + strlen(version) + 1 + strlen(release) + 1);
@@ -707,7 +707,7 @@
lead.signature_type = RPMSIGTYPE_HEADERSIG;
{ const char *name, *version, *release;
- (void) headerNVR(h, name, version, release);
+ (void) headerNEVRA(h, name, NULL, version, release, NULL);
sprintf(buf, %s-%s-%s, name, version, release);
strncpy(lead.name, buf, sizeof(lead.name));
}
@@ -876,10 +876,12 @@
rpmHeaderFormats, errorString);
binFormat = _free(binFormat);
if (binRpm == NULL) {
- const char *name;
-
[CVS] RPM: rpm/ CHANGES rpm/build/ files.c rpm/lib/ depends.c psm.c rp...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 18-Aug-2007 23:32:31
Branch: HEAD Handle: 2007081822322803
Modified files:
rpm CHANGES
rpm/build files.c
rpm/lib depends.c psm.c rpmfi.c rpmfi.h rpminstall.c
transaction.c
rpm/rpmdb hdrNVR.c rpmdb.c
Log:
- permit mixed binary/source installation transactions.
Summary:
RevisionChanges Path
1.1586 +1 -0 rpm/CHANGES
1.261 +2 -1 rpm/build/files.c
1.339 +10 -5 rpm/lib/depends.c
2.220 +1 -0 rpm/lib/psm.c
2.74+56 -1 rpm/lib/rpmfi.c
2.38+11 -1 rpm/lib/rpmfi.h
1.160 +6 -51 rpm/lib/rpminstall.c
1.330 +9 -0 rpm/lib/transaction.c
1.8 +6 -0 rpm/rpmdb/hdrNVR.c
1.152 +8 -0 rpm/rpmdb/rpmdb.c
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.1585 -r1.1586 CHANGES
--- rpm/CHANGES 18 Aug 2007 16:45:02 - 1.1585
+++ rpm/CHANGES 18 Aug 2007 21:32:28 - 1.1586
@@ -1,4 +1,5 @@
4.5 - 5.0:
+- jbj: permit mixed binary/source installation transactions.
- jbj: re-add rpmcache/rpmcmp/rpmdigest tools.
- jbj: more rpmInstall refactoring.
- jbj: use rpmgi for --addsign/--checksig arg iteration.
@@ .
patch -p0 '@@ .'
Index: rpm/build/files.c
$ cvs diff -u -r1.260 -r1.261 files.c
--- rpm/build/files.c 17 Aug 2007 18:53:05 - 1.260
+++ rpm/build/files.c 18 Aug 2007 21:32:29 - 1.261
@@ -1523,7 +1523,8 @@
freecon(scon);
}
}
-matchpathcon_fini();
+if (sxfn != NULL *sxfn != '\0')
+ matchpathcon_fini();
sxfn = _free(sxfn);
(void) headerAddEntry(h, RPMTAG_SIZE, RPM_INT32_TYPE,
@@ .
patch -p0 '@@ .'
Index: rpm/lib/depends.c
$ cvs diff -u -r1.338 -r1.339 depends.c
--- rpm/lib/depends.c 3 Aug 2007 18:29:53 - 1.338
+++ rpm/lib/depends.c 18 Aug 2007 21:32:29 - 1.339
@@ -391,7 +391,6 @@
if (!(upgrade 0x1))
goto exit;
-/* XXX binary rpms always have RPMTAG_SOURCERPM, source rpms do not */
if (isSource)
goto exit;
@@ -2351,10 +2350,16 @@
? rpmteDS(p, RPMTAG_REQUIRENAME) : NULL);
conflicts = (!(depFlags RPMDEPS_FLAG_NOCONFLICTS)
? rpmteDS(p, RPMTAG_CONFLICTNAME) : NULL);
- dirnames = (!(depFlags RPMDEPS_FLAG_NOPARENTDIRS)
- ? rpmteDS(p, RPMTAG_DIRNAMES) : NULL);
- linktos = (!(depFlags RPMDEPS_FLAG_NOLINKTOS)
- ? rpmteDS(p, RPMTAG_FILELINKTOS) : NULL);
+ /* XXX srpm's don't have directory paths. */
+ if (p-isSource) {
+ dirnames = NULL;
+ linktos = NULL;
+ } else {
+ dirnames = (!(depFlags RPMDEPS_FLAG_NOPARENTDIRS)
+ ? rpmteDS(p, RPMTAG_DIRNAMES) : NULL);
+ linktos = (!(depFlags RPMDEPS_FLAG_NOLINKTOS)
+ ? rpmteDS(p, RPMTAG_FILELINKTOS) : NULL);
+ }
rc = checkPackageDeps(ts, rpmteNEVRA(p),
requires, conflicts, dirnames, linktos,
@@ .
patch -p0 '@@ .'
Index: rpm/lib/psm.c
$ cvs diff -u -r2.219 -r2.220 psm.c
--- rpm/lib/psm.c 17 Aug 2007 16:04:51 - 2.219
+++ rpm/lib/psm.c 18 Aug 2007 21:32:29 - 2.220
@@ -2273,6 +2273,7 @@
break;
case PSM_RPMDB_ADD:
if (rpmtsFlags(ts) RPMTRANS_FLAG_TEST)break;
+ if (fi-isSource) break; /* XXX never add SRPM's */
if (fi-h == NULL) break; /* XXX can't happen */
/* Add header to db, doing header check if requested */
@@ .
patch -p0 '@@ .'
Index: rpm/lib/rpmfi.c
$ cvs diff -u -r2.73 -r2.74 rpmfi.c
--- rpm/lib/rpmfi.c 17 Aug 2007 18:50:20 - 2.73
+++ rpm/lib/rpmfi.c 18 Aug 2007 21:32:29 - 2.74
@@ -105,6 +105,11 @@
return j;
}
+int rpmfiIsSource(rpmfi fi)
+{
+return (fi != NULL ? fi-isSource : 0);
+}
+
const char * rpmfiBN(rpmfi fi)
{
const char * BN = NULL;
@@ -1219,7 +1224,8 @@
