RPM Community Forums

Mailing List Message of <rpm-cvs>

[CVS] RPM: rpm-5_3: rpm/ CHANGES rpm/rpmio/ rpmsql.c rpm/tools/ dbsql....

From: Jeff Johnson <jbj@rpm5.org>
Date: Fri 27 Aug 2010 - 15:04:11 CEST
Message-Id: <20100827130411.7DE0FC52DD@rpm5.org>
  RPM Package Manager, CVS Repository
  /cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   27-Aug-2010 15:04:11
  Branch: rpm-5_3                          Handle: 2010082713041001

  Modified files:           (Branch: rpm-5_3)
    rpm                     CHANGES
    rpm/rpmio               rpmsql.c
    rpm/tools               dbsql.c sqlite3.c

  Log:
    - permit building --without-sqlite again.

  Summary:
    Revision    Changes     Path
    1.3296.2.68 +1  -0      rpm/CHANGES
    2.55.2.4    +14 -4      rpm/rpmio/rpmsql.c
    2.13.2.3    +2  -0      rpm/tools/dbsql.c
    2.2.2.3     +2  -0      rpm/tools/sqlite3.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.3296.2.67 -r1.3296.2.68 CHANGES
  --- rpm/CHANGES	25 Aug 2010 14:02:53 -0000	1.3296.2.67
  +++ rpm/CHANGES	27 Aug 2010 13:04:10 -0000	1.3296.2.68
  @@ -1,4 +1,5 @@
   5.3.3 -> 5.3.4:
  +    - jbj: permit building --without-sqlite again.
   
   5.3.2 -> 5.3.3:
       - jbj: finalize for release.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmsql.c
  ============================================================================
  $ cvs diff -u -r2.55.2.3 -r2.55.2.4 rpmsql.c
  --- rpm/rpmio/rpmsql.c	25 Apr 2010 15:59:32 -0000	2.55.2.3
  +++ rpm/rpmio/rpmsql.c	27 Aug 2010 13:04:10 -0000	2.55.2.4
  @@ -4,10 +4,6 @@
   
   #define	_RPMIOB_INTERNAL	/* rpmiobSlurp */
   #include "rpmio_internal.h"	/* XXX fdGetFILE */
  -#define	_RPMSQL_INTERNAL
  -#define	_RPMVT_INTERNAL
  -#define	_RPMVC_INTERNAL
  -#include <rpmsql.h>
   #include <rpmmacro.h>
   #include <rpmdir.h>
   #include <rpmurl.h>
  @@ -21,6 +17,11 @@
   #include <sqlite3.h>
   #endif	/* WITH_SQLITE */
   
  +#define	_RPMSQL_INTERNAL
  +#define	_RPMVT_INTERNAL
  +#define	_RPMVC_INTERNAL
  +#include <rpmsql.h>
  +
   #ifdef	NOTYET		/* XXX FIXME */
   #include <editline/readline.h>
   #elif defined(HAVE_READLINE) && HAVE_READLINE==1
  @@ -134,6 +135,9 @@
   }
   
   /*==============================================================*/
  +
  +#if defined(WITH_SQLITE)
  +
   typedef struct key_s {
       const char * k;
       uint32_t v;
  @@ -620,6 +624,7 @@
   VTDBG(vt, (stderr, "<-- %s(%p,%s) rc %d\n", __FUNCTION__, vt, zNew, rc));
       return rc;
   }
  +#endif /* defined(WITH_SQLITE) */
   
   /*==============================================================*/
   
  @@ -675,6 +680,10 @@
       return vc;
   }
   
  +/*==============================================================*/
  +
  +#if defined(WITH_SQLITE)
  +
   int rpmvcOpen(rpmvt vt, rpmvc * vcp)
   {
       rpmvc vc = rpmvcNew(vt, vt->ac);
  @@ -852,6 +861,7 @@
   VCDBG(vc, (stderr, "<-- %s(%p,%p) rc %d rowid 0x%llx\n", __FUNCTION__, vc, pRowid, rc, (unsigned long long)(pRowid ? *pRowid : 0xf00)));
       return rc;
   }
  +#endif /* defined(WITH_SQLITE) */
   
   /*==============================================================*/
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/tools/dbsql.c
  ============================================================================
  $ cvs diff -u -r2.13.2.2 -r2.13.2.3 dbsql.c
  --- rpm/tools/dbsql.c	25 Apr 2010 14:21:27 -0000	2.13.2.2
  +++ rpm/tools/dbsql.c	27 Aug 2010 13:04:11 -0000	2.13.2.3
  @@ -42,10 +42,12 @@
   {
       NotUsed = NotUsed;
       _rpmsqlSeenInterrupt = 1;
  +#if defined(WITH_SQLITE)
       if (_rpmsqlI && _rpmsqlI->I) {
   	sqlite3 * db = (sqlite3 *) _rpmsqlI->I;
   	sqlite3_interrupt(db);
       }
  +#endif
   }
   #endif
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/tools/sqlite3.c
  ============================================================================
  $ cvs diff -u -r2.2.2.2 -r2.2.2.3 sqlite3.c
  --- rpm/tools/sqlite3.c	25 Apr 2010 14:21:27 -0000	2.2.2.2
  +++ rpm/tools/sqlite3.c	27 Aug 2010 13:04:11 -0000	2.2.2.3
  @@ -42,10 +42,12 @@
   {
       NotUsed = NotUsed;
       _rpmsqlSeenInterrupt = 1;
  +#if defined(WITH_SQLITE)
       if (_rpmsqlI && _rpmsqlI->I) {
   	sqlite3 * db = (sqlite3 *) _rpmsqlI->I;
   	sqlite3_interrupt(db);
       }
  +#endif
   }
   #endif
   
  @@ .
Received on Fri Aug 27 15:04:11 2010
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.