RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  [email protected]
  Module: rpm                              Date:   26-May-2017 22:49:25
  Branch: rpm-5_4                          Handle: 2017052620492203

  Modified files:           (Branch: rpm-5_4)
    rpm                     CHANGES
    rpm/lib                 psm.c rpmal.c rpmds.c rpmfc.c rpmfi.c rpmgi.c
                            rpmps.c rpmte.c rpmts.c
    rpm/rpmdb               dbconfig.c rpmdb.c rpmmdb.c rpmrepo.c rpmwf.c
                            sqlite.c
    rpm/rpmio               cipher.c digest.c macro.c mire.c mongo.c msqio.c
                            rpmasn.c rpmaug.c rpmbag.c rpmbf.c rpmct.c
                            rpmcudf.c rpmcvs.c rpmdate.c rpmdav.c rpmdir.c
                            rpmficl.c rpmgfs.c rpmgit.c rpmhash.c rpmhkp.c
                            rpmio.h rpmiob.c rpmjni.cc rpmlua.c rpmmg.c
                            rpmmqtt.c rpmmrb.c rpmnix.c rpmperl.c rpmpgp.c
                            rpmpython.c rpmruby.c rpmsed.c rpmsm.c rpmsp.c
                            rpmsql.c rpmsquirrel.c rpmsvn.c rpmsx.c rpmsyck.c
                            rpmtcl.c rpmtpm.c rpmxar.c set.c url.c

  Log:
    - rpmio: stub in fooDbug and fooInit callbacks for pools.

  Summary:
    Revision    Changes     Path
    1.3501.2.562+1  -0      rpm/CHANGES
    2.399.2.26  +2  -0      rpm/lib/psm.c
    2.76.4.7    +2  -0      rpm/lib/rpmal.c
    2.170.2.38  +3  -0      rpm/lib/rpmds.c
    1.75.2.30   +2  -0      rpm/lib/rpmfc.c
    2.160.4.10  +3  -0      rpm/lib/rpmfi.c
    2.75.2.17   +2  -0      rpm/lib/rpmgi.c
    2.35.4.5    +2  -0      rpm/lib/rpmps.c
    2.109.2.6   +9  -0      rpm/lib/rpmte.c
    2.188.2.22  +2  -0      rpm/lib/rpmts.c
    1.78.4.20   +2  -0      rpm/rpmdb/dbconfig.c
    1.392.2.37  +5  -0      rpm/rpmdb/rpmdb.c
    1.4.2.6     +2  -0      rpm/rpmdb/rpmmdb.c
    1.4.2.8     +2  -0      rpm/rpmdb/rpmrepo.c
    1.29.2.6    +3  -0      rpm/rpmdb/rpmwf.c
    1.44.4.22   +2  -0      rpm/rpmdb/sqlite.c
    1.1.2.5     +2  -0      rpm/rpmio/cipher.c
    2.93.2.11   +2  -0      rpm/rpmio/digest.c
    2.249.2.46  +4  -0      rpm/rpmio/macro.c
    1.56.4.5    +2  -0      rpm/rpmio/mire.c
    2.3.4.14    +2  -0      rpm/rpmio/mongo.c
    1.1.2.13    +2  -0      rpm/rpmio/msqio.c
    2.2.2.5     +2  -0      rpm/rpmio/rpmasn.c
    1.16.4.6    +2  -0      rpm/rpmio/rpmaug.c
    2.4.2.4     +2  -0      rpm/rpmio/rpmbag.c
    2.10.4.5    +2  -0      rpm/rpmio/rpmbf.c
    1.1.2.9     +3  -0      rpm/rpmio/rpmct.c
    2.7.4.5     +2  -0      rpm/rpmio/rpmcudf.c
    2.1.2.5     +2  -0      rpm/rpmio/rpmcvs.c
    1.1.2.6     +3  -0      rpm/rpmio/rpmdate.c
    2.119.2.24  +2  -0      rpm/rpmio/rpmdav.c
    2.12.2.14   +2  -0      rpm/rpmio/rpmdir.c
    2.5.2.5     +2  -0      rpm/rpmio/rpmficl.c
    1.1.2.11    +2  -0      rpm/rpmio/rpmgfs.c
    2.1.2.60    +2  -0      rpm/rpmio/rpmgit.c
    1.17.4.3    +2  -0      rpm/rpmio/rpmhash.c
    2.20.2.18   +2  -0      rpm/rpmio/rpmhkp.c
    1.97.2.19   +4  -1      rpm/rpmio/rpmio.h
    1.11.2.8    +2  -0      rpm/rpmio/rpmiob.c
    1.1.2.10    +2  -48     rpm/rpmio/rpmjni.cc
    2.76.4.15   +4  -0      rpm/rpmio/rpmlua.c
    2.13.4.6    +2  -0      rpm/rpmio/rpmmg.c
    1.1.2.29    +3  -0      rpm/rpmio/rpmmqtt.c
    1.1.2.8     +2  -0      rpm/rpmio/rpmmrb.c
    2.17.2.6    +2  -0      rpm/rpmio/rpmnix.c
    2.12.2.7    +2  -0      rpm/rpmio/rpmperl.c
    2.127.2.24  +2  -0      rpm/rpmio/rpmpgp.c
    2.16.2.14   +2  -0      rpm/rpmio/rpmpython.c
    2.16.2.8    +2  -0      rpm/rpmio/rpmruby.c
    1.1.2.7     +3  -0      rpm/rpmio/rpmsed.c
    2.18.2.5    +2  -0      rpm/rpmio/rpmsm.c
    2.7.2.7     +2  -0      rpm/rpmio/rpmsp.c
    2.59.2.19   +2  -0      rpm/rpmio/rpmsql.c
    2.6.4.10    +2  -0      rpm/rpmio/rpmsquirrel.c
    2.1.2.10    +2  -0      rpm/rpmio/rpmsvn.c
    2.4.4.8     +2  -0      rpm/rpmio/rpmsx.c
    2.5.2.5     +2  -0      rpm/rpmio/rpmsyck.c
    2.13.2.6    +2  -0      rpm/rpmio/rpmtcl.c
    1.5.2.24    +2  -0      rpm/rpmio/rpmtpm.c
    2.26.4.5    +2  -0      rpm/rpmio/rpmxar.c
    1.1.2.16    +2  -0      rpm/rpmio/set.c
    1.73.4.20   +2  -0      rpm/rpmio/url.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.3501.2.561 -r1.3501.2.562 CHANGES
  --- rpm/CHANGES       26 May 2017 13:22:17 -0000      1.3501.2.561
  +++ rpm/CHANGES       26 May 2017 20:49:22 -0000      1.3501.2.562
  @@ -1,4 +1,5 @@
   5.4.17 -> 5.4.18:
  +    - jbj: rpmio: stub in fooDbug and fooInit callbacks for pools.
       - jbj: msqio: add a monitor to handle multiple readers/writers.
       - jbj: msqio: add fopencookie wrapper.
       - jbj: msqio: add condvar to get rid of racy timeouts (loopback mode 
only).
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/psm.c
  ============================================================================
  $ cvs diff -u -r2.399.2.25 -r2.399.2.26 psm.c
  --- rpm/lib/psm.c     16 May 2017 18:29:10 -0000      2.399.2.25
  +++ rpm/lib/psm.c     26 May 2017 20:49:25 -0000      2.399.2.26
  @@ -1739,6 +1739,8 @@
       psm->triggers = NULL;
   }
   
  +#define      rpmpsmDbug      NULL
  +#define      rpmpsmInit      NULL
   RPMIOPOOL_MODULE(psm)
   
   rpmpsm rpmpsmNew(rpmts ts, rpmte te, rpmfi fi)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmal.c
  ============================================================================
  $ cvs diff -u -r2.76.4.6 -r2.76.4.7 rpmal.c
  --- rpm/lib/rpmal.c   16 May 2017 18:29:11 -0000      2.76.4.6
  +++ rpm/lib/rpmal.c   26 May 2017 20:49:25 -0000      2.76.4.7
  @@ -129,6 +129,8 @@
       rpmalFreeIndex(al);
   }
   
  +#define      rpmalDbug       NULL
  +#define      rpmalInit       NULL
   RPMIOPOOL_MODULE(al)
   
   rpmal rpmalNew(int delta)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmds.c
  ============================================================================
  $ cvs diff -u -r2.170.2.37 -r2.170.2.38 rpmds.c
  --- rpm/lib/rpmds.c   16 May 2017 18:29:11 -0000      2.170.2.37
  +++ rpm/lib/rpmds.c   26 May 2017 20:49:25 -0000      2.170.2.38
  @@ -181,7 +181,10 @@
       ds->include = (miRE) mireFreeAll(ds->include, ds->ninclude);
   }
   
  +#define      rpmdsDbug       NULL
  +#define      rpmdsInit       NULL
   RPMIOPOOL_MODULE(ds)
  +#undef       rpmdsInit
   
   static
   const char ** rpmdsDupArgv(const char ** argv, int argc)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmfc.c
  ============================================================================
  $ cvs diff -u -r1.75.2.29 -r1.75.2.30 rpmfc.c
  --- rpm/lib/rpmfc.c   16 May 2017 18:29:11 -0000      1.75.2.29
  +++ rpm/lib/rpmfc.c   26 May 2017 20:49:25 -0000      1.75.2.30
  @@ -1944,6 +1944,8 @@
       fc->iob_php = rpmiobFree(fc->iob_php);
   }
   
  +#define      rpmfcDbug       NULL
  +#define      rpmfcInit       NULL
   RPMIOPOOL_MODULE(fc)
   
   rpmfc rpmfcNew(void)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmfi.c
  ============================================================================
  $ cvs diff -u -r2.160.4.9 -r2.160.4.10 rpmfi.c
  --- rpm/lib/rpmfi.c   5 May 2017 17:43:51 -0000       2.160.4.9
  +++ rpm/lib/rpmfi.c   26 May 2017 20:49:25 -0000      2.160.4.10
  @@ -1314,7 +1314,10 @@
       fi->h = NULL;
   }
   
  +#define      rpmfiDbug       NULL
  +#define      rpmfiInit       NULL
   RPMIOPOOL_MODULE(fi)
  +#undef       rpmfiInit
   
   /**
    * Convert hex to binary nibble.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmgi.c
  ============================================================================
  $ cvs diff -u -r2.75.2.16 -r2.75.2.17 rpmgi.c
  --- rpm/lib/rpmgi.c   16 May 2017 18:29:11 -0000      2.75.2.16
  +++ rpm/lib/rpmgi.c   26 May 2017 20:49:25 -0000      2.75.2.17
  @@ -498,6 +498,8 @@
       gi->ts = NULL;
   }
   
  +#define      rpmgiDbug       NULL
  +#define      rpmgiInit       NULL
   RPMIOPOOL_MODULE(gi)
   
   rpmgi rpmgiNew(rpmts ts, int tag, const void * keyp, size_t keylen)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmps.c
  ============================================================================
  $ cvs diff -u -r2.35.4.4 -r2.35.4.5 rpmps.c
  --- rpm/lib/rpmps.c   16 May 2017 18:29:11 -0000      2.35.4.4
  +++ rpm/lib/rpmps.c   26 May 2017 20:49:25 -0000      2.35.4.5
  @@ -37,6 +37,8 @@
       ps->probs = _free(ps->probs);
   }
   
  +#define      rpmpsDbug       NULL
  +#define      rpmpsInit       NULL
   RPMIOPOOL_MODULE(ps)
   
   rpmps rpmpsCreate(void)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmte.c
  ============================================================================
  $ cvs diff -u -r2.109.2.5 -r2.109.2.6 rpmte.c
  --- rpm/lib/rpmte.c   16 May 2017 18:29:12 -0000      2.109.2.5
  +++ rpm/lib/rpmte.c   26 May 2017 20:49:25 -0000      2.109.2.6
  @@ -205,6 +205,8 @@
       delTE(te);
   }
   
  +#define      rpmteDbug       NULL
  +#define      rpmteInit       NULL
   RPMIOPOOL_MODULE(te)
   
   rpmte rpmteNew(const rpmts ts, Header h,
  @@ -710,8 +712,15 @@
       tsi->ts = NULL;
   }
   
  +#define      __rpmtsiInit    rpmtsiInit
  +#undef       rpmtsiInit
   #define      _rpmtsi_debug   _rpmte_debug
  +#define      rpmtsiDbug      NULL
  +#define      rpmtsiInit      NULL
   RPMIOPOOL_MODULE(tsi)
  +#undef       rpmtsiInit
  +#define      rpmtsiInit      __rpmtsiInit
  +#undef       __rpmtsiInit
   
   rpmtsi XrpmtsiInit(rpmts ts, const char * fn, unsigned int ln)
   {
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmts.c
  ============================================================================
  $ cvs diff -u -r2.188.2.21 -r2.188.2.22 rpmts.c
  --- rpm/lib/rpmts.c   16 May 2017 18:29:12 -0000      2.188.2.21
  +++ rpm/lib/rpmts.c   26 May 2017 20:49:25 -0000      2.188.2.22
  @@ -749,6 +749,8 @@
       }
   }
   
  +#define      rpmtsDbug       NULL
  +#define      rpmtsInit       NULL
   RPMIOPOOL_MODULE(ts)
   
   void * rpmtsGetKeyring(rpmts ts, int autoload)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/dbconfig.c
  ============================================================================
  $ cvs diff -u -r1.78.4.19 -r1.78.4.20 dbconfig.c
  --- rpm/rpmdb/dbconfig.c      16 May 2017 20:11:40 -0000      1.78.4.19
  +++ rpm/rpmdb/dbconfig.c      26 May 2017 20:49:24 -0000      1.78.4.20
  @@ -461,6 +461,8 @@
       }
   }
   
  +#define      rpmdbiDbug      NULL
  +#define      rpmdbiInit      NULL
   RPMIOPOOL_MODULE(dbi)
   
   #pragma GCC diagnostic push
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/rpmdb.c
  ============================================================================
  $ cvs diff -u -r1.392.2.36 -r1.392.2.37 rpmdb.c
  --- rpm/rpmdb/rpmdb.c 16 May 2017 20:11:41 -0000      1.392.2.36
  +++ rpm/rpmdb/rpmdb.c 26 May 2017 20:49:24 -0000      1.392.2.37
  @@ -683,6 +683,8 @@
       return rc;
   }
   
  +#define      rpmdbDbug       NULL
  +#define      rpmdbInit       NULL
   #define      rpmdbFini       NULL    /* XXX rpmdb deallocation is screwy */
   RPMIOPOOL_MODULE(db)
   
  @@ -1588,7 +1590,10 @@
       (void) rpmdbCheckSignals();
   }
   
  +#define      rpmmiDbug       NULL
  +#define      rpmmiInit       NULL
   RPMIOPOOL_MODULE(mi)
  +#undef       rpmmiInit
   
   uint32_t rpmmiInstance(rpmmi mi)
   {
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/rpmmdb.c
  ============================================================================
  $ cvs diff -u -r1.4.2.5 -r1.4.2.6 rpmmdb.c
  --- rpm/rpmdb/rpmmdb.c        16 May 2017 20:11:41 -0000      1.4.2.5
  +++ rpm/rpmdb/rpmmdb.c        26 May 2017 20:49:24 -0000      1.4.2.6
  @@ -27,6 +27,8 @@
   
   int _rpmmdb_debug = 0;
   
  +#define      rpmmdbDbug      NULL
  +#define      rpmmdbInit      NULL
   RPMIOPOOL_MODULE(mdb)
   
   rpmmdb rpmmdbNew(const char * fn, int flags)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/rpmrepo.c
  ============================================================================
  $ cvs diff -u -r1.4.2.7 -r1.4.2.8 rpmrepo.c
  --- rpm/rpmdb/rpmrepo.c       16 May 2017 20:11:41 -0000      1.4.2.7
  +++ rpm/rpmdb/rpmrepo.c       26 May 2017 20:49:24 -0000      1.4.2.8
  @@ -1809,6 +1809,8 @@
   
   }
   
  +#define      rpmrepoDbug     NULL
  +#define      rpmrepoInit     NULL
   RPMIOPOOL_MODULE(repo)
   
   rpmrepo rpmrepoNew(char ** av, int flags)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/rpmwf.c
  ============================================================================
  $ cvs diff -u -r1.29.2.5 -r1.29.2.6 rpmwf.c
  --- rpm/rpmdb/rpmwf.c 16 May 2017 20:11:41 -0000      1.29.2.5
  +++ rpm/rpmdb/rpmwf.c 26 May 2017 20:49:24 -0000      1.29.2.6
  @@ -197,8 +197,11 @@
       wf->fn = _free(wf->fn);
   }
   
  +#define      rpmwfDbug       NULL
  +#define      rpmwfInit       NULL
   #define      rpmwfFini       rpmwfScrub
   RPMIOPOOL_MODULE(wf)
  +#undef       rpmwfInit
   #undef       rpmwfFini
   
   rpmwf rpmwfNew(const char * fn)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/sqlite.c
  ============================================================================
  $ cvs diff -u -r1.44.4.21 -r1.44.4.22 sqlite.c
  --- rpm/rpmdb/sqlite.c        16 May 2017 20:11:41 -0000      1.44.4.21
  +++ rpm/rpmdb/sqlite.c        26 May 2017 20:49:24 -0000      1.44.4.22
  @@ -406,6 +406,8 @@
       scp->avlen = _free(scp->avlen);
   }
   
  +#define      rpmscpDbug      NULL
  +#define      rpmscpInit      NULL
   RPMIOPOOL_MODULE(scp)
   
   static rpmscp rpmscpNew(void * dbp)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/cipher.c
  ============================================================================
  $ cvs diff -u -r1.1.2.4 -r1.1.2.5 cipher.c
  --- rpm/rpmio/cipher.c        17 May 2017 12:34:38 -0000      1.1.2.4
  +++ rpm/rpmio/cipher.c        26 May 2017 20:49:22 -0000      1.1.2.5
  @@ -76,6 +76,8 @@
       cph->flags = (rpmCipherFlags)0;
   }
   
  +#define      rpmcphDbug      NULL
  +#define      rpmcphInit      NULL
   RPMIOPOOL_MODULE(cph)
   
   #ifdef       REFERENCE
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/digest.c
  ============================================================================
  $ cvs diff -u -r2.93.2.10 -r2.93.2.11 digest.c
  --- rpm/rpmio/digest.c        6 Mar 2017 17:52:54 -0000       2.93.2.10
  +++ rpm/rpmio/digest.c        26 May 2017 20:49:22 -0000      2.93.2.11
  @@ -165,6 +165,8 @@
       ctx->asn1 = NULL;
   }
   
  +#define      rpmctxDbug      NULL
  +#define      rpmctxInit      NULL
   RPMIOPOOL_MODULE(ctx)
   
   pgpHashAlgo rpmDigestAlgo(DIGEST_CTX ctx)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/macro.c
  ============================================================================
  $ cvs diff -u -r2.249.2.45 -r2.249.2.46 macro.c
  --- rpm/rpmio/macro.c 20 May 2017 13:42:48 -0000      2.249.2.45
  +++ rpm/rpmio/macro.c 26 May 2017 20:49:22 -0000      2.249.2.46
  @@ -3830,6 +3830,8 @@
   }
   
   int _rpmme_debug;
  +#define      rpmmeDbug       NULL
  +#define      rpmmeInit       NULL
   RPMIOPOOL_MODULE(me)
   
   rpmme rpmmeNew(char **av, uint32_t flags)
  @@ -3855,6 +3857,8 @@
   }
   
   int _rpmmc_debug;
  +#define      rpmmcDbug       NULL
  +#define      rpmmcInit       NULL
   RPMIOPOOL_INTERP_MODULE(mc)
   
   rpmmc rpmmcNew(char **av, uint32_t flags)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/mire.c
  ============================================================================
  $ cvs diff -u -r1.56.4.4 -r1.56.4.5 mire.c
  --- rpm/rpmio/mire.c  18 Apr 2017 04:05:48 -0000      1.56.4.4
  +++ rpm/rpmio/mire.c  26 May 2017 20:49:22 -0000      1.56.4.5
  @@ -79,6 +79,8 @@
   
   /* XXX rpmmireGetPool is exported to rpmdb/rpmdb.c */
   #define      static
  +#define      rpmmireDbug     NULL
  +#define      rpmmireInit     NULL
   RPMIOPOOL_MODULE(mire)
   #undef       static
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/mongo.c
  ============================================================================
  $ cvs diff -u -r2.3.4.13 -r2.3.4.14 mongo.c
  --- rpm/rpmio/mongo.c 20 May 2017 13:42:48 -0000      2.3.4.13
  +++ rpm/rpmio/mongo.c 26 May 2017 20:49:22 -0000      2.3.4.14
  @@ -3562,6 +3562,8 @@
       mgo->fn = _free(mgo->fn);
   }
   
  +#define      rpmmgoDbug      NULL
  +#define      rpmmgoInit      NULL
   RPMIOPOOL_MODULE(mgo)
   
   rpmmgo rpmmgoNew(const char * fn, int flags)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/msqio.c
  ============================================================================
  $ cvs diff -u -r1.1.2.12 -r1.1.2.13 msqio.c
  --- rpm/rpmio/msqio.c 26 May 2017 19:53:49 -0000      1.1.2.12
  +++ rpm/rpmio/msqio.c 26 May 2017 20:49:22 -0000      1.1.2.13
  @@ -394,6 +394,8 @@
       }
   }
   
  +#define      rpmmsqDbug      NULL
  +#define      rpmmsqInit      NULL
   RPMIOPOOL_MODULE(msq)
   
   rpmmsq rpmmsqNew(const char * path, const char * fmode, int fdno, unsigned 
flags)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmasn.c
  ============================================================================
  $ cvs diff -u -r2.2.2.4 -r2.2.2.5 rpmasn.c
  --- rpm/rpmio/rpmasn.c        17 May 2017 12:34:38 -0000      2.2.2.4
  +++ rpm/rpmio/rpmasn.c        26 May 2017 20:49:22 -0000      2.2.2.5
  @@ -32,6 +32,8 @@
   
   int _rpmasn_debug = 0;
   
  +#define      rpmasnDbug      NULL
  +#define      rpmasnInit      NULL
   RPMIOPOOL_MODULE(asn)
   
   rpmasn rpmasnNew(const char * fn, int flags)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmaug.c
  ============================================================================
  $ cvs diff -u -r1.16.4.5 -r1.16.4.6 rpmaug.c
  --- rpm/rpmio/rpmaug.c        17 May 2017 12:34:38 -0000      1.16.4.5
  +++ rpm/rpmio/rpmaug.c        26 May 2017 20:49:22 -0000      1.16.4.6
  @@ -46,6 +46,8 @@
   
   int _rpmaug_debug = 0;
   
  +#define      rpmaugDbug      NULL
  +#define      rpmaugInit      NULL
   RPMIOPOOL_MODULE(aug)
   
   static const char _root[] = "/";
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmbag.c
  ============================================================================
  $ cvs diff -u -r2.4.2.3 -r2.4.2.4 rpmbag.c
  --- rpm/rpmio/rpmbag.c        17 May 2017 12:34:38 -0000      2.4.2.3
  +++ rpm/rpmio/rpmbag.c        26 May 2017 20:49:22 -0000      2.4.2.4
  @@ -32,6 +32,8 @@
   
   int _rpmbag_debug = 0;
   
  +#define      rpmbagDbug      NULL
  +#define      rpmbagInit      NULL
   RPMIOPOOL_MODULE(bag)
   
   rpmbag rpmbagNew(const char * fn, int flags)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmbf.c
  ============================================================================
  $ cvs diff -u -r2.10.4.4 -r2.10.4.5 rpmbf.c
  --- rpm/rpmio/rpmbf.c 27 Jun 2016 03:05:58 -0000      2.10.4.4
  +++ rpm/rpmio/rpmbf.c 26 May 2017 20:49:23 -0000      2.10.4.5
  @@ -27,6 +27,8 @@
   
   int _rpmbf_debug = 0;
   
  +#define      rpmbfDbug       NULL
  +#define      rpmbfInit       NULL
   RPMIOPOOL_MODULE(bf)
   
   rpmbf rpmbfNew(size_t m, size_t k, unsigned flags)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmct.c
  ============================================================================
  $ cvs diff -u -r1.1.2.8 -r1.1.2.9 rpmct.c
  --- rpm/rpmio/rpmct.c 20 May 2017 13:42:49 -0000      1.1.2.8
  +++ rpm/rpmio/rpmct.c 26 May 2017 20:49:23 -0000      1.1.2.9
  @@ -980,7 +980,10 @@
   
   int _rpmct_debug;
   
  +#define      rpmctDbug       NULL
  +#define      rpmctInit       NULL
   RPMIOPOOL_MODULE(ct)
  +#undef       rpmctInit
   
   rpmct rpmctNew(char ** argv, unsigned flags)
   {
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmcudf.c
  ============================================================================
  $ cvs diff -u -r2.7.4.4 -r2.7.4.5 rpmcudf.c
  --- rpm/rpmio/rpmcudf.c       17 May 2017 12:34:39 -0000      2.7.4.4
  +++ rpm/rpmio/rpmcudf.c       26 May 2017 20:49:23 -0000      2.7.4.5
  @@ -450,6 +450,8 @@
   
   int _rpmcudf_debug = 0;
   
  +#define      rpmcudfDbug     NULL
  +#define      rpmcudfInit     NULL
   RPMIOPOOL_MODULE(cudf)
   
   #ifdef       NOTYET
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmcvs.c
  ============================================================================
  $ cvs diff -u -r2.1.2.4 -r2.1.2.5 rpmcvs.c
  --- rpm/rpmio/rpmcvs.c        17 May 2017 12:34:39 -0000      2.1.2.4
  +++ rpm/rpmio/rpmcvs.c        26 May 2017 20:49:23 -0000      2.1.2.5
  @@ -22,6 +22,8 @@
   
   int _rpmcvs_debug = 0;
   
  +#define      rpmcvsDbug      NULL
  +#define      rpmcvsInit      NULL
   RPMIOPOOL_MODULE(cvs)
   
   rpmcvs rpmcvsNew(const char * fn, int flags)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmdate.c
  ============================================================================
  $ cvs diff -u -r1.1.2.5 -r1.1.2.6 rpmdate.c
  --- rpm/rpmio/rpmdate.c       27 Jun 2016 03:05:58 -0000      1.1.2.5
  +++ rpm/rpmio/rpmdate.c       26 May 2017 20:49:23 -0000      1.1.2.6
  @@ -272,7 +272,10 @@
   
   int _rpmdate_debug = 0;
   
  +#define      rpmdateDbug     NULL
  +#define      rpmdateInit     NULL
   RPMIOPOOL_MODULE(date)
  +#undef       rpmdateInit
   
   rpmdate rpmdateNew(char ** argv, unsigned flags)
   {
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmdav.c
  ============================================================================
  $ cvs diff -u -r2.119.2.23 -r2.119.2.24 rpmdav.c
  --- rpm/rpmio/rpmdav.c        20 May 2017 13:42:49 -0000      2.119.2.23
  +++ rpm/rpmio/rpmdav.c        26 May 2017 20:49:23 -0000      2.119.2.24
  @@ -1525,6 +1525,8 @@
   }
   
   #define      _rpmhtml_debug  _html_debug
  +#define      rpmhtmlDbug     NULL
  +#define      rpmhtmlInit     NULL
   RPMIOPOOL_MODULE(html)
   
   static
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmdir.c
  ============================================================================
  $ cvs diff -u -r2.12.2.13 -r2.12.2.14 rpmdir.c
  --- rpm/rpmio/rpmdir.c        20 May 2017 13:42:49 -0000      2.12.2.13
  +++ rpm/rpmio/rpmdir.c        26 May 2017 20:49:23 -0000      2.12.2.14
  @@ -43,6 +43,8 @@
   }
   
   #define      _rpmavx_debug   _av_debug
  +#define      rpmavxDbug      NULL
  +#define      rpmavxInit      NULL
   RPMIOPOOL_MODULE(avx)
   
   void * rpmavxNew(const char *uri, struct stat *st)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmficl.c
  ============================================================================
  $ cvs diff -u -r2.5.2.4 -r2.5.2.5 rpmficl.c
  --- rpm/rpmio/rpmficl.c       17 May 2017 12:34:39 -0000      2.5.2.4
  +++ rpm/rpmio/rpmficl.c       26 May 2017 20:49:23 -0000      2.5.2.5
  @@ -41,6 +41,8 @@
   
   int _rpmficl_debug = 0;
   
  +#define      rpmficlDbug     NULL
  +#define      rpmficlInit     NULL
   RPMIOPOOL_MODULE(ficl)
   
   static rpmficl rpmficlI(void)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmgfs.c
  ============================================================================
  $ cvs diff -u -r1.1.2.10 -r1.1.2.11 rpmgfs.c
  --- rpm/rpmio/rpmgfs.c        20 May 2017 13:42:49 -0000      1.1.2.10
  +++ rpm/rpmio/rpmgfs.c        26 May 2017 20:49:23 -0000      1.1.2.11
  @@ -698,6 +698,8 @@
   
   int _rpmgfs_debug;
   
  +#define      rpmgfsDbug      NULL
  +#define      rpmgfsInit      NULL
   RPMIOPOOL_MODULE(gfs)
   
   rpmgfs rpmgfsNew(const char * fn, int flags)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmgit.c
  ============================================================================
  $ cvs diff -u -r2.1.2.59 -r2.1.2.60 rpmgit.c
  --- rpm/rpmio/rpmgit.c        20 May 2017 13:42:49 -0000      2.1.2.59
  +++ rpm/rpmio/rpmgit.c        26 May 2017 20:49:23 -0000      2.1.2.60
  @@ -2761,6 +2761,8 @@
   
   int _rpmgit_debug;
   
  +#define      rpmgitDbug      NULL
  +#define      rpmgitInit      NULL
   RPMIOPOOL_MODULE(git)
   
   #ifdef       NOTYET  /* XXX rpmgitRun() uses pre-parsed git->av */
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmhash.c
  ============================================================================
  $ cvs diff -u -r1.17.4.2 -r1.17.4.3 rpmhash.c
  --- rpm/rpmio/rpmhash.c       7 Jul 2016 12:17:31 -0000       1.17.4.2
  +++ rpm/rpmio/rpmhash.c       26 May 2017 20:49:23 -0000      1.17.4.3
  @@ -244,6 +244,8 @@
       ht->buckets = _free(ht->buckets);
   }
   
  +#define      rpmhtDbug       NULL
  +#define      rpmhtInit       NULL
   RPMIOPOOL_MODULE(ht)
   
   hashTable htCreate(int numBuckets, size_t keySize, int freeData,
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmhkp.c
  ============================================================================
  $ cvs diff -u -r2.20.2.17 -r2.20.2.18 rpmhkp.c
  --- rpm/rpmio/rpmhkp.c        17 May 2017 12:34:39 -0000      2.20.2.17
  +++ rpm/rpmio/rpmhkp.c        26 May 2017 20:49:23 -0000      2.20.2.18
  @@ -75,6 +75,8 @@
   
   int _rpmhkp_debug;
   
  +#define      rpmhkpDbug      NULL
  +#define      rpmhkpInit      NULL
   RPMIOPOOL_INTERP_MODULE(hkp)
   
   rpmhkp rpmhkpNew(const rpmuint8_t * keyid, uint32_t flags)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmio.h
  ============================================================================
  $ cvs diff -u -r1.97.2.18 -r1.97.2.19 rpmio.h
  --- rpm/rpmio/rpmio.h 20 May 2017 19:21:07 -0000      1.97.2.18
  +++ rpm/rpmio/rpmio.h 26 May 2017 20:49:23 -0000      1.97.2.19
  @@ -731,7 +731,10 @@
       if (_rpm##XY##Pool == NULL) {            \
        _rpm##XY##Pool =                        \
                rpmioNewPool(#XY, sizeof(*XY), -1, \
  -                     _rpm##XY##_debug, NULL, NULL, rpm##XY##Fini); \
  +                     _rpm##XY##_debug,       \
  +                     rpm##XY##Dbug,          \
  +                     rpm##XY##Init,          \
  +                     rpm##XY##Fini);         \
        pool = _rpm##XY##Pool;                  \
       }                                                \
       XY = (rpm##XY) rpmioGetPool(pool, sizeof(*XY)); \
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmiob.c
  ============================================================================
  $ cvs diff -u -r1.11.2.7 -r1.11.2.8 rpmiob.c
  --- rpm/rpmio/rpmiob.c        20 May 2017 13:42:49 -0000      1.11.2.7
  +++ rpm/rpmio/rpmiob.c        26 May 2017 20:49:23 -0000      1.11.2.8
  @@ -20,6 +20,8 @@
   
   int _rpmiob_debug;
   
  +#define      rpmiobDbug      NULL
  +#define      rpmiobInit      NULL
   RPMIOPOOL_MODULE(iob)
   
   rpmiob rpmiobNew(size_t len)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmjni.cc
  ============================================================================
  $ cvs diff -u -r1.1.2.9 -r1.1.2.10 rpmjni.cc
  --- rpm/rpmio/rpmjni.cc       27 Jun 2016 03:05:58 -0000      1.1.2.9
  +++ rpm/rpmio/rpmjni.cc       26 May 2017 20:49:23 -0000      1.1.2.10
  @@ -49,41 +49,9 @@
   
   }
   
  -#ifdef       DYING
  -/**
  -* The pool of JNI interpreter instances
  -* @see rpmioPool
  -*/
  -/*@unchecked@*/ /*@only@*/ /*@null@*/
  -rpmioPool _rpmjniPool;
  -
  -/**
  - * Returns the current rpmio pool responsible for JNI interpreter instances
  - *
  - * This is a wrapper function that returns the current rpmio pool responsible
  - * for embedded JNI interpreters. It creates and initializes a new pool when
  - * there is no current pool.
  - *
  - * @return The current pool
  - * @see rpmioNewPool
  - */
  -static rpmjni rpmjniGetPool(/*@null@*/ rpmioPool pool)
  -        /*@globals _rpmjniPool, fileSystem @*/
  -        /*@modifies pool, _rpmjniPool, fileSystem @*/
  -{
  -    rpmjni jni;
  -
  -    if (_rpmjniPool == NULL) {
  -        _rpmjniPool = rpmioNewPool("jni", sizeof(*jni), -1, _rpmjni_debug,
  -            NULL, NULL, rpmjniFini);
  -        pool = _rpmjniPool;
  -    } 
  -
  -    return (rpmjni) rpmioGetPool(pool, sizeof(*jni));
  -}
  -#else
  +#define      rpmjniDbug      NULL
  +#define      rpmjniInit      NULL
   RPMIOPOOL_INTERP_MODULE(jni)
  -#endif
   
   #if defined(WITH_JNIEMBED)
   /** Initializes JNI's StringIO for storing output in a string. */
  @@ -94,20 +62,6 @@
   ";
   #endif
   
  -#ifdef       DYING
  -/*@unchecked@*/ /*@relnull@*/
  -rpmjni _rpmjniI = NULL;
  -
  -static rpmjni rpmjniI(void)
  -        /*@globals _rpmjniI @*/
  -        /*@modifies _rpmjniI @*/
  -{
  -    if (_rpmjniI == NULL)
  -        _rpmjniI = rpmjniNew(NULL, 0);
  -    return _rpmjniI;
  -}
  -#endif
  -
   #if defined(WITH_JNIEMBED)
   static jint JNICALL rpmjniVfprintf(FILE *fp, const char *fmt, va_list ap)
   {
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmlua.c
  ============================================================================
  $ cvs diff -u -r2.76.4.14 -r2.76.4.15 rpmlua.c
  --- rpm/rpmio/rpmlua.c        17 May 2017 12:34:40 -0000      2.76.4.14
  +++ rpm/rpmio/rpmlua.c        26 May 2017 20:49:23 -0000      2.76.4.15
  @@ -111,6 +111,8 @@
       lua->printbuf = _free(lua->printbuf);
   }
   
  +#define      rpmluaDbug      NULL
  +#define      rpmluaInit      NULL
   RPMIOPOOL_MODULE(lua)
   
   void *rpmluaFree(rpmlua lua)
  @@ -507,6 +509,8 @@
   }
   
   #define      _rpmluav_debug  _rpmlua_debug
  +#define      rpmluavDbug     NULL
  +#define      rpmluavInit     NULL
   #define      rpmluavFini     NULL
   RPMIOPOOL_MODULE(luav)
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmmg.c
  ============================================================================
  $ cvs diff -u -r2.13.4.5 -r2.13.4.6 rpmmg.c
  --- rpm/rpmio/rpmmg.c 20 May 2017 13:42:49 -0000      2.13.4.5
  +++ rpm/rpmio/rpmmg.c 26 May 2017 20:49:23 -0000      2.13.4.6
  @@ -32,6 +32,8 @@
   
   int _rpmmg_debug = 0;
   
  +#define      rpmmgDbug       NULL
  +#define      rpmmgInit       NULL
   RPMIOPOOL_MODULE(mg)
   
   rpmmg rpmmgNew(const char * fn, int flags)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmmqtt.c
  ============================================================================
  $ cvs diff -u -r1.1.2.28 -r1.1.2.29 rpmmqtt.c
  --- rpm/rpmio/rpmmqtt.c       20 May 2017 13:42:49 -0000      1.1.2.28
  +++ rpm/rpmio/rpmmqtt.c       26 May 2017 20:49:23 -0000      1.1.2.29
  @@ -4082,7 +4082,10 @@
       mqtt->flags = MQTT_FLAGS_NONE;
   }
   
  +#define      rpmmqttDbug     NULL
  +#define      rpmmqttInit     NULL
   RPMIOPOOL_INTERP_MODULE(mqtt)
  +#undef       rpmmqttInit
   
   rpmmqtt rpmmqttNew(char ** av, uint32_t flags)
   {
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmmrb.c
  ============================================================================
  $ cvs diff -u -r1.1.2.7 -r1.1.2.8 rpmmrb.c
  --- rpm/rpmio/rpmmrb.c        20 May 2017 13:42:49 -0000      1.1.2.7
  +++ rpm/rpmio/rpmmrb.c        26 May 2017 20:49:23 -0000      1.1.2.8
  @@ -37,6 +37,8 @@
   
   int _rpmmrb_debug = 0;
   
  +#define      rpmmrbDbug      NULL
  +#define      rpmmrbInit      NULL
   RPMIOPOOL_INTERP_MODULE(mrb)
   
   #if defined(WITH_MRBEMBED)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmnix.c
  ============================================================================
  $ cvs diff -u -r2.17.2.5 -r2.17.2.6 rpmnix.c
  --- rpm/rpmio/rpmnix.c        20 May 2017 13:42:49 -0000      2.17.2.5
  +++ rpm/rpmio/rpmnix.c        26 May 2017 20:49:23 -0000      2.17.2.6
  @@ -3660,6 +3660,8 @@
       nix->con = NULL;
   }
   
  +#define      rpmnixDbug      NULL
  +#define      rpmnixInit      NULL
   RPMIOPOOL_MODULE(nix)
   
   #ifdef       NOTYET
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmperl.c
  ============================================================================
  $ cvs diff -u -r2.12.2.6 -r2.12.2.7 rpmperl.c
  --- rpm/rpmio/rpmperl.c       17 May 2017 12:34:40 -0000      2.12.2.6
  +++ rpm/rpmio/rpmperl.c       26 May 2017 20:49:23 -0000      2.12.2.7
  @@ -36,6 +36,8 @@
       perl->I = NULL;
   }
   
  +#define      rpmperlDbug     NULL
  +#define      rpmperlInit     NULL
   RPMIOPOOL_INTERP_MODULE(perl)
   
   #if defined(WITH_PERLEMBED)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmpgp.c
  ============================================================================
  $ cvs diff -u -r2.127.2.23 -r2.127.2.24 rpmpgp.c
  --- rpm/rpmio/rpmpgp.c        20 May 2017 13:42:49 -0000      2.127.2.23
  +++ rpm/rpmio/rpmpgp.c        26 May 2017 20:49:23 -0000      2.127.2.24
  @@ -1237,6 +1237,8 @@
   }
   
   #define      _rpmdig_debug   _pgp_debug
  +#define      rpmdigDbug      NULL
  +#define      rpmdigInit      NULL
   RPMIOPOOL_MODULE(dig)
   
   pgpDig pgpDigNew(pgpVSFlags vsflags, pgpPubkeyAlgo pubkey_algo)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmpython.c
  ============================================================================
  $ cvs diff -u -r2.16.2.13 -r2.16.2.14 rpmpython.c
  --- rpm/rpmio/rpmpython.c     3 May 2017 14:46:06 -0000       2.16.2.13
  +++ rpm/rpmio/rpmpython.c     26 May 2017 20:49:23 -0000      2.16.2.14
  @@ -36,6 +36,8 @@
   
   int _rpmpython_debug = 0;
   
  +#define      rpmpythonDbug   NULL
  +#define      rpmpythonInit   NULL
   RPMIOPOOL_INTERP_MODULE(python)
   
   #if defined(WITH_PYTHONEMBED)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmruby.c
  ============================================================================
  $ cvs diff -u -r2.16.2.7 -r2.16.2.8 rpmruby.c
  --- rpm/rpmio/rpmruby.c       20 May 2017 13:42:49 -0000      2.16.2.7
  +++ rpm/rpmio/rpmruby.c       26 May 2017 20:49:23 -0000      2.16.2.8
  @@ -44,6 +44,8 @@
   
   int _rpmruby_debug = 0;
   
  +#define      rpmrubyDbug     NULL
  +#define      rpmrubyInit     NULL
   RPMIOPOOL_INTERP_MODULE(ruby)
   
   #if defined(WITH_RUBYEMBED)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmsed.c
  ============================================================================
  $ cvs diff -u -r1.1.2.6 -r1.1.2.7 rpmsed.c
  --- rpm/rpmio/rpmsed.c        27 Jun 2016 03:05:59 -0000      1.1.2.6
  +++ rpm/rpmio/rpmsed.c        26 May 2017 20:49:23 -0000      1.1.2.7
  @@ -396,7 +396,10 @@
       sed->ob = NULL;
   }
   
  +#define      rpmsedDbug      NULL
  +#define      rpmsedInit      NULL
   RPMIOPOOL_MODULE(sed)
  +#undef       rpmsedInit
   
   rpmsed rpmsedNew(char ** argv, unsigned flags)
   {
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmsm.c
  ============================================================================
  $ cvs diff -u -r2.18.2.4 -r2.18.2.5 rpmsm.c
  --- rpm/rpmio/rpmsm.c 20 May 2017 13:42:49 -0000      2.18.2.4
  +++ rpm/rpmio/rpmsm.c 26 May 2017 20:49:23 -0000      2.18.2.5
  @@ -317,6 +317,8 @@
       sm->I = NULL;
   }
   
  +#define      rpmsmDbug       NULL
  +#define      rpmsmInit       NULL
   RPMIOPOOL_MODULE(sm)
   
   rpmsm rpmsmNew(const char * fn, unsigned int flags)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmsp.c
  ============================================================================
  $ cvs diff -u -r2.7.2.6 -r2.7.2.7 rpmsp.c
  --- rpm/rpmio/rpmsp.c 17 May 2017 12:34:41 -0000      2.7.2.6
  +++ rpm/rpmio/rpmsp.c 26 May 2017 20:49:23 -0000      2.7.2.7
  @@ -50,6 +50,8 @@
   
   int _rpmsp_debug = 0;
   
  +#define      rpmspDbug       NULL
  +#define      rpmspInit       NULL
   RPMIOPOOL_MODULE(sp)
   
   rpmsp rpmspNew(const char * fn, unsigned int flags)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmsql.c
  ============================================================================
  $ cvs diff -u -r2.59.2.18 -r2.59.2.19 rpmsql.c
  --- rpm/rpmio/rpmsql.c        20 May 2017 13:42:50 -0000      2.59.2.18
  +++ rpm/rpmio/rpmsql.c        26 May 2017 20:49:23 -0000      2.59.2.19
  @@ -5320,6 +5320,8 @@
       sql->iob = NULL;
   }
   
  +#define      rpmsqlDbug      NULL
  +#define      rpmsqlInit      NULL
   RPMIOPOOL_MODULE(sql)
   const char ** rpmsqlArgv(rpmsql sql, int * argcp)
   {
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmsquirrel.c
  ============================================================================
  $ cvs diff -u -r2.6.4.9 -r2.6.4.10 rpmsquirrel.c
  --- rpm/rpmio/rpmsquirrel.c   17 May 2017 12:34:41 -0000      2.6.4.9
  +++ rpm/rpmio/rpmsquirrel.c   26 May 2017 20:49:23 -0000      2.6.4.10
  @@ -36,6 +36,8 @@
   
   int _rpmsquirrel_debug;
   
  +#define      rpmsquirrelDbug NULL
  +#define      rpmsquirrelInit NULL
   RPMIOPOOL_INTERP_MODULE(squirrel)
   
   #if defined(WITH_SQUIRREL)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmsvn.c
  ============================================================================
  $ cvs diff -u -r2.1.2.9 -r2.1.2.10 rpmsvn.c
  --- rpm/rpmio/rpmsvn.c        17 May 2017 12:34:41 -0000      2.1.2.9
  +++ rpm/rpmio/rpmsvn.c        26 May 2017 20:49:23 -0000      2.1.2.10
  @@ -57,6 +57,8 @@
   
   int _rpmsvn_debug = 0;
   
  +#define      rpmsvnDbug      NULL
  +#define      rpmsvnInit      NULL
   RPMIOPOOL_MODULE(svn)
   
   rpmsvn rpmsvnNew(const char * fn, int flags)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmsx.c
  ============================================================================
  $ cvs diff -u -r2.4.4.7 -r2.4.4.8 rpmsx.c
  --- rpm/rpmio/rpmsx.c 17 May 2017 12:34:41 -0000      2.4.4.7
  +++ rpm/rpmio/rpmsx.c 26 May 2017 20:49:23 -0000      2.4.4.8
  @@ -31,6 +31,8 @@
   
   int _rpmsx_debug = 0;
   
  +#define      rpmsxDbug       NULL
  +#define      rpmsxInit       NULL
   RPMIOPOOL_MODULE(sx)
   
   rpmsx _rpmsxI = NULL;
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmsyck.c
  ============================================================================
  $ cvs diff -u -r2.5.2.4 -r2.5.2.5 rpmsyck.c
  --- rpm/rpmio/rpmsyck.c       27 Jun 2016 03:05:59 -0000      2.5.2.4
  +++ rpm/rpmio/rpmsyck.c       26 May 2017 20:49:23 -0000      2.5.2.5
  @@ -54,6 +54,8 @@
   
   int _rpmsyck_debug = 0;
   
  +#define      rpmsyckDbug     NULL
  +#define      rpmsyckInit     NULL
   RPMIOPOOL_MODULE(syck)
   
   rpmsyck rpmsyckNew(void)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmtcl.c
  ============================================================================
  $ cvs diff -u -r2.13.2.5 -r2.13.2.6 rpmtcl.c
  --- rpm/rpmio/rpmtcl.c        17 May 2017 12:34:41 -0000      2.13.2.5
  +++ rpm/rpmio/rpmtcl.c        26 May 2017 20:49:23 -0000      2.13.2.6
  @@ -26,6 +26,8 @@
   
   int _rpmtcl_debug = 0;
   
  +#define      rpmtclDbug      NULL
  +#define      rpmtclInit      NULL
   RPMIOPOOL_INTERP_MODULE(tcl)
   
   #if defined(WITH_TCL)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmtpm.c
  ============================================================================
  $ cvs diff -u -r1.5.2.23 -r1.5.2.24 rpmtpm.c
  --- rpm/rpmio/rpmtpm.c        17 May 2017 12:34:41 -0000      1.5.2.23
  +++ rpm/rpmio/rpmtpm.c        26 May 2017 20:49:23 -0000      1.5.2.24
  @@ -246,6 +246,8 @@
   
   }
   
  +#define      rpmtpmDbug      NULL
  +#define      rpmtpmInit      NULL
   RPMIOPOOL_MODULE(tpm)
   
   rpmtpm rpmtpmNew(int ac, char ** av, struct poptOption *tbl, uint32_t flags)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmxar.c
  ============================================================================
  $ cvs diff -u -r2.26.4.4 -r2.26.4.5 rpmxar.c
  --- rpm/rpmio/rpmxar.c        17 May 2017 12:34:41 -0000      2.26.4.4
  +++ rpm/rpmio/rpmxar.c        26 May 2017 20:49:23 -0000      2.26.4.5
  @@ -51,6 +51,8 @@
   }
   
   #define      _rpmxar_debug   _xar_debug
  +#define      rpmxarDbug      NULL
  +#define      rpmxarInit      NULL
   RPMIOPOOL_MODULE(xar)
   
   rpmxar rpmxarNew(const char * fn, const char * fmode)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/set.c
  ============================================================================
  $ cvs diff -u -r1.1.2.15 -r1.1.2.16 set.c
  --- rpm/rpmio/set.c   17 May 2017 12:34:41 -0000      1.1.2.15
  +++ rpm/rpmio/set.c   26 May 2017 20:49:23 -0000      1.1.2.16
  @@ -1333,6 +1333,8 @@
       }
   }
   
  +#define      rpmsetDbug      NULL
  +#define      rpmsetInit      NULL
   RPMIOPOOL_MODULE(set)
   
   rpmset rpmsetNew(const char * fn, int flags)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/url.c
  ============================================================================
  $ cvs diff -u -r1.73.4.19 -r1.73.4.20 url.c
  --- rpm/rpmio/url.c   12 Jul 2016 16:47:32 -0000      1.73.4.19
  +++ rpm/rpmio/url.c   26 May 2017 20:49:23 -0000      1.73.4.20
  @@ -176,6 +176,8 @@
    */
   int _url_count = 0;
   
  +#define      rpmurlDbug      NULL
  +#define      rpmurlInit      NULL
   RPMIOPOOL_MODULE(url)
   
   urlinfo XurlNew(const char *msg, const char *fn, unsigned ln)
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                [email protected]

Reply via email to