Date: Saturday, April 8, 2023 @ 13:05:34
Author: dvzrv
Revision: 473315
archrelease: copy trunk to staging-x86_64
Added:
subversion/repos/staging-x86_64/
subversion/repos/staging-x86_64/PKGBUILD
(from rev 473314, subversion/trunk/PKGBUILD)
subversion/repos/staging-x86_64/keys/
subversion/repos/staging-x86_64/ruby-frozen-nil.patch
(from rev 473314, subversion/trunk/ruby-frozen-nil.patch)
subversion/repos/staging-x86_64/subversion-1.14.1-python-3.11-build.patch
(from rev 473314,
subversion/trunk/subversion-1.14.1-python-3.11-build.patch)
subversion/repos/staging-x86_64/subversion-1.14.2-swig-py-Fix-conditionals-by-SWIG-version-and-by-Pyth.patch
(from rev 473314,
subversion/trunk/subversion-1.14.2-swig-py-Fix-conditionals-by-SWIG-version-and-by-Pyth.patch)
subversion/repos/staging-x86_64/subversion.rpath.fix.patch
(from rev 473314, subversion/trunk/subversion.rpath.fix.patch)
subversion/repos/staging-x86_64/svn
(from rev 473314, subversion/trunk/svn)
subversion/repos/staging-x86_64/svnserve.conf
(from rev 473314, subversion/trunk/svnserve.conf)
subversion/repos/staging-x86_64/svnserve.service
(from rev 473314, subversion/trunk/svnserve.service)
subversion/repos/staging-x86_64/svnserve.tmpfiles
(from rev 473314, subversion/trunk/svnserve.tmpfiles)
------------------------------------------------------------------------------+
PKGBUILD |
136 ++++++++++
ruby-frozen-nil.patch |
42 +++
subversion-1.14.1-python-3.11-build.patch |
14 +
subversion-1.14.2-swig-py-Fix-conditionals-by-SWIG-version-and-by-Pyth.patch |
64 ++++
subversion.rpath.fix.patch |
11
svn |
11
svnserve.conf |
5
svnserve.service |
11
svnserve.tmpfiles |
1
9 files changed, 295 insertions(+)
Copied: subversion/repos/staging-x86_64/PKGBUILD (from rev 473314,
subversion/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2023-04-08 13:05:34 UTC (rev 473315)
@@ -0,0 +1,136 @@
+# Maintainer: Felix Yan <[email protected]>
+# Contributor: Angel Velasquez <[email protected]>
+# Contributor: Stéphane Gaudreault <[email protected]>
+# Contributor: Paul Mattal <[email protected]>
+# Contributor: Jason Chu <[email protected]>
+
+pkgname=subversion
+pkgver=1.14.2
+pkgrel=7
+pkgdesc="A Modern Concurrent Version Control System"
+arch=('x86_64')
+url="https://subversion.apache.org/";
+license=('APACHE')
+depends=('apr' 'apr-util' 'bash' 'dbus' 'expat' 'file' 'gcc-libs' 'glibc'
'libsasl' 'libutf8proc' 'lz4' 'serf' 'sqlite'
+ 'systemd' 'zlib' )
+makedepends=('apache' 'python' 'python-py3c' 'perl' 'swig'
'java-environment>=8'
+ 'libgnome-keyring' 'kwallet' 'kdelibs4support' 'ruby')
+optdepends=('libgnome-keyring: for GNOME Keyring for auth credentials'
+ 'kwallet: for KWallet for auth credentials'
+ 'bash-completion: for svn bash completion'
+ 'python: for some hook scripts'
+ 'java-environment: for Java support'
+ 'ruby: for some hook scripts')
+checkdepends=('ruby-test-unit')
+provides=('svn')
+backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve')
+options=('!makeflags' '!emptydirs')
+source=(https://www.apache.org/dist/subversion/subversion-${pkgver}.tar.bz2{,.asc}
+ svn
+ svnserve.conf
+ svnserve.tmpfiles
+ svnserve.service
+ subversion.rpath.fix.patch
+ ruby-frozen-nil.patch
+ subversion-1.14.1-python-3.11-build.patch
+
subversion-1.14.2-swig-py-Fix-conditionals-by-SWIG-version-and-by-Pyth.patch
+)
+sha512sums=('20ada4688ca07d9fb8da4b7d53b5084568652a3b9418c65e688886bae950a16a3ff37710fcfc9c29ef14a89e75b2ceec4e9cf35d5876a7896ebc2b512cfb9ecc'
+ 'SKIP'
+
'3df59e92aa0314ff6adce26e2e1162bf2872ca03ff1f78891081a60e67b521b6046b4a2f85f718dcd27f9d5709594658817a09548cdb74e3976d371dbe47e7db'
+
'f7f2ceac2446cc94ac2be3404083cc54a0f1f4d04d5301f600dfafca38819669bcffdfa45f1b90b9f3cdb042469385a764f11dc1a827f10c23ddf73b7ac6c9da'
+
'7775f4da5003970c9ebdc2f696ba090df194a77d9daed791875488c943f72ae496b5f9cc6f3ff9f3f4de9f352a3b518137babdea38947d1a2d5dd16aa1844036'
+
'8cc23ae71bd7ce7c337eaf12929f1af0a11b55250808e88f06397b874daf2efb9491c464be3d082d937a82c2b0b7c3ed06d6695cfd8a3fda1f803bbfd15837de'
+
'60d538160e738eb3b3e84a3881fe5a8d75c79053d3f31c4c29ef6ace6ccc5dd4367ed712766c911bae3436e9706e4dd144b270bb45161a6c1834a37e154d0440'
+
'bb772e55acd9601121ad06b254c364e8d8cf772ca59b8df0cf4c5c5ecba110d4108d0363672f121f770550cdd052802474029e57643258f398aacd2b63ccb898'
+
'cad1ef6359c4eecce4fc44fb0c8a01a7b9b94cd8b1b3f9bdd9d72b3591f75bada814a9597cea039c6e045f3f07807f17bd720e27cf7d8a92640bb45faaa6a982'
+
'9885226c2eea79712f316194fd9710bd940bce517cb2d3f1fcfbcb1edb8f10ae8496e7d03cd377cb991efa7259ff6930c488c603df206611bae4aa30a62cc596')
+validpgpkeys=('19BBCAEF7B19B280A0E2175E62D48FAD16A0DE01'
+ '8BC4DAE0C5A4D65F404401074F7DBAA99A59B973'
+ 'BA3C15B1337CF0FB222BD41A1BCA6586A347943F'
+ 'E7B2A7F4EC28BE9FF8B38BA4B64FFF1209F9FA74'
+ '3D1DC66D6D2E0B9039528138C4A6C625CCC8E1DF'
+ 'A844790FB5743606EE95920776D788E1ED1A599C'
+ '7B8CA7F6451AD89C8ADC077B376A3CFD110B1C95'
+ '056F8016D9B87B1BDE41746799EC741B57921ACC'
+ '3F8E467CB3366E3013E1120D583F00ADF981C39F'
+ '91BFBF4D6956BD5DF7B72D23DFE691AE331BA3DB'
+ 'EC25FCC105618D04ADB43429C4416167349A3BCB')
+# Ben Reser / Stefan Sperling / Branko Čibej / Evgeny Kotkov / Bert Huijben /
Philip Martin /
+# Stefan Fuhrmann / Stefan Hett (CODE SIGNING KEY) /Nathan Hartman (CODE
SIGNING KEY) / James McCoy /
+# Mark Phippard
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -Np0 -i ../subversion.rpath.fix.patch
+ patch -p1 -i ../ruby-frozen-nil.patch
+ rm subversion/bindings/swig/proxy/*.swg
+ # fix issues with Python 3.11 and swig
+ patch -Np1 -i ../subversion-1.14.1-python-3.11-build.patch
+ patch -Np1 -i
../subversion-1.14.2-swig-py-Fix-conditionals-by-SWIG-version-and-by-Pyth.patch
+
+ ./autogen.sh
+}
+
+build() {
+ local site_packages=$(python -c "import site;
print(site.getsitepackages()[0])")
+
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr \
+ --with-apxs \
+ --enable-javahl \
+ --with-jdk=/usr/lib/jvm/default \
+ --with-gnome-keyring \
+ --with-kwallet \
+ --with-apache-libexecdir=/usr/lib/httpd/modules \
+ --with-ruby-sitedir=/usr/lib/ruby/vendor_ruby \
+ --disable-static
+
+ # prevent excessive overlinking due to libtool
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+ make LT_LDFLAGS="-L$Fdestdir/usr/lib"
+ make swig_pydir=$site_packages/libsvn \
+ swig_pydir_extra=$site_packages/svn swig-py swig-pl javahl swig-rb
+}
+
+check() {
+ cd ${pkgname}-${pkgver}
+ export LANG=C LC_ALL=C
+ make check-swig-py check check-swig-pl check-swig-rb CLEANUP=yes #
check-javahl
+}
+
+package() {
+ local site_packages=$(python -c "import site;
print(site.getsitepackages()[0])")
+
+ cd ${pkgname}-${pkgver}
+
+ export LD_LIBRARY_PATH="${pkgdir}"/usr/lib:${LD_LIBRARY_PATH}
+ make DESTDIR="${pkgdir}" INSTALLDIRS=vendor \
+ swig_pydir=$site_packages/libsvn \
+ swig_pydir_extra=$site_packages/svn \
+ install install-swig-py install-swig-pl install-javahl install-swig-rb
+
+ install -dm755 "${pkgdir}"/usr/share/subversion
+ cp -a tools/hook-scripts "${pkgdir}"/usr/share/subversion/
+ rm "${pkgdir}"/usr/share/subversion/hook-scripts/*.in
+
+ ## svnserve ...
+
+ # xinetd
+ install -D -m 644 "${srcdir}"/svn "${pkgdir}"/etc/xinetd.d/svn
+
+ # ... systemd
+ install -D -m 644 "${srcdir}"/svnserve.service
"${pkgdir}"/usr/lib/systemd/system/svnserve.service
+ install -D -m 644 "${srcdir}"/svnserve.tmpfiles
"${pkgdir}"/usr/lib/tmpfiles.d/svnserve.conf
+
+ # ... common config
+ install -D -m 644 "${srcdir}"/svnserve.conf "${pkgdir}"/etc/conf.d/svnserve
+
+ install -Dm 644 tools/client-side/bash_completion \
+ "${pkgdir}"/usr/share/bash-completion/completions/subversion
+ for i in svn svnadmin svndumpfilter svnlook svnsync svnversion; do
+ ln -sf subversion "${pkgdir}"/usr/share/bash-completion/completions/${i}
+ done
+}
+
+# vim: ts=2 sw=2 et:
Copied: subversion/repos/staging-x86_64/ruby-frozen-nil.patch (from rev 473314,
subversion/trunk/ruby-frozen-nil.patch)
===================================================================
--- staging-x86_64/ruby-frozen-nil.patch (rev 0)
+++ staging-x86_64/ruby-frozen-nil.patch 2023-04-08 13:05:34 UTC (rev
473315)
@@ -0,0 +1,42 @@
+commit 6c69127693e9e395c026d982f871253548037a4d
+Author: James McCoy <[email protected]>
+Date: Sun Nov 8 23:06:45 2015 -0500
+
+ Create a new Ruby Object instead of attempting to modify nil.
+
+ Starting in Ruby 2.2, the nil, true, and false objects are frozen. This
+ was causing test_repos.rb's test_load to fail due to calling
+ "repos.load_fs(nil)". This results in svn_swig_rb_make_stream trying to
+ attributes on nil, which isn't allowed.
+
+ * subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c:
+ (svn_swig_rb_make_stream): Create a new Object if the given io is nil.
+ Also call svn_swig_rb_get_pool in order to deduplicate some
+ pool-handling code.
+
+diff --git a/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
b/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
+index a25ec5a..2210853 100644
+--- a/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
++++ b/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
+@@ -3230,14 +3230,16 @@ svn_swig_rb_make_stream(VALUE io)
+ stream_p = &stream;
+ r2c_swig_type2(io, "svn_stream_t *", (void **)stream_p);
+ } else {
++ if (NIL_P(io)) {
++ io = rb_class_new_instance(0, NULL, rb_cObject);
++ }
+ VALUE rb_pool = rb_pool_new(Qnil);
+- apr_pool_wrapper_t *pool_wrapper;
+- apr_pool_wrapper_t **pool_wrapper_p;
++ apr_pool_t *pool;
++
++ svn_swig_rb_get_pool(0, NULL, io, &rb_pool, &pool);
+
+ rb_set_pool(io, rb_pool);
+- pool_wrapper_p = &pool_wrapper;
+- r2c_swig_type2(rb_pool, "apr_pool_wrapper_t *", (void **)pool_wrapper_p);
+- stream = svn_stream_create((void *)io, pool_wrapper->pool);
++ stream = svn_stream_create((void *)io, pool);
+ svn_stream_set_read2(stream, NULL /* only full read support */,
+ read_handler_rbio);
+ svn_stream_set_write(stream, write_handler_rbio);
Copied:
subversion/repos/staging-x86_64/subversion-1.14.1-python-3.11-build.patch (from
rev 473314, subversion/trunk/subversion-1.14.1-python-3.11-build.patch)
===================================================================
--- staging-x86_64/subversion-1.14.1-python-3.11-build.patch
(rev 0)
+++ staging-x86_64/subversion-1.14.1-python-3.11-build.patch 2023-04-08
13:05:34 UTC (rev 473315)
@@ -0,0 +1,14 @@
+Use read_file instead of deprecated readfp - removed in Python 3.11
+
+diff -ur subversion-1.14.1/build/generator/gen_base.py
subversion-1.14.1-patched/build/generator/gen_base.py
+--- subversion-1.14.1/build/generator/gen_base.py 2019-11-04
06:59:36.000000000 +0100
++++ subversion-1.14.1-patched/build/generator/gen_base.py 2021-12-15
14:04:50.041649320 +0100
+@@ -76,7 +76,7 @@
+
+ # Now read and parse build.conf
+ parser = configparser.ConfigParser()
+- parser.readfp(open(fname))
++ parser.read_file(open(fname))
+
+ self.conf = build_path(os.path.abspath(fname))
+
Copied:
subversion/repos/staging-x86_64/subversion-1.14.2-swig-py-Fix-conditionals-by-SWIG-version-and-by-Pyth.patch
(from rev 473314,
subversion/trunk/subversion-1.14.2-swig-py-Fix-conditionals-by-SWIG-version-and-by-Pyth.patch)
===================================================================
---
staging-x86_64/subversion-1.14.2-swig-py-Fix-conditionals-by-SWIG-version-and-by-Pyth.patch
(rev 0)
+++
staging-x86_64/subversion-1.14.2-swig-py-Fix-conditionals-by-SWIG-version-and-by-Pyth.patch
2023-04-08 13:05:34 UTC (rev 473315)
@@ -0,0 +1,64 @@
+From 8ff4cfd06ce554e9df31a088c9d09f45278c6de4 Mon Sep 17 00:00:00 2001
+From: Yasuhito Futatsuki <[email protected]>
+Date: Tue, 20 Sep 2022 12:57:06 +0000
+Subject: [PATCH] swig-py: Fix conditionals by SWIG version and by Python
+version for proxy code.
+
+We are using different code for proxy object, by Python version and by SWIG
+version. The distinguish between Python 2 and Python 3 was done by SWIG
+macro "SWIGPYTHON_PY3". However, the macro was dropped since SWIG commit
+a343b7e[1], between SWIG 4.0.2 release and upcoming SWIG 4.1.0 release.
+
+As we already dropped support for the combination of SWIG >= 4.0 and Python 2,
+we should detect Python 2 only in SWIG < 4.0 case. So we can rely on the macro
+only in the case.
+
+* subversion/bindings/swig/include/proxy.swg ():
+Reorder the conditionals distinguish SWIG versions and Python versions,
+as described above.
+
+Found by: Jitka Plesnikova (jplesnik {_AT_} redhat.com)
+
+Suggested by: Julien Schueller (schueller {_AT_} phimeca.com) [2]
+
+[1]
https://github.com/swig/swig/commit/a343b7e254567a64761bc1be7dc55b7b7424ec52
+[2] https://github.com/swig/swig/issues/2373#issuecomment-1250997124
+
+
+git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1904167
13f79535-47bb-0310-9956-ffa450edef68
+---
+ subversion/bindings/swig/include/proxy.swg | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/subversion/bindings/swig/include/proxy.swg
b/subversion/bindings/swig/include/proxy.swg
+index ac67d434ca..7d2d0dd033 100644
+--- a/subversion/bindings/swig/include/proxy.swg
++++ b/subversion/bindings/swig/include/proxy.swg
+@@ -66,7 +66,6 @@
+ fn()
+
+ %}
+-#if defined(SWIGPYTHON_PY3)
+ #if SWIG_VERSION >= 0x040000
+ %pythoncode %{
+ # -classic and -modern options have been dropped and this variable
+@@ -76,7 +75,7 @@
+ _set_instance_attr =
_swig_setattr_nondynamic_instance_variable(object.__setattr__)
+
+ %}
+-#else
++#elif defined(SWIGPYTHON_PY3)
+ %pythoncode %{
+ # SWIG classes generated with -modern do not define this variable
+ try:
+@@ -90,7 +89,6 @@
+ _set_instance_attr = _swig_setattr_nondynamic_method(object.__setattr__)
+
+ %}
+-#endif
+ #else
+ %pythoncode %{
+ # SWIG classes generated with -classic do not define this variable,
+--
+2.37.3
+
Copied: subversion/repos/staging-x86_64/subversion.rpath.fix.patch (from rev
473314, subversion/trunk/subversion.rpath.fix.patch)
===================================================================
--- staging-x86_64/subversion.rpath.fix.patch (rev 0)
+++ staging-x86_64/subversion.rpath.fix.patch 2023-04-08 13:05:34 UTC (rev
473315)
@@ -0,0 +1,11 @@
+--- Makefile.in.orig 2009-02-16 14:10:48.000000000 -0200
++++ Makefile.in 2009-06-04 00:56:29.000000000 -0300
+@@ -678,6 +678,7 @@
+
+ $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL
+ cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL PREFIX=$(prefix)
++ cd $(SWIG_PL_DIR)/native; sed -i 's|LD_RUN_PATH|DIE_RPATH_DIE|g'
Makefile{,.{client,delta,fs,ra,repos,wc}}
+
+ # 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
+ # only be used where Python/Perl are known to be available.
Copied: subversion/repos/staging-x86_64/svn (from rev 473314,
subversion/trunk/svn)
===================================================================
--- staging-x86_64/svn (rev 0)
+++ staging-x86_64/svn 2023-04-08 13:05:34 UTC (rev 473315)
@@ -0,0 +1,11 @@
+service svn
+{
+ flags = REUSE
+ socket_type = stream
+ wait = no
+ user = root
+ server = /usr/bin/svnserve
+ server_args = -i
+ log_on_failure += USERID
+ disable = yes
+}
Copied: subversion/repos/staging-x86_64/svnserve.conf (from rev 473314,
subversion/trunk/svnserve.conf)
===================================================================
--- staging-x86_64/svnserve.conf (rev 0)
+++ staging-x86_64/svnserve.conf 2023-04-08 13:05:34 UTC (rev 473315)
@@ -0,0 +1,5 @@
+#
+# Parameters to be passed to svnserve
+#
+#SVNSERVE_ARGS="-r /path/to/some/repos"
+SVNSERVE_ARGS=""
Copied: subversion/repos/staging-x86_64/svnserve.service (from rev 473314,
subversion/trunk/svnserve.service)
===================================================================
--- staging-x86_64/svnserve.service (rev 0)
+++ staging-x86_64/svnserve.service 2023-04-08 13:05:34 UTC (rev 473315)
@@ -0,0 +1,11 @@
+[Unit]
+Description=Subversion protocol daemon
+After=syslog.target network.target
+
+[Service]
+Type=forking
+EnvironmentFile=/etc/conf.d/svnserve
+ExecStart=/usr/bin/svnserve --daemon $SVNSERVE_ARGS
+
+[Install]
+WantedBy=multi-user.target
Copied: subversion/repos/staging-x86_64/svnserve.tmpfiles (from rev 473314,
subversion/trunk/svnserve.tmpfiles)
===================================================================
--- staging-x86_64/svnserve.tmpfiles (rev 0)
+++ staging-x86_64/svnserve.tmpfiles 2023-04-08 13:05:34 UTC (rev 473315)
@@ -0,0 +1 @@
+D /run/svnserve 0700 root root -
