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: 29-Feb-2012 14:32:13
Branch: rpm-5_4 Handle: 2012022913321201
Modified files: (Branch: rpm-5_4)
rpm CHANGES
rpm/build parseSpec.c
Log:
include rpm.org fix for rhbz#782970
don't process spec %include in false
branch of %if clauses
Summary:
Revision Changes Path
1.3501.2.216+2 -0 rpm/CHANGES
2.143.4.3 +1 -1 rpm/build/parseSpec.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3501.2.215 -r1.3501.2.216 CHANGES
--- rpm/CHANGES 29 Feb 2012 04:22:26 -0000 1.3501.2.215
+++ rpm/CHANGES 29 Feb 2012 13:32:12 -0000 1.3501.2.216
@@ -1,4 +1,6 @@
5.4.6 -> 5.4.7:
+ - devzero2000: include rpm.org fix for rhbz#782970
+ don't process spec %include in false branch of %if clauses
- jbj: stub-in autofu for svn/git objects.
- jbj: ispras: upgrade to abi-sanity.checker.pl to 1.12.9.
- jbj: macosx: permit (custom built) libtomcrypt in buildbot's.
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/parseSpec.c
============================================================================
$ cvs diff -u -r2.143.4.2 -r2.143.4.3 parseSpec.c
--- rpm/build/parseSpec.c 6 Apr 2011 23:26:54 -0000 2.143.4.2
+++ rpm/build/parseSpec.c 29 Feb 2012 13:32:13 -0000 2.143.4.3
@@ -433,7 +433,7 @@
spec->readStack = spec->readStack->next;
free(rl);
spec->line[0] = '\0';
- } else if (! strncmp("%include", s, sizeof("%include")-1)) {
+ } else if (spec->readStack->reading && ! strncmp("%include", s,
sizeof("%include")-1)) {
char *fileName, *endFileName, *p;
s += 8;
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
