Apply patches for sync with rev 1.84

LICENSE

@@ -35,7 +35,48 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-For the TPM 2 code the following license and notices apply:
+
+For TPM 2 code that does not explicitly state a license, the following
+license and notices apply:
+
+
+TCG Reference Implementation for TPM 2.0
+This code is informative.
+
+The copyright in this software is being made available under the BSD License,
+included below.
+
+Copyright 2010-2022 Microsoft Corporation
+Copyright 2022-2025 Trusted Computing Group and its contributors
+
+All rights reserved.
+
+
+BSD License
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ""AS IS""
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+For other TPM 2 code the following license and notices apply:
 
 
 Licenses and Notices

configure.ac

@@ -11,7 +11,7 @@ AC_CONFIG_HEADERS([config.h])
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE([foreign 1.6 subdir-objects])
+AM_INIT_AUTOMAKE([foreign 1.9 subdir-objects tar-pax])
 AM_SILENT_RULES([yes])
 
 LIBTPMS_VER_MAJOR=`echo $PACKAGE_VERSION | awk -F. '{print $1}'`

scripts/meld-all

@@ -5,6 +5,27 @@ SKIP_FILES="(Marshal.c|Marshal_fp.h)"
 
 NO_MELD_FLAG=$((1<<0))
 
+help()
+{
+	cat <<_EOF_
+Usage: TCG_TPM_HOME=... $1 [options] TPM2-directory
+
+The following options are available:
+
+--no-meld,--diff-only   : Only display diffs between files; the first two lines
+                          are related to the license and are ignore for the diff.
+--help                  : Display this help screen and exit.
+
+The environmet variable TCG_TPM_HOME must be set and point to
+the TCG TPM2 git checkout.
+
+Example:
+
+TCG_TPM_HOME=\$HOME/TPM $1 --diff-only src/tpm2
+
+_EOF_
+}
+
 main()
 {
 	local opts f fname upstream flags
@@ -65,7 +86,9 @@ main()
 			continue
 		fi
 
-		upstream=$(find "${TCG_TPM_HOME}" | grep -E "/${fname}\$")
+		fn=${f:${#1}}
+		upstream="${TCG_TPM_HOME}/${fn}"
+		#echo "$upstream"
 
 		if [ -n "${upstream}" ]; then
 			# find first empty line presumably after license
@@ -74,14 +97,18 @@ main()
 				if [ $((flags & NO_MELD_FLAG)) -eq 0 ]; then
 					meld "${upstrean}" "${f}"
 				else
-					echo "Something wrong with file $f"
+					echo "Something is wrong with file $f"
 				fi
 			fi
 			line=$((line+1))
 			if [ $((flags & NO_MELD_FLAG)) -ne 0 ]; then
 				echo "============================================================================"
-				echo "${f}"
-				diff --ignore-trailing-space <(sed -n "${line},\$p" < "${f}") "${upstream}"
+				if [ ! -f "${upstream}" ]; then
+					echo "${f}: file does not exist upstream"
+				else
+					echo "${f}"
+					diff --ignore-trailing-space <(sed -n "${line},\$p" < "${f}") "${upstream}"
+				fi
 			fi
 			if ! diff --ignore-trailing-space <(sed -n "${line},\$p" < "${f}") "${upstream}" &>/dev/null; then
 				if [ $((flags & NO_MELD_FLAG)) -eq 0 ]; then

scripts/meld-commit

@@ -0,0 +1,43 @@
+#!/usr/bin/env bash
+
+SKIP_FILES="(CMakeLists.txt|.cmake|CMakePresets.json|Makefile.am|configure.ac)$"
+
+if [ ! -d "$1" ]; then
+	echo "$1 is not a directory"
+	exit 1
+fi
+
+COMMIT="$2"
+if [ -z "$2" ]; then
+	echo "2nd parameter must be a commit id. Not given, so assuming 'HEAD'"
+	COMMIT="HEAD"
+fi
+
+if [ -z "${TCG_TPM_HOME}" ]; then
+	echo "TCG_TPM_HOME must be set to the TCG TPM repo checkout."
+	exit 1
+fi
+
+if [ ! -d "${TCG_TPM_HOME}" ]; then
+	echo "TCG_TPM_HOME must point to a directory."
+	exit 1
+fi
+
+set -x
+LIBTPMS_ROOT="$PWD"
+
+pushd "${TCG_TPM_HOME}" >/dev/null || exit 1
+
+git checkout "${COMMIT}" || exit 1
+
+for fname in $(git diff-tree --no-commit-id --name-only "${COMMIT}" -r); do
+	if [[ $(basename "${fname}") =~ ${SKIP_FILES} ]]; then
+		continue
+	fi
+	mkdir -p "$(dirname "${LIBTPMS_ROOT}/${1}/${fname}")"
+	touch "${LIBTPMS_ROOT}/${1}/${fname}"
+	meld "${fname}" "${LIBTPMS_ROOT}/${1}/${fname}"
+	if [ $(stat -c%s "${LIBTPMS_ROOT}/${1}/${fname}") -eq 0 ]; then
+		rm -f "${LIBTPMS_ROOT}/${1}/${fname}"
+	fi
+done