date:20071116

[CVS] RPM: rpm/ TODO

2007-11-16 Thread Anders F. Bjï¿½rklund

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

  Server: rpm5.org Name:   Anders F. BjÃ¶rklund
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   15-Nov-2007 12:48:19
  Branch: HEAD Handle: 2007111511481900

  Modified files:
rpm TODO

  Log:
minor typo

  Summary:
RevisionChanges Path
1.12+3  -3  rpm/TODO
  

  patch -p0 <<'@@ .'
  Index: rpm/TODO
  
  $ cvs diff -u -r1.11 -r1.12 TODO
  --- rpm/TODO  13 Nov 2007 02:26:44 -  1.11
  +++ rpm/TODO  15 Nov 2007 11:48:19 -  1.12
  @@ -8,7 +8,7 @@
 This is the current RPM 5.0 release engineering roadmap:
   
 1. weekly Alpha releases in November 2007:
  - - APIs: still changing, no guarranties at all for stability
  + - APIs: still changing, no guarantees at all for stability
- code: still acceptable to be at least partly broken
- audience: early adopters in RPM community only
- purpose:  to get initial feedback
  @@ -19,7 +19,7 @@
2007-12-01  RPM 5.0a4   RPM 5.0 alpha 4[TODO]

 2. weekly Beta releases in December 2007:
  - - APIs: mostly fixed, nearly a guarranty to be stable
  + - APIs: mostly fixed, nearly a guarantee to be stable
- code: already stable, but perhaps still some subtle bugs
- audience: RPM community, especially distro vendors
- purpose:  to get final feedback
  @@ -30,7 +30,7 @@
2007-12-29  RPM 5.0b4   RPM 5.0 beta 4 [TODO]
  
 3. release in January 2008:
  - - APIs: fully fixed, guarranty to be kept stable
  + - APIs: fully fixed, guaranteed to be kept stable
- code: stable, no more bugs known bugs left 
- audience: RPM community as a whole
- purpose:  provide RPM 5.0
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/rpmio/ .splintrc

2007-11-16 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-Nov-2007 19:02:28
  Branch: HEAD Handle: 2007111518022700

  Modified files:
rpm/rpmio   .splintrc

  Log:
- update splint spew metrics.

  Summary:
RevisionChanges Path
1.18+25 -27 rpm/rpmio/.splintrc
  

  patch -p0 <<'@@ .'
  Index: rpm/rpmio/.splintrc
  
  $ cvs diff -u -r1.17 -r1.18 .splintrc
  --- rpm/rpmio/.splintrc   15 Nov 2007 17:27:59 -  1.17
  +++ rpm/rpmio/.splintrc   15 Nov 2007 18:02:27 -  1.18
  @@ -14,23 +14,22 @@
   # --- in progress
   -branchstate
   -bufferoverflowhigh
  --shiftimplementation
  --shiftnegative
  +-shiftnegative   # 1 lzdReadOpen
   
   -compdef # 16
  --compmempass # 2
  --globs   # 18
  +-compmempass # 2 LZMA
  +-globs   # 19
   -moduncon# 323
  --mustmod # 17
  +-mustmod # 16
   -noeffectuncon   # 183
  --protoparammatch # 1
  +-protoparammatch # 1 LZMA
   
  --readonlytrans   # 10
  +-readonlytrans   # 10 digest names
   
   -forempty
   -looploopbreak   # 2 LZMA
   -nullptrarith# 16 LZMA
  --shadow
  +-shadow  # 3 LZMA
   
   # --- +partial artifacts
   -declundef
  @@ -43,33 +42,32 @@
   -varuse
   
   # --- not-yet at strict level
  --bitwisesigned   # 204
  --elseifcomplete  # 31
  --exportconst # 265
  --exportfcn   # 381
  --exporttype  # 109
  --exportvar   # 32
  --fielduse# 72
  +-bitwisesigned   # 236
  +-elseifcomplete  # 43
  +-exportconst # 322
  +-exportfcn   # 534
  +-exporttype  # 116
  +-exportvar   # 50
  +-fielduse# 65
   -forblock# tedious
   -ifblock # tedious
   -namechecks  # 929 tedious ANSI compliance checks
  --ptrarith# 104
  +-ptrarith# 271
   
  --compdestroy # 21
  --mustdefine  # 34
  +-compdestroy # 102
  +-mustdefine  # 68
   -sys-dir-errors
   
  --strictops   # 51
  +-strictops   # 105
   -whileblock  # tedious
   
   # --- not-yet at checks level
  -+enumint # 117
  --mustfree# 136
  --predboolptr # 156
  --usedef  # 9
  ++enumint # 239
  +-mustfree# 336
  +-predboolptr # 261
  +-usedef  # 51
   
   # --- not-yet at standard level
  --boolops # 117
  -+boolint # 11
  -+ignorequals # 112
  -#+matchanyintegral   # 39
  +-boolops # 165
  ++boolint # 299
  ++ignorequals # 708
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES rpm/rpmdb/ .splintrc fprint.c fprint.h hdrNVR....

2007-11-16 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:   14-Nov-2007 22:13:19
  Branch: HEAD Handle: 2007111421131701

  Modified files:
rpm CHANGES
rpm/rpmdb   .splintrc fprint.c fprint.h hdrNVR.c hdrfmt.c
header.h legacy.c pkgio.c rpmdb.c rpmdb.h rpmtag.h
rpmwf.c signature.c tagname.c
rpm/rpmio   rpmpgp.c rpmpgp.h

  Log:
- use splint to check integral types, eliminate the easy stuff.

  Summary:
