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: 03-Apr-2016 01:01:12
Branch: rpm-5_4 Handle: 2016040223011200
Modified files: (Branch: rpm-5_4)
rpm/build pack.c
rpm/rpmdb hdrNVR.c package.c pkgio.c rpmtag.h signature.c
Log:
- mark signature header access with HEADERGET_SIGHEADER.
Summary:
Revision Changes Path
2.324.2.17 +4 -4 rpm/build/pack.c
1.46.6.4 +2 -2 rpm/rpmdb/hdrNVR.c
1.2.2.10 +1 -1 rpm/rpmdb/package.c
1.121.2.17 +1 -1 rpm/rpmdb/pkgio.c
1.70.4.20 +1 -0 rpm/rpmdb/rpmtag.h
1.68.2.14 +4 -4 rpm/rpmdb/signature.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/build/pack.c
============================================================================
$ cvs diff -u -r2.324.2.16 -r2.324.2.17 pack.c
--- rpm/build/pack.c 29 Mar 2016 16:40:30 -0000 2.324.2.16
+++ rpm/build/pack.c 2 Apr 2016 23:01:12 -0000 2.324.2.17
@@ -892,7 +892,7 @@
he->t = RPM_BIN_TYPE;
he->p.ptr = (void *) dig->sig;
he->c = dig->siglen;
- xx = headerPut(sigh, he, 0);
+ xx = headerPut(sigh, he, HEADERGET_SIGHEADER);
dig->sig = _free(dig->sig); /* XXX lazily instead? */
dig->siglen = 0;
}
@@ -902,7 +902,7 @@
he->t = RPM_STRING_TYPE;
he->p.str = SHA1;
he->c = 1;
- xx = headerPut(sigh, he, 0);
+ xx = headerPut(sigh, he, HEADERGET_SIGHEADER);
SHA1 = _free(SHA1);
}
@@ -911,7 +911,7 @@
he->t = RPM_UINT32_TYPE;
he->p.ui32p = &payloadSize;
he->c = 1;
- xx = headerPut(sigh, he, 0);
+ xx = headerPut(sigh, he, HEADERGET_SIGHEADER);
}
/* Reallocate the signature header into one contiguous region. */
@@ -937,7 +937,7 @@
he->t = RPM_BIN_TYPE;
he->p.ui8p = b;
he->c = nb;
- xx = headerPut(sigh, he, 0);
+ xx = headerPut(sigh, he, HEADERGET_SIGHEADER);
sigh = headerReload(sigh, RPMTAG_HEADERSIGNATURES);
assert(sigh != NULL);
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/hdrNVR.c
============================================================================
$ cvs diff -u -r1.46.6.3 -r1.46.6.4 hdrNVR.c
--- rpm/rpmdb/hdrNVR.c 5 May 2014 19:44:11 -0000 1.46.6.3
+++ rpm/rpmdb/hdrNVR.c 2 Apr 2016 23:01:12 -0000 1.46.6.4
@@ -249,7 +249,7 @@
return;
for (hi = headerInit(sigh);
- headerNext(hi, he, 0);
+ headerNext(hi, he, HEADERGET_SIGHEADER);
he->p.ptr = _free(he->p.ptr))
{
/* XXX Translate legacy signature tag values. */
@@ -347,7 +347,7 @@
}
assert(he->p.ptr != NULL);
if (!headerIsEntry(sigh, he->tag)) {
- xx = headerPut(sigh, he, 0);
+ xx = headerPut(sigh, he, HEADERGET_SIGHEADER);
assert(xx == 1);
}
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/package.c
============================================================================
$ cvs diff -u -r1.2.2.9 -r1.2.2.10 package.c
--- rpm/rpmdb/package.c 11 May 2015 21:10:17 -0000 1.2.2.9
+++ rpm/rpmdb/package.c 2 Apr 2016 23:01:12 -0000 1.2.2.10
@@ -272,7 +272,7 @@
he->p.ptr = _free(he->p.ptr);
/* Retrieve the tag parameters from the signature header. */
- xx = headerGet(sigh, she, 0);
+ xx = headerGet(sigh, she, HEADERGET_SIGHEADER);
if (she->p.ptr == NULL) {
rc = RPMRC_FAIL;
goto exit;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/pkgio.c
============================================================================
$ cvs diff -u -r1.121.2.16 -r1.121.2.17 pkgio.c
--- rpm/rpmdb/pkgio.c 11 May 2015 21:10:17 -0000 1.121.2.16
+++ rpm/rpmdb/pkgio.c 2 Apr 2016 23:01:12 -0000 1.121.2.17
@@ -983,7 +983,7 @@
/* Print package component sizes. */
he->tag = (rpmTag) RPMSIGTAG_SIZE;
- xx = headerGet(sigh, he, 0);
+ xx = headerGet(sigh, he, HEADERGET_SIGHEADER);
if (xx) {
size_t datasize = he->p.ui32p[0];
rc = printSize(fd, sigSize, pad, datasize);
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmtag.h
============================================================================
$ cvs diff -u -r1.70.4.19 -r1.70.4.20 rpmtag.h
--- rpm/rpmdb/rpmtag.h 28 Mar 2016 21:50:28 -0000 1.70.4.19
+++ rpm/rpmdb/rpmtag.h 2 Apr 2016 23:01:12 -0000 1.70.4.20
@@ -871,6 +871,7 @@
/*@modifies he, internalState @*/;
#define HEADERGET_NOEXTENSION (1 << 0) /*!< Extension search
disabler. */
#define HEADERGET_NOI18NSTRING (1 << 1) /*!< Return i18n strings as
argv. */
+#define HEADERGET_SIGHEADER (1 << 2) /*!< Override signature tag
data. */
/** \ingroup header
* Add or append tag container to header.
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/signature.c
============================================================================
$ cvs diff -u -r1.68.2.13 -r1.68.2.14 signature.c
--- rpm/rpmdb/signature.c 29 Mar 2016 16:40:31 -0000 1.68.2.13
+++ rpm/rpmdb/signature.c 2 Apr 2016 23:01:12 -0000 1.68.2.14
@@ -374,7 +374,7 @@
he->t = RPM_STRING_TYPE;
he->p.str = SHA1;
he->c = 1;
- xx = headerPut(sigh, he, 0);
+ xx = headerPut(sigh, he, HEADERGET_SIGHEADER);
SHA1 = _free(SHA1);
if (!xx)
goto exit;
@@ -418,7 +418,7 @@
he->t = RPM_BIN_TYPE;
he->p.ptr = pkt;
he->c = pktlen;
- xx = headerPut(sigh, he, 0);
+ xx = headerPut(sigh, he, HEADERGET_SIGHEADER);
pkt = _free(pkt);
if (!xx)
goto exit;
@@ -461,7 +461,7 @@
he->p.ui32p = &pktlen;
he->c = 1;
/*@-compmempass@*/
- xx = headerPut(sigh, he, 0);
+ xx = headerPut(sigh, he, HEADERGET_SIGHEADER);
/*@=compmempass@*/
if (!xx)
break;
@@ -476,7 +476,7 @@
he->t = RPM_BIN_TYPE;
he->p.ptr = pkt;
he->c = pktlen;
- xx = headerPut(sigh, he, 0);
+ xx = headerPut(sigh, he, HEADERGET_SIGHEADER);
if (!xx)
break;
ret = 0;
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
