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:
Revision Changes 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 -0000 1.3501.2.163
+++ rpm/CHANGES 5 Sep 2011 23:08:21 -0000 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 -0000 2.472.2.26
+++ rpm/configure.ac 5 Sep 2011 23:08:21 -0000 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 registered with AC_CONFIG_SUBDIRS.
RPM_CHECK_LIB(
[Berkeley-DB (+SQLite3)], [dbsql],
- [db_sql-5.1], [sqlite3_open], [db51/dbsql.h],
+ [db_sql-5.2], [sqlite3_open], [dbsql.h],
[yes,external], [db3/sql],
[
AM_CONDITIONAL(WITH_DBSQL, [ true ])
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmdb.h
============================================================================
$ cvs diff -u -r1.141.2.2 -r1.141.2.3 rpmdb.h
--- rpm/rpmdb/rpmdb.h 11 May 2011 01:38:56 -0000 1.141.2.2
+++ rpm/rpmdb/rpmdb.h 5 Sep 2011 23:08:24 -0000 1.141.2.3
@@ -15,7 +15,7 @@
#if defined(_RPMDB_INTERNAL)
#if defined(WITH_DB)
-#include <db51/db.h>
+#include <db.h>
#else
#include "db_emu.h"
#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmrepo.c
============================================================================
$ cvs diff -u -r1.4 -r1.4.2.1 rpmrepo.c
--- rpm/rpmdb/rpmrepo.c 18 Oct 2010 05:46:20 -0000 1.4
+++ rpm/rpmdb/rpmrepo.c 5 Sep 2011 23:08:24 -0000 1.4.2.1
@@ -5,7 +5,7 @@
#include "system.h"
#if defined(WITH_DBSQL)
-#include <db51/dbsql.h>
+#include <dbsql.h>
#elif defined(WITH_SQLITE)
#include <sqlite3.h>
#ifdef __LCLINT__
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmsql.c
============================================================================
$ cvs diff -u -r2.59 -r2.59.2.1 rpmsql.c
--- rpm/rpmio/rpmsql.c 2 Nov 2010 15:14:36 -0000 2.59
+++ rpm/rpmio/rpmsql.c 5 Sep 2011 23:08:23 -0000 2.59.2.1
@@ -10,7 +10,7 @@
#include <mire.h>
#if defined(WITH_DBSQL)
-#include <db51/dbsql.h>
+#include <dbsql.h>
#elif defined(WITH_SQLITE)
#define SQLITE_OS_UNIX 1
#define SQLITE_THREADSAFE 1
@@ .
patch -p0 <<'@@ .'
Index: rpm/tests/ref/showrc
============================================================================
$ cvs diff -u -r1.37.2.2 -r1.37.2.3 showrc
--- rpm/tests/ref/showrc 5 Sep 2011 12:56:08 -0000 1.37.2.2
+++ rpm/tests/ref/showrc 5 Sep 2011 23:08:25 -0000 1.37.2.3
@@ -16,9 +16,9 @@
MACRO DEFINITIONS:
macrofiles : ../macros/macros:../tests/macros
Features provided by rpmlib installer:
+ rpmlib(BuiltinAugeasScripts) = 5.3-1
rpmlib(BuiltinLuaScripts) = 4.2.2-1
rpmlib(BuiltinPythonScripts) = 5.2-1
- rpmlib(BuiltinSqlScripts) = 5.3-1
rpmlib(BuiltinTclScripts) = 5.2-1
rpmlib(CompressedFileNames) = 3.0.4-1
rpmlib(ConcurrentAccess) = 4.1-1
@@ -217,16 +217,16 @@
-14: __curl /usr/bin/curl
-14: __cvs /usr/bin/cvs
-14: __cxx g++
--14: __db_archive /usr/bin/db51_archive
--14: __db_checkpoint /usr/bin/db51_checkpoint
--14: __db_dump /usr/bin/db51_dump
--14: __db_load /usr/bin/db51_load
--14: __db_log_verify /usr/bin/db51_log_verify
--14: __db_printlog /usr/bin/db51_printlog
--14: __db_recover /usr/bin/db51_recover
--14: __db_stat /usr/bin/db51_stat
--14: __db_upgrade /usr/bin/db51_upgrade
--14: __db_verify /usr/bin/db51_verify
+-14: __db_archive /usr/bin/db52_archive
+-14: __db_checkpoint /usr/bin/db52_checkpoint
+-14: __db_dump /usr/bin/db52_dump
+-14: __db_load /usr/bin/db52_load
+-14: __db_log_verify /usr/bin/db52_log_verify
+-14: __db_printlog /usr/bin/db52_printlog
+-14: __db_recover /usr/bin/db52_recover
+-14: __db_stat /usr/bin/db52_stat
+-14: __db_upgrade /usr/bin/db52_upgrade
+-14: __db_verify /usr/bin/db52_verify
-14: __dbi_btconfig
btree
%{__dbi_other}
@@ -637,7 +637,7 @@
-14: _rpmgi_pattern_regex ^.+/%1-[^-]+-[^-]+\.[^.]+\.rpm$
-14: _rpmgio .ufdio
-14: _rpmhome %{_usrlibrpm}
--14: _rpmversion 5.4.2
+-14: _rpmversion 5.4.3
-14: _sbindir %{_exec_prefix}/sbin
-14: _sharedstatedir %{_prefix}/com
-14: _signature gpg
@@ .
patch -p0 <<'@@ .'
Index: rpm/tests/ref/version
============================================================================
$ cvs diff -u -r1.5.2.2 -r1.5.2.3 version
--- rpm/tests/ref/version 5 Sep 2011 12:56:08 -0000 1.5.2.2
+++ rpm/tests/ref/version 5 Sep 2011 23:08:25 -0000 1.5.2.3
@@ -1,2 +1,2 @@
-lt-rpm (RPM) 5.4.2
-rpmlib 0x28900800,0x7db61000,0x52504d35
+lt-rpm (RPM) 5.4.3
+rpmlib 0x28900c00,0x7db92800,0x52504d35
@@ .
patch -p0 <<'@@ .'
Index: rpm/tools/dbsql.c
============================================================================
$ cvs diff -u -r2.15 -r2.15.2.1 dbsql.c
--- rpm/tools/dbsql.c 18 Oct 2010 05:46:20 -0000 2.15
+++ rpm/tools/dbsql.c 5 Sep 2011 23:08:22 -0000 2.15.2.1
@@ -26,7 +26,7 @@
#include <rpmsql.h>
#if defined(WITH_DBSQL)
-#include <db51/dbsql.h>
+#include <dbsql.h>
#elif defined(WITH_SQLITE)
#define SQLITE_OS_UNIX 1 /* XXX needed? */
#define SQLITE_THREADSAFE 1
@@ .
patch -p0 <<'@@ .'
Index: rpm/tools/rpmrepo.c
============================================================================
$ cvs diff -u -r2.32 -r2.32.2.1 rpmrepo.c
--- rpm/tools/rpmrepo.c 18 Oct 2010 05:46:21 -0000 2.32
+++ rpm/tools/rpmrepo.c 5 Sep 2011 23:08:22 -0000 2.32.2.1
@@ -5,7 +5,7 @@
#include "system.h"
#if defined(WITH_DBSQL)
-#include <db51/dbsql.h>
+#include <dbsql.h>
#elif defined(WITH_SQLITE)
#include <sqlite3.h>
#ifdef __LCLINT__
@@ .
patch -p0 <<'@@ .'
Index: rpm/tools/sqlite3.c
============================================================================
$ cvs diff -u -r2.4 -r2.4.2.1 sqlite3.c
--- rpm/tools/sqlite3.c 18 Oct 2010 05:46:21 -0000 2.4
+++ rpm/tools/sqlite3.c 5 Sep 2011 23:08:22 -0000 2.4.2.1
@@ -26,7 +26,7 @@
#include <rpmsql.h>
#if defined(WITH_DBSQL)
-#include <db51/dbsql.h>
+#include <dbsql.h>
#elif defined(WITH_SQLITE)
#define SQLITE_OS_UNIX 1 /* XXX needed? */
#define SQLITE_THREADSAFE 1
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
