[CVS] RPM: rpm/scripts/ Makefile.am

2011-07-06 Thread Per �yvind Karlsen
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Per Øyvind Karlsen
  Root:   /v/rpm/cvs   Email:  pkarl...@rpm5.org
  Module: rpm  Date:   06-Jul-2011 11:30:13
  Branch: HEAD Handle: 2011070609301200

  Modified files:
rpm/scripts Makefile.am

  Log:
be sure to install gem_helper.rb  gstreamer.sh scripts

  Summary:
RevisionChanges Path
1.83+2  -2  rpm/scripts/Makefile.am
  

  patch -p0 '@@ .'
  Index: rpm/scripts/Makefile.am
  
  $ cvs diff -u -r1.82 -r1.83 Makefile.am
  --- rpm/scripts/Makefile.am   7 Jun 2011 13:30:14 -   1.82
  +++ rpm/scripts/Makefile.am   6 Jul 2011 09:30:12 -   1.83
  @@ -55,8 +55,8 @@
check-files cross-build dbconvert.sh executabledeps.sh \
find-debuginfo.sh find-lang.sh find-prov.pl find-req.pl \
find-provides.perl \
  - find-requires.perl getpo.sh http.req \
  - kmod-deps.sh javadeps.sh libtooldeps.sh \
  + find-requires.perl gem_helper.rb getpo.sh http.req \
  + kmod-deps.sh gstreamer.sh javadeps.sh libtooldeps.sh \
mono-find-provides mono-find-requires \
check-multiarch-files mkmultiarch \
osgideps.pl pkgconfigdeps.sh \
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm-5_4: rpm/scripts/ Makefile.am

2011-07-06 Thread Per �yvind Karlsen
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Per Øyvind Karlsen
  Root:   /v/rpm/cvs   Email:  pkarl...@rpm5.org
  Module: rpm  Date:   06-Jul-2011 11:32:40
  Branch: rpm-5_4  Handle: 2011070609324000

  Modified files:   (Branch: rpm-5_4)
rpm/scripts Makefile.am

  Log:
be sure to install gem_helper.rb  gstreamer.sh scripts

  Summary:
RevisionChanges Path
1.75.2.9+2  -2  rpm/scripts/Makefile.am
  

  patch -p0 '@@ .'
  Index: rpm/scripts/Makefile.am
  
  $ cvs diff -u -r1.75.2.8 -r1.75.2.9 Makefile.am
  --- rpm/scripts/Makefile.am   7 Jun 2011 13:31:17 -   1.75.2.8
  +++ rpm/scripts/Makefile.am   6 Jul 2011 09:32:40 -   1.75.2.9
  @@ -55,8 +55,8 @@
check-files cross-build dbconvert.sh executabledeps.sh \
find-debuginfo.sh find-lang.sh find-prov.pl find-req.pl \
find-provides.perl \
  - find-requires.perl getpo.sh http.req \
  - kmod-deps.sh javadeps.sh libtooldeps.sh \
  + find-requires.perl gem_helper.rb getpo.sh http.req \
  + kmod-deps.sh gstreamer.sh javadeps.sh libtooldeps.sh \
mono-find-provides mono-find-requires \
check-multiarch-files mkmultiarch \
osgideps.pl pkgconfigdeps.sh \
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm-5_3: rpm/scripts/ Makefile.am

2011-07-06 Thread Per �yvind Karlsen
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Per Øyvind Karlsen
  Root:   /v/rpm/cvs   Email:  pkarl...@rpm5.org
  Module: rpm  Date:   06-Jul-2011 11:33:54
  Branch: rpm-5_3  Handle: 2011070609335400

  Modified files:   (Branch: rpm-5_3)
rpm/scripts Makefile.am

  Log:
be sure to install gstreamer.sh script

  Summary:
