date:20080819

[CVS] RPM: rpm/ INSTALL

2008-08-19 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:   19-Aug-2008 23:32:58
  Branch: HEAD Handle: 2008081921325800

  Modified files:
rpm INSTALL

  Log:
internal zlib was removed, internal lzma was added

  Summary:
RevisionChanges Path
2.108   +4  -6  rpm/INSTALL
  

  patch -p0 <<'@@ .'
  Index: rpm/INSTALL
  
  $ cvs diff -u -r2.107 -r2.108 INSTALL
  --- rpm/INSTALL   7 Aug 2008 07:16:46 -   2.107
  +++ rpm/INSTALL   19 Aug 2008 21:32:58 -  2.108
  @@ -36,9 +36,9 @@
   Berkeley-DB [1] optional  4.5 4.7.25  
http://www.oracle.com/database/berkeley-db.html
   SQLite  [1] optional  3.3 3.6.1   http://www.sqlite.org/
   Lua [2] optional  5.1 5.1.3   http://www.lua.org/
  -ZLib[3] optional  1.2 1.2.3   http://www.zlib.net/
  +ZLiboptional  1.2 1.2.3   http://www.zlib.net/
   Bzip2   optional  1.0 1.0.5   http://www.bzip.org/
  -LZMA Utils  optional  4.42.2  4.999.3 http://tukaani.org/lzma/
  +LZMA Utils  [3] optional  4.42.2  4.999.3 http://tukaani.org/lzma/
   File/magic  [4] optional  4.0 4.25ftp://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/
  @@ -63,12 +63,10 @@
  Building RPM against stock external Lua not recommended
  as it reduces its RPM-specific functionality.
   
  -[3] zlib:  Modified ZLib copy bundled with RPM.
  -   Building RPM against stock external Zlib not recommended
  -   as it reduces its RPM-specific functionality.
  +[3] lzma:  Modified LZMA Utils copy bundled with RPM.
  +   Building RPM against stock external LZMA currently still not 
recommended.
   
   [4] file:  Unmodified File/magic copy bundled with RPM for convenience 
reasons.
  -   Building RPM against this internal File/magic requires also 
internal Zlib.
  Building RPM against stock external File/magic supported, too.
  NOTICE: File 4.24 is unportable because uses asprintf(3) 
without fallbacks.
   
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_1: rpm/ CHANGES rpm/python/ Makefile.am rpm/python/rp...

2008-08-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:   19-Aug-2008 22:53:32
  Branch: rpm-5_1  Handle: 20080819205145107

  Modified files:   (Branch: rpm-5_1)
rpm CHANGES
rpm/python  Makefile.am
  Removed files:(Branch: rpm-5_1)
rpm/python/rpm  .cvsignore Makefile.am

  Log:
- jbj: python: simplify Makefile.am

  Summary:
RevisionChanges Path
1.2288.2.94 +1  -0  rpm/CHANGES
1.78.2.1+18 -24 rpm/python/Makefile.am
1.2 +0  -8  rpm/python/rpm/.cvsignore
1.5 +0  -15 rpm/python/rpm/Makefile.am
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.2288.2.93 -r1.2288.2.94 CHANGES
  --- rpm/CHANGES   19 Aug 2008 15:39:07 -  1.2288.2.93
  +++ rpm/CHANGES   19 Aug 2008 20:53:31 -  1.2288.2.94
  @@ -1,4 +1,5 @@
   5.1.4 -> 5.1.5:
  +- jbj: python: simplify Makefile.am
   - afb: check that crc32_combine/adler32_combine really exist, for murky 
old
zlib.
   - afb: remove undefined references too
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/python/Makefile.am
  
  $ cvs diff -u -r1.78 -r1.78.2.1 Makefile.am
  --- rpm/python/Makefile.am15 Jan 2008 19:53:58 -  1.78
  +++ rpm/python/Makefile.am19 Aug 2008 20:53:32 -  1.78.2.1
  @@ -4,17 +4,13 @@
   
   LINT = splint
   
  -pylibdir = @WITH_PYTHON_LIBDIR@
  -pyincdir = @WITH_PYTHON_INCDIR@
  -
  -SUBDIRS = rpm
  -
  -EXTRA_DIST = system.h rpmdebug-py.c
  +EXTRA_DIST = system.h rpmdebug-py.c rpm/__init__.py
   
   AM_CPPFLAGS = -I. \
-I$(top_srcdir) \
-I$(top_srcdir)/build \
-I$(top_srcdir)/lib \
  + -I$(top_builddir)/lib \
-I$(top_srcdir)/rpmdb \
-I$(top_srcdir)/rpmio \
-I$(top_srcdir)/misc \
  @@ -23,14 +19,20 @@
@WITH_LUA_CPPFLAGS@ \
@WITH_FILE_CPPFLAGS@ \
@WITH_XAR_CPPFLAGS@ \
  - -I$(pyincdir)
  + [EMAIL PROTECTED]@
   
   noinst_HEADERS = header-py.h \
rpmal-py.h rpmds-py.h rpmdb-py.h rpmfd-py.h rpmfts-py.h \
  - rpmfi-py.h rpmmacro-py.h rpmmi-py.h rpmps-py.h rpmte-py.h rpmts-py.h \
  + rpmfi-py.h rpmkeyring-py.h rpmmacro-py.h rpmmi-py.h \
  + rpmps-py.h rpmte-py.h rpmts-py.h \
spec-py.h
   
  -mylibs = \
  +pkgpyexecdir = @WITH_PYTHON_LIBDIR@/rpm
  +pkgpyexec_LTLIBRARIES = _rpmmodule.la
  +pkgpyexec_SCRIPTS = rpm/__init__.py
  +
  +_rpmmodule_la_LDFLAGS = -module -avoid-version
  +_rpmmodule_la_LIBADD = \
$(top_builddir)/build/librpmbuild.la \
$(top_builddir)/lib/librpm.la \
$(top_builddir)/rpmdb/librpmdb.la \
  @@ -38,19 +40,11 @@
$(top_builddir)/misc/librpmmisc.la \
@LTLIBINTL@
   
  -#LDADD =
  -#LIBS =
  -
  -rpmdir = $(pylibdir)/rpm
  -rpm_LTLIBRARIES = _rpmmodule.la
  -
  -_rpmmodule_la_LDFLAGS = $(mylibs) -module -avoid-version
  -_rpmmodule_la_LIBADD =
  -
  -_rpmmodule_la_SOURCES = rpmmodule.c header-py.c \
  - rpmal-py.c rpmds-py.c rpmdb-py.c rpmfd-py.c rpmfts-py.c\
  - rpmfi-py.c rpmmacro-py.c rpmmi-py.c rpmps-py.c \
  - rpmte-py.c rpmts-py.c spec-py.c
  +_rpmmodule_la_SOURCES = \
  + rpmmodule.c header-py.c \
  + rpmal-py.c rpmds-py.c rpmdb-py.c rpmfd-py.c rpmfts-py.c\
  + rpmfi-py.c rpmkeyring-py.c rpmmacro-py.c rpmmi-py.c rpmps-py.c \
  + rpmtd-py.c rpmte-py.c rpmts-py.c spec-py.c
   
   # rpmmodule.c header-py.c \
   #rpmal-py.c rpmds-py.c rpmdb-py.c rpmfd-py.c rpmfi-py.c rpmmi-py.c \
  @@ -58,8 +52,8 @@
   # rpmmodule.c header-py.c
   splint_srcs = \
rpmal-py.c rpmds-py.c rpmdb-py.c rpmfd-py.c rpmfts-py.c \
  - rpmfi-py.c rpmmacro-py.c rpmmi-py.c rpmps-py.c rpmte-py.c rpmts-py.c \
  - spec-py.c
  + rpmfi-py.c rpmkeyring-py.c rpmmacro-py.c rpmmi-py.c rpmps-py.c \
  + rpmtd-py.c rpmte-py.c rpmts-py.c spec-py.c
   
   .PHONY:  lint
   lint:
  @@ .
  rm -f rpm/python/rpm/.cvsignore <<'@@ .'
  Index: rpm/python/rpm/.cvsignore
  
  [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
  @@ .
  rm -f rpm/python/rpm/Makefile.am <<'@@ .'
  Index: rpm/python/rpm/Makefile.am
  
  [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
  @@ .
__
RPM Package

[CVS] RPM: rpm/ CHANGES rpm/python/ Makefile.am rpm/python/rpm/ .cvsig...

2008-08-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:   19-Aug-2008 22:51:45
  Branch: HEAD Handle: 2008081920514401

  Modified files:
rpm CHANGES
rpm/python  Makefile.am
  Removed files:
rpm/python/rpm  .cvsignore Makefile.am

  Log:
- jbj: python: simplify Makefile.am

  Summary:
RevisionChanges Path
1.2530  +1  -0  rpm/CHANGES
1.82+8  -17 rpm/python/Makefile.am
1.2 +0  -8  rpm/python/rpm/.cvsignore
1.5 +0  -15 rpm/python/rpm/Makefile.am
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.2529 -r1.2530 CHANGES
  --- rpm/CHANGES   19 Aug 2008 14:46:27 -  1.2529
  +++ rpm/CHANGES   19 Aug 2008 20:51:44 -  1.2530
  @@ -1,5 +1,6 @@
   
   5.1.0 -> 5.2a0:
  +- jbj: python: simplify Makefile.am
   - jbj: display sysinfo path with --showrc.
   - jbj: remove internal zlib.
   - jbj: WR: eliminate most compiler warnings.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/python/Makefile.am
  
  $ cvs diff -u -r1.81 -r1.82 Makefile.am
  --- rpm/python/Makefile.am30 Jul 2008 12:02:46 -  1.81
  +++ rpm/python/Makefile.am19 Aug 2008 20:51:45 -  1.82
  @@ -4,12 +4,7 @@
   
   LINT = splint
   
  -pylibdir = @WITH_PYTHON_LIBDIR@
  -pyincdir = @WITH_PYTHON_INCDIR@
  -
  -SUBDIRS = rpm
  -
  -EXTRA_DIST = system.h rpmdebug-py.c
  +EXTRA_DIST = system.h rpmdebug-py.c rpm/__init__.py
   
   AM_CPPFLAGS = -I. \
-I$(top_srcdir) \
  @@ -24,7 +19,7 @@
@WITH_LUA_CPPFLAGS@ \
@WITH_FILE_CPPFLAGS@ \
@WITH_XAR_CPPFLAGS@ \
  - -I$(pyincdir)
  + [EMAIL PROTECTED]@
   
   noinst_HEADERS = header-py.h \
rpmal-py.h rpmds-py.h rpmdb-py.h rpmfd-py.h rpmfts-py.h \
  @@ -32,7 +27,12 @@
rpmps-py.h rpmte-py.h rpmts-py.h \
spec-py.h
   
  -mylibs = \
  +pkgpyexecdir = @WITH_PYTHON_LIBDIR@/rpm
  +pkgpyexec_LTLIBRARIES = _rpmmodule.la
  +pkgpyexec_SCRIPTS = rpm/__init__.py
  +
  +_rpmmodule_la_LDFLAGS = -module -avoid-version
  +_rpmmodule_la_LIBADD = \
$(top_builddir)/build/librpmbuild.la \
$(top_builddir)/lib/librpm.la \
$(top_builddir)/rpmdb/librpmdb.la \
  @@ -40,15 +40,6 @@
$(top_builddir)/misc/librpmmisc.la \
@LTLIBINTL@
   
  -#LDADD =
  -#LIBS =
  -
  -rpmdir = $(pylibdir)/rpm
  -rpm_LTLIBRARIES = _rpmmodule.la
  -
  -_rpmmodule_la_LDFLAGS = $(mylibs) -module -avoid-version
  -_rpmmodule_la_LIBADD =
  -
   _rpmmodule_la_SOURCES = \
rpmmodule.c header-py.c \
rpmal-py.c rpmds-py.c rpmdb-py.c rpmfd-py.c rpmfts-py.c\
  @@ .
  rm -f rpm/python/rpm/.cvsignore <<'@@ .'
  Index: rpm/python/rpm/.cvsignore
  
  [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
  @@ .
  rm -f rpm/python/rpm/Makefile.am <<'@@ .'
  Index: rpm/python/rpm/Makefile.am
  
  [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_1: rpm/ devtool.conf

2008-08-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:   19-Aug-2008 17:40:41
  Branch: rpm-5_1  Handle: 2008081915404100

  Modified files:   (Branch: rpm-5_1)
rpm devtool.conf

  Log:
- afb: update library litter comments

  Summary:
RevisionChanges Path
2.205.2.13  +4  -5  rpm/devtool.conf
  

  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  
  $ cvs diff -u -r2.205.2.12 -r2.205.2.13 devtool.conf
  --- rpm/devtool.conf  18 Aug 2008 22:18:17 -  2.205.2.12
  +++ rpm/devtool.conf  19 Aug 2008 15:40:41 -  2.205.2.13
  @@ -3,10 +3,9 @@
   ##
   
   %common
  -MODULE_NAMES="db lua zlib file xar"
  +MODULE_NAMES="db lua file xar"
   MODULE_TAG_DB="rpm-5_1"
   MODULE_TAG_LUA="rpm-5_1"
  -MODULE_TAG_ZLIB="rpm-5_1"
   MODULE_TAG_FILE="rpm-5_1"
   MODULE_TAG_XAR="rpm-5_1"
   
  @@ -69,7 +68,7 @@
   --prefix=/usr \
   --with-db=internal \
   --with-db-tools-integrated \
  ---with-zlib=internal \
  +--with-zlib=external \
   --with-bzip2=external \
   --without-lzma \
   --with-file=internal \
  @@ -1136,7 +1135,7 @@
   ##  This also requires --disable-dependency-tracking, since it doesn't
   ##  work with multiple -arch flags (see Apple's Technical Note TN2137)
   ##
  -##  These libraries are built internally: db, lua, zlib, file, xar
  +##  These libraries are built internally: db, lua, file, xar
   ##  These libraries are statically linked: neon, beecrypt, sqlite, popt
   ##  (building popt statically requires that the required popt.h header
   ##  is included within the rpm headers, so that it can be found later)
  @@ -1568,7 +1567,7 @@
   --with-bugreport="[EMAIL PROTECTED]" \
   --with-db=internal \
   --with-lua=internal \
  ---with-zlib=internal \
  +--with-zlib=external \
   --with-file=internal \
   --with-xar=internal \
   --without-lzma \
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_1: lua/local/ lshadow.c lwrs.c rpm/ CHANGES

2008-08-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 lua  Date:   19-Aug-2008 17:39:07
  Branch: rpm-5_1  Handle: 2008081915390700

  Modified files:   (Branch: rpm-5_1)
lua/local   lshadow.c lwrs.c
rpm CHANGES

  Log:
- rfb: emove undefined references too

  Summary:
RevisionChanges Path
1.1.2.4 +5  -1  lua/local/lshadow.c
1.1.2.5 +5  -1  lua/local/lwrs.c
1.2288.2.93 +1  -0  rpm/CHANGES
  

  patch -p0 <<'@@ .'
  Index: lua/local/lshadow.c
  
  $ cvs diff -u -r1.1.2.3 -r1.1.2.4 lshadow.c
  --- lua/local/lshadow.c   18 Aug 2008 19:47:16 -  1.1.2.3
  +++ lua/local/lshadow.c   19 Aug 2008 15:39:07 -  1.1.2.4
  @@ -1,5 +1,5 @@
   /*
  -** $Id: lshadow.c,v 1.1.2.3 2008/08/18 19:47:16 jbj Exp $
  +** $Id: lshadow.c,v 1.1.2.4 2008/08/19 15:39:07 jbj Exp $
   ** Shadow utilities
   */
   
  @@ -50,6 +50,7 @@
 return 0;
   }
   
  +#ifdef USE_LUA_SHADOW
   static int shadow_groupadd (lua_State *L)
/[EMAIL PROTECTED] internalState @*/
/[EMAIL PROTECTED] L, internalState @*/
  @@ -95,7 +96,9 @@
 free(cmdline);
 return 0;
   }
  +#endif /* USE_LUA_SHADOW */
   
  +#ifdef USE_LUA_CHKCONFIG
   static int shadow_chkconfig (lua_State *L)
/[EMAIL PROTECTED] internalState @*/
/[EMAIL PROTECTED] L, internalState @*/
  @@ -118,6 +121,7 @@
 free(cmdline);
 return 0;
   }
  +#endif /* USE_LUA_CHKCONFIG */
   
   /[EMAIL PROTECTED]@*/
   /[EMAIL PROTECTED]@*/
  @@ .
  patch -p0 <<'@@ .'
  Index: lua/local/lwrs.c
  
  $ cvs diff -u -r1.1.2.4 -r1.1.2.5 lwrs.c
  --- lua/local/lwrs.c  18 Aug 2008 19:47:16 -  1.1.2.4
  +++ lua/local/lwrs.c  19 Aug 2008 15:39:07 -  1.1.2.5
  @@ -1,5 +1,5 @@
   /*
  -** $Id: lwrs.c,v 1.1.2.4 2008/08/18 19:47:16 jbj Exp $
  +** $Id: lwrs.c,v 1.1.2.5 2008/08/19 15:39:07 jbj Exp $
   ** WRLinux utilities
   */
   
  @@ -48,6 +48,7 @@
 return 0;
   }
   
  +#ifdef USE_LUA_SHADOW
   static int wrs_groupadd (lua_State *L)
