On Thu, Dec 26, 2019 at 6:00 AM Stefan Sperling <[email protected]> wrote:
> On Thu, Dec 26, 2019 at 02:37:03AM +0000, Daniel Shahaf wrote:
> > It would be nice to find a way for you to share your changes without
> > breaking
> > the bot. Could you talk to stsp about this?
>
> Yes I can help here. Please share your patches and I will integrate them.
> I kept serf-old around to be able to build 1.5 but at this point it's fine
> for me to lose the ability to build it.
I'm attaching 3 patches:
* patch-1-serf-only.txt - Only update to Serf 1.4.x.
* patch-2-sasl-only.txt - Only update to Cyrus SASL 2.1.27.
* full-patch.txt - Contains both of the above + remove all Serf-Old
stuff for svn 1.5.
You can choose to apply changes in several commits by applying them in
that order, or, you can apply just full-patch.txt to get all the
changes.
Thanks for helping with fails.log.* and pointing out to grep the
binding test log files per the svn-bb-openbsd buildbot scripts. That's
very helpful. :-)
One more question: Does anyone know which package(s) to install on
Debian to be able to run the JavaHL tests?
Regarding the svnserve x bdb test failure:
> > Observations from running the regression tests:
> >
> > (1) I get one test failure in [svn x bdb]:
> > FAIL: autoprop_tests.py 7: import: config=no, commandline=none
> >
> > This test passes for all other RA x backend combinations.
>
> With trunk on Linux:
>
> % make svnserveautocheck FS_TYPE=bdb CLEANUP=1
> TESTS="subversion/tests/cmdline/autoprop_tests.py"
> ⋮
> SUMMARY: All tests successful
> %
>
> What was the error (in the .log file)?
Here are the contents of fails.log.svn-check-svn-bdb -- could be some
kind of fluke? I just started another full test run. Let's see if it
repeats:
[[[
W: * Dumped revision 0.
subversion/svnadmin/svnadmin.c:1475,
subversion/libsvn_repos/dump.c:2175,
subversion/libsvn_delta/path_driver.c:190,
subversion/libsvn_delta/path_driver.c:328,
subversion/libsvn_repos/replay.c:534,
subversion/libsvn_fs/fs-loader.c:1223,
subversion/libsvn_fs_base/tree.c:1193,
subversion/libsvn_fs_base/tree.c:1165,
subversion/libsvn_fs_base/tree.c:1026,
subversion/libsvn_fs_base/trail.c:218,
subversion/libsvn_fs_base/trail.c:159,
subversion/libsvn_fs_base/bdb/bdb-err.c:85,
subversion/libsvn_fs_base/bdb/bdb-err.c:79: (apr_err=SVN_ERR_FS_BERKELEY_DB)
svnadmin: E160029: Berkeley DB error for filesystem
'svn-test-work/local_tmp/repos/db' while committing Berkeley DB
transaction:
DB_RUNRECOVERY: Fatal error, run database recovery
subversion/libsvn_fs_base/bdb/env.c:230: (apr_err=SVN_ERR_FS_BERKELEY_DB)
svnadmin: E160029: bdb: PANIC: fatal region error detected; run recovery
W: CMD: /home/nate/ramdrive/svndev/prefix/svn-trunk/bin/svnadmin dump
svn-test-work/local_tmp/repos terminated by signal 6
W: CWD: /home/nate/ramdrive/svndev/svn-trunk/subversion/tests/cmdline
W: EXCEPTION: SVNProcessTerminatedBySignal
Traceback (most recent call last):
File
"/home/nate/ramdrive/svndev/svn-trunk/subversion/tests/cmdline/svntest/main.py",
line 1931, in run
rc = self.pred.run(sandbox)
File
"/home/nate/ramdrive/svndev/svn-trunk/subversion/tests/cmdline/svntest/testcase.py",
line 178, in run
result = self.func(sandbox)
File
"/home/nate/ramdrive/svndev/svn-trunk/subversion/tests/cmdline/autoprop_tests.py",
line 245, in autoprops_imp_no_none
autoprops_test(sbox, 'import', 0, 0, '')
File
"/home/nate/ramdrive/svndev/svn-trunk/subversion/tests/cmdline/autoprop_tests.py",
line 101, in autoprops_test
sbox.build()
File
"/home/nate/ramdrive/svndev/svn-trunk/subversion/tests/cmdline/svntest/sandbox.py",
line 164, in build
minor_version, tree)
File
"/home/nate/ramdrive/svndev/svn-trunk/subversion/tests/cmdline/svntest/actions.py",
line 1994, in make_repo_and_wc
guarantee_greek_repository(sbox.repo_dir, minor_version)
File
"/home/nate/ramdrive/svndev/svn-trunk/subversion/tests/cmdline/svntest/actions.py",
line 193, in guarantee_greek_repository
_guarantee_repos(path, main.pristine_greek_repos_dir, minor_version)
File
"/home/nate/ramdrive/svndev/svn-trunk/subversion/tests/cmdline/svntest/actions.py",
line 178, in _guarantee_repos
failed = main.copy_repos(repos_dir, path, 1, 1, minor_version)
File
"/home/nate/ramdrive/svndev/svn-trunk/subversion/tests/cmdline/svntest/main.py",
line 1246, in copy_repos
dump_stdout, dump_stderr, dump_exit_code = wait_on_pipe(dump_kid, True)
File
"/home/nate/ramdrive/svndev/svn-trunk/subversion/tests/cmdline/svntest/main.py",
line 557, in wait_on_pipe
raise SVNProcessTerminatedBySignal
svntest.main.SVNProcessTerminatedBySignal
FAIL: autoprop_tests.py 7: import: config=no, commandline=none
]]]
Thanks,
Nathan
Index: tools/dev/unix-build/Makefile.svn
===================================================================
--- tools/dev/unix-build/Makefile.svn (revision 1872002)
+++ tools/dev/unix-build/Makefile.svn (working copy)
@@ -105,7 +105,7 @@
PCRE_VER = 8.41
HTTPD_VER = 2.4.37
NEON_VER = 0.30.2
-SERF_VER = 1.3.9
+SERF_VER = 1.4.x
SERF_OLD_VER = 0.3.1
CYRUS_SASL_VER = 2.1.25
SQLITE_VER = 3160200
@@ -193,7 +193,7 @@
HTTPD_URL = https://archive.apache.org/dist/httpd/$(HTTPD_DIST)
#NEON_URL = http://webdav.org/neon/$(NEON_DIST)
NEON_URL = http://ftp.openbsd.org/pub/OpenBSD/distfiles/$(NEON_DIST)
-SERF_URL = https://svn.apache.org/repos/asf/serf/tags/$(SERF_VER)
+SERF_URL = https://svn.apache.org/repos/asf/serf/branches/$(SERF_VER)
SERF_OLD_URL = https://svn.apache.org/repos/asf/serf/tags/$(SERF_OLD_VER)
SQLITE_URL = https://www.sqlite.org/2017/$(SQLITE_DIST)
CYRUS_SASL_URL =
https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-${CYRUS_SASL_VER}/$(CYRUS_SASL_DIST)
@@ -905,7 +905,6 @@
[ -d $(SERF_OBJDIR) ] || mkdir -p $(SERF_OBJDIR)
if [ ! -d $(SERF_SRCDIR) ]; then \
svn co $(SERF_URL) $(SERF_SRCDIR); \
- svn merge ^/serf/branches/1.3.x-sslbuild@1781542
$(SERF_SRCDIR); \
fi
touch $@
Index: tools/dev/unix-build/Makefile.svn
===================================================================
--- tools/dev/unix-build/Makefile.svn (revision 1872002)
+++ tools/dev/unix-build/Makefile.svn (working copy)
@@ -107,7 +107,7 @@
NEON_VER = 0.30.2
SERF_VER = 1.3.9
SERF_OLD_VER = 0.3.1
-CYRUS_SASL_VER = 2.1.25
+CYRUS_SASL_VER = 2.1.27
SQLITE_VER = 3160200
LIBMAGIC_VER = 5.30
RUBY_VER = 2.4.4
@@ -141,7 +141,7 @@
SHA256_${PCRE_DIST} =
244838e1f1d14f7e2fa7681b857b3a8566b74215f28133f14a8f5e59241b682c
SHA256_${HTTPD_DIST} =
aa97a834a32d51974be8d8a013b561e28d327387cb1da2c3c2762acd0146aabd
SHA256_${NEON_DIST} =
db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca
-SHA256_${CYRUS_SASL_DIST} =
418c16e6240a4f9b637cbe3d62937b9675627bad27c622191d47de8686fe24fe
+SHA256_${CYRUS_SASL_DIST} =
26866b1549b00ffd020f188a43c258017fa1c382b3ddadd8201536f72efb05d5
SHA256_${SQLITE_DIST} =
65cc0c3e9366f50c0679c5ccd31432cea894bc4a3e8947dabab88c8693263615
SHA256_${LIBMAGIC_DIST} =
694c2432e5240187524c9e7cf1ec6acc77b47a0e19554d34c14773e43dbbf214
SHA256_${RUBY_DIST} =
254f1c1a79e4cc814d1e7320bc5bdd995dc57e08727d30a767664619a9c8ae5a
Index: tools/dev/unix-build/Makefile.svn
===================================================================
--- tools/dev/unix-build/Makefile.svn (revision 1872002)
+++ tools/dev/unix-build/Makefile.svn (working copy)
@@ -105,9 +105,8 @@
PCRE_VER = 8.41
HTTPD_VER = 2.4.37
NEON_VER = 0.30.2
-SERF_VER = 1.3.9
-SERF_OLD_VER = 0.3.1
-CYRUS_SASL_VER = 2.1.25
+SERF_VER = 1.4.x
+CYRUS_SASL_VER = 2.1.27
SQLITE_VER = 3160200
LIBMAGIC_VER = 5.30
RUBY_VER = 2.4.4
@@ -141,7 +140,7 @@
SHA256_${PCRE_DIST} =
244838e1f1d14f7e2fa7681b857b3a8566b74215f28133f14a8f5e59241b682c
SHA256_${HTTPD_DIST} =
aa97a834a32d51974be8d8a013b561e28d327387cb1da2c3c2762acd0146aabd
SHA256_${NEON_DIST} =
db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca
-SHA256_${CYRUS_SASL_DIST} =
418c16e6240a4f9b637cbe3d62937b9675627bad27c622191d47de8686fe24fe
+SHA256_${CYRUS_SASL_DIST} =
26866b1549b00ffd020f188a43c258017fa1c382b3ddadd8201536f72efb05d5
SHA256_${SQLITE_DIST} =
65cc0c3e9366f50c0679c5ccd31432cea894bc4a3e8947dabab88c8693263615
SHA256_${LIBMAGIC_DIST} =
694c2432e5240187524c9e7cf1ec6acc77b47a0e19554d34c14773e43dbbf214
SHA256_${RUBY_DIST} =
254f1c1a79e4cc814d1e7320bc5bdd995dc57e08727d30a767664619a9c8ae5a
@@ -193,8 +192,7 @@
HTTPD_URL = https://archive.apache.org/dist/httpd/$(HTTPD_DIST)
#NEON_URL = http://webdav.org/neon/$(NEON_DIST)
NEON_URL = http://ftp.openbsd.org/pub/OpenBSD/distfiles/$(NEON_DIST)
-SERF_URL = https://svn.apache.org/repos/asf/serf/tags/$(SERF_VER)
-SERF_OLD_URL = https://svn.apache.org/repos/asf/serf/tags/$(SERF_OLD_VER)
+SERF_URL = https://svn.apache.org/repos/asf/serf/branches/$(SERF_VER)
SQLITE_URL = https://www.sqlite.org/2017/$(SQLITE_DIST)
CYRUS_SASL_URL =
https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-${CYRUS_SASL_VER}/$(CYRUS_SASL_DIST)
LIBMAGIC_URL = ftp://ftp.astron.com/pub/file/$(LIBMAGIC_DIST)
@@ -216,7 +214,6 @@
HTTPD_SRCDIR = $(SRCDIR)/httpd-$(HTTPD_VER)
NEON_SRCDIR = $(SRCDIR)/neon-$(NEON_VER)
SERF_SRCDIR = $(SRCDIR)/serf-$(SERF_VER)
-SERF_OLD_SRCDIR = $(SRCDIR)/serf-$(SERF_OLD_VER)
SQLITE_SRCDIR = $(SRCDIR)/sqlite-autoconf-$(SQLITE_VER)
CYRUS_SASL_SRCDIR = $(SRCDIR)/cyrus-sasl-$(CYRUS_SASL_VER)
LIBMAGIC_SRCDIR = $(SRCDIR)/file-$(LIBMAGIC_VER)
@@ -237,7 +234,6 @@
HTTPD_OBJDIR = $(OBJDIR)/httpd-$(HTTPD_VER)
NEON_OBJDIR = $(OBJDIR)/neon-$(NEON_VER)
SERF_OBJDIR = $(OBJDIR)/serf-$(SERF_VER)
-SERF_OLD_OBJDIR = $(OBJDIR)/serf-$(SERF_OLD_VER)
SQLITE_OBJDIR = $(OBJDIR)/sqlite-$(SQLITE_VER)
CYRUS_SASL_OBJDIR = $(OBJDIR)/cyrus-sasl-$(CYRUS_SASL_VER)
LIBMAGIC_OBJDIR = $(OBJDIR)/file-$(LIBMAGIC_VER)
@@ -272,7 +268,7 @@
.PHONY: all reset clean nuke fetch
all: dirs-create bdb-install apr-install iconv-install apr-util-install \
- pcre-install httpd-install neon-install serf-install serf-old-install \
+ pcre-install httpd-install neon-install serf-install \
sqlite-install cyrus-sasl-install libmagic-install \
ruby-install bz2-install python-install py3c-retrieve gettext-install \
lz4-install svn-install svn-bindings-install
@@ -279,13 +275,13 @@
# Use these to start a build from the beginning.
reset: dirs-reset bdb-reset apr-reset iconv-reset apr-util-reset \
- pcre-reset httpd-reset neon-reset serf-reset serf-old-reset \
+ pcre-reset httpd-reset neon-reset serf-reset \
sqlite-reset cyrus-sasl-reset libmagic-reset ruby-reset python-reset \
bz2-reset gettext-reset lz4-reset svn-reset
# Use to save disk space.
clean: bdb-clean apr-clean iconv-clean apr-util-clean pcre-clean httpd-clean \
- neon-clean serf-clean serf-old-clean sqlite-clean cyrus-sasl-clean \
+ neon-clean serf-clean sqlite-clean cyrus-sasl-clean \
libmagic-clean ruby-clean bz2-clean python-clean gettext-clean \
lz4-clean svn-clean
@@ -905,7 +901,6 @@
[ -d $(SERF_OBJDIR) ] || mkdir -p $(SERF_OBJDIR)
if [ ! -d $(SERF_SRCDIR) ]; then \
svn co $(SERF_URL) $(SERF_SRCDIR); \
- svn merge ^/serf/branches/1.3.x-sslbuild@1781542
$(SERF_SRCDIR); \
fi
touch $@
@@ -932,50 +927,7 @@
$(PREFIX)/serf/lib/libserf-1.so
touch $@
-#######################################################################
-# serf-old (compatible with Subversion 1.5)
-#######################################################################
-serf-old-retrieve: $(SERF_OLD_OBJDIR)/.retrieved
-serf-old-configure: $(SERF_OLD_OBJDIR)/.configured
-serf-old-compile: $(SERF_OLD_OBJDIR)/.compiled
-serf-old-install: $(SERF_OLD_OBJDIR)/.installed
-serf-old-reset:
- $(foreach f, .retrieved .configured .compiled .installed, \
- rm -f $(SERF_OLD_OBJDIR)/$(f);)
-
-serf-old-clean:
- -(cd $(SERF_OLD_SRCDIR) && ./serfmake clean)
-
-# retrieve serf if not present yet
-$(SERF_OLD_OBJDIR)/.retrieved:
- [ -d $(SERF_OLD_OBJDIR) ] || mkdir -p $(SERF_OLD_OBJDIR)
- if [ ! -d $(SERF_OLD_SRCDIR) ]; then \
- svn export $(SERF_OLD_URL) $(SERF_OLD_SRCDIR); \
- fi
- touch $@
-
-# compile serf (serf won't compile outside its source tree)
-$(SERF_OLD_OBJDIR)/.compiled: $(SERF_OLD_OBJDIR)/.retrieved \
- $(APR_UTIL_OBJDIR)/.installed
- cd $(SERF_OLD_SRCDIR) && \
- env CFLAGS="-O0 -g $(PROFILE_CFLAGS) -DAPR_POOL_DEBUG" \
- CC=$(CC) CXX=$(CXX) \
- ./serfmake --with-apr=$(PREFIX)/apr \
- --prefix=$(PREFIX)/serf-old \
- build
- touch $@
-
-# install serf
-$(SERF_OLD_OBJDIR)/.installed: $(SERF_OLD_OBJDIR)/.compiled
- cd $(SERF_OLD_SRCDIR) && \
- ./serfmake --with-apr=$(PREFIX)/apr \
- --with-apr-util=$(PREFIX)/apr \
- --prefix=$(PREFIX)/serf-old \
- install
- touch $@
-
-
#######################################################################
# sqlite
#######################################################################
@@ -1634,7 +1586,7 @@
$(BDB_OBJDIR)/.installed $(SQLITE_OBJDIR)/.installed \
$(HTTPD_OBJDIR)/.installed $(CYRUS_SASL_OBJDIR)/.installed \
$(LIBMAGIC_OBJDIR)/.installed $(NEON_OBJDIR)/.installed \
- $(SERF_OBJDIR)/.installed $(SERF_OLD_OBJDIR)/.installed \
+ $(SERF_OBJDIR)/.installed \
$(RUBY_OBJDIR)/.installed $(PYTHON_OBJDIR)/.installed
cd $(SVN_SRCDIR) && ./autogen.sh
$(SWIG_PL_INCLUDES_HACK)
