public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Fabio Valentini <decathorpe@gmail.com>
To: git-commits@fedoraproject.org
Subject: [rpms/rust-libgit2-sys] f43: Update to version 0.18.7; Fixes RHBZ#2506308
Date: Thu, 23 Jul 2026 19:30:57 GMT [thread overview]
Message-ID: <178483505739.1.399837619237837567.rpms-rust-libgit2-sys-e8d90503eac1@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/rust-libgit2-sys
Branch : f43
Commit : e8d90503eac17aa0dc9e9a4c2921d35a55297fd2
Author : Fabio Valentini <decathorpe@gmail.com>
Date : 2026-07-23T15:35:31+02:00
Stats : +81/-37 in 7 file(s)
URL : https://src.fedoraproject.org/rpms/rust-libgit2-sys/c/e8d90503eac17aa0dc9e9a4c2921d35a55297fd2?branch=f43
Log:
Update to version 0.18.7; Fixes RHBZ#2506308
---
diff --git a/.gitignore b/.gitignore
index edc5f39..6ca4233 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,4 @@
/libgit2-sys-0.18.3+1.9.2.crate
/libgit2-sys-0.18.4+1.9.3.crate
/libgit2-sys-0.18.5+1.9.4.crate
+/libgit2-sys-0.18.7+1.9.6.crate
diff --git a/0001-Link-against-system-libgit2-unconditionally.patch b/0001-Link-against-system-libgit2-unconditionally.patch
index 4f3f5cb..64f92cf 100644
--- a/0001-Link-against-system-libgit2-unconditionally.patch
+++ b/0001-Link-against-system-libgit2-unconditionally.patch
@@ -1,14 +1,14 @@
-From d54fc7546d1e8de04d928b19301e977235450d22 Mon Sep 17 00:00:00 2001
+From 9dd41ac61c83d5bd7bc071f2bfdb1658fb1d601a Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Sat, 9 May 2026 15:35:29 +0200
Subject: [PATCH] Link against system libgit2 unconditionally
---
- build.rs | 284 +------------------------------------------------------
- 1 file changed, 1 insertion(+), 283 deletions(-)
+ build.rs | 327 +------------------------------------------------------
+ 1 file changed, 1 insertion(+), 326 deletions(-)
diff --git a/build.rs b/build.rs
-index b45118c..1df1b8d 100644
+index 6ecd018..1442bee 100644
--- a/build.rs
+++ b/build.rs
@@ -1,9 +1,3 @@
@@ -21,7 +21,7 @@ index b45118c..1df1b8d 100644
/// Tries to use system libgit2 and emits necessary build script instructions.
fn try_system_libgit2(
experimental_sha256: bool,
-@@ -82,281 +76,5 @@ fn main() {
+@@ -82,324 +76,5 @@ fn main() {
)"
);
@@ -106,33 +106,36 @@ index b45118c..1df1b8d 100644
- cfg.include("libgit2/deps/xdiff");
- add_c_files(&mut cfg, "libgit2/deps/xdiff");
-
-- // Use the included PCRE regex backend.
-- //
-- // Ideally these defines would be specific to the pcre files (or placed in
-- // a config.h), but since libgit2 already has a config.h used for other
-- // reasons, just define on the command-line for everything. Perhaps there
-- // is some way with cc to have different instructions per-file?
+- // Use the included PCRE2 regex backend.
+- // Keep these settings aligned with libgit2's bundled PCRE2 configuration.
- cfg.define("GIT_REGEX_BUILTIN", "1")
-- .include("libgit2/deps/pcre")
-- .define("HAVE_STDINT_H", Some("1"))
-- .define("HAVE_MEMMOVE", Some("1"))
-- .define("NO_RECURSE", Some("1"))
-- .define("NEWLINE", Some("10"))
-- .define("POSIX_MALLOC_THRESHOLD", Some("10"))
+- .include("libgit2/deps/pcre2")
+- .define("PCRE2_STATIC", None)
+- .define("PCRE2_EXPORT", Some(""))
+- .define("PCRE2_EXP_DECL", Some(""))
+- .define("PCRE2_EXP_DEFN", Some(""))
+- .define("PCRE2_CODE_UNIT_WIDTH", Some("8"))
+- .define("SUPPORT_PCRE2_8", Some("1"))
+- .define("SUPPORT_UNICODE", Some("1"))
- .define("LINK_SIZE", Some("2"))
-- .define("PARENS_NEST_LIMIT", Some("250"))
+- .define("HEAP_LIMIT", Some("20000000"))
- .define("MATCH_LIMIT", Some("10000000"))
-- .define("MATCH_LIMIT_RECURSION", Some("MATCH_LIMIT"))
-- .define("MAX_NAME_SIZE", Some("32"))
+- .define("MATCH_LIMIT_DEPTH", Some("MATCH_LIMIT"))
+- .define("MAX_VARLOOKBEHIND", Some("255"))
+- .define("NEWLINE_DEFAULT", Some("2"))
+- .define("PARENS_NEST_LIMIT", Some("250"))
+- .define("MAX_NAME_SIZE", Some("128"))
- .define("MAX_NAME_COUNT", Some("10000"));
-- // "no symbols" warning on pcre_string_utils.c is because it is only used
-- // when when COMPILE_PCRE8 is not defined, which is the default.
-- add_c_files(&mut cfg, "libgit2/deps/pcre");
+- add_pcre2_files(&mut cfg);
-
- cfg.file("libgit2/src/util/allocators/failalloc.c");
- cfg.file("libgit2/src/util/allocators/stdalloc.c");
-
- if windows {
+- if target.contains("msvc") {
+- cfg.define("_CRT_SECURE_NO_DEPRECATE", None);
+- cfg.define("_CRT_SECURE_NO_WARNINGS", None);
+- }
- add_c_files(&mut cfg, "libgit2/src/util/win32");
- cfg.define("STRSAFE_NO_DEPRECATE", None);
- cfg.define("WIN32", None);
@@ -302,8 +305,48 @@ index b45118c..1df1b8d 100644
- build.file(&path);
- }
- }
+-}
+-
+-fn add_pcre2_files(build: &mut cc::Build) {
+- // Keep this list in sync with libgit2's PCRE2_SOURCES:
+- // https://github.com/libgit2/libgit2/blob/f7a4071c766ceea3915415e22134cbe3e581c420/deps/pcre2/CMakeLists.txt#L65-L96
+- let root = Path::new("libgit2/deps/pcre2");
+- for file in &[
+- "pcre2_auto_possess.c",
+- "pcre2_chartables.c",
+- "pcre2_chkdint.c",
+- "pcre2_compile.c",
+- "pcre2_compile_cgroup.c",
+- "pcre2_compile_class.c",
+- "pcre2_config.c",
+- "pcre2_context.c",
+- "pcre2_convert.c",
+- "pcre2_dfa_match.c",
+- "pcre2_error.c",
+- "pcre2_extuni.c",
+- "pcre2_find_bracket.c",
+- "pcre2_maketables.c",
+- "pcre2_match.c",
+- "pcre2_match_data.c",
+- "pcre2_match_next.c",
+- "pcre2_newline.c",
+- "pcre2_ord2utf.c",
+- "pcre2_pattern_info.c",
+- "pcre2_script_run.c",
+- "pcre2_serialize.c",
+- "pcre2_string_utils.c",
+- "pcre2_study.c",
+- "pcre2_substitute.c",
+- "pcre2_substring.c",
+- "pcre2_tables.c",
+- "pcre2_ucd.c",
+- "pcre2_valid_utf.c",
+- "pcre2_xclass.c",
+- ] {
+- build.file(root.join(file));
+- }
+ try_system_libgit2(false).expect("Failed to link with system libgit2.");
}
--
-2.54.0
+2.55.0
diff --git a/libgit2-sys-fix-metadata-auto.diff b/libgit2-sys-fix-metadata-auto.diff
index 156ce37..99a3cd2 100644
--- a/libgit2-sys-fix-metadata-auto.diff
+++ b/libgit2-sys-fix-metadata-auto.diff
@@ -1,11 +1,11 @@
---- libgit2-sys-0.18.5+1.9.4/Cargo.toml 2006-07-24T01:21:28+00:00
-+++ libgit2-sys-0.18.5+1.9.4/Cargo.toml 2026-06-04T16:16:49.554481+00:00
+--- libgit2-sys-0.18.7+1.9.6/Cargo.toml 2006-07-24T01:21:28+00:00
++++ libgit2-sys-0.18.7+1.9.6/Cargo.toml 2026-07-23T13:28:56.792555+00:00
@@ -12,7 +12,7 @@
[package]
edition = "2021"
name = "libgit2-sys"
--version = "0.18.5+1.9.4"
-+version = "0.18.5"
+-version = "0.18.7+1.9.6"
++version = "0.18.7"
authors = [
"Josh Triplett <josh@joshtriplett.org>",
"Alex Crichton <alex@alexcrichton.com>",
diff --git a/libgit2-sys-fix-metadata.diff b/libgit2-sys-fix-metadata.diff
index c4e73be..4046c11 100644
--- a/libgit2-sys-fix-metadata.diff
+++ b/libgit2-sys-fix-metadata.diff
@@ -1,5 +1,5 @@
---- libgit2-sys-0.18.5+1.9.4/Cargo.toml 2006-07-24T01:21:28+00:00
-+++ libgit2-sys-0.18.5+1.9.4/Cargo.toml 2026-06-04T16:16:49.555469+00:00
+--- libgit2-sys-0.18.7+1.9.6/Cargo.toml 2006-07-24T01:21:28+00:00
++++ libgit2-sys-0.18.7+1.9.6/Cargo.toml 2026-07-23T13:28:56.794303+00:00
@@ -39,13 +39,6 @@
[features]
https = ["openssl-sys"]
diff --git a/rust-libgit2-sys.spec b/rust-libgit2-sys.spec
index b86ac6f..bfcd9a9 100644
--- a/rust-libgit2-sys.spec
+++ b/rust-libgit2-sys.spec
@@ -3,10 +3,10 @@
%global debug_package %{nil}
%global crate libgit2-sys
-%global crate_version 0.18.5+1.9.4
+%global crate_version 0.18.7+1.9.6
Name: rust-libgit2-sys
-Version: 0.18.5
+Version: 0.18.7
Release: %autorelease
Summary: Native bindings to the libgit2 library
@@ -23,7 +23,7 @@ Patch: libgit2-sys-fix-metadata.diff
Patch2: 0001-Link-against-system-libgit2-unconditionally.patch
BuildRequires: cargo-rpm-macros >= 24
-BuildRequires: (pkgconfig(libgit2) >= 1.9.3 with pkgconfig(libgit2) < 1.10.0~)
+BuildRequires: (pkgconfig(libgit2) >= 1.9.6 with pkgconfig(libgit2) < 1.10.0~)
%global _description %{expand:
Native bindings to the libgit2 library.}
@@ -33,7 +33,7 @@ Native bindings to the libgit2 library.}
%package devel
Summary: %{summary}
BuildArch: noarch
-Requires: (pkgconfig(libgit2) >= 1.9.3 with pkgconfig(libgit2) < 1.10.0~)
+Requires: (pkgconfig(libgit2) >= 1.9.6 with pkgconfig(libgit2) < 1.10.0~)
%description devel %{_description}
diff --git a/rust2rpm.toml b/rust2rpm.toml
index 897edf4..a2eb418 100644
--- a/rust2rpm.toml
+++ b/rust2rpm.toml
@@ -11,8 +11,8 @@ number = 2
file = "0001-Link-against-system-libgit2-unconditionally.patch"
[requires]
-build = ["(pkgconfig(libgit2) >= 1.9.3 with pkgconfig(libgit2) < 1.10.0~)"]
-lib = ["(pkgconfig(libgit2) >= 1.9.3 with pkgconfig(libgit2) < 1.10.0~)"]
+build = ["(pkgconfig(libgit2) >= 1.9.6 with pkgconfig(libgit2) < 1.10.0~)"]
+lib = ["(pkgconfig(libgit2) >= 1.9.6 with pkgconfig(libgit2) < 1.10.0~)"]
[scripts]
prep.post = [
diff --git a/sources b/sources
index 84e1dca..da9f355 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libgit2-sys-0.18.5+1.9.4.crate) = 98922a0665e04aa977914b5b44833cdf843d8ae02aecf1d65382fae675d9fa208161f73b9d5e9779e3aa4cd7566936ee2a669d0bd1c5d18f0343839a1a689300
+SHA512 (libgit2-sys-0.18.7+1.9.6.crate) = 2c400949c916e789b1a2e4b3dfca7b8dcf8fd98f0432cb36955477e2c7ca132880fd9b7a4cc57c2ac76225fd643caa61a246fe1d5d3b6ced2e8421bcd4fcb791
reply other threads:[~2026-07-23 19:30 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=178483505739.1.399837619237837567.rpms-rust-libgit2-sys-e8d90503eac1@fedoraproject.org \
--to=decathorpe@gmail.com \
--cc=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