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: 10-May-2016 19:08:11
Branch: rpm-5_4 Handle: 2016051017081000
Modified files: (Branch: rpm-5_4)
rpm/tests Makefile.am macros.in rpm.suppress
rpm/tests/ref git.out manifest showrc version
Log:
- sanity.
Summary:
Revision Changes Path
1.95.2.78 +3 -2 rpm/tests/Makefile.am
1.34.2.10 +5 -0 rpm/tests/macros.in
1.1.2.5 +24 -24 rpm/tests/ref/git.out
1.17.2.5 +0 -14 rpm/tests/ref/manifest
1.37.2.13 +30 -26 rpm/tests/ref/showrc
1.5.2.12 +2 -2 rpm/tests/ref/version
1.1.2.6 +2 -0 rpm/tests/rpm.suppress
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/tests/Makefile.am
============================================================================
$ cvs diff -u -r1.95.2.77 -r1.95.2.78 Makefile.am
--- rpm/tests/Makefile.am 20 Apr 2016 10:53:59 -0000 1.95.2.77
+++ rpm/tests/Makefile.am 10 May 2016 17:08:10 -0000 1.95.2.78
@@ -1,6 +1,7 @@
## Process this file with automake to produce Makefile.in.
-export LSAN_OPTIONS=exitcode=0:suppressions=$(shell
pwd)/rpm.suppress:print_suppressions=0
+export ASAN_OPTIONS=detect_leaks=1
+export LSAN_OPTIONS=exitcode=0:suppressions=$(shell
pwd)/rpm.suppress:print_suppressions=0 # :report_objects=1
AUTOMAKE_OPTIONS = 1.4 foreign
@@ -387,7 +388,7 @@
check-build: $(BUILD_DIRS)
@echo "=== $@ ==="
- @ls -1 */*.rpm | grep -v '^dir2symlink' | grep -v '^sql-test' >
tmp/manifest
+ @ls -1 */*.rpm | grep -v '^dir2symlink' | grep -v '^sql-test' | sort >
tmp/manifest
@diff -u {tmp,$(srcdir)/ref}/manifest || ${cp} {tmp,ref}/manifest
@rm -rf tmp/cachedb
@${mkdir} -p tmp/cachedb/log tmp/cachedb/tmp
@@ .
patch -p0 <<'@@ .'
Index: rpm/tests/macros.in
============================================================================
$ cvs diff -u -r1.34.2.9 -r1.34.2.10 macros.in
--- rpm/tests/macros.in 20 Apr 2016 10:40:06 -0000 1.34.2.9
+++ rpm/tests/macros.in 10 May 2016 17:08:10 -0000 1.34.2.10
@@ -121,6 +121,11 @@
import rpm\
%{nil}
+%_squirrelI_init \
+print("_squirrelI_init\
+");\
+%{nil}
+
# XXX overload the Debian tags config macro for now
%_arbitrary_tags_debian CVEID:RHSA:RHBZ:ATAS
@@ .
patch -p0 <<'@@ .'
Index: rpm/tests/ref/git.out
============================================================================
$ cvs diff -u -r1.1.2.4 -r1.1.2.5 git.out
--- rpm/tests/ref/git.out 20 Apr 2016 10:38:47 -0000 1.1.2.4
+++ rpm/tests/ref/git.out 10 May 2016 17:08:10 -0000 1.1.2.5
@@ -1,18 +1,18 @@
Initialized empty Git repository in /home/X/src/wdj54/tests/tmp/git/
Created empty initial commit
-commit 4a77a6f89d0e73af1fe22fed94a775ead6bb56b9
+commit 2a33016ed3a732e8ac7766fbcc7895e059bcf88b
Author: Jack Spratt <some...@nowhere.org>
-Date: Wed Apr 20 06:14:37 2016 -0400
+Date: Mon May 9 15:02:30 2016 -0400
RPM init commit
-commit 4a77a6f89d0e73af1fe22fed94a775ead6bb56b9
+commit 2a33016ed3a732e8ac7766fbcc7895e059bcf88b
Author: Jack Spratt <some...@nowhere.org>
-Date: Wed Apr 20 06:14:37 2016 -0400
+Date: Mon May 9 15:02:30 2016 -0400
RPM init commit
-commit 33ba09dc148de93c3ac3cb747472177b2821b2bc
+commit 1b23c7e72db0316f7085b89596ad3350a5ecd02f
Author: Jeff Johnson <j...@jbj.org>
-Date: Wed Apr 20 06:14:37 2016 -0400
+Date: Mon May 9 15:02:30 2016 -0400
RPM add commit
@@ -21,14 +21,14 @@
foo | 1 +
3 files changed, 3 insertions(+)
-commit 4a77a6f89d0e73af1fe22fed94a775ead6bb56b9
+commit 2a33016ed3a732e8ac7766fbcc7895e059bcf88b
Author: Jack Spratt <some...@nowhere.org>
-Date: Wed Apr 20 06:14:37 2016 -0400
+Date: Mon May 9 15:02:30 2016 -0400
RPM init commit
-commit 33ba09dc148de93c3ac3cb747472177b2821b2bc
+commit 1b23c7e72db0316f7085b89596ad3350a5ecd02f
Author: Jeff Johnson <j...@jbj.org>
-Date: Wed Apr 20 06:14:37 2016 -0400
+Date: Mon May 9 15:02:30 2016 -0400
RPM add commit
@@ -37,20 +37,20 @@
foo | 1 +
3 files changed, 3 insertions(+)
-commit 4a77a6f89d0e73af1fe22fed94a775ead6bb56b9
+commit 2a33016ed3a732e8ac7766fbcc7895e059bcf88b
Author: Jack Spratt <some...@nowhere.org>
-Date: Wed Apr 20 06:14:37 2016 -0400
+Date: Mon May 9 15:02:30 2016 -0400
RPM init commit
-commit dc68e3775fbc0868b077d2902d7f996e3125125d
+commit 5bb581466b8f358427ac3357b7354b5d5f1c41c3
Author: Jeff Johnson <j...@jbj.org>
-Date: Wed Apr 20 06:14:38 2016 -0400
+Date: Mon May 9 15:02:31 2016 -0400
RPM modify commit
-commit 33ba09dc148de93c3ac3cb747472177b2821b2bc
+commit 1b23c7e72db0316f7085b89596ad3350a5ecd02f
Author: Jeff Johnson <j...@jbj.org>
-Date: Wed Apr 20 06:14:37 2016 -0400
+Date: Mon May 9 15:02:30 2016 -0400
RPM add commit
@@ -59,20 +59,20 @@
foo | 1 +
3 files changed, 3 insertions(+)
-commit 4a77a6f89d0e73af1fe22fed94a775ead6bb56b9
+commit 2a33016ed3a732e8ac7766fbcc7895e059bcf88b
Author: Jack Spratt <some...@nowhere.org>
-Date: Wed Apr 20 06:14:37 2016 -0400
+Date: Mon May 9 15:02:30 2016 -0400
RPM init commit
-commit dc68e3775fbc0868b077d2902d7f996e3125125d
+commit 5bb581466b8f358427ac3357b7354b5d5f1c41c3
Author: Jeff Johnson <j...@jbj.org>
-Date: Wed Apr 20 06:14:38 2016 -0400
+Date: Mon May 9 15:02:31 2016 -0400
RPM modify commit
-commit 33ba09dc148de93c3ac3cb747472177b2821b2bc
+commit 1b23c7e72db0316f7085b89596ad3350a5ecd02f
Author: Jeff Johnson <j...@jbj.org>
-Date: Wed Apr 20 06:14:37 2016 -0400
+Date: Mon May 9 15:02:30 2016 -0400
RPM add commit
@@ -81,8 +81,8 @@
foo | 1 +
3 files changed, 3 insertions(+)
-commit 4a77a6f89d0e73af1fe22fed94a775ead6bb56b9
+commit 2a33016ed3a732e8ac7766fbcc7895e059bcf88b
Author: Jack Spratt <some...@nowhere.org>
-Date: Wed Apr 20 06:14:37 2016 -0400
+Date: Mon May 9 15:02:30 2016 -0400
RPM init commit
@@ .
patch -p0 <<'@@ .'
Index: rpm/tests/ref/manifest
============================================================================
$ cvs diff -u -r1.17.2.4 -r1.17.2.5 manifest
--- rpm/tests/ref/manifest 26 Apr 2012 18:44:56 -0000 1.17.2.4
+++ rpm/tests/ref/manifest 10 May 2016 17:08:10 -0000 1.17.2.5
@@ -1,5 +1,4 @@
arbitrarytag/arbitrarytag-1.0-1.noarch.rpm
-augtool-test/augtool-test-1.0-1.src.rpm
cAos2-stub/cAos2-stub-1-0.noarch.rpm
config-test/config-test-1.2-0.1.noarch.rpm
cudf-test/battery-3-0.noarch.rpm
@@ -23,16 +22,6 @@
cudf-test/window-2-0.noarch.rpm
cudf-test/window-3-0.noarch.rpm
devtool-sanity/devtool-sanity-1.0-1.noarch.rpm
-dir2symlink/dir2symlink-lua-1-1.noarch.rpm
-dir2symlink/dir2symlink-lua-2-1.noarch.rpm
-dir2symlink/dir2symlink-perl-1-1.noarch.rpm
-dir2symlink/dir2symlink-perl-2-1.noarch.rpm
-dir2symlink/dir2symlink-python-1-1.noarch.rpm
-dir2symlink/dir2symlink-python-2-1.noarch.rpm
-dir2symlink/dir2symlink-ruby-1-1.noarch.rpm
-dir2symlink/dir2symlink-ruby-2-1.noarch.rpm
-dir2symlink/dir2symlink-tcl-1-1.noarch.rpm
-dir2symlink/dir2symlink-tcl-2-1.noarch.rpm
edos-test/car-1-0.noarch.rpm
edos-test/door-1-0.noarch.rpm
edos-test/door-2-0.noarch.rpm
@@ -50,14 +39,11 @@
edos-test/window-2-0.noarch.rpm
lua-test/lua-test-1.2-3.noarch.rpm
millionfile-insanity/millionfile-insanity-1.0-1.src.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
probes-test/probes-1-0.noarch.rpm
probes-test/probes-2-0.noarch.rpm
rpm-arg-max-doc/rpm-arg-max-doc-1.0-1.src.rpm
rpm-size-limit/rpm-size-limit-1.0-1.src.rpm
-sql-test/sql-test-1.0-1.noarch.rpm
test-change-dir-to-symlink/test-change-dir-to-symlink-1-1.src.rpm
test-change-dir-to-symlink/test-change-dir-to-symlink-1-2.src.rpm
test-excludeunpackagefile/test-excludeunpackagefile-1.0-1.src.rpm
@@ .
patch -p0 <<'@@ .'
Index: rpm/tests/ref/showrc
============================================================================
$ cvs diff -u -r1.37.2.12 -r1.37.2.13 showrc
--- rpm/tests/ref/showrc 14 Mar 2016 20:33:41 -0000 1.37.2.12
+++ rpm/tests/ref/showrc 10 May 2016 17:08:10 -0000 1.37.2.13
@@ -10,7 +10,7 @@
optflags : -O2
LUA MODULES:
-luafiles :
/usr/lib/rpm-5.4.16/init.lua:/usr/lib/rpm-5.4.16/rpmlua:/usr/lib/rpm-5.4.16/x86_64-linux/rpmlua:/etc/rpm/5.4.16/rpmlua.*:/etc/rpm/5.4.16/rpmlua:/etc/rpm/5.4.16/x86_64-linux/rpmlua:~/.rpmlua-5.4.16
+luafiles :
/usr/lib/rpm-5.4.17/init.lua:/usr/lib/rpm-5.4.17/rpmlua:/usr/lib/rpm-5.4.17/x86_64-linux/rpmlua:/etc/rpm/5.4.17/rpmlua.*:/etc/rpm/5.4.17/rpmlua:/etc/rpm/5.4.17/x86_64-linux/rpmlua:~/.rpmlua-5.4.17
LUA_PATH :
/usr/local/share/lua//?.lua;/usr/local/share/lua//?/init.lua;/usr/local/lib/lua//?.lua;/usr/local/lib/lua//?/init.lua;./?.lua/usr/local/share/lua/5.3/?.lua;/usr/local/share/lua/5.3/?/init.lua;/usr/local/lib/lua/5.3/?.lua;/usr/local/lib/lua/5.3/?/init.lua;./?.lua;./?/init.lua
LUA_CPATH :
/usr/local/lib/lua//?.so;/usr/local/lib/lua//loadall.so;./?.so/usr/local/lib/lua/5.3/?.so;/usr/local/lib/lua/5.3/loadall.so;./?.so
@@ -49,14 +49,14 @@
cpuinfo(aperfmperf)
cpuinfo(apic)
cpuinfo(arch_perfmon)
- cpuinfo(bogomips) = 4999.74
+ cpuinfo(bogomips) = 4999.78
cpuinfo(bts)
cpuinfo(cache_size) = 6144_KB
cpuinfo(clflush)
cpuinfo(clflush_size) = 64
cpuinfo(cmov)
cpuinfo(constant_tsc)
- cpuinfo(cpu_MHz) = 750.000
+ cpuinfo(cpu_MHz) = 600.000
cpuinfo(cpu_family) = 6
cpuinfo(cx16)
cpuinfo(cx8)
@@ -189,7 +189,7 @@
%{___build_pre}
%{nil}
-14: __aclocal aclocal
--14: __ar ar
+-14: __ar /usr/bin/gcc-ar
-14: __arch_install_post %{nil}
-14: __as /usr/bin/as
-14: __autoconf autoconf
@@ -212,21 +212,21 @@
-14: __curl /usr/bin/curl
-14: __cvs /usr/bin/cvs
-14: __cxx g++
--14: __db_archive /usr/bin/db61_archive
--14: __db_checkpoint /usr/bin/db61_checkpoint
--14: __db_deadlock /usr/bin/db61_deadlock
--14: __db_dump /usr/bin/db61_dump
--14: __db_hotbackup /usr/bin/db61_hotbackup
--14: __db_load /usr/bin/db61_load
--14: __db_log_verify /usr/bin/db61_log_verify
--14: __db_printlog /usr/bin/db61_printlog
--14: __db_recover /usr/bin/db61_recover
--14: __db_replicate /usr/bin/db61_replicate
--14: __db_sql_codegen /usr/bin/db61_sql_codegen
--14: __db_stat /usr/bin/db61_stat
--14: __db_tuner /usr/bin/db61_tuner
--14: __db_upgrade /usr/bin/db61_upgrade
--14: __db_verify /usr/bin/db61_verify
+-14: __db_archive /usr/bin/db62_archive
+-14: __db_checkpoint /usr/bin/db62_checkpoint
+-14: __db_deadlock /usr/bin/db62_deadlock
+-14: __db_dump /usr/bin/db62_dump
+-14: __db_hotbackup /usr/bin/db62_hotbackup
+-14: __db_load /usr/bin/db62_load
+-14: __db_log_verify /usr/bin/db62_log_verify
+-14: __db_printlog /usr/bin/db62_printlog
+-14: __db_recover /usr/bin/db62_recover
+-14: __db_replicate /usr/bin/db62_replicate
+-14: __db_sql_codegen /usr/bin/db62_sql_codegen
+-14: __db_stat /usr/bin/db62_stat
+-14: __db_tuner /usr/bin/db62_tuner
+-14: __db_upgrade /usr/bin/db62_upgrade
+-14: __db_verify /usr/bin/db62_verify
-14: __dbi_btconfig
btree
%{?__dbi_other}
@@ -242,8 +242,8 @@
-14: __dbi_sqlconfig %{?__dbi_perms} %{?__dbi_tmpdir}
-14: __dbi_tmpdir tmpdir=%{_dbpath}/tmp
-14: __dbi_transient %{?__dbi_rebuild} temporary private
--14: __dbi_txn create %{?__nofsync:nofsync} lock log mpool txn
multiversion auto_commit thread thread_count=64
--14: __dbsql /usr/bin/db61sql
+-14: __dbi_txn create %{?__nofsync:nofsync} lock log mpool txn
multiversion auto_commit thread thread_count=4096
+-14: __dbsql /usr/bin/db62sql
-14: __debug_install_post
%{_rpmhome}/find-debuginfo.sh
%{?_missing_build_ids_terminate_build:--strict-build-id}
%{?_find_debuginfo_opts} "%{_builddir}/%{?buildsubdir}"
%{nil}
@@ -307,7 +307,7 @@
-14: __pkgconfig_provides %{nil}
-14: __pkgconfig_requires %{nil}
-14: __policy_tree targeted
--14: __ranlib ranlib
+-14: __ranlib /usr/bin/gcc-ranlib --plugin
/usr/libexec/gcc/x86_64-redhat-linux/6.1.1/liblto_plugin.so
-14: __rc %{_usrlibrpmbin}/rc
-14: __remsh %{__rsh}
-14: __rm /usr/bin/rm
@@ -404,7 +404,7 @@
-14: __svn /usr/bin/svn
-14: __tar /usr/bin/tar
-14: __unzip /usr/bin/unzip
--14: __varcacherpm %{_var}/cache/rpm-5.4.16
+-14: __varcacherpm %{_var}/cache/rpm-5.4.17
-14: __varlibwdj %{_topdir}/tmp/wdj/
-14: __vcheck %{__perl} %{_rpmhome}/vcheck
-14: __vsflags 0xf0000
@@ -684,7 +684,7 @@
-14: _rpmgi_pattern_regex ^.+/%1-[^-]+-[^-]+\.[^.]+\.rpm$
-14: _rpmgio .ufdio
-14: _rpmhome %{_usrlibrpm}
--14: _rpmversion 5.4.16
+-14: _rpmversion 5.4.17
-14: _rubyI_init %{nil}
-14: _sbindir %{_exec_prefix}/sbin
-14: _sharedstatedir %{_prefix}/com
@@ -699,6 +699,10 @@
-14: _sourcedir %{_ntopdir}
-14: _spec_line_buffer_size 100000
-14: _specdir %{_ntopdir}
+-14: _squirrelI_init
+print("_squirrelI_init
+");
+%{nil}
-14: _srcrpmdir %{_ntopdir}
-14: _sysconfdir %{_prefix}/etc
-11= _target x86_64-linux
@@ -716,7 +720,7 @@
-14: _unsafe_rollbacks 0
-14: _use_internal_dependency_generator 2
-14: _usr /usr
--14= _usrlibrpm /usr/lib/rpm-5.4.16
+-14= _usrlibrpm /usr/lib/rpm-5.4.17
-14: _usrlibrpmbin %{_usrlibrpm}/bin
-14: _usrsrc %{_usr}/src
-14: _uuid_auth http://rpm5.org/
@@ -887,4 +891,4 @@
%nil
-14: with %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
-14: without %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
-======================== active 526 empty 0
+======================== active 527 empty 0
@@ .
patch -p0 <<'@@ .'
Index: rpm/tests/ref/version
============================================================================
$ cvs diff -u -r1.5.2.11 -r1.5.2.12 version
--- rpm/tests/ref/version 20 Apr 2016 10:38:47 -0000 1.5.2.11
+++ rpm/tests/ref/version 10 May 2016 17:08:10 -0000 1.5.2.12
@@ -1,2 +1,2 @@
-rpm (RPM) 5.4.16
-rpmlib 0x28904000,0x7e047800,0x52504d35
+rpm (RPM) 5.4.17
+rpmlib 0x28904400,0x7e04a800,0x52504d35
@@ .
patch -p0 <<'@@ .'
Index: rpm/tests/rpm.suppress
============================================================================
$ cvs diff -u -r1.1.2.5 -r1.1.2.6 rpm.suppress
--- rpm/tests/rpm.suppress 11 Apr 2016 09:21:19 -0000 1.1.2.5
+++ rpm/tests/rpm.suppress 10 May 2016 17:08:10 -0000 1.1.2.6
@@ -1,6 +1,8 @@
# --- glibc
leak:__GI___strdup
leak:__GI___strndup
+leak:__strdup
+leak:__strndup
# --- popt
leak:expandNextArg
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
