Commit 621c4f18 authored by Samir's avatar Samir
Browse files

update subversion

parent 63165532
......@@ -4,7 +4,7 @@
# maintainer abveritas@chakra-project.org
pkgname=subversion
pkgver=1.7.5
pkgver=1.7.6
pkgrel=1
pkgdesc="A Modern Concurrent Version Control System"
arch=('i686' 'x86_64')
......@@ -19,12 +19,18 @@ provides=('svn')
options=('!makeflags' '!libtool')
source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2{,.asc}
svnserve svn svnserve.conf
svnserve.tmpfiles
svnserve.service
subversion-1.7.6-kwallet-gcc47.patch
subversion.rpath.fix.patch)
md5sums=('f6353b9b581081cdf97299300c9eada3'
'bc45359b2c002f56d4c5e23468d20392'
md5sums=('4baa434db7709bb059b05d02a2547663'
'62b1a7dcfcda6a07c0a9804b2322614d'
'a2b029e8385007ffb99b437b30521c90'
'a0db6dd43af33952739b6ec089852630'
'c459e299192552f61578f3438abf0664'
'bb2857eceafcfac35dde39dcffad2314'
'e8020c7a1d1a0c47091b5fdd034f81c5'
'f02cef1ab91cc5f345ebf3d281288db3'
'6b4340ba9d8845cd8497e013ae01be3f')
build() {
......@@ -35,6 +41,8 @@ build() {
patch -p0 -i ../subversion.rpath.fix.patch
sed -i 's|/usr/bin/env python|/usr/bin/env python2|' tools/hook-scripts/{,mailer/{,tests/}}*.py
patch -p1 -i ../subversion-1.7.6-kwallet-gcc47.patch
# configure
autoreconf
./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \
......@@ -64,12 +72,21 @@ package() {
rm "${pkgdir}"/usr/lib/perl5/vendor_perl/auto/SVN/_Core/.packlist
rm -r "${pkgdir}"/usr/lib/perl5/core_perl
## svnserve
install -D -m 644 "${srcdir}"/svnserve.conf "${pkgdir}"/etc/conf.d/svnserve
# rc.d
install -D -m 755 "${srcdir}"/svnserve "${pkgdir}"/etc/rc.d/svnserve
install -D -m 644 "${srcdir}"/svn "${pkgdir}"/etc/xinetd.d/svn
install -D -m 644 "${srcdir}"/svnserve.conf "${pkgdir}"/etc/conf.d/svnserve
# 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
# bash completion
install -Dm 644 tools/client-side/bash_completion \
"${pkgdir}"/etc/bash_completion.d/subversion
"${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
}
diff -Naur subversion-1.7.5.ori/subversion/libsvn_auth_kwallet/kwallet.cpp subversion-1.7.5/subversion/libsvn_auth_kwallet/kwallet.cpp
--- subversion-1.7.5.ori/subversion/libsvn_auth_kwallet/kwallet.cpp 2010-12-30 15:46:50.000000000 -0500
+++ subversion-1.7.5/subversion/libsvn_auth_kwallet/kwallet.cpp 2012-08-14 19:43:16.694275908 -0400
@@ -60,6 +60,9 @@
/* KWallet simple provider, puts passwords in KWallet */
/*-----------------------------------------------------------------------*/
+static int q_argc = 1;
+static char q_argv0[] = "svn"; // Build non-const char * from string constant
+static char *q_argv[] = { q_argv0 };
static const char *
get_application_name(apr_hash_t *parameters,
@@ -175,6 +178,10 @@
"kwallet-initialized",
APR_HASH_KEY_STRING,
NULL);
+ apr_hash_set(parameters,
+ "kwallet-wallet",
+ APR_HASH_KEY_STRING,
+ NULL);
}
return APR_SUCCESS;
}
@@ -203,12 +210,11 @@
QCoreApplication *app;
if (! qApp)
{
- int argc = 1;
- app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"});
+ int argc = q_argc;
+ app = new QCoreApplication(argc, q_argv);
}
- KCmdLineArgs::init(1,
- (char *[1]) {(char *) "svn"},
+ KCmdLineArgs::init(q_argc, q_argv,
get_application_name(parameters, pool),
"subversion",
ki18n(get_application_name(parameters, pool)),
@@ -273,12 +279,11 @@
QCoreApplication *app;
if (! qApp)
{
- int argc = 1;
- app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"});
+ int argc = q_argc;
+ app = new QCoreApplication(argc, q_argv);
}
- KCmdLineArgs::init(1,
- (char *[1]) {(char *) "svn"},
+ KCmdLineArgs::init(q_argc, q_argv,
get_application_name(parameters, pool),
"subversion",
ki18n(get_application_name(parameters, pool)),
[Unit]
Description=Subversion protocol daemon
After=syslog.target network.target
[Service]
Type=forking
EnvironmentFile=/etc/conf.d/svnserve
ExecStart=/usr/bin/svnserve --daemon --pid-file=/run/svnserve/svnserve.pid $SVNSERVE_ARGS
[Install]
WantedBy=multi-user.target
D /run/svnserve 0700 root root -
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment