[Build] update.

Author: Escanor Liones

contrib/build-linux/appimage/Dockerfile

@@ -7,16 +7,25 @@ FROM debian:buster@sha256:233c3bbc892229c82da7231980d50adceba4db56a08c0b7053a485
 ENV LC_ALL=C.UTF-8 LANG=C.UTF-8
 ENV DEBIAN_FRONTEND=noninteractive
 
-# need ca-certificates before using snapshot packages
-RUN apt update -qq > /dev/null && apt install -qq --yes --no-install-recommends \
-    ca-certificates
+# bootstrap CA certificates using the default Debian mirrors (HTTP) before
+# switching over to the pinned snapshot archives
+RUN apt-get update -q && \
+    apt-get install -qy --no-install-recommends \
+        ca-certificates && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY apt.conf.d/99snapshot /etc/apt/apt.conf.d/99snapshot
 
 # pin the distro packages
+# Use the Debian snapshot archives and disable Release file expiration checks
 COPY apt.sources.list /etc/apt/sources.list
 COPY apt.preferences /etc/apt/preferences.d/snapshot
+COPY apt.conf.d/99snapshot /etc/apt/apt.conf.d/99snapshot
 
 RUN apt-get update -q && \
     apt-get install -qy --allow-downgrades \
+        ca-certificates \
+        build-essential \
         sudo \
         git \
         wget \
@@ -27,16 +36,24 @@ RUN apt-get update -q && \
         autopoint \
         pkg-config \
         xz-utils \
+        patch \
         libssl-dev \
         libssl1.1 \
         openssl \
         zlib1g-dev \
         libffi-dev \
+        libbz2-dev \
+        libreadline-dev \
         libncurses5-dev \
         libncurses5 \
         libtinfo-dev \
         libtinfo5 \
         libsqlite3-dev \
+        libgdbm-dev \
+        libgdbm-compat-dev \
+        libnss3-dev \
+        liblzma-dev \
+        libexpat1-dev \
         libusb-1.0-0-dev \
         libudev-dev \
         libudev1 \
@@ -81,6 +98,6 @@ RUN usermod -append --groups sudo ${USER}
 RUN echo "%sudo ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
 WORKDIR ${WORK_DIR}
 RUN chown --recursive ${USER} ${WORK_DIR}
-RUN apt update &&  apt install -y python3-pip 
+RUN apt-get update -q && apt-get install -qy python3-pip
 RUN pip3 install sympy mpmath
 USER ${USER}

contrib/build-linux/appimage/README.md

@@ -1,5 +1,5 @@
-AppImage binary for Electrum
-============================
+AppImage binary for FactWallet
+=============================
 
 ✓ _This binary should be reproducible, meaning you should be able to generate
    binaries that match the official releases._
