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: 16-Oct-2007 18:07:28
Branch: HEAD Handle: 2007101617072800
Modified files:
rpm CHANGES
rpm/lib rpmfi.c rpmfi.h
Log:
- extract verifyscript when available. more to do ...
Summary:
Revision Changes Path
1.1716 +1 -0 rpm/CHANGES
2.87 +4 -0 rpm/lib/rpmfi.c
2.44 +4 -0 rpm/lib/rpmfi.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.1715 -r1.1716 CHANGES
--- rpm/CHANGES 16 Oct 2007 15:59:08 -0000 1.1715
+++ rpm/CHANGES 16 Oct 2007 16:07:28 -0000 1.1716
@@ -1,4 +1,5 @@
4.5 -> 5.0:
+ - jbj: extract verifyscript when available. more to do ...
- jbj: fix: %verifyscript broken by scaremem elimination.
- jbj: another missed level of indirection. leave the bandaid, won't hurt.
- jbj: bandaid for a --import hge recursion problem. real fix soon.
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmfi.c
============================================================================
$ cvs diff -u -r2.86 -r2.87 rpmfi.c
--- rpm/lib/rpmfi.c 14 Oct 2007 22:53:57 -0000 2.86
+++ rpm/lib/rpmfi.c 16 Oct 2007 16:07:28 -0000 2.87
@@ -1165,6 +1165,8 @@
fi->pretransprog = _free(fi->pretransprog);
fi->posttrans = _free(fi->posttrans);
fi->posttransprog = _free(fi->posttransprog);
+ fi->verifyscript = _free(fi->verifyscript);
+ fi->verifyscriptprog = _free(fi->verifyscriptprog);
if (fi->fc > 0) {
fi->bnl = _free(fi->bnl);
@@ -1312,6 +1314,8 @@
_fdupestring(h, RPMTAG_PRETRANSPROG, fi->pretransprog);
_fdupestring(h, RPMTAG_POSTTRANS, fi->posttrans);
_fdupestring(h, RPMTAG_POSTTRANSPROG, fi->posttransprog);
+ _fdupestring(h, RPMTAG_VERIFYSCRIPT, fi->verifyscript);
+ _fdupestring(h, RPMTAG_VERIFYSCRIPTPROG, fi->verifyscriptprog);
he->tag = RPMTAG_BASENAMES;
xx = hge(h, he->tag, he->t, he->p, he->c);
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmfi.h
============================================================================
$ cvs diff -u -r2.43 -r2.44 rpmfi.h
--- rpm/lib/rpmfi.h 14 Oct 2007 19:05:38 -0000 2.43
+++ rpm/lib/rpmfi.h 16 Oct 2007 16:07:28 -0000 2.44
@@ -139,6 +139,10 @@
const char * posttrans;
/*@only@*/ /*@relnull@*/
const char * posttransprog;
+/*@only@*/ /*@relnull@*/
+ const char * verifyscript;
+/*@only@*/ /*@relnull@*/
+ const char * verifyscriptprog;
/*@only@*/ /*@null@*/
char * fn; /*!< File name buffer. */
@@ .
Received on Tue Oct 16 18:07:28 2007