From 3d8f4f0b5fa0c04119602d8080317f43c806c77d Mon Sep 17 00:00:00 2001
From: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date: Mon, 17 Aug 2015 17:45:36 +0200
Subject: [PATCH] pysvn: fix issue 197 - callback_ssl_server_trust_prompt fails
to temporarily accept a certificate.
---
component/pysvn-python/buildout.cfg | 4 +++-
component/pysvn-python/pysvn-issue-179.patch | 15 +++++++++++++++
stack/erp5/buildout.cfg | 2 +-
3 files changed, 19 insertions(+), 2 deletions(-)
create mode 100644 component/pysvn-python/pysvn-issue-179.patch
diff --git a/component/pysvn-python/buildout.cfg b/component/pysvn-python/buildout.cfg
index d2c7abf2e..0f985fb7d 100644
--- a/component/pysvn-python/buildout.cfg
+++ b/component/pysvn-python/buildout.cfg
@@ -11,7 +11,9 @@ recipe = zc.recipe.egg:custom
egg =
pysvn
find-links = http://pysvn.barrys-emacs.org/source_kits/pysvn-1.7.10.tar.gz
-patches = ${:_profile_base_location_}/pysvn-1.7.10-inc_lib_dir.patch#02d00b58d537242aa5bb5c9202dedbf1
+patches =
+ ${:_profile_base_location_}/pysvn-1.7.10-inc_lib_dir.patch#02d00b58d537242aa5bb5c9202dedbf1
+ ${:_profile_base_location_}/pysvn-issue-179.patch#bd3f9629f95f0f749c5a5e93c797ee2b
patch-options = -p1
include-dirs =
${subversion:location}/include/subversion-1
diff --git a/component/pysvn-python/pysvn-issue-179.patch b/component/pysvn-python/pysvn-issue-179.patch
new file mode 100644
index 000000000..90bf085b5
--- /dev/null
+++ b/component/pysvn-python/pysvn-issue-179.patch
@@ -0,0 +1,15 @@
+http://pysvn.tigris.org/ds/viewMessage.do?dsForumId=1334&dsMessageId=3094617
+
+diff -ur pysvn-1.7.10.orig/Source/pysvn_svnenv.cpp pysvn-1.7.10/Source/pysvn_svnenv.cpp
+--- pysvn-1.7.10.orig/Source/pysvn_svnenv.cpp 2010-11-20 13:02:37.000000000 +0100
++++ pysvn-1.7.10/Source/pysvn_svnenv.cpp 2015-08-17 17:39:50.491209720 +0200
+@@ -292,8 +292,8 @@
+ if( accept_permanently )
+ {
+ new_cred->may_save = 1;
+- new_cred->accepted_failures = accepted_failures;
+ }
++ new_cred->accepted_failures = accepted_failures;
+
+ *cred = new_cred;
+
diff --git a/stack/erp5/buildout.cfg b/stack/erp5/buildout.cfg
index cd81f6f6d..4bc52f4a7 100644
--- a/stack/erp5/buildout.cfg
+++ b/stack/erp5/buildout.cfg
@@ -566,7 +566,7 @@ scripts =
# patched eggs
Acquisition = 2.13.8+SlapOSPatched001
Products.DCWorkflow = 2.2.4+SlapOSPatched001
-pysvn = 1.7.10+SlapOSPatched001
+pysvn = 1.7.10+SlapOSPatched002
# specify dev version to be sure that an old released version is not used
cloudooo = 1.2.5-dev
--
2.30.9