@@ -34,14 +34,14 @@ see [issue #5159](https://github.com/spesmilo/electrum/issues/5159).
 ## FAQ
 
 ### How can I see what is included in the AppImage?
-Execute the binary as follows: `./electrum*.AppImage --appimage-extract`
+Execute the binary as follows: `./factwallet*.AppImage --appimage-extract`
 
 ### How to investigate diff between binaries if reproducibility fails?
 ```
 cd dist/
-./electrum-*-x86_64.AppImage1 --appimage-extract
+./factwallet-*-x86_64.AppImage1 --appimage-extract
 mv squashfs-root/ squashfs-root1/
-./electrum-*-x86_64.AppImage2 --appimage-extract
+./factwallet-*-x86_64.AppImage2 --appimage-extract
 mv squashfs-root/ squashfs-root2/
 $(cd squashfs-root1; find -type f -exec sha256sum '{}' \; > ./../sha256sum1)
 $(cd squashfs-root2; find -type f -exec sha256sum '{}' \; > ./../sha256sum2)

contrib/build-linux/appimage/apt.sources.list

@@ -1,2 +1,12 @@
+# Debian buster snapshot pinned for deterministic builds
+# Main repository
 deb https://snapshot.debian.org/archive/debian/20230317T205011Z/ buster main
-deb-src https://snapshot.debian.org/archive/debian/20230317T205011Z/ buster main
+deb-src https://snapshot.debian.org/archive/debian/20230317T205011Z/ buster main
+
+# Security updates
+deb https://snapshot.debian.org/archive/debian-security/20230317T205011Z/ buster/updates main
+deb-src https://snapshot.debian.org/archive/debian-security/20230317T205011Z/ buster/updates main
+
+# Point releases / updates
+deb https://snapshot.debian.org/archive/debian/20230317T205011Z/ buster-updates main
+deb-src https://snapshot.debian.org/archive/debian/20230317T205011Z/ buster-updates main

contrib/build-linux/appimage/make_appimage.sh

@@ -7,7 +7,7 @@ CONTRIB="$PROJECT_ROOT/contrib"
 CONTRIB_APPIMAGE="$CONTRIB/build-linux/appimage"
 DISTDIR="$PROJECT_ROOT/dist"
 BUILDDIR="$CONTRIB_APPIMAGE/build/appimage"
-APPDIR="$BUILDDIR/electrum.AppDir"
+APPDIR="$BUILDDIR/factwallet.AppDir"
 CACHEDIR="$CONTRIB_APPIMAGE/.cache/appimage"
 export DLL_TARGET_DIR="$CACHEDIR/dlls"
 PIP_CACHE_DIR="$CONTRIB_APPIMAGE/.cache/pip_cache"
@@ -24,7 +24,7 @@ PY_VER_MAJOR="3.10"  # as it appears in fs paths
 PKG2APPIMAGE_COMMIT="a9c85b7e61a3a883f4a35c41c5decb5af88b6b5d"
 
 VERSION=$(git describe --tags --dirty --always)
-APPIMAGE="$DISTDIR/electrum-$VERSION-x86_64.AppImage"
+APPIMAGE="$DISTDIR/factwallet-$VERSION-x86_64.AppImage"
 
 rm -rf "$BUILDDIR"
 mkdir -p "$APPDIR" "$CACHEDIR" "$PIP_CACHE_DIR" "$DISTDIR" "$DLL_TARGET_DIR"
@@ -37,8 +37,8 @@ info "downloading some dependencies."
 download_if_not_exist "$CACHEDIR/functions.sh" "https://raw.githubusercontent.com/AppImage/pkg2appimage/$PKG2APPIMAGE_COMMIT/functions.sh"
 verify_hash "$CACHEDIR/functions.sh" "8f67711a28635b07ce539a9b083b8c12d5488c00003d6d726c7b134e553220ed"
 
-download_if_not_exist "$CACHEDIR/appimagetool" "https://github.com/AppImage/AppImageKit/releases/download/13/appimagetool-x86_64.AppImage"
-verify_hash "$CACHEDIR/appimagetool" "df3baf5ca5facbecfc2f3fa6713c29ab9cefa8fd8c1eac5d283b79cab33e4acb"
+download_if_not_exist "$CACHEDIR/appimagetool" "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage"
+verify_hash "$CACHEDIR/appimagetool" "b90f4a8b18967545fda78a445b27680a1642f1ef9488ced28b65398f2be7ad2d"
 
 download_if_not_exist "$CACHEDIR/Python-$PYTHON_VERSION.tar.xz" "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz"
 verify_hash "$CACHEDIR/Python-$PYTHON_VERSION.tar.xz" "3c3bc3048303721c904a03eb8326b631e921f11cc3be2988456a42f115daf04c"

contrib/build-wine/build-electrum-git.sh

@@ -57,7 +57,9 @@ rm -rf dist/
 
 # build standalone and portable versions
 info "Running pyinstaller..."
-ELECTRUM_CMDLINE_NAME="$NAME_ROOT-$VERSION" wine "$WINE_PYHOME/scripts/pyinstaller.exe" --noconfirm --ascii --clean deterministic.spec
+# Use the Unicode-capable bootloader (no --ascii flag) so Electrum starts correctly even when
+# installed under paths containing non-ASCII characters (avoids "Error loading Python DLL").
+ELECTRUM_CMDLINE_NAME="$NAME_ROOT-$VERSION" wine "$WINE_PYHOME/scripts/pyinstaller.exe" --noconfirm --clean deterministic.spec
 
 # set timestamps in dist, in order to make the installer reproducible
 pushd dist