- possible fix/workaround for 810861

This commit is contained in:
Joe Orton 2012-04-17 15:46:36 +01:00
parent bc0273b5f5
commit 0caf5ab92a
2 changed files with 18 additions and 0 deletions

View File

@ -0,0 +1,16 @@
Possible fix/workaround for dubious pointer derefs in #810861.
--- subversion-1.7.4/subversion/libsvn_auth_kwallet/kwallet.cpp.kwallet
+++ subversion-1.7.4/subversion/libsvn_auth_kwallet/kwallet.cpp
@@ -175,6 +175,10 @@ kwallet_terminate(void *data)
"kwallet-initialized",
APR_HASH_KEY_STRING,
NULL);
+ apr_hash_set(parameters,
+ "kwallet-wallet",
+ APR_HASH_KEY_STRING,
+ NULL);
}
return APR_SUCCESS;
}

View File

@ -35,6 +35,7 @@ Patch3: subversion-1.7.0-kwallet.patch
Patch4: subversion-1.7.2-ruby19.patch
Patch5: subversion-1.7.4-hashorder.patch
Patch6: subversion-1.7.4-httpd24.patch
Patch7: subversion-1.7.4-kwallet2.patch
BuildRequires: autoconf, libtool, python, python-devel, texinfo, which
BuildRequires: db4-devel >= 4.1.25, swig >= 1.3.24, gettext
BuildRequires: apr-devel >= 1.3.0, apr-util-devel >= 1.3.0
@ -173,6 +174,7 @@ This package includes supplementary tools for use with Subversion.
%patch4 -p1 -b .ruby
%patch5 -p1 -b .hashorder
%patch6 -p1 -b .httpd24
%patch7 -p1 -b .kwallet2
%build
# Regenerate the buildsystem, so that: