[rpms/git] f44: update to 2.55.0

[rpms/git] f44: update to 2.55.0

[@ 2026-06-30 11:14 UTC (permalink / raw)]

            A new commit has been pushed.

            Repo   : rpms/git
            Branch : f44
            Commit : df961c06486e997e3cabf43ba750dd16d043b7f9
            Author : Ondřej Pohořelský <opohorel@redhat.com>
            Date   : 2026-06-30T12:49:47+02:00
            Stats  : +30/-19 in 4 file(s)
            URL    : https://src.fedoraproject.org/rpms/git/c/df961c06486e997e3cabf43ba750dd16d043b7f9?branch=f44

            Log:
            update to 2.55.0

enable Rust support for Fedora >= 45 and EL >= 11

---
diff --git a/0001-t-lib-httpd-try-harder-to-find-a-port-for-apache.patch b/0001-t-lib-httpd-try-harder-to-find-a-port-for-apache.patch
index 733f9c0..356fe82 100644
--- a/0001-t-lib-httpd-try-harder-to-find-a-port-for-apache.patch
+++ b/0001-t-lib-httpd-try-harder-to-find-a-port-for-apache.patch
@@ -26,14 +26,14 @@ setting GIT_TEST_START_HTTPD_TRIES to a different value.
 Helped-by: Ondřej Pohořelský <opohorel@redhat.com>
 Signed-off-by: Todd Zullinger <tmz@pobox.com>
 ---
- t/lib-httpd.sh | 29 ++++++++++++++++++-----------
- 1 file changed, 18 insertions(+), 11 deletions(-)
+ t/lib-httpd.sh | 28 ++++++++++++++++++++++------
+ 1 file changed, 22 insertions(+), 6 deletions(-)
 
 diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh
-index 2fb1b2ae56..4afdf5a6aa 100644
+index fc646447d5c0..f41176fbfdb8 100644
 --- a/t/lib-httpd.sh
 +++ b/t/lib-httpd.sh
