[rpms/fence-agents] eln: Bundle protobuf dependency

[rpms/fence-agents] eln: Bundle protobuf dependency

[Yaakov Selkowitz]

            A new commit has been pushed.

            Repo   : rpms/fence-agents
            Branch : eln
            Commit : 72cf460f1e29d4922c62803fe1f32d3ddece2a34
            Author : Yaakov Selkowitz <yselkowi@redhat.com>
            Date   : 2026-07-15T16:22:55-04:00
            Stats  : +26/-2 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/fence-agents/c/72cf460f1e29d4922c62803fe1f32d3ddece2a34?branch=eln

            Log:
            Bundle protobuf dependency

The google support modules require protobuf version 3 specifically, while
the python3-protobuf package in ELN is now on version 6.  The upstream
tarball imports pkg_resources (dropped from setuptools 82) unconditionally
even though it is only used on MacOS, so it has been repacked with a patch
borrowed from our protobuf3 package.

---
diff --git a/fence-agents.spec b/fence-agents.spec
index e46e133..d5e28f0 100644
--- a/fence-agents.spec
+++ b/fence-agents.spec
@@ -85,6 +85,9 @@ Source1415: pyroute2.ndb-0.6.13.tar.gz
 Source1416: pyroute2.nftables-0.6.13.tar.gz
 Source1417: pyroute2.nslink-0.6.13.tar.gz
 Source1418: PySocks-1.7.1.tar.gz
+# PyPI archive repacked with the following patch applied
+Source1500: protobuf-3.20.3.tar.gz
+Source1501: protobuf-3.20.3-pkg_resources.patch
 ## NEEEDED FOR GOOGLE AUTH
 ## INFO: pip is looking at multiple versions of google-auth to determine which version is compatible with other requirements. This could take a while.
 ## ERROR: Could not find a version that satisfies the requirement rsa<5,>=3.1.4 (from google-auth) (from versions: none)
@@ -204,7 +207,7 @@ BuildRequires: python3-setuptools_scm
 BuildRequires: golang go-rpm-macros
 %endif
 # dependencies for HA support subpackages
-BuildRequires: python3-pexpect python3-ptyprocess python3-colorama python3-docutils python3-pyyaml python3-jmespath python3-pyasn1 python3-urllib3 python3-cryptography python3-cffi python3-requests python3-requests-oauthlib python3-typing-extensions python3-packaging python3-charset-normalizer python3-idna python3-oauthlib python3-pycparser python3-protobuf3 python3-pyparsing
+BuildRequires: python3-pexpect python3-ptyprocess python3-colorama python3-docutils python3-pyyaml python3-jmespath python3-pyasn1 python3-urllib3 python3-cryptography python3-cffi python3-requests python3-requests-oauthlib python3-typing-extensions python3-packaging python3-charset-normalizer python3-idna python3-oauthlib python3-pycparser python3-pyparsing
 
 %if 0%{?fedora} || 0%{?centos} || 0%{?rhel}
 BuildRequires: openwsman-python3
@@ -430,7 +433,7 @@ This package contains support files including the Python fencing library.
 %package -n ha-cloud-support
 License: GPL-2.0-or-later AND LGPL-2.0-or-later AND Apache-2.0 AND MIT AND BSD-2-Clause AND BSD-3-Clause AND MPL-2.0 AND LGPL-2.1-or-later AND ISC
 Summary: Support libraries for HA Cloud agents
-Requires: python3-colorama python3-docutils python3-pyyaml python3-jmespath python3-pyasn1 python3-urllib3 python3-cryptography python3-cffi python3-requests python3-requests-oauthlib python3-typing-extensions python3-packaging python3-charset-normalizer python3-idna python3-oauthlib python3-pycparser python3-protobuf3 python3-pyparsing
+Requires: python3-colorama python3-docutils python3-pyyaml python3-jmespath python3-pyasn1 python3-urllib3 python3-cryptography python3-cffi python3-requests python3-requests-oauthlib python3-typing-extensions python3-packaging python3-charset-normalizer python3-idna python3-oauthlib python3-pycparser python3-pyparsing
 Requires: awscli2
 # common
 Provides: bundled(python3-dateutil) = 2.9.0.post0
