date:20110905

[CVS] RPM: popt/ CHANGES system.h test1.c

2011-09-05 Thread Pinto Elia

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

  Server: rpm5.org Name:   Pinto Elia
  Root:   /v/rpm/cvs   Email:  devzero2...@rpm5.org
  Module: popt Date:   05-Sep-2011 13:20:27
  Branch: HEAD Handle: 2011090511202700

  Modified files:
poptCHANGES system.h test1.c

  Log:
merge  commit ea2978d from git pull request
https://github.com/devzero2000/POPT/pull/2
Fix build with MinGW 32/64 + MSVC by arsenm
(Matt Arsenault)

  Summary:
RevisionChanges Path
1.166   +4  -0  popt/CHANGES
1.23+12 -8  popt/system.h
1.52+2  -2  popt/test1.c
  

  patch -p0 '@@ .'
  Index: popt/CHANGES
  
  $ cvs diff -u -r1.165 -r1.166 CHANGES
  --- popt/CHANGES  16 Jun 2011 15:26:43 -  1.165
  +++ popt/CHANGES  5 Sep 2011 11:20:27 -   1.166
  @@ -1,4 +1,8 @@
   1.17 - 2.0:
  +- devzero2000: merge  commit ea2978d from git pull request 
  +  https://github.com/devzero2000/POPT/pull/2 
  +  Fix build with MinGW 32/64 + MSVC by arsenm
  +  (Matt Arsenault)
   - devzero2000: fix compiler warning -Wunused-but-set-variable (GCC 4.6)
   - devzero2000: redo the autofu vendor-script linker script check for 
openindiana native
 ld, using modern and not deprecated autoconf construct. Even if the 
check is not perfect 
  @@ .
  patch -p0 '@@ .'
  Index: popt/system.h
  
  $ cvs diff -u -r1.22 -r1.23 system.h
  --- popt/system.h 14 Apr 2011 12:40:49 -  1.22
  +++ popt/system.h 5 Sep 2011 11:20:27 -   1.23
  @@ -56,6 +56,9 @@
   
   #ifdef _MSC_VER
   #  define inline __inline
  +#endif
  +
  +#if defined(_MSC_VER) || defined(__MINGW32__)
   #define _CRT_SECURE_NO_WARNINGS 1
   #include io.h
   #include malloc.h
  @@ -109,18 +112,19 @@
   #define lseek _lseek
   
   /* Pretend to be root to replace these */
  -inline int setuid(int x) { return 1; }
  -inline int getuid(void) { return 0; }
  +static inline int setuid(int x) { return 1; }
  +
  +static inline int getuid(void) { return 0; }
   
  -inline int seteuid(int x) { return 1; }
  -inline int geteuid(void) { return 0; }
  +static inline int seteuid(int x) { return 1; }
  +static inline int geteuid(void) { return 0; }
   
  -inline int setgid(int x) { return 1; }
  -inline int getgid(void) { return 0; }
  +static inline int setgid(int x) { return 1; }
  +static inline int getgid(void) { return 0; }
   
  -inline int setegid(int x) { return 1; }
  +static inline int setegid(int x) { return 1; }
   
  -#endif /* _MSC_VER */
  +#endif /* defined(_MSC_VER) || defined(__MINGW32__) */
   
   #ifdef __NeXT
   /* access macros are not declared in non posix mode in unistd.h -
  @@ .
  patch -p0 '@@ .'
  Index: popt/test1.c
  
  $ cvs diff -u -r1.51 -r1.52 test1.c
  --- popt/test1.c  26 Jul 2010 16:23:41 -  1.51
  +++ popt/test1.c  5 Sep 2011 11:20:27 -   1.52
  @@ -256,6 +256,7 @@
   const char ** rest;
   int help = 0;
   int usage = 0;
  +char * testpoptrc;
   
   #if defined(HAVE_MCHECK_H)  defined(HAVE_MTRACE)
   /*@-moduncon -noeffectuncon@*/
  @@ -269,9 +270,8 @@
   /*@-temptrans@*/
   optCon = poptGetContext(test1, argc, argv, options, 0);
   #ifdef HAVE_STDLIB_H
  -char * testpoptrc;
   testpoptrc = getenv (testpoptrc);
  -if (testpoptrc != NULL ) 
  +if (testpoptrc != NULL )
   (void) poptReadConfigFile(optCon, testpoptrc);
   else {
   (void) poptReadConfigFile(optCon, ./test-poptrc);
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: popt/ CHANGES popthelp.c system.h test1.c

2011-09-05 Thread Pinto Elia

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

  Server: rpm5.org Name:   Pinto Elia
  Root:   /v/rpm/cvs   Email:  devzero2...@rpm5.org
  Module: popt Date:   05-Sep-2011 13:26:40
  Branch: HEAD Handle: 2011090511263900

  Modified files:
poptCHANGES popthelp.c system.h test1.c

  Log:
merge commit 8396019 from git pull request
https://github.com/devzero2000/POPT/pull/2
Work around missing format for long long in windows; fix warnings
by asenm (Matt Arsenault)

  Summary:
RevisionChanges Path
1.167   +4  -0  popt/CHANGES
1.104   +1  -1  popt/popthelp.c
1.24+22 -11 popt/system.h
1.53+2  -2  popt/test1.c
  

  patch -p0 '@@ .'
  Index: popt/CHANGES
  
  $ cvs diff -u -r1.166 -r1.167 CHANGES
  --- popt/CHANGES  5 Sep 2011 11:20:27 -   1.166
  +++ popt/CHANGES  5 Sep 2011 11:26:39 -   1.167
  @@ -1,4 +1,8 @@
   1.17 - 2.0:
  +- devzero2000: merge commit 8396019 from git pull request  
  +  https://github.com/devzero2000/POPT/pull/2 
  +  Work around missing format for long long in windows; fix warnings
  +  by asenm (Matt Arsenault)
   - devzero2000: merge  commit ea2978d from git pull request 
 https://github.com/devzero2000/POPT/pull/2 
 Fix build with MinGW 32/64 + MSVC by arsenm
  @@ .
  patch -p0 '@@ .'
  Index: popt/popthelp.c
  
  $ cvs diff -u -r1.103 -r1.104 popthelp.c
  --- popt/popthelp.c   16 Jun 2011 15:26:43 -  1.103
  +++ popt/popthelp.c   5 Sep 2011 11:26:39 -   1.104
  @@ -265,7 +265,7 @@
le += sprintf(le, %ld, arg.longp[0]);
break;
   case POPT_ARG_LONGLONG:
  - le += sprintf(le, %lld, arg.longlongp[0]);
  + le += sprintf(le, % LONG_LONG_FORMAT, arg.longlongp[0]);
break;
   case POPT_ARG_FLOAT:
   {double aDouble = (double) arg.floatp[0];
  @@ .
  patch -p0 '@@ .'
  Index: popt/system.h
  
  $ cvs diff -u -r1.23 -r1.24 system.h
  --- popt/system.h 5 Sep 2011 11:20:27 -   1.23
  +++ popt/system.h 5 Sep 2011 11:26:39 -   1.24
  @@ -7,7 +7,6 @@
   #endif
   
   
  -
   #if defined (__GLIBC__)  defined(__LCLINT__)
   /*@-declundef@*/
   /*@unchecked@*/
  @@ -54,10 +53,18 @@
   #include unistd.h
   #endif
   
  +
  +#if !defined(__GNUC__)  !defined(__attribute__)
  +#define __attribute__(x)
  +#endif
  +#define UNUSED(x) x __attribute__((__unused__))
  +
  +
   #ifdef _MSC_VER
   #  define inline __inline
   #endif
   
  +
   #if defined(_MSC_VER) || defined(__MINGW32__)
   #define _CRT_SECURE_NO_WARNINGS 1
   #include io.h
  @@ -73,6 +80,10 @@
   #define S_ISGID 0002
   #define S_ISVTX 0001
   
  +/* I haven't discovered a better way to work around these format
  +   specifier problems */
  +#define LONG_LONG_FORMAT I64d
  +
   
   /* CHECKME */
   #define S_IWGRP 0020
  @@ -112,17 +123,22 @@
   #define lseek _lseek
   
   /* Pretend to be root to replace these */
  -static inline int setuid(int x) { return 1; }
  +static inline int setuid(UNUSED(int x)) { return 1; }
   
   static inline int getuid(void) { return 0; }
   
  -static inline int seteuid(int x) { return 1; }
  +static inline int seteuid(UNUSED(int x)) { return 1; }
   static inline int geteuid(void) { return 0; }
   
  -static inline int setgid(int x) { return 1; }
  +static inline int setgid(UNUSED(int x)) { return 1; }
   static inline int getgid(void) { return 0; }
   
  -static inline int setegid(int x) { return 1; }
  +static inline int setegid(UNUSED(int x)) { return 1; }
  +
  +
  +#else
  +
  +#define LONG_LONG_FORMAT lld
   
   #endif /* defined(_MSC_VER) || defined(__MINGW32__) */
   
  @@ -186,12 +202,7 @@
   #define  getenv(_s)  __secure_getenv(_s)
   #endif
   
  -#if !defined(__GNUC__)  !defined(__attribute__)
  -#define __attribute__(x)
  -#endif
  -#define UNUSED(x) x __attribute__((__unused__))
  -
   /* Include configmake.h autogenerated from Makefile.am */
  -
   #include configmake.h
   #include popt.h
  +
  @@ .
  patch -p0 '@@ .'
  Index: popt/test1.c
  
  $ cvs diff -u -r1.52 -r1.53 test1.c
  --- popt/test1.c  5 Sep 2011 11:20:27 -   1.52
  +++ popt/test1.c  5 Sep 2011 11:26:39 -   1.53
  @@ -91,7 +91,7 @@
   123456789+123456789+123456789+123456789+123456789+ 
   123456789+123456789+123456789+123456789+123456789+ ;
   /*@unchecked@*/ /*@null@*/

[CVS] RPM: popt/ CHANGES Makefile.am Makefile.mingw config.h.mingw

2011-09-05 Thread Pinto Elia

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

  Server: rpm5.org Name:   Pinto Elia
  Root:   /v/rpm/cvs   Email:  devzero2...@rpm5.org
  Module: popt Date:   05-Sep-2011 13:35:53
  Branch: HEAD Handle: 2011090511355300

  Added files:
poptMakefile.mingw config.h.mingw
  Modified files:
poptCHANGES Makefile.am

  Log:
merge commit aee9f24 from git pull request
https://github.com/devzero2000/POPT/pull/2
Add makefile for mingw
by asenm (Matt Arsenault). Include these new object
in EXTRA_DIST (Makefile.am) by devzero2000 (Elia Pinto)

  Summary:
RevisionChanges Path
1.168   +5  -0  popt/CHANGES
1.80+3  -1  popt/Makefile.am
1.1 +91 -0  popt/Makefile.mingw
1.1 +151 -0 popt/config.h.mingw
  

  patch -p0 '@@ .'
  Index: popt/CHANGES
  
  $ cvs diff -u -r1.167 -r1.168 CHANGES
  --- popt/CHANGES  5 Sep 2011 11:26:39 -   1.167
  +++ popt/CHANGES  5 Sep 2011 11:35:53 -   1.168
  @@ -1,4 +1,9 @@
   1.17 - 2.0:
  +- devzero2000: merge commit aee9f24 from git pull request  
  +  https://github.com/devzero2000/POPT/pull/2 
  +  Add makefile for mingw 
  +  by asenm (Matt Arsenault). Include these new object 
  +  in EXTRA_DIST (Makefile.am) by devzero2000 (Elia Pinto)
   - devzero2000: merge commit 8396019 from git pull request  
 https://github.com/devzero2000/POPT/pull/2 
 Work around missing format for long long in windows; fix warnings
  @@ .
  patch -p0 '@@ .'
  Index: popt/Makefile.am
  
  $ cvs diff -u -r1.79 -r1.80 Makefile.am
  --- popt/Makefile.am  16 Jun 2011 13:53:42 -  1.79
  +++ popt/Makefile.am  5 Sep 2011 11:35:53 -   1.80
  @@ -78,7 +78,9 @@
test3-data/02.answer \
test3-data/02.input \
test3-data/03.answer \
  - test3-data/03.input
  + test3-data/03.input \
  +Makefile.mingw \
  +config.h.mingw
   
   SUBDIRS = po . auto
   
  @@ .
  patch -p0 '@@ .'
  Index: popt/Makefile.mingw
  
  $ cvs diff -u -r0 -r1.1 Makefile.mingw
  --- /dev/null 2011-09-05 13:34:14.0 +0200
  +++ Makefile.mingw2011-09-05 13:35:53.542373390 +0200
  @@ -0,0 +1,91 @@
  +# Makefile for building Popt with MinGW (gcc and gnumake)
  +
  +POPT_PREFIX ?= C:\popt
  +POPT_SRC_DIR ?= .
  +
  +OPT_FLAGS = -Os -DNDEBUG 
  +WARNINGS = -Wall -Wextra
  +INCLUDE_DIRS = -I$(POPT_SRC_DIR)
  +DEFINITIONS = -DHAVE_CONFIG_H
  +CFLAGS = $(OPT_FLAGS) $(WARNINGS) $(INCLUDE_DIRS) $(DEFINITIONS)
  +CXXFLAGS = $(CFLAGS)
  +CC = gcc
  +CXX = g++
  +RM = del
  +MKDIR = mkdir
  +CP = copy
  +
  +
  +CONFIG_HEADER = config.h
  +CONFIG_MINGW_HEADER_NAME = config.h.mingw
  +
  +#CONFIGMAKE_HEADER = configmake.h
  +#CONFIGMAKE_MINGW_HEADER_NAME = configmake.h.mingw
  +
  +POPT_SRC = $(POPT_SRC_DIR)/lookup3.c \
  +  $(POPT_SRC_DIR)/poptconfig.c \
  +  $(POPT_SRC_DIR)/popthelp.c \
  +  $(POPT_SRC_DIR)/poptint.c \
  +  $(POPT_SRC_DIR)/poptparse.c \
  +  $(POPT_SRC_DIR)/popt.c
  +
  +POPT_HEADERS = $(POPT_SRC_DIR)/config.h \
  +  $(POPT_SRC_DIR)/configmake.h \
  +  $(POPT_SRC_DIR)/popt.h \
  +  $(POPT_SRC_DIR)/poptint.h \
  +  $(POPT_SRC_DIR)/system.h
  +
  +POPT_PUBLIC_HEADERS ?= $(POPT_SRC_DIR)\popt.h 
  +
  +LIB_OBJ = lookup3.o poptconfig.o popthelp.o poptint.o poptparse.o popt.o
  +
  +LIB_BIN = libpopt.a
  +TEST_BINS = tdict.exe test1.exe test2.exe
  +OBJ = $(LIB_OBJ) $(TEST_OBJ)
  +BIN = $(LIB_BIN) $(TEST_BINS)
  +
  +
  +
  +all: $(BIN) $(TEST_BINS)
  +
  +$(CONFIG_HEADER): 
  +   $(CP) $(CONFIG_MINGW_HEADER_NAME) $(CONFIG_HEADER)
  +   $(CP) $(CONFIGMAKE_MINGW_HEADER_NAME) $(CONFIGMAKE_HEADER)
  +
  +%.o: $(POPT_SRC_DIR)/%.c $(CONFIG_HEADER)
  + $(CC) -c $ -o $@ $(CPPFLAGS) $(CFLAGS)
  +
  +$(LIB_BIN): $(LIB_OBJ)
  + $(AR) rc $@ $^
  +
  +tdict.exe: tdict.c $(LIB_BIN)
  + $(CC) -o $@ $(CPPFLAGS) $(CFLAGS) $ $(LIB_BIN)
  +
  +test1.exe: test1.c $(LIB_BIN)
  + $(CC) -o $@ $(CPPFLAGS) $(CFLAGS) $ $(LIB_BIN) 
  +
  +test2.exe: test2.c $(LIB_BIN)
  + $(CC) -o $@ $(CPPFLAGS) $(CFLAGS) $ $(LIB_BIN) 
  +
  +
  +RANLIB ?= ranlib
  +
  +tests: $(TEST_BINS)
  +
  +
  +install: $(LIB_BIN) $(POPT_PUBLIC_HEADERS)
  +  $(MKDIR) $(POPT_PREFIX)\include
  +

[CVS] RPM: popt/ CHANGES popt.c system.h

2011-09-05 Thread Pinto Elia

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

  Server: rpm5.org Name:   Pinto Elia
  Root:   /v/rpm/cvs   Email:  devzero2...@rpm5.org
  Module: popt Date:   05-Sep-2011 13:46:28
  Branch: HEAD Handle: 2011090511462800

  Modified files:
poptCHANGES popt.c system.h

  Log:
devzero2000: merge commit fc8836e from git pull request
https://github.com/devzero2000/POPT/pull/2
Fix more MSVC build warnings
by asenm (Matt Arsenault). This is the last commit
of this patch series and pull request.

  Summary:
RevisionChanges Path
1.169   +5  -0  popt/CHANGES
1.160   +1  -0  popt/popt.c
1.25+11 -2  popt/system.h
  

  patch -p0 '@@ .'
  Index: popt/CHANGES
  
  $ cvs diff -u -r1.168 -r1.169 CHANGES
  --- popt/CHANGES  5 Sep 2011 11:35:53 -   1.168
  +++ popt/CHANGES  5 Sep 2011 11:46:28 -   1.169
  @@ -1,4 +1,9 @@
   1.17 - 2.0:
  +- devzero2000: merge commit fc8836e from git pull request  
  +  https://github.com/devzero2000/POPT/pull/2 
  +  Fix more MSVC build warnings
  +  by asenm (Matt Arsenault). This is the last commit
  +  of this patch series and pull request.
   - devzero2000: merge commit aee9f24 from git pull request  
 https://github.com/devzero2000/POPT/pull/2 
 Add makefile for mingw 
  @@ .
  patch -p0 '@@ .'
  Index: popt/popt.c
  
  $ cvs diff -u -r1.159 -r1.160 popt.c
  --- popt/popt.c   16 Jun 2011 15:26:43 -  1.159
  +++ popt/popt.c   5 Sep 2011 11:46:28 -   1.160
  @@ -31,6 +31,7 @@
   #define  assert(_x)
   #endif
   
  +
   #ifdef   MYDEBUG
   /*@unchecked@*/
   int _popt_debug = 0;
  @@ .
  patch -p0 '@@ .'
  Index: popt/system.h
  
  $ cvs diff -u -r1.24 -r1.25 system.h
  --- popt/system.h 5 Sep 2011 11:26:39 -   1.24
  +++ popt/system.h 5 Sep 2011 11:46:28 -   1.25
  @@ -3,7 +3,15 @@
*/
   
   #ifdef HAVE_CONFIG_H
  -#include config.h
  +# ifndef _MSC_VER
  +#  include config.h
  +# else
  +#  include config_msvc.h
  +# endif /* _MSC_VER */
  +#endif /* HAVE_CONFIG_H */
  +
  +#if defined(_MSC_VER) || defined(__MINGW32__)
  +# define _CRT_SECURE_NO_WARNINGS 1
   #endif
   
   
  @@ -66,9 +74,9 @@
   
   
   #if defined(_MSC_VER) || defined(__MINGW32__)
  -#define _CRT_SECURE_NO_WARNINGS 1
   #include io.h
   #include malloc.h
  +#include process.h
   #define F_OK 0
   #define R_OK 4
   #define W_OK 2
  @@ -121,6 +129,7 @@
   #define open _open
   #define close _close
   #define lseek _lseek
  +#define execvp _execvp
   
   /* Pretend to be root to replace these */
   static inline int setuid(UNUSED(int x)) { return 1; }
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: popt/ CHANGES popthelp.c test1.c

2011-09-05 Thread Pinto Elia

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

  Server: rpm5.org Name:   Pinto Elia
  Root:   /v/rpm/cvs   Email:  devzero2...@rpm5.org
  Module: popt Date:   05-Sep-2011 14:14:31
  Branch: HEAD Handle: 2011090512143000

  Modified files:
poptCHANGES popthelp.c test1.c

  Log:
redo commit 8396019
Useless to have format crap just for conforming
to oddball platform
(http://rpm5.org/community/rpm-devel/5166.html).
Keep the patch only inside MinGW.

  Summary:
RevisionChanges Path
1.170   +5  -0  popt/CHANGES
1.105   +4  -0  popt/popthelp.c
1.54+4  -0  popt/test1.c
  

  patch -p0 '@@ .'
  Index: popt/CHANGES
  
  $ cvs diff -u -r1.169 -r1.170 CHANGES
  --- popt/CHANGES  5 Sep 2011 11:46:28 -   1.169
  +++ popt/CHANGES  5 Sep 2011 12:14:30 -   1.170
  @@ -1,4 +1,9 @@
   1.17 - 2.0:
  +- devzero2000: redo commit 8396019 
  +  Useless to have format crap just for conforming
  +  to oddball platform 
  +  (http://rpm5.org/community/rpm-devel/5166.html).
  +  Keep the patch only inside MinGW.
   - devzero2000: merge commit fc8836e from git pull request  
 https://github.com/devzero2000/POPT/pull/2 
 Fix more MSVC build warnings
  @@ .
  patch -p0 '@@ .'
  Index: popt/popthelp.c
  
  $ cvs diff -u -r1.104 -r1.105 popthelp.c
  --- popt/popthelp.c   5 Sep 2011 11:26:39 -   1.104
  +++ popt/popthelp.c   5 Sep 2011 12:14:30 -   1.105
  @@ -265,7 +265,11 @@
le += sprintf(le, %ld, arg.longp[0]);
break;
   case POPT_ARG_LONGLONG:
  +#if defined(_MSC_VER) || defined(__MINGW32__)
le += sprintf(le, % LONG_LONG_FORMAT, arg.longlongp[0]);
  +#else 
  +le += sprintf(le, %lld, arg.longlongp[0]);
  +#endif
break;
   case POPT_ARG_FLOAT:
   {double aDouble = (double) arg.floatp[0];
  @@ .
  patch -p0 '@@ .'
  Index: popt/test1.c
  
  $ cvs diff -u -r1.53 -r1.54 test1.c
  --- popt/test1.c  5 Sep 2011 11:26:39 -   1.53
  +++ popt/test1.c  5 Sep 2011 12:14:30 -   1.54
  @@ -334,7 +334,11 @@
   if (aLong != bLong)
fprintf(stdout,  aLong: %ld, aLong);
   if (aLongLong != bLongLong)
  +#if defined(_MSC_VER) || defined(__MINGW32__)
fprintf(stdout,  aLongLong: % LONG_LONG_FORMAT, aLongLong);
  +#else
  +fprintf(stdout,  aLongLong: %lld, aLongLong);
  +#endif
   /*@-realcompare@*/
   if (aFloat != bFloat)
fprintf(stdout,  aFloat: %g, (double)aFloat);
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

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

2011-09-05 Thread Jeff Johnson

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

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   05-Sep-2011 14:20:25
  Branch: HEAD Handle: 2011090512202500

  Modified files:
rpm CHANGES
rpm/rpmdb   hdrfmt.c

  Log:
- fix: ensure that integer CDATA is initialized to  when missing.

  Summary:
RevisionChanges Path
1.3669  +1  -0  rpm/CHANGES
1.169   +1  -0  rpm/rpmdb/hdrfmt.c
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3668 -r1.3669 CHANGES
  --- rpm/CHANGES   15 Aug 2011 20:32:41 -  1.3668
  +++ rpm/CHANGES   5 Sep 2011 12:20:25 -   1.3669
  @@ -1,4 +1,5 @@
   HEAD:
  +- jbj: fix: ensure that integer CDATA is initialized to  when missing.
   - jbj: fix: subdir is needed to find loader maps.
   - jbj: include Pascal's pom2spec java - *.rpm wrapper from
https://gitorious.org/pbleser/pbleser/blobs/raw/master/pom2spec)
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmdb/hdrfmt.c
  
  $ cvs diff -u -r1.168 -r1.169 hdrfmt.c
  --- rpm/rpmdb/hdrfmt.c27 May 2011 06:57:18 -  1.168
  +++ rpm/rpmdb/hdrfmt.c5 Sep 2011 12:20:25 -   1.169
  @@ -1092,6 +1092,7 @@
char * t = xmalloc(tlen+1);
int xx;
   
  + *t = '\0';
if (anint != 0) /* XXX empty XML tag sets 0 as default? */
xx = snprintf(t, tlen, %llu, (unsigned long long)anint);
s = t;
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/rpmdb/ hdrfmt.c

2011-09-05 Thread Jeff Johnson

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

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   05-Sep-2011 14:21:11
  Branch: rpm-5_4  Handle: 2011090512211000

  Modified files:   (Branch: rpm-5_4)
rpm CHANGES
rpm/rpmdb   hdrfmt.c

  Log:
- fix: ensure that integer CDATA is initialized to  when missing.

  Summary:
RevisionChanges Path
1.3501.2.154+1  -0  rpm/CHANGES
1.151.2.6   +1  -0  rpm/rpmdb/hdrfmt.c
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3501.2.153 -r1.3501.2.154 CHANGES
  --- rpm/CHANGES   15 Aug 2011 20:33:14 -  1.3501.2.153
  +++ rpm/CHANGES   5 Sep 2011 12:21:10 -   1.3501.2.154
  @@ -1,4 +1,5 @@
   5.4.1 - 5.4.2
  +- jbj: fix: ensure that integer CDATA is initialized to  when missing.
   - jbj: fix: subdir is needed to find loader maps.
   - jbj: include Pascal's pom2spec java - *.rpm wrapper from
https://gitorious.org/pbleser/pbleser/blobs/raw/master/pom2spec)
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmdb/hdrfmt.c
  
  $ cvs diff -u -r1.151.2.5 -r1.151.2.6 hdrfmt.c
  --- rpm/rpmdb/hdrfmt.c20 Apr 2011 06:10:57 -  1.151.2.5
  +++ rpm/rpmdb/hdrfmt.c5 Sep 2011 12:21:10 -   1.151.2.6
  @@ -1061,6 +1061,7 @@
char * t = xmalloc(tlen+1);
int xx;
   
  + *t = '\0';
if (anint != 0) /* XXX empty XML tag sets 0 as default? */
xx = snprintf(t, tlen, %llu, (unsigned long long)anint);
s = t;
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/ debug.h

2011-09-05 Thread Jeff Johnson

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

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   05-Sep-2011 14:37:00
  Branch: rpm-5_4  Handle: 2011090512365900

  Modified files:   (Branch: rpm-5_4)
rpm debug.h

  Log:
- jbj: valgrind: add a cast.

  Summary:
RevisionChanges Path
2.7.4.5 +1  -1  rpm/debug.h
  

  patch -p0 '@@ .'
  Index: rpm/debug.h
  
  $ cvs diff -u -r2.7.4.4 -r2.7.4.5 debug.h
  --- rpm/debug.h   30 Aug 2011 12:12:05 -  2.7.4.4
  +++ rpm/debug.h   5 Sep 2011 12:36:59 -   2.7.4.5
  @@ -68,7 +68,7 @@
   static inline char * DRD_xstrdup(const char * s)
   {
   size_t nb = strlen(s) + 1;
  -char * t = DRD_xmalloc(nb);
  +char * t = (char *) DRD_xmalloc(nb);
   return strcpy(t, s);
   }
   
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/tools/ .cvsignore

2011-09-05 Thread Jeff Johnson

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

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   05-Sep-2011 14:43:10
  Branch: rpm-5_4  Handle: 2011090512431000

  Modified files:   (Branch: rpm-5_4)
rpm/tools   .cvsignore

  Log:
- ignore dbconvert/roto.

  Summary:
RevisionChanges Path
1.50.2.1+2  -0  rpm/tools/.cvsignore
  

  patch -p0 '@@ .'
  Index: rpm/tools/.cvsignore
  
  $ cvs diff -u -r1.50 -r1.50.2.1 .cvsignore
  --- rpm/tools/.cvsignore  10 Apr 2010 18:14:53 -  1.50
  +++ rpm/tools/.cvsignore  5 Sep 2011 12:43:10 -   1.50.2.1
  @@ -10,6 +10,7 @@
   convertdb1
   cp
   cudftool
  +dbconvert
   db_sql_codegen
   db_tool
   dbsql
  @@ -31,6 +32,7 @@
   nix-push
   nix-store
   nix-worker
  +roto
   rpm2cpio
   rpmcache
   rpmcmp
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

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

2011-09-05 Thread Jeff Johnson

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

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   05-Sep-2011 14:45:30
  Branch: rpm-5_4  Handle: 2011090512452900

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

  Log:
- tests: make check-convert opt-in: no need to always test.

  Summary:
RevisionChanges Path
1.95.2.23   +1  -1  rpm/tests/Makefile.am
  

  patch -p0 '@@ .'
  Index: rpm/tests/Makefile.am
  
  $ cvs diff -u -r1.95.2.22 -r1.95.2.23 Makefile.am
  --- rpm/tests/Makefile.am 2 Jun 2011 17:41:42 -   1.95.2.22
  +++ rpm/tests/Makefile.am 5 Sep 2011 12:45:29 -   1.95.2.23
  @@ -920,7 +920,7 @@
   test:check-init check-pubkeys check-markup check-macros \
check-build check-sign check-ACID check-install \
check-query check-verify check-rpmv3\
  - check-triggers check-convert # check-tools # check-repo
  + check-triggers # check-convert # check-tools # check-repo
   
   check-local: check-init
   
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

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

2011-09-05 Thread Jeff Johnson

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

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   05-Sep-2011 14:49:11
  Branch: rpm-5_4  Handle: 2011090512491100

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

  Log:
- mongo: use the harwich.jbj.org 64bit instance.

  Summary:
RevisionChanges Path
1.5.2.4 +1  -1  rpm/tests/mongo/Makefile.am
  

  patch -p0 '@@ .'
  Index: rpm/tests/mongo/Makefile.am
  
  $ cvs diff -u -r1.5.2.3 -r1.5.2.4 Makefile.am
  --- rpm/tests/mongo/Makefile.am   9 May 2011 04:06:34 -   1.5.2.3
  +++ rpm/tests/mongo/Makefile.am   5 Sep 2011 12:49:11 -   1.5.2.4
  @@ -41,7 +41,7 @@
   #$(RPMDB_LDADD)
   
   mongo =  @__MONGO@
  -mongoserver =192.168.0.75# 198.178.231.189 # XXX 
mongo.rpm5.org
  +mongoserver =198.49.244.159  # XXX mongo.rpm5.org?
   
   all_types_SOURCES =  test.h all_types.c
   all_types_LDADD =$(RPMIO_LDADD)
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/scripts/ mgo

2011-09-05 Thread Jeff Johnson

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

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   05-Sep-2011 14:53:19
  Branch: rpm-5_4  Handle: 2011090512531900

  Modified files:   (Branch: rpm-5_4)
rpm/scripts mgo

  Log:
- mongo: use harwich.jbj.org instead.

  Summary:
RevisionChanges Path
1.1.2.2 +1  -1  rpm/scripts/mgo
  

  patch -p0 '@@ .'
  Index: rpm/scripts/mgo
  
  $ cvs diff -u -r1.1.2.1 -r1.1.2.2 mgo
  --- rpm/scripts/mgo   8 Apr 2011 16:13:15 -   1.1.2.1
  +++ rpm/scripts/mgo   5 Sep 2011 12:53:19 -   1.1.2.2
  @@ -35,7 +35,7 @@
   ;;
   harwich|hw)
   # --- CentOS5/x86_64. @pmmman.com hosted VM. mongo-1.6.x.
  -H=harwich.rpm5.org
  +H=harwich.jbj.org
   ;;
   wareham|wh)
   # --- Cooker/i586 (w 2Gb limit). IPv6 only. mongo-1.6.x.
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/tests/ref/ hkp manifest showrc version

2011-09-05 Thread Jeff Johnson

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

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   05-Sep-2011 14:56:08
  Branch: rpm-5_4  Handle: 2011090512560800

  Modified files:   (Branch: rpm-5_4)
rpm/tests/ref   hkp manifest showrc version

  Log:
- tests: sanity.

  Summary:
RevisionChanges Path
1.4.2.1 +12 -1  rpm/tests/ref/hkp
1.17.2.2+8  -8  rpm/tests/ref/manifest
1.37.2.2+81 -121rpm/tests/ref/showrc
1.5.2.2 +2  -2  rpm/tests/ref/version
  

  patch -p0 '@@ .'
  Index: rpm/tests/ref/hkp
  
  $ cvs diff -u -r1.4 -r1.4.2.1 hkp
  --- rpm/tests/ref/hkp 27 Sep 2010 21:52:09 -  1.4
  +++ rpm/tests/ref/hkp 5 Sep 2011 12:56:08 -   1.4.2.1
  @@ -4,7 +4,7 @@
   NOKEY0xa520e8f1cba29bf9
   OK   0x9AC53D4D
   BAD  0x7AD0BECB
  -BAD  0x7C611479
  +OK   0x7C611479
   OK   0x1CFC22F3363DEAE3
   OK   0xb873641b2039b291
   OK   Jeff Johnson (ARS N3NPQ) j...@redhat.com
  @@ -28,10 +28,21 @@
   OK   Fedora (11) fed...@fedoraproject.org
   OK   0x57bbccba
   OK   0xe8e40fde
  +OK   0xfdb36b03
  +OK   0x97a1071f
  +OK   0x069c8460
  +OK   0x0608b895
  +OK   0x217521f6
   OK   0x1edca302
   OK   0xe8562897
   OK   0x70771FF3
   OK   0x22458A98
  +OK   0x37017186
  +OK   0x78D019F5
  +OK   0x437D05B5
  +OK   0xFBB75451
  +OK   0x55BE302B
  +OK   0x473041FA
   OK   0xC45A42F1
   OK   0x6B8D79E6
   OK   0x1AA78495
  @@ .
  patch -p0 '@@ .'
  Index: rpm/tests/ref/manifest
  
  $ cvs diff -u -r1.17.2.1 -r1.17.2.2 manifest
  --- rpm/tests/ref/manifest27 Dec 2010 16:52:15 -  1.17.2.1
  +++ rpm/tests/ref/manifest5 Sep 2011 12:56:08 -   1.17.2.2
  @@ -39,20 +39,20 @@
   edos-test/window-2-0.noarch.rpm
   order-test/orderA-1.2-0.1.noarch.rpm
   order-test/orderB-1.2-0.1.noarch.rpm
  -popt/popt-1.14-1.i686.rpm
  +popt/popt-1.14-1.x86_64.rpm
   probes-test/probes-1-0.noarch.rpm
   probes-test/probes-2-0.noarch.rpm
   triggers-DP/triggers-DP-a-1.0-1.noarch.rpm
  -triggers-DP/triggers-DP-b-1.0-1.i686.rpm
  +triggers-DP/triggers-DP-b-1.0-1.x86_64.rpm
   triggers-D/triggers-D-a-1.0-1.noarch.rpm
  -triggers-D/triggers-D-b-1.0-1.i686.rpm
  +triggers-D/triggers-D-b-1.0-1.x86_64.rpm
   triggers-FP/triggers-FP-a-1.0-1.noarch.rpm
  -triggers-FP/triggers-FP-b-1.0-1.i686.rpm
  +triggers-FP/triggers-FP-b-1.0-1.x86_64.rpm
   triggers-F/triggers-F-a-1.0-1.noarch.rpm
  -triggers-F/triggers-F-b-1.0-1.i686.rpm
  +triggers-F/triggers-F-b-1.0-1.x86_64.rpm
   triggers-NA/triggers-NA-a-1.0-1.noarch.rpm
  -triggers-NA/triggers-NA-b-1.0-1.i686.rpm
  +triggers-NA/triggers-NA-b-1.0-1.x86_64.rpm
   triggers-N/triggers-N-a-1.0-1.noarch.rpm
  -triggers-N/triggers-N-b-1.0-1.i686.rpm
  +triggers-N/triggers-N-b-1.0-1.x86_64.rpm
   triggers-P/triggers-P-a-1.0-1.noarch.rpm
  -triggers-P/triggers-P-b-1.0-1.i686.rpm
  +triggers-P/triggers-P-b-1.0-1.x86_64.rpm
  @@ .
  patch -p0 '@@ .'
  Index: rpm/tests/ref/showrc
  
  $ cvs diff -u -r1.37.2.1 -r1.37.2.2 showrc
  --- rpm/tests/ref/showrc  27 Dec 2010 16:52:15 -  1.37.2.1
  +++ rpm/tests/ref/showrc  5 Sep 2011 12:56:08 -   1.37.2.2
  @@ -1,16 +1,16 @@
   ARCHITECTURE AND OS:
  -build arch: i686
  -compatible build archs: i686
  +build arch: x86_64
  +compatible build archs: x86_64
   build os  : Linux
   compatible build os's : linux
  -install arch  : i686
  +install arch  : x86_64
   install os: Linux
  -compatible archs  : i686-redhat-linux
  -compatible os's   : linux
  +compatible archs  :
  +compatible os's   : Linux
   optflags  : -O2
   
   LUA MODULES:
  -luafiles  : 
/usr/lib/rpm/init.lua:/usr/lib/rpm/rpmlua:/usr/lib/rpm/i686-linux/rpmlua:/etc/rpm/rpmlua.*:/etc/rpm/rpmlua:/etc/rpm/i686-linux/rpmlua:~/.rpmlua
  +luafiles  : 
/usr/lib/rpm/init.lua:/usr/lib/rpm/rpmlua:/usr/lib/rpm/x86_64-linux/rpmlua:/etc/rpm/rpmlua.*:/etc/rpm/rpmlua:/etc/rpm/x86_64-linux/rpmlua:~/.rpmlua
   luapath   : /usr/lib/rpm/lua/?.lua
   
   MACRO DEFINITIONS:
  @@ -38,37 +38,75 @@
   
   Features provided by current cpuinfo (from /proc/cpuinfo):
   cpuinfo(acpi)
  +cpuinfo(aperfmperf)

[CVS] RPM: popt/ popthelp.c system.h test1.c

2011-09-05 Thread Pinto Elia

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

  Server: rpm5.org Name:   Pinto Elia
  Root:   /v/rpm/cvs   Email:  devzero2...@rpm5.org
  Module: popt Date:   05-Sep-2011 15:20:54
  Branch: HEAD Handle: 2011090513205400

  Modified files:
poptpopthelp.c system.h test1.c

  Log:
redo commit 8396019 again
get rid of LONG_LONG format specifier and inline
it instead

  Summary:
RevisionChanges Path
1.106   +1  -1  popt/popthelp.c
1.26+0  -5  popt/system.h
1.55+1  -1  popt/test1.c
  

  patch -p0 '@@ .'
  Index: popt/popthelp.c
  
  $ cvs diff -u -r1.105 -r1.106 popthelp.c
  --- popt/popthelp.c   5 Sep 2011 12:14:30 -   1.105
  +++ popt/popthelp.c   5 Sep 2011 13:20:54 -   1.106
  @@ -266,7 +266,7 @@
break;
   case POPT_ARG_LONGLONG:
   #if defined(_MSC_VER) || defined(__MINGW32__)
  - le += sprintf(le, % LONG_LONG_FORMAT, arg.longlongp[0]);
  + le += sprintf(le, %I64d, arg.longlongp[0]);
   #else 
   le += sprintf(le, %lld, arg.longlongp[0]);
   #endif
  @@ .
  patch -p0 '@@ .'
  Index: popt/system.h
  
  $ cvs diff -u -r1.25 -r1.26 system.h
  --- popt/system.h 5 Sep 2011 11:46:28 -   1.25
  +++ popt/system.h 5 Sep 2011 13:20:54 -   1.26
  @@ -88,10 +88,6 @@
   #define S_ISGID 0002
   #define S_ISVTX 0001
   
  -/* I haven't discovered a better way to work around these format
  -   specifier problems */
  -#define LONG_LONG_FORMAT I64d
  -
   
   /* CHECKME */
   #define S_IWGRP 0020
  @@ -147,7 +143,6 @@
   
   #else
   
  -#define LONG_LONG_FORMAT lld
   
   #endif /* defined(_MSC_VER) || defined(__MINGW32__) */
   
  @@ .
  patch -p0 '@@ .'
  Index: popt/test1.c
  
  $ cvs diff -u -r1.54 -r1.55 test1.c
  --- popt/test1.c  5 Sep 2011 12:14:30 -   1.54
  +++ popt/test1.c  5 Sep 2011 13:20:54 -   1.55
  @@ -335,7 +335,7 @@
fprintf(stdout,  aLong: %ld, aLong);
   if (aLongLong != bLongLong)
   #if defined(_MSC_VER) || defined(__MINGW32__)
  - fprintf(stdout,  aLongLong: % LONG_LONG_FORMAT, aLongLong);
  + fprintf(stdout,  aLongLong: %I64d, aLongLong);
   #else
   fprintf(stdout,  aLongLong: %lld, aLongLong);
   #endif
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

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

2011-09-05 Thread Jeff Johnson

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

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   05-Sep-2011 15:46:42
  Branch: rpm-5_4  Handle: 2011090513464200

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

  Log:
- orphan.

  Summary:
RevisionChanges Path
1.75.2.11   +1  -1  rpm/scripts/Makefile.am
  

  patch -p0 '@@ .'
  Index: rpm/scripts/Makefile.am
  
  $ cvs diff -u -r1.75.2.10 -r1.75.2.11 Makefile.am
  --- rpm/scripts/Makefile.am   15 Aug 2011 20:29:47 -  1.75.2.10
  +++ rpm/scripts/Makefile.am   5 Sep 2011 13:46:42 -   1.75.2.11
  @@ -24,7 +24,7 @@
gstreamer.sh javadeps.sh libtooldeps.sh mgo \
mono-find-provides mono-find-requires \
check-multiarch-files multiarch-platform multiarch-dispatch \
  - multiarch-dispatch.h mkmultiarch \
  + multiarch-dispatch.h mkmultiarch gem_helper.rb \
nix_meta \
osgideps.pl pkgconfigdeps.sh \
perldeps.pl perl.prov perl.req pythondeps.sh pythoneggs.py \
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac

2011-09-05 Thread Jeff Johnson

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

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   05-Sep-2011 15:47:47
  Branch: rpm-5_4  Handle: 2011090513474601

  Modified files:   (Branch: rpm-5_4)
rpm CHANGES configure.ac

  Log:
- start 5.4.3 development.

  Summary:
RevisionChanges Path
1.3501.2.156+4  -1  rpm/CHANGES
2.472.2.26  +2  -2  rpm/configure.ac
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3501.2.155 -r1.3501.2.156 CHANGES
  --- rpm/CHANGES   5 Sep 2011 12:35:19 -   1.3501.2.155
  +++ rpm/CHANGES   5 Sep 2011 13:47:46 -   1.3501.2.156
  @@ -1,4 +1,7 @@
  -5.4.1 - 5.4.2
  +5.4.2 - 5.4.3:
  +- jbj: start 5.4.3 development.
  +
  +5.4.1 - 5.4.2:
   - jbj: i18n: update PO files (Translation Project).
   - jbj: fix: ensure that integer CDATA is initialized to  when missing.
   - jbj: fix: subdir is needed to find loader maps.
  @@ .
  patch -p0 '@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.472.2.25 -r2.472.2.26 configure.ac
  --- rpm/configure.ac  28 Jun 2011 12:26:10 -  2.472.2.25
  +++ rpm/configure.ac  5 Sep 2011 13:47:47 -   2.472.2.26
  @@ -8,8 +8,8 @@
   
   AC_PREREQ(2.63)
   m4_define([PACKAGE_BUGREPORT_DEFAULT], [rpm-de...@rpm5.org])
  -AC_INIT([rpm],[5.4.2],[PACKAGE_BUGREPORT_DEFAULT])
  -PACKAGE_TIMESTAMP=2011-06-02 dnl # [-MM[-DD[ HH[:MM
  +AC_INIT([rpm],[5.4.3],[PACKAGE_BUGREPORT_DEFAULT])
  +PACKAGE_TIMESTAMP=2011-09-05 dnl # [-MM[-DD[ HH[:MM
   AC_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION])
   
   AC_MSG_HEADER([INITIALIZATION])
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: neon/test/ .cvsignore Makefile.am Makefile.in neon/test/com...

2011-09-05 Thread Jeff Johnson

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

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: neon Date:   05-Sep-2011 19:44:28
  Branch: HEAD Handle: 2011090517442602

  Added files:
neon/test   Makefile.am
neon/test/common.cvsignore
  Modified files:
neon/test   .cvsignore
  Removed files:
neon/test   Makefile.in

  Log:
- neon: automake for neon tests.

  Summary:
RevisionChanges Path
1.5 +122 -0 neon/test/.cvsignore
1.1 +177 -0 neon/test/Makefile.am
1.9 +0  -232neon/test/Makefile.in
1.3 +4  -0  neon/test/common/.cvsignore
  

  patch -p0 '@@ .'
  Index: neon/test/.cvsignore
  
  $ cvs diff -u -r1.4 -r1.5 .cvsignore
  --- neon/test/.cvsignore  6 May 2010 22:29:04 -   1.4
  +++ neon/test/.cvsignore  5 Sep 2011 17:44:26 -   1.5
  @@ -1,2 +1,124 @@
  +.deps
  +.libs
  +*.la
  +*.lo
   Makefile
  +Makefile.in
   makekeys
  +acl3744
  +altname1.cert
  +altname1.csr
  +altname2.cert
  +altname2.csr
  +altname3.cert
  +altname3.csr
  +altname4.cert
  +altname4.csr
  +altname5.cert
  +altname5.csr
  +altname6.cert
  +altname6.csr
  +altname7.cert
  +altname7.csr
  +altname8.cert
  +altname8.csr
  +altname9.cert
  +altname9.csr
  +auth
  +badcsum.gz
  +basic
  +bmpsubj.cert
  +bmpsubj.csr
  +ca
  +ca-stamp
  +ca1
  +ca1.pem
  +ca1server.cert
  +ca2
  +ca2.csr
  +ca2.pem
  +ca2server.cert
  +ca2server.pem
  +ca3
  +ca3.pem
  +ca3server.cert
  +ca4.pem
  +calist.pem
  +caseless.cert
  +caseless.csr
  +chain.pem
  +child.log
  +client.cert
  +client.csr
  +client.dsap
  +client.key
  +client.p12
  +clientca.p12
  +clientdsa.cert
  +clientdsa.csr
  +clientdsa.key
  +cnfirst.cert
  +cnfirst.csr
  +compress
  +corrupt1.gz
  +corrupt2.gz
  +debug.log
  +dsaclient.p12
  +empty.gz
  +enkclient.p12
  +expired.cert
  +expired.csr
  +file1.gz
  +file2.gz
  +foobar.txt
  +justmail.cert
  +justmail.csr
  +lock
  +makekeys.out
  +missingcn.cert
  +missingcn.csr
  +ncclient.p12
  +nkclient.p12
  +noclient.p12
  +notyet.cert
  +notyet.csr
  +nssdb
  +nssdb-dsa
  +oldacl
  +output.pem
  +props
  +random.txt
  +redirect
  +request
  +resolve
  +server.cert
  +server.csr
  +session
  +socket
  +socket-ssl
  +ssigned.pem
  +ssl
  +string-tests
  +stubs
  +t61subj.cert
  +t61subj.csr
  +trailing.gz
  +truncated.gz
  +twocn.cert
  +twocn.csr
  +twoou.cert
  +twoou.csr
  +unclient.p12
  +uri-tests
  +utf8subj.cert
  +utf8subj.csr
  +util-tests
  +wildcard.cert
  +wildcard.csr
  +wildip.cert
  +wildip.csr
  +wrongcn.cert
  +wrongcn.csr
  +xml
  +xmlreq
  +
  @@ .
  patch -p0 '@@ .'
  Index: neon/test/Makefile.am
  
  $ cvs diff -u -r0 -r1.1 Makefile.am
  --- /dev/null 2011-09-05 19:44:00.0 +0200
  +++ Makefile.am   2011-09-05 19:44:27.608740061 +0200
  @@ -0,0 +1,177 @@
  +# Makefile for neon test suite.
  +
  +SHELL = @SHELL@
  +CPPFLAGS = @CPPFLAGS@ -I. -I$(top_srcdir)/src -I$(top_srcdir)/test/common
  +
  +VPATH = @srcdir@
  +
  +OPENSSL = @OPENSSL@
  +
  +HELPERS = @HELPERS@ foobar.txt
  +
  +BASIC_TESTS = uri-tests util-tests string-tests socket \
  + session request auth basic stubs redirect
  +ZLIB_TESTS = compress
  +ZLIB_HELPERS = file1.gz file2.gz trailing.gz badcsum.gz truncated.gz \
  + corrupt1.gz corrupt2.gz empty.gz random.txt
  +DAV_TESTS = xml xmlreq oldacl acl3744 props lock
  +SSL_TESTS = socket-ssl ssl
  +
  +SSL_HELPERS = ca-stamp
  +
  +TESTS = @TESTS@
  +
  +VALGRIND = valgrind --tool=memcheck --leak-check=yes --trace-children=no 
--show-reachable=yes
  +
  +LIBNEON = $(top_builddir)/src/libneon.la
  +
  +noinst_LTLIBRARIES = libtest.la
  +libtest_la_LIBADD = $(LIBNEON)
  +libtest_la_SOURCES = \
  + common/tests.c \
  + common/child.c \
  + utils.c \
  + util-socks.c
  +
  +#Z LIBTOOL = @LIBTOOL@ --silent
  +#Z TEST_LDFLAGS = @TEST_LDFLAGS@
  +
  +INSTALL_HELPERS = $(HELPERS) server.key makekeys \
  + $(srcdir)/openssl.conf $(srcdir)/notvalid.pem \
  + $(srcdir)/expired.pem
  +
  +# By default, compile but don't run the tests.
  +all: $(TESTS)
  +
  +clean:
  + rm -f $(TESTS) $(HELPERS) *.*o common/*.*o libtest.*a *.log
  + rm -f *.gc* *.da *.bb* common/*.bb* common/*.gc* common/*.da
  + rm -rf ca ca2 .libs nssdb*
  + rm -f ca-stamp client.key *.csr ssigned.pem wrongcn.pem \
  +server.cert client.cert *.p12 *.cert sparse.bin
  +
  +check: $(TESTS) $(HELPERS)
  + @SRCDIR=$(srcdir) $(SHELL) $(srcdir)/run.sh $(TESTS)
  +

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

2011-09-05 Thread Jeff Johnson

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

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   05-Sep-2011 20:11:43
  Branch: rpm-5_4  Handle: 2011090518114201

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

  Log:
- python: disable broken make check.

  Summary:
RevisionChanges Path
1.3501.2.158+1  -0  rpm/CHANGES
1.88.2.3+3  -3  rpm/python/Makefile.am
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3501.2.157 -r1.3501.2.158 CHANGES
  --- rpm/CHANGES   5 Sep 2011 18:09:47 -   1.3501.2.157
  +++ rpm/CHANGES   5 Sep 2011 18:11:42 -   1.3501.2.158
  @@ -1,6 +1,7 @@
   5.4.2 - 5.4.3:
   - jbj: start 5.4.3 development.
   - jbj: neon: upgrade to neon-0.29.6 internal.
  +- jbj: python: disable broken make check.
   
   5.4.1 - 5.4.2:
   - jbj: i18n: update PO files (Translation Project).
  @@ .
  patch -p0 '@@ .'
  Index: rpm/python/Makefile.am
  
  $ cvs diff -u -r1.88.2.2 -r1.88.2.3 Makefile.am
  --- rpm/python/Makefile.am3 Mar 2011 19:34:07 -   1.88.2.2
  +++ rpm/python/Makefile.am5 Sep 2011 18:11:43 -   1.88.2.3
  @@ -63,6 +63,6 @@
$(LINT) $(DEFS) $(INCLUDES) $(splint_srcs)
   
   # FIXME: using .libs/ is not really correct, but whatever
  -check-local:
  - @export PYTHONPATH=$(PYTHONPATH):$(shell pwd):$(shell pwd)/.libs/  \
  - cd test  python test_rpm.py
  +#check-local:
  +#@export PYTHONPATH=$(PYTHONPATH):$(shell pwd):$(shell pwd)/.libs/  \
  +#cd test  python test_rpm.py
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

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

2011-09-05 Thread Jeff Johnson

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

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   05-Sep-2011 22:22:09
  Branch: rpm-5_4  Handle: 2011090520220900

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

  Log:
- devtool: figger -luuid on Serentos.

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

  patch -p0 '@@ .'
  Index: rpm/devtool.conf
  
  $ cvs diff -u -r2.365.2.12 -r2.365.2.13 devtool.conf
  --- rpm/devtool.conf  30 Aug 2011 12:14:09 -  2.365.2.12
  +++ rpm/devtool.conf  5 Sep 2011 20:22:09 -   2.365.2.13
  @@ -431,7 +431,7 @@
   --with-expat \
   --with-pcre \
   --enable-utf8 \
  ---with-uuid=/usr/include:/usr/lib64 \
  +--with-uuid=system \
   --with-attr \
   --with-acl \
   --without-xar \
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/build/auto/ Makefile.am desc.in r...

2011-09-05 Thread Jeff Johnson

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

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   05-Sep-2011 22:23:23
  Branch: rpm-5_4  Handle: 2011090520232102

  Modified files:   (Branch: rpm-5_4)
rpm CHANGES
rpm/build/auto  Makefile.am desc.in
rpm/lib/autoMakefile.am desc.in
rpm/rpmdb/auto  Makefile.am desc.in
rpm/rpmio/auto  Makefile.am desc.in types.in

  Log:
- tests: rescusitate api-sanity auto/* markup for 1.12.5.

  Summary:
RevisionChanges Path
1.3501.2.161+1  -0  rpm/CHANGES
1.2.2.2 +7  -4  rpm/build/auto/Makefile.am
1.1.4.2 +39 -13 rpm/build/auto/desc.in
1.2.2.2 +7  -4  rpm/lib/auto/Makefile.am
1.2.4.2 +39 -8  rpm/lib/auto/desc.in
1.2.2.2 +7  -4  rpm/rpmdb/auto/Makefile.am
1.2.4.3 +41 -12 rpm/rpmdb/auto/desc.in
1.5.2.3 +7  -4  rpm/rpmio/auto/Makefile.am
1.2.4.3 +32 -7  rpm/rpmio/auto/desc.in
1.3.4.3 +14 -9  rpm/rpmio/auto/types.in
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3501.2.160 -r1.3501.2.161 CHANGES
  --- rpm/CHANGES   5 Sep 2011 18:22:15 -   1.3501.2.160
  +++ rpm/CHANGES   5 Sep 2011 20:23:21 -   1.3501.2.161
  @@ -1,4 +1,5 @@
   5.4.2 - 5.4.3:
  +- jbj: tests: rescusitate api-sanity auto/* markup for 1.12.5.
   - jbj: tests: upgrade to abi-compliance-checker 1.93.7 (modules? docs?).
   - jbj: tests: upgrade to api-sanity-autotest-1.12.5 (docs?).
   - jbj: python: disable broken make check.
  @@ .
  patch -p0 '@@ .'
  Index: rpm/build/auto/Makefile.am
  
  $ cvs diff -u -r1.2.2.1 -r1.2.2.2 Makefile.am
  --- rpm/build/auto/Makefile.am27 Dec 2010 16:01:52 -  1.2.2.1
  +++ rpm/build/auto/Makefile.am5 Sep 2011 20:23:23 -   1.2.2.2
  @@ -9,11 +9,14 @@
   
   TDIRS =  descriptors_storage header_compile_errors test_results 
tests
   
  +desc.xml: desc
  + cp $ $@
  +
   clean-local:
  - rm -rf $(TDIRS)
  + rm -rf $(TDIRS) desc.xml
   
  -check-local:
  - -[ -d tests ]  ${AUTOTEST} -l build -d desc -clean
  - -${AUTOTEST} -l build -d desc -st types -td test_data \
  +check-local: desc.xml
  + -[ -d tests ]  ${AUTOTEST} -l build -d desc.xml -clean
  + -${AUTOTEST} -l build -d desc.xml -st types -td test_data \
-gen -splint-specs -build -run
   
  @@ .
  patch -p0 '@@ .'
  Index: rpm/build/auto/desc.in
  
  $ cvs diff -u -r1.1.4.1 -r1.1.4.2 desc.in
  --- rpm/build/auto/desc.in27 Dec 2010 16:01:52 -  1.1.4.1
  +++ rpm/build/auto/desc.in5 Sep 2011 20:23:23 -   1.1.4.2
  @@ -13,20 +13,19 @@
   /libs
   
   include_paths
  +/include_paths
  +
  +add_include_paths
 @abs_top_srcdir@/build
 @abs_top_srcdir@/lib
 @abs_top_srcdir@/rpmdb
 @abs_top_srcdir@/rpmio
  -/include_paths
  +/add_include_paths
   
   gcc_options
 @CFLAGS@
   /gcc_options
   
  -opaque_types
  -/opaque_types
  -skip_interfaces
  -/skip_interfaces
   include_preamble
 stdint.h
 stdio.h
  @@ -40,6 +39,41 @@
 rpmtag.h
   /include_preamble
   
  +defines
  +/defines
  +
  +skip_types
  +/skip_types
  +
  +skip_symbols
  +/skip_symbols
  +
  +skip_constants
  +/skip_constants
  +
  +skip_headers
  +  @prefix@/include/rpm/*.h
  +/skip_headers
  +
  +skip_libs
  +  @prefix@/lib64/libdb.so
  +  @prefix@/lib64/libsqlite3.so
  +/skip_libs
  +
  +search_headers
  +/search_headers
  +
  +search_libs
  +/search_libs
  +
  +tools
  +/tools
  +
  +cross_prefix
  +/cross_prefix
  +
  +!-- undocumented? --
  +
   libs_depend
 @abs_top_builddir@/lib/.libs/librpm.so
 @abs_top_builddir@/rpmdb/.libs/librpmdb.so
  @@ -53,13 +87,6 @@
   skip_interfaces
   /skip_interfaces
   
  -skip_headers
  -  /usr/include/rpm/*.h
  -/skip_headers
  -
  -skip_libs
  -/skip_libs
  -
   libgroup
   /libgroup
   
  @@ -68,4 +95,3 @@
   
   skip_warnings
   /skip_warnings
  -
  @@ .
  patch -p0 '@@ .'
  Index: rpm/lib/auto/Makefile.am
  
  $ cvs diff -u -r1.2.2.1 -r1.2.2.2 Makefile.am
  --- rpm/lib/auto/Makefile.am  27 Dec 2010 15:13:33 -  1.2.2.1
  +++ rpm/lib/auto/Makefile.am  5 Sep 2011 20:23:23 -   1.2.2.2
  @@ -9,10 +9,13 @@
   
   TDIRS =  descriptors_storage header_compile_errors test_results

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

2011-09-05 Thread Jeff Johnson

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

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   06-Sep-2011 00:57:52
  Branch: rpm-5_4  Handle: 2011090522575101

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

  Log:
- bdb: fix: don't set PARTIAL on primary DBT through cursor-cpget.

  Summary:
RevisionChanges Path
1.3501.2.162+1  -0  rpm/CHANGES
1.392.2.6   +0  -1  rpm/rpmdb/rpmdb.c
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3501.2.161 -r1.3501.2.162 CHANGES
  --- rpm/CHANGES   5 Sep 2011 20:23:21 -   1.3501.2.161
  +++ rpm/CHANGES   5 Sep 2011 22:57:51 -   1.3501.2.162
  @@ -1,4 +1,5 @@
   5.4.2 - 5.4.3:
  +- jbj: bdb: fix: don't set PARTIAL on primary DBT through cursor-cpget.
   - jbj: tests: rescusitate api-sanity auto/* markup for 1.12.5.
   - jbj: tests: upgrade to abi-compliance-checker 1.93.7 (modules? docs?).
   - jbj: tests: upgrade to api-sanity-autotest-1.12.5 (docs?).
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmdb/rpmdb.c
  
  $ cvs diff -u -r1.392.2.5 -r1.392.2.6 rpmdb.c
  --- rpm/rpmdb/rpmdb.c 16 Feb 2011 18:42:40 -  1.392.2.5
  +++ rpm/rpmdb/rpmdb.c 5 Sep 2011 22:57:52 -   1.392.2.6
  @@ -1263,7 +1263,6 @@
   }
   
   doit:
  -p.flags |= DB_DBT_PARTIAL;
   v.flags |= DB_DBT_PARTIAL;
   
   xx = dbiCopen(dbi, dbiTxnid(dbi), dbcursor, 0);
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/rpmdb/ rpmtxn.c

2011-09-05 Thread Jeff Johnson

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

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   06-Sep-2011 00:59:37
  Branch: rpm-5_4  Handle: 2011090522593501

  Modified files:   (Branch: rpm-5_4)
rpm CHANGES
rpm/rpmdb   rpmtxn.c

  Log:
- rpmtxn: fix: use DB_INIT_TXN (0x800 changes in db-5.2.28).

  Summary:
RevisionChanges Path
1.3501.2.163+2  -1  rpm/CHANGES
1.6.4.1 +2  -2  rpm/rpmdb/rpmtxn.c
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3501.2.162 -r1.3501.2.163 CHANGES
  --- rpm/CHANGES   5 Sep 2011 22:57:51 -   1.3501.2.162
  +++ rpm/CHANGES   5 Sep 2011 22:59:35 -   1.3501.2.163
  @@ -1,5 +1,6 @@
   5.4.2 - 5.4.3:
  -- jbj: bdb: fix: don't set PARTIAL on primary DBT through cursor-cpget.
  +- jbj: rpmtxn: fix: use DB_INIT_TXN (0x800 changes in db-5.2.28).
  +- jbj: rpmdb: fix: don't set PARTIAL on primary DBT through 
cursor-cpget.
   - jbj: tests: rescusitate api-sanity auto/* markup for 1.12.5.
   - jbj: tests: upgrade to abi-compliance-checker 1.93.7 (modules? docs?).
   - jbj: tests: upgrade to api-sanity-autotest-1.12.5 (docs?).
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmdb/rpmtxn.c
  
  $ cvs diff -u -r1.6 -r1.6.4.1 rpmtxn.c
  --- rpm/rpmdb/rpmtxn.c10 Dec 2009 17:08:42 -  1.6
  +++ rpm/rpmdb/rpmtxn.c5 Sep 2011 22:59:36 -   1.6.4.1
  @@ -59,7 +59,7 @@
   DB_TXN * _parent = parent;
   DB_TXN * _txn = NULL;
   u_int32_t _flags = 0;
  -int rc = (dbenv  rpmdb-_dbi[0]-dbi_eflags  0x800)
  +int rc = (dbenv  rpmdb-_dbi[0]-dbi_eflags  DB_INIT_TXN)
? dbenv-txn_begin(dbenv, _parent, _txn, _flags) : ENOTSUP;
   if (!rc) {
if (txnp != NULL)
  @@ -88,7 +88,7 @@
   u_int32_t _kbytes = 0;
   u_int32_t _minutes = 0;
   u_int32_t _flags = 0;
  -int rc = (dbenv  rpmdb-_dbi[0]-dbi_eflags  0x800)
  +int rc = (dbenv  rpmdb-_dbi[0]-dbi_eflags  DB_INIT_TXN)
? dbenv-txn_checkpoint(dbenv, _kbytes, _minutes, _flags) : ENOTSUP;
   if (_rpmtxn_debug)
   fprintf(stderr, -- %s(%p,%u,%u,0x%x) rc %d\n, dbenv-txn_checkpoint, 
dbenv, (unsigned)_kbytes, (unsigned)_minutes, (unsigned)_flags, rc);
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/lib/ rpmchecksig.c

2011-09-05 Thread Jeff Johnson

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

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   06-Sep-2011 01:00:29
  Branch: rpm-5_4  Handle: 2011090523002800

  Modified files:   (Branch: rpm-5_4)
rpm/lib rpmchecksig.c

  Log:
- common exit (for debugging), remove bogus gcc warning.

  Summary:
RevisionChanges Path
1.240.2.2   +3  -3  rpm/lib/rpmchecksig.c
  

  patch -p0 '@@ .'
  Index: rpm/lib/rpmchecksig.c
  
  $ cvs diff -u -r1.240.2.1 -r1.240.2.2 rpmchecksig.c
  --- rpm/lib/rpmchecksig.c 18 Mar 2011 19:45:02 -  1.240.2.1
  +++ rpm/lib/rpmchecksig.c 5 Sep 2011 23:00:28 -   1.240.2.2
  @@ -203,7 +203,7 @@
   Header sigh = NULL;
   int res = 1; /* XXX assume failure */
   int deleting = (qva-qva_mode == RPMSIGN_DEL_SIGNATURE);
  -rpmRC rpmrc;
  +rpmRC rpmrc = 0;
   int xx;
   int i;
   
  @@ -527,9 +527,9 @@
   int validate = 1;
   
   if (pkt == NULL || pktlen = 0)
  - return RPMRC_FAIL;
  + goto exit;
   if (rpmtsOpenDB(ts, (O_RDWR|O_CREAT)))
  - return RPMRC_FAIL;
  + goto exit;
   
   /*@-moduncon@*/
   if ((enc = b64encode(pkt, pktlen)) == NULL)
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac rpm/rpmdb/ rpmdb.h rpmre...

2011-09-05 Thread Jeff Johnson

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

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   06-Sep-2011 01:08:26
  Branch: rpm-5_4  Handle: 2011090523082104

  Modified files:   (Branch: rpm-5_4)
rpm CHANGES configure.ac
rpm/rpmdb   rpmdb.h rpmrepo.c
rpm/rpmio   rpmsql.c
rpm/tests/ref   showrc version
rpm/tools   dbsql.c rpmrepo.c sqlite3.c

  Log:
- rpmdb: stub-in db-5.2.28 support.
- rpmdb: set -I/usr/include/dbXY, remove dbXY/

  Summary:
RevisionChanges Path
1.3501.2.164+2  -0  rpm/CHANGES
2.472.2.27  +16 -12 rpm/configure.ac
1.141.2.3   +1  -1  rpm/rpmdb/rpmdb.h
1.4.2.1 +1  -1  rpm/rpmdb/rpmrepo.c
2.59.2.1+1  -1  rpm/rpmio/rpmsql.c
1.37.2.3+12 -12 rpm/tests/ref/showrc
1.5.2.3 +2  -2  rpm/tests/ref/version
2.15.2.1+1  -1  rpm/tools/dbsql.c
2.32.2.1+1  -1  rpm/tools/rpmrepo.c
2.4.2.1 +1  -1  rpm/tools/sqlite3.c
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3501.2.163 -r1.3501.2.164 CHANGES
  --- rpm/CHANGES   5 Sep 2011 22:59:35 -   1.3501.2.163
  +++ rpm/CHANGES   5 Sep 2011 23:08:21 -   1.3501.2.164
  @@ -1,4 +1,6 @@
   5.4.2 - 5.4.3:
  +- jbj: rpmdb: stub-in db-5.2.28 support.
  +- jbj: rpmdb: set -I/usr/include/dbXY, remove dbXY/
   - jbj: rpmtxn: fix: use DB_INIT_TXN (0x800 changes in db-5.2.28).
   - jbj: rpmdb: fix: don't set PARTIAL on primary DBT through 
cursor-cpget.
   - jbj: tests: rescusitate api-sanity auto/* markup for 1.12.5.
  @@ .
  patch -p0 '@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.472.2.26 -r2.472.2.27 configure.ac
  --- rpm/configure.ac  5 Sep 2011 13:47:47 -   2.472.2.26
  +++ rpm/configure.ac  5 Sep 2011 23:08:21 -   2.472.2.27
  @@ -538,6 +538,9 @@
   else
   MYPATH=$PATH
   fi
  +
  +DBXY=db52
  +
   AC_PATH_PROG(__BASH, bash, %{_bindir}/bash, $MYPATH)
   AC_PATH_PROG(__BZIP2, bzip2, %{_bindir}/bzip2, $MYPATH)
   AC_PATH_PROG(__CAT, cat, /bin/cat, $MYPATH)
  @@ -548,16 +551,16 @@
   AC_PATH_PROG(__CPIO, cpio, /bin/cpio, $MYPATH)
   AC_PATH_PROG(__CURL, curl, %{_bindir}/curl, $MYPATH)
   AC_PATH_PROG(__CVS, cvs, %{_bindir}/cvs, $MYPATH)
  -AC_PATH_PROG(__DB_ARCHIVE, db51_archive, %{_bindir}/db51_archive, $MYPATH)
  -AC_PATH_PROG(__DB_CHECKPOINT, db51_checkpoint, %{_bindir}/db51_checkpoint, 
$MYPATH)
  -AC_PATH_PROG(__DB_DUMP, db51_dump, %{_bindir}/db51_dump, $MYPATH)
  -AC_PATH_PROG(__DB_LOAD, db51_load, %{_bindir}/db51_load, $MYPATH)
  -AC_PATH_PROG(__DB_LOG_VERIFY, db51_log_verify, %{_bindir}/db51_log_verify, 
$MYPATH)
  -AC_PATH_PROG(__DB_PRINTLOG, db51_printlog, %{_bindir}/db51_printlog, $MYPATH)
  -AC_PATH_PROG(__DB_RECOVER, db51_recover, %{_bindir}/db51_recover, $MYPATH)
  -AC_PATH_PROG(__DB_STAT, db51_stat, %{_bindir}/db51_stat, $MYPATH)
  -AC_PATH_PROG(__DB_UPGRADE, db51_upgrade, %{_bindir}/db51_upgrade, $MYPATH)
  -AC_PATH_PROG(__DB_VERIFY, db51_verify, %{_bindir}/db51_verify, $MYPATH)
  +AC_PATH_PROG(__DB_ARCHIVE, ${DBXY}_archive, %{_bindir}/${DBXY}_archive, 
$MYPATH)
  +AC_PATH_PROG(__DB_CHECKPOINT, ${DBXY}_checkpoint, 
%{_bindir}/${DBXY}_checkpoint, $MYPATH)
  +AC_PATH_PROG(__DB_DUMP, ${DBXY}_dump, %{_bindir}/${DBXY}_dump, $MYPATH)
  +AC_PATH_PROG(__DB_LOAD, ${DBXY}_load, %{_bindir}/${DBXY}_load, $MYPATH)
  +AC_PATH_PROG(__DB_LOG_VERIFY, ${DBXY}_log_verify, 
%{_bindir}/${DBXY}_log_verify, $MYPATH)
  +AC_PATH_PROG(__DB_PRINTLOG, ${DBXY}_printlog, %{_bindir}/${DBXY}_printlog, 
$MYPATH)
  +AC_PATH_PROG(__DB_RECOVER, ${DBXY}_recover, %{_bindir}/${DBXY}_recover, 
$MYPATH)
  +AC_PATH_PROG(__DB_STAT, ${DBXY}_stat, %{_bindir}/${DBXY}_stat, $MYPATH)
  +AC_PATH_PROG(__DB_UPGRADE, ${DBXY}_upgrade, %{_bindir}/${DBXY}_upgrade, 
$MYPATH)
  +AC_PATH_PROG(__DB_VERIFY, ${DBXY}_verify, %{_bindir}/${DBXY}_verify, $MYPATH)
   AC_PATH_PROG(__DIFF, diff, /bin/diff, $MYPATH)
   AC_PATH_PROG(__DITTO, ditto, %{_bindir}/ditto, $MYPATH)
   AC_PATH_PROG(__FILE, file, %{_bindir}/file, $MYPATH)
  @@ -1483,9 +1486,10 @@
   
   dnl # Berkeley-DB  SQLite
   DBLIBSRCS=
  +CPPFLAGS=${CPPFLAGS} -I${includedir}/${DBXY}
   RPM_CHECK_LIB(
   [Berkeley-DB], [db],
  -[db-5.1], [db_create], [db51/db.h],
  +[db-5.2], [db_create], [db.h],
   [yes,external], [db3],
   [ DBLIBSRCS=$DBLIBSRCS db3.c
 AM_CONDITIONAL(WITH_DB, [ true ])
  @@ -1512,7 +1516,7 @@
   dnl XXX error: `db3' is already

[CVS] RPM: rpm-5_4: rpm/rpmdb/ db3.c dbconfig.c rpmdb.c rpmtag.h tagna...

2011-09-05 Thread Jeff Johnson

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

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   06-Sep-2011 01:49:41
  Branch: rpm-5_4  Handle: 2011090523494001

  Modified files:   (Branch: rpm-5_4)
rpm/rpmdb   db3.c dbconfig.c rpmdb.c rpmtag.h tagname.c
rpm/tools   dbconvert.c

  Log:
- rpmdb: more db-5.2.28 changes.

  Summary:
RevisionChanges Path
1.156.2.7   +78 -4  rpm/rpmdb/db3.c
1.78.4.1+4  -0  rpm/rpmdb/dbconfig.c
1.392.2.7   +1  -0  rpm/rpmdb/rpmdb.c
1.70.4.2+4  -2  rpm/rpmdb/rpmtag.h
1.34.2.2+6  -0  rpm/rpmdb/tagname.c
2.1.2.11+4  -0  rpm/tools/dbconvert.c
  

  patch -p0 '@@ .'
  Index: rpm/rpmdb/db3.c
  
  $ cvs diff -u -r1.156.2.6 -r1.156.2.7 db3.c
  --- rpm/rpmdb/db3.c   27 Mar 2011 05:16:04 -  1.156.2.6
  +++ rpm/rpmdb/db3.c   5 Sep 2011 23:49:40 -   1.156.2.7
  @@ -241,6 +241,7 @@
   _ENTRY(INIT_LOCK),
   _ENTRY(INIT_LOG),
   _ENTRY(INIT_MPOOL),
  +_ENTRY(INIT_MUTEX),  /* XXX not in DBENV-open() doco */
   _ENTRY(INIT_REP),
   _ENTRY(INIT_TXN),
   _ENTRY(RECOVER),
  @@ -338,8 +339,9 @@
   
   /*@unchecked@*/ /*@observer@*/
   static KEY DBCoflags[] = {
  -#ifdef   NOTYET  /* XXX DB-cursor() doco for db-5.1.19 lists, undef'd */
  -_ENTRY(BULK),
  + /* XXX DB-cursor() doco for db-5.1.19 lists, undef'd */
  +#if defined(DB_CURSOR_BULK)
  +_ENTRY(CURSOR_BULK),
   #endif
   _ENTRY(READ_COMMITTED),
   _ENTRY(READ_UNCOMMITTED),
  @@ -437,6 +439,9 @@
   _DBT_ENTRY(PARTIAL),
   _DBT_ENTRY(APPMALLOC),
   _DBT_ENTRY(MULTIPLE),
  +#if defined(DB_DBT_READONLY) /* XXX db-5.2.28 */
  +_DBT_ENTRY(READONLY),
  +#endif
   };
   /*@unchecked@*/
   static size_t nDBTflags = sizeof(DBTflags) / sizeof(DBTflags[0]);
  @@ -707,8 +712,41 @@
   const char * n;
   uint32_t v;
   } _events[] = {
  +#if (DB_VERSION_MAJOR == 5  DB_VERSION_MINOR == 2)
  +_TABLE(PANIC),   /*  0 */
  +_TABLE(REG_ALIVE),   /*  1 */
  +_TABLE(REG_PANIC),   /*  2 */
  +_TABLE(REP_CLIENT),  /*  3 */
  +_TABLE(REP_CONNECT_BROKEN),  /*  4 */
  +_TABLE(REP_CONNECT_ESTD),/*  5 */
  +_TABLE(REP_CONNECT_TRY_FAILED), /*  6 */
  +_TABLE(REP_DUPMASTER),   /*  7 */
  +_TABLE(REP_ELECTED), /*  8 */
  +_TABLE(REP_ELECTION_FAILED),/*  9 */
  +_TABLE(REP_INIT_DONE),   /* 10 */
  +_TABLE(REP_JOIN_FAILURE),/* 11 */
  +_TABLE(REP_LOCAL_SITE_REMOVED), /* 12 */
  +_TABLE(REP_MASTER),  /* 13 */
  +_TABLE(REP_MASTER_FAILURE),  /* 14 */
  +_TABLE(REP_NEWMASTER),   /* 15 */
  +_TABLE(REP_PERM_FAILED), /* 16 */
  +_TABLE(REP_SITE_ADDED),  /* 17 */
  +_TABLE(REP_SITE_REMOVED),/* 18 */
  +_TABLE(REP_STARTUPDONE), /* 19 */
  +_TABLE(REP_WOULD_ROLLBACK),  /* 20 */
  +_TABLE(WRITE_FAILED),/* 21 */
  +_TABLE(NO_SUCH_EVENT),   /* 22 */
  +_TABLE(NO_SUCH_EVENT),   /* 23 */
  +_TABLE(NO_SUCH_EVENT),   /* 24 */
  +_TABLE(NO_SUCH_EVENT),   /* 25 */
  +_TABLE(NO_SUCH_EVENT),   /* 26 */
  +_TABLE(NO_SUCH_EVENT),   /* 27 */
  +_TABLE(NO_SUCH_EVENT),   /* 28 */
  +_TABLE(NO_SUCH_EVENT),   /* 29 */
  +_TABLE(NO_SUCH_EVENT),   /* 30 */
  +_TABLE(NO_SUCH_EVENT),   /* 31 */
  +#elif (DB_VERSION_MAJOR == 5  DB_VERSION_MINOR  2)
/* XXX numbered from db-5.1.19, older versions are different. */
  -#if (DB_VERSION_MAJOR == 5)
   _TABLE(PANIC),   /*  0 */
   _TABLE(REG_ALIVE),   /*  1 */
   _TABLE(REG_PANIC),   /*  2 */
  @@ -725,6 +763,22 @@
   _TABLE(WRITE_FAILED),/* 13 */
   _TABLE(NO_SUCH_EVENT),   /* 14 */
   _TABLE(NO_SUCH_EVENT),   /* 15 */
  +_TABLE(NO_SUCH_EVENT),   /* 16 */
  +_TABLE(NO_SUCH_EVENT),   /* 17 */
  +_TABLE(NO_SUCH_EVENT),   /* 18 */
  +_TABLE(NO_SUCH_EVENT),   /* 19 */
  +_TABLE(NO_SUCH_EVENT),   /* 20 */
  +_TABLE(NO_SUCH_EVENT),   /* 21 */
  +_TABLE(NO_SUCH_EVENT),   /* 22 */
  +_TABLE(NO_SUCH_EVENT),   /* 23 */
  +_TABLE(NO_SUCH_EVENT),   /* 24 */
  +_TABLE(NO_SUCH_EVENT),   /* 25 */
  +_TABLE(NO_SUCH_EVENT),   /* 26 */
  +_TABLE(NO_SUCH_EVENT),   /* 27 */
  +_TABLE(NO_SUCH_EVENT),   /* 28 */
  +_TABLE(NO_SUCH_EVENT),   /* 29 */
  +_TABLE(NO_SUCH_EVENT),   /* 30 */
  +_TABLE(NO_SUCH_EVENT),   /* 31 */
   #else
   _TABLE(NO_SUCH_EVENT),   /*  0 */
   _TABLE(PANIC),   /*  1 */
  @@

[CVS] RPM: popt/ CHANGES system.h test1.c

[CVS] RPM: popt/ CHANGES popthelp.c system.h test1.c

[CVS] RPM: popt/ CHANGES Makefile.am Makefile.mingw config.h.mingw

[CVS] RPM: popt/ CHANGES popt.c system.h

[CVS] RPM: popt/ CHANGES popthelp.c test1.c

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

[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/rpmdb/ hdrfmt.c

[CVS] RPM: rpm-5_4: rpm/ debug.h

[CVS] RPM: rpm-5_4: rpm/tools/ .cvsignore

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

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

[CVS] RPM: rpm-5_4: rpm/scripts/ mgo

[CVS] RPM: rpm-5_4: rpm/tests/ref/ hkp manifest showrc version

[CVS] RPM: popt/ popthelp.c system.h test1.c

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

[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac

[CVS] RPM: neon/test/ .cvsignore Makefile.am Makefile.in neon/test/com...

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

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

[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/build/auto/ Makefile.am desc.in r...

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

[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/rpmdb/ rpmtxn.c

[CVS] RPM: rpm-5_4: rpm/lib/ rpmchecksig.c

[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac rpm/rpmdb/ rpmdb.h rpmre...

[CVS] RPM: rpm-5_4: rpm/rpmdb/ db3.c dbconfig.c rpmdb.c rpmtag.h tagna...

25 matches

Site Navigation

Mail list logo

Footer information