- possible fix/workaround for 810861
This commit is contained in:
parent
c9c954ec29
commit
1230952c6a
16
subversion-1.7.4-kwallet2.patch
Normal file
16
subversion-1.7.4-kwallet2.patch
Normal 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;
|
||||||
|
}
|
@ -35,6 +35,7 @@ Patch6: subversion-1.6.11-pie.patch
|
|||||||
Patch8: subversion-1.6.6-kwallet.patch
|
Patch8: subversion-1.6.6-kwallet.patch
|
||||||
Patch9: subversion-1.6.12-disable-client-test.patch
|
Patch9: subversion-1.6.12-disable-client-test.patch
|
||||||
Patch10: subversion-MakeMaker.patch
|
Patch10: subversion-MakeMaker.patch
|
||||||
|
Patch11: subversion-1.7.4-kwallet2.patch
|
||||||
BuildRequires: autoconf, libtool, python, python-devel, texinfo, which
|
BuildRequires: autoconf, libtool, python, python-devel, texinfo, which
|
||||||
BuildRequires: db4-devel >= 4.1.25, swig >= 1.3.24, gettext
|
BuildRequires: db4-devel >= 4.1.25, swig >= 1.3.24, gettext
|
||||||
BuildRequires: apr-devel >= 1.3.0, apr-util-devel >= 1.3.0
|
BuildRequires: apr-devel >= 1.3.0, apr-util-devel >= 1.3.0
|
||||||
@ -182,6 +183,7 @@ cd ../../..
|
|||||||
%patch8 -p1 -b .kwallet
|
%patch8 -p1 -b .kwallet
|
||||||
%patch9 -p1 -b .disable-client-test
|
%patch9 -p1 -b .disable-client-test
|
||||||
%patch10 -p1 -b .eemm
|
%patch10 -p1 -b .eemm
|
||||||
|
%patch11 -p1 -b .kwallet2
|
||||||
|
|
||||||
sed -i -e 's|^XSL="$dir/|XSL="%{_datadir}/svn2cl/|' \
|
sed -i -e 's|^XSL="$dir/|XSL="%{_datadir}/svn2cl/|' \
|
||||||
contrib/client-side/svn2cl/svn2cl.sh
|
contrib/client-side/svn2cl/svn2cl.sh
|
||||||
|
Loading…
Reference in New Issue
Block a user