RevisionChanges Path
1.1824  +1  -0  rpm/CHANGES
1.10+1  -1  rpm/rpmdb/.splintrc
1.21+6  -6  rpm/rpmdb/fprint.c
1.12+2  -2  rpm/rpmdb/fprint.h
1.31+4  -4  rpm/rpmdb/hdrNVR.c
1.33+21 -18 rpm/rpmdb/hdrfmt.c
1.65+3  -3  rpm/rpmdb/header.h
1.36+3  -3  rpm/rpmdb/legacy.c
1.33+23 -22 rpm/rpmdb/pkgio.c
1.207   +71 -68 rpm/rpmdb/rpmdb.c
1.68+4  -4  rpm/rpmdb/rpmdb.h
1.4 +3  -3  rpm/rpmdb/rpmtag.h
1.8 +1  -1  rpm/rpmdb/rpmwf.c
1.21+20 -17 rpm/rpmdb/signature.c
1.11+14 -14 rpm/rpmdb/tagname.c
2.67+1  -1  rpm/rpmio/rpmpgp.c
2.52+9  -9  rpm/rpmio/rpmpgp.h
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.1823 -r1.1824 CHANGES
  --- rpm/CHANGES   14 Nov 2007 01:17:51 -  1.1823
  +++ rpm/CHANGES   14 Nov 2007 21:13:17 -  1.1824
  @@ -1,4 +1,5 @@
   5.0a1 -> 5.0a2:
  +- jbj: use splint to check integral types, eliminate the easy stuff.
   - jbj: splint fiddles for rpmdb.
   - jbj: don't cache unsatisfied Suggests:.
   - jbj: fix the last memory leak with -Kvv, recheck install/query paths.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/.splintrc
  
  $ cvs diff -u -r1.9 -r1.10 .splintrc
  --- rpm/rpmdb/.splintrc   14 Nov 2007 01:17:52 -  1.9
  +++ rpm/rpmdb/.splintrc   14 Nov 2007 21:13:18 -  1.10
  @@ -80,4 +80,4 @@
   +boolint # 18
   +charint # 74
   +ignorequals # 104
  -+matchanyintegral# 90
  +#+matchanyintegral   # 90
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/fprint.c
  
  $ cvs diff -u -r1.20 -r1.21 fprint.c
  --- rpm/rpmdb/fprint.c10 Nov 2007 18:06:43 -  1.20
  +++ rpm/rpmdb/fprint.c14 Nov 2007 21:13:18 -  1.21
  @@ -217,12 +217,12 @@
   }
   
   void fpLookupList(fingerPrintCache cache, const char ** dirNames, 
  -   const char ** baseNames, const uint_32 * dirIndexes, 
  -   int fileCount, fingerPrint * fpList)
  +   const char ** baseNames, const uint32_t * dirIndexes, 
  +   uint32_t fileCount, fingerPrint * fpList)
   {
  -int i;
  +unsigned i;
   
  -for (i = 0; i < fileCount; i++) {
  +for (i = 0; i < (unsigned) fileCount; i++) {
/* If this is in the same directory as the last file, don't bother
   redoing all of this work */
if (i > 0 && dirIndexes[i - 1] == dirIndexes[i]) {
  @@ -254,8 +254,8 @@
   HE_t he = &he_s;
   const char ** baseNames;
   const char ** dirNames;
  -uint_32 * dirIndexes;
  -int fileCount;
  +uint32_t * dirIndexes;
  +rpmTagCount fileCount;
   int xx;
   
   he->tag = RPMTAG_BASENAMES;
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/fprint.h
  
  $ cvs diff -u -r1.11 -r1.12 fprint.h
  --- rpm/rpmdb/fprint.h25 May 2007 17:36:33 -  1.11
  +++ rpm/rpmdb/fprint.h14 Nov 2007 21:13:18 -  1.12
  @@ -148,8 +148,8 @@
* @retval *fpList   array of finger prints
*/
   void fpLookupList(fingerPrintCache cache, const char ** dirNames, 
  -   const char ** baseNames, const uint_32 * dirIndexes, 
  -   int fileCount, fingerPrint * fpList)
  +   const char ** baseNames, const uint32_t * dirIndexes, 
  +   uint32_t fileCount, fingerPrint * fpList)
/[EMAIL PROTECTED] cache, *fpList @*/;
   
   #ifdef __cplusplus
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/hdrNVR.c
  
  $ cvs diff -u -r1.30 -r1.31 hdrNVR.c
  --- rpm

[CVS] RPM: rpm/ Makefile.am macros.in

2007-11-16 Thread Anders F. Bjï¿½rklund

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

  Server: rpm5.org Name:   Anders F. BjÃ¶rklund
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   15-Nov-2007 12:39:37
  Branch: HEAD Handle: 2007111511393700

  Modified files:
rpm Makefile.am macros.in

  Log:
move _repackage_dir, away from %{_topdir} back to %{_var}

  Summary:
RevisionChanges Path
2.212   +4  -1  rpm/Makefile.am
1.199   +2  -2  rpm/macros.in
  

  patch -p0 <<'@@ .'
  Index: rpm/Makefile.am
  
  $ cvs diff -u -r2.211 -r2.212 Makefile.am
  --- rpm/Makefile.am   11 Nov 2007 16:13:36 -  2.211
  +++ rpm/Makefile.am   15 Nov 2007 11:39:37 -  2.212
  @@ -140,7 +140,8 @@
   
   install-data-local:
@$(MKDIR_P) $(DESTDIR)$(DBPATH)
  - @for dir in BUILD RPMS SOURCES SPECS SRPMS TR; do\
  + @$(MKDIR_P) $(DESTDIR)$(varprefix)/spool/repackage
  + @for dir in BUILD RPMS SOURCES SPECS SRPMS; do\
$(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/$$dir;\
done
@case "@host_cpu@" in \
  @@ -194,9 +195,11 @@
done
@$(__CHOWN) ${RPMUSER}.${RPMGROUP} $(DESTDIR)$(pkglibdir)
@$(__CHOWN) -R ${RPMUSER}.${RPMGROUP} $(DESTDIR)$(varprefix)/lib/rpm
  + @$(__CHOWN) -R ${RPMUSER}.${RPMGROUP} 
$(DESTDIR)$(varprefix)/spool/repackage
[EMAIL PROTECTED](__CHMOD) 0664 $(DESTDIR)$(varprefix)/lib/rpm/[A-Z]*
[EMAIL PROTECTED](__CHMOD) 0775 $(DESTDIR)$(varprefix)/lib/rpm
[EMAIL PROTECTED](__CHMOD) 0664 $(DESTDIR)$(varprefix)/lib/rpm/__db.*
  + [EMAIL PROTECTED](__CHMOD) 0755 $(DESTDIR)$(varprefix)/spool/repackage
   
   .PHONY:  unsetgid
   unsetgid:
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/macros.in
  
  $ cvs diff -u -r1.198 -r1.199 macros.in
  --- rpm/macros.in 13 Oct 2007 14:58:21 -  1.198
  +++ rpm/macros.in 15 Nov 2007 11:39:37 -  1.199
  @@ -1,7 +1,7 @@
   #/*! \page config_macros Default configuration: @USRLIBRPM@/macros
   # \verbatim
   #
  -# $Id: macros.in,v 1.198 2007/10/13 14:58:21 bero Exp $
  +# $Id: macros.in,v 1.199 2007/11/15 11:39:37 afb Exp $
   #
   # This is a global RPM configuration file. All changes made here will
   # be lost when the rpm package is upgraded. Any per-system configuration
  @@ -857,7 +857,7 @@
   
   #The "transactional rollback" directory in which erased packages will
   #be saved when using the --repackage option.
  -%_repackage_dir  %{_topdir}/TR
  +%_repackage_dir  %{_var}/spool/repackage
   
   #A path (i.e. URL) prefix that is pre-pended to %{_repackage_dir}.
   %_repackage_root %{nil}
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES rpm/rpmdb/ .splintrc header.c header_internal....

2007-11-16 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-Nov-2007 15:30:26
  Branch: HEAD Handle: 2007111514302501

  Modified files:
rpm CHANGES
rpm/rpmdb   .splintrc header.c header_internal.c
header_internal.h merge.c pkgio.c rpmdb.c sqlite.c
rpm/rpmio   rpmpgp.h

  Log:
- jbj: first pass through header.c converting to uint32_t everywhere.

  Summary:
RevisionChanges Path
1.1826  +1  -0  rpm/CHANGES
1.12+1  -1  rpm/rpmdb/.splintrc
1.120   +132 -127   rpm/rpmdb/header.c
1.15+10 -10 rpm/rpmdb/header_internal.c
1.30+9  -9  rpm/rpmdb/header_internal.h
1.11+8  -8  rpm/rpmdb/merge.c
1.35+83 -83 rpm/rpmdb/pkgio.c
1.209   +1  -1  rpm/rpmdb/rpmdb.c
1.23+8  -8  rpm/rpmdb/sqlite.c
2.53+8  -8  rpm/rpmio/rpmpgp.h
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.1825 -r1.1826 CHANGES
  --- rpm/CHANGES   14 Nov 2007 23:56:33 -  1.1825
  +++ rpm/CHANGES   15 Nov 2007 14:30:25 -  1.1826
  @@ -1,4 +1,5 @@
   5.0a1 -> 5.0a2:
  +- jbj: first pass through header.c converting to uint32_t everywhere.
   - jbj: get rid of splint spew before chasing header.c integers.
   - jbj: use splint to check integral types, eliminate the easy stuff.
   - jbj: splint fiddles for rpmdb.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/.splintrc
  
  $ cvs diff -u -r1.11 -r1.12 .splintrc
  --- rpm/rpmdb/.splintrc   14 Nov 2007 23:56:33 -  1.11
  +++ rpm/rpmdb/.splintrc   15 Nov 2007 14:30:25 -  1.12
  @@ -62,4 +62,4 @@
   -boolops # 136
   +boolint # 407
   +ignorequals # 165
  -+matchanyintegral# 130
  ++matchanyintegral# 23
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/header.c
  
  $ cvs diff -u -r1.119 -r1.120 header.c
  --- rpm/rpmdb/header.c14 Nov 2007 23:56:33 -  1.119
  +++ rpm/rpmdb/header.c15 Nov 2007 14:30:25 -  1.120
  @@ -127,7 +127,7 @@
*/
   /[EMAIL PROTECTED]@*/
   /[EMAIL PROTECTED]@*/ static inline /[EMAIL PROTECTED]@*/
  -const char * tagName(int tag)
  +const char * tagName(uint32_t tag)
/[EMAIL PROTECTED]/
   {
   /[EMAIL PROTECTED]@*/
  @@ -142,7 +142,7 @@
* @return   tag data type, 0 on not found.
*/
   /[EMAIL PROTECTED]@*/ static inline
  -int tagType(int tag)
  +uint32_t tagType(uint32_t tag)
/[EMAIL PROTECTED]/
   {
   /[EMAIL PROTECTED]@*/
  @@ -331,7 +331,7 @@
   /[EMAIL PROTECTED]@*/
   indexEntry ap = (indexEntry) avp, bp = (indexEntry) bvp;
   /[EMAIL PROTECTED]@*/
  -return (ap->info.tag - bp->info.tag);
  +return ((int)ap->info.tag - (int)bp->info.tag);
   }
   
   /** \ingroup header
  @@ -355,14 +355,14 @@
   /[EMAIL PROTECTED]@*/
   indexEntry ap = (indexEntry) avp, bp = (indexEntry) bvp;
   /[EMAIL PROTECTED]@*/
  -int rc = (ap->info.offset - bp->info.offset);
  +int rc = ((int)ap->info.offset - (int)bp->info.offset);
   
   if (rc == 0) {
/* Within a region, entries sort by address. Added drips sort by tag. */
if (ap->info.offset < 0)
rc = (((char *)ap->data) - ((char *)bp->data));
else
  - rc = (ap->info.tag - bp->info.tag);
  + rc = ((int)ap->info.tag - (int)bp->info.tag);
   }
   return rc;
   }
  @@ -447,15 +447,15 @@
* @param count  entry item count
* @param onDisk data is concatenated strings (with NUL's))?
* @param *pend  pointer to end of tag container data (or NULL)
  - * @return   no. bytes in data, -1 on failure
  + * @return   no. bytes in data, 0 on failure
*/
  -static int dataLength(rpmTagType type, rpmTagData * p, rpmTagCount count,
  +static size_t dataLength(rpmTagType type, rpmTagData * p, rpmTagCount count,
int onDisk, /[EMAIL PROTECTED]@*/ rpmTagData * pend)
/[EMAIL PROTECTED]/
   {
   const unsigned char * s = (unsigned char *) (*p).ui8p;
   const unsigned char * se = (unsigned char *) (pend ? (*pend).ui8p : 
NULL);
  -int length = 0;
  +size_t length = 0;
   
   switch (type) {
   case RPM_STRING_TYPE:
  @@ -463,7 +463,7 @@
return -1;

[CVS] RPM: rpm/ CHANGES

2007-11-16 Thread Anders F. Bjï¿½rklund

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

  Server: rpm5.org Name:   Anders F. BjÃ¶rklund
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   16-Nov-2007 20:56:45
  Branch: HEAD Handle: 2007111619564500

  Modified files:
rpm CHANGES

  Log:
zlib upgrade

  Summary:
RevisionChanges Path
1.1833  +1  -0  rpm/CHANGES
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.1832 -r1.1833 CHANGES
  --- rpm/CHANGES   16 Nov 2007 06:32:35 -  1.1832
  +++ rpm/CHANGES   16 Nov 2007 19:56:45 -  1.1833
  @@ -1,4 +1,5 @@
   5.0a1 -> 5.0a2:
  +- afb: upgrade internal rsyncable zlib, from 1.2.2.4 to 1.2.3
   - jbj: fix: segfault with corrupted rpm reported at
http://qa.mandriva.com/show_bug.cgi?id=33735
   No change needed to rpm-5.0 whatsoever:
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES

2007-11-16 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:   16-Nov-2007 07:32:36
  Branch: HEAD Handle: 2007111606323500

  Modified files:
rpm CHANGES

  Log:
- fix: segfault with corrupted rpm reported at
http://qa.mandriva.com/show_bug.cgi?id=33735
No change needed to rpm-5.0 whatsoever:
   % rpm -K rep-gtk-debug-0.18-6mdv2008.0.x86_64.rpm
   error: /tmp/rep-gtk-debug-0.18-6mdv2008.0.x86_64.rpm: Header: 
region trailer: BAD, tag 63 type 7 offset 848 count 1524040208

  Summary:
RevisionChanges Path
1.1832  +5  -0  rpm/CHANGES
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.1831 -r1.1832 CHANGES
  --- rpm/CHANGES   16 Nov 2007 02:19:05 -  1.1831
  +++ rpm/CHANGES   16 Nov 2007 06:32:35 -  1.1832
  @@ -1,4 +1,9 @@
   5.0a1 -> 5.0a2:
  +- jbj: fix: segfault with corrupted rpm reported at
  + http://qa.mandriva.com/show_bug.cgi?id=33735
  +No change needed to rpm-5.0 whatsoever:
  +% rpm -K rep-gtk-debug-0.18-6mdv2008.0.x86_64.rpm 
  +error: /tmp/rep-gtk-debug-0.18-6mdv2008.0.x86_64.rpm: Header: region 
trailer: BAD, tag 63 type 7 offset 848 count 1524040208
   - jbj: handle --root/--dbpath variants, with/without URL, using 
--rebuilddb.
   - jbj: rpmdb: casts for integral conversions.
   - jbj: lib: identify and repair several minor flaws caught by splint.
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: xar/lib/ libxar.la.in.in

2007-11-16 Thread Anders F. Bjï¿½rklund

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

  Server: rpm5.org Name:   Anders F. BjÃ¶rklund
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: xar  Date:   15-Nov-2007 20:41:01
  Branch: HEAD Handle: 2007111519410100

  Modified files:
xar/lib libxar.la.in.in

  Log:
forgot to set libdir in the libtool hackalike

  Summary:
RevisionChanges Path
1.2 +1  -1  xar/lib/libxar.la.in.in
  

  patch -p0 <<'@@ .'
  Index: xar/lib/libxar.la.in.in
  
  $ cvs diff -u -r1.1 -r1.2 libxar.la.in.in
  --- xar/lib/libxar.la.in.in   12 Sep 2007 15:47:42 -  1.1
  +++ xar/lib/libxar.la.in.in   15 Nov 2007 19:41:01 -  1.2
  @@ -32,4 +32,4 @@
   dlpreopen=''
   
   # Directory that this library needs to be installed in:
  -libdir=''
  +libdir='@LIBDIR@'
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/rpmio/ rpmpgp.c

2007-11-16 Thread Anders F. Bjï¿½rklund

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

  Server: rpm5.org Name:   Anders F. BjÃ¶rklund
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   15-Nov-2007 16:13:07
  Branch: HEAD Handle: 2007111515130700

  Modified files:
rpm/rpmio   rpmpgp.c

  Log:
change implementation to match new header

  Summary:
RevisionChanges Path
2.68+6  -6  rpm/rpmio/rpmpgp.c
  

  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmpgp.c
  
  $ cvs diff -u -r2.67 -r2.68 rpmpgp.c
  --- rpm/rpmio/rpmpgp.c14 Nov 2007 21:13:18 -  2.67
  +++ rpm/rpmio/rpmpgp.c15 Nov 2007 15:13:07 -  2.68
  @@ -285,7 +285,7 @@
   return 0;
   }
   
  -int pgpPrtSubType(const byte *h, unsigned int hlen, pgpSigType sigtype)
  +int pgpPrtSubType(const byte *h, size_t hlen, pgpSigType sigtype)
   {
   const byte *p = h;
   unsigned plen;
  @@ -867,7 +867,7 @@
   return 0;
   }
   
  -int pgpPktLen(const byte *pkt, unsigned int pleft, pgpPkt pp)
  +int pgpPktLen(const byte *pkt, size_t pleft, pgpPkt pp)
   {
   unsigned int val = *pkt;
   unsigned int plen;
  @@ -897,7 +897,7 @@
   return pp->pktlen;
   }
   
  -int pgpPubkeyFingerprint(const byte * pkt, unsigned int pktlen, byte * keyid)
  +int pgpPubkeyFingerprint(const byte * pkt, size_t pktlen, byte * keyid)
   {
   pgpPkt pp = alloca(sizeof(*pp));
   int rc = pgpPktLen(pkt, pktlen, pp);
  @@ -964,7 +964,7 @@
   return 8;/* no. of bytes of pubkey signid */
   }
   
  -int pgpPrtPkt(const byte *pkt, unsigned int pleft)
  +int pgpPrtPkt(const byte *pkt, size_t pleft)
   {
   pgpPkt pp = alloca(sizeof(*pp));
   int rc = pgpPktLen(pkt, pleft, pp);
  @@ -1261,13 +1261,13 @@
   return 0;
   }
   
  -int pgpPrtPkts(const byte * pkts, unsigned int pktlen, pgpDig dig, int 
printing)
  +int pgpPrtPkts(const byte * pkts, size_t pktlen, pgpDig dig, int printing)
/[EMAIL PROTECTED] _dig, _digp, _print @*/
/[EMAIL PROTECTED] _dig, _digp, *_digp, _print @*/
   {
   pgpPkt pp = alloca(sizeof(*pp));
   unsigned int val = *pkts;
  -unsigned int pleft;
  +size_t pleft;
   int len;
   byte ** ppkts = NULL;
   int npkts;
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES rpm/rpmio/ .splintrc LzmaDecode.c argv.c looku...

2007-11-16 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-Nov-2007 17:29:03
  Branch: HEAD Handle: 2007111516290101

  Modified files:
rpm CHANGES
rpm/rpmio   .splintrc LzmaDecode.c argv.c lookup3.c macro.c
rpmdav.c rpmhash.c rpmio.c rpmpgp.c rpmrpc.c
strcasecmp.c

  Log:
- rpmio: casts for character <-> integral conversions.

  Summary:
RevisionChanges Path
1.1827  +1  -0  rpm/CHANGES
1.16+0  -1  rpm/rpmio/.splintrc
1.4 +8  -8  rpm/rpmio/LzmaDecode.c
1.6 +3  -3  rpm/rpmio/argv.c
1.3 +2  -2  rpm/rpmio/lookup3.c
2.151   +54 -53 rpm/rpmio/macro.c
2.51+5  -5  rpm/rpmio/rpmdav.c
1.6 +3  -3  rpm/rpmio/rpmhash.c
1.101   +6  -6  rpm/rpmio/rpmio.c
2.69+3  -3  rpm/rpmio/rpmpgp.c
2.60+17 -17 rpm/rpmio/rpmrpc.c
2.6 +6  -6  rpm/rpmio/strcasecmp.c
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.1826 -r1.1827 CHANGES
  --- rpm/CHANGES   15 Nov 2007 14:30:25 -  1.1826
  +++ rpm/CHANGES   15 Nov 2007 16:29:01 -  1.1827
  @@ -1,4 +1,5 @@
   5.0a1 -> 5.0a2:
  +- jbj: rpmio: casts for character <-> integral conversions.
   - jbj: first pass through header.c converting to uint32_t everywhere.
   - jbj: get rid of splint spew before chasing header.c integers.
   - jbj: use splint to check integral types, eliminate the easy stuff.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/.splintrc
  
  $ cvs diff -u -r1.15 -r1.16 .splintrc
  --- rpm/rpmio/.splintrc   6 Oct 2007 21:33:50 -   1.15
  +++ rpm/rpmio/.splintrc   15 Nov 2007 16:29:01 -  1.16
  @@ -71,6 +71,5 @@
   # --- not-yet at standard level
   -boolops # 117
   +boolint # 11
  -+charint # 146
   +ignorequals # 112
   +matchanyintegral# 39
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/LzmaDecode.c
  
  $ cvs diff -u -r1.3 -r1.4 LzmaDecode.c
  --- rpm/rpmio/LzmaDecode.c10 Jul 2007 12:07:43 -  1.3
  +++ rpm/rpmio/LzmaDecode.c15 Nov 2007 16:29:01 -  1.4
  @@ -129,14 +129,14 @@
 if (size < LZMA_PROPERTIES_SIZE)
   return LZMA_RESULT_DATA_ERROR;
 prop0 = propsData[0];
  -  if (prop0 >= (9 * 5 * 5))
  +  if (prop0 >= (unsigned char)(9 * 5 * 5))
   return LZMA_RESULT_DATA_ERROR;
 {
  -for (propsRes->pb = 0; prop0 >= (9 * 5); propsRes->pb++, prop0 -= (9 * 
5))
  +for (propsRes->pb = 0; prop0 >= (unsigned char)(9 * 5); propsRes->pb++, 
prop0 -= (unsigned char)(9 * 5))
{};
  -for (propsRes->lp = 0; prop0 >= 9; propsRes->lp++, prop0 -= 9)
  +for (propsRes->lp = 0; prop0 >= (unsigned char)9; propsRes->lp++, prop0 
-= (unsigned char)9)
{};
  -propsRes->lc = prop0;
  +propsRes->lc = (int) prop0;
   /*
   unsigned char remainder = (unsigned char)(prop0 / 9);
   propsRes->lc = prop0 % 9;
  @@ -170,7 +170,7 @@
   {
 CProb *p = vs->Probs;
 SizeT nowPos = 0;
  -  Byte previousByte = 0;
  +  Byte previousByte = '\0';
 UInt32 posStateMask = (1 << (vs->Properties.pb)) - 1;
 UInt32 literalPosMask = (1 << (vs->Properties.lp)) - 1;
 int lc = vs->Properties.lc;
  @@ -224,7 +224,7 @@
 globalPos = 0;
 distanceLimit = 0;
 dictionaryPos = 0;
  -  dictionary[dictionarySize - 1] = 0;
  +  dictionary[dictionarySize - 1] = (Byte)0;
   #ifdef _LZMA_IN_CB
 RC_INIT;
   #else
  @@ -302,7 +302,7 @@
   + globalPos
   #endif
   )
  -& literalPosMask) << lc) + (previousByte >> (8 - lc;
  +& literalPosMask) << lc) + (UInt32)(previousByte >> (8 - lc;
   
 if (state >= kNumLitStates)
 {
  @@ -311,7 +311,7 @@
   UInt32 pos = dictionaryPos - rep0;
   if (pos >= dictionarySize)
 pos += dictionarySize;
  -matchByte = dictionary[pos];
  +matchByte = (int) dictionary[pos];
   #else
   matchByte = outStream[nowPos - rep0];
   #endif
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/argv.c
  
  $ cvs diff -u -r1.5 -r1.6 argv.c
  --- rpm/rpmio/argv.c  6 Oct 2007 19:40:23 -   1.5

[CVS] RPM: rpm/rpmdb/ rpmwf.c

2007-11-16 Thread Anders F. Bjï¿½rklund

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

  Server: rpm5.org Name:   Anders F. BjÃ¶rklund
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   16-Nov-2007 10:40:46
  Branch: HEAD Handle: 2007111609404600

  Modified files:
rpm/rpmdb   rpmwf.c

  Log:
make rpmdb compile without xar too

  Summary:
RevisionChanges Path
1.10+9  -3  rpm/rpmdb/rpmwf.c
  

  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/rpmwf.c
  
  $ cvs diff -u -r1.9 -r1.10 rpmwf.c
  --- rpm/rpmdb/rpmwf.c 14 Nov 2007 23:56:33 -  1.9
  +++ rpm/rpmdb/rpmwf.c 16 Nov 2007 09:40:46 -  1.10
  @@ -19,7 +19,9 @@
   
   rpmRC rpmwfFiniXAR(rpmwf wf)
   {
  +#ifdef WITH_XAR
   int xx;
  +#endif
   
   if (_rpmwf_debug)
   fprintf(stderr, "*** rpmwfFiniXAR(%p)\n", wf);
  @@ -80,11 +82,13 @@
   } else
wf->f = xar_file_next(wf->i);
   /[EMAIL PROTECTED]@*/
  -#endif
   
   if (wf->f == NULL)
return RPMRC_NOTFOUND;
   return RPMRC_OK;
  +#else
  +return RPMRC_FAIL;
  +#endif
   }
   
   rpmRC rpmwfPushXAR(rpmwf wf, const char * fn)
  @@ -109,16 +113,18 @@
nb = wf->np;
   }
   
  -if (wf->x && b && nb > 0) {
   #ifdef WITH_XAR
  +if (wf->x && b && nb > 0) {
   /[EMAIL PROTECTED]@*/
wf->f = xar_add_frombuffer(wf->x, NULL, fn, b, nb);
   /[EMAIL PROTECTED]@*/
if (wf->f == NULL)
  -#endif
return RPMRC_FAIL;
   }
   return RPMRC_OK;
  +#else
  +return RPMRC_FAIL;
  +#endif
   }
   
   rpmRC rpmwfPullXAR(rpmwf wf, const char * fn)
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ TODO

2007-11-16 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:   16-Nov-2007 00:50:21
  Branch: HEAD Handle: 2007111523502100

  Modified files:
rpm TODO

  Log:
- put the decision regarding RPMv3 format support on a time line, by
beta1.

  Summary:
RevisionChanges Path
1.13+3  -0  rpm/TODO
  

  patch -p0 <<'@@ .'
  Index: rpm/TODO
  
  $ cvs diff -u -r1.12 -r1.13 TODO
  --- rpm/TODO  15 Nov 2007 11:48:19 -  1.12
  +++ rpm/TODO  15 Nov 2007 23:50:21 -  1.13
  @@ -71,6 +71,9 @@
   - jbj: sign *.rpm, convert to *.xar using txar, DSA verify w my pubkey
"works", but not same FC8 package converted using txar and FC8 pubkey
verify.
  +- jbj: either do explicit QA on RPMv3 packages or rip out the support.
  + Signature verification of RPMv3 packages is already disabled.
  + I vote for ripping, but the code needs explicit testing if kept.
   
 o to be resolved before RPM 5.0.0:
   - rse: NEWS polishing
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES rpm/rpmdb/ .splintrc dbconfig.c fprint.c hdrNV...

2007-11-16 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-Nov-2007 00:56:35
  Branch: HEAD Handle: 2007111423563302

  Modified files:
rpm CHANGES
rpm/rpmdb   .splintrc dbconfig.c fprint.c hdrNVR.c hdrfmt.c
header.c merge.c pkgio.c rpmdb.c rpmwf.c rpmwf.h
signature.c sqlite.c tagname.c
rpm/rpmio   rpmio.h rpmio_internal.h

  Log:
- jbj: get rid of splint spew before chasing header.c integers.

  Summary:
RevisionChanges Path
1.1825  +1  -0  rpm/CHANGES
1.11+24 -42 rpm/rpmdb/.splintrc
1.49+4  -4  rpm/rpmdb/dbconfig.c
1.22+1  -1  rpm/rpmdb/fprint.c
1.32+5  -0  rpm/rpmdb/hdrNVR.c
1.34+15 -13 rpm/rpmdb/hdrfmt.c
1.119   +44 -16 rpm/rpmdb/header.c
1.10+2  -2  rpm/rpmdb/merge.c
1.34+16 -10 rpm/rpmdb/pkgio.c
1.208   +28 -19 rpm/rpmdb/rpmdb.c
1.9 +6  -0  rpm/rpmdb/rpmwf.c
1.4 +7  -7  rpm/rpmdb/rpmwf.h
1.22+13 -11 rpm/rpmdb/signature.c
1.22+4  -4  rpm/rpmdb/sqlite.c
1.12+1  -1  rpm/rpmdb/tagname.c
1.60+8  -8  rpm/rpmio/rpmio.h
2.86+7  -2  rpm/rpmio/rpmio_internal.h
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.1824 -r1.1825 CHANGES
  --- rpm/CHANGES   14 Nov 2007 21:13:17 -  1.1824
  +++ rpm/CHANGES   14 Nov 2007 23:56:33 -  1.1825
  @@ -1,4 +1,5 @@
   5.0a1 -> 5.0a2:
  +- jbj: get rid of splint spew before chasing header.c integers.
   - jbj: use splint to check integral types, eliminate the easy stuff.
   - jbj: splint fiddles for rpmdb.
   - jbj: don't cache unsatisfied Suggests:.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/.splintrc
  
  $ cvs diff -u -r1.10 -r1.11 .splintrc
  --- rpm/rpmdb/.splintrc   14 Nov 2007 21:13:18 -  1.10
  +++ rpm/rpmdb/.splintrc   14 Nov 2007 23:56:33 -  1.11
  @@ -15,26 +15,10 @@
   +slovak-fcns
   -bufferoverflowhigh
   
  --assignexpose
  --compdef
  --compmempass
  --duplicatequals
  --globs   # 3
  --incondefs
  --modobserver # 9
  --nullpass# 2
  --nullstate   # 2
  --redecl
  -
  --dependenttrans
  --kepttrans
  --observertrans
  --onlytrans
  --readonlytrans
  --temptrans
  --unqualifiedtrans
  +-incondefs   # 5
  +-nullpass# 10
   
  --internalglobs   # 35
  +-internalglobs   # 81
   -unrecog # 2 rpmcliPackagesTotal misplaced
   
   # --- +partial artifacts
  @@ -48,36 +32,34 @@
   -varuse
   
   # --- not-yet at strict level
  --bitwisesigned   # 160
  +-bitwisesigned   # 228
   -branchstate # 65
  --elseifcomplete  # 9
  --exportconst # 687
  --exportfcn   # 464
  --exporttype  # 196
  --exportvar   # 55
  --fielduse# 225 occurence 
  +-elseifcomplete  # 20
  +-exportconst # 857
  +-exportfcn   # 509
  +-exporttype  # 167
  +-exportvar   # 93
  +-fielduse# 266
   -forblock# tedious
   -ifblock # tedious
  --namechecks  # 1679
  --ptrarith# 201
  +-namechecks  # 1632
  +-ptrarith# 251
   
  --compdestroy # 125
  --mustdefine  # 76
  --sys-dir-errors
  +-compdestroy # 158
  +-mustdefine  # 84
  +-sys-dir-errors  # 523
   
  --strictops   # 54
  --strictusereleased   # 3
  +-strictops   # 85
   -whileblock  # 20
   
   # --- not-yet at checks level
  -+enumint # 211
  --mustfree# 219
  --predboolptr # 107
  --usedef  # 42
  ++enumint # 578
  +-mustfree# 470
  +-predboolptr # 195
  +-usedef  # 16
   
   # --- not-yet at standard level
  --boolops # 81
  -+boolint # 18
  -+charint # 74
  -+ignorequals # 104
  -#+matchanyintegral   # 90
  +-boolops # 136
  ++boolint # 407
  ++ignorequals # 165
  ++matchanyintegral# 130
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/dbconfig.c
  
  $ cvs diff -u -r1.48 -r1.49 dbconfig.c
  --- rpm/rpmdb/dbc

[CVS] RPM: rpm/ CHANGES rpm/rpmdb/ .splintrc hdrinline.h header.c head...

2007-11-16 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:   16-Nov-2007 00:14:54
  Branch: HEAD Handle: 2007111523145201

  Modified files:
rpm CHANGES
rpm/rpmdb   .splintrc hdrinline.h header.c header.h
header_internal.c header_internal.h pkgio.c

  Log:
- rpmdb: casts for integral conversions.

  Summary:
RevisionChanges Path
1.1830  +1  -0  rpm/CHANGES
1.13+1  -1  rpm/rpmdb/.splintrc
1.32+3  -3  rpm/rpmdb/hdrinline.h
1.121   +77 -62 rpm/rpmdb/header.c
1.66+3  -3  rpm/rpmdb/header.h
1.16+3  -2  rpm/rpmdb/header_internal.c
1.31+4  -4  rpm/rpmdb/header_internal.h
1.36+13 -10 rpm/rpmdb/pkgio.c
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.1829 -r1.1830 CHANGES
  --- rpm/CHANGES   15 Nov 2007 20:26:03 -  1.1829
  +++ rpm/CHANGES   15 Nov 2007 23:14:52 -  1.1830
  @@ -1,4 +1,5 @@
   5.0a1 -> 5.0a2:
  +- jbj: rpmdb: casts for integral conversions.
   - jbj: lib: identify and repair several minor flaws caught by splint.
   - jbj: rpmio: casts for integral conversions.
   - jbj: rpmio: casts for character <-> integral conversions.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/.splintrc
  
  $ cvs diff -u -r1.12 -r1.13 .splintrc
  --- rpm/rpmdb/.splintrc   15 Nov 2007 14:30:25 -  1.12
  +++ rpm/rpmdb/.splintrc   15 Nov 2007 23:14:53 -  1.13
  @@ -62,4 +62,4 @@
   -boolops # 136
   +boolint # 407
   +ignorequals # 165
  -+matchanyintegral# 23
  +#+matchanyintegral   # 23
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/hdrinline.h
  
  $ cvs diff -u -r1.31 -r1.32 hdrinline.h
  --- rpm/rpmdb/hdrinline.h 14 Nov 2007 01:17:52 -  1.31
  +++ rpm/rpmdb/hdrinline.h 15 Nov 2007 23:14:53 -  1.32
  @@ -116,7 +116,7 @@
* @return   size of on-disk header
*/
   /[EMAIL PROTECTED]@*/ static inline
  -unsigned int headerSizeof(/[EMAIL PROTECTED]@*/ Header h)
  +size_t headerSizeof(/[EMAIL PROTECTED]@*/ Header h)
/[EMAIL PROTECTED] h @*/
   {
   /[EMAIL PROTECTED]@*/
  @@ -659,7 +659,7 @@
* @return   header instance
*/
   /[EMAIL PROTECTED]@*/ static inline
  -int headerGetInstance(/[EMAIL PROTECTED]@*/ Header h)
  +uint32_t headerGetInstance(/[EMAIL PROTECTED]@*/ Header h)
/[EMAIL PROTECTED]/
   {
   return hdrVec->hdrgetinstance(h);
  @@ -672,7 +672,7 @@
* @return   0 always
*/
   /[EMAIL PROTECTED]@*/ static inline
  -int headerSetInstance(/[EMAIL PROTECTED]@*/ Header h, int instance)
  +uint32_t headerSetInstance(/[EMAIL PROTECTED]@*/ Header h, uint32_t instance)
/[EMAIL PROTECTED] h @*/
   {
   return hdrVec->hdrsetinstance(h, instance);
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/header.c
  
  $ cvs diff -u -r1.120 -r1.121 header.c
  --- rpm/rpmdb/header.c15 Nov 2007 14:30:25 -  1.120
  +++ rpm/rpmdb/header.c15 Nov 2007 23:14:53 -  1.121
  @@ -261,7 +261,7 @@
   
   if (h->index) {
indexEntry entry = h->index;
  - int i;
  + size_t i;
for (i = 0; i < h->indexUsed; i++, entry++) {
if ((h->flags & HEADERFLAG_ALLOCATED) && ENTRY_IS_REGION(entry)) {
if (entry->length > 0) {
  @@ -384,13 +384,13 @@
* @return   size of on-disk header
*/
   static
  -unsigned int headerSizeof(/[EMAIL PROTECTED]@*/ Header h)
  +size_t headerSizeof(/[EMAIL PROTECTED]@*/ Header h)
/[EMAIL PROTECTED] h @*/
   {
   indexEntry entry;
  -unsigned int size = 0;
  -unsigned int pad = 0;
  -int i;
  +size_t size = 0;
  +size_t pad = 0;
  +size_t i;
   
   if (h == NULL)
return size;
  @@ -404,7 +404,7 @@
   /[EMAIL PROTECTED]@*/
   
   for (i = 0, entry = h->index; i < h->indexUsed; i++, entry++) {
  - unsigned diff;
  + size_t diff;
rpmTagType type;
   
/* Regions go in as is ... */
  @@ -525,10 +525,10 @@
* @param dataStart  header data start
* @param dataEndheader data end
* @param regionid   region offset
  - * @return   no. bytes of data in region, -1 on error

[CVS] RPM: rpm/rpmio/ macro.c rpmdav.c rpmio.h rpmlua.c rpmmacro.h rpm...

2007-11-16 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-Nov-2007 15:56:21
  Branch: HEAD Handle: 2007111514562100

  Modified files:
rpm/rpmio   macro.c rpmdav.c rpmio.h rpmlua.c rpmmacro.h
rpmsq.c

  Log:
- annotate recent rpmio changes.

  Summary:
RevisionChanges Path
2.150   +3  -1  rpm/rpmio/macro.c
2.50+2  -0  rpm/rpmio/rpmdav.c
1.61+2  -2  rpm/rpmio/rpmio.h
2.26+4  -0  rpm/rpmio/rpmlua.c
2.42+1  -1  rpm/rpmio/rpmmacro.h
1.29+6  -2  rpm/rpmio/rpmsq.c
  

  patch -p0 <<'@@ .'
  Index: rpm/rpmio/macro.c
  
  $ cvs diff -u -r2.149 -r2.150 macro.c
  --- rpm/rpmio/macro.c 4 Nov 2007 00:23:08 -   2.149
  +++ rpm/rpmio/macro.c 15 Nov 2007 14:56:21 -  2.150
  @@ -214,7 +214,9 @@
   }
   }
   
  +/[EMAIL PROTECTED]@*/
   static char * dupMacroEntry(MacroEntry me)
  + /[EMAIL PROTECTED]/
   {
   char * t, * te;
   size_t nb;
  @@ -227,7 +229,7 @@
nb += strlen(me->body) + sizeof("\t") - 1;
   nb++;
   
  -te = t = xmalloc(nb);
  +t = te = xmalloc(nb);
   *te = '\0';
   te = stpcpy( stpcpy(te, "%"), me->name);
   if (me->opts)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmdav.c
  
  $ cvs diff -u -r2.49 -r2.50 rpmdav.c
  --- rpm/rpmio/rpmdav.c9 Nov 2007 18:00:07 -   2.49
  +++ rpm/rpmio/rpmdav.c15 Nov 2007 14:56:21 -  2.50
  @@ -31,6 +31,7 @@
   #include "ne_utils.h"
   #if !defined(HEADER_ERR_H)
   /* cheats to avoid having to explicitly build against OpenSSL */
  +/[EMAIL PROTECTED]@*/
   extern void ERR_remove_state(int foo);
   extern void ENGINE_cleanup(void);
   extern void CONF_modules_unload(int foo);
  @@ -38,6 +39,7 @@
   extern void EVP_cleanup(void);
   extern void CRYPTO_cleanup_all_ex_data(void);
   extern void CRYPTO_mem_leaks(void * ptr);
  +/[EMAIL PROTECTED]@*/
   #endif
   
   #include "ne_md5.h" /* for version detection only */
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmio.h
  
  $ cvs diff -u -r1.60 -r1.61 rpmio.h
  --- rpm/rpmio/rpmio.h 14 Nov 2007 23:56:35 -  1.60
  +++ rpm/rpmio/rpmio.h 15 Nov 2007 14:56:21 -  1.61
  @@ -895,8 +895,8 @@
* Free all memory allocated by rpmio usage.
*/
   void rpmioClean(void)
  - /[EMAIL PROTECTED] internalState @*/
  - /[EMAIL PROTECTED] internalState @*/;
  + /[EMAIL PROTECTED] internalState, fileSystem @*/
  + /[EMAIL PROTECTED] internalState, fileSystem @*/;
   
   #ifdef __cplusplus
   }
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmlua.c
  
  $ cvs diff -u -r2.25 -r2.26 rpmlua.c
  --- rpm/rpmio/rpmlua.c3 Nov 2007 16:01:26 -   2.25
  +++ rpm/rpmio/rpmlua.c15 Nov 2007 14:56:21 -  2.26
  @@ -633,7 +633,9 @@
   int ac = 0;
   int i;
   
  +/[EMAIL PROTECTED]@*/
   lua_newtable(L);
  +/[EMAIL PROTECTED]@*/
   
   ac = rpmGetMacroEntries(NULL, NULL, -1, &av);
   
  @@ -653,6 +655,7 @@
}
b++;
   
  +/[EMAIL PROTECTED]@*/
   lua_pushstring(L, n);
   lua_newtable(L);
   if (o) {
  @@ -666,6 +669,7 @@
   lua_settable(L, -3);
   }
   lua_settable(L, -3);
  +/[EMAIL PROTECTED]@*/
   }
   av = argvFree(av);
   return 1;
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmmacro.h
  
  $ cvs diff -u -r2.41 -r2.42 rpmmacro.h
  --- rpm/rpmio/rpmmacro.h  3 Nov 2007 13:19:23 -   2.41
  +++ rpm/rpmio/rpmmacro.h  15 Nov 2007 14:56:21 -  2.42
  @@ -84,7 +84,7 @@
   rpmGetMacroEntries(/[EMAIL PROTECTED]@*/ MacroContext mc, /[EMAIL 
PROTECTED]@*/ miRE mire,
int used, /[EMAIL PROTECTED]@*/ const char *** avp)
/[EMAIL PROTECTED] rpmGlobalMacroContext @*/
  - /[EMAIL PROTECTED] *avp @*/;
  + /[EMAIL PROTECTED] mire, *avp @*/;
   
   /**
* Return URL path(s) from a (URL prefixed) pattern glob.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmsq.c
  
  $ cvs diff -u -r1.28 -r1.29 rpmsq.c
  --- rpm/rpmio/rpmsq.c 12 Nov 2007 13:22:03 -  1.28
  +++ rpm/rpmio/rpmsq.c 15 Nov 2007

[CVS] RPM: rpm/ CHANGES rpm/lib/ .splintrc depends.c psm.c query.c rpm...

2007-11-16 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-Nov-2007 21:26:05
  Branch: HEAD Handle: 2007111520260301

  Modified files:
rpm CHANGES
rpm/lib .splintrc depends.c psm.c query.c rpmchecksig.c
rpmfc.c rpminstall.c rpmps.c rpmps.h rpmte.c
rpmts.c verify.c

  Log:
- lib: identify and repair several minor flaws caught by splint.

  Summary:
RevisionChanges Path
1.1829  +1  -0  rpm/CHANGES
2.15+25 -6  rpm/lib/.splintrc
1.362   +2  -0  rpm/lib/depends.c
2.261   +3  -3  rpm/lib/psm.c
2.191   +1  -1  rpm/lib/query.c
1.178   +9  -6  rpm/lib/rpmchecksig.c
1.36+0  -1  rpm/lib/rpmfc.c
1.182   +9  -7  rpm/lib/rpminstall.c
2.17+3  -4  rpm/lib/rpmps.c
2.14+1  -1  rpm/lib/rpmps.h
2.67+0  -2  rpm/lib/rpmte.c
2.120   +2  -2  rpm/lib/rpmts.c
2.176   +2  -0  rpm/lib/verify.c
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.1828 -r1.1829 CHANGES
  --- rpm/CHANGES   15 Nov 2007 17:27:58 -  1.1828
  +++ rpm/CHANGES   15 Nov 2007 20:26:03 -  1.1829
  @@ -1,4 +1,5 @@
   5.0a1 -> 5.0a2:
  +- jbj: lib: identify and repair several minor flaws caught by splint.
   - jbj: rpmio: casts for integral conversions.
   - jbj: rpmio: casts for character <-> integral conversions.
   - jbj: first pass through header.c converting to uint32_t everywhere.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/.splintrc
  
  $ cvs diff -u -r2.14 -r2.15 .splintrc
  --- rpm/lib/.splintrc 14 Nov 2007 01:17:51 -  2.14
  +++ rpm/lib/.splintrc 15 Nov 2007 20:26:04 -  2.15
  @@ -16,22 +16,41 @@
   +slovak-fcns
   -bufferoverflowhigh
   
  --globuse
  --redecl  # 38
  -+voidabstract
  --warnlintcomments
  +-warnlintcomments# 1 ARGSUSED in getdate.y
   
   -branchstate
   -compdef
  --evalorder
  --exportheader
  +-compmempass
   -globs
  +-globstate
  +-globuse
  +-incondefs
  +-infloops
  +-internalglobs
  +-modobserver
  +-mods
   -mustmod
  +-nullderef   # 11
   -nullpass# 31
  +-nullptrarith# 1
  +-nullstate   # 9
  +-predboolothers
  +-redecl  # 38
  +-usereleased
  +
  +-dependenttrans
  +-kepttrans
  +-observertrans
  +-onlytrans
  +-ownedtrans
  +-readonlytrans
  +-temptrans
  +-unqualifiedtrans
   
   # --- +partial artifacts
   -declundef
   -exportheadervar
  +-exportheader
   -exportlocal
   
   -enummemuse
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/depends.c
  
  $ cvs diff -u -r1.361 -r1.362 depends.c
  --- rpm/lib/depends.c 13 Nov 2007 13:34:42 -  1.361
  +++ rpm/lib/depends.c 15 Nov 2007 20:26:04 -  1.362
  @@ -558,10 +558,12 @@
   
   void rpmnsClean(void)
   {
  +/[EMAIL PROTECTED]@*/
   rpmlibP = rpmdsFree(rpmlibP);
   cpuinfoP = rpmdsFree(cpuinfoP);
   getconfP = rpmdsFree(getconfP);
   unameP = rpmdsFree(unameP);
  +/[EMAIL PROTECTED]@*/
   _sysinfo_path = _free(_sysinfo_path);
   sysinfo_path = _free(sysinfo_path);
   }
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/psm.c
  
  $ cvs diff -u -r2.260 -r2.261 psm.c
  --- rpm/lib/psm.c 11 Nov 2007 22:07:45 -  2.260
  +++ rpm/lib/psm.c 15 Nov 2007 20:26:04 -  2.261
  @@ -250,7 +250,7 @@
   
   assert(fi->h != NULL);
   assert(fi->te->h == NULL);   /* XXX headerFree side effect */
  -rpmteSetHeader(fi->te, fi->h);
  +(void) rpmteSetHeader(fi->te, fi->h);
   fi->te->fd = fdLink(fd, "installSourcePackage");
   
   (void) headerMacrosLoad(fi->h);
  @@ -383,7 +383,7 @@
   if (h != NULL) h = headerFree(h);
   
   if (fi != NULL) {
  - rpmteSetHeader(fi->te, NULL);
  + (void) rpmteSetHeader(fi->te, NULL);
if (fi->te->fd != NULL)
(void) Fclose(fi->te->fd);
fi->te->fd = NULL;
  @@ -,7 +,7 @@
   psm->te->h = headerFree(psm->te->h);
   #else
if (psm->te != NULL)
  - rpmteSetHeader(psm->te, NULL);
  + (void) rpmteSetHeader(psm->te, NULL);
   #endif
if (fi->h != NULL)
fi->h = headerFree(fi->h);
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/query

[CVS] RPM: rpm/ CHANGES rpm/rpmdb/ rpmdb.c rpm/rpmio/ rpmio.c

2007-11-16 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:   16-Nov-2007 03:19:06
  Branch: HEAD Handle: 2007111602190501

  Modified files:
rpm CHANGES
rpm/rpmdb   rpmdb.c
rpm/rpmio   rpmio.c

  Log:
- handle --root/--dbpath variants, with/without URL, using
--rebuilddb.

  Summary:
RevisionChanges Path
1.1831  +1  -0  rpm/CHANGES
1.210   +12 -4  rpm/rpmdb/rpmdb.c
1.103   +1  -1  rpm/rpmio/rpmio.c
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.1830 -r1.1831 CHANGES
  --- rpm/CHANGES   15 Nov 2007 23:14:52 -  1.1830
  +++ rpm/CHANGES   16 Nov 2007 02:19:05 -  1.1831
  @@ -1,4 +1,5 @@
   5.0a1 -> 5.0a2:
  +- jbj: handle --root/--dbpath variants, with/without URL, using 
--rebuilddb.
   - jbj: rpmdb: casts for integral conversions.
   - jbj: lib: identify and repair several minor flaws caught by splint.
   - jbj: rpmio: casts for integral conversions.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/rpmdb.c
  
  $ cvs diff -u -r1.209 -r1.210 rpmdb.c
  --- rpm/rpmdb/rpmdb.c 15 Nov 2007 14:30:25 -  1.209
  +++ rpm/rpmdb/rpmdb.c 16 Nov 2007 02:19:05 -  1.210
  @@ -3911,9 +3911,6 @@
   int * dbiTags = NULL;
   int dbiTagsMax = 0;
   
  -if (prefix == NULL) prefix = "/";
  -prefix = rpmGetPath(prefix, NULL);   /* strip trailing '/' */
  -
   _dbapi = rpmExpandNumeric("%{_dbapi}");
   _dbapi_rebuild = rpmExpandNumeric("%{_dbapi_rebuild}");
   
  @@ -3928,6 +3925,17 @@
rc = 1;
goto exit;
   }
  +
  +/* Add --root prefix iff --dbpath is not a URL. */
  +switch (urlPath(tfn, NULL)) {
  +default:
  + prefix = xstrdup("");
  + break;
  +case URL_IS_UNKNOWN:
  + prefix = rpmGetPath((prefix ? prefix : "/"), NULL);
  + break;
  +}
  +
   dbpath = rootdbpath = rpmGetPath(prefix, tfn, NULL);
   if (!(prefix[0] == '/' && prefix[1] == '\0'))
dbpath += strlen(prefix);
  @@ -3949,7 +3957,7 @@
   }
   newdbpath = newrootdbpath = rpmGetPath(prefix, tfn, NULL);
   if (!(prefix[0] == '/' && prefix[1] == '\0'))
  - newdbpath += strlen(prefix) - 1;
  + newdbpath += strlen(prefix);
   tfn = _free(tfn);
   
   rpmlog(RPMLOG_DEBUG, D_("rebuilding database %s into %s\n"),
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmio.c
  
  $ cvs diff -u -r1.102 -r1.103 rpmio.c
  --- rpm/rpmio/rpmio.c 15 Nov 2007 17:27:59 -  1.102
  +++ rpm/rpmio/rpmio.c 16 Nov 2007 02:19:06 -  1.103
  @@ -3642,7 +3642,7 @@
return errno;
created = 1;
if (!(uid == (uid_t) -1 && gid == (gid_t) -1)) {
  - rc = chown(d, uid, gid);
  + rc = Chown(d, uid, gid);
if (rc)
return errno;
}
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ devtool.conf

2007-11-16 Thread Anders F. Bjï¿½rklund

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

  Server: rpm5.org Name:   Anders F. BjÃ¶rklund
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   16-Nov-2007 21:33:15
  Branch: HEAD Handle: 2007111620331500

  Modified files:
rpm devtool.conf

  Log:
avoid strip warnings, by being explicit

  Summary:
RevisionChanges Path
2.129   +5  -3  rpm/devtool.conf
  

  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  
  $ cvs diff -u -r2.128 -r2.129 devtool.conf
  --- rpm/devtool.conf  12 Nov 2007 23:58:26 -  2.128
  +++ rpm/devtool.conf  16 Nov 2007 20:33:15 -  2.129
  @@ -1791,10 +1791,12 @@
   strip -S /tmp/rpm-root/usr/local/lib/rpm/txar
   
   # strip debugging symbols, and remove libtool files (.la)
  -strip -S /tmp/rpm-root/usr/local/bin/*
  +strip -S /tmp/rpm-root/usr/local/bin/rpm
  +strip -S /tmp/rpm-root/usr/local/bin/rpmbuild
  +strip -S /tmp/rpm-root/usr/local/bin/rpmconstant
   strip -S /tmp/rpm-root/usr/local/lib/rpm/db_*
  -strip -S /tmp/rpm-root/usr/local/lib/*.dylib
  -rm -f /tmp/rpm-root/usr/local/lib/*.la
  +strip -S /tmp/rpm-root/usr/local/lib/librpm*.dylib
  +rm -f /tmp/rpm-root/usr/local/lib/librpm*.la
   
   # test drive (version only, should set up a local dbpath)
   DYLD_LIBRARY_PATH=/tmp/rpm-root/usr/local/lib:$DYLD_LIBRARY_PATH 
/tmp/rpm-root/usr/local/bin/rpm --version
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ INSTALL

2007-11-16 Thread Anders F. Bjï¿½rklund

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

  Server: rpm5.org Name:   Anders F. BjÃ¶rklund
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   16-Nov-2007 09:45:36
  Branch: HEAD Handle: 2007111608453600

  Modified files:
rpm INSTALL

  Log:
update xar library info

  Summary:
RevisionChanges Path
2.58+8  -4  rpm/INSTALL
  

  patch -p0 <<'@@ .'
  Index: rpm/INSTALL
  
  $ cvs diff -u -r2.57 -r2.58 INSTALL
  --- rpm/INSTALL   11 Nov 2007 15:05:17 -  2.57
  +++ rpm/INSTALL   16 Nov 2007 08:45:36 -  2.58
  @@ -39,8 +39,8 @@
   File/magic  [4] optional  4.0 4.21ftp://ftp.astron.com/pub/file/
   GNU gettext optional  0.160.17
http://www.gnu.org/software/gettext/
   GNU iconv   optional  1.111.11
http://www.gnu.org/software/libiconv/
  -PCRE[5] optional  7.0 7.4 http://www.pcre.org/
  -XAR optional  1.6 1.6 http://code.google.com/p/xar/
  +PCREoptional  7.0 7.4 http://www.pcre.org/
  +XAR [5] optional  1.5 1.6dev  http://code.google.com/p/xar/
   DMalloc optional  5   5.5.2   http://dmalloc.com/
   Electric Fence  optional  2.1 2.1.13  
http://perens.com/FreeSoftware/ElectricFence/
   Linux KeyUtils  optional  1.2 1.2 
http://people.redhat.com/~dhowells/keyutils/
  @@ -66,6 +66,7 @@
   
   [5] xar:   Modified XAR copy bundled with RPM.
  Building RPM against stock external XAR currently still not 
recommended.
  +   The 1.5 releases of Xar needs some patching, before they work.
   
   Run-Time
   
  @@ -203,14 +204,17 @@
libbz2  (optional)
libintl (optional)
libiconv(optional)
  + libxar  (optional)
libdmalloc  (optional)
libefence   (optional)
libkeyutils (optional)
libelf  (optional)
libneon (optional)
   
  -  Third-Party Libraries: libxml2 (required by libneon)
  -  (stage 3)  libssl  (required by libneon)
  +  Third-Party Libraries: libxml2 (required by libxar)
  +  (stage 3)  libz(required by libxar)
  + libexpat(required by libneon)
  + libssl  (required by libneon)
libcrypto   (required by libssl)
 
 System Libraries:  libc(required by all)
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES rpm/rpmio/ .splintrc argv.c digest.c fts.c mac...

2007-11-16 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-Nov-2007 18:28:01
  Branch: HEAD Handle: 2007111517275801

  Modified files:
rpm CHANGES
rpm/rpmio   .splintrc argv.c digest.c fts.c macro.c rpmdav.c
rpmhash.c rpmhook.c rpmio.c rpmlog.c rpmlua.c
rpmpgp.c rpmrpc.c rpmsq.c rpmsw.c url.c

  Log:
- jbj: rpmio: casts for integral conversions.

  Summary:
RevisionChanges Path
1.1828  +1  -0  rpm/CHANGES
1.17+1  -1  rpm/rpmio/.splintrc
1.7 +1  -1  rpm/rpmio/argv.c
2.36+1  -1  rpm/rpmio/digest.c
1.24+4  -4  rpm/rpmio/fts.c
2.152   +2  -2  rpm/rpmio/macro.c
2.52+7  -7  rpm/rpmio/rpmdav.c
1.7 +1  -1  rpm/rpmio/rpmhash.c
1.8 +1  -1  rpm/rpmio/rpmhook.c
1.102   +45 -45 rpm/rpmio/rpmio.c
2.35+3  -2  rpm/rpmio/rpmlog.c
2.27+2  -2  rpm/rpmio/rpmlua.c
2.70+7  -7  rpm/rpmio/rpmpgp.c
2.61+19 -17 rpm/rpmio/rpmrpc.c
1.30+7  -7  rpm/rpmio/rpmsq.c
2.14+2  -2  rpm/rpmio/rpmsw.c
1.43+1  -1  rpm/rpmio/url.c
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.1827 -r1.1828 CHANGES
  --- rpm/CHANGES   15 Nov 2007 16:29:01 -  1.1827
  +++ rpm/CHANGES   15 Nov 2007 17:27:58 -  1.1828
  @@ -1,4 +1,5 @@
   5.0a1 -> 5.0a2:
  +- jbj: rpmio: casts for integral conversions.
   - jbj: rpmio: casts for character <-> integral conversions.
   - jbj: first pass through header.c converting to uint32_t everywhere.
   - jbj: get rid of splint spew before chasing header.c integers.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/.splintrc
  
  $ cvs diff -u -r1.16 -r1.17 .splintrc
  --- rpm/rpmio/.splintrc   15 Nov 2007 16:29:01 -  1.16
  +++ rpm/rpmio/.splintrc   15 Nov 2007 17:27:59 -  1.17
  @@ -72,4 +72,4 @@
   -boolops # 117
   +boolint # 11
   +ignorequals # 112
  -+matchanyintegral# 39
  +#+matchanyintegral   # 39
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/argv.c
  
  $ cvs diff -u -r1.6 -r1.7 argv.c
  --- rpm/rpmio/argv.c  15 Nov 2007 16:29:01 -  1.6
  +++ rpm/rpmio/argv.c  15 Nov 2007 17:27:59 -  1.7
  @@ -228,7 +228,7 @@
   
   if (fp == NULL)
return -2;
  -while (!rc && (b = fgets(buf, sizeof(buf), fp)) != NULL) {
  +while (!rc && (b = fgets(buf, (int)sizeof(buf), fp)) != NULL) {
buf[sizeof(buf)-1] = '\0';
be = b + strlen(buf) - 1;
while (strchr("\r\n", *be) != NULL)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/digest.c
  
  $ cvs diff -u -r2.35 -r2.36 digest.c
  --- rpm/rpmio/digest.c6 Oct 2007 19:40:23 -   2.35
  +++ rpm/rpmio/digest.c15 Nov 2007 17:27:59 -  2.36
  @@ -655,7 +655,6 @@
   {
   byte * digest;
   char * t;
  -int i;
   
   if (ctx == NULL)
return -1;
  @@ -678,6 +677,7 @@
if (datap) {
const byte * s = (const byte *) digest;
static const char hex[] = "0123456789abcdef";
  + size_t i;
   
*(char **)datap = t = xmalloc((2*ctx->digestsize) + 1);
for (i = 0 ; i < ctx->digestsize; i++) {
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/fts.c
  
  $ cvs diff -u -r1.23 -r1.24 fts.c
  --- rpm/rpmio/fts.c   6 Oct 2007 19:40:23 -   1.23
  +++ rpm/rpmio/fts.c   15 Nov 2007 17:27:59 -  1.24
  @@ -244,7 +244,7 @@
/[EMAIL PROTECTED]@*/ break;
}
   
  - p = fts_alloc(sp, *argv, len);
  + p = fts_alloc(sp, *argv, (int)len);
if (p == NULL)
goto mem3;
p->fts_level = FTS_ROOTLEVEL;
  @@ -310,7 +310,7 @@
   static void
   fts_load(FTS * sp, FTSENT * p)
   {
  - register int len;
  + register size_t len;
register char *cp;
   
/*
  @@ -325,7 +325,7 @@
if ((cp = strrchr(p->fts_name, '/')) && (cp != p->fts_name || cp[1])) {
len = strlen(++cp);

[CVS] RPM: rpm/ INSTALL

2007-11-16 Thread Anders F. Bjï¿½rklund

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

  Server: rpm5.org Name:   Anders F. BjÃ¶rklund
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   16-Nov-2007 20:52:25
  Branch: HEAD Handle: 2007111619522500

  Modified files:
rpm INSTALL

  Log:
mention missing zlib features

  Summary:
RevisionChanges Path
2.59+2  -1  rpm/INSTALL
  

  patch -p0 <<'@@ .'
  Index: rpm/INSTALL
  
  $ cvs diff -u -r2.58 -r2.59 INSTALL
  --- rpm/INSTALL   16 Nov 2007 08:45:36 -  2.58
  +++ rpm/INSTALL   16 Nov 2007 19:52:25 -  2.59
  @@ -58,7 +58,8 @@
  as it reduces its RPM-specific functionality.
   
   [3] zlib:  Modified ZLib copy bundled with RPM.
  -   Building RPM against stock external Zlib not recommended.
  +   Building RPM against stock external Zlib not recommended
  +   as it reduces its RPM-specific functionality.
   
   [4] file:  Unmodified File/magic copy bundled with RPM for convenience 
reasons.
  Building RPM against this internal File/magic requires also 
internal Zlib.
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ TODO

[CVS] RPM: rpm/rpmio/ .splintrc

[CVS] RPM: rpm/ CHANGES rpm/rpmdb/ .splintrc fprint.c fprint.h hdrNVR....

[CVS] RPM: rpm/ Makefile.am macros.in

[CVS] RPM: rpm/ CHANGES rpm/rpmdb/ .splintrc header.c header_internal....

[CVS] RPM: rpm/ CHANGES

[CVS] RPM: rpm/ CHANGES

[CVS] RPM: xar/lib/ libxar.la.in.in

[CVS] RPM: rpm/rpmio/ rpmpgp.c

[CVS] RPM: rpm/ CHANGES rpm/rpmio/ .splintrc LzmaDecode.c argv.c looku...

[CVS] RPM: rpm/rpmdb/ rpmwf.c

[CVS] RPM: rpm/ TODO

[CVS] RPM: rpm/ CHANGES rpm/rpmdb/ .splintrc dbconfig.c fprint.c hdrNV...

[CVS] RPM: rpm/ CHANGES rpm/rpmdb/ .splintrc hdrinline.h header.c head...

[CVS] RPM: rpm/rpmio/ macro.c rpmdav.c rpmio.h rpmlua.c rpmmacro.h rpm...

[CVS] RPM: rpm/ CHANGES rpm/lib/ .splintrc depends.c psm.c query.c rpm...

[CVS] RPM: rpm/ CHANGES rpm/rpmdb/ rpmdb.c rpm/rpmio/ rpmio.c

[CVS] RPM: rpm/ devtool.conf

[CVS] RPM: rpm/ INSTALL

[CVS] RPM: rpm/ CHANGES rpm/rpmio/ .splintrc argv.c digest.c fts.c mac...

[CVS] RPM: rpm/ INSTALL

21 matches

Site Navigation

Mail list logo

Footer information