From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sat, 11 Mar 2023 19:58:19 +0000 (+0100)
Subject: Sync with 2.34.8
X-Git-Tag: v2.35.8~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8cd052ea53b0e125e02a844bf728174a81da60df;p=thirdparty%2Fgit.git

Sync with 2.34.8

* maint-2.34: (28 commits)
  Git 2.34.8
  Git 2.33.8
  Git 2.32.7
  Git 2.31.8
  tests: avoid using `test_i18ncmp`
  Git 2.30.9
  gettext: avoid using gettext if the locale dir is not present
  apply --reject: overwrite existing `.rej` symlink if it exists
  http.c: clear the 'finished' member once we are done with it
  clone.c: avoid "exceeds maximum object size" error with GCC v12.x
  range-diff: use ssize_t for parsed "len" in read_patches()
  range-diff: handle unterminated lines in read_patches()
  range-diff: drop useless "offset" variable from read_patches()
  t5604: GETTEXT_POISON fix, conclusion
  t5604: GETTEXT_POISON fix, part 1
  t5619: GETTEXT_POISON fix
  t0003: GETTEXT_POISON fix, conclusion
  t0003: GETTEXT_POISON fix, part 1
  t0033: GETTEXT_POISON fix
  http: support CURLOPT_PROTOCOLS_STR
  http: prefer CURLOPT_SEEKFUNCTION to CURLOPT_IOCTLFUNCTION
  ...
---

8cd052ea53b0e125e02a844bf728174a81da60df
diff --cc .github/workflows/main.yml
index c35200defb,a9a3830425..352772e607
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@@ -225,19 -219,9 +225,19 @@@ jobs
            - jobname: linux-clang
              cc: clang
              pool: ubuntu-latest
 +          - jobname: linux-sha256
 +            cc: clang
 +            os: ubuntu
 +            pool: ubuntu-latest
            - jobname: linux-gcc
              cc: gcc
 +            cc_package: gcc-8
-             pool: ubuntu-latest
++            pool: ubuntu-20.04
 +          - jobname: linux-TEST-vars
 +            cc: gcc
 +            os: ubuntu
 +            cc_package: gcc-8
-             pool: ubuntu-latest
+             pool: ubuntu-20.04
            - jobname: osx-clang
              cc: clang
              pool: macos-latest
diff --cc ci/install-dependencies.sh
index dbcebad2fb,e6e283e323..df6c61713c
--- a/ci/install-dependencies.sh
+++ b/ci/install-dependencies.sh
@@@ -11,11 -11,18 +11,11 @@@ UBUNTU_COMMON_PKGS="make libssl-dev lib
   tcl tk gettext zlib1g-dev perl-modules liberror-perl libauthen-sasl-perl
   libemail-valid-perl libio-socket-ssl-perl libnet-smtp-ssl-perl"
  
 -case "$jobname" in
 -linux-clang|linux-gcc|linux-leaks)
 -	sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
 +case "$runs_on_pool" in
- ubuntu-latest)
++ubuntu-*)
  	sudo apt-get -q update
  	sudo apt-get -q -y install language-pack-is libsvn-perl apache2 \
- 		$UBUNTU_COMMON_PKGS $CC_PACKAGE
+ 		$UBUNTU_COMMON_PKGS $PYTHON_PACKAGE
 -	case "$jobname" in
 -	linux-gcc)
 -		sudo apt-get -q -y install gcc-8
 -		;;
 -	esac
 -
  	mkdir --parents "$P4_PATH"
  	pushd "$P4_PATH"
  		wget --quiet "$P4WHENCE/bin.linux26x86_64/p4d"
@@@ -37,24 -44,24 +37,26 @@@ macos-latest
  	test -z "$BREW_INSTALL_PACKAGES" ||
  	brew install $BREW_INSTALL_PACKAGES
  	brew link --force gettext
- 	brew install --cask --no-quarantine perforce || {
- 		# Update the definitions and try again
- 		cask_repo="$(brew --repository)"/Library/Taps/homebrew/homebrew-cask &&
- 		git -C "$cask_repo" pull --no-stat --ff-only &&
- 		brew install --cask --no-quarantine perforce
- 	} ||
- 	brew install homebrew/cask/perforce
+ 	mkdir -p $HOME/bin
+ 	(
+ 		cd $HOME/bin
+ 		wget -q "$P4WHENCE/bin.macosx1015x86_64/helix-core-server.tgz" &&
+ 		tar -xf helix-core-server.tgz &&
+ 		sudo xattr -d com.apple.quarantine p4 p4d 2>/dev/null || true
+ 	)
+ 	PATH="$PATH:${HOME}/bin"
+ 	export PATH
 -	case "$jobname" in
 -	osx-gcc)
 -		brew install gcc@9
 -		# Just in case the image is updated to contain gcc@9
 -		# pre-installed but not linked.
 -		brew link gcc@9
 -		;;
 -	esac
 +
 +	if test -n "$CC_PACKAGE"
 +	then
 +		BREW_PACKAGE=${CC_PACKAGE/-/@}
 +		brew install "$BREW_PACKAGE"
 +		brew link "$BREW_PACKAGE"
 +	fi
  	;;
 +esac
 +
 +case "$jobname" in
  StaticAnalysis)
  	sudo apt-get -q update
  	sudo apt-get -q -y install coccinelle libcurl4-openssl-dev libssl-dev \
diff --cc ci/lib.sh
index 9d28ab50fb,bbc19028d8..5e01a927f1
--- a/ci/lib.sh
+++ b/ci/lib.sh
@@@ -156,19 -182,15 +156,19 @@@ export DEFAULT_TEST_TARGET=prov
  export GIT_TEST_CLONE_2GB=true
  export SKIP_DASHED_BUILT_INS=YesPlease
  
 -case "$jobname" in
 -linux-clang|linux-gcc|linux-leaks)
 +case "$runs_on_pool" in
- ubuntu-latest)
++ubuntu-*)
 +	if test "$jobname" = "linux-gcc-default"
 +	then
 +		break
 +	fi
 +
+ 	PYTHON_PACKAGE=python2
  	if [ "$jobname" = linux-gcc ]
  	then
- 		MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=/usr/bin/python3"
- 	else
- 		MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=/usr/bin/python2"
 -		export CC=gcc-8
+ 		PYTHON_PACKAGE=python3
  	fi
+ 	MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=/usr/bin/$PYTHON_PACKAGE"
  
  	export GIT_TEST_HTTPD=true