Accepting request 179562 from home:AndreasStieger:svn18

Apache Subversion 1.8.0

OBS-URL: https://build.opensuse.org/request/show/179562
OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm:svn/subversion?expand=0&rev=127
This commit is contained in:
Andreas Stieger 2013-06-18 12:36:30 +00:00 committed by Git OBS Bridge
parent 24cbdb9616
commit 491fc02a9e
23 changed files with 375 additions and 2812 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f316a8e662f1730ee6f8ac3da5ea375b9cc4923e9022066880d38eb75dd267f5
size 294963

3
contrib-1485350.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9919eb327d8acc32473737c6ec6dee85b2d1ffb4a276ea3bd03b9722c12967e8
size 293043

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c90b21864a5df1f46e7a3cd7ee6bcfc3e050db4e3a24f2c6a3996970584c383c
size 1396268

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:22cf70872a5bad5f8aad338b6373af6ad001a08a4dd70f4315d86acaa44cafe1
size 1280774

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c1df222bec83d014d17785e2ceba6bc80962f64b280967de0285836d8d77a8e7
size 5952121

View File

@ -1,74 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.13 (OpenBSD)
iQEcBAABAgAGBQJRnUIdAAoJEE99uqmaWblzOuMH/0FyKuG3mW4y4wt+swv26fYu
gsQYTbcdePAX9B2hzh92L5I1URDC1F9aZ8JPeUHVgFwzWo9N4aTG/b5ElB1R0EPT
hJuw22I08iHJ5R63wCJ/9Fi1tiTy9xdjSNmMQ+NRgm3muxPu88Ogb7+355KMwkB8
xZB4L17r3DsCJ0fx8wLqlDoTSP0zEuA27BUvZ4OcELXAZ1nVJU29QXrFqWjQsVt3
coJEuP4ZTuVB2UAqWQXbMz3YwHhtpfQyry2gMdvSpSULY/iMNrnut1X269tH5vKv
mm+6Ed3ucS2n8MXHMDqTraRvwSzP0QmTtxykX/IniIhLqvu0+q9IfflQG/3KZuk=
=hXr9
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG/MacGPG2 v2.0.19 (Darwin)
Comment: GPGTools - http://gpgtools.org
iQIcBAABCgAGBQJRn9bXAAoJEGLUj60WoN4BrDoQAIUE3WmkSfG6A5rJxJrmlC6d
a5hVGIE+q3usZhm4sDEgEhf7C7eQq7qbRACelep+xPki7ZY85rnqauGlRUBI5A9X
kkTdij1+XDJ0+nj30wmmrIOfmuuUU2dqnKHge5a3LjZmii+9wPoK7fvRxccky6n/
1e39iwOj7C6cmGkadsGHCnFUic+U7KBFqb2KyRGUaW/sPPWO5FvYV23vFjgnOV7r
DOhn1lhq/cfTYeOvtJ5Cxg6/N0rfP9fw4OYVKSPAhtBs4lSw1DB4hDNMjp16QZgC
gxfdjtpiYri5R24TtMbUyXzo4WQtgrSDlPaw/GScdh8+T5V+2VHjQJslp9B27oNr
Db+GuYMRMLg+6FMSoICa6ezY5Caz+O0Plcxx5gqg1rZYaE8R6GkA7EN04CHEQgBJ
bFMb0be214X0pDjyJiyq4ufKHgqYhQw81OLl3JbnGzxpJXqpdXwP4++L+JcjSEfS
9J9qyoGSRU59c1k/FAHP908aBmmVgM1U5o7MXhO6vthxV3U+deglLPW6EkM/tyHe
hZJF/YtTTaELiBtDOlyEK6DfMtZKj9KpV/45/eC2Hh5Xn+rHR770JP9jXkB855RN
MHKchEwTCG5P5x+BMxe6sLh15nzOTePuIEQUTKMthv2m2UT8qcrvL9kuxxmuTWnV
sxFTLc3fsospoBUcHkl3
=l3Fp
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQEcBAABCAAGBQJRoH2eAAoJEHbXiOHtGlmcMM8H/0lkLXfY4ioYQJlswMjjbR3R
sLzvPaXAgr6EUGIpib/FBi5eG9vZ7zLQsnH6y4GBNhVT/GFhfHRdu8d8MN6MEmel
YWfYT+/K4nfes7Uugz7rUN3wtYnXTREbwmOhsz2iPesRzvKsaZPW7GoWZW9PXsr4
uAbEf59+1SBTqRaMXWJoUhmXq3L6C6QSHw/en6CVhxhcrIosB/8pHp5SSyWTKdOb
23vHe9Iz7y4tNISDZa3obU12M93UuYzrhrWALzhuBz1CPQFRj88HddHqAZRPGYBH
HWzBdaNV4QkEs9UtjeCGs3LG3US4ouFrn0Rs4t/Bguhb8iwMq2Pbmyy+UV/Q2bg=
=8BwG
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAABCAAGBQJRn7R5AAoJEPXg8AH+aBMzKoYP/1ra6222Ui7MkdJegN4HIWUT
hZXcnvj5nHcIHoNTNX7EPIR5rVUknApzJyHJvdoy9W/2JtzbFmn47VaT8ULphGnK
1+DAJUcB8vRxk0I9nXUGj+Bx3IYtkQrGrKdB5mu5meIPNNiZTX/5fSJio6q9KklK
JmTOjSNr7uZJdRXO1nUFWiHcg7V6M/Zoc7j0PdfSVTOZ9W15av7M/MQDjipaPrfQ
K8iWMC6V8fQUd7GXK5EsWplC6yr7k20j7ZeapUSAeDMZ94enI1omjjvFKlrROTuo
NLAeG5puTPBN6hdLgpMfNxqWJfi1+5a6OPAb/FZbImHydX77xbAQLg3p7cUYMaXd
kkVm5U7GnFWIOhij0yFwa6p+1B2xF9NfuyIqevbBifgRDRa8S2WF9UXd6OGxDHge
h9BZTJgOTCWgo6WH7LajFWx18wgNqB5ZPWJUmNqdimB0kfYQhmblW1T4rtp6f415
V7CDSm1lYx8RDkmk67EgANL9JxW/G2fj2o13JGXaRZQnkCajYWqs/KMHIfHhh/KK
yjc5leMqKhWHBcR1EoF8jpOLgDNiDS6viCOBVILZw9nclXMZqGpmWlQ+yyQ+RIs7
2Exh5/YAQa/nUXWvYXX+Sqd8Z9jHXZzhzGYUDzMglfK0rYiqiXA0H6e5hAVPKOaB
gSQMb7Q/+NNWl8mz4jXJ
=rbqu
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAABCAAGBQJRo8Y9AAoJEB+wZLhO7MST55AQAMjsaMbrD2Rj1XZf2CBxq3nj
6K0RbuitgY1ZN9ID2rzdBavyY+F+7lcTQqf6bLV5oOdPfVeRYnFM0mm3Lmft2Q3D
uLcgMNH0ldKhvU9rWx/cBfLVtkhhc3Sbw1uLfWiHEHEq8PaPmXSnhj+FmWZxIIQo
OwAvCjzGbVOPohndof7G6TWmbqgfOMioGQa8q5FvNM7MU2zHT5HXEvd80vu9LYO3
IQSAyWJ8oWNxaal0cBUpY5Ps58UxzRxgCoDqbloSEDQrkzxo+Y9DhY9YXsagF93o
07unC49x7bIagZieps0AI5u6HAB+HQb77VxdZ3F3QIeThAsMikyluCNb+XHcOFhx
+B2s9fwdufndJF84CYD/BS0Qt6Unph7GENE0hbNJq+k/XiWJ6g5qGeWKAhVp71fB
SagqmksH05scjwM3GFlmqcUJRUERPs0HqGRFPDqVRXLRiL0LgYg/P2pGJNj8qI7A
dmxe3Uncz25ntjN2U0H0+vHr9AEbA4olLSzO8mnfieeDn/C3S3ZAp9A7npABJTYj
mSLjx5snKgpOaE7vdNSjD9BhyHr/3bLryHCoNZ4m9uGFzkoTUTq52hsf4PPG6xYD
Bxk+540hYlif6w1Y/v/5QyHszRbT9D8Ef+l8xlyOPq9yiAEbJon+LJibwjYu+zlS
TlBAvncAwfpbTLpRpjf9
=J44D
-----END PGP SIGNATURE-----

View File

