From 9db6d18d11531cae6a2f1b5ec3739687328aeb6f Mon Sep 17 00:00:00 2001
From: "Markus F.X.J. Oberhumer" <markus@oberhumer.com>
Date: Mon, 4 Jan 2021 17:23:57 +0100
Subject: [PATCH] Now using upx-stubtools 20210104 with new
 clang-format-10.0.1.

---
 .github/travis_build.sh           |  2 +-
 .github/workflows/ci.yml          |  2 +-
 src/stub/Makefile                 |  2 +-
 src/stub/scripts/upx-clang-format | 10 +++++-----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/travis_build.sh b/.github/travis_build.sh
index 75a51165..d6206424 100644
--- a/.github/travis_build.sh
+++ b/.github/travis_build.sh
@@ -43,7 +43,7 @@ if [[ $BM_X =~ (^|\+)rebuild-stubs($|\+) ]]; then
     elif [[ -f "$HOME/.local/bin/bin-upx/upx-stubtools-check-version" ]]; then
         bin_upx=$(readlink -en -- "$HOME/.local/bin/bin-upx")
     else
-        bin_upx=$(readlink -en -- "$upx_SRCDIR/../deps/bin-upx-20160918")
+        bin_upx=$(readlink -en -- "$upx_SRCDIR/../deps/bin-upx-20210104")
     fi
     cd / && cd $upx_SRCDIR || exit 1
     extra_subdirs=()
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b1a6ad29..ccc450a6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,7 +26,7 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y libmpfr4:i386 zlib1g:i386
           cd ..; mkdir -p deps; cd deps
-          wget -q -O - https://github.com/upx/upx-stubtools/releases/download/v20160918/bin-upx-20160918.tar.xz | tar -xJ
+          wget -q -O - https://github.com/upx/upx-stubtools/releases/download/v20210104/bin-upx-20210104.tar.xz | tar -xJ
       - name: 'Check out code'
         uses: actions/checkout@v2
         with: { submodules: true }
diff --git a/src/stub/Makefile b/src/stub/Makefile
index 3d9e7f78..efac1de7 100644
--- a/src/stub/Makefile
+++ b/src/stub/Makefile
@@ -162,7 +162,7 @@ endif
 all.targets ?= .upx-stubtools-stamp tmp/.tmp-stamp .all-stamp
 all: $$(all.targets)
 .upx-stubtools-stamp: $(MAKEFILE_LIST)
-	upx-stubtools-check-version 20160918
+	upx-stubtools-check-version 20210104
 	@echo "timestamp" > $@
 .DELETE_ON_ERROR: .upx-stubtools-stamp
 %/.tmp-stamp:
diff --git a/src/stub/scripts/upx-clang-format b/src/stub/scripts/upx-clang-format
index b4f86eb6..27a9f55c 100755
--- a/src/stub/scripts/upx-clang-format
+++ b/src/stub/scripts/upx-clang-format
@@ -2,18 +2,18 @@
 ## vim:set ts=4 sw=4 et:
 set -e; set -o pipefail
 
-# NOTE: we are using clang-format-3.9.0 from upx-stubtools
+# NOTE: we are using clang-format-10.0.1 from upx-stubtools
 # see https://github.com/upx/upx-stubtools/releases
 
-CLANG_FORMAT="$HOME/local/bin/bin-upx/clang-format-3.9.0"
+CLANG_FORMAT="$HOME/local/bin/bin-upx/clang-format-10.0.1"
 if [[ ! -f $CLANG_FORMAT ]]; then
-CLANG_FORMAT="$HOME/.local/bin/bin-upx/clang-format-3.9.0"
+CLANG_FORMAT="$HOME/.local/bin/bin-upx/clang-format-10.0.1"
 fi
 if [[ ! -f $CLANG_FORMAT ]]; then
-CLANG_FORMAT="$HOME/bin/bin-upx/clang-format-3.9.0"
+CLANG_FORMAT="$HOME/bin/bin-upx/clang-format-10.0.1"
 fi
 if [[ ! -f $CLANG_FORMAT ]]; then
-    echo "ERROR: $0: cannot find clang-format-3.9.0"
+    echo "ERROR: $0: cannot find clang-format-10.0.1"
     echo "ERROR: $0: please visit https://github.com/upx/upx-stubtools/releases"
     exit 1
 fi