Merge v1.21.3 from Wget

ArchiveTeam · May 3, 2022 · c9cca72 · c9cca72
1 parent 799b880
commit c9cca72
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -5,12 +5,12 @@ RUN set -eux \
  && case "${TLSTYPE}" in openssl) SSLPKG=libssl-dev;; gnutls) SSLPKG=gnutls-dev;; *) echo "Unknown TLSTYPE ${TLSTYPE}"; exit 1;; esac \
  && echo deb http://deb.debian.org/debian buster-backports main contrib > /etc/apt/sources.list.d/backports.list \
  && DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical apt-get -qqy --no-install-recommends -o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confold -o Dpkg::Options::=--force-unsafe-io update \
- && DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical apt-get -qqy --no-install-recommends -o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confold -o Dpkg::Options::=--force-unsafe-io install "${SSLPKG}" build-essential git bzip2 bash rsync gcc zlib1g-dev autoconf flex make automake gettext libidn11 autopoint texinfo gperf ca-certificates wget pkg-config libpsl-dev libidn2-dev lua5.1-dev \
+ && DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical apt-get -qqy --no-install-recommends -o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confold -o Dpkg::Options::=--force-unsafe-io install "${SSLPKG}" build-essential git bzip2 bash rsync gcc zlib1g-dev autoconf autoconf-archive flex make automake gettext libidn11 autopoint texinfo gperf ca-certificates wget pkg-config libpsl-dev libidn2-dev lua5.1-dev libgpgme-dev  \
  && DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical apt-get -qqy --no-install-recommends -o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confold -o Dpkg::Options::=--force-unsafe-io -t buster-backports install libzstd-dev zstd \
  && cd /tmp/wget \
  && ./bootstrap \
  && ./configure --with-ssl="${TLSTYPE}" -disable-nls \
  && make -j $(nproc) \
  && src/wget -V | grep -q lua
 FROM scratch
-COPY --from=wget_build /tmp/wget/src/wget /wget
+COPY --from=wget_build /tmp/wget/src/wget /wget
diff --git a/src/init.h b/src/init.h
@@ -43,6 +43,6 @@ void cleanup (void);
 void defaults (void);
 bool run_wgetrc (const char *file, file_stats_t *);
 
-#define MAX_LONGOPTION 26
+#define MAX_LONGOPTION 29
 
 #endif /* INIT_H */
diff --git a/src/luahooks.c b/src/luahooks.c
@@ -772,7 +772,7 @@ luahooks_get_urls (const char *file, const char *url, bool is_css,
 
 void
 luahooks_finish (double start_time, double end_time,
-                 int numurls, SUM_SIZE_INT total_downloaded_bytes,
+                 int numurls, wgint total_downloaded_bytes,
                  double total_download_time)
 {
   if (lua == NULL || !luahooks_function_lookup ("callbacks", "finish"))

diff --git a/src/luahooks.h b/src/luahooks.h
@@ -52,7 +52,7 @@ bool luahooks_can_generate_urls ();
 struct luahooks_url *luahooks_get_urls (const char *file, const char *url,
                                        bool is_css, struct iri *iri);
 void luahooks_finish (double start_time, double end_time,
-                 int numurls, SUM_SIZE_INT total_downloaded_bytes,
+                 int numurls, wgint total_downloaded_bytes,
                  double total_download_time);
 int luahooks_before_exit (int exit_status);