Auto sync2gitlab import of git-2.39.0-1.el8.src.rpm
This commit is contained in:
		
							parent
							
								
									eae7b20354
								
							
						
					
					
						commit
						f334d8fed7
					
				
							
								
								
									
										2
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							| @ -1,2 +1,4 @@ | |||||||
| /git-2.31.1.tar.sign | /git-2.31.1.tar.sign | ||||||
| /git-2.31.1.tar.xz | /git-2.31.1.tar.xz | ||||||
|  | /git-2.39.0.tar.sign | ||||||
|  | /git-2.39.0.tar.xz | ||||||
|  | |||||||
							
								
								
									
										73
									
								
								0001-t-lib-httpd-try-harder-to-find-a-port-for-apache.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										73
									
								
								0001-t-lib-httpd-try-harder-to-find-a-port-for-apache.patch
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,73 @@ | |||||||
|  | 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() { | ||||||
							
								
								
									
										88
									
								
								0002-t-lib-git-daemon-try-harder-to-find-a-port.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										88
									
								
								0002-t-lib-git-daemon-try-harder-to-find-a-port.patch
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,88 @@ | |||||||
|  | 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() { | ||||||
							
								
								
									
										85
									
								
								0003-t-lib-git-svn-try-harder-to-find-a-port.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										85
									
								
								0003-t-lib-git-svn-try-harder-to-find-a-port.patch
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,85 @@ | |||||||
|  | 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,7 +1,7 @@ | |||||||
| diff -ur a/builtin/receive-pack.c b/builtin/receive-pack.c
 | diff -ur a/builtin/receive-pack.c b/builtin/receive-pack.c
 | ||||||
| --- a/builtin/receive-pack.c	2020-06-01 17:49:27.000000000 +0200
 | --- a/builtin/receive-pack.c	2022-10-07 06:48:26.000000000 +0200
 | ||||||
| +++ b/builtin/receive-pack.c	2020-06-15 15:28:48.149268576 +0200
 | +++ b/builtin/receive-pack.c	2022-11-21 16:34:02.417278135 +0100
 | ||||||
| @@ -29,6 +29,8 @@
 | @@ -30,6 +30,8 @@
 | ||||||
|  #include "commit-reach.h" |  #include "commit-reach.h" | ||||||
|  #include "worktree.h" |  #include "worktree.h" | ||||||
|  #include "shallow.h" |  #include "shallow.h" | ||||||
| @ -10,7 +10,7 @@ diff -ur a/builtin/receive-pack.c b/builtin/receive-pack.c | |||||||
|   |   | ||||||
|  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>"), | ||||||
| @@ -419,43 +421,11 @@
 | @@ -528,43 +530,11 @@
 | ||||||
|  	return 0; |  	return 0; | ||||||
|  } |  } | ||||||
|   |   | ||||||
| @ -57,10 +57,10 @@ diff -ur a/builtin/receive-pack.c b/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 a/Makefile b/Makefile
 | diff -ur a/Makefile b/Makefile
 | ||||||
| --- a/Makefile	2020-06-01 17:49:27.000000000 +0200
 | --- a/Makefile	2022-10-07 06:48:26.000000000 +0200
 | ||||||
| +++ b/Makefile	2020-06-15 15:00:45.212758547 +0200
 | +++ b/Makefile	2022-11-21 16:35:56.986792752 +0100
 | ||||||
| @@ -1830,6 +1830,8 @@
 | @@ -2008,6 +2008,8 @@
 | ||||||
|  	BASIC_CFLAGS += -DHAVE_GETDELIM |  	EXTLIBS += -lcrypto -lssl | ||||||
|  endif |  endif | ||||||
|   |   | ||||||
| +EXTLIBS += -lcrypto
 | +EXTLIBS += -lcrypto
 | ||||||
							
								
								
									
										95
									
								
								git.spec
									
									
									
									
									
								
							
							
						
						
									
										95
									
								
								git.spec
									
									
									
									
									
								
							| @ -85,12 +85,15 @@ | |||||||
