From 32e72010787b29c952075918e79b7d8468582d3a Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Thu, 16 Oct 2025 16:29:48 +0200 Subject: [PATCH] make-file-list: special-case `msys-assuan-0.dll` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As pointed out by Matthias Aßhauer in https://github.com/git-for-windows/git/issues/5625#issuecomment-3327019222, the `msys-assuan-0.dll` file is included in `libassuan` only for backwards-compatibility. Let's exclude it unless it is needed. Signed-off-by: Johannes Schindelin --- make-file-list.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/make-file-list.sh b/make-file-list.sh index 3ee5ca5d5a..990fe5c99f 100755 --- a/make-file-list.sh +++ b/make-file-list.sh @@ -193,6 +193,11 @@ if test i686 = "$ARCH" && ! grep msys-uuid-1 /usr/bin/msys-apr-1-0.dll 2>&1 >/de then I686_EXCLUDE='uuid\|lzma\|' fi +ASSUAN_0_EXCLUDE= +if ! grep msys-assuan-0 /usr/bin/gpg.exe 2>&1 >/dev/null +then + ASSUAN_0_EXCLUDE='\|assuan-0' +fi pacman_list $packages "$@" | @@ -244,7 +249,7 @@ grep -v -e '\.[acho]$' -e '\.l[ao]$' -e '/aclocal/' \ -e '^/usr/bin/msys-\('"$I686_EXCLUDE"'fdisk\|gettextpo\|gmpxx\|gnutlsxx\|gomp\|xml2\|xslt\|exslt\)-.*\.dll$' \ -e '^/usr/bin/msys-\(hdb\|history8\|kadm5\|kdc\|otp\|sl\).*\.dll$' \ -e '^/usr/bin/msys-\(atomic\|blkid\|charset\|gthread\|metalink\|nghttp2\|ssh2\|kafs\)-.*\.dll$' \ - -e '^/usr/bin/msys-\(ncurses++w6\|asprintf-[0-9]*\|\)\.dll$' \ + -e '^/usr/bin/msys-\(ncurses++w6\|asprintf-[0-9]*'"$ASSUAN_0_EXCLUDE"'\)\.dll$' \ -e '^/usr/bin/msys-\(formw6\|menuw6\|panelw6\)\.dll$' \ -e '^/usr/bin/msys-svn_swig_\(py\|ruby\)-.*\.dll$' \ -e '^/usr/bin/\(dumper\|sasl.*\|sshd\)\.exe$' \