diff --git a/CVE-2024-6345.patch b/CVE-2024-6345.patch
new file mode 100644
index 0000000..d3f5074
--- /dev/null
+++ b/CVE-2024-6345.patch
@@ -0,0 +1,116 @@
+From 472528deea4063f20c5d9525f0faf64ae0cd0a90 Mon Sep 17 00:00:00 2001
+From: Lumir Balhar <lbalhar@redhat.com>
+Date: Wed, 24 Jul 2024 14:26:09 +0200
+Subject: [PATCH] CVE-2024-6345
+
+---
+ setuptools/package_index.py           | 21 +++++----------------
+ setuptools/tests/test_packageindex.py | 20 ++++++++++----------
+ 2 files changed, 15 insertions(+), 26 deletions(-)
+
+diff --git a/setuptools/package_index.py b/setuptools/package_index.py
+index 7095585..1368bde 100644
+--- a/setuptools/package_index.py
++++ b/setuptools/package_index.py
+@@ -1,5 +1,6 @@
+ """PyPI and direct package downloading."""
+ 
++import subprocess
+ import sys
+ import os
+ import re
+@@ -881,17 +882,11 @@ class PackageIndex(Environment):
+         url, rev = self._vcs_split_rev_from_url(url, pop_prefix=True)
+ 
+         self.info("Doing git clone from %s to %s", url, filename)
+-        os.system("git clone --quiet %s %s" % (url, filename))
++        subprocess.check_call(["git", "clone", "--quiet", url, filename])
+ 
+         if rev is not None:
+             self.info("Checking out %s", rev)
+-            os.system(
+-                "git -C %s checkout --quiet %s"
+-                % (
+-                    filename,
+-                    rev,
+-                )
+-            )
++            subprocess.check_call(["git", "-C", filename, "checkout", "--quiet", rev])
+ 
+         return filename
+ 
+@@ -900,17 +895,11 @@ class PackageIndex(Environment):
+         url, rev = self._vcs_split_rev_from_url(url, pop_prefix=True)
+ 
+         self.info("Doing hg clone from %s to %s", url, filename)
+-        os.system("hg clone --quiet %s %s" % (url, filename))
++        subprocess.check_call(["hg", "clone", "--quiet", url, filename])
+ 
+         if rev is not None:
+             self.info("Updating to %s", rev)
+-            os.system(
+-                "hg --cwd %s up -C -r %s -q"
+-                % (
+-                    filename,
+-                    rev,
+-                )
+-            )
++            subprocess.check_call(["hg", "--cwd", filename, "up", "-C", "-r", rev, "-q"])
+ 
+         return filename
+ 
+diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
+index 0287063..c136e8d 100644
+--- a/setuptools/tests/test_packageindex.py
++++ b/setuptools/tests/test_packageindex.py
+@@ -190,37 +190,37 @@ class TestPackageIndex:
+         url = 'git+https://github.example/group/project@master#egg=foo'
+         index = setuptools.package_index.PackageIndex()
+ 
+-        with mock.patch("os.system") as os_system_mock:
++        with mock.patch("subprocess.check_call") as subprocess_check_call_mock:
+             result = index.download(url, str(tmpdir))
+ 
+-        os_system_mock.assert_called()
++        subprocess_check_call_mock.assert_called()
+ 
+         expected_dir = str(tmpdir / 'project@master')
+         expected = (
+             'git clone --quiet ' 'https://github.example/group/project {expected_dir}'
+-        ).format(**locals())
+-        first_call_args = os_system_mock.call_args_list[0][0]
++        ).format(**locals()).split()
++        first_call_args = subprocess_check_call_mock.call_args_list[0][0]
+         assert first_call_args == (expected,)
+ 
+         tmpl = 'git -C {expected_dir} checkout --quiet master'
+-        expected = tmpl.format(**locals())
+-        assert os_system_mock.call_args_list[1][0] == (expected,)
++        expected = tmpl.format(**locals()).split()
++        assert subprocess_check_call_mock.call_args_list[1][0] == (expected,)
+         assert result == expected_dir
+ 
+     def test_download_git_no_rev(self, tmpdir):
+         url = 'git+https://github.example/group/project#egg=foo'
+         index = setuptools.package_index.PackageIndex()
+ 
+-        with mock.patch("os.system") as os_system_mock:
++        with mock.patch("subprocess.check_call") as subprocess_check_call_mock:
+             result = index.download(url, str(tmpdir))
+ 
+-        os_system_mock.assert_called()
++        subprocess_check_call_mock.assert_called()
+ 
+         expected_dir = str(tmpdir / 'project')
+         expected = (
+             'git clone --quiet ' 'https://github.example/group/project {expected_dir}'
+-        ).format(**locals())
+-        os_system_mock.assert_called_once_with(expected)
++        ).format(**locals()).split()
++        subprocess_check_call_mock.assert_called_once_with(expected)
+ 
+     def test_download_svn(self, tmpdir):
+         url = 'svn+https://svn.example/project#egg=foo'
+-- 
+2.45.2
+
diff --git a/python-setuptools.spec b/python-setuptools.spec
index 68ae2b8..ba45fa2 100644
--- a/python-setuptools.spec
+++ b/python-setuptools.spec
@@ -45,6 +45,13 @@ Patch:          Remove-optional-or-unpackaged-test-deps.patch
 # adjust it, but only when $RPM_BUILD_ROOT is set
 Patch:          Adjust-the-setup.py-install-deprecation-message.patch
 
+# Security fix for CVE-2024-6345
+# Remote code execution via download functions in the package_index module
+# Tracking bug: https://bugzilla.redhat.com/show_bug.cgi?id=2297771
+# Upstream solution: https://github.com/pypa/setuptools/pull/4332
+# Patch simplified because upstream doesn't support SVN anymore.
+Patch:          CVE-2024-6345.patch
+
 BuildArch:      noarch
 
 BuildRequires:  python%{python3_pkgversion}-devel