/[EMAIL PROTECTED] internalState @*/
/[EMAIL PROTECTED] L, internalState @*/
  @@ -93,7 +94,9 @@
 free(cmdline);
 return 0;
   }
  +#endif /* USE_LUA_SHADOW */
   
  +#ifdef USE_LUA_CHKCONFIG
   static int wrs_chkconfig (lua_State *L)
/[EMAIL PROTECTED] internalState @*/
/[EMAIL PROTECTED] L, internalState @*/
  @@ -116,6 +119,7 @@
 free(cmdline);
 return 0;
   }
  +#endif /* USE_LUA_CHKCONFIG */
   
   /[EMAIL PROTECTED]@*/
   /[EMAIL PROTECTED]@*/
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.2288.2.92 -r1.2288.2.93 CHANGES
  --- rpm/CHANGES   19 Aug 2008 15:31:41 -  1.2288.2.92
  +++ rpm/CHANGES   19 Aug 2008 15:39:07 -  1.2288.2.93
  @@ -1,6 +1,7 @@
   5.1.4 -> 5.1.5:
   - afb: check that crc32_combine/adler32_combine really exist, for murky 
old
zlib.
  +- afb: remove undefined references too
   - jbj: WR: run-time discovered configuration goopiness, take 1.
   - jbj: display cpuinfo path with --showrc.
   - jbj: display sysinfo path with --showrc.
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_1: rpm/ CHANGES configure.ac rpm/rpmio/ digest.c

