public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
To: git-commits@fedoraproject.org
Subject: [rpms/pcs] eln: update and patch pycurl
Date: Fri, 20 Nov 2026 18:17:44 GMT	[thread overview]
Message-ID: <179519866476.1.14994956707149557244.rpms-pcs-01e95ec69e5f@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/pcs
            Branch : eln
            Commit : 01e95ec69e5f374b21e8a488fe68d3e6c8b412e0
            Author : Michal Pospíšil <mpospisi@redhat.com>
            Date   : 2026-11-18T16:19:54-05:00
            Stats  : +46/-5 in 4 file(s)
            URL    : https://src.fedoraproject.org/rpms/pcs/c/01e95ec69e5f374b21e8a488fe68d3e6c8b412e0?branch=eln

            Log:
            update and patch pycurl

New pycurl doesn't build with old setuptools due to pyproject.toml
metadata that are incompatible with older setuptools. We introduce a
patch here that removes the conflicting metadata from pyproject.toml to
allow building with setuptools distributed in RHEL 10.

---
diff --git a/.gitignore b/.gitignore
index a1b067c..3358aea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -103,3 +103,4 @@
 /pcs-0.12.3.tar.gz
 /pcs-web-ui-0.1.25.tar.gz
 /pcs-web-ui-node-modules-0.1.25.tar.xz
+/pycurl-7.47.0.tar.gz

diff --git a/pcs.spec b/pcs.spec
index bf00898..27821c2 100644
--- a/pcs.spec
+++ b/pcs.spec
@@ -48,7 +48,8 @@ ExclusiveArch: x86_64 s390x ppc64le aarch64 riscv64
 %global dacite_version  1.9.2
 %global pyagentx_version   0.4.pcs.2
 
-%global pycurl_version  7.45.6
+%global pycurl_version  7.47.0
+%global pycurl_src_name pycurl-%{pycurl_version}
 # During its initialization, PycURL checks that the actual libcurl version
 # is not lower than the one used when PycURL was built.
 # Yes, that should be handled by library versioning (which would then get
@@ -101,7 +102,7 @@ Source0: %{url}/archive/%{?v_prefix}%{version_or_commit}/%{pcs_source_name}.tar.
 
 Source21: https://github.com/konradhalas/dacite/archive/v%{dacite_version}/dacite-%{dacite_version}.tar.gz
 Source22: https://github.com/ondrejmular/pyagentx/archive/v%{pyagentx_version}/pyagentx-%{pyagentx_version}.tar.gz
-Source23: https://pypi.python.org/packages/source/p/pycurl/pycurl-%{pycurl_version}.tar.gz
+Source23: https://pypi.python.org/packages/source/p/pycurl/%{pycurl_src_name}.tar.gz
 
 Source61: https://rubygems.org/downloads/backports-%{version_rubygem_backports}.gem
 Source62: https://rubygems.org/downloads/base64-%{version_rubygem_base64}.gem
@@ -132,6 +133,9 @@ Patch3: RHEL-214140-01-fix-pcs-stonith-update-scsi-devices-command.patch
 # ui patches: >200
 # Patch201: name-web-ui.patch
 
+# pycurl patches: >400
+# Patch401: pycurl-really-descriptive-name.patch
+Patch401: pycurl-license.patch
 
 # git for patches
 BuildRequires: git-core
@@ -363,9 +367,18 @@ update_times_patch(){
 # 1. unpack sources (-b 0)
 # 2. then cd into sources tree (the setup macro itself)
 # 3. then unpack node_modules into sources tree (-a 1).
-%autosetup -T -b 100 -a 101 -N -n %{ui_src_name}
-%autopatch -p1 -m 201
+# patch pycurl sources
+%autosetup -T -b 23 -n %{pycurl_src_name} -N
+%autopatch -p1 -m 401
+# update_times_patch %%{PATCH401}
+update_times_patch %{PATCH401}
+
+# repackaging patched pycurl and placing it into sources next to the untouched
+# original - it cannot be replaced, because rpmbuild -bp would fail on 2nd+ try
+tar -c -f %{_sourcedir}/%{pycurl_src_name}-patched.tar.gz -z ../%{pycurl_src_name}
 
+%autosetup -T -b 100 -a 101 -N -n %{ui_src_name}
+%autopatch -p1 -m 201 -M 400
 # update_times_patch %%{PATCH201}
 
 # patch pcs sources
@@ -412,7 +425,8 @@ cp -f %SOURCE76 %{rubygem_cache_dir}
 mkdir -p %{pcs_bundled_dir}/src
 cp -f %SOURCE21 rpm/
 cp -f %SOURCE22 rpm/
-cp -f %SOURCE23 rpm/
+# using patched pycurl instead of the original
+cp -f %{_sourcedir}/%{pycurl_src_name}-patched.tar.gz rpm/
 
 
 

diff --git a/pycurl-license.patch b/pycurl-license.patch
new file mode 100644
index 0000000..8d74910
--- /dev/null
+++ b/pycurl-license.patch
@@ -0,0 +1,25 @@
+From dce9fd025ebeb09465759a36d78c2b3ff2b956b2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michal=20Posp=C3=AD=C5=A1il?= <mpospisi@redhat.com>
+Date: Thu, 3 Sep 2026 20:33:17 +0200
+Subject: [PATCH] remove fields incompatible with setuptools<77
+
+---
+ pyproject.toml | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/pyproject.toml b/pyproject.toml
+index dbcdaa2f..83831343 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -7,8 +7,6 @@ name = "pycurl"
+ description = "PycURL -- A Python Interface To The cURL library"
+ readme = "README.rst"
+ requires-python = ">=3.10"
+-license = "LGPL-2.1-only OR MIT"
+-license-files = ["COPYING-LGPL", "COPYING-MIT"]
+ keywords = ["curl", "libcurl", "urllib", "wget", "download", "file transfer", "http", "www"]
+ authors = [
+     { name = "Kjetil Jacobsen",         email = "kjetilja@gmail.com" },
+-- 
+2.56.0
+

diff --git a/sources b/sources
index db13482..515ddd0 100644
--- a/sources
+++ b/sources
@@ -19,3 +19,4 @@ SHA512 (tilt-2.7.0.gem) = 713f42fa04e4083aa1be26b149c57ac6af7889014214c65584abc1
 SHA512 (pcs-web-ui-0.1.25.tar.gz) = 8380e17743b47099e1fa941d2099a162c10bbc9cbb4103d21c340f0f0385d26550aced5e14dd180deacb4102678ea5f5a5e990e3156b6c087b2ff4aeaed5f41b
 SHA512 (pcs-web-ui-node-modules-0.1.25.tar.xz) = 56003da4a14db540ebc939bbcd13ac44a9b6a75d064f0ba6267368a4cbebc58382fc008fd1ce85624f97c01f7020dafbbed3333c009ce347f0ee919a41d8a6c4
 SHA512 (pcs-0.12.3.tar.gz) = aadd0c76c87c57e6af95871a12809c1bd224c1e32b0d5931a78c5c5daf3c43618392238e73048f2b4c18e648bd5d200eb9072ae561c25b78b6a709c87736fa57
+SHA512 (pycurl-7.47.0.tar.gz) = 4dbd60c60fe6cab898a1477f144d3e7e6618939be62cbd29d3c3d675c846c0b44d518364d0b63a0c3d3255db7a31b9cb86201ccafe4b39dae23a52902be68bca

                 reply	other threads:[~2026-11-20 18:17 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=179519866476.1.14994956707149557244.rpms-pcs-01e95ec69e5f@fedoraproject.org \
    --to=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox