date:20071109

[CVS] RPM: rpm/ CHANGES rpm/lib/ poptALL.c rpm/rpmio/ librpmio.vers rp...

2007-11-09 Thread Jeff Johnson

  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:   09-Nov-2007 19:00:09
  Branch: HEAD Handle: 2007110918000304

  Modified files:
rpm CHANGES
rpm/lib poptALL.c
rpm/rpmio   librpmio.vers rpmdav.c rpmdav.h rpmio.c rpmio.h

  Log:
- rearrange the steaming piles of ick into an aesthetic constellation.

  Summary:
RevisionChanges Path
1.1780  +1  -0  rpm/CHANGES
2.50+4  -33 rpm/lib/poptALL.c
2.15+1  -2  rpm/rpmio/librpmio.vers
2.49+26 -0  rpm/rpmio/rpmdav.c
2.18+6  -0  rpm/rpmio/rpmdav.h
1.98+13 -0  rpm/rpmio/rpmio.c
1.59+7  -0  rpm/rpmio/rpmio.h
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.1779 -r1.1780 CHANGES
  --- rpm/CHANGES   9 Nov 2007 17:16:24 -   1.1779
  +++ rpm/CHANGES   9 Nov 2007 18:00:03 -   1.1780
  @@ -1,4 +1,5 @@
   4.5 - 5.0:
  +- jbj: rearrange the steaming piles of ick into an aesthetic 
constellation.
   - jbj: squeaky clean SSL memory cleanup. Ick.
   - rpm.org: start hiding rpmsq internals.
   - jbj: fix: trade a double free for a modest memory leak for the 
moment.
  @@ .
  patch -p0 '@@ .'
  Index: rpm/lib/poptALL.c
  
  $ cvs diff -u -r2.49 -r2.50 poptALL.c
  --- rpm/lib/poptALL.c 9 Nov 2007 17:16:24 -   2.49
  +++ rpm/lib/poptALL.c 9 Nov 2007 18:00:07 -   2.50
  @@ -8,25 +8,10 @@
   
   #include rpmio.h
   #include rpmcli.h
  -#include rpmlua.h  /* XXX rpmluaFree() */
   #include fs.h  /* XXX rpmFreeFilesystems() */
   #include fts.h
   #include mire.h
   
  -#if defined(WITH_NEON)   /* XXX this should be done in a rpmioClean() 
wrapper. */
  -#include ne_utils.h
  -#if !defined(HEADER_ERR_H)
  -/* cheats to avoid having to explicitly build against OpenSSL */
  -extern void ERR_remove_state(int foo);
  -extern void ENGINE_cleanup(void);
  -extern void CONF_modules_unload(int foo);
  -extern void ERR_free_strings(void);
  -extern void EVP_cleanup(void);
  -extern void CRYPTO_cleanup_all_ex_data(void);
  -extern void CRYPTO_mem_leaks(void * ptr);
  -#endif
  -#endif
  -
   #include debug.h
   
   #define POPT_SHOWVERSION -999
  @@ -521,30 +506,16 @@
   poptContext
   rpmcliFini(poptContext optCon)
   {
  -/* XXX this should be done in a rpmioClean() wrapper. */
  +/* XXX this should be done in the rpmioClean() wrapper. */
   /* keeps memory leak checkers quiet */
   rpmFreeMacros(NULL);
   /[EMAIL PROTECTED]@*/rpmFreeMacros(rpmCLIMacroContext);
  +
  +rpmioClean();
  +
   rpmFreeRpmrc();
  -#if defined(WITH_LUA)/* XXX this should be done in a rpmioClean() 
wrapper. */
  -(void) rpmluaFree(NULL);
  -#endif
  -#if defined(WITH_NEON)   /* XXX this should be done in a rpmioClean() 
wrapper. */
  -if (ne_has_support(NE_FEATURE_SSL)) {
  -/* XXX 
http://www.nabble.com/Memory-Leaks-in-SSL_Library_init()-t3431875.html */
  - ENGINE_cleanup();
  - CRYPTO_cleanup_all_ex_data();
  - ERR_free_strings();
  - ERR_remove_state(0);
  - EVP_cleanup();
  - CRYPTO_mem_leaks(NULL);
  - CONF_modules_unload(1);
  -}
  -#endif
   
   rpmFreeFilesystems();
  -/[EMAIL PROTECTED]@*/urlFreeCache();
  -rpmlogClose();
   /[EMAIL PROTECTED]@*/rpmcliTargets = _free(rpmcliTargets);
   
   rpmTags-byName = _free(rpmTags-byName);
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmio/librpmio.vers
  
  $ cvs diff -u -r2.14 -r2.15 librpmio.vers
  --- rpm/rpmio/librpmio.vers   3 Nov 2007 13:21:43 -   2.14
  +++ rpm/rpmio/librpmio.vers   9 Nov 2007 18:00:07 -   2.15
  @@ -227,6 +227,7 @@
   rpmInitMacros;
   _rpmio_debug;
   rpmioAccess;
  +rpmioClean;
   rpmioMkpath;
   rpmioSlurp;
   rpmLoadMacroFile;
  @@ -243,7 +244,6 @@
   rpmlogSetMask;
   rpmluaCheckScript;
   rpmluaDelVar;
  -rpmluaFree;
   rpmluaGetData;
   rpmluaGetPrintBuffer;
   rpmluaGetVar;
  @@ -314,7 +314,6 @@
   _url_cache;
   _url_count;
   _url_debug;
  -urlFreeCache;
   urlGetFile;
   _url_iobuf_size;
   urlIsURL;
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmio/rpmdav.c
  
  $ cvs diff -u -r2.48

[CVS] RPM: rpm/ CHANGES rpm/lib/ depends.c rpmchecksig.c rpmds.c rpmds...

2007-11-09 Thread Jeff Johnson

  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:   09-Nov-2007 22:04:36
  Branch: HEAD Handle: 2007110921043501

  Modified files:
rpm CHANGES
rpm/lib depends.c rpmchecksig.c rpmds.c rpmds.h
rpm/rpmdb   pkgio.c rpmdb.c

  Log:
- jbj: hmmm, headerGetExtension should not leak memory on failure. hack it.
- jbj: more memory leak canoodling.

  Summary:
RevisionChanges Path
1.1782  +2  -0  rpm/CHANGES
1.359   +3  -0  rpm/lib/depends.c
1.169   +1  -0  rpm/lib/rpmchecksig.c
2.78+1  -1  rpm/lib/rpmds.c
2.61+3  -0  rpm/lib/rpmds.h
1.23+1  -1  rpm/rpmdb/pkgio.c
1.202   +5  -1  rpm/rpmdb/rpmdb.c
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.1781 -r1.1782 CHANGES
  --- rpm/CHANGES   9 Nov 2007 20:10:59 -   1.1781
  +++ rpm/CHANGES   9 Nov 2007 21:04:35 -   1.1782
  @@ -1,4 +1,6 @@
   4.5 - 5.0:
  +- jbj: hmmm, headerGetExtension should not leak memory on failure. hack 
it.
  +- jbj: more memory leak canoodling.
   - jbj: plug a couple of memory leaks.
   - jbj: rearrange the steaming piles of ick into an aesthetic 
constellation.
   - jbj: squeaky clean SSL memory cleanup. Ick.
  @@ .
  patch -p0 '@@ .'
  Index: rpm/lib/depends.c
  
  $ cvs diff -u -r1.358 -r1.359 depends.c
  --- rpm/lib/depends.c 9 Nov 2007 20:11:00 -   1.358
  +++ rpm/lib/depends.c 9 Nov 2007 21:04:35 -   1.359
  @@ -562,6 +562,8 @@
   cpuinfoP = rpmdsFree(cpuinfoP);
   getconfP = rpmdsFree(getconfP);
   unameP = rpmdsFree(unameP);
  +_sysinfo_path = _free(_sysinfo_path);
  +sysinfo_path = _free(sysinfo_path);
   }
   
   /**
  @@ -900,6 +902,7 @@
sysinfo_path = xstrdup(SYSCONFIGDIR /sysinfo);
}
   }
  +
   if (!rpmioAccess(sysinfo_path, NULL, R_OK)) {
   #ifdef   NOTYET  /* XXX just sysinfo Provides: for now. */
rpmTag tagN = (Name[0] == '/' ? RPMTAG_DIRNAMES : RPMTAG_PROVIDENAME);
  @@ .
  patch -p0 '@@ .'
  Index: rpm/lib/rpmchecksig.c
  
  $ cvs diff -u -r1.168 -r1.169 rpmchecksig.c
  --- rpm/lib/rpmchecksig.c 8 Nov 2007 19:40:40 -   1.168
  +++ rpm/lib/rpmchecksig.c 9 Nov 2007 21:04:35 -   1.169
  @@ -874,6 +874,7 @@
res++;
goto exit;
}
  + msg = _free(msg);
   }
   
   if (!_nosigh) {
  @@ .
  patch -p0 '@@ .'
  Index: rpm/lib/rpmds.c
  
  $ cvs diff -u -r2.77 -r2.78 rpmds.c
  --- rpm/lib/rpmds.c   3 Nov 2007 23:44:00 -   2.77
  +++ rpm/lib/rpmds.c   9 Nov 2007 21:04:35 -   2.78
  @@ -1545,7 +1545,7 @@
   
   #define  _ETC_RPM_SYSINFOSYSCONFIGDIR /sysinfo
   /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ /[EMAIL 
PROTECTED]@*/
  -static const char *_sysinfo_path = NULL;
  +const char *_sysinfo_path = NULL;
   
   /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/
   static const char *_sysinfo_tags[] = {
  @@ .
  patch -p0 '@@ .'
  Index: rpm/lib/rpmds.h
  
  $ cvs diff -u -r2.60 -r2.61 rpmds.h
  --- rpm/lib/rpmds.h   3 Nov 2007 23:44:00 -   2.60
  +++ rpm/lib/rpmds.h   9 Nov 2007 21:04:35 -   2.61
  @@ -18,6 +18,9 @@
   extern int _rpmds_debug;
   /[EMAIL PROTECTED]@*/
   
  +/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ /[EMAIL 
PROTECTED]@*/
  +extern const char *_sysinfo_path;
  +
   /**
*/
   /[EMAIL PROTECTED]@*/
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmdb/pkgio.c
  
  $ cvs diff -u -r1.22 -r1.23 pkgio.c
  --- rpm/rpmdb/pkgio.c 8 Nov 2007 19:40:40 -   1.22
  +++ rpm/rpmdb/pkgio.c 9 Nov 2007 21:04:36 -   1.23
  @@ -434,7 +434,7 @@
   else
l = _free(l);

  -if (msg != NULL) {
  +if (msg != NULL  buf[0] != '\0') {
buf[sizeof(buf)-1] = '\0';
*msg = xstrdup(buf);
   }
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmdb/rpmdb.c
  
  $ cvs diff -u -r1.201 -r1.202 rpmdb.c
  --- rpm/rpmdb/rpmdb.c 8 Nov 2007 16:20:13 -

[CVS] RPM: rpm/ CHANGES rpm/build/ pack.c

2007-11-09 Thread Jeff Johnson

  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:   09-Nov-2007 22:18:43
  Branch: HEAD Handle: 2007110921184300

  Modified files:
rpm CHANGES
rpm/build   pack.c

  Log:
- rpm.org: Remove dead  unused RPMTAG_ARCHIVESIZE addition code ...

  Summary:
RevisionChanges Path
1.1784  +1  -0  rpm/CHANGES
2.248   +0  -12 rpm/build/pack.c
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.1783 -r1.1784 CHANGES
  --- rpm/CHANGES   9 Nov 2007 21:15:44 -   1.1783
  +++ rpm/CHANGES   9 Nov 2007 21:18:43 -   1.1784
  @@ -1,4 +1,5 @@
   4.5 - 5.0:
  +- rpm.org: Remove dead  unused RPMTAG_ARCHIVESIZE addition code ...
   - rpm.org: Remove rpmSetMachine() from API.
   - jbj: hmmm, headerGetExtension should not leak memory on failure. hack 
it.
   - jbj: more memory leak canoodling.
  @@ .
  patch -p0 '@@ .'
  Index: rpm/build/pack.c
  
  $ cvs diff -u -r2.247 -r2.248 pack.c
  --- rpm/build/pack.c  8 Nov 2007 20:33:18 -   2.247
  +++ rpm/build/pack.c  9 Nov 2007 21:18:43 -   2.248
  @@ -621,18 +621,6 @@
   if (pkgidp)
*pkgidp = NULL;
   
  -#ifdef   DYING
  -if (Fileno(csa-cpioFdIn)  0) {
  - csa-cpioArchiveSize = 0;
  - /* Add a bogus archive size to the Header */
  - he-tag = RPMTAG_ARCHIVESIZE;
  - he-t = RPM_UINT32_TYPE;
  - he-p.ui32p = csa-cpioArchiveSize;
  - he-c = 1;
  - xx = hae(h, he, 0);
  -}
  -#endif
  -
   /* Save payload information */
   isSource =
(headerIsEntry(h, RPMTAG_SOURCERPM) == 0 
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES rpm/lib/ rpmrc.c

2007-11-09 Thread Jeff Johnson

  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:   09-Nov-2007 22:23:51
  Branch: HEAD Handle: 2007110921235100

  Modified files:
rpm CHANGES
rpm/lib rpmrc.c

  Log:
- rpm.org: Remove useless var parameter from setup helpers.

  Summary:
RevisionChanges Path
1.1785  +1  -0  rpm/CHANGES
2.215   +15 -16 rpm/lib/rpmrc.c
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.1784 -r1.1785 CHANGES
  --- rpm/CHANGES   9 Nov 2007 21:18:43 -   1.1784
  +++ rpm/CHANGES   9 Nov 2007 21:23:51 -   1.1785
  @@ -1,4 +1,5 @@
   4.5 - 5.0:
  +- rpm.org: Remove useless var parameter from setup helpers.
   - rpm.org: Remove dead  unused RPMTAG_ARCHIVESIZE addition code ...
   - rpm.org: Remove rpmSetMachine() from API.
   - jbj: hmmm, headerGetExtension should not leak memory on failure. hack 
it.
  @@ .
  patch -p0 '@@ .'
  Index: rpm/lib/rpmrc.c
  
  $ cvs diff -u -r2.214 -r2.215 rpmrc.c
  --- rpm/lib/rpmrc.c   9 Nov 2007 21:15:45 -   2.214
  +++ rpm/lib/rpmrc.c   9 Nov 2007 21:23:51 -   2.215
  @@ -231,7 +231,7 @@
   return name;
   }
   
  -static void setVarDefault(/[EMAIL PROTECTED]@*/ int var, const char * 
macroname,
  +static void addMacroDefault(const char * macroname,
const char * val, /[EMAIL PROTECTED]@*/ const char * body)
/[EMAIL PROTECTED] rpmGlobalMacroContext, internalState @*/
/[EMAIL PROTECTED] rpmGlobalMacroContext, internalState @*/
  @@ -241,8 +241,7 @@
   addMacro(NULL, macroname, NULL, body, RMIL_DEFAULT);
   }
   
  -static void setPathDefault(/[EMAIL PROTECTED]@*/ int var, const char * 
macroname,
  - const char * subdir)
  +static void setPathDefault(const char * macroname, const char * subdir)
/[EMAIL PROTECTED] rpmGlobalMacroContext, h_errno, internalState @*/
/[EMAIL PROTECTED] rpmGlobalMacroContext, internalState @*/
   {
  @@ -285,30 +284,30 @@
   
   addMacro(NULL, ___build_pre, NULL, ___build_pre, RMIL_DEFAULT);
   
  -setVarDefault(-1,_topdir,
  +addMacroDefault(_topdir,
%{_usr}/src/rpm,  NULL);
  -setVarDefault(-1,_tmppath,
  +addMacroDefault(_tmppath,
%{_var}/tmp,  NULL);
  -setVarDefault(-1,_dbpath,
  +addMacroDefault(_dbpath,
%{_var}/lib/rpm,  NULL);
  -setVarDefault(-1,_defaultdocdir,
  +addMacroDefault(_defaultdocdir,
%{_usr}/share/doc,NULL);
   
  -setVarDefault(-1,_rpmfilename,
  +addMacroDefault(_rpmfilename,
%%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm,NULL);
   
  -setVarDefault(-1,optflags,
  +addMacroDefault(optflags,
-O2 -g,   NULL);
  -setVarDefault(-1,sigtype,
  +addMacroDefault(sigtype,
none, NULL);
  -setVarDefault(-1,_buildshell,
  +addMacroDefault(_buildshell,
/bin/sh,  NULL);
   
  -setPathDefault(-1,   _builddir,BUILD);
  -setPathDefault(-1,   _rpmdir,  RPMS);
  -setPathDefault(-1,   _srcrpmdir,   SRPMS);
  -setPathDefault(-1,   _sourcedir,   SOURCES);
  -setPathDefault(-1,   _specdir, SPECS);
  +setPathDefault(_builddir,  BUILD);
  +setPathDefault(_rpmdir,RPMS);
  +setPathDefault(_srcrpmdir, SRPMS);
  +setPathDefault(_sourcedir, SOURCES);
  +setPathDefault(_specdir,   SPECS);
   
   }
   
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES rpm/build/ files.c rpm/lib/ manifest.c package...

2007-11-09 Thread Jeff Johnson

  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:   09-Nov-2007 22:32:38
  Branch: HEAD Handle: 2007110921323602

  Modified files:
rpm CHANGES
rpm/build   files.c
rpm/lib manifest.c package.c psm.c query.c rpmps.c rpmrc.c
transaction.c
rpm/python  header-py.c

  Log:
- rpm.org: Remove bunch of unnecessary misc.h includes, document
others.

  Summary:
RevisionChanges Path
1.1786  +1  -0  rpm/CHANGES
1.287   +1  -1  rpm/build/files.c
2.21+0  -1  rpm/lib/manifest.c
2.179   +0  -1  rpm/lib/package.c
2.258   +1  -1  rpm/lib/psm.c
2.188   +1  -1  rpm/lib/query.c
2.16+0  -1  rpm/lib/rpmps.c
2.216   +0  -1  rpm/lib/rpmrc.c
1.351   +1  -1  rpm/lib/transaction.c
1.74+0  -1  rpm/python/header-py.c
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.1785 -r1.1786 CHANGES
  --- rpm/CHANGES   9 Nov 2007 21:23:51 -   1.1785
  +++ rpm/CHANGES   9 Nov 2007 21:32:36 -   1.1786
  @@ -1,4 +1,5 @@
   4.5 - 5.0:
  +- rpm.org: Remove bunch of unnecessary misc.h includes, document others.
   - rpm.org: Remove useless var parameter from setup helpers.
   - rpm.org: Remove dead  unused RPMTAG_ARCHIVESIZE addition code ...
   - rpm.org: Remove rpmSetMachine() from API.
  @@ .
  patch -p0 '@@ .'
  Index: rpm/build/files.c
  
  $ cvs diff -u -r1.286 -r1.287 files.c
  --- rpm/build/files.c 8 Nov 2007 16:20:12 -   1.286
  +++ rpm/build/files.c 9 Nov 2007 21:32:36 -   1.287
  @@ -33,7 +33,7 @@
   #include buildio.h
   
   #include legacy.h  /* XXX dodigest */
  -#include misc.h
  +#include misc.h/* for splitString, freeSplitString */
   #include debug.h
   
   /[EMAIL PROTECTED] Header @*/
  @@ .
  patch -p0 '@@ .'
  Index: rpm/lib/manifest.c
  
  $ cvs diff -u -r2.20 -r2.21 manifest.c
  --- rpm/lib/manifest.c11 Oct 2007 19:44:22 -  2.20
  +++ rpm/lib/manifest.c9 Nov 2007 21:32:37 -   2.21
  @@ -10,7 +10,6 @@
   
   #include stringbuf.h
   #include manifest.h
  -#include misc.h
   #include debug.h
   
   /[EMAIL PROTECTED] StringBuf @*/
  @@ .
  patch -p0 '@@ .'
  Index: rpm/lib/package.c
  
  $ cvs diff -u -r2.178 -r2.179 package.c
  --- rpm/lib/package.c 8 Nov 2007 19:40:40 -   2.178
  +++ rpm/lib/package.c 9 Nov 2007 21:32:37 -   2.179
  @@ -11,7 +11,6 @@
   
   #include rpmts.h
   
  -#include misc.h/* XXX stripTrailingChar() */
   #include pkgio.h
   
   #include header_internal.h /* XXX headerCheck */
  @@ .
  patch -p0 '@@ .'
  Index: rpm/lib/psm.c
  
  $ cvs diff -u -r2.257 -r2.258 psm.c
  --- rpm/lib/psm.c 8 Nov 2007 20:33:18 -   2.257
  +++ rpm/lib/psm.c 9 Nov 2007 21:32:37 -   2.258
  @@ -29,7 +29,7 @@
   #include rpmts.h
   
   #include pkgio.h
  -#include misc.h/* XXX rpmMkdirPath */
  +#include misc.h/* XXX rpmMkdirPath, makeTempFile, doputenv */
   #include rpmdb.h   /* XXX for db_chrootDone */
   #include signature.h   /* signature constants */
   #include debug.h
  @@ .
  patch -p0 '@@ .'
  Index: rpm/lib/query.c
  
  $ cvs diff -u -r2.187 -r2.188 query.c
  --- rpm/lib/query.c   11 Oct 2007 19:44:22 -  2.187
  +++ rpm/lib/query.c   9 Nov 2007 21:32:37 -   2.188
  @@ -21,7 +21,7 @@
   #include rpmts.h
   
   #include manifest.h
  -#include misc.h/* XXX for rpmGlob() */
  +#include misc.h/* XXX for currentDirectory() */
   
   #include debug.h
   
  @@ .
  patch -p0 '@@ .'
  Index: rpm/lib/rpmps.c
  
  $ cvs diff -u -r2.15 -r2.16 rpmps.c
  --- rpm/lib/rpmps.c   3 Nov 2007 23:44:01 -   2.15
  +++ rpm/lib/rpmps.c   9 Nov 2007 21:32:37 -   2.16
  @@ -10,7 +10,6 @@
   #define  _RPMPS_INTERNAL
   #include rpmps.h
   
  -#include misc.h
   #include debug.h
   
   /[EMAIL PROTECTED] fnpyKey @*/
  @@ .
  patch -p0 '@@ .'
  Index:

[CVS] RPM: rpm/ CHANGES rpm/build/ parsePrep.c rpm/rpmdb/ db3.c dbconf...

2007-11-09 Thread Jeff Johnson

  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:   09-Nov-2007 23:20:52
  Branch: HEAD Handle: 2007110922205100

  Modified files:
rpm CHANGES
rpm/build   parsePrep.c
rpm/rpmdb   db3.c dbconfig.c hdrNVR.c hdrfmt.c legacy.c
pkgio.c signature.c sqlite.c tagname.c

  Log:
- jbj: include rpmtag.h, not rpmlib.h, if only tag names are needed.

  Summary:
RevisionChanges Path
1.1789  +1  -0  rpm/CHANGES
2.92+1  -1  rpm/build/parsePrep.c
1.77+1  -1  rpm/rpmdb/db3.c
1.47+1  -1  rpm/rpmdb/dbconfig.c
1.26+1  -1  rpm/rpmdb/hdrNVR.c
1.29+1  -1  rpm/rpmdb/hdrfmt.c
1.35+1  -1  rpm/rpmdb/legacy.c
1.24+1  -1  rpm/rpmdb/pkgio.c
1.17+1  -1  rpm/rpmdb/signature.c
1.20+1  -1  rpm/rpmdb/sqlite.c
1.7 +1  -1  rpm/rpmdb/tagname.c
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.1788 -r1.1789 CHANGES
  --- rpm/CHANGES   9 Nov 2007 21:59:44 -   1.1788
  +++ rpm/CHANGES   9 Nov 2007 22:20:51 -   1.1789
  @@ -1,4 +1,5 @@
   4.5 - 5.0:
  +- jbj: include rpmtag.h, not rpmlib.h, if only tag names are needed.
   - jbj: change int_32 to evrFlags and uint32_t in rpmfc.c and rpmds.c.
   - rpm.org: Remove two unnecessary legacy.h includes.
   - rpm.org: Remove bunch of unnecessary misc.h includes, document others.
  @@ .
  patch -p0 '@@ .'
  Index: rpm/build/parsePrep.c
  
  $ cvs diff -u -r2.91 -r2.92 parsePrep.c
  --- rpm/build/parsePrep.c 3 Nov 2007 23:43:59 -   2.91
  +++ rpm/build/parsePrep.c 9 Nov 2007 22:20:51 -   2.92
  @@ -5,7 +5,7 @@
   
   #include system.h
   
  -#include rpmio_internal.h
  +#include rpmio.h
   #include rpmbuild.h
   #include debug.h
   
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmdb/db3.c
  
  $ cvs diff -u -r1.76 -r1.77 db3.c
  --- rpm/rpmdb/db3.c   11 Oct 2007 19:44:24 -  1.76
  +++ rpm/rpmdb/db3.c   9 Nov 2007 22:20:51 -   1.77
  @@ -12,7 +12,7 @@
   #include sys/ipc.h
   #endif
   
  -#include rpmlib.h
  +#include rpmtag.h
   #include rpmio.h
   #include rpmmacro.h
   #include rpmurl.h  /* XXX urlPath proto */
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmdb/dbconfig.c
  
  $ cvs diff -u -r1.46 -r1.47 dbconfig.c
  --- rpm/rpmdb/dbconfig.c  11 Oct 2007 13:04:28 -  1.46
  +++ rpm/rpmdb/dbconfig.c  9 Nov 2007 22:20:51 -   1.47
  @@ -4,7 +4,7 @@
   
   #include system.h
   
  -#include rpmlib.h
  +#include rpmtag.h
   #include rpmio.h
   #include rpmmacro.h
   
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmdb/hdrNVR.c
  
  $ cvs diff -u -r1.25 -r1.26 hdrNVR.c
  --- rpm/rpmdb/hdrNVR.c8 Nov 2007 17:14:56 -   1.25
  +++ rpm/rpmdb/hdrNVR.c9 Nov 2007 22:20:51 -   1.26
  @@ -3,7 +3,7 @@
*/
   
   #include system.h
  -#include rpmlib.h
  +#include rpmtag.h
   #include rpmio.h
   #include rpmmacro.h
   
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmdb/hdrfmt.c
  
  $ cvs diff -u -r1.28 -r1.29 hdrfmt.c
  --- rpm/rpmdb/hdrfmt.c8 Nov 2007 15:15:40 -   1.28
  +++ rpm/rpmdb/hdrfmt.c9 Nov 2007 22:20:51 -   1.29
  @@ -5,7 +5,7 @@
   #include system.h
   
   #include rpmio_internal.h
  -#include rpmlib.h
  +#include rpmlib.h  /* XXX RPMFILE_FOO, rpmMkdirPath */
   #include rpmmacro.h/* XXX for %_i18ndomains */
   
   #define _RPMEVR_INTERNAL
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmdb/legacy.c
  
  $ cvs diff -u -r1.34 -r1.35 legacy.c
  --- rpm/rpmdb/legacy.c30 Sep 2007 17:29:05 -  1.34
  +++ rpm/rpmdb/legacy.c9 Nov 2007 22:20:51 -   1.35
  @@ -26,7 +26,7 @@
   #endif
   
   #include rpmio_internal.h
  -#include rpmlib.h
  +#include rpmlib.h  /* XXX rpmMkdirPath */
   #include rpmmacro.h
   #include misc.h
   #include legacy.h
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmdb/pkgio.c

[CVS] RPM: rpm/ CHANGES rpm/lib/ rpmts.h

2007-11-09 Thread Jeff Johnson

  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:   10-Nov-2007 00:23:59
  Branch: HEAD Handle: 2007110923235900

  Modified files:
rpm CHANGES
rpm/lib rpmts.h

  Log:
- rpm.org: Clarify rpmtsCheck() documentation (rhbz#159638).

  Summary:
RevisionChanges Path
1.1791  +1  -0  rpm/CHANGES
2.85+6  -1  rpm/lib/rpmts.h
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.1790 -r1.1791 CHANGES
  --- rpm/CHANGES   9 Nov 2007 23:18:01 -   1.1790
  +++ rpm/CHANGES   9 Nov 2007 23:23:59 -   1.1791
  @@ -1,4 +1,5 @@
   4.5 - 5.0:
  +- rpm.org: Clarify rpmtsCheck() documentation (rhbz#159638).
   - rpm.org: Remove bunch of unnecessary rpmio_internal includes.
   - jbj: include rpmtag.h, not rpmlib.h, if only tag names are needed.
   - jbj: change int_32 to evrFlags and uint32_t in rpmfc.c and rpmds.c.
  @@ .
  patch -p0 '@@ .'
  Index: rpm/lib/rpmts.h
  
  $ cvs diff -u -r2.84 -r2.85 rpmts.h
  --- rpm/lib/rpmts.h   4 Nov 2007 00:23:08 -   2.84
  +++ rpm/lib/rpmts.h   9 Nov 2007 23:23:59 -   2.85
  @@ -240,7 +240,12 @@
   #endif
   
   /** \ingroup rpmts
  - * Check that all dependencies can be resolved.
  + * Perform dependency resolution on the transaction set.
  + *
  + * Any problems found by rpmtsCheck() can be examined by retrieving the 
  + * problem set with rpmtsProblems(), success here only means that
  + * the resolution was successfully attempted for all packages in the set.
  + *
* @param ts transaction set
* @return   0 on success
*/
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES rpm/doc/ rpm.8

2007-11-09 Thread Jeff Johnson

  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:   10-Nov-2007 00:27:06
  Branch: HEAD Handle: 2007110923270500

  Modified files:
rpm CHANGES
rpm/doc rpm.8

  Log:
- rpm.org: Clarify rpm manpage wrt rpmbuild binary vs package
(rhbz#233232).

  Summary:
RevisionChanges Path
1.1792  +1  -0  rpm/CHANGES
1.35+1  -1  rpm/doc/rpm.8
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.1791 -r1.1792 CHANGES
  --- rpm/CHANGES   9 Nov 2007 23:23:59 -   1.1791
  +++ rpm/CHANGES   9 Nov 2007 23:27:05 -   1.1792
  @@ -1,4 +1,5 @@
   4.5 - 5.0:
  +- rpm.org: Clarify rpm manpage wrt rpmbuild binary vs package 
(rhbz#233232).
   - rpm.org: Clarify rpmtsCheck() documentation (rhbz#159638).
   - rpm.org: Remove bunch of unnecessary rpmio_internal includes.
   - jbj: include rpmtag.h, not rpmlib.h, if only tag names are needed.
  @@ .
  patch -p0 '@@ .'
  Index: rpm/doc/rpm.8
  
  $ cvs diff -u -r1.34 -r1.35 rpm.8
  --- rpm/doc/rpm.8 29 Jul 2007 18:47:34 -  1.34
  +++ rpm/doc/rpm.8 9 Nov 2007 23:27:05 -   1.35
  @@ -851,7 +851,7 @@
   executable. Although legacy compatibility provided by the popt aliases
   below has been adequate, the compatibility is not perfect; hence build
   mode compatibility through popt aliases is being removed from rpm.
  -Install the \fBrpmbuild\fR package, and see
  +Install the package containing \fBrpmbuild\fR (usually \fBrpm-build\fR) and 
see
   \fBrpmbuild\fR(8) for documentation of all the
   \fBrpm\fR build modes previously documented here in
   \fBrpm\fR(8).
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: popt/po/ de.po

2007-11-09 Thread Robert Scheck

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

  Server: rpm5.org Name:   Robert Scheck
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: popt Date:   10-Nov-2007 00:34:13
  Branch: HEAD Handle: 2007110923341300

  Modified files:
popt/po de.po

  Log:
Replace my e-mail address with the rpm5.org one

  Summary:
RevisionChanges Path
1.56+3  -3  popt/po/de.po
  

  patch -p0 '@@ .'
  Index: popt/po/de.po
  
  $ cvs diff -u -r1.55 -r1.56 de.po
  --- popt/po/de.po 14 Sep 2007 11:41:36 -  1.55
  +++ popt/po/de.po 9 Nov 2007 23:34:13 -   1.56
  @@ -1,14 +1,14 @@
   # Translation of popt to German (Deutsch)
   # This file is distributed under the same license as the popt package.
  -# Robert Scheck [EMAIL PROTECTED], 2004-2007.
  +# Robert Scheck [EMAIL PROTECTED], 2004-2007.
   #
   msgid 
   msgstr 
   Project-Id-Version: popt 1.12\n
   Report-Msgid-Bugs-To: [EMAIL PROTECTED]\n
   POT-Creation-Date: 2007-09-06 08:50-0400\n
  -PO-Revision-Date: 2007-02-17 21:00+0100\n
  -Last-Translator: Robert Scheck [EMAIL PROTECTED]\n
  +PO-Revision-Date: 2007-11-10 00:35+0100\n
  +Last-Translator: Robert Scheck [EMAIL PROTECTED]\n
   Language-Team: German [EMAIL PROTECTED]\n
   MIME-Version: 1.0\n
   Content-Type: text/plain; charset=UTF-8\n
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES Doxyfile.in

2007-11-09 Thread Jeff Johnson

  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:   10-Nov-2007 00:34:41
  Branch: HEAD Handle: 2007110923344000

  Modified files:
rpm CHANGES Doxyfile.in

  Log:
- rpm.org: Remove refs to file/src.

  Summary:
RevisionChanges Path
1.1793  +1  -0  rpm/CHANGES
2.80+0  -16 rpm/Doxyfile.in
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.1792 -r1.1793 CHANGES
  --- rpm/CHANGES   9 Nov 2007 23:27:05 -   1.1792
  +++ rpm/CHANGES   9 Nov 2007 23:34:40 -   1.1793
  @@ -1,4 +1,5 @@
   4.5 - 5.0:
  +- rpm.org: Remove refs to file/src.
   - rpm.org: Clarify rpm manpage wrt rpmbuild binary vs package 
(rhbz#233232).
   - rpm.org: Clarify rpmtsCheck() documentation (rhbz#159638).
   - rpm.org: Remove bunch of unnecessary rpmio_internal includes.
  @@ .
  patch -p0 '@@ .'
  Index: rpm/Doxyfile.in
  
  $ cvs diff -u -r2.79 -r2.80 Doxyfile.in
  --- rpm/Doxyfile.in   20 Oct 2007 01:10:58 -  2.79
  +++ rpm/Doxyfile.in   9 Nov 2007 23:34:40 -   2.80
  @@ -504,22 +504,6 @@
@top_srcdir@/doc/manual/spec \
@top_srcdir@/doc/manual/triggers \
@top_srcdir@/doc/manual/tsort \
  - @top_srcdir@/file/src/apprentice.c \
  - @top_srcdir@/file/src/apptype.c \
  - @top_srcdir@/file/src/ascmagic.c \
  - @top_srcdir@/file/src/compress.c \
  - @top_srcdir@/file/src/file.c \
  - @top_srcdir@/file/src/file.h \
  - @top_srcdir@/file/src/fsmagic.c \
  - @top_srcdir@/file/src/funcs.c \
  - @top_srcdir@/file/src/is_tar.c \
  - @top_srcdir@/file/src/magic.c \
  - @top_srcdir@/file/src/magic.h \
  - @top_srcdir@/file/src/names.h \
  - @top_srcdir@/file/src/print.c \
  - @top_srcdir@/file/src/readelf.c \
  - @top_srcdir@/file/src/readelf.h \
  - @top_srcdir@/file/src/softmagic.c \
@top_srcdir@/file/src/tar.h \
@top_srcdir@/lib/cpio.c \
@top_srcdir@/lib/cpio.h \
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES rpm/lib/ cpio.c

2007-11-09 Thread Jeff Johnson

  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:   10-Nov-2007 00:36:53
  Branch: HEAD Handle: 2007110923365300

  Modified files:
rpm CHANGES
rpm/lib cpio.c

  Log:
- rpm.org: Change strntoul to using size_t for sizes

  Summary:
RevisionChanges Path
1.1794  +1  -0  rpm/CHANGES
2.135   +1  -1  rpm/lib/cpio.c
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.1793 -r1.1794 CHANGES
  --- rpm/CHANGES   9 Nov 2007 23:34:40 -   1.1793
  +++ rpm/CHANGES   9 Nov 2007 23:36:53 -   1.1794
  @@ -1,4 +1,5 @@
   4.5 - 5.0:
  +- rpm.org: Change strntoul to using size_t for sizes.
   - rpm.org: Remove refs to file/src.
   - rpm.org: Clarify rpm manpage wrt rpmbuild binary vs package 
(rhbz#233232).
   - rpm.org: Clarify rpmtsCheck() documentation (rhbz#159638).
  @@ .
  patch -p0 '@@ .'
  Index: rpm/lib/cpio.c
  
  $ cvs diff -u -r2.134 -r2.135 cpio.c
  --- rpm/lib/cpio.c9 Nov 2007 23:18:02 -   2.134
  +++ rpm/lib/cpio.c9 Nov 2007 23:36:53 -   2.135
  @@ -31,7 +31,7 @@
* @param nummax no. of bytes to read
* @return   converted integer
*/
  -static int strntoul(const char *str, /[EMAIL PROTECTED]@*/char **endptr, int 
base, int num)
  +static int strntoul(const char *str, /[EMAIL PROTECTED]@*/char **endptr, int 
base, size_t num)
/[EMAIL PROTECTED] *endptr @*/
/[EMAIL PROTECTED] maxSet(endptr) = 0 @*/
   {
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES rpm/lib/ poptALL.c rpm/rpmio/ librpmio.vers rp...

[CVS] RPM: rpm/ CHANGES rpm/lib/ depends.c rpmchecksig.c rpmds.c rpmds...

[CVS] RPM: rpm/ CHANGES rpm/build/ pack.c

[CVS] RPM: rpm/ CHANGES rpm/lib/ rpmrc.c

[CVS] RPM: rpm/ CHANGES rpm/build/ files.c rpm/lib/ manifest.c package...

[CVS] RPM: rpm/ CHANGES rpm/build/ parsePrep.c rpm/rpmdb/ db3.c dbconf...

[CVS] RPM: rpm/ CHANGES rpm/lib/ rpmts.h

[CVS] RPM: rpm/ CHANGES rpm/doc/ rpm.8

[CVS] RPM: popt/po/ de.po

[CVS] RPM: rpm/ CHANGES Doxyfile.in

[CVS] RPM: rpm/ CHANGES rpm/lib/ cpio.c

11 matches

Site Navigation

Mail list logo

Footer information