[pkg-gnupg-maint] Bug#949664: libassuan: diff for NMU version 2.5.3-7.1

[Filipi Souza]

Control: tags 949664 + pending

Dear maintainer,

I've prepared an NMU for libassuan (versioned as 2.5.3-7.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards,
Filipi Souza


diff -Nru libassuan-2.5.3/debian/changelog libassuan-
2.5.3/debian/changelog
--- libassuan-2.5.3/debian/changelog	2019-07-17 12:09:10.000000000
-0300
+++ libassuan-2.5.3/debian/changelog	2020-06-10 06:57:10.000000000
-0300
@@ -1,3 +1,12 @@
+libassuan (2.5.3-7.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/tests/build-windows: updated to fix testsuite flags being
+      incorrectly passed and to skip a test fail on arch arm64. Thanks
+      Gianfranco Costamagna. (Closes: #949664)
+
+ -- Filipi Souza <filipi.saci at gmail.com>  Wed, 10 Jun 2020 06:57:10
-0300
+
 libassuan (2.5.3-7) unstable; urgency=medium
 
   * export CPPFLAGS_FOR_BUILD as well
diff -Nru libassuan-2.5.3/debian/tests/build-windows libassuan-
2.5.3/debian/tests/build-windows
--- libassuan-2.5.3/debian/tests/build-windows	2019-07-16
14:49:54.000000000 -0300
+++ libassuan-2.5.3/debian/tests/build-windows	2020-06-10
06:57:10.000000000 -0300
@@ -2,35 +2,35 @@
 
 set -e
 
-ARCH=$1
+ARCH="$1"
 
 if [ "$ARCH" = x86_64 ]; then
-    GCC=x86_64-w64-mingw32-gcc
     WINE=/usr/lib/wine/wine64
     export WINESERVER=/usr/lib/wine/wineserver64
 elif [ "$ARCH" = i686 ]; then
-    GCC=i686-w64-mingw32-gcc
     WINE=/usr/lib/wine/wine
     export WINESERVER=/usr/lib/wine/wineserver32
 else
     printf >&2 'Unknown Architecture: %s\n' "$ARCH"
     exit 1
 fi
+GCC="${ARCH}-w64-mingw32-gcc"
 
 # get wine initialized, which normally spews logs to stderr
 # (autopkgtest doesn't want stderr)
 "$WINE" hostname 2>&1
 
-export PKG_CONFIG_PATH=/usr/x86_64-w64-mingw32/lib/pkgconfig
+if [ `dpkg --print-architecture` = 'arm64' ] ; then
+  echo "Don't fail testsuite on arm64, this test always failed there"
+  exit 0
+fi
 
-# see https://dev.gnupg.org/T4624 for why this is needed
-extralibs=(-lws2_32)
+export PKG_CONFIG_PATH="/usr/${ARCH}-w64-mingw32/lib/pkgconfig"
 
-"$GCC" -pedantic -Wall -Werror -o test-run.exe \
-       -static \
-       -Wl,--no-as-needed \
-       debian/tests/simple-build.c \
-       $(pkg-config --static --cflags --libs libassuan)
"${extralibs[@]}"
+# see https://dev.gnupg.org/T4624 for why this is needed
+extra_libs=(-lws2_32)
 
+# build a static windows binary around libassuan and run it:
+"$GCC" -pedantic -Wall -Werror -static -o test-run.exe
debian/tests/simple-build.c $(pkg-config --cflags --static --libs
libassuan) "${extra_libs[@]}"
 "$WINE" ./test-run.exe
-rm -f test-run.exe
+rm -f ./test-run.exe