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-Apr-2017 18:59:14
Branch: rpm-5_4 Handle: 2017041116591400
Modified files: (Branch: rpm-5_4)
rpm CHANGES
rpm/rpmdb header_internal.c
Log:
- header: fix: accomodate rpm.org unsorted signature header bug.
Summary:
Revision Changes Path
1.3501.2.528+1 -0 rpm/CHANGES
1.20.2.8 +2 -0 rpm/rpmdb/header_internal.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3501.2.527 -r1.3501.2.528 CHANGES
--- rpm/CHANGES 5 Apr 2017 16:42:58 -0000 1.3501.2.527
+++ rpm/CHANGES 11 Apr 2017 16:59:14 -0000 1.3501.2.528
@@ -1,4 +1,5 @@
5.4.17 -> 5.4.18:
+ - jbj: header: fix: accomodate rpm.org unsorted signature header bug.
- jbj: rpmio: pass glibc-peculier 'x' and 'e' to stdio fopen(3).
- jbj: debugedit: bug fixes.
- jbj: debugedit: upgrade to handle resizable elf section.
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/header_internal.c
============================================================================
$ cvs diff -u -r1.20.2.7 -r1.20.2.8 header_internal.c
--- rpm/rpmdb/header_internal.c 19 Apr 2016 13:13:06 -0000 1.20.2.7
+++ rpm/rpmdb/header_internal.c 11 Apr 2017 16:59:14 -0000 1.20.2.8
@@ -72,6 +72,8 @@
if (negate)
info->offset = -info->offset;
+ /* XXX buggy rpm.org signature header isn't sorted. */
+ if (!(ptag == (rpmTag)RPMSIGTAG_MD5 && info->tag ==
(rpmTag)RPMSIGTAG_SHA1))
if (i > 0 && ptag > info->tag) {
/* Heuristic to determine whether this or previous tag was fubar. */
if (ptag > RPMTAG_FIRSTFREE_TAG) {
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