@ -1,61 +0,0 @@
From: Andreas Stieger <andreas.stieger@gmx.de>
Date: Sat, 12 May 2012 00:20:35 +0100
Subject: [PATCH] fix Ruby 1.9 deprecation warning for Config, use RbConfig
References: http://mail-archives.apache.org/mod_mbox/subversion-dev/201205.mbox/%3C4FAD9EC3.1030207%40gmx.de%3E https://mail-archives.apache.org/mod_mbox/subversion-commits/201205.mbox/%3C20120512111900.C40DB2388860%40eris.apache.org%3E
Upstream: merged
Fixes warning/error in ruby 1.9 "Use RbConfig instead of obsolete and deprecated Config"
$ svn log -r1337514 -v https://svn.apache.org/repos/asf/subversion/trunk/
------------------------------------------------------------------------
r1337514 | astieger | 2012-05-12 12:19:00 +0100 (Sat, 12 May 2012) | 9 lines
Changed paths:
M /subversion/trunk/build/ac-macros/swig.m4
M /subversion/trunk/configure.ac
fix Ruby 1.9 deprecation warning for Config, use RbConfig
* configure.ac
replace Config with RbConfig
* build/ac-macros/swig.m4
replace Config with RbConfig
Approved by: gstein
---
build/ac-macros/swig.m4 | 2 +-
configure.ac | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
Index: subversion-1.7.8/build/ac-macros/swig.m4
===================================================================
--- subversion-1.7.8.orig/build/ac-macros/swig.m4 2011-06-22 15:45:03.000000000 +0100
+++ subversion-1.7.8/build/ac-macros/swig.m4 2012-12-11 13:00:18.000000000 +0000
@@ -187,7 +187,7 @@ AC_DEFUN(SVN_FIND_SWIG,
for var_name in arch archdir CC LDSHARED DLEXT LIBS LIBRUBYARG \
rubyhdrdir sitedir sitelibdir sitearchdir libdir
do
- rbconfig_tmp=`$rbconfig "print Config::CONFIG@<:@'$var_name'@:>@"`
+ rbconfig_tmp=`$rbconfig "print RbConfig::CONFIG@<:@'$var_name'@:>@"`
eval "rbconfig_$var_name=\"$rbconfig_tmp\""
done
Index: subversion-1.7.8/configure.ac
===================================================================
--- subversion-1.7.8.orig/configure.ac 2012-10-02 18:18:00.000000000 +0100
+++ subversion-1.7.8/configure.ac 2012-12-11 13:00:18.000000000 +0000
@@ -1117,12 +1117,12 @@ if test "$RUBY" != "none"; then
AC_PATH_PROGS(RDOC, rdoc rdoc1.8 rdoc18, none)
fi
AC_CACHE_CHECK([for Ruby major version], [svn_cv_ruby_major],[
- svn_cv_ruby_major="`$RUBY -rrbconfig -e 'print Config::CONFIG.fetch(%q(MAJOR))'`"
+ svn_cv_ruby_major="`$RUBY -rrbconfig -e 'print RbConfig::CONFIG.fetch(%q(MAJOR))'`"
])
RUBY_MAJOR="$svn_cv_ruby_major"
AC_CACHE_CHECK([for Ruby minor version], [svn_cv_ruby_minor],[
- svn_cv_ruby_minor="`$RUBY -rrbconfig -e 'print Config::CONFIG.fetch(%q(MINOR))'`"
+ svn_cv_ruby_minor="`$RUBY -rrbconfig -e 'print RbConfig::CONFIG.fetch(%q(MINOR))'`"
])
RUBY_MINOR="$svn_cv_ruby_minor"

View File

@ -1,35 +0,0 @@
Date: Wed, 12 Dec 2012 20:01:11 +0000
From: Andreas Stieger <andreas.stieger@gmx.de>
Subject: [PATCH] Prevent false negative results of "make check" in Python
References: http://svn.apache.org/viewvc/subversion/trunk/build/run_tests.py?r1=1420904&r2=1420944&pathrev=1420944
Upstream: merged
Patch changes the test harness to prevent some false negatives when
running the test suite. Specifically, if a python test initialisation
returns in such a way that the test runner doesn't know how to handle
the result, change to code to return a non-zero exit code like and,
subsequently, have "make check" fail correctly. Reproducible by using
Python < 2.5 or missing sqlite3 Python bindings, exit triggered by
subversion/tests/cmdline/svntest/__init__.py
In the openSUSE obs, affects SLE 11 only, when building with unit tests.
svn diff -c1420944 https://svn.apache.org/repos/asf/subversion/trunk
---
build/run_tests.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: subversion-1.7.8/build/run_tests.py
===================================================================
--- subversion-1.7.8.orig/build/run_tests.py 2012-09-29 05:02:11.000000000 +0100
+++ subversion-1.7.8/build/run_tests.py 2012-12-12 20:48:29.000000000 +0000
@@ -378,7 +378,7 @@ class TestHarness:
('.py', 'U', imp.PY_SOURCE))
except:
print('Don\'t know what to do about ' + progbase)
- raise
+ sys.exit(1)
import svntest.main

View File

@ -1,48 +0,0 @@
From: Andreas Stieger <andreas.stieger@gmx.de>
Date: 2013-05-21 17:43:00 +0100
Subject: [PATCH] do not clear LD_LIBRARY_PATH in davautocheck.sh
Upstream: merged
References: http://svn.apache.org/viewvc?view=revision&revision=1197065
During "make check", auth-test loads DSOs at runtime and cannot find them
unless LD_LIBRARY_PATH inlucdes subversion/libsvn_auth_kwallet/.libs and
/subversion/libsvn_auth_gnome_keyring/.libs.
Adjust davautocheck.sh so that LD_LIBRARY_PATH is prepended to rather
than overwritten so that the spec file can set the required paths for
the auth-tests to pass.
Actually then found to have been fixed in the trunk in r1197065. Required
for unit tests with 1.7.x but not 1.8.x
---
subversion/tests/cmdline/dav-mirror-autocheck.sh | 2 +-
subversion/tests/cmdline/davautocheck.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Index: subversion-1.7.9/subversion/tests/cmdline/dav-mirror-autocheck.sh
===================================================================
--- subversion-1.7.9.orig/subversion/tests/cmdline/dav-mirror-autocheck.sh 2011-04-21 12:42:32.000000000 +0100
+++ subversion-1.7.9/subversion/tests/cmdline/dav-mirror-autocheck.sh 2013-05-21 20:32:40.000000000 +0100
@@ -323,7 +323,7 @@ fi
[ -r "$MOD_AUTHZ_SVN" ] \
|| fail "authz_svn_module not found, please use '--enable-shared --enable-dso --with-apxs' with your 'configure' script"
-export LD_LIBRARY_PATH="$ABS_BUILDDIR/subversion/libsvn_ra_neon/.libs:$ABS_BUILDDIR/subversion/libsvn_ra_local/.libs:$ABS_BUILDDIR/subversion/libsvn_ra_svn/.libs"
+export LD_LIBRARY_PATH="$ABS_BUILDDIR/subversion/libsvn_ra_neon/.libs:$ABS_BUILDDIR/subversion/libsvn_ra_local/.libs:$ABS_BUILDDIR/subversion/libsvn_ra_svn/.libs:$LD_LIBRARY_PATH"
MASTER_REPOS="${MASTER_REPOS:-"$HTTPD_ROOT/master_repos"}"
SLAVE_REPOS="${SLAVE_REPOS:-"$HTTPD_ROOT/slave_repos"}"
Index: subversion-1.7.9/subversion/tests/cmdline/davautocheck.sh
===================================================================
--- subversion-1.7.9.orig/subversion/tests/cmdline/davautocheck.sh 2012-05-13 05:03:03.000000000 +0100
+++ subversion-1.7.9/subversion/tests/cmdline/davautocheck.sh 2013-05-21 20:32:40.000000000 +0100
@@ -198,7 +198,7 @@ fi
[ -r "$MOD_AUTHZ_SVN" ] \
|| fail "authz_svn_module not found, please use '--enable-shared --enable-dso --with-apxs' with your 'configure' script"
-export LD_LIBRARY_PATH="$ABS_BUILDDIR/subversion/libsvn_ra_neon/.libs:$ABS_BUILDDIR/subversion/libsvn_ra_local/.libs:$ABS_BUILDDIR/subversion/libsvn_ra_svn/.libs"
+export LD_LIBRARY_PATH="$ABS_BUILDDIR/subversion/libsvn_ra_neon/.libs:$ABS_BUILDDIR/subversion/libsvn_ra_local/.libs:$ABS_BUILDDIR/subversion/libsvn_ra_svn/.libs:$LD_LIBRARY_PATH"
case "`uname`" in
Darwin*) LDD='otool -L'

3
subversion-1.8.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a470803293a8aced445cff0f7b24b95ad276600af55d4b24b1e196fd2de87f10
size 6711904

View File