RevisionChanges Path
1.65.2.13   +2  -2  rpm/scripts/Makefile.am
  

  patch -p0 '@@ .'
  Index: rpm/scripts/Makefile.am
  
  $ cvs diff -u -r1.65.2.12 -r1.65.2.13 Makefile.am
  --- rpm/scripts/Makefile.am   28 Jun 2011 12:05:32 -  1.65.2.12
  +++ rpm/scripts/Makefile.am   6 Jul 2011 09:33:54 -   1.65.2.13
  @@ -15,7 +15,7 @@
deb_control deb_md5sums deb_postinst deb_postrm deb_preinst deb_prerm \
executabledeps.sh \
find-debuginfo.sh find-lang.sh find-prov.pl find-req.pl \
  - find-provides.ksyms find-requires.ksyms kmod-deps.sh kmodtool \
  + find-provides.ksyms find-requires.ksyms kmodtool kmod-deps.sh \
cpanflute cpanflute2 Specfile.pm find-provides.perl \
find-requires.perl freshen.sh gendiff gem_helper.rb getpo.sh http.req \
check-java-closure.sh java.prov.sh java.req.sh \
  @@ -55,7 +55,7 @@
find-debuginfo.sh find-lang.sh find-prov.pl find-req.pl \
find-provides.perl \
find-requires.perl gem_helper.rb getpo.sh http.req \
  - kmod-deps.sh javadeps.sh libtooldeps.sh \
  + kmod-deps.sh gstreamer.sh javadeps.sh libtooldeps.sh \
mono-find-provides mono-find-requires \
check-multiarch-files mkmultiarch \
osgideps.pl pkgconfigdeps.sh \
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm/ CHANGES rpm/tools/ dbconvert.c

2011-07-06 Thread Per �yvind Karlsen
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Per Øyvind Karlsen
  Root:   /v/rpm/cvs   Email:  pkarl...@rpm5.org
  Module: rpm  Date:   06-Jul-2011 14:55:30
  Branch: HEAD Handle: 2011070612552901

  Modified files:
rpm CHANGES
rpm/tools   dbconvert.c

  Log:
dbconvert: fix segfault when no root is specified.

  Summary:
RevisionChanges Path
1.3660  +1  -0  rpm/CHANGES
2.7 +2  -2  rpm/tools/dbconvert.c
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3659 -r1.3660 CHANGES
  --- rpm/CHANGES   28 Jun 2011 12:00:19 -  1.3659
  +++ rpm/CHANGES   6 Jul 2011 12:55:29 -   1.3660
  @@ -1,4 +1,5 @@
   HEAD:
  +- proyvind: dbconvert: fix segfault when no root is specified.
   - proyvind: check-multiarch-files: remove unnecessary import of 
MDK::Common,
causing undesired dependency from perl dependency generator.
   - devzero2000: add a simple usage command to devtool
  @@ .
  patch -p0 '@@ .'
  Index: rpm/tools/dbconvert.c
  
  $ cvs diff -u -r2.6 -r2.7 dbconvert.c
  --- rpm/tools/dbconvert.c 11 May 2011 07:55:06 -  2.6
  +++ rpm/tools/dbconvert.c 6 Jul 2011 12:55:30 -   2.7
  @@ -114,7 +114,7 @@
 create mpool txn thread thread_count=64 nofsync, -1);
   
   /* (ugly) clear any existing locks */
  -fn = rpmGetPath(prefix[0] ? prefix : , dbpath, /, __db.*, NULL);
  +fn = rpmGetPath(prefix  prefix[0] ? prefix : , dbpath, /, 
__db.*, NULL);
   xx = Glob(fn, 0, NULL, gl);
   for (i = 0; i  (int) gl.gl_pathc; i++)
xx = Unlink(gl.gl_pathv[i]);
  @@ -377,7 +377,7 @@
   fn = _free(fn);
   
   /* clear locks */
  -fn = rpmGetPath(prefix[0] ? prefix : , dbpath, /, __db.*, NULL);
  +fn = rpmGetPath(prefix  prefix[0] ? prefix : , dbpath, /, 
__db.*, NULL);
   xx = Glob(fn, 0, NULL, gl);
   for (i = 0; i  (int) gl.gl_pathc; i++)