@@ -482,6 +485,7 @@ Provides: bundled(python-pyroute2-nftables) = 0.6.13
 Provides: bundled(python-pyroute2-nslink) = 0.6.13
 Provides: bundled(python-PySocks) = 1.7.1
 Provides: bundled(python3-rsa) = 4.9
+Provides: bundled(python3-protobuf) = 3.20.3
 %description -n ha-cloud-support
 Support libraries for Fence Agents.
 %files -n ha-cloud-support

diff --git a/protobuf-3.20.3-pkg_resources.patch b/protobuf-3.20.3-pkg_resources.patch
new file mode 100644
index 0000000..99cb504
--- /dev/null
+++ b/protobuf-3.20.3-pkg_resources.patch
@@ -0,0 +1,19 @@
+diff -up a/python/setup.py b/python/setup.py
+--- a/python/setup.py	2022-09-29 13:38:53.000000000 -0400
++++ b/python/setup.py	2026-05-20 12:27:08.147369533 -0400
+@@ -8,7 +8,6 @@ from distutils import util
+ import fnmatch
+ import glob
+ import os
+-import pkg_resources
+ import re
+ import subprocess
+ import sys
+@@ -266,6 +265,7 @@ if __name__ == '__main__':
+     # C++ projects must now migrate to libc++ and are recommended to set a
+     # deployment target of macOS 10.9 or later, or iOS 7 or later.
+     if sys.platform == 'darwin':
++      import pkg_resources
+       mac_target = str(sysconfig.get_config_var('MACOSX_DEPLOYMENT_TARGET'))
+       if mac_target and (pkg_resources.parse_version(mac_target) <
+                          pkg_resources.parse_version('10.9.0')):

diff --git a/sources b/sources
index a415b39..5c5612d 100644
--- a/sources
+++ b/sources
@@ -51,6 +51,7 @@ SHA512 (pyroute2.ndb-0.6.13.tar.gz) = 17a992483c34d6bc0ae12dc1f077f52ed0de0dc37d
 SHA512 (pyroute2.nftables-0.6.13.tar.gz) = bb9426bda897ebda74fdccf59782b9d8dc665ba7f07aaa92fd80e039a9098f581256b66318431113a7b3da19b2dba279492661b97a67a724e41b41dd89e20bfe
 SHA512 (pyroute2.nslink-0.6.13.tar.gz) = 16b3c8ea6d5319520a4d777f5ad76c265ea38c0b8ecc98922ddc6d898d05cfc931acd6b4a2884b1803b318e17744bf93961312ac60ea227ff2d01245ceedf935
 SHA512 (PySocks-1.7.1.tar.gz) = cef4a5ce8c67fb485644696a23bf68a721db47f3211212de2d4431eaf9ebd26077dd5a06f6dfa7fde2dcb9d7c1ed551facd014e999929cb4d7b504972c464016
+SHA512 (protobuf-3.20.3.tar.gz) = 921d56e4e7ff390f06e1f3d053bffd07e56b54985ae457aea667d8345d0aebffd70d72b8cfaad236b337bd91d18773f9b9a44144f513550e6dc95cc8969aa450
 SHA512 (rsa-4.9.tar.gz) = 85f359cc448a42f267f425fcf761597eeeab942523de49284b01d6ea2bcca8bddf0fac26926b487ae91c15889a7c4897a33ee00de859f28fe9cca19ef98c3f19
 SHA512 (poetry_core-1.9.0.tar.gz) = 51812a673cd430511aa33fc84a646f0f73a3dfc334848f570f598ddefc83b1d29ed2061cc0109e59dd9f15ad4863920a165dfec86a27ecd6aa7fcecd425f9c7f
 SHA512 (openshift-0.13.2.tar.gz) = ff1f2a72b154c59a9e93381fbce51029b9c64fa11ad3a9f39281a55167d8e97344425419e3139e7369e31495c17ae69ba2a7cc47b86ad0a81dc21980edeff366