@ -0,0 +1,76 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG/MacGPG2 v2.0.18 (Darwin)
Comment: GPGTools - http://gpgtools.org
iQIcBAABCgAGBQJRuZJdAAoJEGLUj60WoN4B24IP/3uFSZrIA5a4nbrb2gzQIBZL
sS6yKC2uA7lpAJx6eG8GVN9P5PMZtWfdYRBcq9Pm+hPaHaG9jhj04hck5aR5wwyg
YEm4bsMfkeG/IPpBCOg2kuU9KipqCOeRIJFhbOMz3ctWnJc/WTPSAI7YsrRE7NuG
mQexpTWt04BdHviDDg7hZDAN0eYXKud42hk+UxQYjiejCt1/84EtfQIsHs5GXFay
5g+X9gc4iIDmPle5Y52aZ3gOejgu/sJN80zU3j+C8CqG5aniuLPkmSKgbPd7l1M4
idGO0tROH6dUYRIIG8q0uoCaBK02+Kw2gpZSsYvf6EvEBAeHQCYFwq0iVBlrUGBZ
2iUEJfXJ4VWQm5w4SzVPyEeaNWtDh66J6ZM89JEVe6pnT5GDLgDu1Fu5r1QHJ5pq
wuFzxdHXGl4KRUJOZT4oHzycjVEePIZRAQKQ2joJ36Q/zs9ZyiTw0nL9ATyNeQd8
Sv8SudI7rgrHMy1GIcYbzIVdG+58Ad+WqAndgmG1KJrKZA7SG5U7UTayJXYIKhfe
7hnNrn3OcyG9saftD2VZ2vyefBDbeFRcFwqP2ZCfTNqNxx1LC3UFqEQ78KHm8CDY
fVLv8xfPBXm8S+eVRCILXP1fFf1MzEvDwlPELYboJrCqnvPUUYa8pjsuGb2ZBGtC
82GNrq1om9tA/L86t1C3
=BPj9
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.13 (OpenBSD)
iQEcBAABAgAGBQJRuz/qAAoJEE99uqmaWblzVhcIAKGghKe6ZRRefpfRBQ2Kbdso
T0mDFeKAnfPfdf3EDSvaqOLCNoY8wOlmx7nbsYGJPnsNoz66XerPlgzhZoC6tHUT
Yn48q7DAkcB2FYg9oJlgvQxRELpsZIcW53rC/EEPkZWTScY2fTLf8DM6NgQGFiE0
+9dOheRycsoSESjzzsVVyBcprydWfXT3IOuOao9jSO85m32t0XgbxZtzNOewEzgX
wEbn91yYTbx+sxTpv8JX9GbH9lE6pqsH/Ldenl5UzZEirCppPKQidm1RFO83+E3r
7gFKOkgO554AqxUgYR6n7i4Q1A00O/kSdt62jhs3gyTfUD2TtIHB1Q7rmZ/3xNk=
=WHUI
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG/MacGPG2 v2.0.19 (Darwin)
Comment: GPGTools - http://gpgtools.org
iQIcBAABCgAGBQJRvHF5AAoJEBvKZYajR5Q/hqkQAJZY94/Js2joZeGfV7JinmO4
qRZpnq9h7hPiI1KsRKUelHi2Nx4pSsrCfBJO5j1ma0KQSvcHTT+vulQh21Gajl3e
T1TF7tX77Dsdp7rdPRFrnd3g74koLOPVk8PXM3TSKj5l5TCBHpCflYY9TovfiTYa
efbpXmzVLVeRPfBGeCsXSXKOlhgcmsWjufLGjz1u5sbPrpxQ9ijZegRsZV0P7j5y
vTE4cPQng0hO9kong/o41QDctwEAeunkqF2T7mMv7nkf+J20N2r5UB/d7lUblt0v
2vobIvpR5ZO8bUGqh5do03+bL2AUMvcYMTkmQrylDPTMU/Ou2YXA0ppdjIV4zdfH
wmDc88It7M8bl9MNYOsR7IoNDC8fgGMJIVa+RYeoqyUZS+QS0l5OXcZ3/TIGlT02
1gSY9HmAfYLCTfC6lOJqcSxB4VCDlHZGRegS81nYoXJe9bVXBH6XYyRP4aZew9v3
hngDA8EpiwpNQDSe7E7qwmvTDdmh1r0ikcV7OKwldMJBJDGMtDM6LsJL+rQCNmjO
MS7/y2EKEGf3I2gV5QV4GPER/Pbq1jgjunyimA3mqWL4gc2bjX+l9ez1oVxEVJJ5
IAIYQWhpZfbGVUAvh6grBhczKsVe9n67Mkz01eez+IALpO4u5qYVMM1rHMrpARRf
lyD6mZmF81qy7laFKEqY
=Qo1h
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG/MacGPG2 v2.0.19 (Darwin)
Comment: GPGTools - http://gpgtools.org
iQEcBAABCgAGBQJRvHDyAAoJECm4ktDIYoUBBZ0H/3jmU3Z9BUQTMUcp9Vqln2CW
wL1uylJOurZNsrSUwxCxeUwAiVvokI59mlDrsYTdNIaSstIRO6/ogGznUzWqE+Hb
icuc4x1sxIMX38sntUxP3W8kwk2wLAlW25emaPmSdylMwMHGRD/plC+NELXVPlVf
ba8gvJ1vtyeqV2UNY2X4OvlKLZrMhEoP9FDNWagN228t5LB1NVEjOyw825jABRhK
+lIevtTTdZg8WGplE1o77NxY36Nv2UFmMOc1JVp3WajmRF5+aedzfvV3mh+xhlQR
tR9E4w5QCHXNm7R0lDFMjDqblS17mLDCg7tVqHl+1SCT2UzuoHp5mllfGiOJ2Ak=
=/ONU
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAABCAAGBQJRvSxHAAoJEPXg8AH+aBMzy7QQAJIhTGb4Mc4ktah//UPLUcXG
cZ/fdIpPxC8OgjNkThjFVljFupvp8bCLSf2/+/EUhbzqmR1i2Xh25qEjvzTWMJHc
idqmL5OSzOWYSq4BDU8I+NuNc4Q6eUWMl8HOiLxcENFeejOOaNecVtoABXzrIryh
VBzByVVBuC7oQztbAmWlsilk5ySaDCKQV9gBihe/adhCS32oojTIeACKnpJE2tXB
1D0ywAl/eLNWALzb42EimIgesc7Qz1XVaby7kUrUfM418prRycqZqGUcVB6VHVog
4Tb9/TocD+y/SrBho/ORSJo7mR/smSXPpYNGgaMXSvXrjU/fUwvqEn835nQ/9dFN
5Eg/twP7Uy6atoj+qLujqcSWhgg0Xvz1mVwLaXGC8L46acKvUSeo7MdlDHGGV4c3
/Qo8RJ0vHNyZcu6fjkj+QsU0MAvBvhWmwIrCBDVblZn5N7VHx68HHQi//xCoScTq
D+5DA7E+3Qa/HrEUM8n1yEaVnkAJMS30AJ0u2mVfXq+2TeAeyvx2BreLH0cpKe86
ppWyTz26pId9xEADDaa8MW8AhPxSSwMC3c2WNIRScMzHvioeu/K0YTzc0v3s73np
rmnsK3aaFfgCw735TB+hfAfkLdzOnAVRiC+Wp6HBjAqhIUjtTrFnHBLLN4otNOwJ
27erlHjo1xGYxhnL9QUd
=ld0e
-----END PGP SIGNATURE-----

View File

@ -1,38 +0,0 @@
Index: subversion/libsvn_ra_neon/session.c
===================================================================
--- subversion/libsvn_ra_neon/session.c.orig 2011-12-21 17:36:12.000000000 +0000
+++ subversion/libsvn_ra_neon/session.c 2011-12-21 17:36:17.000000000 +0000
@@ -910,6 +910,17 @@ svn_ra_neon__open(svn_ra_session_t *sess
}
#endif
}
+#ifdef SVN_NEON_0_29
+ else
+ {
+ /* If we do not have any proxy specified for this host and
+ we're running a new enough neon implementation, we use
+ neon's session proxy autodetection (via libproxy). */
+ ne_session_system_proxy(sess, 0);
+ ne_session_system_proxy(sess2, 0);
+ }
+#endif
+
if (!timeout)
timeout = DEFAULT_HTTP_TIMEOUT;
Index: build/ac-macros/neon.m4
===================================================================
--- build/ac-macros/neon.m4.orig 2011-12-21 17:36:12.000000000 +0000
+++ build/ac-macros/neon.m4 2011-12-21 17:38:02.000000000 +0000
@@ -100,6 +100,11 @@ AC_DEFUN(SVN_NEON_CONFIG,
[Define to 1 if you have Neon 0.28 or later.])
fi
+ if test -n ["`echo "$NEON_VERSION" | $EGREP '^0\.(29|3[0-9])\.'`"] ; then
+ AC_DEFINE_UNQUOTED([SVN_NEON_0_29], [1],
+ [Define to 1 if you have Neon 0.29 or later.])
+ fi
+
for svn_allowed_neon in $NEON_ALLOWED_LIST; do
if test -n "`echo "$NEON_VERSION" | grep "^$svn_allowed_neon"`" ||
test "$svn_allowed_neon" = "any"; then

View File

