Accepting request 321836 from devel:tools:scm:svn:1.9
Apache Subversion 1.9.0 OBS-URL: https://build.opensuse.org/request/show/321836 OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm:svn/subversion?expand=0&rev=216
This commit is contained in:
Git OBS Bridge
parent
a42a45defa
commit
67ed8c7702
@ -6,11 +6,19 @@ patch by David Kimdon <dwhedon@debian.org>. The basic theory is:
|
||||
- Use libtool instead of apxs to install the apache modules.
|
||||
libtool relinks without rpath in this case, apxs obviously doesn't.
|
||||
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -216,10 +216,10 @@
|
||||
# special compilation for files destined for cxxhl
|
||||
COMPILE_CXXHL_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=compile $(COMPILE_CXX) $(LT_CFLAGS) $(CXXHL_INCLUDES) -o $@ -c
|
||||
---
|
||||
Makefile.in | 12 +++++++-----
|
||||
build.conf | 4 ++--
|
||||
build/generator/gen_base.py | 3 ++-
|
||||
3 files changed, 11 insertions(+), 8 deletions(-)
|
||||
|
||||
Index: subversion-1.9.0-beta1/Makefile.in
|
||||
===================================================================
|
||||
--- subversion-1.9.0-beta1.orig/Makefile.in 2015-03-06 23:32:00.000000000 +0100
|
||||
+++ subversion-1.9.0-beta1/Makefile.in 2015-03-06 23:33:25.000000000 +0100
|
||||
@@ -255,10 +255,10 @@ COMPILE_CXXHL_CXX = $(LT_COMPILE_CXX) $(
|
||||
COMPILE_GMOCK_CXX = $(LT_COMPILE_CXX_NOWARN) $(GMOCK_INCLUDES) -o $@ -c
|
||||
COMPILE_CXXHL_GMOCK_CXX = $(LT_COMPILE_CXX) $(CXXHL_INCLUDES) $(GMOCK_INCLUDES) -o $@ -c
|
||||
|
||||
-LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(libdir)
|
||||
-LINK_LIB = $(LINK) $(LT_SO_VERSION)
|
||||
@ -23,40 +31,44 @@ patch by David Kimdon <dwhedon@debian.org>. The basic theory is:
|
||||
|
||||
# special link rule for mod_dav_svn
|
||||
LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS)
|
||||
@@ -777,7 +777,9 @@
|
||||
@@ -837,7 +837,9 @@ $(SWIG_PL_DIR)/native/Makefile.PL: $(SWI
|
||||
./config.status subversion/bindings/swig/perl/native/Makefile.PL
|
||||
|
||||
$(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL
|
||||
- cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL
|
||||
- cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL PREFIX=$(prefix)
|
||||
+ cd $(SWIG_PL_DIR)/native; \
|
||||
+ $(PERL) Makefile.PL INSTALLDIRS=vendor; \
|
||||
+ $(PERL) Makefile.PL PREFIX=$(prefix) INSTALLDIRS=vendor; \
|
||||
+ sed -i -e '/^LD_RUN_PATH/s/^/#/' Makefile Makefile.[a-z]*
|
||||
|
||||
# There is a "readlink -f" command on some systems for the same purpose,
|
||||
# but it's not as portable (e.g. Mac OS X doesn't have it). These should
|
||||
--- a/build.conf
|
||||
+++ b/build.conf
|
||||
@@ -502,7 +502,7 @@
|
||||
lang = python
|
||||
Index: subversion-1.9.0-beta1/build.conf
|
||||
===================================================================
|
||||
--- subversion-1.9.0-beta1.orig/build.conf 2015-03-06 23:32:00.000000000 +0100
|
||||
+++ subversion-1.9.0-beta1/build.conf 2015-03-06 23:32:05.000000000 +0100
|
||||
@@ -561,7 +561,7 @@ lang = python
|
||||
path = subversion/bindings/swig/python/libsvn_swig_py
|
||||
libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_subr apriconv apr
|
||||
libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_subr
|
||||
apriconv apr python swig
|
||||
-link-cmd = $(LINK)
|
||||
+link-cmd = $(LINK_LIB) $(SWIG_PY_LIBS)
|
||||
install = swig-py-lib
|
||||
# need special build rule to include -DSWIGPYTHON
|
||||
compile-cmd = $(COMPILE_SWIG_PY)
|
||||
@@ -525,7 +525,7 @@
|
||||
@@ -586,7 +586,7 @@ type = swig_lib
|
||||
lang = ruby
|
||||
path = subversion/bindings/swig/ruby/libsvn_swig_ruby
|
||||
libs = libsvn_client libsvn_wc libsvn_delta libsvn_subr apriconv apr
|
||||
libs = libsvn_client libsvn_wc libsvn_delta libsvn_subr apriconv apr ruby swig
|
||||
-link-cmd = $(LINK) $(SWIG_RB_LIBS)
|
||||
+link-cmd = $(LINK_LIB) $(SWIG_RB_LIBS)
|
||||
install = swig-rb-lib
|
||||
# need special build rule to include
|
||||
compile-cmd = $(COMPILE_SWIG_RB)
|
||||
--- a/build/generator/gen_base.py
|
||||
+++ b/build/generator/gen_base.py
|
||||
@@ -415,7 +415,7 @@
|
||||
Index: subversion-1.9.0-beta1/build/generator/gen_base.py
|
||||
===================================================================
|
||||
--- subversion-1.9.0-beta1.orig/build/generator/gen_base.py 2015-03-06 23:32:00.000000000 +0100
|
||||
+++ subversion-1.9.0-beta1/build/generator/gen_base.py 2015-03-06 23:32:05.000000000 +0100
|
||||
@@ -497,7 +497,7 @@ class TargetLinked(Target):
|
||||
self.install = options.get('install')
|
||||
self.compile_cmd = options.get('compile-cmd')
|
||||
self.sources = options.get('sources', '*.c *.cpp')
|
||||
@ -65,7 +77,7 @@ patch by David Kimdon <dwhedon@debian.org>. The basic theory is:
|
||||
|
||||
self.external_lib = options.get('external-lib')
|
||||
self.external_project = options.get('external-project')
|
||||
@@ -467,6 +467,7 @@
|
||||
@@ -550,6 +550,7 @@ class TargetExe(TargetLinked):
|
||||
extmap = self.gen_obj._extension_map
|
||||
self.objext = extmap['exe', 'object']
|
||||
self.filename = build_path_join(self.path, name + extmap['exe', 'target'])
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
From: Oleksandr Chumachenko <ledest@gmail.com>
|
||||
Date: Thu Nov 20 19:44:10 2014 UTC
|
||||
Subject: [PATCH] Remove bashism in mailer.py test suite
|
||||
References: http://svn.apache.org/viewvc?view=revision&revision=r1640795
|
||||
Upstream: committed
|
||||
|
||||
* mailer/tests/mailer-init.sh
|
||||
Change echo -e to more portable printf
|
||||
|
||||
---
|
||||
tools/hook-scripts/mailer/tests/mailer-init.sh | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
Index: subversion-1.8.10/tools/hook-scripts/mailer/tests/mailer-init.sh
|
||||
===================================================================
|
||||
--- subversion-1.8.10.orig/tools/hook-scripts/mailer/tests/mailer-init.sh 2013-02-25 03:30:54.000000000 +0000
|
||||
+++ subversion-1.8.10/tools/hook-scripts/mailer/tests/mailer-init.sh 2014-11-20 19:00:52.000000000 +0000
|
||||
@@ -101,14 +101,14 @@ echo change C6 >> dir6/file4
|
||||
svn commit -m "copy dir, then make a change"
|
||||
|
||||
# add a binary file and set property to binary value
|
||||
-echo -e "\x00\x01\x02\x03\x04" > file11
|
||||
+printf "\x00\x01\x02\x03\x04\n" > file11
|
||||
svn add file11
|
||||
svn ps svn:mime-type application/octect-stream file11
|
||||
svn ps prop2 -F file11 file9
|
||||
svn commit -m "add binary file"
|
||||
|
||||
# change the binary file and set property to non binary value
|
||||
-echo -e "\x20\x01\x02\x20" > file11
|
||||
+printf "\x20\x01\x02\x20\n" > file11
|
||||
svn ps prop2 propval2 file9
|
||||
svn commit -m "change binary file"
|
||||
|
||||
@ -17,52 +17,12 @@ command.
|
||||
|
||||
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
|
||||
Index: trunk/subversion/tests/cmdline/svnserveautocheck.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() {
|
||||
--- trunk/subversion/tests/cmdline/svnserveautocheck.sh (revision 1665651)
|
||||
+++ trunk/subversion/tests/cmdline/svnserveautocheck.sh (revision 1665652)
|
||||
@@ -92,11 +92,7 @@
|
||||
fi
|
||||
}
|
||||
|
||||
@ -73,14 +33,14 @@ Index: subversion-1.8.11/subversion/tests/cmdline/svnserveautocheck.sh
|
||||
-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
|
||||
MAKE=${MAKE:-make}
|
||||
|
||||
@@ -121,13 +117,13 @@
|
||||
|
||||
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"
|
||||
- $TIME_CMD "$MAKE" check "BASE_URL=$BASE_URL"
|
||||
+ TIME_CMD "$MAKE" check "BASE_URL=$BASE_URL"
|
||||
r=$?
|
||||
else
|
||||
cd "$ABS_BUILDDIR/subversion/tests/cmdline/"
|
||||
@ -91,3 +51,38 @@ Index: subversion-1.8.11/subversion/tests/cmdline/svnserveautocheck.sh
|
||||
r=$?
|
||||
cd - > /dev/null
|
||||
fi
|
||||
Index: trunk/subversion/tests/cmdline/davautocheck.sh
|
||||
===================================================================
|
||||
--- trunk/subversion/tests/cmdline/davautocheck.sh (revision 1665651)
|
||||
+++ trunk/subversion/tests/cmdline/davautocheck.sh (revision 1665652)
|
||||
@@ -596,13 +596,8 @@
|
||||
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
|
||||
-
|
||||
MAKE=${MAKE:-make}
|
||||
|
||||
say "starting the tests..."
|
||||
@@ -620,13 +615,13 @@
|
||||
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
|
||||
|
||||
|
||||
@ -1,30 +0,0 @@
|
||||
------------------------------------------------------------------------
|
||||
r1658347 | brane | 2015-02-09 11:23:53 +0100 (Mon, 09 Feb 2015) | 6 lines
|
||||
Changed paths:
|
||||
M /subversion/trunk/subversion/bindings/swig/svn_delta.i
|
||||
|
||||
Partial fix for bindings build with Swig 3.0.x; fixes swig-pl and swig-rb.
|
||||
|
||||
* subversion/bindings/swig/svn_delta.i:
|
||||
Escape Python code block so that Swig doesn't error out on the comments,
|
||||
thinking they're unknown directives.
|
||||
|
||||
------------------------------------------------------------------------
|
||||
Index: subversion/bindings/swig/svn_delta.i
|
||||
===================================================================
|
||||
--- subversion/bindings/swig/svn_delta.i (revision 1658346)
|
||||
+++ subversion/bindings/swig/svn_delta.i (revision 1658347)
|
||||
@@ -205,11 +205,11 @@
|
||||
%include svn_delta_h.swg
|
||||
|
||||
#ifdef SWIGPYTHON
|
||||
-%pythoncode {
|
||||
+%pythoncode %{
|
||||
# This function is for backwards compatibility only.
|
||||
# Use svn_txdelta_window_t.ops instead.
|
||||
svn_txdelta_window_t_ops_get = svn_txdelta_window_t._ops_get
|
||||
-}
|
||||
+%}
|
||||
#endif
|
||||
|
||||
#ifdef SWIGRUBY
|
||||
@ -1,32 +0,0 @@
|
||||
------------------------------------------------------------------------
|
||||
r1655262 | rhuijben | 2015-01-28 12:37:54 +0100 (Wed, 28 Jan 2015) | 6 lines
|
||||
Changed paths:
|
||||
M /subversion/trunk/subversion/bindings/swig/core.i
|
||||
|
||||
* subversion/bindings/swig/core.i
|
||||
Use C style comments in a file that is processed like C, to avoid errors
|
||||
with newer swig versions that use stricter processing rules.
|
||||
|
||||
Found by: astieger
|
||||
|
||||
------------------------------------------------------------------------
|
||||
Index: subversion/bindings/swig/core.i
|
||||
===================================================================
|
||||
--- subversion/bindings/swig/core.i (revision 1655261)
|
||||
+++ subversion/bindings/swig/core.i (revision 1655262)
|
||||
@@ -800,10 +800,11 @@
|
||||
#endif
|
||||
|
||||
#ifdef SWIGPYTHON
|
||||
-# The auth baton depends on the providers, so we preserve a
|
||||
-# reference to them inside the wrapper. This way, if all external
|
||||
-# references to the providers are gone, they will still be alive,
|
||||
-# keeping the baton valid.
|
||||
+/* The auth baton depends on the providers, so we preserve a
|
||||
+ reference to them inside the wrapper. This way, if all external
|
||||
+ references to the providers are gone, they will still be alive,
|
||||
+ keeping the baton valid.
|
||||
+ */
|
||||
%feature("pythonappend") svn_auth_open %{
|
||||
val.__dict__["_deps"] = list(args[0])
|
||||
%}
|
||||
@ -1,18 +0,0 @@
|
||||
--- subversion/mod_authz_svn/mod_authz_svn.c.orig 2015-08-06 13:03:43.000000000 +0200
|
||||
+++ subversion/mod_authz_svn/mod_authz_svn.c 2015-08-06 13:04:35.000000000 +0200
|
||||
@@ -860,13 +860,14 @@
|
||||
&authz_svn_module);
|
||||
const char *repos_path = NULL;
|
||||
const char *dest_repos_path = NULL;
|
||||
- int status, authn_required;
|
||||
+ int status;
|
||||
|
||||
#if USE_FORCE_AUTHN
|
||||
/* Use the force_authn() hook available in 2.4.x to work securely
|
||||
* given that ap_some_auth_required() is no longer functional for our
|
||||
* purposes in 2.4.x.
|
||||
*/
|
||||
+ int authn_required;
|
||||
int authn_configured;
|
||||
|
||||
/* We are not configured to run */
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7f3883cdfcad4174e06dd94d6e3e8ec91856823268eebe60c924be76f5229a1f
|
||||
size 6850562
|
||||
@ -1,91 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG/MacGPG2 v2.0.19 (Darwin)
|
||||
Comment: GPGTools - http://gpgtools.org
|
||||
|
||||
iQIcBAABCgAGBQJVtdM0AAoJEBvKZYajR5Q/xmUP/09bbaXFJT/NAzfswGfOUsFy
|
||||
OWLDXSNZvgHXERxHqTJMdpToGEGsrRM1z202rUn5b0UxdkV/T40jNBAV0KKHsJ31
|
||||
DQLNf8h/8uhw1xrsDKOJhyxGguOQxKJcQPJASi100Q18NeH7l7HyExMYNI0Damv7
|
||||
IKN8vI0Y03xZQgXwNLTXTzyorfSeYfg7+AZlVBpIawkZ/zu6yuBv5Bldf0936prv
|
||||
rUgmIQtHrpa6lCP5fK0vU/QorjyCTjyevxUzCoe8yZTYlAfFKZZdg2H8p8erROK9
|
||||
O+/3eyDhpi8PSfiYkl9PiSEAww4oYpUayZo1BHl4Mq32hANU9U9pEMtTC1tQaUVJ
|
||||
BaV/0ejvfugmLjQYfMF6C2ZTqYPoetRttsGwjD89tsduBAooAIwwjDK5T4buaQYP
|
||||
4MBiR/YenBqlA+195rUide465TK0psSCvOOlN3/Ph3zGm0lSW2Rn5vfD4qUzOLBr
|
||||
1BGkuOUr+S3qUXDC3cIpt0mt6LTMQUcSeMiekYTKoInphzZ0vWf+2z/NZwGe14Qv
|
||||
lheNfW2jO2vnY8sWNBXibz0k1wROVaaEGSHoqE3xuUoRFujZKIZ87Nc58lVt3BXx
|
||||
D8Ct0XbDYlbb6oqzs0+i4JYxbui/tY5mfRRy/GIs7KuD3PDehkD2pcqpmZrVb0Ew
|
||||
luP6J7hon2iF630KZDq0
|
||||
=16rK
|
||||
-----END PGP SIGNATURE-----
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1
|
||||
|
||||
iQEcBAABAgAGBQJVtklqAAoJEE99uqmaWblzyJQIAJncHmMPiPtULbA/Ad3adaBR
|
||||
cSBYqbbdgFUV2gGyS7b0DFWUfQ7pMk5lkxDAMV47H6//DqIqIGSYoxB8OfyVn6M8
|
||||
xiHeWBnRqvZH2DlMBYAvXGcHhRciN8rYqShCldZkvzPvkNU6sY/Fqp9s01HFEN4G
|
||||
0yHY2PfeBoeAG0ZSV1ONABeGtT7YgF9MT7Rwp4LJ0O9sykbc0I4qDuL+2hMUL0/s
|
||||
cZOknbnrKiJUEEZ1CDJ8YWuZ+EoBNkbGZTFneSsedyQnDP8moOFt8fYr4AIQR3oe
|
||||
TmcdrHhes+q8CrbpUIt27TisJ7Sd4s1B3kZ0pUs+vlu3qU9xh7P1RoFYgDaZ54w=
|
||||
=izkq
|
||||
-----END PGP SIGNATURE-----
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1
|
||||
|
||||
iQIcBAABAgAGBQJVtli/AAoJEJnsdBtXkhrMv2sQAICByH1og3TI4mMd6gty6e4d
|
||||
2US06Hzjh71UxcpaEkCIIZhQVGqYSIz6MAsRDUeiSAomj9kHF8e+FZq5FPaU/aJo
|
||||
rel6sOTpIubbIBim8MxUx/6H94AMVZ5sIld0flTkvKvnVtkpgFF8Qh1sCU6Protw
|
||||
qx+KRbtpe11bDqsA10SLuYpe7ZUnJZj8YUaAxX6aZKODGGlbKIUhddVVrl0dPK2i
|
||||
/QfwlAxYdM5ROI791NUSRqOMIjvH1/eJZFwb8B3+S8Ot00g4VA25yqfY1fLDrTRk
|
||||
TJm7irnayIlsH7sW63agYTknYUa3Y5/ZBbBjdU9WYZqM0iRxwFJrWSpFqN1F9lmI
|
||||
Vw6wt/yJp6lWzI/L3rJ2e7ZlI0bNO656GY34JRbmlnyumBE5pURc/RxFBGuk4DTD
|
||||
+huDK34zdtkeH8cZNwdbkqkr9S3BLea1VVIiHLvYmMBluJ2wO63oPDZK7HffAt0k
|
||||
tQyEhuWe60JIE6lLrmkQ0KGxEVJkyfmB3whX78IeIFtIgiGb351vVbJW/hEXKbhC
|
||||
r4KOQRQIxwCl8Yill51sffcTIfwRu708gnGoc+ieZwglifM13K7ZHryaL9JKHWge
|
||||
RCN7sV7vIarn4PE2AL1xKFMQ0IQtHKXAkhmGgRBwav6S0eFAS/a/KkK0UKS7ciAq
|
||||
SGkEa18kAaqGB5lFdFFX
|
||||
=IVs2
|
||||
-----END PGP SIGNATURE-----
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1
|
||||
|
||||
iQIcBAABCAAGBQJVtmgtAAoJEB+wZLhO7MSTN84P/1a1fljrY3uLy8Uz7O85pghP
|
||||
YIl14/ijISIvrNHEduyCCFVC5HztneBuwZltXQKPCYl1C2y2E4xYISnObZa0ypgs
|
||||
1Qyj1aowaI+KiPR15kmVH7mtNBOts3TL/dR3R8Nnhih9Ouwh0l6XWm9S27+S3XSH
|
||||
4C+Ekmj4oldhZRZXPMTeABnA7lgTfkxnmvFi7nD0er0yrC1KlS7BI18Jfl1VRHNK
|
||||
IK748ZeDVWAxePK/UNEz1yqngDzjHiOngNR6OQG1eOomS2ZoDcY7WnFMJhBYlJCp
|
||||
lVR2FAc4qZz4+TiYXB5pEp7BdaG6AdXccH/j5C4Z3/cHYkL4lVL3OxnJ6pkCbaU5
|
||||
kbfySo913NPm3d2DPobvWEbC9JnOo0qK/8EBYth2OLgL9BF+NWQ/q//OMmsj4xBS
|
||||
IIl1enJjP3gYdv96TkqolrYOUR/2jCQ793Hn2UJFGjNpAhcpy9yND6UCRW5cUqX0
|
||||
gnKBrZGXOMZ0e/oeGYahYWlTbNQGx2jkRdumJd9xssjVnAqu3gkICXwQNE77DmY8
|
||||
IeSAeH4lsf0aVQ2YhScPI5ESa0/VAoeyu0eyJWPrT6x7yrJ3naTXr+E0PZyuU+PP
|
||||
ig5mWn9r0gmBflgZFVenQbC7SfhWCYTinRTCAHINln2kYMoOxW76sewm5O7A+G8q
|
||||
JgGk7jB/Qp1sKuA3qdnp
|
||||
=Chlj
|
||||
-----END PGP SIGNATURE-----
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1
|
||||
|
||||
iQEcBAABCAAGBQJVu0fRAAoJEHbXiOHtGlmcrP8H/1HiJs4i3H21iVdLJE7Jg/gq
|
||||
GTIe/QrqqGM1v+NmF6SSgSTiyLD0Q5fjoaq2dpFDbt76SM/BFgkYVjDyFB8te5zR
|
||||
ZlHQpttYU3uy9wBgupdazd1M/OQjie2p6bZMfLgCskhSKmBJDU+s9+xQ0DE2BmtH
|
||||
tBKV/ME9ZNIwZMlQTG8ehsBNyLTFhEEQ/x8Qher8QHnYRhSH6gTL8UrkoSRF7M26
|
||||
NznCOi7AOP4cEfbisklRaovkze3+ZhRGpIq9mhFVL9vCmuYD3WSJsPJ+3bwJq23+
|
||||
cmgb6bMv0+Vx6RK28S5ddACKFIsGs/wnZVNkL2iIFLiC6ZBwkJPHRDeujPTXcCA=
|
||||
=T24s
|
||||
-----END PGP SIGNATURE-----
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1
|
||||
|
||||
iQIcBAABAgAGBQJVv8/yAAoJEMSmxiXMyOHfqWcP/2Rwd5tAXk1Z/fqbfjJOHR8v
|
||||
bIntA2PM0ES/2v0ndb9LbQeQRn6QINWfkcW5yt62H4dMfe5zOK66lLxZ0jbG3Ztx
|
||||
+DEzaGmQ+tkEl5pQFstGjFKVGCEwTAjcrHrf+AhrfRhHOwg+aGh6m4AsOSuADETz
|
||||
Kt6sDx61GBTTy+lgeuI6DMViu7d3NYZV3zAH+kf/j9YEcrCwL7xotXtH3LFtlhow
|
||||
NW1AneASscTxKx5np8IqDD4rvOqoqQJ0Zz0oDcF6/CrZfRuMDK5sN6LSENYGSdLM
|
||||
NHhcZxn7wfGQMxti75a/5h2dHxNE1PN11vWgFiBuaau7pr421ixLMbx3knssoYvL
|
||||
hmNDVjNV20IvtVTXEDawCLjDwT2y+AiBsrp/kw3WTUgZUNVA+BFjGfb0t7P08ZuE
|
||||
Yv9BAaa/cBO2q1SdF/SAt/lTHAuHFiCyfBiEoRTkjuQYbBD3hAfGH57LhLfpjk6k
|
||||
mGdM/R6HBCVxHFhsEMFIXmqxyzGk4PG0bkoEy7vmyIquPJQO5yFyMLfzm/hqjCGC
|
||||
6pbbyqOcJvYkk346QAy7on5r92IL+oZ+CqFIobry8eBOUdXRTwlHFSN7fTUVpU03
|
||||
EwQtYph795HdFLblBREjQLE9ac4p7uvR32euWjE4zpiU28mwMGmjN+CODsUG+JV8
|
||||
DHBtnhXpZG7EsGpn1+xI
|
||||
=rFWj
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -16,10 +16,10 @@ This patch enables building Subversion against this fixed package.
|
||||
build/ac-macros/apache.m4 | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
Index: subversion-1.8.9/build/ac-macros/apache.m4
|
||||
Index: subversion-1.9.0-alpha2/build/ac-macros/apache.m4
|
||||
===================================================================
|
||||
--- subversion-1.8.9.orig/build/ac-macros/apache.m4 2014-04-24 05:01:08.000000000 +0100
|
||||
+++ subversion-1.8.9/build/ac-macros/apache.m4 2014-05-07 20:52:04.000000000 +0100
|
||||
--- subversion-1.9.0-alpha2.orig/build/ac-macros/apache.m4 2013-11-26 22:18:56.000000000 +0100
|
||||
+++ subversion-1.9.0-alpha2/build/ac-macros/apache.m4 2015-01-24 14:55:32.000000000 +0100
|
||||
@@ -128,7 +128,7 @@ if test -n "$APXS" && test "$APXS" != "n
|
||||
AC_MSG_CHECKING([mod_dav version])
|
||||
old_CPPFLAGS="$CPPFLAGS"
|
||||
3
subversion-1.9.0.tar.bz2
Normal file
3
subversion-1.9.0.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:fcb11db07e132cac6c72a969e222a592f849ef34dd8bd1c2f99fa1ad267a3fe6
|
||||
size 7743404
|
||||
91
subversion-1.9.0.tar.bz2.asc
Normal file
91
subversion-1.9.0.tar.bz2.asc
Normal file
@ -0,0 +1,91 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG/MacGPG2 v2.0.19 (Darwin)
|
||||
Comment: GPGTools - http://gpgtools.org
|
||||
|
||||
iQIcBAABCgAGBQJVtewiAAoJEBvKZYajR5Q/HuEP/A+Kbyt7W2Yf6/sXyH3BgvA3
|
||||
ydOescotK0m+opQBGFjyYsR14FYqPyR6d1GENBAE9SaZ3Kzl0C+fFy+d17DWcmin
|
||||
MnWdfjabMYj33mKzaX5+uWFzGxfVbyG5TYEp2ZbcolGhmcZpmbO+DNLjCgGICH1i
|
||||
T57UBfRY06srXiBPjwMdPSY1ztoyTQsx35MXsQ/I9owZfMQYUqU3eh3GYVkaZl7K
|
||||
9iq294i2Q0TVwrrABup9BmHLmdQAkIJLZENJ65WLEGDBWwogiCoJyCCryV1U07j7
|
||||
W+4IqgkNwQ79YTwfjRI3ZuuT+cS72J++th0OnCFtetpQJp+KDA7mOoMYK19wnVIX
|
||||
uUyLWV/z+0stJJST7QelHQEjYZX8zsjj/rRnrU7nyH5RYzNtkHaq24VuP14ca3WN
|
||||
45OASWQkHMZtP453M4Yr0FVpxpOlhaJNePrPT+IfwE2057eCfQFWPRL75qPWneMt
|
||||
iYbhFYojh2uEeLO1x+bVzH8K80GIkEGUJuRXk5ovOgOCjcENzhiRGXaravosxd8H
|
||||
n4937gk6TrA+vY6XQubUZi55bqVhHW8PFl8OjkNQZ0a9krMjIS8I+zI3ntbP4lbY
|
||||
URhqYJIgBRf8jN6mwAxtTY34V/2ethoPkAsr+ndM43HCgciTuE4y999Lk9D4SRsi
|
||||
o7eUZZKP/QT4JKuxmcmq
|
||||
=qfd2
|
||||
-----END PGP SIGNATURE-----
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1
|
||||
|
||||
iQIcBAABAgAGBQJVtk3aAAoJEJnsdBtXkhrMEEkQALc9MZEO9eX7wMZZb/GOzoPI
|
||||
BmNOYmPqsNW5uOstoouhy1FQoDxCM8+tYx26H5sDxMDLtyqMieNKAAZo1biJl7nl
|
||||
33LH8+Lnc5gd8PkvfeKLs/ofsTLlNDyJ0e0iQKhzeHyuWvjEwh5ATINukEMsxmXV
|
||||
qRSPPrzpV5ymONZtJXXu29+4qY0N6KK//QdGau3b60UsU9mxK9JrUkdKOiYoNDhr
|
||||
5MWRIx+ImVuP9m25a5InvlF4Zn5RPZlREGUW/8hfRSrqHzzPkmoeQLqG43pp2v9Q
|
||||
U2p0Ss3OKmjajimdz9kw2419wXkJKw5leQFfETOKj5jTG5R96Eyvqmf2Uq7eVzZi
|
||||
sReO1csokv/uk/uhOgtY2XKO/JUWfE75hruzoiKgJ1GQ0mVu9Vpi4xpzg4pHEUCh
|
||||
oN3SKFs53tPkygAtVXr8QRce9/P5KNRPZ1o7g9wWKihDkM1WbMbHRRaftgqJWJpK
|
||||
qsCV2KD2j4P3noidmcIxynxJFkJBfUy1zKpmHB+JlF5PRCaBLQXk+Tz9rD8YEeFU
|
||||
3jrYdOpJMZaalsv8BNCSk8McMpLbzpTBFCCzUfIl/doVcUGaPIVey/Zm3ADphaaM
|
||||
aOSQjEXkqwWie0JYRY9YQR+OC5dGkmwIvSo9Wtk9QqYZdWtUNf0AEBOVCQh+3ERX
|
||||
iqzr3efpsPbLPFHprGQ7
|
||||
=g9Wu
|
||||
-----END PGP SIGNATURE-----
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1
|
||||
|
||||
iQIcBAABCAAGBQJVtm+6AAoJEB+wZLhO7MSTdmQP/Ru+6FyjM/PplB1GKWJbi1xY
|
||||
mzT8pAXb+fpll8ioaD73u7hSrDVQRgDGrDeXYHbGy7/n+mKccFZDDy0QgyQHXFRW
|
||||
yaLzYzGG5tmEQZORlQdavWsTDs8ODMJ2O1sD5QQNL7YjZSmiBazs1h7RhZ8PfMj5
|
||||
JQEFch3stzsmcVO1lhb8Pt39EhIpQAuzG7zR7PBSR6nxghYetSau8mGD5dVnQCKA
|
||||
B87l2tSYnjF59/Fz6balei4FY4v/XGP5YAmp1WfvxTzbaSOPHKmwT6S1rcPHcfGf
|
||||
jetPJcHrFjN1L3xO2PZjwOoXp1VC/EPAZ7O24rFVTZPEBWJAUCH1wG13dYVtyBrs
|
||||
9iXiW3Jf7hY7YMFZBhXp8zFNHVfuJeVm0zdi3l1x9BWQp4/kRNmcU/6agZIXWeFk
|
||||
tb2qfXWADdN0AoSum+iTB29uBEuZoiZdnmU6fHRV9oEhhHJBrbkJPit0UYGkC2i0
|
||||
ttSAKD/E3e94kvFSu7STLa1EVV2mFtGrq0QiOWr+92/S8m6KoPt5C6nCOccwCNCH
|
||||
rwfVfNasM+0O7ru+l2kGlMI53wFWqzC5uslUN7/VmCxaQeC3+LDOUPSa9VCIt2kI
|
||||
/ozodeWBfuxsTdXjGKM6mtly3zMqM0J2eccSnTKiBjhXC8zX2BNr9H3NNoFliJUz
|
||||
a0fterlPHDBxw5D7QJuo
|
||||
=y1+Y
|
||||
-----END PGP SIGNATURE-----
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1
|
||||
|
||||
iQEcBAABCAAGBQJVuhDnAAoJEHbXiOHtGlmcIuUH+wfNzW9wkwc7CZAtPQiXaJIe
|
||||
jteGo8O81hg5gNgO+vqwQgg/yg6zcsxlfoO0a8EZNqP9tgd6xfBigNrTMFtr3EHB
|
||||
E41PEiywqL7h6fOW5Z3JBCi6ijnUfEPA8Pb6zXs1TCDUPt1pTMIWCQeMOiz5iAA3
|
||||
tvqaitoPbpJEa1KAwGHtTKnvD0gBXC5cUSm4smcja/eZg2SNUgZoE7IUPMW0z79J
|
||||
7ZBSvmHMPMz+SxzhCqfubRirnPMp/6BxpYEqAPDkBzV2oq8IYCCbI7nkHmmCCuAz
|
||||
QeWkY4hHVqC7hukH7EdtLj+C3zM0C0OwJLWJr8CXjS+pXkkOrXvOtawFIgZrnXk=
|
||||
=gnyl
|
||||
-----END PGP SIGNATURE-----
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1
|
||||
|
||||
iQEcBAABAgAGBQJVuykAAAoJEE99uqmaWblz3R8H/0DstQXzn7djDu9viG+hKcXT
|
||||
c19Ctf+2uo4zLZvN28wNEwXKb1PDSUkGx3A9y86V9MVSUXTdquF7S4pzdWKHxXYH
|
||||
aKsxxCEwXPMIC8Nlcefyl1TJ7OF7zkwQ4c3cDvY4KWbYgISL+SLaapmqcKc6lNy1
|
||||
XNvzj3M/T5v0W+/sUzKEdhwyCahtm5w2k+rabby0FLe3icpA8ZSc/nu8mrwJ++dl
|
||||
JWp26J2tC0x8Xf4nFTehTs+hf52lAlUo7f+Ie/ElbWwKKW9AE/ZxVDDU+Qxk5SUW
|
||||
Nl+knh/2S6neaapmiqplpmiVARlSP3vuRU85D+hIXovjowPzcjP0GitrNP31upY=
|
||||
=2Gwk
|
||||
-----END PGP SIGNATURE-----
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1
|
||||
|
||||
iQIcBAABAgAGBQJVwcE2AAoJEMSmxiXMyOHfyjcP/0F7uHNW/ItobbTrewZ5827c
|
||||
kAOW8g83J5cDV1kNKdK1/PJQxAx/WqGDEian2liyjfouKFk9oBZPGigauIKgVJR+
|
||||
kzTV5VtSMYMzHrgfoxX8Ftcd/wwPWVONIlizx2DCSqvw9lCsMa94FmVNE4W8x0UN
|
||||
CqfIuipS+A2uQrp6nY95jEGRUaM52vvva/5xfNFfEIGzNHsmHoL/HJGGGGicLXWX
|
||||
DTzTnLVoxeIpvgNOv5FxietLyqFBYZKz6t49173+3agt1Q1IWlDKBHIrRabvv9MD
|
||||
YLIzUbHLoPqs8/1S3uZyg08Y8kLCR/AE3oY+nbvK03RCwuj4X6Xietqp0yUWZJAY
|
||||
PQ7Y43YMxG3h4fqb2tUMEyIrJFhfFnivKn+NaCW6ljoXqfTKaFCNZhDGijbAc7Cx
|
||||
fVjwpFeIM+sE100Z7y56w2R7A1WUTOyJRaDAZ1UTAuQLTdsXNq8o2/0RhNcYKLmH
|
||||
1B8rAgLpYae93/3Rr9oeO0fRU778rAyX9RdBU73UV1alrpiF2Z6+WiHLBRAUtZux
|
||||
5VA3MzhA/cQkHR2ApTGiXHsPxM2Htjynrq3GH/lkOtnZTrETd3Uqh5q3PNu4Zm8W
|
||||
q1jACaUNrVQiDrOow+1XBIJLBRpTqFpFxTqsJC1+Mfl4f+0GyduZXdnq5acJZhwJ
|
||||
VFtfz0DHmC9aA4EfwKq9
|
||||
=XULr
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -13,13 +13,13 @@ Prevent unneccessary rebuilds of binary packages differing only by date, time an
|
||||
subversion/tests/cmdline/getopt_tests_data/svn--version_stdout | 1 -
|
||||
5 files changed, 6 insertions(+), 12 deletions(-)
|
||||
|
||||
Index: subversion-1.8.9/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
|
||||
Index: subversion-1.9.0/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
|
||||
===================================================================
|
||||
--- subversion-1.8.9.orig/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java 2014-05-07 20:10:17.000000000 +0100
|
||||
+++ subversion-1.8.9/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java 2014-05-07 20:10:26.000000000 +0100
|
||||
@@ -140,10 +140,10 @@ public class BasicTests extends SVNTests
|
||||
--- subversion-1.9.0.orig/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java 2015-08-10 22:02:38.000000000 +0200
|
||||
+++ subversion-1.9.0/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java 2015-08-10 22:03:00.000000000 +0200
|
||||
@@ -144,10 +144,10 @@ public class BasicTests extends SVNTests
|
||||
{
|
||||
VersionExtended vx = client.getVersionExtended(false);
|
||||
vx = client.getVersionExtended(false);
|
||||
String result = vx.getBuildDate();
|
||||
- if (result == null || result.trim().length() == 0)
|
||||
+ if (result == null)
|
||||
@ -30,11 +30,11 @@ Index: subversion-1.8.9/subversion/bindings/javahl/tests/org/apache/subversion/j
|
||||
throw new Exception("Build time empty");
|
||||
result = vx.getBuildHost();
|
||||
if (result == null || result.trim().length() == 0)
|
||||
Index: subversion-1.8.9/subversion/libsvn_subr/opt.c
|
||||
Index: subversion-1.9.0/subversion/libsvn_subr/opt.c
|
||||
===================================================================
|
||||
--- subversion-1.8.9.orig/subversion/libsvn_subr/opt.c 2014-05-07 20:10:17.000000000 +0100
|
||||
+++ subversion-1.8.9/subversion/libsvn_subr/opt.c 2014-05-07 20:10:26.000000000 +0100
|
||||
@@ -1114,12 +1114,8 @@ svn_opt__print_version_info(const char *
|
||||
--- subversion-1.9.0.orig/subversion/libsvn_subr/opt.c 2015-08-10 22:02:38.000000000 +0200
|
||||
+++ subversion-1.9.0/subversion/libsvn_subr/opt.c 2015-08-10 22:03:00.000000000 +0200
|
||||
@@ -1109,12 +1109,8 @@ svn_opt__print_version_info(const char *
|
||||
if (quiet)
|
||||
return svn_cmdline_printf(pool, "%s\n", SVN_VER_NUMBER);
|
||||
|
||||
@ -49,10 +49,10 @@ Index: subversion-1.8.9/subversion/libsvn_subr/opt.c
|
||||
SVN_ERR(svn_cmdline_printf(pool, "%s\n", svn_version_ext_copyright(info)));
|
||||
|
||||
if (footer)
|
||||
Index: subversion-1.8.9/subversion/libsvn_subr/version.c
|
||||
Index: subversion-1.9.0/subversion/libsvn_subr/version.c
|
||||
===================================================================
|
||||
--- subversion-1.8.9.orig/subversion/libsvn_subr/version.c 2014-05-07 20:10:17.000000000 +0100
|
||||
+++ subversion-1.8.9/subversion/libsvn_subr/version.c 2014-05-07 20:10:26.000000000 +0100
|
||||
--- subversion-1.9.0.orig/subversion/libsvn_subr/version.c 2015-08-10 22:02:38.000000000 +0200
|
||||
+++ subversion-1.9.0/subversion/libsvn_subr/version.c 2015-08-10 22:03:00.000000000 +0200
|
||||
@@ -132,8 +132,8 @@ svn_version_extended(svn_boolean_t verbo
|
||||
{
|
||||
svn_version_extended_t *info = apr_pcalloc(pool, sizeof(*info));
|
||||
@ -64,23 +64,23 @@ Index: subversion-1.8.9/subversion/libsvn_subr/version.c
|
||||
info->build_host = SVN_BUILD_HOST;
|
||||
info->copyright = apr_pstrdup
|
||||
(pool, _("Copyright (C) 2015 The Apache Software Foundation.\n"
|
||||
Index: subversion-1.8.9/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout
|
||||
Index: subversion-1.9.0/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout
|
||||
===================================================================
|
||||
--- subversion-1.8.9.orig/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout 2014-05-07 20:10:17.000000000 +0100
|
||||
+++ subversion-1.8.9/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout 2014-05-07 20:10:26.000000000 +0100
|
||||
--- subversion-1.9.0.orig/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout 2015-08-10 22:02:38.000000000 +0200
|
||||
+++ subversion-1.9.0/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout 2015-08-10 22:03:00.000000000 +0200
|
||||
@@ -1,5 +1,4 @@
|
||||
svn, version 1.8.0-dev (under development)
|
||||
- compiled Sep 10 2012, 14:00:24 on i386-apple-darwin11.4.0
|
||||
svn, version 1.9.0-dev (under development)
|
||||
- compiled Feb 26 2014, 15:15:42 on x86_64-unknown-openbsd5.5
|
||||
|
||||
Copyright (C) 2012 The Apache Software Foundation.
|
||||
This software consists of contributions made by many people;
|
||||
Index: subversion-1.8.9/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout
|
||||
Index: subversion-1.9.0/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout
|
||||
===================================================================
|
||||
--- subversion-1.8.9.orig/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout 2014-05-07 20:10:17.000000000 +0100
|
||||
+++ subversion-1.8.9/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout 2014-05-07 20:10:26.000000000 +0100
|
||||
--- subversion-1.9.0.orig/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout 2015-08-10 22:02:38.000000000 +0200
|
||||
+++ subversion-1.9.0/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout 2015-08-10 22:03:00.000000000 +0200
|
||||
@@ -1,5 +1,4 @@
|
||||
svn, version 0.16.0 (r3987)
|
||||
- compiled Dec 5 2002, 00:02:51
|
||||
svn, version 1.9.0-dev (under development)
|
||||
- compiled Feb 26 2014, 15:15:42 on x86_64-unknown-openbsd5.5
|
||||
|
||||
Copyright (C) 2010 The Apache Software Foundation.
|
||||
Copyright (C) 2014 The Apache Software Foundation.
|
||||
This software consists of contributions made by many people;
|
||||
|
||||
@ -6,7 +6,7 @@ An online version can be found at http://svnbook.red-bean.com/
|
||||
|
||||
Topics:
|
||||
|
||||
0. upgrading to Apache Subversion 1.8
|
||||
0. upgrading to Apache Subversion 1.9
|
||||
1. mini-howto
|
||||
2. allowing anonymous read access
|
||||
3. serving several repositories with SVNParentPath
|
||||
@ -16,29 +16,24 @@ Topics:
|
||||
|
||||
================================================================================
|
||||
|
||||
0. upgrading to Apache Subversion 1.8
|
||||
0. upgrading to Apache Subversion 1.9
|
||||
|
||||
- concerns when upgrading from earlier versions
|
||||
* Upgrading the Working Copy
|
||||
1.8 introduces a new working copy format. One-time execution of
|
||||
"svn upgrade" required. After that, clients earlier than 1.8 will
|
||||
1.9 uses the same working copy format introduced in 1.8. When upgrading
|
||||
a working copy from a client earlier than 1.8, a one-time execution of
|
||||
"svn upgrade" is required. After that, clients earlier than 1.8 will
|
||||
be unable to use the working copy. Working copy must have been
|
||||
created using 1.6 or 1.7. For details, please see:
|
||||
https://subversion.apache.org/docs/release-notes/1.8.html#wc-upgrade
|
||||
https://subversion.apache.org/docs/release-notes/1.9.html#wc-upgrade
|
||||
* Upgrading the Repository
|
||||
1.8 can read and write repositories created by earlier versions.
|
||||
"svnadmin upgrade" may be used to upgrade to FSFS format 6 of 1.8,
|
||||
after which the repository will be no longer be usable for 1.7 servers.
|
||||
1.9 can read and write repositories created by earlier versions.
|
||||
"svnadmin upgrade" may be used to upgrade to FSFS format 7 of 1.9,
|
||||
after which the repository will be no longer be usable for 1.8 servers.
|
||||
An optional dump/load cycle may be used to apply FSFS improvements
|
||||
to past revisions.
|
||||
https://subversion.apache.org/docs/release-notes/1.8.html#compatibility
|
||||
https://subversion.apache.org/docs/release-notes/1.8.html#fsfs-enhancements
|
||||
* Required configuration changes when using mod_dav_svn with Apache httpd2:
|
||||
The MaxKeepAliveRequests option in httpd.conf needs to be increased
|
||||
from 100 (the default) to at least 1000 (there is no reason why it
|
||||
could not be 10000). This will improve performance by allowing serf
|
||||
clients to use fewer TCP connections to the server. Clients using
|
||||
neon will also work fine with this configuration.
|
||||
https://subversion.apache.org/docs/release-notes/1.9.html#compatibility
|
||||
https://subversion.apache.org/docs/release-notes/1.9.html#fsfs-improvements
|
||||
|
||||
================================================================================
|
||||
|
||||
|
||||
@ -1,3 +1,29 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 11 06:38:11 UTC 2015 - astieger@suse.com
|
||||
|
||||
- Apache Subversion 1.9.0:
|
||||
* new FSFS format 7 with major overhaul for I/O reduction
|
||||
* prospective blame
|
||||
* FSX experimental repository back-end
|
||||
* many enhangements and bug fixes
|
||||
- subversion-devel now ships pkgconfig files
|
||||
- dependency changes:
|
||||
* serf 1.3.4
|
||||
* apr, apr-utl 1.3.x
|
||||
* httpd 2.2.x
|
||||
* java 1.6
|
||||
* Python 2.7
|
||||
- To continue to allow building against blacklisted httpd 2.4.6
|
||||
which has the required patches in openSUSE:13.1:Update, update
|
||||
subversion-1.8.9-allow-httpd-2.4.6.patch to
|
||||
subversion-1.9.0-allow-httpd-2.4.6.patch
|
||||
- removed upstreamed patches:
|
||||
* subversion-1.8.10-fix-bashisms.patch
|
||||
* subversion-1.8.11-swig-py-comment.patch
|
||||
* subversion-1.8.11-swig-py-comment-2.patch
|
||||
- adjust subversion-no-build-date.patch
|
||||
- drop subversion-1.8.14-unused-var-authnrequired.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Aug 6 11:28:23 UTC 2015 - stsp@elego.de
|
||||
|
||||
|
||||
8262
subversion.keyring
8262
subversion.keyring
File diff suppressed because it is too large
Load Diff
@ -27,6 +27,7 @@
|
||||
%define apache_sysconfdir %(%{apxs} -q SYSCONFDIR)
|
||||
%define apache_mmn %(MMN="$(%{apxs} -q LIBEXECDIR)_MMN"; test -x "$MMN" && "$MMN")
|
||||
%define sqlite_minimum_version 3.7.12
|
||||
# SLE 12 does not ship KDE
|
||||
%define with_kde 0%{?suse_version} != 1315
|
||||
%if 0%{?suse_version} > 1140
|
||||
%define with_systemd 1
|
||||
@ -36,7 +37,7 @@ BuildRequires: pkgconfig(systemd)
|
||||
%bcond_without python_ctypes
|
||||
%bcond_with all_regression_tests
|
||||
Name: subversion
|
||||
Version: 1.8.14
|
||||
Version: 1.9.0
|
||||
Release: 0
|
||||
Summary: Subversion version control system
|
||||
License: Apache-2.0
|
||||
@ -54,8 +55,7 @@ Source14: svnserve.service
|
||||
Source15: svnserve.tmpfiles
|
||||
Source42: subversion.svngrep.sh
|
||||
Source43: subversion.svndiff.sh
|
||||
# https://people.apache.org/keys/group/subversion-pmc.asc
|
||||
Source50: subversion.keyring
|
||||
Source50: https://people.apache.org/keys/group/subversion-pmc.asc#/subversion.keyring
|
||||
Source51: https://www.apache.org/dist/subversion/%{name}-%{version}.tar.bz2.asc
|
||||
Source92: %{name}.rpmlintrc
|
||||
Patch11: subversion.libtool-verbose.patch
|
||||
@ -63,17 +63,13 @@ Patch20: subversion-swig-perl-install_vendor.patch
|
||||
Patch23: subversion-swig-perl-Wall.patch
|
||||
Patch30: subversion-1.8.0-rpath.patch
|
||||
Patch37: subversion-no-build-date.patch
|
||||
Patch38: subversion-1.8.9-allow-httpd-2.4.6.patch
|
||||
Patch39: subversion-fix-parallel-build-support-for-perl-bindings.patch
|
||||
Patch40: subversion-perl-underlinking.patch
|
||||
Patch41: subversion-1.8.10-fix-bashisms.patch
|
||||
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
|
||||
Patch46: subversion-1.8.14-httpd-version-number-detection.patch
|
||||
Patch47: subversion-1.8.14-unused-var-authnrequired.patch
|
||||
BuildRequires: apache2-devel
|
||||
Patch48: subversion-1.9.0-allow-httpd-2.4.6.patch
|
||||
BuildRequires: apache2-devel >= 2.2.0
|
||||
BuildRequires: apache2-prefork
|
||||
BuildRequires: cyrus-sasl-devel
|
||||
BuildRequires: db-devel
|
||||
@ -86,11 +82,11 @@ BuildRequires: java-devel >= 1.6.0
|
||||
BuildRequires: junit
|
||||
BuildRequires: krb5-devel
|
||||
BuildRequires: libgnome-keyring-devel
|
||||
BuildRequires: libserf-devel >= 1.2.1
|
||||
BuildRequires: libstdc++-devel
|
||||
BuildRequires: libtool
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: python-devel
|
||||
BuildRequires: pkg-config
|
||||
# Python 2.7 or later is required to run autogen.sh
|
||||
BuildRequires: python-devel >= 2.7
|
||||
BuildRequires: python-xml
|
||||
BuildRequires: ruby-devel >= 1.8.2
|
||||
BuildRequires: sqlite3-devel >= %{sqlite_minimum_version}
|
||||
@ -102,6 +98,23 @@ Requires(post): %fillup_prereq
|
||||
Requires(pre): pwdutils
|
||||
Provides: subversion-javahl = %{version}-%{release}
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
# blacklisted versions of httpd, see build/ac-macros/apache.m4
|
||||
BuildConflicts: apache2-devel = 2.2.25
|
||||
BuildConflicts: apache2-devel = 2.4.5
|
||||
# allow patched 2.4.6 in openSUSE:13.1:Update bnc#864308
|
||||
# BuildConflicts: apache2-devel = 2.4.6
|
||||
%if 0%{?suse_version} >= 1220
|
||||
BuildRequires: pkgconfig(apr-1) >= 1.3.0
|
||||
BuildRequires: pkgconfig(apr-util-1) >= 1.3.0
|
||||
%else
|
||||
BuildRequires: libapr-util1-devel >= 1.3.0
|
||||
BuildRequires: libapr1-devel >= 1.3.0
|
||||
%endif
|
||||
%if 0%{?suse_version} >= 1220
|
||||
BuildRequires: pkgconfig(serf-1) >= 1.3.4
|
||||
%else
|
||||
BuildRequires: libserf-devel >= 1.3.4
|
||||
%endif
|
||||
%if 0%{?suse_version} < 1210
|
||||
Requires(post): %insserv_prereq
|
||||
%endif
|
||||
@ -238,22 +251,18 @@ parameters and keywords for the svn command and other tools.
|
||||
%endif
|
||||
|
||||
%prep
|
||||
%setup -q -n subversion-%{version} -a 4
|
||||
%setup -q -a 4
|
||||
%patch11 -p1
|
||||
%patch20 -p1
|
||||
%patch23 -p1
|
||||
%patch30 -p1
|
||||
%patch37 -p1
|
||||
%patch38 -p1
|
||||
%patch39
|
||||
%patch40 -p1
|
||||
%patch41 -p1
|
||||
%patch42
|
||||
%patch43
|
||||
%patch44 -p1
|
||||
%patch45 -p1
|
||||
%patch46 -p1
|
||||
%patch47
|
||||
%patch48 -p1
|
||||
|
||||
%build
|
||||
# Re-boot strap, needed for patch37
|
||||
@ -363,9 +372,11 @@ cat with_jdk.files >> files.subversion
|
||||
|
||||
# tools
|
||||
make DESTDIR=%{buildroot} install-tools
|
||||
mv %{buildroot}%{_bindir}/svn-tools/{svn-populate-node-origins-index,svn-rep-sharing-stats,svnauthz-validate,svn-bench,fsfs-stats} %{buildroot}%{_bindir}
|
||||
mv -v %{buildroot}%{_bindir}/svn-tools/{fsfs-access-map,svnauthz,svnauthz-validate,svn-populate-node-origins-index,svnraisetreeconflict} %{buildroot}%{_bindir}
|
||||
# discard all other tools
|
||||
rm -rf %{buildroot}%{_bindir}/svn-tools
|
||||
# replicate svn-bench compatibility link
|
||||
ln -sf svnbench %{buildroot}%{_bindir}/svn-bench
|
||||
|
||||
mkdir -p %{buildroot}%{_prefix}/sbin
|
||||
mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates
|
||||
@ -419,16 +430,6 @@ rm -rf tools/*/*.in
|
||||
rm -rf doc/doxygen/html/installdox
|
||||
|
||||
%check
|
||||
#
|
||||
# double check that the essential repository access schemes have been compiled in
|
||||
#
|
||||
schemes=$(LD_LIBRARY_PATH="%{buildroot}%{_libdir}" "%{buildroot}%{_bindir}/svn" --version | grep "'" | cut -d\' -f2 | sort -u)
|
||||
# reset vim syntax: '
|
||||
test "$schemes" = "file
|
||||
http
|
||||
https
|
||||
svn"
|
||||
|
||||
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)
|
||||
@ -517,15 +518,16 @@ systemd-tmpfiles --create %{_tmpfilesdir}/svnserve.conf
|
||||
%endif
|
||||
%attr(755,root,root) %{_bindir}/svn
|
||||
%attr(755,root,root) %{_bindir}/svnadmin
|
||||
%attr(755,root,root) %{_bindir}/svndumpfilter
|
||||
%attr(755,root,root) %{_bindir}/svnlook
|
||||
%attr(755,root,root) %{_bindir}/svnserve
|
||||
%attr(755,root,root) %{_bindir}/svnversion
|
||||
%attr(755,root,root) %{_bindir}/svndiff
|
||||
%attr(755,root,root) %{_bindir}/svndumpfilter
|
||||
%attr(755,root,root) %{_bindir}/svnfsfs
|
||||
%attr(755,root,root) %{_bindir}/svngrep
|
||||
%attr(755,root,root) %{_bindir}/svnsync
|
||||
%attr(755,root,root) %{_bindir}/svnrdump
|
||||
%attr(755,root,root) %{_bindir}/svnlook
|
||||
%attr(755,root,root) %{_bindir}/svnmucc
|
||||
%attr(755,root,root) %{_bindir}/svnrdump
|
||||
%attr(755,root,root) %{_bindir}/svnserve
|
||||
%attr(755,root,root) %{_bindir}/svnsync
|
||||
%attr(755,root,root) %{_bindir}/svnversion
|
||||
%{_libdir}/libsvn_client*.so.*
|
||||
%{_libdir}/libsvn_delta*.so.*
|
||||
%{_libdir}/libsvn_diff*.so.*
|
||||
@ -539,7 +541,7 @@ systemd-tmpfiles --create %{_tmpfilesdir}/svnserve.conf
|
||||
|
||||
%files perl
|
||||
%defattr(-,root,root)
|
||||
%doc %{_mandir}/man?/SVN::*
|
||||
%{_mandir}/man?/SVN::*
|
||||
%{_libdir}/libsvn_swig_perl-1.so.*
|
||||
%{perl_vendorarch}/SVN
|
||||
%{perl_vendorarch}/auto/SVN
|
||||
@ -573,17 +575,20 @@ systemd-tmpfiles --create %{_tmpfilesdir}/svnserve.conf
|
||||
%defattr(-,root,root)
|
||||
%dir %{_includedir}/subversion-1
|
||||
%{_libdir}/libsvn_*.so
|
||||
%{_datadir}/pkgconfig/*.pc
|
||||
%{_includedir}/subversion-1/*
|
||||
%doc doc/doxygen/html
|
||||
|
||||
%files tools
|
||||
%defattr(-,root,root)
|
||||
%{_bindir}/fsfs-access-map
|
||||
%attr(755,root,root) %{_bindir}/svn_apply_autoprops.py
|
||||
%{_bindir}/svn-populate-node-origins-index
|
||||
%{_bindir}/svnauthz
|
||||
%{_bindir}/svnauthz-validate
|
||||
%{_bindir}/svn-rep-sharing-stats
|
||||
%{_bindir}/svnbench
|
||||
%{_bindir}/svn-bench
|
||||
%{_bindir}/fsfs-stats
|
||||
%{_bindir}/svn-populate-node-origins-index
|
||||
%{_bindir}/svnraisetreeconflict
|
||||
|
||||
%files server
|
||||
%defattr(-,root,root)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user