Compare commits
No commits in common. "c8" and "imports/c8-beta/git-2.31.1-2.el8" have entirely different histories.
c8
...
imports/c8
@ -1,2 +1,2 @@
|
|||||||
7577a22e233e892dba5cf19a3a57cef2062d01e6 SOURCES/git-2.43.5.tar.sign
|
a66f98f88bf7734f8463446ac0735cee190da1dc SOURCES/git-2.31.1.tar.xz
|
||||||
31decef72034ae36c8098a9e6bb13a7dd4859fd9 SOURCES/git-2.43.5.tar.xz
|
87d3a395bad523277647f8614fbd9fefe0450fc6 SOURCES/gpgkey-junio.asc
|
||||||
|
4
.gitignore
vendored
4
.gitignore
vendored
@ -1,2 +1,2 @@
|
|||||||
SOURCES/git-2.43.5.tar.sign
|
SOURCES/git-2.31.1.tar.xz
|
||||||
SOURCES/git-2.43.5.tar.xz
|
SOURCES/gpgkey-junio.asc
|
||||||
|
@ -1,73 +0,0 @@
|
|||||||
From aedeaaf788bd8a7fc5a1887196b6f6d8a5c31362 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Todd Zullinger <tmz@pobox.com>
|
|
||||||
Date: Sun, 21 Aug 2022 13:49:57 -0400
|
|
||||||
Subject: [PATCH] t/lib-httpd: try harder to find a port for apache
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
When running multiple builds concurrently, tests which run daemons, like
|
|
||||||
apache httpd, sometimes conflict with each other, leading to spurious
|
|
||||||
failures:
|
|
||||||
|
|
||||||
++ /usr/sbin/httpd -d '/tmp/git-t.ck9I/trash directory.t9118-git-svn-funky-branch-names/httpd' \
|
|
||||||
-f /builddir/build/BUILD/git-2.37.2/t/lib-httpd/apache.conf -DDAV -DSVN -c 'Listen 127.0.0.1:9118' \
|
|
||||||
-k start
|
|
||||||
(98)Address already in use: AH00072: make_sock: could not bind to address 127.0.0.1:9118
|
|
||||||
no listening sockets available, shutting down
|
|
||||||
AH00015: Unable to open logs
|
|
||||||
++ test 1 -ne 0
|
|
||||||
|
|
||||||
Try a bit harder to find an open port to use to avoid these intermittent
|
|
||||||
failures. If we fail to start httpd, increment the port number and try
|
|
||||||
again. By default, we make 3 attempts. This may be overridden by
|
|
||||||
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(-)
|
|
||||||
|
|
||||||
diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh
|
|
||||||
index 1f6b9b08d1..9279dcd659 100644
|
|
||||||
--- a/t/lib-httpd.sh
|
|
||||||
+++ b/t/lib-httpd.sh
|
|
||||||
@@ -175,19 +175,26 @@ prepare_httpd() {
|
|
||||||
}
|
|
||||||
|
|
||||||
start_httpd() {
|
|
||||||
- prepare_httpd >&3 2>&4
|
|
||||||
-
|
|
||||||
test_atexit stop_httpd
|
|
||||||
|
|
||||||
- "$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"
|
|
||||||
- fi
|
|
||||||
+ i=0
|
|
||||||
+ while test $i -lt ${GIT_TEST_START_HTTPD_TRIES:-3}
|
|
||||||
+ do
|
|
||||||
+ i=$(($i + 1))
|
|
||||||
+ prepare_httpd >&3 2>&4
|
|
||||||
+ say >&3 "Starting httpd on port $LIB_HTTPD_PORT"
|
|
||||||
+ "$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
|
|
||||||
+ test $? -eq 0 && return
|
|
||||||
+ LIB_HTTPD_PORT=$(($LIB_HTTPD_PORT + 1))
|
|
||||||
+ export LIB_HTTPD_PORT
|
|
||||||
+ # clean up modules symlink, prepare_httpd will re-create it
|
|
||||||
+ rm -f "$HTTPD_ROOT_PATH/modules"
|
|
||||||
+ done
|
|
||||||
+ cat "$HTTPD_ROOT_PATH"/error.log >&4 2>/dev/null
|
|
||||||
+ test_skip_or_die GIT_TEST_HTTPD "web server setup failed"
|
|
||||||
}
|
|
||||||
|
|
||||||
stop_httpd() {
|
|
@ -1,88 +0,0 @@
|
|||||||
From 16750d024ce038b019ab2e9ee5639901e445af37 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Todd Zullinger <tmz@pobox.com>
|
|
||||||
Date: Fri, 26 Aug 2022 18:28:44 -0400
|
|
||||||
Subject: [PATCH] t/lib-git-daemon: try harder to find a port
|
|
||||||
|
|
||||||
As with the previous commit, try harder to find an open port to avoid
|
|
||||||
intermittent failures on busy/shared build systems.
|
|
||||||
|
|
||||||
By default, we make 3 attempts. This may be overridden by setting
|
|
||||||
GIT_TEST_START_GIT_DAEMON_TRIES to a different value.
|
|
||||||
|
|
||||||
Signed-off-by: Todd Zullinger <tmz@pobox.com>
|
|
||||||
---
|
|
||||||
t/lib-git-daemon.sh | 60 ++++++++++++++++++++++++++++-----------------
|
|
||||||
1 file changed, 37 insertions(+), 23 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/t/lib-git-daemon.sh b/t/lib-git-daemon.sh
|
|
||||||
index e62569222b..c3e8dda9ff 100644
|
|
||||||
--- a/t/lib-git-daemon.sh
|
|
||||||
+++ b/t/lib-git-daemon.sh
|
|
||||||
@@ -51,30 +51,44 @@ start_git_daemon() {
|
|
||||||
registered_stop_git_daemon_atexit_handler=AlreadyDone
|
|
||||||
fi
|
|
||||||
|
|
||||||
- say >&3 "Starting git daemon ..."
|
|
||||||
- mkfifo git_daemon_output
|
|
||||||
- ${LIB_GIT_DAEMON_COMMAND:-git daemon} \
|
|
||||||
- --listen=127.0.0.1 --port="$LIB_GIT_DAEMON_PORT" \
|
|
||||||
- --reuseaddr --verbose --pid-file="$GIT_DAEMON_PIDFILE" \
|
|
||||||
- --base-path="$GIT_DAEMON_DOCUMENT_ROOT_PATH" \
|
|
||||||
- "$@" "$GIT_DAEMON_DOCUMENT_ROOT_PATH" \
|
|
||||||
- >&3 2>git_daemon_output &
|
|
||||||
- GIT_DAEMON_PID=$!
|
|
||||||
- {
|
|
||||||
- read -r line <&7
|
|
||||||
- printf "%s\n" "$line" >&4
|
|
||||||
- cat <&7 >&4 &
|
|
||||||
- } 7<git_daemon_output &&
|
|
||||||
+ i=0
|
|
||||||
+ while test $i -lt ${GIT_TEST_START_GIT_DAEMON_TRIES:-3}
|
|
||||||
+ do
|
|
||||||
+ say >&3 "Starting git daemon on port $LIB_GIT_DAEMON_PORT ..."
|
|
||||||
+ mkfifo git_daemon_output
|
|
||||||
+ ${LIB_GIT_DAEMON_COMMAND:-git daemon} \
|
|
||||||
+ --listen=127.0.0.1 --port="$LIB_GIT_DAEMON_PORT" \
|
|
||||||
+ --reuseaddr --verbose --pid-file="$GIT_DAEMON_PIDFILE" \
|
|
||||||
+ --base-path="$GIT_DAEMON_DOCUMENT_ROOT_PATH" \
|
|
||||||
+ "$@" "$GIT_DAEMON_DOCUMENT_ROOT_PATH" \
|
|
||||||
+ >&3 2>git_daemon_output &
|
|
||||||
+ GIT_DAEMON_PID=$!
|
|
||||||
+ {
|
|
||||||
+ read -r line <&7
|
|
||||||
+ printf "%s\n" "$line" >&4
|
|
||||||
+ cat <&7 >&4 &
|
|
||||||
+ } 7<git_daemon_output &&
|
|
||||||
|
|
||||||
- # Check expected output
|
|
||||||
- if test x"$(expr "$line" : "\[[0-9]*\] \(.*\)")" != x"Ready to rumble"
|
|
||||||
- then
|
|
||||||
- kill "$GIT_DAEMON_PID"
|
|
||||||
- wait "$GIT_DAEMON_PID"
|
|
||||||
- unset GIT_DAEMON_PID
|
|
||||||
- test_skip_or_die GIT_TEST_GIT_DAEMON \
|
|
||||||
- "git daemon failed to start"
|
|
||||||
- fi
|
|
||||||
+ # Check expected output
|
|
||||||
+ output="$(expr "$line" : "\[[0-9]*\] \(.*\)")"
|
|
||||||
+ # Return if found
|
|
||||||
+ test x"$output" = x"Ready to rumble" && return
|
|
||||||
+ # Increment port for retry if not found
|
|
||||||
+ LIB_GIT_DAEMON_PORT=$(($LIB_GIT_DAEMON_PORT + 1))
|
|
||||||
+ export LIB_GIT_DAEMON_PORT
|
|
||||||
+ GIT_DAEMON_HOST_PORT=127.0.0.1:$LIB_GIT_DAEMON_PORT
|
|
||||||
+ GIT_DAEMON_URL=git://$GIT_DAEMON_HOST_PORT
|
|
||||||
+ # unset GIT_DAEMON_PID; remove the fifo & pid file
|
|
||||||
+ GIT_DAEMON_PID=
|
|
||||||
+ rm -f git_daemon_output "$GIT_DAEMON_PIDFILE"
|
|
||||||
+ done
|
|
||||||
+
|
|
||||||
+ # Clean up and return failure
|
|
||||||
+ kill "$GIT_DAEMON_PID"
|
|
||||||
+ wait "$GIT_DAEMON_PID"
|
|
||||||
+ unset GIT_DAEMON_PID
|
|
||||||
+ test_skip_or_die GIT_TEST_GIT_DAEMON \
|
|
||||||
+ "git daemon failed to start"
|
|
||||||
}
|
|
||||||
|
|
||||||
stop_git_daemon() {
|
|
@ -1,85 +0,0 @@
|
|||||||
From aa5105dc115b43edc6c9c11714b092583f1221aa Mon Sep 17 00:00:00 2001
|
|
||||||
From: Todd Zullinger <tmz@pobox.com>
|
|
||||||
Date: Fri, 26 Aug 2022 18:28:44 -0400
|
|
||||||
Subject: [PATCH] t/lib-git-svn: try harder to find a port
|
|
||||||
|
|
||||||
As with the previous commits, try harder to find an open port to avoid
|
|
||||||
intermittent failures on busy/shared build systems.
|
|
||||||
|
|
||||||
By default, we make 3 attempts. This may be overridden by setting
|
|
||||||
GIT_TEST_START_SVNSERVE_TRIES to a different value.
|
|
||||||
|
|
||||||
Run svnserve in daemon mode and use 'test_atexit' to stop it. This is
|
|
||||||
cleaner than running in the foreground with --listen-once and having to
|
|
||||||
manage the PID ourselves.
|
|
||||||
|
|
||||||
Signed-off-by: Todd Zullinger <tmz@pobox.com>
|
|
||||||
---
|
|
||||||
t/lib-git-svn.sh | 34 +++++++++++++++++++++++++----
|
|
||||||
t/t9113-git-svn-dcommit-new-file.sh | 1 -
|
|
||||||
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
|
|
||||||
--- a/t/lib-git-svn.sh
|
|
||||||
+++ b/t/lib-git-svn.sh
|
|
||||||
@@ -17,6 +17,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
|
|
||||||
@@ -119,10 +120,35 @@ require_svnserve () {
|
|
||||||
}
|
|
||||||
|
|
||||||
start_svnserve () {
|
|
||||||
- svnserve --listen-port $SVNSERVE_PORT \
|
|
||||||
- --root "$rawsvnrepo" \
|
|
||||||
- --listen-once \
|
|
||||||
- --listen-host 127.0.0.1 &
|
|
||||||
+ test_atexit stop_svnserve
|
|
||||||
+
|
|
||||||
+ i=0
|
|
||||||
+ while test $i -lt ${GIT_TEST_START_SVNSERVE_TRIES:-3}
|
|
||||||
+ do
|
|
||||||
+ say >&3 "Starting svnserve on port $SVNSERVE_PORT ..."
|
|
||||||
+ svnserve --listen-port $SVNSERVE_PORT \
|
|
||||||
+ --root "$rawsvnrepo" \
|
|
||||||
+ --daemon --pid-file="$SVNSERVE_PIDFILE" \
|
|
||||||
+ --listen-host 127.0.0.1
|
|
||||||
+ ret=$?
|
|
||||||
+ # increment port and retry if unsuccessful
|
|
||||||
+ if test $ret -ne 0
|
|
||||||
+ then
|
|
||||||
+ SVNSERVE_PORT=$(($SVNSERVE_PORT + 1))
|
|
||||||
+ export SVNSERVE_PORT
|
|
||||||
+ else
|
|
||||||
+ break
|
|
||||||
+ fi
|
|
||||||
+ done
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+stop_svnserve () {
|
|
||||||
+ say >&3 "Stopping svnserve ..."
|
|
||||||
+ SVNSERVE_PID="$(cat "$SVNSERVE_PIDFILE")"
|
|
||||||
+ if test -n "$SVNSERVE_PID"
|
|
||||||
+ then
|
|
||||||
+ kill "$SVNSERVE_PID" 2>/dev/null
|
|
||||||
+ fi
|
|
||||||
}
|
|
||||||
|
|
||||||
prepare_utf8_locale () {
|
|
||||||
diff --git a/t/t9113-git-svn-dcommit-new-file.sh b/t/t9113-git-svn-dcommit-new-file.sh
|
|
||||||
index e8479cec7a..5925891f5d 100755
|
|
||||||
--- a/t/t9113-git-svn-dcommit-new-file.sh
|
|
||||||
+++ b/t/t9113-git-svn-dcommit-new-file.sh
|
|
||||||
@@ -28,7 +28,6 @@ test_expect_success 'create files in new directory with dcommit' "
|
|
||||||
echo hello > git-new-dir/world &&
|
|
||||||
git update-index --add git-new-dir/world &&
|
|
||||||
git commit -m hello &&
|
|
||||||
- start_svnserve &&
|
|
||||||
git svn dcommit
|
|
||||||
"
|
|
||||||
|
|
@ -1,16 +1,16 @@
|
|||||||
diff -ur b/builtin/receive-pack.c a/builtin/receive-pack.c
|
diff -ur a/builtin/receive-pack.c b/builtin/receive-pack.c
|
||||||
--- b/builtin/receive-pack.c 2023-11-20 03:07:41.000000000 +0100
|
--- a/builtin/receive-pack.c 2020-06-01 17:49:27.000000000 +0200
|
||||||
+++ a/builtin/receive-pack.c 2023-12-06 15:34:28.294170714 +0100
|
+++ b/builtin/receive-pack.c 2020-06-15 15:28:48.149268576 +0200
|
||||||
@@ -40,6 +40,8 @@
|
@@ -29,6 +29,8 @@
|
||||||
|
#include "commit-reach.h"
|
||||||
#include "worktree.h"
|
#include "worktree.h"
|
||||||
#include "shallow.h"
|
#include "shallow.h"
|
||||||
#include "parse-options.h"
|
|
||||||
+#include <openssl/hmac.h>
|
+#include <openssl/hmac.h>
|
||||||
+#include <openssl/evp.h>
|
+#include <openssl/evp.h>
|
||||||
|
|
||||||
static const char * const receive_pack_usage[] = {
|
static const char * const receive_pack_usage[] = {
|
||||||
N_("git receive-pack <git-dir>"),
|
N_("git receive-pack <git-dir>"),
|
||||||
@@ -538,43 +540,11 @@
|
@@ -419,43 +421,11 @@
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -56,11 +56,11 @@ diff -ur b/builtin/receive-pack.c a/builtin/receive-pack.c
|
|||||||
}
|
}
|
||||||
|
|
||||||
static char *prepare_push_cert_nonce(const char *path, timestamp_t stamp)
|
static char *prepare_push_cert_nonce(const char *path, timestamp_t stamp)
|
||||||
diff -ur b/Makefile a/Makefile
|
diff -ur a/Makefile b/Makefile
|
||||||
--- b/Makefile 2023-11-20 03:07:41.000000000 +0100
|
--- a/Makefile 2020-06-01 17:49:27.000000000 +0200
|
||||||
+++ a/Makefile 2023-12-06 15:35:08.506316431 +0100
|
+++ b/Makefile 2020-06-15 15:00:45.212758547 +0200
|
||||||
@@ -2123,6 +2123,8 @@
|
@@ -1830,6 +1830,8 @@
|
||||||
EXTLIBS += -lcrypto -lssl
|
BASIC_CFLAGS += -DHAVE_GETDELIM
|
||||||
endif
|
endif
|
||||||
|
|
||||||
+EXTLIBS += -lcrypto
|
+EXTLIBS += -lcrypto
|
BIN
SOURCES/git-2.31.1.tar.sign
Normal file
BIN
SOURCES/git-2.31.1.tar.sign
Normal file
Binary file not shown.
@ -1,144 +0,0 @@
|
|||||||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
|
||||||
|
|
||||||
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
|
|
||||||
=7hTI
|
|
||||||
-----END PGP PUBLIC KEY BLOCK-----
|
|
115
SPECS/git.spec
115
SPECS/git.spec
@ -85,15 +85,12 @@
|
|||||||
%global build_ldflags -Wl,-z,relro -Wl,-z,now
|
%global build_ldflags -Wl,-z,relro -Wl,-z,now
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# Set path to the package-notes linker script
|
|
||||||
%global _package_note_file %{_builddir}/%{name}-%{version}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld
|
|
||||||
|
|
||||||
# Define for release candidates
|
# Define for release candidates
|
||||||
#global rcrev .rc0
|
#global rcrev .rc0
|
||||||
|
|
||||||
Name: git
|
Name: git
|
||||||
Version: 2.43.5
|
Version: 2.31.1
|
||||||
Release: 1%{?rcrev}%{?dist}
|
Release: 2%{?rcrev}%{?dist}
|
||||||
Summary: Fast Version Control System
|
Summary: Fast Version Control System
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
URL: https://git-scm.com/
|
URL: https://git-scm.com/
|
||||||
@ -126,17 +123,7 @@ Source99: print-failed-test-output
|
|||||||
Patch0: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch
|
Patch0: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch
|
||||||
Patch1: 0001-Switch-git-instaweb-default-to-apache-2.26.2.patch
|
Patch1: 0001-Switch-git-instaweb-default-to-apache-2.26.2.patch
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1619113
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1619113
|
||||||
Patch2: git-2.43.0-core-crypto-hmac.patch
|
Patch2: git-2.27.0-core-crypto-hmac.patch
|
||||||
|
|
||||||
# https://bugzilla.redhat.com/2114531
|
|
||||||
# tests: try harder to find open ports for apache, git, and svn
|
|
||||||
#
|
|
||||||
# https://github.com/tmzullinger/git/commit/aedeaaf788
|
|
||||||
Patch3: 0001-t-lib-httpd-try-harder-to-find-a-port-for-apache.patch
|
|
||||||
# https://github.com/tmzullinger/git/commit/16750d024c
|
|
||||||
Patch4: 0002-t-lib-git-daemon-try-harder-to-find-a-port.patch
|
|
||||||
# https://github.com/tmzullinger/git/commit/aa5105dc11
|
|
||||||
Patch5: 0003-t-lib-git-svn-try-harder-to-find-a-port.patch
|
|
||||||
|
|
||||||
%if %{with docs}
|
%if %{with docs}
|
||||||
# pod2man is needed to build Git.3pm
|
# pod2man is needed to build Git.3pm
|
||||||
@ -648,17 +635,26 @@ export SOURCE_DATE_EPOCH=$(date -r version +%%s 2>/dev/null)
|
|||||||
# Fix shebang in a few places to silence rpmlint complaints
|
# Fix shebang in a few places to silence rpmlint complaints
|
||||||
%if %{with python2}
|
%if %{with python2}
|
||||||
sed -i -e '1s@#! */usr/bin/env python$@#!%{__python2}@' \
|
sed -i -e '1s@#! */usr/bin/env python$@#!%{__python2}@' \
|
||||||
contrib/fast-import/import-zips.py
|
contrib/fast-import/import-zips.py \
|
||||||
|
contrib/hg-to-git/hg-to-git.py \
|
||||||
|
contrib/hooks/multimail/git_multimail.py \
|
||||||
|
contrib/hooks/multimail/migrate-mailhook-config \
|
||||||
|
contrib/hooks/multimail/post-receive.example
|
||||||
%else
|
%else
|
||||||
# Remove contrib/fast-import/import-zips.py which require python2.
|
# Remove contrib/fast-import/import-zips.py which require python2.
|
||||||
rm -rf contrib/fast-import/import-zips.py
|
rm -rf contrib/fast-import/import-zips.py
|
||||||
%endif
|
%endif
|
||||||
# endif with python2
|
# endif with python2
|
||||||
|
|
||||||
# Use python3 to avoid an unnecessary python2 dependency, if possible.
|
# The multimail hook is installed with git. Use python3 to avoid an
|
||||||
|
# unnecessary python2 dependency, if possible. Also fix contrib/hg-to-git
|
||||||
|
# while here.
|
||||||
%if %{with python3}
|
%if %{with python3}
|
||||||
sed -i -e '1s@#!\( */usr/bin/env python\|%{__python2}\)$@#!%{__python3}@' \
|
sed -i -e '1s@#!\( */usr/bin/env python\|%{__python2}\)$@#!%{__python3}@' \
|
||||||
contrib/hg-to-git/hg-to-git.py
|
contrib/hg-to-git/hg-to-git.py \
|
||||||
|
contrib/hooks/multimail/git_multimail.py \
|
||||||
|
contrib/hooks/multimail/migrate-mailhook-config \
|
||||||
|
contrib/hooks/multimail/post-receive.example
|
||||||
%endif
|
%endif
|
||||||
# endif with python3
|
# endif with python3
|
||||||
|
|
||||||
@ -700,9 +696,6 @@ install -Dpm 0755 contrib/diff-highlight/diff-highlight \
|
|||||||
%{buildroot}%{_datadir}/git-core/contrib/diff-highlight
|
%{buildroot}%{_datadir}/git-core/contrib/diff-highlight
|
||||||
rm -rf contrib/diff-highlight/{Makefile,diff-highlight,*.perl,t}
|
rm -rf contrib/diff-highlight/{Makefile,diff-highlight,*.perl,t}
|
||||||
|
|
||||||
# Remove contrib/scalar to avoid cruft in the git-core-doc docdir
|
|
||||||
rm -rf contrib/scalar
|
|
||||||
|
|
||||||
# Clean up contrib/subtree to avoid cruft in the git-core-doc docdir
|
# Clean up contrib/subtree to avoid cruft in the git-core-doc docdir
|
||||||
rm -rf contrib/subtree/{INSTALL,Makefile,git-subtree*,t}
|
rm -rf contrib/subtree/{INSTALL,Makefile,git-subtree*,t}
|
||||||
|
|
||||||
@ -766,6 +759,9 @@ mkdir -p %{buildroot}%{_datadir}/git-core/contrib/completion
|
|||||||
install -pm 644 contrib/completion/git-completion.tcsh \
|
install -pm 644 contrib/completion/git-completion.tcsh \
|
||||||
%{buildroot}%{_datadir}/git-core/contrib/completion/
|
%{buildroot}%{_datadir}/git-core/contrib/completion/
|
||||||
|
|
||||||
|
# Drop .py extension from git_multimail to avoid byte-compiling
|
||||||
|
mv contrib/hooks/multimail/git_multimail{.py,}
|
||||||
|
|
||||||
# Move contrib/hooks out of %%docdir
|
# Move contrib/hooks out of %%docdir
|
||||||
mkdir -p %{buildroot}%{_datadir}/git-core/contrib
|
mkdir -p %{buildroot}%{_datadir}/git-core/contrib
|
||||||
mv contrib/hooks %{buildroot}%{_datadir}/git-core/contrib
|
mv contrib/hooks %{buildroot}%{_datadir}/git-core/contrib
|
||||||
@ -854,17 +850,7 @@ find %{buildroot}%{_pkgdocdir} -name "*.html" -print0 | xargs -r0 linkchecker
|
|||||||
# endif with docs && with linkcheck
|
# endif with docs && with linkcheck
|
||||||
|
|
||||||
# Tests to skip on all releases and architectures
|
# Tests to skip on all releases and architectures
|
||||||
#
|
GIT_SKIP_TESTS=""
|
||||||
# t5559-http-fetch-smart-http2 runs t5551-http-fetch-smart with
|
|
||||||
# HTTP_PROTO=HTTP/2. Unfortunately, it fails quite regularly.
|
|
||||||
# https://lore.kernel.org/git/Y4fUntdlc1mqwad5@pobox.com/
|
|
||||||
GIT_SKIP_TESTS="t5559"
|
|
||||||
|
|
||||||
%if 0%{?rhel} && 0%{?rhel} < 8
|
|
||||||
# Skip tests which require mod_http2 on el7
|
|
||||||
GIT_SKIP_TESTS="$GIT_SKIP_TESTS t5559"
|
|
||||||
%endif
|
|
||||||
# endif rhel < 8
|
|
||||||
|
|
||||||
%ifarch aarch64 %{arm} %{power64}
|
%ifarch aarch64 %{arm} %{power64}
|
||||||
# Skip tests which fail on aarch64, arm, and ppc
|
# Skip tests which fail on aarch64, arm, and ppc
|
||||||
@ -873,39 +859,20 @@ GIT_SKIP_TESTS="$GIT_SKIP_TESTS t5559"
|
|||||||
# to limit the maximum stack size.
|
# to limit the maximum stack size.
|
||||||
# t5541.35 'push 2000 tags over http'
|
# t5541.35 'push 2000 tags over http'
|
||||||
# t5551.25 'clone the 2,000 tag repo to check OS command line overflow'
|
# t5551.25 'clone the 2,000 tag repo to check OS command line overflow'
|
||||||
GIT_SKIP_TESTS="$GIT_SKIP_TESTS t5541.37 t5551.25"
|
GIT_SKIP_TESTS="$GIT_SKIP_TESTS t5541.35 t5551.25"
|
||||||
%endif
|
%endif
|
||||||
# endif aarch64 %%{arm} %%{power64}
|
# endif aarch64 %%{arm} %%{power64}
|
||||||
|
|
||||||
%if 0%{?rhel} == 8 && "%{_arch}" == "s390x"
|
%ifarch %{power64}
|
||||||
# Skip tests which fail on s390x on rhel-8
|
# Skip tests which fail on ppc
|
||||||
#
|
#
|
||||||
# The following tests fail on s390x & el8. The cause should be investigated.
|
# t9115-git-svn-dcommit-funky-renames is disabled because it frequently fails.
|
||||||
# However, it's a lower priority since the same tests work consistently on
|
# The port it uses (9115) is already in use. It is unclear if this is
|
||||||
# s390x with Fedora and RHEL-9. The failures seem to originate in t5300.
|
# due to an issue in the test suite or a conflict with some other process on
|
||||||
#
|
# the build host. It only appears to occur on ppc-arches.
|
||||||
# t5300.10 'unpack without delta'
|
GIT_SKIP_TESTS="$GIT_SKIP_TESTS t9115"
|
||||||
# t5300.12 'unpack with REF_DELTA'
|
|
||||||
# t5300.13 'unpack with REF_DELTA'
|
|
||||||
# t5300.14 'unpack with OFS_DELTA'
|
|
||||||
# t5300.18 'compare delta flavors'
|
|
||||||
# t5300.20 'use packed deltified (REF_DELTA) objects'
|
|
||||||
# t5300.23 'verify pack'
|
|
||||||
# t5300.24 'verify pack -v'
|
|
||||||
# t5300.25 'verify-pack catches mismatched .idx and .pack files'
|
|
||||||
# t5300.29 'verify-pack catches a corrupted sum of the index file itself'
|
|
||||||
# t5300.30 'build pack index for an existing pack'
|
|
||||||
# t5300.45 'make sure index-pack detects the SHA1 collision'
|
|
||||||
# t5300.46 'make sure index-pack detects the SHA1 collision (large blobs)'
|
|
||||||
# t5303.5 'create corruption in data of first object'
|
|
||||||
# t5303.7 '... and loose copy of second object allows for partial recovery'
|
|
||||||
# t5303.11 'create corruption in data of first delta'
|
|
||||||
# t6300.35 'basic atom: head objectsize:disk'
|
|
||||||
# t6300.91 'basic atom: tag objectsize:disk'
|
|
||||||
# t6300.92 'basic atom: tag *objectsize:disk'
|
|
||||||
GIT_SKIP_TESTS="$GIT_SKIP_TESTS t5300.1[02348] t5300.2[03459] t5300.30 t5300.4[56] t5303.[57] t5303.11 t6300.35 t6300.9[12]"
|
|
||||||
%endif
|
%endif
|
||||||
# endif rhel == 8 && arch == s390x
|
# endif %%{power64}
|
||||||
|
|
||||||
export GIT_SKIP_TESTS
|
export GIT_SKIP_TESTS
|
||||||
|
|
||||||
@ -959,6 +926,7 @@ rmdir --ignore-fail-on-non-empty "$testdir"
|
|||||||
%endif
|
%endif
|
||||||
# endif emacs_filesystem
|
# endif emacs_filesystem
|
||||||
%{_datadir}/git-core/contrib/diff-highlight
|
%{_datadir}/git-core/contrib/diff-highlight
|
||||||
|
%{_datadir}/git-core/contrib/hooks/multimail
|
||||||
%{_datadir}/git-core/contrib/hooks/update-paranoid
|
%{_datadir}/git-core/contrib/hooks/update-paranoid
|
||||||
%{_datadir}/git-core/contrib/hooks/setgitperms.perl
|
%{_datadir}/git-core/contrib/hooks/setgitperms.perl
|
||||||
%{_datadir}/git-core/templates/hooks/fsmonitor-watchman.sample
|
%{_datadir}/git-core/templates/hooks/fsmonitor-watchman.sample
|
||||||
@ -975,6 +943,7 @@ rmdir --ignore-fail-on-non-empty "$testdir"
|
|||||||
%license COPYING
|
%license COPYING
|
||||||
# exclude is best way here because of troubles with symlinks inside git-core/
|
# exclude is best way here because of troubles with symlinks inside git-core/
|
||||||
%exclude %{_datadir}/git-core/contrib/diff-highlight
|
%exclude %{_datadir}/git-core/contrib/diff-highlight
|
||||||
|
%exclude %{_datadir}/git-core/contrib/hooks/multimail
|
||||||
%exclude %{_datadir}/git-core/contrib/hooks/update-paranoid
|
%exclude %{_datadir}/git-core/contrib/hooks/update-paranoid
|
||||||
%exclude %{_datadir}/git-core/contrib/hooks/setgitperms.perl
|
%exclude %{_datadir}/git-core/contrib/hooks/setgitperms.perl
|
||||||
%exclude %{_datadir}/git-core/templates/hooks/fsmonitor-watchman.sample
|
%exclude %{_datadir}/git-core/templates/hooks/fsmonitor-watchman.sample
|
||||||
@ -1099,30 +1068,6 @@ rmdir --ignore-fail-on-non-empty "$testdir"
|
|||||||
%{?with_docs:%{_pkgdocdir}/git-svn.html}
|
%{?with_docs:%{_pkgdocdir}/git-svn.html}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Wed Jun 05 2024 Ondřej Pohořelský <opohorel@redhat.com> - 2.43.5-1
|
|
||||||
- Update to 2.43.5
|
|
||||||
- Related: RHEL-36399, RHEL-36411
|
|
||||||
|
|
||||||
* Wed May 15 2024 Ondřej Pohořelský <opohorel@redhat.com> - 2.43.4-1
|
|
||||||
- Update to 2.43.4
|
|
||||||
- Resolves: RHEL-36399, RHEL-36411
|
|
||||||
|
|
||||||
* Wed Dec 06 2023 Ondřej Pohořelský <opohorel@redhat.com> - 2.43.0-1
|
|
||||||
- Update to 2.43.0
|
|
||||||
- Resolves: RHEL-17103
|
|
||||||
|
|
||||||
* Thu Apr 27 2023 Ondřej Pohořelský <opohorel@redhat.com> - 2.39.3-1
|
|
||||||
- Update to 2.39.3
|
|
||||||
- Resolves: #2188364, #2188373, #2190157, #2190158
|
|
||||||
|
|
||||||
* Thu Jan 19 2023 Ondrej Pohorelsky <opohorel@redhat.com> - 2.39.1-1
|
|
||||||
- Update to 2.39.1
|
|
||||||
- Resolves: rhbz#2162064
|
|
||||||
|
|
||||||
* Mon Dec 19 2022 Ondrej Pohorelsky <opohorel@redhat.com> - 2.39.0-1
|
|
||||||
- Update to 2.39.0
|
|
||||||
- Resolves: rhbz#2139378
|
|
||||||
|
|
||||||
* Thu Nov 25 2021 Ondrej Pohorelsky <opohorel@redhat.com> - 2.31.1-2
|
* Thu Nov 25 2021 Ondrej Pohorelsky <opohorel@redhat.com> - 2.31.1-2
|
||||||
- Remove perl(Email::Valid) require from git-email
|
- Remove perl(Email::Valid) require from git-email
|
||||||
- Related: rhbz#2021547
|
- Related: rhbz#2021547
|
||||||
|
Loading…
Reference in New Issue
Block a user