update dockerfiles and build scripts

Update some package versions that are no longer available, use an untagged package version for sdist because setuptools no longers supports the tagged version.

contrib/build-linux/appimage/Dockerfile_ub1804

@@ -10,7 +10,7 @@ RUN echo deb ${UBUNTU_MIRROR} bionic main restricted universe multiverse > /etc/
     echo deb ${UBUNTU_MIRROR} bionic-security main restricted universe multiverse >> /etc/apt/sources.list && \
     apt-get update -q && \
     apt-get install -qy \
-        git=1:2.17.1-1ubuntu0.13 \
+        git=1:2.17.1-1ubuntu0.15 \
         wget=1.19.4-1ubuntu2.2 \
         make=4.1-9.1ubuntu1 \
         autotools-dev=20180224.1 \

contrib/build-wine/docker/Dockerfile

@@ -19,7 +19,7 @@ RUN echo deb ${UBUNTU_MIRROR} ${UBUNTUDIST} main restricted universe multiverse
         gnupg2=2.2.27-3ubuntu2.1 \
         ca-certificates=20211016 \
         wget=1.21.2-2ubuntu1 \
-        git=1:2.34.1-1ubuntu1.5 \
+        git=1:2.34.1-1ubuntu1.6 \
         p7zip-full=16.02+dfsg-8 \
         make=4.3-4.1build1 \
         autotools-dev=20220109.1 \
@@ -53,7 +53,7 @@ RUN echo "78b185fabdb323971d13bd329fefc8038e08559aa51c4996de18db0639a51df6 /tmp/
         # xvfb is needed to launch the Visual Studio installer
         xvfb=2:21.1.3-2ubuntu2.5 \
         # winbind is needed for the Visual Studio installer and cl.exe PDB generation
-        winbind=2:4.15.9+dfsg-0ubuntu0.3
+        winbind=2:4.15.13+dfsg-0ubuntu1
 
 RUN rm -rf /var/lib/apt/lists/* && \
     apt-get autoremove -y && \

contrib/make_linux_sdist

@@ -13,17 +13,19 @@ pushd "$contrib"/..
 
 # EC_PACKAGE_VERSION and EC_PACKAGE_NAME are used by setup.py to specify
 # generated filename with a version from git tag. Otherwise defaults are used.
-EC_PACKAGE_VERSION=`git describe --tags` || fail "Could not get determine git tag version"
+# As of latest setuptools, the version with git commit tag is not tolerated so
+# we only use the git tag for display.
+TAGGED_VERSION=`git describe --tags` || fail "Could not get determine git tag version"
 EC_PACKAGE_NAME="${PACKAGE}"
-export EC_PACKAGE_VERSION EC_PACKAGE_NAME
+export EC_PACKAGE_NAME
 
-info "Making SrcDist for version: ${EC_PACKAGE_NAME}-${EC_PACKAGE_VERSION} ..."
+info "Making SrcDist for version: ${EC_PACKAGE_NAME}-${TAGGED_VERSION} ..."
 
 "$contrib"/make_locale && \
     "$contrib"/make_packages && \
     python3 setup.py sdist --enable-secp --enable-zbar --enable-tor --format=zip,gztar || fail "Failed."
 
-unset EC_PACKAGE_VERSION EC_PACKAGE_NAME
+unset EC_PACKAGE_NAME TAGGED_VERSION
 
 info "Linux source distribution (including compiled libseck256k1 & libzbar) has been placed in dist/"