Adding upstream version 2.1.7.upstream/2.1.7

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 27 insertions, 17 deletions

diff --git a/maint/Makefile.am b/maint/Makefile.am
index 788dd46..bfdbfaf 100644
--- a/maint/Makefile.am
+++ b/maint/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2019-2022 the Pacemaker project contributors
+# Copyright 2019-2023 the Pacemaker project contributors
 #
 # The version control history for this file may have further details.
 #
@@ -18,14 +18,18 @@ EXTRA_DIST		= README
 #
 
 # Count changes in these directories
-CHANGELOG_DIRS = ../include ../lib ../daemons ../tools ../xml
+CHANGELOG_DIRS = ../include 	\
+		 ../lib 	\
+		 ../daemons 	\
+		 ../tools 	\
+		 ../xml
 
 .PHONY: require_last_release
 require_last_release:
 	@if [ -z "$(CHECKOUT)" ]; then					\
 		echo "This target must be run from a git checkout";	\
 		exit 1;							\
-	elif ! git rev-parse $(LAST_RELEASE) >/dev/null 2>&1; then	\
+	elif ! "$(GIT)" rev-parse $(LAST_RELEASE) >/dev/null 2>&1; then	\
 		echo "LAST_RELEASE must be set to a valid git tag";	\
 		exit 1;							\
 	fi
@@ -33,22 +37,23 @@ require_last_release:
 .PHONY: summary
 summary: require_last_release
 	@printf "* %s %s <%s> %s\n" "$$(date +'%a %b %d %Y')"		\
-		"$$(git config user.name)" "$$(git config user.email)"	\
+		"$$("$(GIT)" config user.name)"				\
+		"$$("$(GIT)" config user.email)"			\
 		"$(NEXT_RELEASE)"
 	@printf "\055 %d commits with%s\n"				\
-		"$$(git log --pretty=oneline --no-merges		\
+		"$$("$(GIT)" log --pretty=oneline --no-merges		\
 			$(LAST_RELEASE)..HEAD | wc -l)"			\
-		"$$(git diff $(LAST_RELEASE)..HEAD --shortstat		\
+		"$$("$(GIT)" diff $(LAST_RELEASE)..HEAD --shortstat	\
 			$(CHANGELOG_DIRS))"
 
 .PHONY: changes
 changes: summary
 	@printf "\n- Features added since $(LAST_RELEASE)\n"
-	@git log --pretty=format:'%s' --no-merges			\
+	@"$(GIT)" log --pretty=format:'%s' --no-merges			\
 		--abbrev-commit $(LAST_RELEASE)..HEAD			\
 		| sed -n -e 's/^ *Feature: */  + /p' | sort -uf
 	@printf "\n- Fixes since $(LAST_RELEASE)\n"
-	@git log --pretty=format:'%s' --no-merges			\
+	@"$(GIT)" log --pretty=format:'%s' --no-merges			\
 		--abbrev-commit $(LAST_RELEASE)..HEAD			\
 		| sed -n -e 's/^ *\(Fix\|High\|Bug\): */  + /p' | sed	\
 		-e 's/\(cib\|pacemaker-based\|based\):/CIB:/'		\
@@ -58,7 +63,7 @@ changes: summary
 		-e 's/\(PE\|pengine\|pacemaker-schedulerd\|schedulerd\):/scheduler:/'	\
 		| sort -uf
 	@printf "\n- Public API changes since $(LAST_RELEASE)\n"
-	@git log --pretty=format:'%s' --no-merges			\
+	@"$(GIT)" log --pretty=format:'%s' --no-merges			\
 		--abbrev-commit $(LAST_RELEASE)..HEAD			\
 		| sed -n -e 's/^ *API: */  + /p' | sort -uf
 
@@ -71,7 +76,7 @@ changelog: require_last_release
 
 .PHONY: authors
 authors: require_last_release
-	git log $(LAST_RELEASE)..$(COMMIT) --format='%an' | sort -u
+	"$(GIT)" log $(LAST_RELEASE)..$(COMMIT) --format='%an' | sort -u
 
 #
 # gnulib updates
@@ -91,17 +96,22 @@ gnulib-update:
 	@echo 'Pacemaker cannot update until minimum supported automake is 1.14'
 	@exit 1
 	if test -e gnulib; then							\
-		cd gnulib && git pull;						\
+		cd gnulib && "$(GIT)" pull;					\
 	else									\
-		git clone https://git.savannah.gnu.org/git/gnulib.git gnulib	\
-			&& cd gnulib && git config pull.rebase false;		\
+		"$(GIT)" clone https://git.savannah.gnu.org/git/gnulib.git	\
+			gnulib							\
+			&& cd gnulib && "$(GIT)" config pull.rebase false;	\
 	fi
 	cd $(top_srcdir) && maint/gnulib/gnulib-tool --source-base=lib/gnu 	\
 		--lgpl=2 --no-vc-files --no-conditional-dependencies --libtool	\
 		$(GNU_MODS_AVOID:%=--avoid %) --import $(GNU_MODS)
-	sed -i -e "s/bundled(gnulib).*/bundled(gnulib) = `date +'%Y%m%d'`/"	\
-		../rpm/pacemaker.spec.in
-	sed -i -e "s/_GL_EXTERN_INLINE/_GL_INLINE/" 				\
+	cp -p ../rpm/pacemaker.spec.in ../rpm/pacemaker.spec.in.$$
+	sed -e "s/bundled(gnulib).*/bundled(gnulib) = `date +'%Y%m%d'`/"	\
+		../rpm/pacemaker.spec.in > ../rpm/pacemaker.spec.in.$$
+	mv ../rpm/pacemaker.spec.in.$$ ../rpm/pacemaker.spec.in
+	cp -p ../lib/gnu/md5.c ../lib/gnu/md5.c.$$
+	sed -e "s/_GL_EXTERN_INLINE/_GL_INLINE/" 				\
 		-e "s#left_over -= 64;#left_over \&= 63; /* helps static analysis */#"	\
 		-e "s#&ctx->buffer\[16\]#\&(((char *) ctx->buffer)[64]) /* helps static analysis */#"	\
-		../lib/gnu/md5.c
+		../lib/gnu/md5.c > ../lib/gnu/md5.c.$$
+	mv ../lib/gnu/md5.c.$$ ../lib/gnu/md5.c