From 5c77eeb7055d32acfde8458ba96a83ffe7c5e9f5 Mon Sep 17 00:00:00 2001
From: Richard Lescak <rlescak@redhat.com>
Date: Wed, 5 Oct 2022 17:44:43 +0200
Subject: [PATCH] fix segfault in Python swig test (#2128024)

---
 ...itionals-by-SWIG-version-and-by-Pyth.patch | 64 +++++++++++++++++++
 subversion.spec                               |  7 +-
 2 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 subversion-1.14.2-swig-py-Fix-conditionals-by-SWIG-version-and-by-Pyth.patch

diff --git a/subversion-1.14.2-swig-py-Fix-conditionals-by-SWIG-version-and-by-Pyth.patch b/subversion-1.14.2-swig-py-Fix-conditionals-by-SWIG-version-and-by-Pyth.patch
new file mode 100644
index 0000000..3478f2c
--- /dev/null
+++ b/subversion-1.14.2-swig-py-Fix-conditionals-by-SWIG-version-and-by-Pyth.patch
@@ -0,0 +1,64 @@
+From 8ff4cfd06ce554e9df31a088c9d09f45278c6de4 Mon Sep 17 00:00:00 2001
+From: Yasuhito Futatsuki <futatuki@apache.org>
+Date: Tue, 20 Sep 2022 12:57:06 +0000
+Subject: [PATCH] swig-py: Fix conditionals by SWIG version and by Python
+version for proxy code.
+
+We are using different code for proxy object, by Python version and by SWIG
+version.  The distinguish between Python 2 and Python 3 was done by SWIG
+macro "SWIGPYTHON_PY3".  However, the macro was dropped since SWIG commit
+a343b7e[1], between SWIG 4.0.2 release and upcoming SWIG 4.1.0 release.
+
+As we already dropped support for the combination of SWIG >= 4.0 and Python 2,
+we should detect Python 2 only in SWIG < 4.0 case. So we can rely on the macro
+only in the case.
+
+* subversion/bindings/swig/include/proxy.swg ():
+Reorder the conditionals distinguish SWIG versions and Python versions,
+as described above.
+
+Found by: Jitka Plesnikova (jplesnik {_AT_} redhat.com)
+
+Suggested by: Julien Schueller (schueller {_AT_} phimeca.com) [2]
+
+[1] https://github.com/swig/swig/commit/a343b7e254567a64761bc1be7dc55b7b7424ec52
+[2] https://github.com/swig/swig/issues/2373#issuecomment-1250997124
+
+
+git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1904167 13f79535-47bb-0310-9956-ffa450edef68
+---
+ subversion/bindings/swig/include/proxy.swg | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/subversion/bindings/swig/include/proxy.swg b/subversion/bindings/swig/include/proxy.swg
+index ac67d434ca..7d2d0dd033 100644
+--- a/subversion/bindings/swig/include/proxy.swg
++++ b/subversion/bindings/swig/include/proxy.swg
+@@ -66,7 +66,6 @@
+         fn()
+ 
+ %}
+-#if defined(SWIGPYTHON_PY3)
+ #if SWIG_VERSION >= 0x040000
+ %pythoncode %{
+   # -classic and -modern options have been dropped and this variable
+@@ -76,7 +75,7 @@
+   _set_instance_attr = _swig_setattr_nondynamic_instance_variable(object.__setattr__)
+ 
+ %}
+-#else
++#elif defined(SWIGPYTHON_PY3)
+ %pythoncode %{
+   # SWIG classes generated with -modern do not define this variable
+   try:
+@@ -90,7 +89,6 @@
+   _set_instance_attr = _swig_setattr_nondynamic_method(object.__setattr__)
+ 
+ %}
+-#endif
+ #else
+ %pythoncode %{
+   # SWIG classes generated with -classic do not define this variable,
+-- 
+2.37.3
+
diff --git a/subversion.spec b/subversion.spec
index 7b4c5ed..bf47a92 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -59,7 +59,7 @@
 Summary: A Modern Concurrent Version Control System
 Name: subversion
 Version: 1.14.2
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: ASL 2.0
 URL: https://subversion.apache.org/
 Source0: https://downloads.apache.org/subversion/subversion-%{version}.tar.bz2
@@ -77,6 +77,7 @@ Patch4: subversion-1.8.0-rubybind.patch
 Patch5: subversion-1.8.5-swigplWall.patch
 Patch6: subversion-1.14.1-testnomagic.patch
 Patch8: subversion-1.14.1-python-3.11-build.patch
+Patch9: subversion-1.14.2-swig-py-Fix-conditionals-by-SWIG-version-and-by-Pyth.patch
 
 BuildRequires: make
 BuildRequires: autoconf, libtool, texinfo, which, gcc, gcc-c++
@@ -241,6 +242,7 @@ This package includes supplementary tools for use with Subversion.
 %patch5 -p1 -b .swigplWall
 %patch6 -p1 -b .testnomagic
 %patch8 -p1 -b .pythonbuild
+%patch9 -p1 -b .swigfix
 
 :
 : === Building:
@@ -581,6 +583,9 @@ make check-javahl
 %endif
 
 %changelog
+* Wed Oct 05 2022 Richard Lescak <rlescak@redhat.com> - 1.14.2-8
+- fix segfault in Python swig test (#2128024)
+
 * Fri Jul 29 2022 Joe Orton <jorton@redhat.com> - 1.14.2-7
 - improve library versioning so filenames are unique across releases