subject:"\[CVS\] RPM\: rpm\/ CHANGES rpm\/lib\/ formats.c"

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

2008-06-14 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:   15-Jun-2008 06:26:56
  Branch: HEAD Handle: 2008061504265600

  Modified files:
rpm CHANGES
rpm/lib formats.c

  Log:
- fix: return 1 rather than assertion failing on Suggests: header ext
query of package with no Requires:.

  Summary:
RevisionChanges Path
1.2413  +2  -0  rpm/CHANGES
2.127   +3  -3  rpm/lib/formats.c
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.2412 -r1.2413 CHANGES
  --- rpm/CHANGES   14 Jun 2008 15:30:10 -  1.2412
  +++ rpm/CHANGES   15 Jun 2008 04:26:56 -  1.2413
  @@ -1,5 +1,7 @@
   
   5.1.0 - 5.2a0:
  +- jbj: fix: return 1 rather than assertion failing on Suggests: header 
ext
  + query of package with no Requires:.
   - rse: unbreak building without LZMAUtils library
   - jbj: add --deb:foo aliases for *.deb spewage.
   - jbj: rework :strsub find-and-replace to use mire patterns.
  @@ .
  patch -p0 '@@ .'
  Index: rpm/lib/formats.c
  
  $ cvs diff -u -r2.126 -r2.127 formats.c
  --- rpm/lib/formats.c 12 Mar 2008 19:41:11 -  2.126
  +++ rpm/lib/formats.c 15 Jun 2008 04:26:56 -  2.127
  @@ -225,7 +225,9 @@
   size_t nb = 0;
   int i;
   
  -assert(ds != NULL);
  +if (ds == NULL)
  + return 1;
  +
   /* Collect dependencies marked as hints. */
   ds = rpmdsInit(ds);
   if (ds != NULL)
  @@ -254,8 +256,6 @@
   av = argvFree(av);
   ds = rpmdsFree(ds);
   
  -/* XXX perhaps return (none) inband if no suggests/enhances shrug. */
  -
   he-t = RPM_STRING_ARRAY_TYPE;
   he-p.argv = argv;
   he-c = argc;
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES rpm/lib/ formats.c psm.c rpmlib.h rpm/python/ ...

2007-08-03 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:   03-Aug-2007 22:46:40
  Branch: HEAD Handle: 2007080321463802

  Modified files:
rpm CHANGES
rpm/lib formats.c psm.c rpmlib.h
rpm/python  header-py.c rpmfts-py.c
rpm/rpmdb   hdrfmt.c librpmdb.vers

  Log:
- extension tags in hdrfmt.c now can be passed NULL. Start the fixing.
- rpmtfs-py.c needs _free from rpmio.h, not rpmlib.h
- add RPMTAG_{FILE,ORIG}PATHS to not revisit old expectations.

  Summary:
RevisionChanges Path
1.1555  +3  -0  rpm/CHANGES
2.107   +1  -1  rpm/lib/formats.c
2.217   +3  -3  rpm/lib/psm.c
2.429   +2  -0  rpm/lib/rpmlib.h
1.50+5  -3  rpm/python/header-py.c
1.17+1  -1  rpm/python/rpmfts-py.c
1.3 +12 -12 rpm/rpmdb/hdrfmt.c
1.9 +1  -0  rpm/rpmdb/librpmdb.vers
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.1554 -r1.1555 CHANGES
  --- rpm/CHANGES   3 Aug 2007 19:22:11 -   1.1554
  +++ rpm/CHANGES   3 Aug 2007 20:46:38 -   1.1555
  @@ -1,4 +1,7 @@
   4.5 - 5.0:
  +- jbj: extension tags in hdrfmt.c now can be passed NULL. Start the 
fixing.
  +- jbj: rpmtfs-py.c needs _free from rpmio.h, not rpmlib.h
  +- jbj: add RPMTAG_{FILE,ORIG}PATHS to not revisit old expectations.
   - jbj: _FINALLY_ get rpmfiBuildFNames() out of rpm libraries. w00t!
   - jbj: add headerGetExtension(RPMTAG_FILENAMES), and rpmdb/hdrfmt.c 
orphan.
   - jbj: use headerGetExtension(RPMTAG_NVRA) most everywhere.
  @@ .
  patch -p0 '@@ .'
  Index: rpm/lib/formats.c
  
  $ cvs diff -u -r2.106 -r2.107 formats.c
  --- rpm/lib/formats.c 3 Aug 2007 19:22:11 -   2.106
  +++ rpm/lib/formats.c 3 Aug 2007 20:46:39 -   2.107
  @@ -83,7 +83,7 @@
numFiles = 0;
filenames = NULL;
   } else {
  - headerGetExtension(h, RPMTAG_FILENAMES, NULL, filenames, numFiles);
  + headerGetExtension(h, RPMTAG_FILEPATHS, NULL, filenames, numFiles);
   }
   
   /[EMAIL PROTECTED]@*/
  @@ .
  patch -p0 '@@ .'
  Index: rpm/lib/psm.c
  
  $ cvs diff -u -r2.216 -r2.217 psm.c
  --- rpm/lib/psm.c 3 Aug 2007 19:22:11 -   2.216
  +++ rpm/lib/psm.c 3 Aug 2007 20:46:39 -   2.217
  @@ -258,7 +258,7 @@
   i = fi-fc;
   
   if (fi-h != NULL) { /* XXX can't happen */
  - headerGetExtension(fi-h, RPMTAG_FILENAMES, NULL, fi-apath, NULL);
  + headerGetExtension(fi-h, RPMTAG_FILEPATHS, NULL, fi-apath, NULL);
   
if (headerIsEntry(fi-h, RPMTAG_COOKIE))
for (i = 0; i  fi-fc; i++)
  @@ -1623,9 +1623,9 @@
CPIO_MAP_PATH | CPIO_MAP_MODE | CPIO_MAP_UID | CPIO_MAP_GID | 
(fi-mapflags  CPIO_SBIT_CHECK);

if (headerIsEntry(fi-h, RPMTAG_ORIGBASENAMES))
  - headerGetExtension(fi-h, RPMTAG_ORIGFILENAMES, NULL, 
fi-apath, NULL);
  + headerGetExtension(fi-h, RPMTAG_ORIGPATHS, NULL, fi-apath, 
NULL);
else
  - headerGetExtension(fi-h, RPMTAG_FILENAMES, NULL, fi-apath, 
NULL);
  + headerGetExtension(fi-h, RPMTAG_FILEPATHS, NULL, fi-apath, 
NULL);

if (fi-fuser == NULL)
xx = hge(fi-h, RPMTAG_FILEUSERNAME, NULL,
  @@ .
  patch -p0 '@@ .'
  Index: rpm/lib/rpmlib.h
  
  $ cvs diff -u -r2.428 -r2.429 rpmlib.h
  --- rpm/lib/rpmlib.h  2 Aug 2007 15:03:08 -   2.428
  +++ rpm/lib/rpmlib.h  3 Aug 2007 20:46:39 -   2.429
  @@ -428,6 +428,8 @@
   RPMTAG_BUILDOBSOLETES= 1194, /* internal */
   RPMTAG_DBINSTANCE= 1195, /* i */
   RPMTAG_NVRA  = 1196, /* s */
  +RPMTAG_FILEPATHS = 1197, /* s[] */
  +RPMTAG_ORIGPATHS = 1198, /* s[] */
   
   /[EMAIL PROTECTED]@*/
   RPMTAG_FIRSTFREE_TAG /*! internal */
  @@ .
  patch -p0 '@@ .'
  Index: rpm/python/header-py.c
  
  $ cvs diff -u -r1.49 -r1.50 header-py.c
  --- rpm/python/header-py.c3 Aug 2007 19:22:12 -   1.49
  +++ rpm/python/header-py.c3 Aug 2007 20:46:39 -   1.50
  @@ -179,7 +179,7 @@
   
   /[EMAIL PROTECTED]@*/

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

2007-07-19 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:   20-Jul-2007 02:57:43
  Branch: HEAD Handle: 2007072001574201

  Modified files:
rpm CHANGES
rpm/lib formats.c

  Log:
- fix a --import memory leak.

  Summary:
RevisionChanges Path
1.1499  +1  -0  rpm/CHANGES
2.101   +7  -1  rpm/lib/formats.c
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.1498 -r1.1499 CHANGES
  --- rpm/CHANGES   19 Jul 2007 19:07:56 -  1.1498
  +++ rpm/CHANGES   20 Jul 2007 00:57:42 -  1.1499
  @@ -1,4 +1,5 @@
   4.5 - 5.0:
  +- jbj: fix a --import memory leak.
   - rse: unbreak big-endian handling in memory and cryptography functions 
by Autoconf providing WORDS_BIGENDIAN and fixing usage
   - rse: cleanup and fix the code to compile under *non*-GCC compilers 
(e.g. Sun Studio and Intel C/C++)
   - rse: fix building under --with-dmalloc with DMalloc 5.5.2 where 
x{malloc,calloc,realloc,free} are also overridden
  @@ .
  patch -p0 '@@ .'
  Index: rpm/lib/formats.c
  
  $ cvs diff -u -r2.100 -r2.101 formats.c
  --- rpm/lib/formats.c 18 Jun 2007 17:31:23 -  2.100
  +++ rpm/lib/formats.c 20 Jul 2007 00:57:43 -  2.101
  @@ -161,6 +161,7 @@
   const unsigned char * s;
   size_t ns;
   int atype;
  +char * val;
   
   switch (type) {
   case RPM_OPENPGP_TYPE:
  @@ -174,6 +175,8 @@
   case RPM_STRING_TYPE:
   case RPM_STRING_ARRAY_TYPE:
enc = data;
  + s = NULL;
  + ns = 0;
if (b64decode(enc, (void **)s, ns))
return xstrdup(_((not base64)));
atype = PGPARMOR_PUBKEY;/* XXX check pkt for pubkey */
  @@ -191,7 +194,10 @@
   }
   
   /* XXX this doesn't use padding directly, assumes enough slop in retval. 
*/
  -return pgpArmorWrap(atype, s, ns);
  +val = pgpArmorWrap(atype, s, ns);
  +if (atype == PGPARMOR_PUBKEY)
  + s = _free(s);
  +return val;
   }
   
   /**
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

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

[CVS] RPM: rpm/ CHANGES rpm/lib/ formats.c psm.c rpmlib.h rpm/python/ ...

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

3 matches

Site Navigation

Mail list logo

Footer information