xx = Unlink(gl.gl_pathv[i]);
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/tools/ dbconvert.c

2011-07-06 Thread Per �yvind Karlsen
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Per Øyvind Karlsen
  Root:   /v/rpm/cvs   Email:  pkarl...@rpm5.org
  Module: rpm  Date:   06-Jul-2011 14:56:52
  Branch: rpm-5_4  Handle: 2011070612565101

  Modified files:   (Branch: rpm-5_4)
rpm CHANGES
rpm/tools   dbconvert.c

  Log:
dbconvert: fix segfault when no root is specified.

  Summary:
RevisionChanges Path
1.3501.2.145+1  -0  rpm/CHANGES
2.1.2.7 +2  -2  rpm/tools/dbconvert.c
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3501.2.144 -r1.3501.2.145 CHANGES
  --- rpm/CHANGES   28 Jun 2011 12:26:10 -  1.3501.2.144
  +++ rpm/CHANGES   6 Jul 2011 12:56:51 -   1.3501.2.145
  @@ -1,4 +1,5 @@
   5.4.1 - 5.4.2
  +- proyvind: dbconvert: fix segfault when no root is specified.
   - devzero2000: merge afb patch portability of endian
   - proyvind: check-multiarch-files: remove unnecessary import of 
MDK::Common,
causing undesired dependency from perl dependency generator.
  @@ .
  patch -p0 '@@ .'
  Index: rpm/tools/dbconvert.c
  
  $ cvs diff -u -r2.1.2.6 -r2.1.2.7 dbconvert.c
  --- rpm/tools/dbconvert.c 28 Jun 2011 12:26:11 -  2.1.2.6
  +++ rpm/tools/dbconvert.c 6 Jul 2011 12:56:52 -   2.1.2.7
  @@ -82,7 +82,7 @@
 addMacro(NULL, __dbi_txn, NULL, create mpool txn thread thread_count=64 
nofsync, -1);
   
 /* (ugly) clear any existing locks */
  -  fn = rpmGetPath(prefix[0] ? prefix : , dbpath, /, __db.*, NULL);
  +  fn = rpmGetPath(prefix  prefix[0] ? prefix : , dbpath, /, __db.*, 
NULL);
 xx = Glob(fn, 0, NULL, gl);
 for (i = 0; i  (int)gl.gl_pathc; i++)
   xx = Unlink(gl.gl_pathv[i]);
  @@ -90,7 +90,7 @@
 Globfree(gl);
   
 tsCur = rpmtsCreate();
  -  rpmtsSetRootDir(tsCur, prefix  prefix[0] ? prefix : NULL);
  +  rpmtsSetRootDir(tsCur, prefix  prefix  prefix[0] ? prefix : NULL);
 if(!rpmtsOpenDB(tsCur, O_RDONLY)) {
   if(dbtype == 1) {
 addMacro(NULL, _dbi_tags, NULL, 
Packages:Name:Basenames:Group:Requirename:Providename:Conflictname:Triggername:Dirnames:Requireversion:Provideversion:Installtid:Sigmd5:Sha1header:Filedigests:Depends:Pubkeys,
 -1);
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm-5_3: rpm/ CHANGES rpm/tools/ dbconvert.c

2011-07-06 Thread Per �yvind Karlsen
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Per Øyvind Karlsen
  Root:   /v/rpm/cvs   Email:  pkarl...@rpm5.org
  Module: rpm  Date:   06-Jul-2011 14:58:04
  Branch: rpm-5_3  Handle: 2011070612580301

  Modified files:   (Branch: rpm-5_3)
rpm CHANGES
rpm/tools   dbconvert.c

  Log:
dbconvert: fix segfault when no root is specified.

  Summary:
RevisionChanges Path
1.3296.2.242+1  -0  rpm/CHANGES
2.1.4.6 +2  -2  rpm/tools/dbconvert.c
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3296.2.241 -r1.3296.2.242 CHANGES
  --- rpm/CHANGES   28 Jun 2011 12:31:11 -  1.3296.2.241
  +++ rpm/CHANGES   6 Jul 2011 12:58:03 -   1.3296.2.242
  @@ -1,4 +1,5 @@
   5.3.12 - 5.3.13
  +- proyvind: dbconvert: fix segfault when no root is specified.
   - devzero2000: merge afb patch portability of endian
   - proyvind: check-multiarch-files: remove unnecessary import of 
MDK::Common,
causing undesired dependency from perl dependency generator.
  @@ .
  patch -p0 '@@ .'
  Index: rpm/tools/dbconvert.c
  
  $ cvs diff -u -r2.1.4.5 -r2.1.4.6 dbconvert.c
  --- rpm/tools/dbconvert.c 28 Jun 2011 12:31:12 -  2.1.4.5
  +++ rpm/tools/dbconvert.c 6 Jul 2011 12:58:04 -   2.1.4.6
  @@ -82,7 +82,7 @@
 addMacro(NULL, __dbi_txn, NULL, create mpool txn thread thread_count=64 
nofsync, -1);
   
 /* (ugly) clear any existing locks */
  -  fn = rpmGetPath(prefix[0] ? prefix : , dbpath, /, __db.*, NULL);
  +  fn = rpmGetPath(prefix  prefix[0] ? prefix : , dbpath, /, __db.*, 
NULL);
 xx = Glob(fn, 0, NULL, gl);
 for (i = 0; i  (int)gl.gl_pathc; i++)
   xx = Unlink(gl.gl_pathv[i]);
  @@ -331,7 +331,7 @@
  fn = _free(fn);
   
  /* clear locks */
  -   fn = rpmGetPath(prefix[0] ? prefix : , dbpath, /, __db.*, NULL);
  +   fn = rpmGetPath(prefix  prefix[0] ? prefix : , dbpath, /, 
__db.*, NULL);
  xx = Glob(fn, 0, NULL, gl);
  for (i = 0; i  (int)gl.gl_pathc; i++)
xx = Unlink(gl.gl_pathv[i]);
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm-5_3: rpm/tools/ dbconvert.c

2011-07-06 Thread Per �yvind Karlsen
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Per Øyvind Karlsen
  Root:   /v/rpm/cvs   Email:  pkarl...@rpm5.org
  Module: rpm  Date:   06-Jul-2011 15:03:01
  Branch: rpm-5_3  Handle: 2011070613030100

  Modified files:   (Branch: rpm-5_3)
rpm/tools   dbconvert.c

  Log:
fix header inclusion

  Summary:
RevisionChanges Path
2.1.4.7 +12 -13 rpm/tools/dbconvert.c
  

  patch -p0 '@@ .'
  Index: rpm/tools/dbconvert.c
  
  $ cvs diff -u -r2.1.4.6 -r2.1.4.7 dbconvert.c
  --- rpm/tools/dbconvert.c 6 Jul 2011 12:58:04 -   2.1.4.6
  +++ rpm/tools/dbconvert.c 6 Jul 2011 13:03:01 -   2.1.4.7
  @@ -1,22 +1,21 @@
  -#include fcntl.h
  -#include libintl.h
  -#include glob.h
  -#include errno.h
  -#include stdint.h
   
  -#include popt.h
  +#include system.h
   
  -#define _RPMDB_INTERNAL
  -#define _RPMTAG_INTERNAL
  -#define WITH_DB
  +#include poptIO.h
   
  -#include argv.h
   #include rpmio.h
  -#include rpmtag.h
  -#include rpmdb.h
  +#include rpmlog.h
   #include rpmmacro.h
  +#include argv.h
  +
  +#define _RPMTAG_INTERNAL
  +#define _RPMDB_INTERNAL
  +#include rpmdb.h
  +
   #include rpmts.h
  -#include rpmlog.h
  +#include rpmrc.h
  +
  +#include debug.h
   
   #ifdef HAVE_SYS_ENDIAN_H
   #include sys/endian.h
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org