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: 13-Sep-2011 03:12:53 Branch: rpm-5_4 Handle: 2011091301125003 Modified files: (Branch: rpm-5_4) rpm CHANGES configure.ac devtool.conf rpm/macros macros.in rpm/rpmdb db3.c dbconfig.c rpmdb.h rpm/rpmio rpmltc.h rpm/ruby Makefile.am rpm/tests/ref manifest showrc Log: - ruby: disable "make check" until -lpcreposix gets linked correctly. - ruby: avoid undefined @WITH_RUBY_VENDORARCHDIR@. - crypto: rescusitate --with-libtomcrypt. - rpmdb: stub-in DB_HEAP and heapsize configurable. - rpmdb: macros for new db-utils. Summary: Revision Changes Path 1.3501.2.171+5 -0 rpm/CHANGES 2.472.2.30 +9 -1 rpm/configure.ac 2.365.2.14 +2 -2 rpm/devtool.conf 1.39.2.18 +7 -1 rpm/macros/macros.in 1.156.2.8 +8 -0 rpm/rpmdb/db3.c 1.78.4.2 +3 -1 rpm/rpmdb/dbconfig.c 1.141.2.4 +1 -0 rpm/rpmdb/rpmdb.h 1.2.4.1 +2 -2 rpm/rpmio/rpmltc.h 1.11.2.2 +3 -3 rpm/ruby/Makefile.am 1.17.2.3 +1 -0 rpm/tests/ref/manifest 1.37.2.4 +11 -13 rpm/tests/ref/showrc ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/CHANGES ============================================================================ $ cvs diff -u -r1.3501.2.170 -r1.3501.2.171 CHANGES --- rpm/CHANGES 12 Sep 2011 20:29:25 -0000 1.3501.2.170 +++ rpm/CHANGES 13 Sep 2011 01:12:50 -0000 1.3501.2.171 @@ -1,4 +1,9 @@ 5.4.2 -> 5.4.3: + - jbj: ruby: disable "make check" until -lpcreposix gets linked correctly. + - jbj: ruby: avoid undefined @WITH_RUBY_VENDORARCHDIR@. + - jbj: crypto: rescusitate --with-libtomcrypt. + - jbj: rpmdb: stub-in DB_HEAP and heapsize configurable. + - jbj: rpmdb: macros for new db-utils. - jbj: lua: port to lua-5.2.0-beta external. - jbj: hdrfmt: fix: remove a memory leak. - jbj: rpmgi: fix: load rpmdb tag value filters more carefully. @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac ============================================================================ $ cvs diff -u -r2.472.2.29 -r2.472.2.30 configure.ac --- rpm/configure.ac 6 Sep 2011 15:03:53 -0000 2.472.2.29 +++ rpm/configure.ac 13 Sep 2011 01:12:51 -0000 2.472.2.30 @@ -553,12 +553,18 @@ AC_PATH_PROG(__CVS, cvs, %{_bindir}/cvs, $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_DEADLOCK, ${DBXY}_deadlock, %{_bindir}/${DBXY}_deadlock, $MYPATH) AC_PATH_PROG(__DB_DUMP, ${DBXY}_dump, %{_bindir}/${DBXY}_dump, $MYPATH) +AC_PATH_PROG(__DB_HOTBACKUP, ${DBXY}_hotbackup, %{_bindir}/${DBXY}_hotbackup, $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_REPLICATE, ${DBXY}_replicate, %{_bindir}/${DBXY}_replicate, $MYPATH) +AC_PATH_PROG(__DBSQL, ${DBXY}_stat, %{_bindir}/${DBXY}sql, $MYPATH) +AC_PATH_PROG(__DB_SQL_CODEGEN, ${DBXY}_stat, %{_bindir}/${DBXY}_sql_codegen, $MYPATH) AC_PATH_PROG(__DB_STAT, ${DBXY}_stat, %{_bindir}/${DBXY}_stat, $MYPATH) +AC_PATH_PROG(__DB_TUNER, ${DBXY}_stat, %{_bindir}/${DBXY}_tuner, $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) @@ -1361,11 +1367,13 @@ ], []) dnl # TomCrypt +dnl XXX FIXME: add libtomcrypt.pc RPM_CHECK_LIB( [TomCrypt], [tomcrypt], - [tomcrypt], [ltc_init_multi], [tomcrypt/tomcrypt.h], + [tomcrypt], [ltc_init_multi], [tomcrypt/tomcrypt_cfg.h], [no,external:none], [], [ AC_DEFINE(WITH_TOMCRYPT, 1, [Define if building with LibTomCrypt]) + CPPFLAGS="$CPPFLAGS -I${includedir}/tomcrypt -I${includedir}/tommmath" ], []) dnl # IBM TPM 1.2 software emulation @@ . patch -p0 <<'@@ .' Index: rpm/devtool.conf ============================================================================ $ cvs diff -u -r2.365.2.13 -r2.365.2.14 devtool.conf --- rpm/devtool.conf 5 Sep 2011 20:22:09 -0000 2.365.2.13 +++ rpm/devtool.conf 13 Sep 2011 01:12:51 -0000 2.365.2.14 @@ -421,7 +421,7 @@ --with-openssl \ --with-nss \ --with-gcrypt \ - --without-tomcrypt \ + --with-tomcrypt \ --without-tpm \ --with-libtasn1 \ --with-pakchois \ @@ -451,7 +451,7 @@ --with-pythonembed=/usr/lib:/usr/include/python2.6 \ --with-perl \ --without-perlembed \ - --with-ruby \ + --with-ruby=/usr/lib64:/usr/lib64/ruby/1.8 \ --with-selinux \ --without-sepol \ --without-semanage \ @@ . patch -p0 <<'@@ .' Index: rpm/macros/macros.in ============================================================================ $ cvs diff -u -r1.39.2.17 -r1.39.2.18 macros.in --- rpm/macros/macros.in 6 Sep 2011 15:03:54 -0000 1.39.2.17 +++ rpm/macros/macros.in 13 Sep 2011 01:12:51 -0000 1.39.2.18 @@ -1,7 +1,7 @@ #/*! \page config_macros Default configuration: @USRLIBRPM@/macros # \verbatim # -# $Id: macros.in,v 1.39.2.17 2011/09/06 15:03:54 devzero2000 Exp $ +# $Id: macros.in,v 1.39.2.18 2011/09/13 01:12:51 jbj Exp $ # # This is a global RPM configuration file. All changes made here will # be lost when the rpm package is upgraded. Any per-system configuration @@ -69,12 +69,18 @@ %__cvs @__CVS@ %__db_archive @__DB_ARCHIVE@ %__db_checkpoint @__DB_CHECKPOINT@ +%__db_deadlock @__DB_DEADLOCK@ %__db_dump @__DB_DUMP@ +%__db_hotbackup @__DB_HOTBACKUP@ %__db_load @__DB_LOAD@ %__db_log_verify @__DB_LOG_VERIFY@ %__db_printlog @__DB_PRINTLOG@ %__db_recover @__DB_RECOVER@ +%__db_replicate @__DB_REPLICATE@ %__db_stat @__DB_STAT@ +%__dbsql @__DBSQL@ +%__db_sql_codegen @__DB_SQL_CODEGEN@ +%__db_tuner @__DB_TUNER@ %__db_upgrade @__DB_UPGRADE@ %__db_verify @__DB_VERIFY@ %__diff @__DIFF@ @@ . patch -p0 <<'@@ .' Index: rpm/rpmdb/db3.c ============================================================================ $ cvs diff -u -r1.156.2.7 -r1.156.2.8 db3.c --- rpm/rpmdb/db3.c 5 Sep 2011 23:49:40 -0000 1.156.2.7 +++ rpm/rpmdb/db3.c 13 Sep 2011 01:12:52 -0000 1.156.2.8 @@ -2541,6 +2541,14 @@ break; #if defined(DB_HEAP) /* XXX FIXME: db-5.2.28 parameters */ case DB_HEAP: + if (dbi->dbi_heapsize) { + static uint32_t _gbytes = 0; + static uint32_t _bytes = dbi->db_heapsize; +assert(_heapsize >= (3 * dbi->dbi_pagesize)); + rc = db->set_heapsize(db, _gbytes, _bytes); + rc = cvtdberr(dbi, "db->set_heapsize", rc, _debug); + if (rc) break; + } break; #endif } @@ . patch -p0 <<'@@ .' Index: rpm/rpmdb/dbconfig.c ============================================================================ $ cvs diff -u -r1.78.4.1 -r1.78.4.2 dbconfig.c --- rpm/rpmdb/dbconfig.c 5 Sep 2011 23:49:40 -0000 1.78.4.1 +++ rpm/rpmdb/dbconfig.c 13 Sep 2011 01:12:52 -0000 1.78.4.2 @@ -240,7 +240,7 @@ NULL, NULL }, { "queue", 0,POPT_ARG_VAL, &db3dbi.dbi_type, DB_QUEUE, NULL, NULL }, -#if defined(WITH_DB) && defined(DB_HEAP) +#if defined(DB_HEAP) { "heap", 0,POPT_ARG_VAL, &db3dbi.dbi_type, DB_HEAP, NULL, NULL }, #endif @@ -315,6 +315,8 @@ #endif { "pagesize", 0,POPT_ARG_INT, &db3dbi.dbi_pagesize, 0, NULL, NULL }, + { "heapsize", 0,POPT_ARG_INT, &db3dbi.dbi_heapsize, 0, + NULL, NULL }, #if defined(WITH_DB) { "region_init", 0,POPT_ARG_VAL, &db3dbi.dbi_region_init, 1, @@ . patch -p0 <<'@@ .' Index: rpm/rpmdb/rpmdb.h ============================================================================ $ cvs diff -u -r1.141.2.3 -r1.141.2.4 rpmdb.h --- rpm/rpmdb/rpmdb.h 5 Sep 2011 23:08:24 -0000 1.141.2.3 +++ rpm/rpmdb/rpmdb.h 13 Sep 2011 01:12:52 -0000 1.141.2.4 @@ -389,6 +389,7 @@ #endif /* dbinfo parameters */ int dbi_pagesize; /*!< (fs blksize) */ + int dbi_heapsize; /*!< DB_HEAP */ /*@unused@*/ /*@null@*/ void * (*dbi_malloc) (size_t nbytes) /*@*/; @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmltc.h ============================================================================ $ cvs diff -u -r1.2 -r1.2.4.1 rpmltc.h --- rpm/rpmio/rpmltc.h 12 Jun 2010 14:32:07 -0000 1.2 +++ rpm/rpmio/rpmltc.h 13 Sep 2011 01:12:52 -0000 1.2.4.1 @@ -11,8 +11,8 @@ /* Implementation specific includes. */ #if defined(_RPMLTC_INTERNAL) -#include <tomcrypt.h> -#include <tommath.h> +#include <tomcrypt/tomcrypt.h> +#include <tommath/tommath.h> #endif /** @@ . patch -p0 <<'@@ .' Index: rpm/ruby/Makefile.am ============================================================================ $ cvs diff -u -r1.11.2.1 -r1.11.2.2 Makefile.am --- rpm/ruby/Makefile.am 3 Apr 2011 19:15:55 -0000 1.11.2.1 +++ rpm/ruby/Makefile.am 13 Sep 2011 01:12:53 -0000 1.11.2.2 @@ -44,7 +44,7 @@ $(top_builddir)/build/librpmbuild.la \ $(RPM_LDADD_COMMON) -pkglibdir = @WITH_RUBY_VENDORARCHDIR@ +pkglibdir = @USRLIBRPM@/lib pkgbindir = @USRLIBRPM@/bin pkgbin_PROGRAMS = trb @@ -79,6 +79,6 @@ .PHONY: check-local check-local: - -(cd test; rake test; cd ..) -#-./trb +# -(cd test; rake test; cd ..) +# -./trb @@ . patch -p0 <<'@@ .' Index: rpm/tests/ref/manifest ============================================================================ $ cvs diff -u -r1.17.2.2 -r1.17.2.3 manifest --- rpm/tests/ref/manifest 5 Sep 2011 12:56:08 -0000 1.17.2.2 +++ rpm/tests/ref/manifest 13 Sep 2011 01:12:53 -0000 1.17.2.3 @@ -37,6 +37,7 @@ edos-test/window-0-0.noarch.rpm edos-test/window-1-0.noarch.rpm edos-test/window-2-0.noarch.rpm +lua-test/lua-test-1.2-3.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.x86_64.rpm @@ . patch -p0 <<'@@ .' Index: rpm/tests/ref/showrc ============================================================================ $ cvs diff -u -r1.37.2.3 -r1.37.2.4 showrc --- rpm/tests/ref/showrc 5 Sep 2011 23:08:25 -0000 1.37.2.3 +++ rpm/tests/ref/showrc 13 Sep 2011 01:12:53 -0000 1.37.2.4 @@ -41,7 +41,7 @@ cpuinfo(aperfmperf) cpuinfo(apic) cpuinfo(arch_perfmon) - cpuinfo(bogomips) = 5867.42 + cpuinfo(bogomips) = 5866.92 cpuinfo(bts) cpuinfo(cache_size) = 8192_KB cpuinfo(clflush) @@ -219,12 +219,17 @@ -14: __cxx g++ -14: __db_archive /usr/bin/db52_archive -14: __db_checkpoint /usr/bin/db52_checkpoint +-14: __db_deadlock /usr/bin/db52_deadlock -14: __db_dump /usr/bin/db52_dump +-14: __db_hotbackup /usr/bin/db52_hotbackup -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_replicate /usr/bin/db52_replicate +-14: __db_sql_codegen /usr/bin/db52_stat -14: __db_stat /usr/bin/db52_stat +-14: __db_tuner /usr/bin/db52_stat -14: __db_upgrade /usr/bin/db52_upgrade -14: __db_verify /usr/bin/db52_verify -14: __dbi_btconfig @@ -242,6 +247,7 @@ -14: __dbi_sqlconfig perms=0644 %{?_tmppath:tmpdir=%{_tmppath}} -14: __dbi_transient %{?__dbi_rebuild} temporary private -14: __dbi_txn create %{?__nofsync:nofsync} lock log mpool txn auto_commit thread thread_count=64 +-14: __dbsql /usr/bin/db52_stat -14: __debug_install_post %{_rpmhome}/find-debuginfo.sh %{?_missing_build_ids_terminate_build:--strict-build-id} %{?_find_debuginfo_opts} "%{_builddir}/%{?buildsubdir}" %{nil} @@ -276,7 +282,9 @@ -14: __libtoolize libtoolize -14: __ln /bin/ln -14: __ln_s ln -s +-14: __lrzip /usr/bin/lrzip -14: __lua %{_usrlibrpmbin}/lua +-14: __lzip /usr/bin/lzip -14: __lzma /usr/bin/lzma -14: __lzop /usr/bin/lzop -14: __make /usr/bin/make @@ -301,17 +309,7 @@ -14: __pgp %{_bindir}/pgp -14: __pkgconfig_provides %{nil} -14: __pkgconfig_requires %{nil} --14: __policy_tree %{expand:%%global __policy_tree %{lua: -t="targeted" -f = io.open("/etc/selinux/config") -if f then - for l in f:lines() do - if "SELINUXTYPE=" == string.sub(l,0,12) then t=string.sub(l,13); end - end - f:close() -end -print (t) -}}%{__policy_tree} +-14: __policy_tree targeted -14: __ranlib ranlib -14: __rc %{_usrlibrpmbin}/rc -14: __remsh %{__rsh} @@ -812,4 +810,4 @@ %nil -14: with %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}} -14: without %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}} -======================== active 482 empty 0 +======================== active 490 empty 0 @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