-@@ -206,19 +206,26 @@ enable_cgipassauth () {
+@@ -231,18 +231,26 @@ enable_cgipassauth () {
  }
  
  start_httpd() {
@@ -41,11 +41,10 @@ index 2fb1b2ae56..4afdf5a6aa 100644
 -
  	test_atexit stop_httpd
  
--	"$LIB_HTTPD_PATH" -d "$HTTPD_ROOT_PATH" \
+-	if ! "$LIB_HTTPD_PATH" -d "$HTTPD_ROOT_PATH" \
 -		-f "$TEST_PATH/apache.conf" $HTTPD_PARA \
 -		-c "Listen 127.0.0.1:$LIB_HTTPD_PORT" -k start \
 -		>&3 2>&4
--	if test $? -ne 0
 -	then
 -		cat "$HTTPD_ROOT_PATH"/error.log >&4 2>/dev/null
 -		test_skip_or_die GIT_TEST_HTTPD "web server setup failed"

diff --git a/0003-t-lib-git-svn-try-harder-to-find-a-port.patch b/0003-t-lib-git-svn-try-harder-to-find-a-port.patch
index 905174e..29a8189 100644
--- a/0003-t-lib-git-svn-try-harder-to-find-a-port.patch
+++ b/0003-t-lib-git-svn-try-harder-to-find-a-port.patch
@@ -20,17 +20,17 @@ Signed-off-by: Todd Zullinger <tmz@pobox.com>
  2 files changed, 30 insertions(+), 5 deletions(-)
 
 diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh
-index ea28971e8e..04e660e2ba 100644
+index 52843f667de0..20bae909215c 100644
 --- a/t/lib-git-svn.sh
 +++ b/t/lib-git-svn.sh
-@@ -17,6 +17,7 @@ fi
+@@ -13,6 +13,7 @@ fi
  GIT_DIR=$PWD/.git
  GIT_SVN_DIR=$GIT_DIR/svn/refs/remotes/git-svn
  SVN_TREE=$GIT_SVN_DIR/svn-tree
 +SVNSERVE_PIDFILE="$PWD"/daemon.pid
  test_set_port SVNSERVE_PORT
  
- svn >/dev/null 2>&1
+ if ! svn help >/dev/null 2>&1
 @@ -119,10 +120,35 @@ require_svnserve () {
  }
  

diff --git a/git.spec b/git.spec
index 8f6ee5b..7b0438a 100644
--- a/git.spec
+++ b/git.spec
@@ -47,6 +47,14 @@
 %global use_perl_interpreter 0
 %endif
 
+# Build with Rust support
+# Enable on Fedora >= 45 and EL >= 11, disable on older releases
+%if 0%{?fedora} >= 45 || 0%{?rhel} >= 11
+%bcond_without              rust
+%else
+%bcond_with                 rust
+%endif
+
 # Allow cvs subpackage to be toggled via --with/--without
 # Disable cvs subpackage by default on EL >= 8
 %if 0%{?rhel} >= 8
@@ -78,7 +86,7 @@
 %global _package_note_file  %{_builddir}/%{name}-%{real_version}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld
 
 Name:           git
-Version:        2.54.0
+Version:        2.55.0
 Release:        1%{?dist}
 Summary:        Fast Version Control System
 License:        BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT
@@ -132,13 +140,6 @@ Patch3:         0003-t-lib-git-svn-try-harder-to-find-a-port.patch
 # Prevents t5540 failures on i686, s390x and ppc64le
 Patch5:         git-test-apache-davlockdbtype-config.patch
 
-# Adds the option to sanitize sideband channel messages
-# CVE-2024-52005 wasn't fixed by upstream. This patch adds the option to harden Git against it.
-# The default behaviour of Git remains unchanged.
-#
-# https://github.com/gitgitgadget/git/pull/1853
-Patch6:         git-2.52-sanitize-sideband-channel-messages.patch
-
 %if %{with docs}
 # pod2man is needed to build Git.3pm
 BuildRequires:  perl-podlators
@@ -176,6 +177,10 @@ BuildRequires:  libcurl-devel
 BuildRequires:  make
 BuildRequires:  openssl-devel
 BuildRequires:  pcre2-devel
+%if %{with rust}
+BuildRequires:  cargo
+BuildRequires:  rust
+%endif
 BuildRequires:  perl(Error)
 BuildRequires:  perl(lib)
 %if %{use_perl_generators}
@@ -583,6 +588,9 @@ NO_PYTHON = 1
 %if %{with asciidoctor}
 USE_ASCIIDOCTOR = 1
 %endif
+%if %{without rust}
+NO_RUST = 1
+%endif
 htmldir = %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}
 prefix = %{_prefix}
 perllibdir = %{perl_vendorlib}
@@ -1041,6 +1049,10 @@ rmdir --ignore-fail-on-non-empty "$testdir"
 %{?with_docs:%{_pkgdocdir}/git-svn.html}
 
 %changelog
+* Tue Jun 30 2026 Ondřej Pohořelský <opohorel@redhat.com> - 2.55.0-1
+- update to 2.55.0
+- enable Rust support for Fedora >= 45 and EL >= 11
+
 * Tue Apr 21 2026 Ondřej Pohořelský <opohorel@redhat.com> - 2.54.0-1
 - update to 2.54.0
 

diff --git a/sources b/sources
index c909b11..4f0e816 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (git-2.54.0.tar.xz) = cb363917124edc245c9f6745e6e0c4093990275b4d57f9d2213c655b304ac81b05ece8d88546122727495ebc48a5ae19ab166a3ee43b6b8c68da488ac0270064
-SHA512 (git-2.54.0.tar.sign) = 5ab0ea8d440017dfad74b3525acb8dbb9cdf759f8a0b36f489526ad9e62b04736d29c9f7e89e59c2d9835cc38c2fac9ec6575737e7bef14e6e53b8bdff5533d7
+SHA512 (git-2.55.0.tar.xz) = 73a53e5e79e9c357884512ad9fe5788ce48c33fd7ebb49f7c68f63c872beb5c5766f4fd1a9d9a2d8c89c192dc801ac7339422e9eec644ada56215fe9803af741
+SHA512 (git-2.55.0.tar.sign) = d584cfaf219e957648f3e218e5fc9686c6cbd6a01398e0356621b461c275d76cb825a34ebe0241b2b9077e410c6861fde499db1505e784e35f671aec6535dd35