Hello community, here is the log from the commit of package subversion for openSUSE:Factory checked in at 2015-03-18 13:08:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/subversion (Old) and /work/SRC/openSUSE:Factory/.subversion.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "subversion" Changes: -------- --- /work/SRC/openSUSE:Factory/subversion/subversion.changes 2015-02-22 17:26:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.subversion.new/subversion.changes 2015-03-18 13:08:48.000000000 +0100 @@ -1,0 +2,18 @@ +Tue Mar 10 20:09:16 UTC 2015 - [email protected] + +- Fix running all regression tests with davautocheck.sh and + svnserveautocheck.sh when time is a shell built-in but not + a command: add subversion-1.8.11-autocheck-time.patch + +------------------------------------------------------------------- +Wed Mar 4 18:12:54 UTC 2015 - [email protected] + +- fix sample configuration comments in subversion.conf [boo#916286] + +------------------------------------------------------------------- +Mon Mar 2 08:08:44 UTC 2015 - [email protected] + +- SLE 11 SP3 build with all regression tests +- run swig-py tests where they pass + +------------------------------------------------------------------- New: ---- subversion-1.8.11-autocheck-time.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ subversion.spec ++++++ --- /var/tmp/diff_new_pack.gjzUuZ/_old 2015-03-18 13:08:50.000000000 +0100 +++ /var/tmp/diff_new_pack.gjzUuZ/_new 2015-03-18 13:08:50.000000000 +0100 @@ -70,6 +70,7 @@ Patch42: subversion-1.8.11-swig-py-comment.patch Patch43: subversion-1.8.11-swig-py-comment-2.patch Patch44: subversion-1.8.11-swig-py-comment-3.patch +Patch45: subversion-1.8.11-autocheck-time.patch BuildRequires: apache2-devel BuildRequires: apache2-prefork BuildRequires: cyrus-sasl-devel @@ -110,8 +111,10 @@ %if %{with all_regression_tests} # tools required for network based tests BuildRequires: net-tools -BuildRequires: time BuildRequires: wget +%if %{?suse_version} >= 1310 +BuildRequires: time +%endif %endif %if %{with python_ctypes} BuildRequires: ctypesgen @@ -237,9 +240,10 @@ %patch39 %patch40 -p1 %patch41 -p1 -%patch42 -p0 -%patch43 -p0 +%patch42 +%patch43 %patch44 -p1 +%patch45 -p1 %build # Re-boot strap, needed for patch37 @@ -414,13 +418,14 @@ https svn" -%if 0%{?suse_version} > 1130 export LANG=C LC_ALL=C make %{?_smp_mflags} check CLEANUP=true || (cat fails.log; exit 1) make %{?_smp_mflags} check-javahl || (cat fails.log; exit 1) make %{?_smp_mflags} check-swig-pl || (cat fails.log; exit 1) +%if 0%{?suse_version} <= 1320 # swig bindings check failing from swig 3.0.3 and later -# make %{?_smp_mflags} check-swig-py || (cat fails.log; exit 1) +make %{?_smp_mflags} check-swig-py || (cat fails.log; exit 1) +%endif make %{?_smp_mflags} check-swig-rb || (cat fails.log; exit 1) %if %{with all_regression_tests} make %{?_smp_mflags} svnserveautocheck CLEANUP=true FS_TYPE=fsfs || (cat fails.log; exit 1) @@ -428,7 +433,6 @@ make %{?_smp_mflags} davautocheck CLEANUP=true FS_TYPE=fsfs || (cat fails.log; exit 1) make %{?_smp_mflags} davautocheck CLEANUP=true FS_TYPE=bdb || (cat fails.log; exit 1) %endif -%endif %pre getent group %{svngroup} >/dev/null || groupadd -r %{svngroup} ++++++ subversion-1.8.11-autocheck-time.patch ++++++ ------------------------------------------------------------------------ r1665652 | astieger | 2015-03-10 20:19:04 +0100 (Tue, 10 Mar 2015) | 13 lines Changed paths: M /subversion/trunk/subversion/tests/cmdline/davautocheck.sh M /subversion/trunk/subversion/tests/cmdline/svnserveautocheck.sh Follow-up to r1421594: Fix (svnserve|dav)autocheck when time is only a built-in. Some shells do not treat variable contents as a keyword, which in the case of time makes the script fail if it is a built-in but not a command. * subversion/tests/cmdline/svnserveautocheck.sh, subversion/tests/cmdline/davautocheck.sh: Turn TIME_CMD into a function. Approved by: breser, danielsh This is the version of the patch backported to the 1.8 branch. ------------------------------------------------------------------------ --- subversion/tests/cmdline/davautocheck.sh | 10 +++------- subversion/tests/cmdline/svnserveautocheck.sh | 10 +++------- 2 files changed, 6 insertions(+), 14 deletions(-) Index: subversion-1.8.11/subversion/tests/cmdline/davautocheck.sh =================================================================== --- subversion-1.8.11.orig/subversion/tests/cmdline/davautocheck.sh 2015-03-10 21:05:56.000000000 +0100 +++ subversion-1.8.11/subversion/tests/cmdline/davautocheck.sh 2015-03-10 21:06:50.000000000 +0100 @@ -534,11 +534,7 @@ if [ $# -eq 1 ] && [ "x$1" = 'x--no-test exit fi -if type time > /dev/null; then - TIME_CMD=time -else - TIME_CMD="" -fi +if type time > /dev/null ; then TIME_CMD() { time "$@"; } ; else TIME_CMD() { "$@"; } ; fi say "starting the tests..." @@ -557,13 +553,13 @@ else fi if [ $# = 0 ]; then - $TIME_CMD make check "BASE_URL=$BASE_URL" $SSL_MAKE_VAR + TIME_CMD make check "BASE_URL=$BASE_URL" $SSL_MAKE_VAR r=$? else (cd "$ABS_BUILDDIR/subversion/tests/cmdline/" TEST="$1" shift - $TIME_CMD "$ABS_SRCDIR/subversion/tests/cmdline/${TEST}_tests.py" "--url=$BASE_URL" $SSL_TEST_ARG "$@") + TIME_CMD "$ABS_SRCDIR/subversion/tests/cmdline/${TEST}_tests.py" "--url=$BASE_URL" $SSL_TEST_ARG "$@") r=$? fi Index: subversion-1.8.11/subversion/tests/cmdline/svnserveautocheck.sh =================================================================== --- subversion-1.8.11.orig/subversion/tests/cmdline/svnserveautocheck.sh 2015-03-10 21:05:50.000000000 +0100 +++ subversion-1.8.11/subversion/tests/cmdline/svnserveautocheck.sh 2015-03-10 21:05:56.000000000 +0100 @@ -92,11 +92,7 @@ random_port() { fi } -if type time > /dev/null; then - TIME_CMD=time -else - TIME_CMD="" -fi +if type time > /dev/null ; then TIME_CMD() { time "$@"; } ; else TIME_CMD() { "$@"; } ; fi SVNSERVE_PORT=$(random_port) while netstat -an | grep $SVNSERVE_PORT | grep 'LISTEN'; do @@ -119,13 +115,13 @@ fi BASE_URL=svn://127.0.0.1:$SVNSERVE_PORT if [ $# = 0 ]; then - $TIME_CMD make check "BASE_URL=$BASE_URL" + TIME_CMD make check "BASE_URL=$BASE_URL" r=$? else cd "$ABS_BUILDDIR/subversion/tests/cmdline/" TEST="$1" shift - $TIME_CMD "./${TEST}_tests.py" "--url=$BASE_URL" $* + TIME_CMD "./${TEST}_tests.py" "--url=$BASE_URL" $* r=$? cd - > /dev/null fi ++++++ subversion.conf ++++++ --- /var/tmp/diff_new_pack.gjzUuZ/_old 2015-03-18 13:08:50.000000000 +0100 +++ /var/tmp/diff_new_pack.gjzUuZ/_new 2015-03-18 13:08:50.000000000 +0100 @@ -34,6 +34,7 @@ # AuthType Basic # AuthName "Authorization Realm" # AuthUserFile /srv/svn/user_access/myproject1_passwdfile +# AuthGroupFile /srv/svn/user_access/myproject1_groupfile # # # Limit read access to certain people # <Limit GET PROPFIND OPTIONS REPORT> @@ -47,7 +48,7 @@ # <LimitExcept GET PROPFIND OPTIONS REPORT> # # uncomment to require SSL connection for password protection. # # SSLRequireSSL -# Require project1_committers +# Require group project1_committers # </LimitExcept> # #</Location> -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
