OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 28-Aug-2003 15:48:47 Branch: HEAD Handle: 2003082814484700 Modified files: openpkg-src/openpkg rpm.patch.bugfix Log: include vendor patch which fixes a segfault Summary: Revision Changes Path 1.10 +17 -0 openpkg-src/openpkg/rpm.patch.bugfix ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/openpkg/rpm.patch.bugfix ============================================================================ $ cvs diff -u -r1.9 -r1.10 rpm.patch.bugfix --- openpkg-src/openpkg/rpm.patch.bugfix 28 Aug 2003 08:21:45 -0000 1.9 +++ openpkg-src/openpkg/rpm.patch.bugfix 28 Aug 2003 13:48:47 -0000 1.10 @@ -184,3 +184,20 @@ se = grabArgs(mb, me, fe, grab); } else { addMacro(mb->mc, "**", NULL, "", mb->depth); + ++--------------------------------------------------------------------------- +| Backported RPM vendor patch: +| "fix: packages w/o file colors segfault" +| (cvs diff -r2.41.2.6 -r2.41.2.7 lib/rpmfi.c) ++--------------------------------------------------------------------------- +Index: lib/rpmfi.c +--- lib/rpmfi.c 17 Jul 2003 22:44:28 -0000 1.1.1.3 ++++ lib/rpmfi.c 28 Aug 2003 13:05:42 -0000 +@@ -866,6 +866,7 @@ + *fn = '\0'; + fnlen = stpcpy( stpcpy(fn, dirNames[dirIndexes[i]]), baseNames[i]) - fn; + ++if (fColors != NULL) + dColors[dirIndexes[i]] |= fColors[i]; + /* + * See if this file path needs relocating. @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]