@ -1,27 +1,86 @@
From: Andreas Stieger <andreas.stieger@gmx.de>
Date: 2013-04-07 21:09:15 +0100
Subject: remove build date and time from binary
Date: Wed, 06 Mar 2013 00:05:08 +0000
Subject: Remove volatile build information
Upstream: never
Prevent unneccessary rebuilds by removing date and time macros.
Prevent unneccessary rebuilds of binary packages differing only by date, time and build host.
---
subversion/libsvn_subr/opt.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java | 4 ++--
subversion/libsvn_subr/opt.c | 8 ++------
subversion/libsvn_subr/version.c | 4 ++--
subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout | 1 -
subversion/tests/cmdline/getopt_tests_data/svn--version_stdout | 1 -
5 files changed, 6 insertions(+), 12 deletions(-)
Index: subversion-1.7.9/subversion/libsvn_subr/opt.c
Index: subversion-nightly/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
===================================================================
--- subversion-1.7.9.orig/subversion/libsvn_subr/opt.c 2013-01-04 03:05:28.000000000 +0000
+++ subversion-1.7.9/subversion/libsvn_subr/opt.c 2013-04-07 21:09:14.000000000 +0100
@@ -1084,9 +1084,8 @@ svn_opt__print_version_info(const char *
--- subversion-nightly.orig/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java 2013-04-01 20:57:02.000000000 +0100
+++ subversion-nightly/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java 2013-04-11 23:50:53.000000000 +0100
@@ -140,10 +140,10 @@ public class BasicTests extends SVNTests
{
VersionExtended vx = client.getVersionExtended(false);
String result = vx.getBuildDate();
- if (result == null || result.trim().length() == 0)
+ if (result == null)
throw new Exception("Build date empty");
result = vx.getBuildTime();
- if (result == null || result.trim().length() == 0)
+ if (result == null)
throw new Exception("Build time empty");
result = vx.getBuildHost();
if (result == null || result.trim().length() == 0)
Index: subversion-nightly/subversion/libsvn_subr/opt.c
===================================================================
--- subversion-nightly.orig/subversion/libsvn_subr/opt.c 2013-03-23 14:35:40.000000000 +0000
+++ subversion-nightly/subversion/libsvn_subr/opt.c 2013-04-11 23:51:47.000000000 +0100
@@ -1114,12 +1114,8 @@ svn_opt__print_version_info(const char *
if (quiet)
return svn_cmdline_printf(pool, "%s\n", SVN_VER_NUMBER);
- SVN_ERR(svn_cmdline_printf(pool, _("%s, version %s\n"
- " compiled %s, %s\n\n"), pgm_name,
- SVN_VERSION, __DATE__, __TIME__));
+ SVN_ERR(svn_cmdline_printf(pool, _("%s, version %s\n\n"), pgm_name,
+ SVN_VERSION));
SVN_ERR(svn_cmdline_fputs(
_("Copyright (C) 2013 The Apache Software Foundation.\n"
"This software consists of contributions made by many "
- " compiled %s, %s on %s\n\n"),
- pgm_name, SVN_VERSION,
- svn_version_ext_build_date(info),
- svn_version_ext_build_time(info),
- svn_version_ext_build_host(info)));
+ SVN_ERR(svn_cmdline_printf(pool, _("%s, version %s\n\n"),
+ pgm_name, SVN_VERSION));
SVN_ERR(svn_cmdline_printf(pool, "%s\n", svn_version_ext_copyright(info)));
if (footer)
Index: subversion-nightly/subversion/libsvn_subr/version.c
===================================================================
--- subversion-nightly.orig/subversion/libsvn_subr/version.c 2013-03-22 15:59:11.000000000 +0000
+++ subversion-nightly/subversion/libsvn_subr/version.c 2013-04-11 23:50:53.000000000 +0100
@@ -125,8 +125,8 @@ svn_version_extended(svn_boolean_t verbo
{
svn_version_extended_t *info = apr_pcalloc(pool, sizeof(*info));
- info->build_date = __DATE__;
- info->build_time = __TIME__;
+ info->build_date = "";
+ info->build_time = "";
info->build_host = SVN_BUILD_HOST;
info->copyright = apr_pstrdup
(pool, _("Copyright (C) 2013 The Apache Software Foundation.\n"
Index: subversion-nightly/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout
===================================================================
--- subversion-nightly.orig/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout 2012-09-10 22:58:53.000000000 +0100
+++ subversion-nightly/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout 2013-04-11 23:51:25.000000000 +0100
@@ -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
Copyright (C) 2012 The Apache Software Foundation.
This software consists of contributions made by many people;
Index: subversion-nightly/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout
===================================================================
--- subversion-nightly.orig/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout 2012-09-10 13:03:34.000000000 +0100
+++ subversion-nightly/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout 2013-04-11 23:51:33.000000000 +0100
@@ -1,5 +1,4 @@
svn, version 0.16.0 (r3987)
- compiled Dec 5 2002, 00:02:51
Copyright (C) 2010 The Apache Software Foundation.
This software consists of contributions made by many people;

View File

@ -1,11 +1,11 @@
Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: Makefile.in
Index: subversion-1.8.0-rc2/Makefile.in
===================================================================
--- Makefile.in.orig 2011-12-21 17:32:20.000000000 +0000
+++ Makefile.in 2011-12-21 17:32:27.000000000 +0000
@@ -756,7 +756,7 @@ check-swig-pl: swig-pl swig-pl-lib
--- subversion-1.8.0-rc2.orig/Makefile.in 2013-05-14 20:24:53.000000000 +0100
+++ subversion-1.8.0-rc2/Makefile.in 2013-05-14 20:24:54.000000000 +0100
@@ -780,7 +780,7 @@ check-swig-pl: swig-pl swig-pl-lib
cd $(SWIG_PL_DIR)/native; $(MAKE) test
install-swig-pl: swig-pl install-swig-pl-lib

View File

@ -6,6 +6,7 @@ An online version can be found at http://svnbook.red-bean.com/
Topics:
0. upgrading to Apache Subversion 1.8
1. mini-howto
2. allowing anonymous read access
3. serving several repositories with SVNParentPath
@ -15,6 +16,32 @@ Topics:
================================================================================
0. upgrading to Apache Subversion 1.8
- 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
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
* 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.
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.
================================================================================
1. mini-howto
To run a subversion server, you need to configure apache2 to load two modules:
@ -28,6 +55,12 @@ A default/example configuration of the dav_svn module can be found in
/etc/apache2/conf.d/subversion.conf. The current default configuration
automatically includes this file the default server configuration.
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.
Create some directories to contain the repositories and other files:
mkdir -p /srv/svn/repos
@ -42,7 +75,7 @@ this, discard this section.
If instead you wish to show a list of repositories, set "SVNListParentPath on"
later. See for details:
http://svnbook.red-bean.com/en/1.7/svn.serverconfig.httpd.html#svn.serverconfig.httpd.extra.browsing.reposlisting
http://svnbook.red-bean.com/en/1.8/svn.serverconfig.httpd.html#svn.serverconfig.httpd.extra.browsing.reposlisting
The section following that will configure a repository to be served out of
the path /srv/svn/repos/myproject1. Note that the location "/repo/myproject1"
@ -152,7 +185,7 @@ To start, ensure proper ownership of repositories and run:
service svnserve start
For further information about multi-method repository access, see
http://svnbook.red-bean.com/en/1.7/svn.serverconfig.multimethod.html
http://svnbook.red-bean.com/en/1.8/svn.serverconfig.multimethod.html
You can test repository access by:
@ -165,7 +198,7 @@ configued access via
/srv/svn/repos/repo1/conf/svnserve.conf
To configue authentication for svnserve, see
http://svnbook.red-bean.com/en/1.7/svn.serverconfig.svnserve.html#svn.serverconfig.svnserve.auth
http://svnbook.red-bean.com/en/1.8/svn.serverconfig.svnserve.html#svn.serverconfig.svnserve.auth
================================================================================

View File

@ -1,3 +1,71 @@
-------------------------------------------------------------------
Tue Jun 18 00:00:00 UTC 2013 - andreas.stieger@gmx.de
- Apache Subversion 1.8.0
- Major new features
* working copy records moves as first-class operation
* merge uses reintegrate mode automatically when needed
* FSFS: Packing of revision property shards
* support inheritable properties
* repository can suggest config for autoprops and ignores
* support gpg-agent for password caching
* authz rules can be stored inside the repository
- 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
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
* 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.
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.
- many minor features and improvements listed in:
https://subversion.apache.org/docs/release-notes/1.8.html
http://svn.apache.org/repos/asf/subversion/tags/1.8.0/CHANGES
- Deprecations:
* require serf as client-side http library (neon support removed)
* deprecate the Berkeley DB FS backend (libsvn_fs_base)
- packaging changes:
* ra_serf is now the only http library
* remove neon dependency, ra_neon removed upstream
* update in-tree sqlite to recommended version 3.7.15.1
* build with sqlite amalgamation for openSUSE 12.2 and earlier
* dropped patches, accepted upstream:
subversion-1.7.4-ruby-1.9-RbConfig.patch
subversion-1.7.8-TestHarness_run_py_test_exit_code.patch
* dropped patches, no longer required:
subversion-1.7.9-davautocheck-LD_LIBRARY_PATH.patch
Also setting LD_LIBRARY_PATH no longer required for tests.
* dropped patches, feature removed upstream:
subversion-neon-systemproxy.patch
* updated patches for upstream changes:
subversion-no-build-date.patch
subversion-swig-perl-install_vendor.patch
subversion.libtool-verbose.patch
subversion.perl.LD_RUN_PATH.patch
subversion.libtool-pie-flags.patch
* update tools installation, svnmucc is now a first order tool
* updated build requirements:
+ python >= 2.5
+ serf >= 1.2.1
+ ruby 1.8.x, >= 1.8.2 or 1.9.3
* build ruby bindings again for openSUSE 12.3 and Factory
* fix detection of ruby sitelib directory
* remove obsolete tool svnmerge.py
* update contrib package to r1485350
-------------------------------------------------------------------
Sat Jun 15 23:20:09 UTC 2013 - andreas.stieger@gmx.de

View File

@ -6,7 +6,7 @@ uid Greg Stein <gstein@apache.org>
uid Greg Stein <gstein@collab.net>
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2.0.18 (FreeBSD)
Version: GnuPG v2.0.19 (FreeBSD)
mQGiBD1bRO4RBACFxCQEk8j9a9SSzVIFUg6EKAXabSii1f2vyhdsj7yLd4E2nybA
6907ohpFkIHdOGWAasKKDRG3rpL1X37c5dxUYgGFGyfbe7FapUPP0azq/Wsfn8Ax
@ -877,7 +877,7 @@ uid Branko \xc4\x8cibej <brane@wandisco.com>
sub 2048R/38EB9A57 2005-04-03
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2.0.18 (FreeBSD)
Version: GnuPG v2.0.19 (FreeBSD)
mQELBEJPxd4BCACiGbCB4SoehQ58kVa/3TQaFVd8XE1+KX2vIm3Z5Od3xmmibbVy
YVxg2C/NIsEAEpFBGANUPrkloCN2aE3hQbNbd6rB2BCvBkk+KeVp+OOE2BpdUBBn
@ -1299,7 +1299,7 @@ uid Brian William Fitzpatrick <fitz@red-bean.com>
sub 1024g/C4D0817F 1999-09-08
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2.0.18 (FreeBSD)
Version: GnuPG v2.0.19 (FreeBSD)
mQGiBDfWZZQRBACpBaGLjfUj1AnxnfPtv2yLj/5IAvhiZZLRpSBtBxezDxmUJUOF
twoA3fABTkJwA+mA/j2Evl0GcBeBJGZLnyodFl9LomwjPdsBryZIBltKjAG1Sj/0
@ -1531,7 +1531,7 @@ uid [jpeg image of size 8330]
sub 4096R/830522D6 2012-10-08
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2.0.18 (FreeBSD)
Version: GnuPG v2.0.19 (FreeBSD)
mQINBFBy+/sBEADGYozqCg0EypAf+WLWkjdStBRWf98JjKR58b1iNhZHntq1rEDI
eQpyvBZjzfrZLHVIiSr5qVjwAu1XhPheDy8F+PZNVOpzlcSC9nE1ZyK0q/cbZXiq
@ -1805,7 +1805,7 @@ uid C. Michael Pilato <cmpilato@collab.net>
sub 1024g/D88CE17E 2004-06-14
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2.0.18 (FreeBSD)
Version: GnuPG v2.0.19 (FreeBSD)
mQGiBEDN0pYRBAClirW6MNfy6lTyV4AvCNoDGr29GVx5Cb1DzxwmZKxWMnoVRj08
oPUvm/pR3DO6oq+ugHKN1rSwXeuGVugZWJXsVefZc29J0vgfgzdlye+fs4vYJ2xb
@ -2005,7 +2005,7 @@ uid Justin R. Erenkrantz <jerenkrantz@ebuilt.com>
sub 2048g/8B626683 1999-09-19
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2.0.18 (FreeBSD)
Version: GnuPG v2.0.19 (FreeBSD)
mQGiBDflD4IRBADqhgm28jVQWqu8ogG/NvYOSySYc4MhrXFqOQrRxJOcAxdc03fR
Mu7RtAa4hXpNfjOLIfxY0cc6aqKJLlOuZAUxNNFWIcuO3xSWsPrwflaBsATt+0jw
@ -3465,7 +3465,7 @@ uid Max Bowsher <maxb1@ukf.net>
sub 4096R/AB4F09C1 2011-05-14
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2.0.18 (FreeBSD)
Version: GnuPG v2.0.19 (FreeBSD)
mQINBE3OiZEBEACvSeK+1fknmv21QBaMH3+sImiH9Iao+dNcFM1EM0Q/bBE96IT0
HhMylBVnAK1aHBRusTFurjOT7/yW2+g9SUxRBjcmuIi0WyRcvW90gkbhPauX/CHj
@ -3717,7 +3717,7 @@ uid Max Bowsher <maxb@mxtelecom.com>
sub 2048g/AF3B563D 2005-02-05
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2.0.18 (FreeBSD)
Version: GnuPG v2.0.19 (FreeBSD)
mQGiBEIEyD4RBACb+Fl9PmkfIbribsJhuvvQVzfGN3bhOns+UtSszc/0ZA8BkJo4
OxOQnXM9mZiQ/7EXdwNAmjSV2hpuzVJrQ5BcGF2KRQFZlwbJ/ebG13HunWcttNvM
@ -4180,7 +4180,7 @@ pub 1024D/4DF18BE2 2006-07-20
uid Jeremy Whitlock (This is the PGP key for Jeremy Whitlock <jwhitlock@apache.org>.) <jwhitlock@apache.org>
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2.0.18 (FreeBSD)
Version: GnuPG v2.0.19 (FreeBSD)
mQGiBES/1sYRBACWqlYCla67kGt1EYs4Wc4aa8NxQRSkUmjGG/vneSMd4epH6ydK
gV3FmMrH9b2shB+S5uKo+qG8KgJ7r+vUC9nJn6iLdKsCsIEH1Ln+DT8wDBxaX+R2
@ -4205,7 +4205,7 @@ uid Julian Foad <julianfoad@btopenworld.com>
sub 2048g/AC1665DA 2008-04-21
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2.0.18 (FreeBSD)
Version: GnuPG v2.0.19 (FreeBSD)
mQGiBEgMqa0RBACs3NeioAILFVipAOL41UIPFISwjyqGPyRwYp4L9OwFdr/kGv94
1/Pftllwu9IH41iPq4AOPP9gEoqkw0y+ZipJEjh90LOgncosXqOz7JDIfu+6eqqW
@ -4278,7 +4278,7 @@ uid Julian Foad <julian.foad@wandisco.com>
sub 4096R/9D5140CB 2012-10-11
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2.0.18 (FreeBSD)
Version: GnuPG v2.0.19 (FreeBSD)
mQINBFB2JwIBEADP0O07jET+WpolukaVoArxvGL8eNScUs+KPXEhrNeL+2obEatE
HURIFnyvcFZgFVAufzdFQPbz+H3AEpUAorfowQjyfLpPc84fq/X+DyxhI+O/9sjS
@ -4377,7 +4377,7 @@ uid Ivan Zhakov <ivan@visualsvn.com>
sub 4096R/C1F0F3B9 2013-04-01
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2.0.18 (FreeBSD)
Version: GnuPG v2.0.19 (FreeBSD)
mQINBFFZa3wBEADXN2umZqUrLWqOaymsN8rfvTx39V0cj4G9dfdPmx3xeIvJEoKE
2NnpN3BgYY+PDlY8XMuu9idUyreDIGb/SZL6ihQRFIkM1LNhYYvKma3UsqJ/+K/C
@ -4434,7 +4434,7 @@ uid Paul T. Burba <ptburba@gmail.com>
sub 4096R/552AF6EF 2012-12-11
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2.0.18 (FreeBSD)
Version: GnuPG v2.0.19 (FreeBSD)
mQINBFDHkigBEACbZzrCCTNLW34+9ZVfs5r2qGzIG+pULWsk647ItoXKGEZ4m40T
TxAZXvtBauYR6oeclXY6RQyYoi1i3OGP3VNh1lsaY3oLxxcWTBHxE+f+qnp1A16N
@ -4509,7 +4509,7 @@ uid [jpeg image of size 4854]
sub 4096g/8D8BA92B 2005-05-13
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2.0.18 (FreeBSD)
Version: GnuPG v2.0.19 (FreeBSD)
mQGiBEKE95oRBACPaJTtIZYzmpILZamUuBkNGOp1sZkcNaWIf1wokFXw54rcxWXf
/rUYx1/vGYWT2XGrnuI3/JlQD0RA7G+xwBaJ0fGfQiKQjmVVV72Qf7g1PB3Cp+6w
@ -6157,7 +6157,7 @@ uid Mark Phippard (markphip) <markphip@gmail.com>
sub 2048g/63C81123 2007-12-09
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2.0.18 (FreeBSD)
Version: GnuPG v2.0.19 (FreeBSD)
mQGiBEdcAyURBAD7UF11q0Uxa3pxEgngfZkaTjxmw/f1RvpSP+inlDvnFq/pNhEp
HIuVNYw3PdNfJQ+N/Cydlt5dbLwlcYjYyj60ZQlPMIV/hRH9nZCg744SrHE7BkWv
@ -6193,7 +6193,7 @@ uid Blair Zajac <blair@orcaware.com>
sub 2048g/D2A97751 2005-03-28
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2.0.18 (FreeBSD)
Version: GnuPG v2.0.19 (FreeBSD)
mQGiBEJHiucRBACInJS8Mb744CJIg9F9d/KbL5OgBCjjRme4zkvf6JV1C/Hm8JkE
caGHXlHYWk1aTkwVZHd3NNo3KZeUg8P0sgIh3vsVAU2MFVGrZIofAHKgvCUGkElD
@ -6264,7 +6264,7 @@ uid Stefan Sperling <stsp@openbsd.org>
sub 2048R/1F5A49FB 2012-10-23
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2.0.18 (FreeBSD)
Version: GnuPG v2.0.19 (FreeBSD)
mQENBFCGhv8BCADVQ5AV0768s5v2RUqTHh4eyBRRwm6KAXKOSknUh4sdhrQB6uTP
hOJrIEFF6ozqHeRVLpfPF8HrSzEXwQeCdu7Y0cu0D93CNRPfbwArObBy7iuvZzXE
@ -6391,7 +6391,7 @@ uid Stefan Sperling (Elego Software Solutions GmbH) <stsp@elego
sub 1024g/6F24CDE6 2005-02-05
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2.0.18 (FreeBSD)
Version: GnuPG v2.0.19 (FreeBSD)
mQGiBEIEwDQRBADcyeJpNj5Mt+Fbsi0NK6ofFpPtSJ+BngYKLyDghvs4XVRD99id
yv4MB5PCBEVfuhGFoVsTADNY8m30DuXO8vdDzk9T6aNmIKNwjKUx2qX/KgQLzJC4
@ -8156,7 +8156,7 @@ uid Daniel Shahaf <danielsh@apache.org>
sub 3072g/C307B960 2009-08-05 [expires: 2014-08-14]
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2.0.18 (FreeBSD)
Version: GnuPG v2.0.19 (FreeBSD)
mQGiBEp5/fkRBACQ4CU2w72NeH8feIRjqwE2XxKEdf6HZ2ae9TKOsz/ZTErAoSYG
Ywj9juTqmTc7BO7jOakdW2HBFZ+t/+95U+iZoJUU/+vL/TeKY72z0EuAIzTmflWx
@ -8386,7 +8386,7 @@ uid Senthil Kumaran S <stylesen@gmail.com>
sub 2048g/F902D62D 2008-07-02
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2.0.18 (FreeBSD)
Version: GnuPG v2.0.19 (FreeBSD)
mQGiBEhra/QRBACJCtNyVyi8+iH45zmHlw7vnU8ipoYQRCIpjKu8dDDnn2J2AgiQ
bdRY3s6jGmlwdkxD51L5qejiOWnRMJbc6n90D0z1U7e0v9Bb0F0AaPjxS9aZXxp+
@ -8449,7 +8449,7 @@ uid Jostein Chr. Andersen (General Key) <jostein@vait.se>
sub 2048g/EFC2899F 2007-09-18
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2.0.18 (FreeBSD)
Version: GnuPG v2.0.19 (FreeBSD)
mQGiBEbvm9gRBADwqrGXyYZFR6TJ+llGdqVMvbGVdJx7TCEziBqgXwHDG0FbW9Id
OvalvUY31JvsKT632Wz6++B1ceYUcXMzuOWxZlHneQAGXnu7C9ZPvi6PFFmCsUy8
@ -8498,7 +8498,7 @@ uid [jpeg image of size 12985]
sub 2048g/A0A215FC 2004-05-25
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2.0.18 (FreeBSD)
Version: GnuPG v2.0.19 (FreeBSD)
mQGiBDPG2+4RBADXCEi2slv6ZyLCURMPgE47ddIXqZJrqNKOzQks/ob6iyECFvWD
GHsElNdAvEF5LoMHbigavSRsY9y9y3H3lyOcVMYmg7oS44AkELYhIeoqrjWYXTbD
@ -11040,7 +11040,7 @@ uid [jpeg image of size 10861]
sub 2048R/7547A8A9 2008-02-02
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2.0.18 (FreeBSD)
Version: GnuPG v2.0.19 (FreeBSD)
mQENBEekKYIBCADoq2adWRvlki6f3GyUgKWIqSRifhSqMcdqMrooP7qWn2PfiTFQ
KjeFoUKua+W1IeQAC0i9ATTmDhCMC5Oy5fq/grWlPPj9J2wRVDvUn3Tml75CC1wq
@ -12046,7 +12046,7 @@ uid Bert Huijben <rhuijben@apache.org>
sub 4096g/105F872D 2008-10-10 [expires: 2016-10-08]
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2.0.18 (FreeBSD)
Version: GnuPG v2.0.19 (FreeBSD)
mQGiBEjvQ+kRBACuegU5uzlZnaN2ee8597GfxfpQhwfvhSXZ3qxdQFzRL0Jc9b/K
AY/X8eT8jasucwnbLY+W3pLshMWwGR2sco7pIzws1s/9vmntu7zTnV2ICTyK+jGq
@ -12211,7 +12211,7 @@ uid Bert Huijben <rhuijben@collab.net>
sub 4096R/5065EB6D 2012-09-18 [expires: 2020-09-16]
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2.0.18 (FreeBSD)
Version: GnuPG v2.0.19 (FreeBSD)
mQINBFBXyBwBEADWUjMUWlklDw3yCTnD8qIBwp4SGInslNp5EQFmkZDrc3f9h7EG
hoHT88AuoyJFAZiJLWVc7ULKWM5XjkC865/MO9Lqw8yDJnm8LaHCdE2iLntkoFRq
@ -12296,7 +12296,7 @@ uid Philip Martin <philip@codematters.co.uk>
uid Philip Martin <philip.martin@wandisco.com>
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2.0.18 (FreeBSD)
Version: GnuPG v2.0.19 (FreeBSD)
mQENBEtUtcgBCACtSyRpMQWQEE+aggXFxvFJIYz7H3fWggQoRRvoztMJPYcEhWt2
nxsWPc16waWNo98uqvqNqNzE0fip2E/Hs7omKI5GtXl094mKn93bmwqbiBUL+p/3
@ -12733,7 +12733,7 @@ uid Jelmer Vernooij <jelmer@a-eskwadraat.nl>
sub 1024g/93C471CD 2001-10-30
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2.0.18 (FreeBSD)
Version: GnuPG v2.0.19 (FreeBSD)
mQGiBDve33cRBACY+4UBw8lSvL4cTFJU7AxuigeEbvIx9Hq0jnhSnzs1VEVNrIF6
1bqGvHYaPoqF1yTLwU0f8ku70XKFQjBNxYAKO3z4rXh+CBCe6LEMoZvl9SRPViGG
@ -22164,7 +22164,7 @@ uid Jelmer Vernooij <jrvernooij@tigris.org>
sub 4096R/1DB3C01A 2009-07-05
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2.0.18 (FreeBSD)
Version: GnuPG v2.0.19 (FreeBSD)
mQINBEpQwsABEACqYMFfTgdeBfCGdgavnGu3jzWAU0+l/ILYZLOjYUumFOmXkSUH
AD9YxGh/SXi+UO9K9wnbSWaH63sZSYoHP7pnP9GoegQODQqZQI0lhFZieJjkVmgQ
@ -30136,7 +30136,7 @@ uid Neels Janosch Hofmeyr (Subversion) <neels@apache.org>
sub 2048g/7584CE0B 2008-05-16
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2.0.18 (FreeBSD)
Version: GnuPG v2.0.19 (FreeBSD)
mQGiBEgt8nURBACs4zhGf6YCyno/76D7llE2v7Iac8Yx9EOiQCtgWp3Yo8+EBxKa
uo+7Wz1EY0BjWPwrTE2z39uAlMCh04ljdt75Zq6aS9csxrOAhN7xIy4JLSErOfUh
@ -30274,7 +30274,7 @@ pub 4096R/C232B454 2011-05-18 [expired: 2012-05-17]
uid Stefan Fuhrmann <stefanfuhrmann@alice-dsl.de>
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2.0.18 (FreeBSD)
Version: GnuPG v2.0.19 (FreeBSD)
mQINBE3TF2ABEADDhqWikW5+jfMyzrlgSx6wCJlxImpVDcDCaRzgPWOoacRFKtdA
s+RE/Y9bWoCJyOqRz34xhUYYHX3JMCGEq7fRD+Is/5gl5rehVDzEqkQmUYdObrS4
@ -30364,7 +30364,7 @@ uid Ramkumar Ramachandra (artagnon) <artagnon@gmail.com>
sub 2048R/6FC9FB42 2009-09-28
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2.0.18 (FreeBSD)
Version: GnuPG v2.0.19 (FreeBSD)
mQENBErAw2ABCADRhHz/FSgjSDN6+Hvh1Ipjl+RsmGDMYIanxk08pUaO+4tridXC
L6RMeXFsVFSkEAXOsxAGKHM3MbqNyk/uXdf8P8CcbkvYcTaRHFJAueBN7Ot1z1aF
@ -30414,7 +30414,7 @@ uid Johan Corveleyn <jcorvel@gmail.com>
sub 4096R/781EAAF9 2010-09-19
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2.0.18 (FreeBSD)
Version: GnuPG v2.0.19 (FreeBSD)
mQINBEyV1RABEADLj63b8G0xcpyMLruCLvB/VatArRY+vevbDUJOxWPJ9UzbIPus
sB7ymcLlXt/X34TEIsAMTQRXo/ylQ4cfihWbEeI8Qhu3gXjRpXKeb4m+CdppPaQ5
@ -30553,7 +30553,7 @@ uid Ben Reser <ben.reser@wandisco.com>
sub 4096R/5EF5CC13 2011-01-28
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2.0.18 (FreeBSD)
Version: GnuPG v2.0.19 (FreeBSD)
mQINBE1CV48BEAC7OiEWFfHiHd6AQbYfSOEw2Gv0Z7GcySDfdHsDX3VBGVUrrQGi
1a2AEFQNyj2pvQxBhlW5eP92ZKL30S7/4aYOeqxuvjDFq5gBYn0Nll7nsKFSstJa
@ -31567,7 +31567,7 @@ uid Joe Schaefer <joes@apache.org>
sub 1024g/ED4260B6 2003-06-13
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2.0.18 (FreeBSD)
Version: GnuPG v2.0.19 (FreeBSD)
mQGiBD7qX7gRBACxF9D8+GYaiLC/c7eyNwuxQJtbkm6myjuhUoZsG6o0Z4SPNqP7
dlQn3uYIQeRrT3pZjXCpcxYAq10c2QpDNR/Ip3w20FXF/QDGZZ/B+DRAY0Te7jv5

View File

@ -1,8 +1,12 @@
Index: Makefile.in
---
Makefile.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: subversion-nightly/Makefile.in
===================================================================
--- Makefile.in.orig 2011-12-21 17:32:27.000000000 +0000
+++ Makefile.in 2011-12-21 17:32:31.000000000 +0000
@@ -231,8 +231,8 @@ libsvn_subr_LDFLAGS = @libsvn_subr_LDFLA
--- subversion-nightly.orig/Makefile.in 2013-03-17 20:02:10.000000000 +0000
+++ subversion-nightly/Makefile.in 2013-03-17 20:02:15.000000000 +0000
@@ -228,8 +228,8 @@ libsvn_subr_LDFLAGS = @libsvn_subr_LDFLA
libsvn_wc_LDFLAGS = @libsvn_wc_LDFLAGS@
# Compilation of SWIG-generated C source code

View File

@ -1,7 +1,11 @@
Index: Makefile.in
---
Makefile.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: subversion-nightly/Makefile.in
===================================================================
--- Makefile.in.orig 2011-07-16 12:50:53.000000000 +0100
+++ Makefile.in 2011-12-21 17:32:20.000000000 +0000
--- subversion-nightly.orig/Makefile.in 2013-03-15 12:21:46.000000000 +0000
+++ subversion-nightly/Makefile.in 2013-03-17 20:02:04.000000000 +0000
@@ -112,8 +112,8 @@ EXEEXT = @EXEEXT@
SHELL = @SHELL@

View File

@ -6,11 +6,11 @@ ERROR: RPATH "/usr/src/packages/BUILD/subversion-1.5.x/subversion/libsvn_subr/.l
Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: Makefile.in
Index: subversion-1.8.0-rc2/Makefile.in
===================================================================
--- Makefile.in.orig 2011-12-21 17:32:31.000000000 +0000
+++ Makefile.in 2011-12-21 17:32:35.000000000 +0000
@@ -736,7 +736,7 @@ $(SWIG_PL_DIR)/native/Makefile.PL: $(SWI
--- subversion-1.8.0-rc2.orig/Makefile.in 2013-05-14 20:25:00.000000000 +0100
+++ subversion-1.8.0-rc2/Makefile.in 2013-05-14 20:25:01.000000000 +0100
@@ -760,7 +760,7 @@ $(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

View File

@ -2,6 +2,7 @@
# spec file for package subversion
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2013 Andreas Stieger <andreas.stieger@gmx.de>
# Copyright (c) 2009-2010 Pascal Bleser <pascal.bleser@opensuse.org>
#
# All modifications and additions to the file contributed by third parties
@ -17,14 +18,13 @@
#
# Subversion as of 1.7.4 does not work with ruby 1.9 in Factory
%define with_ruby 0%{?suse_version} > 1110 && 0%{?suse_version} < 1220
%define with_ruby 0%{?suse_version} > 1110
%define with_intree_swig 0%{?suse_version} != 1110
%if 0%{?always_use_intree_sqlite:1}
%define with_intree_sqlite 1
%define with_python_ctypes 0%{?suse_version} > 1110
%else
%define with_intree_sqlite 0%{?suse_version} < 1110
%define with_intree_sqlite 0%{?suse_version} < 1230
%define with_python_ctypes 0
%endif
%if %suse_version >= 1220
@ -33,9 +33,6 @@
%define with_kde4_kwallet 0%{?suse_version} > 1100
%define with_gnome_keyring 0%{?suse_version} > 1100
%bcond_without neon
%bcond_without serf
# run build --with=regression_tests to run test suite
%bcond_with regression_tests
@ -49,12 +46,12 @@
%define svnuser svn
Name: subversion
Version: 1.7.10
Version: 1.8.0
Release: 0
# in-tree SWIG version to use for the build:
%define swig_version 1.3.36
%define sqlite_version 3.7.6.3
%define sqlite_pkg_version 3070603
%define sqlite_version 3.7.15.1
%define sqlite_pkg_version 3071501
BuildRequires: apache2-devel
BuildRequires: db-devel
BuildRequires: file-devel
@ -81,7 +78,17 @@ BuildRequires: bash-completion
BuildRequires: ctypesgen
%endif
%if %with_ruby
BuildRequires: ruby-devel
# Only 1.8.x releases are fully supported, 1.9.3 support is new
# configure script disallows versions between 1.8.7 and 1.9.3
BuildConflicts: ruby-devel = 1.9.0
BuildConflicts: ruby-devel = 1.9.1
BuildConflicts: ruby-devel = 1.9.2
%if 0%{?suse_version} >= 1310
# 13.1 and later have a ruby19 package, pkgconfig and a different versioning scheme
BuildRequires: pkgconfig(ruby-1.9)
%else
BuildRequires: ruby-devel >= 1.8.2
%endif
%endif # with_ruby
BuildRequires: apache2-prefork
BuildRequires: cyrus-sasl-devel
@ -94,9 +101,7 @@ BuildRequires: libgnome-keyring-devel
BuildRequires: gnome-keyring-devel
%endif
%endif # with_gnome_keyring
%if %{with serf}
BuildRequires: libserf-devel
%endif
BuildRequires: libserf-devel >= 1.2.1
%if %with_kde4_kwallet
BuildRequires: dbus-1-devel
BuildRequires: kdelibs4-core
@ -110,14 +115,6 @@ BuildRequires: junit
%else
%define with_java 0
%endif
%if %{with neon}
%if 0%{?suse_version} > 1030
BuildRequires: libneon-devel
%else
BuildRequires: neon-devel
BuildRequires: openldap2-devel
%endif # suse_version > 1030
%endif # with neon
%if 0%{?suse_version} >= 1230
# fix "have choice for libjpeg-devel needed by libmng-devel: libjpeg62-devel libjpeg8-devel"
#!BuildIgnore: libjpeg62-devel
@ -125,7 +122,11 @@ BuildRequires: openldap2-devel
%if %{with regression_tests}
# svnserveautocheck.sh davautocheck.sh requirements
BuildRequires: net-tools
BuildRequires: util-linux
BuildRequires: wget
%if 0%{?suse_version} > 1230
BuildRequires: time
%endif
%if 0%{?sles_version} == 11
# additional python sqlite required for SLE 11 only for python tests to complete
# needs to be added to branch project to work, e.g.
@ -150,12 +151,11 @@ Summary: Subversion version control system
License: Apache-2.0
Group: Development/Tools/Version Control
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Url: http://subversion.apache.org
Source0: http://www.apache.org/dist/subversion/subversion-%{version}.tar.bz2
Url: https://subversion.apache.org
Source0: https://www.apache.org/dist/subversion/%{name}-%{version}.tar.bz2
Source1: subversion.conf
Source2: subversion.README.SuSE
Source3: svnmerge.py
Source4: contrib-1187941.tar.bz2
Source4: contrib-1485350.tar.bz2
Source9: subversion.rcsvnserve
Source10: subversion.sysconfig.svnserve
Source12: subversion.sysconfig.svnserve.remoteaccess
@ -177,8 +177,9 @@ Source90: swig-%{swig_version}.tar.bz2
BuildRequires: swig
%endif
%if %with_intree_sqlite
# http://www.sqlite.org/sqlite-amalgamation-%{sqlite_version}.tar.gz
Source91: sqlite-autoconf-%{sqlite_pkg_version}.tar.bz2
Source91: https://www.sqlite.org/sqlite-amalgamation-%{sqlite_pkg_version}.zip
BuildRequires: unzip
BuildConflicts: sqlite3-devel
%else
BuildRequires: sqlite3-devel >= %{sqlite_version}
%requires_ge libsqlite3-0
@ -191,23 +192,12 @@ Patch20: subversion-swig-perl-install_vendor.patch
Patch23: subversion.libtool-pie-flags.patch
Patch31: subversion.perl.LD_RUN_PATH.patch
Patch37: subversion-no-build-date.patch
# PATCH-FEATURE-UPSTREAM subversion-neon-systemproxy.patch dimstar@opensuse.org -- Use system proxy offered by neon, if no specific config is used (Thus, actually using libproxy in the background to use 'the right proxy' as configured in the system).
Patch38: subversion-neon-systemproxy.patch
Patch39: subversion-1.7.4-ruby-1.9-RbConfig.patch
Patch40: subversion-1.7.8-TestHarness_run_py_test_exit_code.patch
Patch41: subversion-1.7.9-davautocheck-LD_LIBRARY_PATH.patch
#
%if %with_ruby
%if %{!?rb_arch:1}0
%define rb_arch %(echo "%{_host_cpu}-%{_os}" | sed -e "s/i686/i586/" -e "s/armv5tel/armv4l/" -e "s/hppa2.0/hppa/")
%endif
%if %{!?rb_major_ver:1}0
%define rb_major_ver %(/usr/bin/ruby -e 'puts VERSION'|cut -f1,2 -d.)
%endif
%if %{!?site_ruby:1}0
%define site_ruby %{_usr}/%{_lib}/ruby/site_ruby/%{rb_major_ver}
%endif
%define site_ruby %(ruby -rrbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')
%endif # with_ruby
#
%if %with_java
Provides: subversion-javahl = %{version}-%{release}
%endif # with_java
@ -357,21 +347,15 @@ parameters and keywords for the svn command and other tools.
%if %with_intree_sqlite
%__install -d ./sqlite-amalgamation
pushd ./sqlite-amalgamation
%__bzip2 -d -c "%{SOURCE91}" | %__tar xf - "sqlite-autoconf-%{sqlite_pkg_version}/sqlite3.c"
%__mv "sqlite-autoconf-%{sqlite_pkg_version}/sqlite3.c" .
%__rm -rf "sqlite-autoconf-%{sqlite_pkg_version}"
unzip -ej "%{SOURCE91}"
popd #./sqlite-amalgamation
%endif # with_intree_sqlite
#
%patch11 -p0
%patch20
%patch23 -p0
%patch31
%patch11 -p1
%patch20 -p1
%patch23 -p1
%patch31 -p1
%patch37 -p1
%patch38
%patch39 -p1
%patch40 -p1
%patch41 -p1
SQLITE_RECOMMENDED_VER=$(grep -E '^SQLITE_RECOMMENDED_VER=' configure.ac|cut -f2 -d=|cut -f2 -d\")
#"
@ -499,17 +483,13 @@ export LDFLAGS=-pie
export PATH="${SWIG_ROOT}/bin:${PATH}"
%configure \
--with-editor="vim -c 'set tw=72 et' " \
%if %{with neon}
--with-neon=%{_prefix} \
%endif
%if %{with serf}
--with-serf=%{_prefix} \
%endif
--with-apr=%{_prefix} \
--with-apr-util=%{_prefix} \
--with-apxs=%{apxs} \
--with-zlib=%{_prefix} \
--with-berkeley-db=db.h:db.h:%{_prefix}:db \
--with-apache-libexecdir=%{apache_libexecdir} \
$with_jdk \
%if %with_java
--with-junit="%{_usr}/share/java/junit.jar" \
@ -547,7 +527,7 @@ python_ctypes_target=ctypes-python
%else
python_ctypes_target=
%endif # with_python_ctypes
%__make extraclean-swig
%__make extraclean-bindings
%__make swig-py $python_ctypes_target swig-pl $ruby_target SWIG_LDFLAGS= $with_jdk
%install
@ -583,7 +563,6 @@ mkdir -p $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/
cp -avL contrib/client-side/emacs/*.el $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/
rm -f $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/vc-svn.el
#
install -m 755 contrib/client-side/svnmerge/svnmerge.py $RPM_BUILD_ROOT/usr/bin/svnmerge.py
cp -avL contrib/client-side/svn_apply_autoprops.py $RPM_BUILD_ROOT/usr/bin
#
mkdir -p $RPM_BUILD_ROOT/%{apache_sysconfdir}/conf.d
@ -596,7 +575,7 @@ cat with_jdk.files >> files.subversion
#
# tools
%__make DESTDIR="$RPM_BUILD_ROOT" install-tools
%__mv $RPM_BUILD_ROOT%{_bindir}/svn-tools/{svn-populate-node-origins-index,svn-rep-sharing-stats,svnauthz-validate,svnmucc} $RPM_BUILD_ROOT%{_bindir}
%__mv $RPM_BUILD_ROOT%{_bindir}/svn-tools/{svn-populate-node-origins-index,svn-rep-sharing-stats,svnauthz-validate} $RPM_BUILD_ROOT%{_bindir}
# discard all other tools
%__rm -rf $RPM_BUILD_ROOT%{_bindir}/svn-tools
#
@ -635,7 +614,6 @@ rm -f %{buildroot}/var/adm/perl-modules/subversion
#
# double check that the essential repository access schemes have been compiled in
# requires at least one http library: neon or serf
#
schemes=$(LD_LIBRARY_PATH="${RPM_BUILD_ROOT}%{_libdir}" "${RPM_BUILD_ROOT}%{_bindir}/svn" --version | %__grep "'" | cut -d\' -f2 | sort -u)
# reset vim syntax: '
@ -644,51 +622,23 @@ http
https
svn"
#
%if %{with neon}
#
# double check that when building with neon support, ra_neon is actually available and handles http and https schemes
#
serf_schemes=$(LD_LIBRARY_PATH="${RPM_BUILD_ROOT}%{_libdir}" "${RPM_BUILD_ROOT}%{_bindir}/svn" --version | %__grep -A2 "ra_neon" | %__grep "'" | cut -d\' -f2 )
# reset vim syntax: '
test "$serf_schemes" = "http
https"
#
%endif # with neon
#
%if %{with serf}
#
# double check that when building with serf support, ra_serf is actually available and handles http and https schemes
#
serf_schemes=$(LD_LIBRARY_PATH="${RPM_BUILD_ROOT}%{_libdir}" "${RPM_BUILD_ROOT}%{_bindir}/svn" --version | %__grep -A2 "ra_serf" | %__grep "'" | cut -d\' -f2 )
# reset vim syntax: '
test "$serf_schemes" = "http
https"
#
%endif # with serf
# check that when building with in-tree SQLite, it is statically linked and of exactly that version
sqlite_info=$(LD_LIBRARY_PATH="${RPM_BUILD_ROOT}%{_libdir}" "${RPM_BUILD_ROOT}%{_bindir}/svn" --version -v | %__grep "SQLite" | cut -d\- -f2)
%if %with_intree_sqlite
test "$sqlite_info" = " SQLite %{sqlite_version} (static)"
%endif
#
%if %{with regression_tests}
ulimit -a
# During "make check", auth-test loads DSOs at runtime and can't find
# them if we don't set up LD_LIBRARY_PATH as below.
export LD_LIBRARY_PATH="$PWD/subversion/libsvn_auth_kwallet/.libs:$PWD/subversion/libsvn_auth_gnome_keyring/.libs:$LD_LIBRARY_PATH"
# run tests over ra_local (file://)
%__make check CLEANUP=true FS_TYPE=fsfs
# run tests over ra_svn (svn://)
%__make svnserveautocheck CLEANUP=true FS_TYPE=fsfs
# run tests over ra_neon (http://)
%if %{with neon}
%__make davautocheck CLEANUP=true FS_TYPE=fsfs HTTP_LIBRARY=neon
%endif # neon
# run tests over ra_serf (http://)
%if %{with serf}
%__make davautocheck CLEANUP=true FS_TYPE=fsfs HTTP_LIBRARY=serf
%endif # serf
%if %with_java
%__make check-javahl
@ -743,22 +693,19 @@ systemd-tmpfiles --create /usr/lib/tmpfiles.d/svnserve.conf
%post -n subversion-perl -p /sbin/ldconfig
%postun -n subversion-perl -p /sbin/ldconfig
%if %with_ruby
%post -n subversion-ruby -p /sbin/ldconfig
%postun -n subversion-ruby -p /sbin/ldconfig
%endif # with_ruby
%if %with_gnome_keyring
%post -n libsvn_auth_gnome_keyring-1-0 -p /sbin/ldconfig
%postun -n libsvn_auth_gnome_keyring-1-0 -p /sbin/ldconfig
%endif # with_gnome_keyring
%if %with_kde4_kwallet
%post -n libsvn_auth_kwallet-1-0 -p /sbin/ldconfig
%postun -n libsvn_auth_kwallet-1-0 -p /sbin/ldconfig
%endif # with_kde4_kwallet
@ -789,6 +736,7 @@ systemd-tmpfiles --create /usr/lib/tmpfiles.d/svnserve.conf
%attr(755,root,root) /usr/bin/svngrep
%attr(755,root,root) /usr/bin/svnsync
%attr(755,root,root) /usr/bin/svnrdump
%attr(755,root,root) /usr/bin/svnmucc
%{_libdir}/libsvn_client*.so.*
%{_libdir}/libsvn_delta*.so.*
%{_libdir}/libsvn_diff*.so.*
@ -816,8 +764,8 @@ systemd-tmpfiles --create /usr/lib/tmpfiles.d/svnserve.conf
%{_libdir}/libsvn_swig_py-1.so.*
%{site_python}/libsvn/*
%{site_python}/svn/*
%if %with_python_ctypes
%if %with_python_ctypes
%files python-ctypes
%defattr(-,root,root)
%doc subversion/bindings/ctypes-python/examples
@ -827,8 +775,8 @@ systemd-tmpfiles --create /usr/lib/tmpfiles.d/svnserve.conf
%{site_python}/svn_ctypes_python_bindings-*-py%{py_ver}.egg-info
%endif # suse_version >= 1020
%endif # with_python_ctypes
%if %with_ruby
%if %with_ruby
%files ruby
%defattr(-,root,root)
%dir %{site_ruby}
@ -845,12 +793,10 @@ systemd-tmpfiles --create /usr/lib/tmpfiles.d/svnserve.conf
%files tools
%defattr(-,root,root)
%attr(755,root,root) %{_bindir}/svnmerge.py
%attr(755,root,root) %{_bindir}/svn_apply_autoprops.py
%{_bindir}/svn-populate-node-origins-index
%{_bindir}/svnauthz-validate
%{_bindir}/svn-rep-sharing-stats
%{_bindir}/svnmucc
%files server
%defattr(-,root,root)
@ -860,15 +806,15 @@ systemd-tmpfiles --create /usr/lib/tmpfiles.d/svnserve.conf
%{apache_libexecdir}/mod_dav_svn.*
%{apache_libexecdir}/mod_authz_svn.*
%{apache_libexecdir}/mod_dontdothat.*
%if %with_gnome_keyring
%if %with_gnome_keyring
%files -n libsvn_auth_gnome_keyring-1-0
%defattr(-,root,root)
%{_libdir}/libsvn_auth_gnome_keyring-1.so.0
%{_libdir}/libsvn_auth_gnome_keyring-1.so.0.*
%endif # with_gnome_keyring
%if %with_kde4_kwallet
%if %with_kde4_kwallet
%files -n libsvn_auth_kwallet-1-0
%defattr(-,root,root)
%{_libdir}/libsvn_auth_kwallet-1.so.0
@ -876,7 +822,6 @@ systemd-tmpfiles --create /usr/lib/tmpfiles.d/svnserve.conf
%endif # with_kde4_kwallet
%if %with_bashcomp
%files bash-completion
%defattr(-,root,root)
%config %{_sysconfdir}/bash_completion.d/%{name}

View File

@ -8,7 +8,7 @@
# The -R option enforces read-only access, i.e. write operations to the
# repository (such as commits) will not be allowed.
# Authentication should be configured before allowing write access.
# See http://svnbook.red-bean.com/en/1.7/svn.serverconfig.svnserve.html#svn.serverconfig.svnserve.auth
# See http://svnbook.red-bean.com/en/1.8/svn.serverconfig.svnserve.html#svn.serverconfig.svnserve.auth
#
SVNSERVE_OPTIONS="-d -R -r /srv/svn/repos"
@ -21,7 +21,7 @@ SVNSERVE_OPTIONS="-d -R -r /srv/svn/repos"
# svn group and the setgid flag is set on the repositories
# usermod -A svn wwwrun
# chmod -R g+s /srv/svn/repos
# See http://svnbook.red-bean.com/en/1.7/svn.serverconfig.multimethod.html
# See http://svnbook.red-bean.com/en/1.8/svn.serverconfig.multimethod.html
#
SVNSERVE_USERID="svn"
@ -34,6 +34,6 @@ SVNSERVE_USERID="svn"
# svn group and the setgid flag is set on the repositories
# usermod -A svn wwwrun
# chmod -R g+s /srv/svn/repos
# See http://svnbook.red-bean.com/en/1.7/svn.serverconfig.multimethod.html
# See http://svnbook.red-bean.com/en/1.8/svn.serverconfig.multimethod.html
#
SVNSERVE_GROUPID="svn"

File diff suppressed because it is too large Load Diff