From 641b116f04af9934da662de9ef4814f0beb79241 Mon Sep 17 00:00:00 2001
From: "Markus F.X.J. Oberhumer" <markus@oberhumer.com>
Date: Tue, 25 Jul 2023 12:18:33 +0200
Subject: [PATCH] Update .gitattributes.

---
 .gitattributes                        | 28 ++++++++++++++++++++-------
 .github/workflows/ci.yml              |  4 ++--
 .github/workflows/weekly-ci-zigcc.yml |  4 ++--
 misc/testsuite/upx_testsuite_1.sh     |  1 +
 src/Makefile                          |  4 ++--
 5 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index bbc91598..e67a7254 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,10 +1,24 @@
-# make GitHub language detection more accurate, see https://github.com/github/linguist
+# see https://github.com/github-linguist/linguist
+#
+# HINT: check settings with
+#   git ls-files | git check-attr --stdin --all
 
-src/*.h linguist-language=C++
-src/*/*.h linguist-language=C++
+# tell GitHub and other diff-tools that these files are automatically generated
 
-src/stub/**/*.ash linguist-language=Assembly
-src/stub/**/*.asm linguist-language=Assembly
-src/stub/**/*.S linguist-language=Assembly
+doc/upx.1                               linguist-generated
+doc/upx-doc.*                           linguist-generated
 
-src/stub/tmp/** linguist-vendored
+src/stub/*.h                            linguist-generated
+src/stub/src/arch/**/lzma_d_c[fns].S    linguist-generated
+src/stub/tmp/**                         linguist-generated
+
+# make GitHub language detection more accurate
+
+src/*.h             linguist-language=C++
+src/*/*.h           linguist-language=C++
+
+src/stub/**/*.ash   linguist-language=Assembly
+src/stub/**/*.asm   linguist-language=Assembly
+src/stub/**/*.S     linguist-language=Assembly
+
+src/stub/tmp/**     linguist-vendored
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index aed3568c..f79d5a9c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,8 +12,8 @@ env:
   CMAKE_REQUIRED_QUIET: OFF
   DEBIAN_FRONTEND: noninteractive
   UPX_CMAKE_BUILD_FLAGS: --verbose
-  # 2023-07-24
-  ZIG_DIST_VERSION: 0.11.0-dev.4195+7f3fdd2ff
+  # 2023-07-25
+  ZIG_DIST_VERSION: 0.11.0-dev.4228+aea29afc4
 
 jobs:
   job-rebuild-and-verify-stubs:
diff --git a/.github/workflows/weekly-ci-zigcc.yml b/.github/workflows/weekly-ci-zigcc.yml
index 0652d746..2bd2bbd6 100644
--- a/.github/workflows/weekly-ci-zigcc.yml
+++ b/.github/workflows/weekly-ci-zigcc.yml
@@ -8,8 +8,8 @@ on:
 env:
   CMAKE_REQUIRED_QUIET: OFF
   DEBIAN_FRONTEND: noninteractive
-  # 2023-07-24
-  ZIG_DIST_VERSION: 0.11.0-dev.4195+7f3fdd2ff
+  # 2023-07-25
+  ZIG_DIST_VERSION: 0.11.0-dev.4228+aea29afc4
 
 jobs:
   job-linux-zigcc: # uses cmake + make
diff --git a/misc/testsuite/upx_testsuite_1.sh b/misc/testsuite/upx_testsuite_1.sh
index b4ee521a..4875abec 100755
--- a/misc/testsuite/upx_testsuite_1.sh
+++ b/misc/testsuite/upx_testsuite_1.sh
@@ -70,6 +70,7 @@ upx_testsuite_BUILDDIR=$(readlink -fn "$upx_testsuite_BUILDDIR") # make absolute
 [[ -d $upx_testsuite_BUILDDIR ]] || exit 1
 
 cd / && cd "$upx_testsuite_BUILDDIR" || exit 1
+: > ./.mfxnobackup
 
 # upx_run check, part2
 if ! "${upx_run[@]}" --version-short >/dev/null; then
diff --git a/src/Makefile b/src/Makefile
index 6b1440cf..6537f7f8 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -62,12 +62,12 @@ endif
 
 # run the UPX testsuite
 # The expected (old) checksums are in $(top_srcdir)/misc/testsuite/upx_testsuite_1-expected_sha256sums.sh
-# The   actual (new) checksums are in ./tmp-testsuite/testsuite_1/.sha256sums.recreate
+# The   actual (new) checksums are in ./tmp-upx-testsuite/testsuite_1/.sha256sums.recreate
 ifneq ($(wildcard $(upx_testsuite_SRCDIR)/files/packed/.),)
 ifneq ($(wildcard $(top_srcdir)/misc/testsuite/upx_testsuite_1.sh),)
 run-testsuite: run-testsuite-release
 run-testsuite-%: export upx_testsuite_SRCDIR   := $(upx_testsuite_SRCDIR)
-run-testsuite-%: export upx_testsuite_BUILDDIR := ./tmp-testsuite
+run-testsuite-%: export upx_testsuite_BUILDDIR := ./tmp-upx-testsuite
 run-testsuite-debug: export upx_exe := $(top_srcdir)/build/debug/upx
 run-testsuite-debug: PHONY $(top_srcdir)/build/debug/upx
 	time -p bash $(top_srcdir)/misc/testsuite/upx_testsuite_1.sh