diff --git a/pygit2-Upgrade_to_libgit2_v1_8_1-2.patch b/pygit2-Upgrade_to_libgit2_v1_8_1-2.patch new file mode 100644 index 0000000..ce47afd --- /dev/null +++ b/pygit2-Upgrade_to_libgit2_v1_8_1-2.patch @@ -0,0 +1,23 @@ +From dabd40c54fa3a086a5b1b1dd0f2fb86a689eef69 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=2E=20David=20Ib=C3=A1=C3=B1ez?= +Date: Fri, 17 May 2024 09:53:05 +0200 +Subject: [PATCH] Update to libgit2 1.8.1 + +--- + pygit2/decl/remote.h | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/pygit2/decl/remote.h b/pygit2/decl/remote.h +index 6a4ee90b..64b96442 100644 +--- a/pygit2/decl/remote.h ++++ b/pygit2/decl/remote.h +@@ -81,8 +81,7 @@ typedef struct { + int version; + git_remote_callbacks callbacks; + git_fetch_prune_t prune; +- unsigned int update_fetchhead : 1, +- report_unchanged : 1; ++ unsigned int update_fetchhead; + git_remote_autotag_option_t download_tags; + git_proxy_options proxy_opts; + int depth; diff --git a/pygit2-Upgrade_to_libgit2_v1_8_1.patch b/pygit2-Upgrade_to_libgit2_v1_8_1.patch new file mode 100644 index 0000000..af0a792 --- /dev/null +++ b/pygit2-Upgrade_to_libgit2_v1_8_1.patch @@ -0,0 +1,46 @@ +From 31ea782852a318214149d24b73fc0e6ebe4210c6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=2E=20David=20Ib=C3=A1=C3=B1ez?= +Date: Fri, 17 May 2024 09:29:14 +0200 +Subject: [PATCH] Update to libgit2 1.8.1 + +--- + .github/workflows/tests.yml | 8 ++++---- + Makefile | 2 +- + appveyor.yml | 2 +- + build.sh | 8 ++++---- + docs/install.rst | 14 +++++++------- + pyproject.toml | 4 ++-- + 6 files changed, 19 insertions(+), 19 deletions(-) + +--- a/Makefile ++++ b/Makefile +@@ -1,7 +1,7 @@ + .PHONY: build html + + build: +- OPENSSL_VERSION=3.1.5 LIBSSH2_VERSION=1.11.0 LIBGIT2_VERSION=1.8.0 sh build.sh ++ OPENSSL_VERSION=3.1.5 LIBSSH2_VERSION=1.11.0 LIBGIT2_VERSION=1.8.1 sh build.sh + + html: build + make -C docs html +--- a/build.sh ++++ b/build.sh +@@ -22,14 +22,14 @@ + # + # sh build.sh + # +-# Build libgit2 1.8.0 (will use libssh2 if available), then build pygit2 ++# Build libgit2 1.8.1 (will use libssh2 if available), then build pygit2 + # inplace: + # +-# LIBGIT2_VERSION=1.8.0 sh build.sh ++# LIBGIT2_VERSION=1.8.1 sh build.sh + # +-# Build libssh2 1.11.0 and libgit2 1.8.0, then build pygit2 inplace: ++# Build libssh2 1.11.0 and libgit2 1.8.1, then build pygit2 inplace: + # +-# LIBSSH2_VERSION=1.11.0 LIBGIT2_VERSION=1.8.0 sh build.sh ++# LIBSSH2_VERSION=1.11.0 LIBGIT2_VERSION=1.8.1 sh build.sh + # + # Build inplace and run the tests: + # diff --git a/python-pygit2.changes b/python-pygit2.changes index 430fc8d..153c9b0 100644 --- a/python-pygit2.changes +++ b/python-pygit2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri May 17 10:57:08 UTC 2024 - Dirk Müller + +- add pygit2-Upgrade_to_libgit2_v1_8_1-2.patch + pygit2-Upgrade_to_libgit2_v1_8_1.patch: support libgit2 1.8.1 + ------------------------------------------------------------------- Thu May 2 10:26:23 UTC 2024 - Michal Suchanek diff --git a/python-pygit2.spec b/python-pygit2.spec index 97ed495..f5289d9 100644 --- a/python-pygit2.spec +++ b/python-pygit2.spec @@ -29,8 +29,12 @@ Source: https://files.pythonhosted.org/packages/source/p/pygit2/pygit2-% Patch0: pygit2-Upgrade_to_libgit2_v1_8_0.patch # PATCH-FIX-UPSTREAM - fixup for the libgit 1.8 support Patch1: Fix-CI.patch +# PATCH-FIX-UPSTREAM +Patch2: pygit2-Upgrade_to_libgit2_v1_8_1.patch +# PATCH-FIX-UPSTREAM +Patch3: pygit2-Upgrade_to_libgit2_v1_8_1-2.patch # PATCH-FIX-UPSTREAM - happens to eliminate bogus pointer casts -Patch2: Fix-leaks-in-fetch_refspecs-and-push_refspecs.patch +Patch4: Fix-leaks-in-fetch_refspecs-and-push_refspecs.patch BuildRequires: %{python_module cached-property} BuildRequires: %{python_module cffi >= 1.4.0} BuildRequires: %{python_module devel} @@ -54,6 +58,8 @@ Bindings for libgit2, a linkable C library for the Git version-control system. %prep %autosetup -p1 -n pygit2-%{version} %if %{?pkg_vcmp:%pkg_vcmp libgit2-devel < 1.8}%{!?pkg_vcmp:1} +%patch -P 3 -p1 -R +%patch -P 2 -p1 -R %patch -P 1 -p1 -R %patch -P 0 -p1 -R %endif