Here is a fresh diff for 1.21.1 (not 1.21) released on January 9, 2021. It is based on wen heping's diff for 1.21.
Changelog: https://git.savannah.gnu.org/cgit/wget.git/tree/NEWS I tested downloading and verifying SHA256 of install69.img. Feedback and tests are welcome. OK? Nam Nguyen writes: > wen heping writes: > >> Hi, >> >> Here is a patch for net/wget to update to 1.21, it build >> well and run well on amd64-6.8 system. >> >> >> wen > > Thank you for this update. It looks good to me. I can commit this if I > can get an OK. > > solene@: Should it be backported to -stable? > ${WRKSRC}/ChangeLog reports fixed memory leak, use of uninitialized > stack mem and stack memory leak found by Coverity, and other memory > leaks and a read buffer overflow. > > `make test' passes, skipping some. I tested by downloading an openbsd > ISO. I tested against the pending devel/pcre2 update, which I will > commit soon. > > Details on `make test' > ====================== > Here are some notes on `make test' explaining why they are skipped. > > 1. SKIP: Test-stdouterr.px > > This test tries writing to /dev/full and expects an exit status of 3, > indicating a File I/O error (per wget(1)). /dev/full does not exist on > OpenBSD. > > unless(-e "/dev/full") { > exit 77; # skip > } > > 2. SKIP: Test-no_proxy-env > > This is the only new unit test that appears to be skipped. Other tests > are skipped as in the previous release, 1.20.3. > > Test-no_proxy-env.log:1:SKIP Test-no_proxy-env.py (exit status: 77) > > This test, along with other tests, are skipped for the same > reason. gethostbyname fails and returns an error. This is to be expected > because _pbuild doesn't have network access. I confirmed this with a > minimal python3 reproducer that works when run as a user but fails when > using doas -u _pbuild. > > import socket > try: > ip = socket.gethostbyname("www.working2.localhost") > except socket.gaierror as _: > print("error"); > print("works " + ip); > > The other tests that fail for the same reason: > > SKIP: Test-https-selfsigned.px > SKIP: Test-https-weboftrust.px > SKIP: Test-https-tlsv1x.px > SKIP: Test-https-clientcert.px > SKIP: Test-https-tlsv1.px > SKIP: Test-https-pfs.px > SKIP: Test-https-crl.px > SKIP: Test-https-badcerts.px Index: Makefile =================================================================== RCS file: /cvs/ports/net/wget/Makefile,v retrieving revision 1.86 diff -u -p -u -p -r1.86 Makefile --- Makefile 23 Feb 2021 19:39:35 -0000 1.86 +++ Makefile 26 Jun 2021 09:10:48 -0000 @@ -2,9 +2,8 @@ COMMENT = retrieve files from the web via HTTP, HTTPS and FTP -DISTNAME = wget-1.20.3 +DISTNAME = wget-1.21.1 CATEGORIES = net -REVISION = 3 HOMEPAGE = https://www.gnu.org/software/wget/ MAINTAINER = Nam Nguyen <n...@berkeley.edu> Index: distinfo =================================================================== RCS file: /cvs/ports/net/wget/distinfo,v retrieving revision 1.25 diff -u -p -u -p -r1.25 distinfo --- distinfo 23 Apr 2019 20:15:08 -0000 1.25 +++ distinfo 26 Jun 2021 09:10:48 -0000 @@ -1,2 +1,2 @@ -SHA256 (wget-1.20.3.tar.gz) = MczPxmMFKNscjjoG9t7PKjcAYLmChBz6srhndAClCS4= -SIZE (wget-1.20.3.tar.gz) = 4489249 +SHA256 (wget-1.21.1.tar.gz) = WboL2t6a0TXtpYGuTlmnqfJeOkvealQZYysxkGEg4m4= +SIZE (wget-1.21.1.tar.gz) = 4884887 Index: patches/patch-Makefile_in =================================================================== RCS file: /cvs/ports/net/wget/patches/patch-Makefile_in,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-Makefile_in --- patches/patch-Makefile_in 4 Apr 2019 10:36:45 -0000 1.2 +++ patches/patch-Makefile_in 26 Jun 2021 09:10:48 -0000 @@ -3,12 +3,12 @@ $OpenBSD: patch-Makefile_in,v 1.2 2019/0 Index: Makefile.in --- Makefile.in.orig +++ Makefile.in -@@ -1469,7 +1469,7 @@ distuninstallcheck_listfiles = find . -type f | \ +@@ -1644,7 +1644,7 @@ distuninstallcheck_listfiles = find . -type f | \ ACLOCAL_AMFLAGS = -I m4 # subdirectories in the distribution --SUBDIRS = lib src doc po util fuzz tests testenv -+SUBDIRS = lib src doc po util tests testenv +-SUBDIRS = lib src doc po gnulib_po util fuzz tests testenv ++SUBDIRS = lib src doc po gnulib_po util tests testenv EXTRA_DIST = MAILING-LIST \ msdos/config.h msdos/Makefile.DJ \ msdos/Makefile.WC ABOUT-NLS \ Index: patches/patch-doc_wget_texi =================================================================== RCS file: /cvs/ports/net/wget/patches/patch-doc_wget_texi,v retrieving revision 1.16 diff -u -p -u -p -r1.16 patch-doc_wget_texi --- patches/patch-doc_wget_texi 21 Feb 2019 22:32:31 -0000 1.16 +++ patches/patch-doc_wget_texi 26 Jun 2021 09:10:48 -0000 @@ -2,7 +2,7 @@ $OpenBSD: patch-doc_wget_texi,v 1.16 201 Index: doc/wget.texi --- doc/wget.texi.orig +++ doc/wget.texi -@@ -190,7 +190,7 @@ gauge can be customized to your preferences. +@@ -195,7 +195,7 @@ gauge can be customized to your preferences. Most of the features are fully configurable, either through command line options, or via the initialization file @file{.wgetrc} (@pxref{Startup File}). Wget allows you to define @dfn{global} startup files @@ -11,7 +11,7 @@ Index: doc/wget.texi specify the location of a startup file with the --config option. To disable the reading of config files, use --no-config. If both --config and --no-config are given, --no-config is ignored. -@@ -199,7 +199,7 @@ If both --config and --no-config are given, --no-confi +@@ -204,7 +204,7 @@ If both --config and --no-config are given, --no-confi @ignore @c man begin FILES @table @samp @@ -20,7 +20,7 @@ Index: doc/wget.texi Default location of the @dfn{global} startup file. @item .wgetrc -@@ -3166,9 +3166,8 @@ commands. +@@ -3185,9 +3185,8 @@ commands. @cindex location of wgetrc When initializing, Wget will look for a @dfn{global} startup file, @@ -32,7 +32,7 @@ Index: doc/wget.texi Then it will look for the user's file. If the environmental variable @code{WGETRC} is set, Wget will try to load that file. Failing that, no -@@ -3178,7 +3177,7 @@ If @code{WGETRC} is not set, Wget will try to load @fi +@@ -3197,7 +3196,7 @@ If @code{WGETRC} is not set, Wget will try to load @fi The fact that user's settings are loaded after the system-wide ones means that in case of collision user's wgetrc @emph{overrides} the Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/net/wget/pkg/PLIST,v retrieving revision 1.26 diff -u -p -u -p -r1.26 PLIST --- pkg/PLIST 29 Jan 2014 06:08:42 -0000 1.26 +++ pkg/PLIST 26 Jun 2021 09:10:48 -0000 @@ -6,46 +6,90 @@ share/examples/wget/ share/examples/wget/wgetrc @sample ${SYSCONFDIR}/wgetrc +share/locale/af/ +share/locale/af/LC_MESSAGES/ +share/locale/af/LC_MESSAGES/wget-gnulib.mo +share/locale/be/LC_MESSAGES/wget-gnulib.mo share/locale/be/LC_MESSAGES/wget.mo +share/locale/bg/LC_MESSAGES/wget-gnulib.mo share/locale/bg/LC_MESSAGES/wget.mo +share/locale/ca/LC_MESSAGES/wget-gnulib.mo share/locale/ca/LC_MESSAGES/wget.mo +share/locale/cs/LC_MESSAGES/wget-gnulib.mo share/locale/cs/LC_MESSAGES/wget.mo +share/locale/da/LC_MESSAGES/wget-gnulib.mo share/locale/da/LC_MESSAGES/wget.mo +share/locale/de/LC_MESSAGES/wget-gnulib.mo share/locale/de/LC_MESSAGES/wget.mo +share/locale/el/LC_MESSAGES/wget-gnulib.mo share/locale/el/LC_MESSAGES/wget.mo share/locale/en_GB/ share/locale/en_GB/LC_MESSAGES/ share/locale/en_GB/LC_MESSAGES/wget.mo +share/locale/eo/LC_MESSAGES/wget-gnulib.mo share/locale/eo/LC_MESSAGES/wget.mo +share/locale/es/LC_MESSAGES/wget-gnulib.mo share/locale/es/LC_MESSAGES/wget.mo +share/locale/et/LC_MESSAGES/wget-gnulib.mo share/locale/et/LC_MESSAGES/wget.mo +share/locale/eu/LC_MESSAGES/wget-gnulib.mo share/locale/eu/LC_MESSAGES/wget.mo +share/locale/fi/LC_MESSAGES/wget-gnulib.mo share/locale/fi/LC_MESSAGES/wget.mo +share/locale/fr/LC_MESSAGES/wget-gnulib.mo share/locale/fr/LC_MESSAGES/wget.mo +share/locale/ga/LC_MESSAGES/wget-gnulib.mo share/locale/ga/LC_MESSAGES/wget.mo +share/locale/gl/LC_MESSAGES/wget-gnulib.mo share/locale/gl/LC_MESSAGES/wget.mo share/locale/he/LC_MESSAGES/wget.mo share/locale/hr/LC_MESSAGES/wget.mo +share/locale/hu/LC_MESSAGES/wget-gnulib.mo share/locale/hu/LC_MESSAGES/wget.mo share/locale/id/LC_MESSAGES/wget.mo +share/locale/it/LC_MESSAGES/wget-gnulib.mo share/locale/it/LC_MESSAGES/wget.mo +share/locale/ja/LC_MESSAGES/wget-gnulib.mo share/locale/ja/LC_MESSAGES/wget.mo +share/locale/ko/LC_MESSAGES/wget-gnulib.mo share/locale/lt/ share/locale/lt/LC_MESSAGES/ share/locale/lt/LC_MESSAGES/wget.mo +share/locale/ms/ +share/locale/ms/LC_MESSAGES/ +share/locale/ms/LC_MESSAGES/wget-gnulib.mo +share/locale/nb/LC_MESSAGES/wget-gnulib.mo share/locale/nb/LC_MESSAGES/wget.mo +share/locale/nl/LC_MESSAGES/wget-gnulib.mo share/locale/nl/LC_MESSAGES/wget.mo +share/locale/pl/LC_MESSAGES/wget-gnulib.mo share/locale/pl/LC_MESSAGES/wget.mo +share/locale/pt/LC_MESSAGES/wget-gnulib.mo share/locale/pt/LC_MESSAGES/wget.mo +share/locale/pt_BR/LC_MESSAGES/wget-gnulib.mo share/locale/pt_BR/LC_MESSAGES/wget.mo +share/locale/ro/LC_MESSAGES/wget-gnulib.mo share/locale/ro/LC_MESSAGES/wget.mo +share/locale/ru/LC_MESSAGES/wget-gnulib.mo share/locale/ru/LC_MESSAGES/wget.mo +share/locale/rw/ +share/locale/rw/LC_MESSAGES/ +share/locale/rw/LC_MESSAGES/wget-gnulib.mo +share/locale/sk/LC_MESSAGES/wget-gnulib.mo share/locale/sk/LC_MESSAGES/wget.mo +share/locale/sl/LC_MESSAGES/wget-gnulib.mo share/locale/sl/LC_MESSAGES/wget.mo +share/locale/sr/LC_MESSAGES/wget-gnulib.mo share/locale/sr/LC_MESSAGES/wget.mo +share/locale/sv/LC_MESSAGES/wget-gnulib.mo share/locale/sv/LC_MESSAGES/wget.mo +share/locale/tr/LC_MESSAGES/wget-gnulib.mo share/locale/tr/LC_MESSAGES/wget.mo +share/locale/uk/LC_MESSAGES/wget-gnulib.mo share/locale/uk/LC_MESSAGES/wget.mo +share/locale/vi/LC_MESSAGES/wget-gnulib.mo share/locale/vi/LC_MESSAGES/wget.mo +share/locale/zh_CN/LC_MESSAGES/wget-gnulib.mo share/locale/zh_CN/LC_MESSAGES/wget.mo +share/locale/zh_TW/LC_MESSAGES/wget-gnulib.mo share/locale/zh_TW/LC_MESSAGES/wget.mo
