[arch-commits] Commit in subversion/repos (22 files)
Felix Yan
fyan at archlinux.org
Wed Jun 3 08:03:44 UTC 2015
Date: Wednesday, June 3, 2015 @ 10:03:44
Author: fyan
Revision: 240282
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
subversion/repos/staging-i686/
subversion/repos/staging-i686/PKGBUILD
(from rev 240281, subversion/trunk/PKGBUILD)
subversion/repos/staging-i686/fix_ruby22_tests.patch
(from rev 240281, subversion/trunk/fix_ruby22_tests.patch)
subversion/repos/staging-i686/subversion.install
(from rev 240281, subversion/trunk/subversion.install)
subversion/repos/staging-i686/subversion.rpath.fix.patch
(from rev 240281, subversion/trunk/subversion.rpath.fix.patch)
subversion/repos/staging-i686/svn
(from rev 240281, subversion/trunk/svn)
subversion/repos/staging-i686/svnserve.conf
(from rev 240281, subversion/trunk/svnserve.conf)
subversion/repos/staging-i686/svnserve.service
(from rev 240281, subversion/trunk/svnserve.service)
subversion/repos/staging-i686/svnserve.tmpfiles
(from rev 240281, subversion/trunk/svnserve.tmpfiles)
subversion/repos/staging-i686/wc-queries-test1-r1672295.patch
(from rev 240281, subversion/trunk/wc-queries-test1-r1672295.patch)
subversion/repos/staging-i686/wc-queries-test2-r1673691.patch
(from rev 240281, subversion/trunk/wc-queries-test2-r1673691.patch)
subversion/repos/staging-x86_64/
subversion/repos/staging-x86_64/PKGBUILD
(from rev 240281, subversion/trunk/PKGBUILD)
subversion/repos/staging-x86_64/fix_ruby22_tests.patch
(from rev 240281, subversion/trunk/fix_ruby22_tests.patch)
subversion/repos/staging-x86_64/subversion.install
(from rev 240281, subversion/trunk/subversion.install)
subversion/repos/staging-x86_64/subversion.rpath.fix.patch
(from rev 240281, subversion/trunk/subversion.rpath.fix.patch)
subversion/repos/staging-x86_64/svn
(from rev 240281, subversion/trunk/svn)
subversion/repos/staging-x86_64/svnserve.conf
(from rev 240281, subversion/trunk/svnserve.conf)
subversion/repos/staging-x86_64/svnserve.service
(from rev 240281, subversion/trunk/svnserve.service)
subversion/repos/staging-x86_64/svnserve.tmpfiles
(from rev 240281, subversion/trunk/svnserve.tmpfiles)
subversion/repos/staging-x86_64/wc-queries-test1-r1672295.patch
(from rev 240281, subversion/trunk/wc-queries-test1-r1672295.patch)
subversion/repos/staging-x86_64/wc-queries-test2-r1673691.patch
(from rev 240281, subversion/trunk/wc-queries-test2-r1673691.patch)
------------------------------------------------+
staging-i686/PKGBUILD | 113 ++++++++++++++
staging-i686/fix_ruby22_tests.patch | 174 +++++++++++++++++++++++
staging-i686/subversion.install | 7
staging-i686/subversion.rpath.fix.patch | 10 +
staging-i686/svn | 11 +
staging-i686/svnserve.conf | 5
staging-i686/svnserve.service | 11 +
staging-i686/svnserve.tmpfiles | 1
staging-i686/wc-queries-test1-r1672295.patch | 51 ++++++
staging-i686/wc-queries-test2-r1673691.patch | 56 +++++++
staging-x86_64/PKGBUILD | 113 ++++++++++++++
staging-x86_64/fix_ruby22_tests.patch | 174 +++++++++++++++++++++++
staging-x86_64/subversion.install | 7
staging-x86_64/subversion.rpath.fix.patch | 10 +
staging-x86_64/svn | 11 +
staging-x86_64/svnserve.conf | 5
staging-x86_64/svnserve.service | 11 +
staging-x86_64/svnserve.tmpfiles | 1
staging-x86_64/wc-queries-test1-r1672295.patch | 51 ++++++
staging-x86_64/wc-queries-test2-r1673691.patch | 56 +++++++
20 files changed, 878 insertions(+)
Copied: subversion/repos/staging-i686/PKGBUILD (from rev 240281, subversion/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2015-06-03 08:03:44 UTC (rev 240282)
@@ -0,0 +1,113 @@
+# $Id$
+# Maintainer: Angel Velasquez <angvp at archlinux.org>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
+# Contributor: Paul Mattal <paul at archlinux.org>
+# Contributor: Jason Chu <jason at archlinux.org>
+
+pkgname=subversion
+pkgver=1.8.13
+pkgrel=2
+pkgdesc="A Modern Concurrent Version Control System"
+arch=('i686' 'x86_64')
+url="http://subversion.apache.org/"
+license=('APACHE')
+depends=('sqlite' 'file' 'serf' 'systemd')
+makedepends=('apache' 'python2' 'perl' 'swig' 'java-environment'
+ 'libgnome-keyring' 'kdelibs' 'ruby')
+optdepends=('libgnome-keyring: for GNOME Keyring for auth credentials'
+ 'kdebase-runtime: for KWallet for auth credentials'
+ 'bash-completion: for svn bash completion'
+ 'python2: for some hook scripts'
+ 'java-environment: for Java support'
+ 'ruby: for some hook scripts')
+provides=('svn')
+backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve')
+options=('!makeflags' '!emptydirs')
+install=${pkgname}.install
+source=(http://www.apache.org/dist/subversion/subversion-${pkgver}.tar.bz2{,.asc}
+ svn
+ svnserve.conf
+ svnserve.tmpfiles
+ svnserve.service
+ subversion.rpath.fix.patch
+ fix_ruby22_tests.patch
+ wc-queries-test1-r1672295.patch
+ wc-queries-test2-r1673691.patch)
+md5sums=('4413417b529d7bdf82f74e50df02e88b'
+ 'SKIP'
+ 'a0db6dd43af33952739b6ec089852630'
+ 'af1dd703cc28e61d2e2a132ce3eec37a'
+ 'bb2857eceafcfac35dde39dcffad2314'
+ '733011145b8a8e74baf4c9fc9197b3e8'
+ '6b4340ba9d8845cd8497e013ae01be3f'
+ 'e5a59f43af24c103477e09bc1120831d'
+ 'b665db41811ba6fe30542c8cacfddb47'
+ '39d1956fb53289c60edef88453204e7c')
+validpgpkeys=('19BBCAEF7B19B280A0E2175E62D48FAD16A0DE01'
+ '8BC4DAE0C5A4D65F404401074F7DBAA99A59B973') # Ben Reser / Stefan Sperling
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -Np0 -i ../subversion.rpath.fix.patch
+ patch -p1 -i ../fix_ruby22_tests.patch
+ patch -p1 -i ../wc-queries-test1-r1672295.patch
+ patch -p1 -i ../wc-queries-test2-r1673691.patch
+ sed -i 's|/usr/bin/env python|/usr/bin/env python2|' tools/hook-scripts/{,mailer/{,tests/}}*.py
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ export PYTHON=/usr/bin/python2
+ ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \
+ --with-zlib=/usr --with-serf=/usr --with-apxs \
+ --with-sqlite=/usr \
+ --enable-javahl --with-jdk=/usr/lib/jvm/default \
+ --with-gnome-keyring --with-kwallet \
+ --with-apache-libexecdir=/usr/lib/httpd/modules \
+ --with-ruby-sitedir=/usr/lib/ruby/vendor_ruby \
+ --disable-static
+
+ make LT_LDFLAGS="-L$Fdestdir/usr/lib"
+ make swig_pydir=/usr/lib/python2.7/site-packages/libsvn \
+ swig_pydir_extra=/usr/lib/python2.7/site-packages/svn swig-py swig-pl javahl swig-rb
+}
+
+check() {
+ cd ${pkgname}-${pkgver}
+ export LANG=C LC_ALL=C
+ make check check-swig-pl check-swig-py check-swig-rb CLEANUP=yes # check-javahl
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+
+ export LD_LIBRARY_PATH="${pkgdir}"/usr/lib:${LD_LIBRARY_PATH}
+ make DESTDIR="${pkgdir}" INSTALLDIRS=vendor \
+ swig_pydir=/usr/lib/python2.7/site-packages/libsvn \
+ swig_pydir_extra=/usr/lib/python2.7/site-packages/svn \
+ install install-swig-py install-swig-pl install-javahl install-swig-rb
+
+ install -dm755 "${pkgdir}"/usr/share/subversion
+ cp -a tools/hook-scripts "${pkgdir}"/usr/share/subversion/
+ rm "${pkgdir}"/usr/share/subversion/hook-scripts/*.in
+
+ ## svnserve ...
+
+ # xinetd
+ install -D -m 644 "${srcdir}"/svn "${pkgdir}"/etc/xinetd.d/svn
+
+ # ... systemd
+ install -D -m 644 "${srcdir}"/svnserve.service "${pkgdir}"/usr/lib/systemd/system/svnserve.service
+ install -D -m 644 "${srcdir}"/svnserve.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/svnserve.conf
+
+ # ... common config
+ install -D -m 644 "${srcdir}"/svnserve.conf "${pkgdir}"/etc/conf.d/svnserve
+
+ install -Dm 644 tools/client-side/bash_completion \
+ "${pkgdir}"/usr/share/bash-completion/completions/subversion
+ for i in svn svnadmin svndumpfilter svnlook svnsync svnversion; do
+ ln -sf subversion "${pkgdir}"/usr/share/bash-completion/completions/${i}
+ done
+}
+
Copied: subversion/repos/staging-i686/fix_ruby22_tests.patch (from rev 240281, subversion/trunk/fix_ruby22_tests.patch)
===================================================================
--- staging-i686/fix_ruby22_tests.patch (rev 0)
+++ staging-i686/fix_ruby22_tests.patch 2015-06-03 08:03:44 UTC (rev 240282)
@@ -0,0 +1,174 @@
+commit 1bf46d7f134b24a8f594a0e108056aed67759590
+Author: Anatol Pomozov <anatol.pomozov at gmail.com>
+Date: Tue Dec 30 04:50:55 2014 -0800
+
+ Fix test for ruby 2.2
+
+ The main source of problems with ruby 2.2 is that it uses new test-unit framework
+ that changes some API.
+
+ In partcular all assert_* functions are void, but our tests expect bool. Change tests and do
+ not check output of assert_* functions.
+
+ Do not override TestCase::inherit function as it is used by the framework itself.
+
+ In ruby 2.2 bool is frozen object so we cannot modify it.
+
+diff --git a/subversion/bindings/swig/ruby/test/my-assertions.rb b/subversion/bindings/swig/ruby/test/my-assertions.rb
+index 77c42e7..91f7ad8 100644
+--- a/subversion/bindings/swig/ruby/test/my-assertions.rb
++++ b/subversion/bindings/swig/ruby/test/my-assertions.rb
+@@ -24,41 +24,13 @@ module Test
+ module Unit
+ module Assertions
+
+- # make an intermediary assertion block handler
+- def _my_assert_block(&block)
+- if RUBY_VERSION > '1.9'
+- assert_block do
+- yield
+- end
+- else
+- _wrap_assertion do
+- yield
+- end
+- end
+- end
+-
+- def assert_true(boolean, message=nil)
+- _my_assert_block do
+- assert_equal(true, boolean, message)
+- end
+- end
+-
+- def assert_false(boolean, message=nil)
+- _my_assert_block do
+- assert_equal(false, boolean, message)
+- end
+- end
+-
+ def assert_nested_sorted_array(expected, actual, message=nil)
+- _my_assert_block do
+ assert_equal(expected.collect {|elem| elem.sort},
+ actual.collect {|elem| elem.sort},
+ message)
+- end
+ end
+
+ def assert_equal_log_entries(expected, actual, message=nil)
+- _my_assert_block do
+ actual = actual.collect do |entry|
+ changed_paths = entry.changed_paths
+ changed_paths.each_key do |path|
+@@ -73,7 +45,6 @@ module Test
+ entry.has_children?]
+ end
+ assert_equal(expected, actual, message)
+- end
+ end
+ end
+ end
+diff --git a/subversion/bindings/swig/ruby/test/test-unit-ext.rb b/subversion/bindings/swig/ruby/test/test-unit-ext.rb
+index ce88d75..62a1508 100644
+--- a/subversion/bindings/swig/ruby/test/test-unit-ext.rb
++++ b/subversion/bindings/swig/ruby/test/test-unit-ext.rb
+@@ -18,6 +18,6 @@
+ # ====================================================================
+
+ require "test-unit-ext/always-show-result" if RUBY_VERSION < '1.9.3'
+-require "test-unit-ext/priority"
++#require "test-unit-ext/priority"
+ require "test-unit-ext/backtrace-filter" if RUBY_VERSION < '1.9.3'
+ require "test-unit-ext/long-display-for-emacs" if RUBY_VERSION < '1.9.3'
+diff --git a/subversion/bindings/swig/ruby/test/test_delta.rb b/subversion/bindings/swig/ruby/test/test_delta.rb
+index 541a4fe..90c1e3b 100644
+--- a/subversion/bindings/swig/ruby/test/test_delta.rb
++++ b/subversion/bindings/swig/ruby/test/test_delta.rb
+@@ -48,7 +48,6 @@ class SvnDeltaTest < Test::Unit::TestCase
+ target = StringIO.new(t)
+ stream = Svn::Delta::TextDeltaStream.new(source, target)
+ assert_nil(stream.md5_digest)
+- _my_assert_block do
+ ret = stream.each do |window|
+ window.ops.each do |op|
+ op_size = op.offset + op.length
+@@ -64,8 +63,6 @@ class SvnDeltaTest < Test::Unit::TestCase
+ end
+ end
+ end
+- true if RUBY_VERSION > '1.9' # this block returns nil in > ruby '1.9'
+- end
+ assert_equal(Digest::MD5.hexdigest(t), stream.md5_digest)
+ end
+
+@@ -84,7 +81,6 @@ class SvnDeltaTest < Test::Unit::TestCase
+ end
+ end
+
+- _my_assert_block do
+ composed_window.ops.each do |op|
+ op_size = op.offset + op.length
+ case op.action_code
+@@ -98,7 +94,6 @@ class SvnDeltaTest < Test::Unit::TestCase
+ flunk
+ end
+ end
+- end
+ end
+
+ def test_txdelta_apply_instructions
+diff --git a/subversion/bindings/swig/ruby/test/test_repos.rb b/subversion/bindings/swig/ruby/test/test_repos.rb
+index 89ca8c1..6745200 100644
+--- a/subversion/bindings/swig/ruby/test/test_repos.rb
++++ b/subversion/bindings/swig/ruby/test/test_repos.rb
+@@ -678,7 +678,8 @@ class SvnReposTest < Test::Unit::TestCase
+
+ dest_path = File.join(@tmp_path, "dest")
+ Svn::Repos.create(dest_path) do |repos|
+- assert_raises(NoMethodError) do
++ assert_raises(RuntimeError) do
++ # Can't modify frozen object
+ repos.load_fs(nil)
+ end
+ end
+diff --git a/subversion/bindings/swig/ruby/test/test_wc.rb b/subversion/bindings/swig/ruby/test/test_wc.rb
+index 3a2aa65..2313e60 100644
+--- a/subversion/bindings/swig/ruby/test/test_wc.rb
++++ b/subversion/bindings/swig/ruby/test/test_wc.rb
+@@ -411,7 +411,7 @@ EOE
+ end
+ end
+
+- def test_status
++ def test_status2
+ source = "source"
+ file1 = "file1"
+ file2 = "file2"
+@@ -534,7 +534,6 @@ EOE
+ ctx.ci(lf_path)
+
+ Svn::Wc::AdmAccess.open(nil, @wc_path, true, 5) do |access|
+- _my_assert_block do
+ File.open(src_path, "wb") {|f| f.print(source)}
+ args = [method_name, src_path, crlf_path, Svn::Wc::TRANSLATE_FROM_NF]
+ result = yield(access.send(*args), source)
+@@ -553,7 +552,6 @@ EOE
+ result ||= File.open(src_path, "rb") {|f| f.read}
+ assert_equal(lf_source, result)
+ end
+- end
+ end
+ end
+
+@@ -1072,11 +1070,6 @@ EOE
+ assert_not_nil context
+ assert_kind_of Svn::Wc::Context, context
+ end
+- if RUBY_VERSION > '1.9'
+- assert_equal(result,true)
+- else
+- assert_nil result
+- end
+ end
+ end
+
Copied: subversion/repos/staging-i686/subversion.install (from rev 240281, subversion/trunk/subversion.install)
===================================================================
--- staging-i686/subversion.install (rev 0)
+++ staging-i686/subversion.install 2015-06-03 08:03:44 UTC (rev 240282)
@@ -0,0 +1,7 @@
+post_install() {
+ usr/bin/systemd-tmpfiles --create svnserve.conf || true
+}
+
+post_upgrade() {
+ post_install
+}
Copied: subversion/repos/staging-i686/subversion.rpath.fix.patch (from rev 240281, subversion/trunk/subversion.rpath.fix.patch)
===================================================================
--- staging-i686/subversion.rpath.fix.patch (rev 0)
+++ staging-i686/subversion.rpath.fix.patch 2015-06-03 08:03:44 UTC (rev 240282)
@@ -0,0 +1,10 @@
+--- Makefile.in.orig 2009-02-16 14:10:48.000000000 -0200
++++ Makefile.in 2009-06-04 00:56:29.000000000 -0300
+@@ -678,6 +678,7 @@
+
+ $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL
+ cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL
++ cd $(SWIG_PL_DIR)/native; sed -i 's|LD_RUN_PATH|DIE_RPATH_DIE|g' Makefile{,.{client,delta,fs,ra,repos,wc}}
+
+ swig-pl_DEPS = autogen-swig-pl libsvn_swig_perl \
+ $(SWIG_PL_DIR)/native/Makefile
Copied: subversion/repos/staging-i686/svn (from rev 240281, subversion/trunk/svn)
===================================================================
--- staging-i686/svn (rev 0)
+++ staging-i686/svn 2015-06-03 08:03:44 UTC (rev 240282)
@@ -0,0 +1,11 @@
+service svn
+{
+ flags = REUSE
+ socket_type = stream
+ wait = no
+ user = root
+ server = /usr/bin/svnserve
+ server_args = -i
+ log_on_failure += USERID
+ disable = yes
+}
Copied: subversion/repos/staging-i686/svnserve.conf (from rev 240281, subversion/trunk/svnserve.conf)
===================================================================
--- staging-i686/svnserve.conf (rev 0)
+++ staging-i686/svnserve.conf 2015-06-03 08:03:44 UTC (rev 240282)
@@ -0,0 +1,5 @@
+#
+# Parameters to be passed to svnserve
+#
+#SVNSERVE_ARGS="-r /path/to/some/repos"
+SVNSERVE_ARGS=""
Copied: subversion/repos/staging-i686/svnserve.service (from rev 240281, subversion/trunk/svnserve.service)
===================================================================
--- staging-i686/svnserve.service (rev 0)
+++ staging-i686/svnserve.service 2015-06-03 08:03:44 UTC (rev 240282)
@@ -0,0 +1,11 @@
+[Unit]
+Description=Subversion protocol daemon
+After=syslog.target network.target
+
+[Service]
+Type=forking
+EnvironmentFile=/etc/conf.d/svnserve
+ExecStart=/usr/bin/svnserve --daemon $SVNSERVE_ARGS
+
+[Install]
+WantedBy=multi-user.target
Copied: subversion/repos/staging-i686/svnserve.tmpfiles (from rev 240281, subversion/trunk/svnserve.tmpfiles)
===================================================================
--- staging-i686/svnserve.tmpfiles (rev 0)
+++ staging-i686/svnserve.tmpfiles 2015-06-03 08:03:44 UTC (rev 240282)
@@ -0,0 +1 @@
+D /run/svnserve 0700 root root -
Copied: subversion/repos/staging-i686/wc-queries-test1-r1672295.patch (from rev 240281, subversion/trunk/wc-queries-test1-r1672295.patch)
===================================================================
--- staging-i686/wc-queries-test1-r1672295.patch (rev 0)
+++ staging-i686/wc-queries-test1-r1672295.patch 2015-06-03 08:03:44 UTC (rev 240282)
@@ -0,0 +1,51 @@
+------------------------------------------------------------------------
+r1672295 | rhuijben | 2015-04-09 07:31:12 -0400 (Thu, 09 Apr 2015) | 15 lines
+
+Optimize STMT_SELECT_EXTERNALS_DEFINED when using Sqlite 3.8.9, by
+adding two more rows to the sqlite_stat1 table.
+
+This fixes a test failure in wc-queries-test.c, but actual users most
+likely don't notice a difference as a tablescan on an EXTERNALS tables
+index is not that expensive, given that most working copies don't have
+many externals.
+
+* subversion/libsvn_wc/wc-metadata.sql
+ (STMT_INSTALL_SCHEMA_STATISTICS): Add two rows.
+
+* subversion/tests/libsvn_wc/wc-queries-test.c
+ (test_schema_statistics): Add a dummy externals row to allow
+ verifying schema.
+
+
+--- a/subversion/tests/libsvn_wc/wc-queries-test.c
++++ b/subversion/tests/libsvn_wc/wc-queries-test.c
+@@ -824,6 +824,15 @@
+ "VALUES (1, '', '')",
+ NULL, NULL, NULL));
+
++ SQLITE_ERR(
++ sqlite3_exec(sdb,
++ "INSERT INTO EXTERNALS (wc_id, local_relpath,"
++ " parent_relpath, repos_id,"
++ " presence, kind, def_local_relpath,"
++ " def_repos_relpath) "
++ "VALUES (1, 'subdir', '', 1, 'normal', 'dir', '', '')",
++ NULL, NULL, NULL));
++
+ /* These are currently not necessary for query optimization, but it's better
+ to tell Sqlite how we intend to use this table anyway */
+ SQLITE_ERR(
+--- a/subversion/libsvn_wc/wc-metadata.sql
++++ b/subversion/libsvn_wc/wc-metadata.sql
+@@ -619,6 +619,11 @@
+ INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES
+ ('WC_LOCK', 'sqlite_autoindex_WC_LOCK_1', '100 100 1');
+
++INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES
++ ('EXTERNALS','sqlite_autoindex_EXTERNALS_1', '100 100 1');
++INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES
++ ('EXTERNALS','I_EXTERNALS_DEFINED', '100 100 3 1');
++
+ /* sqlite_autoindex_WORK_QUEUE_1 doesn't exist because WORK_QUEUE is
+ a INTEGER PRIMARY KEY AUTOINCREMENT table */
+
Copied: subversion/repos/staging-i686/wc-queries-test2-r1673691.patch (from rev 240281, subversion/trunk/wc-queries-test2-r1673691.patch)
===================================================================
--- staging-i686/wc-queries-test2-r1673691.patch (rev 0)
+++ staging-i686/wc-queries-test2-r1673691.patch 2015-06-03 08:03:44 UTC (rev 240282)
@@ -0,0 +1,56 @@
+------------------------------------------------------------------------
+r1673691 | rhuijben | 2015-04-15 05:30:04 -0400 (Wed, 15 Apr 2015) | 5 lines
+
+* subversion/libsvn_wc/wc-metadata.sql
+ (STMT_INSTALL_SCHEMA_STATISTICS): Delete existing sqlite_stat1 rows for
+ the externals table before installing new rows to avoid duplicate entries.
+ Remove unneeded 'OR REPLACE' from all inserts.
+
+
+Index: trunk/subversion/libsvn_wc/wc-metadata.sql
+===================================================================
+--- trunk/subversion/libsvn_wc/wc-metadata.sql (revision 1673690)
++++ trunk/subversion/libsvn_wc/wc-metadata.sql (revision 1673691)
+@@ -598,30 +598,30 @@
+ ANALYZE sqlite_master; /* Creates empty sqlite_stat1 if necessary */
+
+ DELETE FROM sqlite_stat1
+-WHERE tbl in ('NODES', 'ACTUAL_NODE', 'LOCK', 'WC_LOCK');
++WHERE tbl in ('NODES', 'ACTUAL_NODE', 'LOCK', 'WC_LOCK', 'EXTERNALS');
+
+-INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES
++INSERT INTO sqlite_stat1(tbl, idx, stat) VALUES
+ ('NODES', 'sqlite_autoindex_NODES_1', '8000 8000 2 1');
+-INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES
++INSERT INTO sqlite_stat1(tbl, idx, stat) VALUES
+ ('NODES', 'I_NODES_PARENT', '8000 8000 10 2 1');
+ /* Tell a lie: We ignore that 99.9% of all moved_to values are NULL */
+-INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES
++INSERT INTO sqlite_stat1(tbl, idx, stat) VALUES
+ ('NODES', 'I_NODES_MOVED', '8000 8000 1 1');
+
+-INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES
++INSERT INTO sqlite_stat1(tbl, idx, stat) VALUES
+ ('ACTUAL_NODE', 'sqlite_autoindex_ACTUAL_NODE_1', '8000 8000 1');
+-INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES
++INSERT INTO sqlite_stat1(tbl, idx, stat) VALUES
+ ('ACTUAL_NODE', 'I_ACTUAL_PARENT', '8000 8000 10 1');
+
+-INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES
++INSERT INTO sqlite_stat1(tbl, idx, stat) VALUES
+ ('LOCK', 'sqlite_autoindex_LOCK_1', '100 100 1');
+
+-INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES
++INSERT INTO sqlite_stat1(tbl, idx, stat) VALUES
+ ('WC_LOCK', 'sqlite_autoindex_WC_LOCK_1', '100 100 1');
+
+-INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES
++INSERT INTO sqlite_stat1(tbl, idx, stat) VALUES
+ ('EXTERNALS','sqlite_autoindex_EXTERNALS_1', '100 100 1');
+-INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES
++INSERT INTO sqlite_stat1(tbl, idx, stat) VALUES
+ ('EXTERNALS','I_EXTERNALS_DEFINED', '100 100 3 1');
+
+ /* sqlite_autoindex_WORK_QUEUE_1 doesn't exist because WORK_QUEUE is
+
+------------------------------------------------------------------------
Copied: subversion/repos/staging-x86_64/PKGBUILD (from rev 240281, subversion/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2015-06-03 08:03:44 UTC (rev 240282)
@@ -0,0 +1,113 @@
+# $Id$
+# Maintainer: Angel Velasquez <angvp at archlinux.org>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
+# Contributor: Paul Mattal <paul at archlinux.org>
+# Contributor: Jason Chu <jason at archlinux.org>
+
+pkgname=subversion
+pkgver=1.8.13
+pkgrel=2
+pkgdesc="A Modern Concurrent Version Control System"
+arch=('i686' 'x86_64')
+url="http://subversion.apache.org/"
+license=('APACHE')
+depends=('sqlite' 'file' 'serf' 'systemd')
+makedepends=('apache' 'python2' 'perl' 'swig' 'java-environment'
+ 'libgnome-keyring' 'kdelibs' 'ruby')
+optdepends=('libgnome-keyring: for GNOME Keyring for auth credentials'
+ 'kdebase-runtime: for KWallet for auth credentials'
+ 'bash-completion: for svn bash completion'
+ 'python2: for some hook scripts'
+ 'java-environment: for Java support'
+ 'ruby: for some hook scripts')
+provides=('svn')
+backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve')
+options=('!makeflags' '!emptydirs')
+install=${pkgname}.install
+source=(http://www.apache.org/dist/subversion/subversion-${pkgver}.tar.bz2{,.asc}
+ svn
+ svnserve.conf
+ svnserve.tmpfiles
+ svnserve.service
+ subversion.rpath.fix.patch
+ fix_ruby22_tests.patch
+ wc-queries-test1-r1672295.patch
+ wc-queries-test2-r1673691.patch)
+md5sums=('4413417b529d7bdf82f74e50df02e88b'
+ 'SKIP'
+ 'a0db6dd43af33952739b6ec089852630'
+ 'af1dd703cc28e61d2e2a132ce3eec37a'
+ 'bb2857eceafcfac35dde39dcffad2314'
+ '733011145b8a8e74baf4c9fc9197b3e8'
+ '6b4340ba9d8845cd8497e013ae01be3f'
+ 'e5a59f43af24c103477e09bc1120831d'
+ 'b665db41811ba6fe30542c8cacfddb47'
+ '39d1956fb53289c60edef88453204e7c')
+validpgpkeys=('19BBCAEF7B19B280A0E2175E62D48FAD16A0DE01'
+ '8BC4DAE0C5A4D65F404401074F7DBAA99A59B973') # Ben Reser / Stefan Sperling
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -Np0 -i ../subversion.rpath.fix.patch
+ patch -p1 -i ../fix_ruby22_tests.patch
+ patch -p1 -i ../wc-queries-test1-r1672295.patch
+ patch -p1 -i ../wc-queries-test2-r1673691.patch
+ sed -i 's|/usr/bin/env python|/usr/bin/env python2|' tools/hook-scripts/{,mailer/{,tests/}}*.py
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ export PYTHON=/usr/bin/python2
+ ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \
+ --with-zlib=/usr --with-serf=/usr --with-apxs \
+ --with-sqlite=/usr \
+ --enable-javahl --with-jdk=/usr/lib/jvm/default \
+ --with-gnome-keyring --with-kwallet \
+ --with-apache-libexecdir=/usr/lib/httpd/modules \
+ --with-ruby-sitedir=/usr/lib/ruby/vendor_ruby \
+ --disable-static
+
+ make LT_LDFLAGS="-L$Fdestdir/usr/lib"
+ make swig_pydir=/usr/lib/python2.7/site-packages/libsvn \
+ swig_pydir_extra=/usr/lib/python2.7/site-packages/svn swig-py swig-pl javahl swig-rb
+}
+
+check() {
+ cd ${pkgname}-${pkgver}
+ export LANG=C LC_ALL=C
+ make check check-swig-pl check-swig-py check-swig-rb CLEANUP=yes # check-javahl
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+
+ export LD_LIBRARY_PATH="${pkgdir}"/usr/lib:${LD_LIBRARY_PATH}
+ make DESTDIR="${pkgdir}" INSTALLDIRS=vendor \
+ swig_pydir=/usr/lib/python2.7/site-packages/libsvn \
+ swig_pydir_extra=/usr/lib/python2.7/site-packages/svn \
+ install install-swig-py install-swig-pl install-javahl install-swig-rb
+
+ install -dm755 "${pkgdir}"/usr/share/subversion
+ cp -a tools/hook-scripts "${pkgdir}"/usr/share/subversion/
+ rm "${pkgdir}"/usr/share/subversion/hook-scripts/*.in
+
+ ## svnserve ...
+
+ # xinetd
+ install -D -m 644 "${srcdir}"/svn "${pkgdir}"/etc/xinetd.d/svn
+
+ # ... systemd
+ install -D -m 644 "${srcdir}"/svnserve.service "${pkgdir}"/usr/lib/systemd/system/svnserve.service
+ install -D -m 644 "${srcdir}"/svnserve.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/svnserve.conf
+
+ # ... common config
+ install -D -m 644 "${srcdir}"/svnserve.conf "${pkgdir}"/etc/conf.d/svnserve
+
+ install -Dm 644 tools/client-side/bash_completion \
+ "${pkgdir}"/usr/share/bash-completion/completions/subversion
+ for i in svn svnadmin svndumpfilter svnlook svnsync svnversion; do
+ ln -sf subversion "${pkgdir}"/usr/share/bash-completion/completions/${i}
+ done
+}
+
Copied: subversion/repos/staging-x86_64/fix_ruby22_tests.patch (from rev 240281, subversion/trunk/fix_ruby22_tests.patch)
===================================================================
--- staging-x86_64/fix_ruby22_tests.patch (rev 0)
+++ staging-x86_64/fix_ruby22_tests.patch 2015-06-03 08:03:44 UTC (rev 240282)
@@ -0,0 +1,174 @@
+commit 1bf46d7f134b24a8f594a0e108056aed67759590
+Author: Anatol Pomozov <anatol.pomozov at gmail.com>
+Date: Tue Dec 30 04:50:55 2014 -0800
+
+ Fix test for ruby 2.2
+
+ The main source of problems with ruby 2.2 is that it uses new test-unit framework
+ that changes some API.
+
+ In partcular all assert_* functions are void, but our tests expect bool. Change tests and do
+ not check output of assert_* functions.
+
+ Do not override TestCase::inherit function as it is used by the framework itself.
+
+ In ruby 2.2 bool is frozen object so we cannot modify it.
+
+diff --git a/subversion/bindings/swig/ruby/test/my-assertions.rb b/subversion/bindings/swig/ruby/test/my-assertions.rb
+index 77c42e7..91f7ad8 100644
+--- a/subversion/bindings/swig/ruby/test/my-assertions.rb
++++ b/subversion/bindings/swig/ruby/test/my-assertions.rb
+@@ -24,41 +24,13 @@ module Test
+ module Unit
+ module Assertions
+
+- # make an intermediary assertion block handler
+- def _my_assert_block(&block)
+- if RUBY_VERSION > '1.9'
+- assert_block do
+- yield
+- end
+- else
+- _wrap_assertion do
+- yield
+- end
+- end
+- end
+-
+- def assert_true(boolean, message=nil)
+- _my_assert_block do
+- assert_equal(true, boolean, message)
+- end
+- end
+-
+- def assert_false(boolean, message=nil)
+- _my_assert_block do
+- assert_equal(false, boolean, message)
+- end
+- end
+-
+ def assert_nested_sorted_array(expected, actual, message=nil)
+- _my_assert_block do
+ assert_equal(expected.collect {|elem| elem.sort},
+ actual.collect {|elem| elem.sort},
+ message)
+- end
+ end
+
+ def assert_equal_log_entries(expected, actual, message=nil)
+- _my_assert_block do
+ actual = actual.collect do |entry|
+ changed_paths = entry.changed_paths
+ changed_paths.each_key do |path|
+@@ -73,7 +45,6 @@ module Test
+ entry.has_children?]
+ end
+ assert_equal(expected, actual, message)
+- end
+ end
+ end
+ end
+diff --git a/subversion/bindings/swig/ruby/test/test-unit-ext.rb b/subversion/bindings/swig/ruby/test/test-unit-ext.rb
+index ce88d75..62a1508 100644
+--- a/subversion/bindings/swig/ruby/test/test-unit-ext.rb
++++ b/subversion/bindings/swig/ruby/test/test-unit-ext.rb
+@@ -18,6 +18,6 @@
+ # ====================================================================
+
+ require "test-unit-ext/always-show-result" if RUBY_VERSION < '1.9.3'
+-require "test-unit-ext/priority"
++#require "test-unit-ext/priority"
+ require "test-unit-ext/backtrace-filter" if RUBY_VERSION < '1.9.3'
+ require "test-unit-ext/long-display-for-emacs" if RUBY_VERSION < '1.9.3'
+diff --git a/subversion/bindings/swig/ruby/test/test_delta.rb b/subversion/bindings/swig/ruby/test/test_delta.rb
+index 541a4fe..90c1e3b 100644
+--- a/subversion/bindings/swig/ruby/test/test_delta.rb
++++ b/subversion/bindings/swig/ruby/test/test_delta.rb
+@@ -48,7 +48,6 @@ class SvnDeltaTest < Test::Unit::TestCase
+ target = StringIO.new(t)
+ stream = Svn::Delta::TextDeltaStream.new(source, target)
+ assert_nil(stream.md5_digest)
+- _my_assert_block do
+ ret = stream.each do |window|
+ window.ops.each do |op|
+ op_size = op.offset + op.length
+@@ -64,8 +63,6 @@ class SvnDeltaTest < Test::Unit::TestCase
+ end
+ end
+ end
+- true if RUBY_VERSION > '1.9' # this block returns nil in > ruby '1.9'
+- end
+ assert_equal(Digest::MD5.hexdigest(t), stream.md5_digest)
+ end
+
+@@ -84,7 +81,6 @@ class SvnDeltaTest < Test::Unit::TestCase
+ end
+ end
+
+- _my_assert_block do
+ composed_window.ops.each do |op|
+ op_size = op.offset + op.length
+ case op.action_code
+@@ -98,7 +94,6 @@ class SvnDeltaTest < Test::Unit::TestCase
+ flunk
+ end
+ end
+- end
+ end
+
+ def test_txdelta_apply_instructions
+diff --git a/subversion/bindings/swig/ruby/test/test_repos.rb b/subversion/bindings/swig/ruby/test/test_repos.rb
+index 89ca8c1..6745200 100644
+--- a/subversion/bindings/swig/ruby/test/test_repos.rb
++++ b/subversion/bindings/swig/ruby/test/test_repos.rb
+@@ -678,7 +678,8 @@ class SvnReposTest < Test::Unit::TestCase
+
+ dest_path = File.join(@tmp_path, "dest")
+ Svn::Repos.create(dest_path) do |repos|
+- assert_raises(NoMethodError) do
++ assert_raises(RuntimeError) do
++ # Can't modify frozen object
+ repos.load_fs(nil)
+ end
+ end
+diff --git a/subversion/bindings/swig/ruby/test/test_wc.rb b/subversion/bindings/swig/ruby/test/test_wc.rb
+index 3a2aa65..2313e60 100644
+--- a/subversion/bindings/swig/ruby/test/test_wc.rb
++++ b/subversion/bindings/swig/ruby/test/test_wc.rb
+@@ -411,7 +411,7 @@ EOE
+ end
+ end
+
+- def test_status
++ def test_status2
+ source = "source"
+ file1 = "file1"
+ file2 = "file2"
+@@ -534,7 +534,6 @@ EOE
+ ctx.ci(lf_path)
+
+ Svn::Wc::AdmAccess.open(nil, @wc_path, true, 5) do |access|
+- _my_assert_block do
+ File.open(src_path, "wb") {|f| f.print(source)}
+ args = [method_name, src_path, crlf_path, Svn::Wc::TRANSLATE_FROM_NF]
+ result = yield(access.send(*args), source)
+@@ -553,7 +552,6 @@ EOE
+ result ||= File.open(src_path, "rb") {|f| f.read}
+ assert_equal(lf_source, result)
+ end
+- end
+ end
+ end
+
+@@ -1072,11 +1070,6 @@ EOE
+ assert_not_nil context
+ assert_kind_of Svn::Wc::Context, context
+ end
+- if RUBY_VERSION > '1.9'
+- assert_equal(result,true)
+- else
+- assert_nil result
+- end
+ end
+ end
+
Copied: subversion/repos/staging-x86_64/subversion.install (from rev 240281, subversion/trunk/subversion.install)
===================================================================
--- staging-x86_64/subversion.install (rev 0)
+++ staging-x86_64/subversion.install 2015-06-03 08:03:44 UTC (rev 240282)
@@ -0,0 +1,7 @@
+post_install() {
+ usr/bin/systemd-tmpfiles --create svnserve.conf || true
+}
+
+post_upgrade() {
+ post_install
+}
Copied: subversion/repos/staging-x86_64/subversion.rpath.fix.patch (from rev 240281, subversion/trunk/subversion.rpath.fix.patch)
===================================================================
--- staging-x86_64/subversion.rpath.fix.patch (rev 0)
+++ staging-x86_64/subversion.rpath.fix.patch 2015-06-03 08:03:44 UTC (rev 240282)
@@ -0,0 +1,10 @@
+--- Makefile.in.orig 2009-02-16 14:10:48.000000000 -0200
++++ Makefile.in 2009-06-04 00:56:29.000000000 -0300
+@@ -678,6 +678,7 @@
+
+ $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL
+ cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL
++ cd $(SWIG_PL_DIR)/native; sed -i 's|LD_RUN_PATH|DIE_RPATH_DIE|g' Makefile{,.{client,delta,fs,ra,repos,wc}}
+
+ swig-pl_DEPS = autogen-swig-pl libsvn_swig_perl \
+ $(SWIG_PL_DIR)/native/Makefile
Copied: subversion/repos/staging-x86_64/svn (from rev 240281, subversion/trunk/svn)
===================================================================
--- staging-x86_64/svn (rev 0)
+++ staging-x86_64/svn 2015-06-03 08:03:44 UTC (rev 240282)
@@ -0,0 +1,11 @@
+service svn
+{
+ flags = REUSE
+ socket_type = stream
+ wait = no
+ user = root
+ server = /usr/bin/svnserve
+ server_args = -i
+ log_on_failure += USERID
+ disable = yes
+}
Copied: subversion/repos/staging-x86_64/svnserve.conf (from rev 240281, subversion/trunk/svnserve.conf)
===================================================================
--- staging-x86_64/svnserve.conf (rev 0)
+++ staging-x86_64/svnserve.conf 2015-06-03 08:03:44 UTC (rev 240282)
@@ -0,0 +1,5 @@
+#
+# Parameters to be passed to svnserve
+#
+#SVNSERVE_ARGS="-r /path/to/some/repos"
+SVNSERVE_ARGS=""
Copied: subversion/repos/staging-x86_64/svnserve.service (from rev 240281, subversion/trunk/svnserve.service)
===================================================================
--- staging-x86_64/svnserve.service (rev 0)
+++ staging-x86_64/svnserve.service 2015-06-03 08:03:44 UTC (rev 240282)
@@ -0,0 +1,11 @@
+[Unit]
+Description=Subversion protocol daemon
+After=syslog.target network.target
+
+[Service]
+Type=forking
+EnvironmentFile=/etc/conf.d/svnserve
+ExecStart=/usr/bin/svnserve --daemon $SVNSERVE_ARGS
+
+[Install]
+WantedBy=multi-user.target
Copied: subversion/repos/staging-x86_64/svnserve.tmpfiles (from rev 240281, subversion/trunk/svnserve.tmpfiles)
===================================================================
--- staging-x86_64/svnserve.tmpfiles (rev 0)
+++ staging-x86_64/svnserve.tmpfiles 2015-06-03 08:03:44 UTC (rev 240282)
@@ -0,0 +1 @@
+D /run/svnserve 0700 root root -
Copied: subversion/repos/staging-x86_64/wc-queries-test1-r1672295.patch (from rev 240281, subversion/trunk/wc-queries-test1-r1672295.patch)
===================================================================
--- staging-x86_64/wc-queries-test1-r1672295.patch (rev 0)
+++ staging-x86_64/wc-queries-test1-r1672295.patch 2015-06-03 08:03:44 UTC (rev 240282)
@@ -0,0 +1,51 @@
+------------------------------------------------------------------------
+r1672295 | rhuijben | 2015-04-09 07:31:12 -0400 (Thu, 09 Apr 2015) | 15 lines
+
+Optimize STMT_SELECT_EXTERNALS_DEFINED when using Sqlite 3.8.9, by
+adding two more rows to the sqlite_stat1 table.
+
+This fixes a test failure in wc-queries-test.c, but actual users most
+likely don't notice a difference as a tablescan on an EXTERNALS tables
+index is not that expensive, given that most working copies don't have
+many externals.
+
+* subversion/libsvn_wc/wc-metadata.sql
+ (STMT_INSTALL_SCHEMA_STATISTICS): Add two rows.
+
+* subversion/tests/libsvn_wc/wc-queries-test.c
+ (test_schema_statistics): Add a dummy externals row to allow
+ verifying schema.
+
+
+--- a/subversion/tests/libsvn_wc/wc-queries-test.c
++++ b/subversion/tests/libsvn_wc/wc-queries-test.c
+@@ -824,6 +824,15 @@
+ "VALUES (1, '', '')",
+ NULL, NULL, NULL));
+
++ SQLITE_ERR(
++ sqlite3_exec(sdb,
++ "INSERT INTO EXTERNALS (wc_id, local_relpath,"
++ " parent_relpath, repos_id,"
++ " presence, kind, def_local_relpath,"
++ " def_repos_relpath) "
++ "VALUES (1, 'subdir', '', 1, 'normal', 'dir', '', '')",
++ NULL, NULL, NULL));
++
+ /* These are currently not necessary for query optimization, but it's better
+ to tell Sqlite how we intend to use this table anyway */
+ SQLITE_ERR(
+--- a/subversion/libsvn_wc/wc-metadata.sql
++++ b/subversion/libsvn_wc/wc-metadata.sql
+@@ -619,6 +619,11 @@
+ INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES
+ ('WC_LOCK', 'sqlite_autoindex_WC_LOCK_1', '100 100 1');
+
++INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES
++ ('EXTERNALS','sqlite_autoindex_EXTERNALS_1', '100 100 1');
++INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES
++ ('EXTERNALS','I_EXTERNALS_DEFINED', '100 100 3 1');
++
+ /* sqlite_autoindex_WORK_QUEUE_1 doesn't exist because WORK_QUEUE is
+ a INTEGER PRIMARY KEY AUTOINCREMENT table */
+
Copied: subversion/repos/staging-x86_64/wc-queries-test2-r1673691.patch (from rev 240281, subversion/trunk/wc-queries-test2-r1673691.patch)
===================================================================
--- staging-x86_64/wc-queries-test2-r1673691.patch (rev 0)
+++ staging-x86_64/wc-queries-test2-r1673691.patch 2015-06-03 08:03:44 UTC (rev 240282)
@@ -0,0 +1,56 @@
+------------------------------------------------------------------------
+r1673691 | rhuijben | 2015-04-15 05:30:04 -0400 (Wed, 15 Apr 2015) | 5 lines
+
+* subversion/libsvn_wc/wc-metadata.sql
+ (STMT_INSTALL_SCHEMA_STATISTICS): Delete existing sqlite_stat1 rows for
+ the externals table before installing new rows to avoid duplicate entries.
+ Remove unneeded 'OR REPLACE' from all inserts.
+
+
+Index: trunk/subversion/libsvn_wc/wc-metadata.sql
+===================================================================
+--- trunk/subversion/libsvn_wc/wc-metadata.sql (revision 1673690)
++++ trunk/subversion/libsvn_wc/wc-metadata.sql (revision 1673691)
+@@ -598,30 +598,30 @@
+ ANALYZE sqlite_master; /* Creates empty sqlite_stat1 if necessary */
+
+ DELETE FROM sqlite_stat1
+-WHERE tbl in ('NODES', 'ACTUAL_NODE', 'LOCK', 'WC_LOCK');
++WHERE tbl in ('NODES', 'ACTUAL_NODE', 'LOCK', 'WC_LOCK', 'EXTERNALS');
+
+-INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES
++INSERT INTO sqlite_stat1(tbl, idx, stat) VALUES
+ ('NODES', 'sqlite_autoindex_NODES_1', '8000 8000 2 1');
+-INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES
++INSERT INTO sqlite_stat1(tbl, idx, stat) VALUES
+ ('NODES', 'I_NODES_PARENT', '8000 8000 10 2 1');
+ /* Tell a lie: We ignore that 99.9% of all moved_to values are NULL */
+-INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES
++INSERT INTO sqlite_stat1(tbl, idx, stat) VALUES
+ ('NODES', 'I_NODES_MOVED', '8000 8000 1 1');
+
+-INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES
++INSERT INTO sqlite_stat1(tbl, idx, stat) VALUES
+ ('ACTUAL_NODE', 'sqlite_autoindex_ACTUAL_NODE_1', '8000 8000 1');
+-INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES
++INSERT INTO sqlite_stat1(tbl, idx, stat) VALUES
+ ('ACTUAL_NODE', 'I_ACTUAL_PARENT', '8000 8000 10 1');
+
+-INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES
++INSERT INTO sqlite_stat1(tbl, idx, stat) VALUES
+ ('LOCK', 'sqlite_autoindex_LOCK_1', '100 100 1');
+
+-INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES
++INSERT INTO sqlite_stat1(tbl, idx, stat) VALUES
+ ('WC_LOCK', 'sqlite_autoindex_WC_LOCK_1', '100 100 1');
+
+-INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES
++INSERT INTO sqlite_stat1(tbl, idx, stat) VALUES
+ ('EXTERNALS','sqlite_autoindex_EXTERNALS_1', '100 100 1');
+-INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES
++INSERT INTO sqlite_stat1(tbl, idx, stat) VALUES
+ ('EXTERNALS','I_EXTERNALS_DEFINED', '100 100 3 1');
+
+ /* sqlite_autoindex_WORK_QUEUE_1 doesn't exist because WORK_QUEUE is
+
+------------------------------------------------------------------------
More information about the arch-commits
mailing list