| %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.31.1 | Version:        2.39.0 | ||||||
| Release:        2%{?rcrev}%{?dist} | Release:        1%{?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/ | ||||||
| @ -123,7 +126,17 @@ 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.27.0-core-crypto-hmac.patch | Patch2:         git-2.38.1-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 | ||||||
| @ -635,26 +648,17 @@ 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 | ||||||
| 
 | 
 | ||||||
| # The multimail hook is installed with git.  Use python3 to avoid an | # Use python3 to avoid an unnecessary python2 dependency, if possible. | ||||||
| # 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 | ||||||
| 
 | 
 | ||||||
| @ -696,6 +700,9 @@ 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} | ||||||
| 
 | 
 | ||||||
| @ -759,9 +766,6 @@ 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 | ||||||
| @ -850,7 +854,17 @@ 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 | ||||||
| @ -859,20 +873,39 @@ GIT_SKIP_TESTS="" | |||||||
| # 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.35 t5551.25" | GIT_SKIP_TESTS="$GIT_SKIP_TESTS t5541.37 t5551.25" | ||||||
| %endif | %endif | ||||||
| # endif aarch64 %%{arm} %%{power64} | # endif aarch64 %%{arm} %%{power64} | ||||||
| 
 | 
 | ||||||
| %ifarch %{power64} | %if 0%{?rhel} == 8 && "%{_arch}" == "s390x" | ||||||
| # Skip tests which fail on ppc | # Skip tests which fail on s390x on rhel-8 | ||||||
| # | # | ||||||
| # t9115-git-svn-dcommit-funky-renames is disabled because it frequently fails. | # The following tests fail on s390x & el8.  The cause should be investigated. | ||||||
| # The port it uses (9115) is already in use.  It is unclear if this is | # However, it's a lower priority since the same tests work consistently on | ||||||
| # due to an issue in the test suite or a conflict with some other process on | # s390x with Fedora and RHEL-9.  The failures seem to originate in t5300. | ||||||
| # the build host.  It only appears to occur on ppc-arches. | # | ||||||
| GIT_SKIP_TESTS="$GIT_SKIP_TESTS t9115" | # t5300.10 'unpack without delta' | ||||||
|  | # 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 %%{power64} | # endif rhel == 8 && arch == s390x | ||||||
| 
 | 
 | ||||||
| export GIT_SKIP_TESTS | export GIT_SKIP_TESTS | ||||||
| 
 | 
 | ||||||
| @ -926,7 +959,6 @@ 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 | ||||||
| @ -943,7 +975,6 @@ 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 | ||||||
| @ -1068,6 +1099,10 @@ rmdir --ignore-fail-on-non-empty "$testdir" | |||||||
| %{?with_docs:%{_pkgdocdir}/git-svn.html} | %{?with_docs:%{_pkgdocdir}/git-svn.html} | ||||||
| 
 | 
 | ||||||
| %changelog | %changelog | ||||||
|  | * 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 | ||||||
|  | |||||||
							
								
								
									
										4
									
								
								sources
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								sources
									
									
									
									
									
								
							| @ -1,2 +1,2 @@ | |||||||
| SHA512 (git-2.31.1.tar.sign) = 0a721876f9869d1dc9a43e7f83f8e63a3d8fa932ff2d2e69bb98f3e314e2e9a896c2171cb6a020d6c6e929fdf1af736dbeb3f25f93fb4d359a9aaa5b859069c3 | SHA512 (git-2.39.0.tar.sign) = 61f8b98c86ecada0784aa9d86bb7c88ed3fb836dee8ee91c16bdf6fba56226c6db424debd2b0f1485b67bdbb5261626b8ff9f362e32d7b93449461f0f873559a | ||||||
| SHA512 (git-2.31.1.tar.xz) = 9aa334a3e8519700ff5d112153ec42677722980094caa9d22aa91afdb65166bd9a98fa445c0d327c428ebfa73bf4832e9b3836109a1d9319feafe3191cfd170e | SHA512 (git-2.39.0.tar.xz) = f072cae7738279b1c0f8202e83a243ff0164b03d3be22895aa875caa265150a5773e1f062724b3eb82bc64b163730b6f451b82fa0c904167a8fa53ced5d3b1df | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user