RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: jbj@rpm5.org
Module: rpm Date: 17-Dec-2007 18:13:53
Branch: HEAD Handle: 2007121717135200
Modified files:
rpm CHANGES
rpm/build parseBuildInstallClean.c parseChangelog.c
parseDescription.c parseFiles.c parsePreamble.c
parsePrep.c parseScript.c parseSpec.c rpmbuild.h
Log:
- explicitly compare against PART_NONE, avoid RPMRC_FOO collisions.
Summary:
Revision Changes Path
1.1994 +1 -0 rpm/CHANGES
2.28 +1 -1 rpm/build/parseBuildInstallClean.c
2.41 +1 -1 rpm/build/parseChangelog.c
2.34 +1 -1 rpm/build/parseDescription.c
2.31 +1 -1 rpm/build/parseFiles.c
2.163 +1 -1 rpm/build/parsePreamble.c
2.105 +1 -1 rpm/build/parsePrep.c
2.59 +1 -1 rpm/build/parseScript.c
2.126 +2 -2 rpm/build/parseSpec.c
2.88 +2 -2 rpm/build/rpmbuild.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.1993 -r1.1994 CHANGES
--- rpm/CHANGES 16 Dec 2007 22:54:39 -0000 1.1993
+++ rpm/CHANGES 17 Dec 2007 17:13:52 -0000 1.1994
@@ -1,4 +1,5 @@
5.0b2 -> 5.0b3:
+ - jbj: explicitly compare against PART_NONE, avoid RPMRC_FOO collisions.
- jbj: fold in patch-as-plain-macro changes.
- jbj: fix some minor memory leaks.
- jbj: XAR magic is detected when reading packages, --xar is superfluous.
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/parseBuildInstallClean.c
============================================================================
$ cvs diff -u -r2.27 -r2.28 parseBuildInstallClean.c
--- rpm/build/parseBuildInstallClean.c 16 Dec 2007 23:46:34 -0000 2.27
+++ rpm/build/parseBuildInstallClean.c 17 Dec 2007 17:13:52 -0000 2.28
@@ -65,7 +65,7 @@
if (rc != RPMRC_OK)
return rc;
- while (! (nextPart = isPart(spec->line))) {
+ while ((nextPart = isPart(spec->line)) == PART_NONE) {
if (sbp)
appendStringBuf(*sbp, spec->line);
if ((rc = readLine(spec, STRIP_NOTHING)) > 0)
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/parseChangelog.c
============================================================================
$ cvs diff -u -r2.40 -r2.41 parseChangelog.c
--- rpm/build/parseChangelog.c 17 Dec 2007 07:07:41 -0000 2.40
+++ rpm/build/parseChangelog.c 17 Dec 2007 17:13:52 -0000 2.41
@@ -272,7 +272,7 @@
if (rc != RPMRC_OK)
return rc;
- while (! (nextPart = isPart(spec->line))) {
+ while ((nextPart = isPart(spec->line)) == PART_NONE) {
const char * line;
line = xstrdup(spec->line);
line = xstrtolocale(line);
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/parseDescription.c
============================================================================
$ cvs diff -u -r2.33 -r2.34 parseDescription.c
--- rpm/build/parseDescription.c 8 Dec 2007 21:30:20 -0000 2.33
+++ rpm/build/parseDescription.c 17 Dec 2007 17:13:52 -0000 2.34
@@ -104,7 +104,7 @@
nextPart = RPMRC_FAIL;
goto exit;
}
- while (! (nextPart = isPart(spec->line))) {
+ while ((nextPart = isPart(spec->line)) == PART_NONE) {
appendLineStringBuf(sb, spec->line);
if (t) t->t_nlines++;
if ((rc =
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/parseFiles.c
============================================================================
$ cvs diff -u -r2.30 -r2.31 parseFiles.c
--- rpm/build/parseFiles.c 8 Dec 2007 21:30:20 -0000 2.30
+++ rpm/build/parseFiles.c 17 Dec 2007 17:13:52 -0000 2.31
@@ -102,7 +102,7 @@
} else {
if (rc)
goto exit;
- while (! (nextPart = isPart(spec->line))) {
+ while ((nextPart = isPart(spec->line)) == PART_NONE) {
appendStringBuf(pkg->fileList, spec->line);
if ((rc = readLine(spec, STRIP_COMMENTS)) > 0) {
nextPart = PART_NONE;
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/parsePreamble.c
============================================================================
$ cvs diff -u -r2.162 -r2.163 parsePreamble.c
--- rpm/build/parsePreamble.c 17 Dec 2007 14:46:47 -0000 2.162
+++ rpm/build/parsePreamble.c 17 Dec 2007 17:13:52 -0000 2.163
@@ -1032,7 +1032,7 @@
} else {
if (rc)
return rc;
- while (! (nextPart = isPart(spec->line))) {
+ while ((nextPart = isPart(spec->line)) == PART_NONE) {
const char * macro = NULL;
rpmTag tag;
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/parsePrep.c
============================================================================
$ cvs diff -u -r2.104 -r2.105 parsePrep.c
--- rpm/build/parsePrep.c 17 Dec 2007 15:45:48 -0000 2.104
+++ rpm/build/parsePrep.c 17 Dec 2007 17:13:52 -0000 2.105
@@ -777,7 +777,7 @@
sb = newStringBuf();
- while (! (nextPart = isPart(spec->line))) {
+ while ((nextPart = isPart(spec->line)) == PART_NONE) {
/* Need to expand the macros inline. That way we */
/* can give good line number information on error. */
appendStringBuf(sb, spec->line);
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/parseScript.c
============================================================================
$ cvs diff -u -r2.58 -r2.59 parseScript.c
--- rpm/build/parseScript.c 16 Dec 2007 23:46:34 -0000 2.58
+++ rpm/build/parseScript.c 17 Dec 2007 17:13:52 -0000 2.59
@@ -288,7 +288,7 @@
} else {
if (rc)
goto exit;
- while (! (nextPart = isPart(spec->line))) {
+ while ((nextPart = isPart(spec->line)) == PART_NONE) {
appendStringBuf(sb, spec->line);
if ((rc = readLine(spec, STRIP_NOTHING)) > 0) {
nextPart = PART_NONE;
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/parseSpec.c
============================================================================
$ cvs diff -u -r2.125 -r2.126 parseSpec.c
--- rpm/build/parseSpec.c 16 Dec 2007 23:46:34 -0000 2.125
+++ rpm/build/parseSpec.c 17 Dec 2007 17:13:52 -0000 2.126
@@ -17,8 +17,8 @@
*/
/*@unchecked@*/
static struct PartRec {
- int part;
- int len;
+ rpmParseState part;
+ size_t len;
/*@observer@*/ /*@null@*/
const char * token;
} partList[] = {
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/rpmbuild.h
============================================================================
$ cvs diff -u -r2.87 -r2.88 rpmbuild.h
--- rpm/build/rpmbuild.h 17 Dec 2007 07:07:41 -0000 2.87
+++ rpm/build/rpmbuild.h 17 Dec 2007 17:13:52 -0000 2.88
@@ -48,7 +48,7 @@
/** \ingroup rpmbuild
* Spec file parser states.
*/
-#define PART_BASE 0
+#define PART_BASE 100
typedef enum rpmParseState_e {
PART_NONE = 0+PART_BASE, /*!< */
/* leave room for RPMRC_NOTFOUND returns. */
@@ -73,7 +73,7 @@
PART_BUILDARCHITECTURES= 29+PART_BASE,/*!< */
PART_TRIGGERPOSTUN = 30+PART_BASE, /*!< */
PART_TRIGGERPREIN = 31+PART_BASE, /*!< */
- /* support "%track" and "%test" scripts/sections */
+ /* support "%track" and "%sanitycheck" scripts/sections */
PART_TRACK = 32+PART_BASE, /*!< */
PART_SANITYCHECK = 33+PART_BASE, /*!< */
PART_LAST = 34+PART_BASE /*!< */
@@ .
Received on Mon Dec 17 18:13:53 2007