Date: Friday, December 21, 2012 @ 09:57:14 Author: stephane Revision: 173700
upgpkg: subversion 1.7.8-1 upstream update; add serf dependency; do not install static libs; Fix kwallet crash (FS#33081) Added: subversion/trunk/subversion-kwallet.patch Modified: subversion/trunk/PKGBUILD Deleted: subversion/trunk/subversion-1.7.6-kwallet-gcc47.patch --------------------------------------+ PKGBUILD | 24 +++++++------- subversion-1.7.6-kwallet-gcc47.patch | 56 --------------------------------- subversion-kwallet.patch | 22 ++++++++++++ 3 files changed, 35 insertions(+), 67 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-12-21 13:21:14 UTC (rev 173699) +++ PKGBUILD 2012-12-21 14:57:14 UTC (rev 173700) @@ -4,12 +4,12 @@ # Contributor: Jason Chu <[email protected]> pkgname=subversion -pkgver=1.7.7 -pkgrel=2 +pkgver=1.7.8 +pkgrel=1 pkgdesc="A Modern Concurrent Version Control System" arch=('i686' 'x86_64') license=('APACHE') -depends=('neon' 'apr-util' 'sqlite' 'file') +depends=('neon' 'apr-util' 'sqlite' 'file' 'serf') optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion' \ 'python2: for some hook scripts' 'java-environment') #'ruby: for some hook scripts') makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'java-runtime' 'java-environment' @@ -25,31 +25,33 @@ svnserve.conf svnserve.tmpfiles svnserve.service - subversion-1.7.6-kwallet-gcc47.patch + subversion-kwallet.patch subversion.rpath.fix.patch) -sha1sums=('c9fc0c5992eda36ba9affd93a15929e25958a951' - '3df83e46277f0f08868236a6b6e6c0f0d7ef9278' +sha1sums=('12c7d8d5414bba74c9777c4d1dae74f152df63c2' + '24f8e82fa131c1a1b924d71046f8d38cb00645a7' '64ba3e6ebafc08ac62f59d788f7a825fdce69573' '73b36c046c09cec2093354911c89e3ba8056af6c' 'ad117bf3b2a838a9a678a93fd8db1a066ad46c41' '00cc36e69077a8c45674ead6dd62a7647b3a3b6d' '9f6790d842cf3e0228b007483a43e39a42724068' - 'aa0d01e606de2ebc5eed9c533d218d37a217c50c' + 'f2aed28a2e34b8631ee9b69175bac1bac59327ce' '3d1e28408a9abb42af2e531adc0d01ce21acfad6') build() { cd "${srcdir}/${pkgname}-${pkgver}" export PYTHON=/usr/bin/python2 - patch -p0 -i ../subversion.rpath.fix.patch + patch -Np0 -i ../subversion.rpath.fix.patch sed -i 's|/usr/bin/env python|/usr/bin/env python2|' tools/hook-scripts/{,mailer/{,tests/}}*.py - patch -Np1 -i ../subversion-1.7.6-kwallet-gcc47.patch + # FS#33081 + patch -Np0 -i ../subversion-kwallet.patch ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \ - --with-zlib=/usr --with-neon=/usr --with-apxs \ + --with-zlib=/usr --with-neon=/usr --with-serf=/usr --with-apxs \ --with-sqlite=/usr --with-berkeley-db=:/usr/include/:/usr/lib:db-5.3 \ - --enable-javahl --with-gnome-keyring --with-kwallet + --enable-javahl --with-gnome-keyring --with-kwallet \ + --disable-static make external-all make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all Deleted: subversion-1.7.6-kwallet-gcc47.patch =================================================================== --- subversion-1.7.6-kwallet-gcc47.patch 2012-12-21 13:21:14 UTC (rev 173699) +++ subversion-1.7.6-kwallet-gcc47.patch 2012-12-21 14:57:14 UTC (rev 173700) @@ -1,56 +0,0 @@ -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)), Added: subversion-kwallet.patch =================================================================== --- subversion-kwallet.patch (rev 0) +++ subversion-kwallet.patch 2012-12-21 14:57:14 UTC (rev 173700) @@ -0,0 +1,22 @@ +Index: subversion/libsvn_auth_kwallet/kwallet.cpp +=================================================================== +--- subversion/libsvn_auth_kwallet/kwallet.cpp (revision 1421011) ++++ subversion/libsvn_auth_kwallet/kwallet.cpp (working copy) +@@ -253,7 +253,7 @@ kwallet_password_get(svn_boolean_t *done, + } + } + +- apr_pool_cleanup_register(pool, parameters, kwallet_terminate, NULL); ++ apr_pool_cleanup_register(pool, parameters, kwallet_terminate, apr_pool_cleanup_null); + + return SVN_NO_ERROR; + } +@@ -327,7 +327,7 @@ kwallet_password_set(svn_boolean_t *done, + } + } + +- apr_pool_cleanup_register(pool, parameters, kwallet_terminate, NULL); ++ apr_pool_cleanup_register(pool, parameters, kwallet_terminate, apr_pool_cleanup_null); + + return SVN_NO_ERROR; + } \ No newline at end of file