2008-08-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:   19-Aug-2008 17:31:41
  Branch: rpm-5_1  Handle: 2008081915314100

  Modified files:   (Branch: rpm-5_1)
rpm CHANGES configure.ac
rpm/rpmio   digest.c

  Log:
- afb: check that crc32_combine/adler32_combine really exist, for murky old
zlib.

  Summary:
RevisionChanges Path
1.2288.2.92 +2  -0  rpm/CHANGES
2.289.2.10  +2  -0  rpm/configure.ac
2.38.2.1+4  -0  rpm/rpmio/digest.c
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.2288.2.91 -r1.2288.2.92 CHANGES
  --- rpm/CHANGES   19 Aug 2008 15:21:52 -  1.2288.2.91
  +++ rpm/CHANGES   19 Aug 2008 15:31:41 -  1.2288.2.92
  @@ -1,4 +1,6 @@
   5.1.4 -> 5.1.5:
  +- afb: check that crc32_combine/adler32_combine really exist, for murky 
old
  + zlib.
   - jbj: WR: run-time discovered configuration goopiness, take 1.
   - jbj: display cpuinfo path with --showrc.
   - jbj: display sysinfo path with --showrc.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.289.2.9 -r2.289.2.10 configure.ac
  --- rpm/configure.ac  18 Aug 2008 23:46:49 -  2.289.2.9
  +++ rpm/configure.ac  19 Aug 2008 15:31:41 -  2.289.2.10
  @@ -946,6 +946,8 @@
   [rpmz z gz], [gzread], [zlib.h],
   [yes,external:none], [zlib],
   [ AC_CHECK_FUNC(gzseek)
  +  AC_CHECK_FUNC(crc32_combine, AC_DEFINE(HAVE_ZLIB_CRC32_COMBINE, 1, 
[Define as 1 if you have crc32_combine() in zlib]))
  +  AC_CHECK_FUNC(adler32_combine, AC_DEFINE(HAVE_ZLIB_ADLER32_COMBINE, 1, 
[Define as 1 if you have adler32_combine() in zlib]))
 if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then
 AC_DEFINE(HAVE_ZLIB_H, 1, [Define to 1 if you have ])
 fi
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/digest.c
  
  $ cvs diff -u -r2.38 -r2.38.2.1 digest.c
  --- rpm/rpmio/digest.c18 Feb 2008 19:59:08 -  2.38
  +++ rpm/rpmio/digest.c19 Aug 2008 15:31:41 -  2.38.2.1
  @@ -502,8 +502,10 @@
   /[EMAIL PROTECTED] @*/
mp->update = (uint32_t (*)(uint32_t, const byte *, size_t)) crc32;
   #if defined(ZLIB_H)
  +#if defined(HAVE_ZLIB_CRC32_COMBINE)
mp->combine = (uint32_t (*)(uint32_t, uint32_t, size_t)) 
crc32_combine;
   #endif
  +#endif
   /[EMAIL PROTECTED] @*/
ctx->paramsize = sizeof(*mp);
ctx->param = mp;
  @@ -522,8 +524,10 @@
   /[EMAIL PROTECTED] @*/
   #if defined(ZLIB_H)
mp->update = (uint32_t (*)(uint32_t, const byte *, size_t)) adler32;
  +#if defined(HAVE_ZLIB_ADLER32_COMBINE)
mp->combine = (uint32_t (*)(uint32_t, uint32_t, size_t)) 
adler32_combine;
   #endif
  +#endif
   /[EMAIL PROTECTED] @*/
ctx->paramsize = sizeof(*mp);
ctx->param = mp;
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_1: rpm/ CHANGES rpm/lib/ poptALL.c rpmds.c rpmds.h rp...

2008-08-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:   19-Aug-2008 17:21:53
  Branch: rpm-5_1  Handle: 2008081915215201

  Modified files:   (Branch: rpm-5_1)
rpm CHANGES
rpm/lib poptALL.c rpmds.c rpmds.h rpmrc.c

  Log:
- WR: run-time discovered configuration goopiness, take 1.
- display cpuinfo path with --showrc.
- display sysinfo path with --showrc.

  Summary:
RevisionChanges Path
1.2288.2.91 +3  -0  rpm/CHANGES
2.90.2.1+83 -12 rpm/lib/poptALL.c
2.94.2.1+1  -1  rpm/lib/rpmds.c
2.66.2.1+5  -0  rpm/lib/rpmds.h
2.234.2.2   +21 -5  rpm/lib/rpmrc.c
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.2288.2.90 -r1.2288.2.91 CHANGES
  --- rpm/CHANGES   18 Aug 2008 23:46:49 -  1.2288.2.90
  +++ rpm/CHANGES   19 Aug 2008 15:21:52 -  1.2288.2.91
  @@ -1,4 +1,7 @@
   5.1.4 -> 5.1.5:
  +- jbj: WR: run-time discovered configuration goopiness, take 1.
  +- jbj: display cpuinfo path with --showrc.
  +- jbj: display sysinfo path with --showrc.
   - jbj: remove internal zlib.
   - jbj: WR: add %windriver target to devtool.conf.
   - jbj: WR: eliminate most compiler warnings.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/poptALL.c
  
  $ cvs diff -u -r2.90 -r2.90.2.1 poptALL.c
  --- rpm/lib/poptALL.c 2 Apr 2008 21:56:47 -   2.90
  +++ rpm/lib/poptALL.c 19 Aug 2008 15:21:53 -  2.90.2.1
  @@ -6,17 +6,30 @@
   #include "system.h"
   const char *__progname;
   
  +#if defined(RPM_VENDOR_WINDRIVER)
  +const char *__usrlibrpm = USRLIBRPM;
  +const char *__etcrpm = SYSCONFIGDIR;
  +#endif
  +#if defined(ENABLE_NLS) && !defined(__LCLINT__)
  +const char *__localedir = LOCALEDIR;
  +#endif
  +
   #include 
   #include 
   #include 
   #include 
   
   #include 
  -#include   /* XXX rpmFreeFilesystems() */
  +
   #include/* XXX rpmnsClean() */
   
  +#include   /* XXX rpmFreeFilesystems() */
  +
   #include "debug.h"
   
  +/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/
  +extern unsigned int * keyids;
  +
   #define POPT_SHOWVERSION -999
   #define POPT_SHOWRC  -998
   #define POPT_QUERYTAGS   -997
  @@ -117,20 +130,22 @@
   extern const char *rpmluaFiles;
   #endif
   
  +/[EMAIL PROTECTED]@*//* argv loading prevents observer, xstrdup 
needed. */
   /[EMAIL PROTECTED]@*/
   static char *rpmpoptfiles = RPMPOPTFILES;
  +/[EMAIL PROTECTED]@*/
   
   /**
* Display rpm version.
*/
   static void printVersion(FILE * fp)
  - /[EMAIL PROTECTED] rpmEVR, fileSystem @*/
  - /[EMAIL PROTECTED] *fp, fileSystem @*/
  + /[EMAIL PROTECTED] rpmEVR, fileSystem, internalState @*/
  + /[EMAIL PROTECTED] *fp, fileSystem, internalState @*/
   {
   fprintf(fp, _("%s (" RPM_NAME ") %s\n"), __progname, rpmEVR);
   if (rpmIsVerbose())
  - fprintf(fp, "rpmlib 0x%08x,0x%08x,0x%08x\n",
  - rpmlibVersion(), rpmlibTimestamp(), rpmlibVendor());
  + fprintf(fp, "rpmlib 0x%08x,0x%08x,0x%08x\n", (unsigned)rpmlibVersion(),
  + (unsigned)rpmlibTimestamp(), (unsigned)rpmlibVendor());
   }
   
   void rpmcliConfigured(void)
  @@ -161,9 +176,9 @@
   /[EMAIL PROTECTED]@*/ enum poptCallbackReason reason,
   const struct poptOption * opt, const char * arg,
   /[EMAIL PROTECTED]@*/ const void * data)
  - /[EMAIL PROTECTED] rpmcliTargets, rpmcliQueryFlags, rpmCLIMacroContext,
  + /[EMAIL PROTECTED] pgpDigVSFlags, rpmcliTargets, rpmcliQueryFlags, 
rpmCLIMacroContext,
rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/
  - /[EMAIL PROTECTED] con, rpmcliTargets, rpmcliQueryFlags, 
rpmCLIMacroContext,
  + /[EMAIL PROTECTED] con, pgpDigVSFlags, rpmcliTargets, rpmcliQueryFlags, 
rpmCLIMacroContext,
rpmGlobalMacroContext, fileSystem, internalState @*/
   {
   
  @@ -214,7 +229,7 @@
   size_t val_len;
   val_len = strlen(val);
   if (val[val_len - 1] == '\n')
  -fwrite(val, val_len, 1, stdout);
  +val_len = fwrite(val, val_len, 1, stdout);
   else
fprintf(stdout, "%s\n", val);
val = _free(val);
  @@ -414,6 +429,8 @@
   
   poptContext
   rpmcliFini(poptContext optCon)
  + /[EMAIL PROTECTED

[CVS] RPM: rpm/ devtool.conf

2008-08-19 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:   19-Aug-2008 17:04:48
  Branch: HEAD Handle: 2008081915044700

  Modified files:
rpm devtool.conf

  Log:
macosx: update library litter comments

  Summary:
RevisionChanges Path
2.240   +1  -1  rpm/devtool.conf
  

  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  
  $ cvs diff -u -r2.239 -r2.240 devtool.conf
  --- rpm/devtool.conf  18 Aug 2008 23:29:27 -  2.239
  +++ rpm/devtool.conf  19 Aug 2008 15:04:47 -  2.240
  @@ -1104,7 +1104,7 @@
   ##  This also requires --disable-dependency-tracking, since it doesn't
   ##  work with multiple -arch flags (see Apple's Technical Note TN2137)
   ##
  -##  These libraries are built internally: db, lua, zlib, file, xar, lzma
  +##  These libraries are being built internally: db, lua, file, xar, lzma
   ##  These are statically linked: neon, beecrypt, sqlite, popt, pcre, uuid
   ##  (building popt statically requires that the required popt.h header
   ##  is included within the rpm headers, so that it can be found later)
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ configure.ac rpm/rpmio/ digest.c

2008-08-19 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:   19-Aug-2008 17:02:59
  Branch: HEAD Handle: 2008081915025801

  Modified files:
rpm configure.ac
rpm/rpmio   digest.c

  Log:
check that crc32_combine/adler32_combine really exist, for murky old
zlib

  Summary:
RevisionChanges Path
2.312   +2  -0  rpm/configure.ac
2.40+4  -0  rpm/rpmio/digest.c
  

  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.311 -r2.312 configure.ac
  --- rpm/configure.ac  18 Aug 2008 23:32:47 -  2.311
  +++ rpm/configure.ac  19 Aug 2008 15:02:58 -  2.312
  @@ -959,6 +959,8 @@
   [rpmz z gz], [gzread], [zlib.h],
   [yes,external:none], [zlib],
   [ AC_CHECK_FUNC(gzseek)
  +  AC_CHECK_FUNC(crc32_combine, AC_DEFINE(HAVE_ZLIB_CRC32_COMBINE, 1, 
[Define as 1 if you have crc32_combine() in zlib]))
  +  AC_CHECK_FUNC(adler32_combine, AC_DEFINE(HAVE_ZLIB_ADLER32_COMBINE, 1, 
[Define as 1 if you have adler32_combine() in zlib]))
 if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then
 AC_DEFINE(HAVE_ZLIB_H, 1, [Define to 1 if you have ])
 fi
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/digest.c
  
  $ cvs diff -u -r2.39 -r2.40 digest.c
  --- rpm/rpmio/digest.c31 Jul 2008 02:40:10 -  2.39
  +++ rpm/rpmio/digest.c19 Aug 2008 15:02:59 -  2.40
  @@ -502,8 +502,10 @@
   /[EMAIL PROTECTED] @*/
mp->update = (rpmuint32_t (*)(rpmuint32_t, const byte *, size_t)) 
crc32;
   #if defined(ZLIB_H)
  +#if defined(HAVE_ZLIB_CRC32_COMBINE)
mp->combine = (rpmuint32_t (*)(rpmuint32_t, rpmuint32_t, size_t)) 
crc32_combine;
   #endif
  +#endif
   /[EMAIL PROTECTED] @*/
ctx->paramsize = sizeof(*mp);
ctx->param = mp;
  @@ -522,8 +524,10 @@
   /[EMAIL PROTECTED] @*/
   #if defined(ZLIB_H)
mp->update = (rpmuint32_t (*)(rpmuint32_t, const byte *, size_t)) 
adler32;
  +#if defined(HAVE_ZLIB_ADLER32_COMBINE)
mp->combine = (rpmuint32_t (*)(rpmuint32_t, rpmuint32_t, size_t)) 
adler32_combine;
   #endif
  +#endif
   /[EMAIL PROTECTED] @*/
ctx->paramsize = sizeof(*mp);
ctx->param = mp;
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

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

2008-08-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:   19-Aug-2008 16:46:28
  Branch: HEAD Handle: 2008081914462701

  Modified files:
rpm CHANGES
rpm/lib rpmrc.c

  Log:
- jbj: display sysinfo path with --showrc.

  Summary:
RevisionChanges Path
1.2529  +1  -0  rpm/CHANGES
2.245   +2  -1  rpm/lib/rpmrc.c
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.2528 -r1.2529 CHANGES
  --- rpm/CHANGES   18 Aug 2008 23:29:27 -  1.2528
  +++ rpm/CHANGES   19 Aug 2008 14:46:27 -  1.2529
  @@ -1,5 +1,6 @@
   
   5.1.0 -> 5.2a0:
  +- jbj: display sysinfo path with --showrc.
   - jbj: remove internal zlib.
   - jbj: WR: eliminate most compiler warnings.
   - jbj: WR: eliminate duplicated AutoFu boilerplate, use system.h instead.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmrc.c
  
  $ cvs diff -u -r2.244 -r2.245 rpmrc.c
  --- rpm/lib/rpmrc.c   17 Aug 2008 20:43:58 -  2.244
  +++ rpm/lib/rpmrc.c   19 Aug 2008 14:46:28 -  2.245
  @@ -1016,7 +1016,8 @@
xx = rpmdsSysinfo(PRCO, NULL);
ds = rpmdsFromPRCO(PRCO, RPMTAG_PROVIDENAME);
if (ds != NULL) {
  - fprintf(fp, _("Configured system provides (from 
/etc/rpm/sysinfo):\n"));
  + const char * fn = (_sysinfo_path ? _sysinfo_path : 
"/etc/rpm/sysinfo");
  + fprintf(fp, _("Configured system provides (from %s):\n"), fn);
ds = rpmdsInit(ds);
while (rpmdsNext(ds) >= 0) {
const char * DNEVR = rpmdsDNEVR(ds);
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ INSTALL

[CVS] RPM: rpm-5_1: rpm/ CHANGES rpm/python/ Makefile.am rpm/python/rp...

[CVS] RPM: rpm/ CHANGES rpm/python/ Makefile.am rpm/python/rpm/ .cvsig...

[CVS] RPM: rpm-5_1: rpm/ devtool.conf

[CVS] RPM: rpm-5_1: lua/local/ lshadow.c lwrs.c rpm/ CHANGES

[CVS] RPM: rpm-5_1: rpm/ CHANGES configure.ac rpm/rpmio/ digest.c

[CVS] RPM: rpm-5_1: rpm/ CHANGES rpm/lib/ poptALL.c rpmds.c rpmds.h rp...

[CVS] RPM: rpm/ devtool.conf

[CVS] RPM: rpm/ configure.ac rpm/rpmio/ digest.c

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

10 matches

Site Navigation

Mail list logo

Footer information