Re: update net/wget 1.21.4

2023-08-01 Thread Nam Nguyen 
Christian Weisgerber writes:

> Nam Nguyen:
>
>> It is weird that it successfully builds unit-tests (before ...) then
>> tries to rebuild it again (after ...):
>
> The difference is staring you in the face. ;-)

Thanks for investigating. MAKE_JOBS=1 works and unit-tests rebuilds
three times identically. Can you commit this with REVISION bump if
needed? ok namn@

>
> The Makefile mixes "unit-tests" and "./unit-tests".  gmake understands
> that those refer to one and the same target; our make doesn't.

Re: update net/wget 1.21.4

2023-07-30 Thread Christian Weisgerber 
Nam Nguyen:

> It is weird that it successfully builds unit-tests (before ...) then
> tries to rebuild it again (after ...):

The difference is staring you in the face. ;-)

The Makefile mixes "unit-tests" and "./unit-tests".  gmake understands
that those refer to one and the same target; our make doesn't.

diff /usr/ports
commit - ba5d71eefddb381a11ffc945887767c4c7e5d5e5
path + /usr/ports
blob - d4ca85af01bda790b0106563a29ab7f6a97a0515
file + net/wget/Makefile
--- net/wget/Makefile
+++ net/wget/Makefile
@@ -31,9 +31,6 @@ FAKE_FLAGS =  sysconfdir="${PREFIX}/share/examples/wge
 
 FAKE_FLAGS =   sysconfdir="${PREFIX}/share/examples/wget"
 
-# for tests
-USE_GMAKE =Yes
-
 CONFIGURE_STYLE =  gnu
 CONFIGURE_ARGS =   --with-ssl=openssl
 CONFIGURE_ENV +=   CPPFLAGS="-I${LOCALBASE}/include" \
blob - /dev/null
file + net/wget/patches/patch-tests_Makefile_in (mode 644)
--- /dev/null
+++ net/wget/patches/patch-tests_Makefile_in
@@ -0,0 +1,27 @@
+Our make(1) treats ./unit-tests and unit-tests as distinct targets.
+
+Index: tests/Makefile.in
+--- tests/Makefile.in.orig
 tests/Makefile.in
+@@ -2158,7 +2158,7 @@ AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/li
+ 
+ AM_CFLAGS = $(WERROR_CFLAGS) $(WARN_CFLAGS)
+ CLEANFILES = *~ *.bak core core.[0-9]*
+-TESTS = ./unit-tests$(EXEEXT) $(PX_TESTS)
++TESTS = unit-tests$(EXEEXT) $(PX_TESTS)
+ TEST_EXTENSIONS = .px
+ PX_LOG_COMPILER = $(PERL)
+ AM_PX_LOG_FLAGS = -I$(srcdir)
+@@ -2429,9 +2429,9 @@ recheck: all $(check_PROGRAMS)
+   am__force_recheck=am--force-recheck \
+   TEST_LOGS="$$log_list"; \
+   exit $$?
+-./unit-tests.log: ./unit-tests$(EXEEXT)
+-  @p='./unit-tests$(EXEEXT)'; \
+-  b='./unit-tests'; \
++unit-tests.log: unit-tests$(EXEEXT)
++  @p='unit-tests$(EXEEXT)'; \
++  b='unit-tests'; \
+   $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+   --log-file $$b.log --trs-file $$b.trs \
+   $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) 
-- $(LOG_COMPILE) \
-- 
Christian "naddy" Weisgerber  na...@mips.inka.de

Re: update net/wget 1.21.4

2023-07-28 Thread Stuart Henderson 
On 2023/07/27 18:39, Nam Nguyen wrote:
> I can reproduce this wget.h not found error with MAKE_JOBS=1. naddy@
> reported this error a while ago, too.
> 
> Here is an inline diff that additionally switches back to USE_GMAKE =
> Yes so tests can reliably compile with MAKE_JOBS=1. Still OK?

Yes (might be worth a quick comment like "# for tests" too?)

Re: update net/wget 1.21.4

2023-07-27 Thread Nam Nguyen 
Stuart Henderson writes:

> On 2023/07/27 14:44, Nam Nguyen wrote:
>> Stuart Henderson writes:
>> 
>> > tests fail to run completely here:
>> >
>> > cc -I/usr/local/include -I/usr/local/include -DHAVE_LIBSSL
>> > -I/usr/local/include -DNDEBUG -O2 -pipe -I/usr/local/include
>> > -L/usr/local/lib -o ./unit-tests ./unit-tests.c
>> > ./unit-tests.c:31:10: fatal error: 'wget.h' file not found
>> 
>> I can reproduce this if I run `make check' in ${WRKSRC}. If I run `make
>> test' in the port directory it is able to run the test suite, and it
>> omits that compile line.
>
> It usually fails "make test" in the port directory for me.
> Seems I am able to get it to work (not sure if reliably or just
> sometimes) with MAKE_JOBS=6 though.

I can reproduce this wget.h not found error with MAKE_JOBS=1. naddy@
reported this error a while ago, too.

Here is an inline diff that additionally switches back to USE_GMAKE =
Yes so tests can reliably compile with MAKE_JOBS=1. Still OK?

It is weird that it successfully builds unit-tests (before ...) then
tries to rebuild it again (after ...):

--8<---cut here---start->8---
cc   -I/usr/local/include -I/usr/local/include  -DHAVE_LIBSSL  
-I/usr/local/include -DNDEBUG -O2 -pipe  -L/usr/local/lib -o unit-tests 
unit-tests.o ../src/libunittest.a ../lib/libgnu.a  
/usr/local/lib/libiconv.so.7.1 /usr/local/lib
/libintl.so.7.0 /usr/local/lib/libiconv.so.7.1 -Wl,-rpath,/usr/local/lib  
/usr/local/lib/libunistring.so.0.1 /usr/local/lib/libiconv.so.7.1 
-Wl,-rpath,/usr/local/lib  -L/usr/local/lib -lpcre2-8 -L/usr/local/lib -lidn2 
-lssl -lcrypto -lz -L
/usr/local/lib -lpsl

...

cd ../src && make  libunittest.a
`libunittest.a' is up to date.
cc -I/usr/local/include -I/usr/local/include  -DHAVE_LIBSSL  
-I/usr/local/include -DNDEBUG -O2 -pipe -I/usr/local/include -L/usr/local/lib 
-o ./unit-tests ./unit-tests.c
./unit-tests.c:31:10: fatal error: 'wget.h' file not found
#include "wget.h"
 ^~~~
1 error generated.
--8<---cut here---end--->8---

This seems like difference in behavior between make and gmake. Maybe
because unit-tests is specified as an explicit rule in [3] it somehow
wants to rebuild it at some point and the include paths are
insufficient? Maybe it is the usage of parallel-tests feature in [2] and
[4]?

[1] 
https://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.71/html_node/Make-Target-Lookup.html#Make-Target-Lookup

"OpenBSD and FreeBSD make, however, never perform a VPATH search for a
dependency that has an explicit rule. This is extremely annoying."

[2] 
https://www.gnu.org/software/automake/manual/html_node/Parallel-Test-Harness.html#Parallel-Test-Harness

"it is not possible to specify distributed tests that are themselves
generated by means of explicit rules, in a way that is portable to all
make implementations (see Make Target Lookup in The Autoconf Manual, the
semantics of FreeBSD and OpenBSD make conflict with this). In case of
doubt you may want to require to use GNU make, or work around the issue
with inference rules to generate the tests."

[3] ${WRKSRC}/tests/Makefile

--8<---cut here---start->8---
   2205 unit-tests$(EXEEXT): $(unit_tests_OBJECTS) $(unit_tests_DEPENDENCIES) 
$(EXTRA_unit_tests_DEPENDENCIES)
   2206 @rm -f unit-tests$(EXEEXT)
   2207 $(AM_V_CCLD)$(LINK) $(unit_tests_OBJECTS) $(unit_tests_LDADD) 
$(LIBS)
--8<---cut here---end--->8---

[4] parallel-tests feature 
https://www.gnu.org/software/automake/manual/1.11.6/html_node/Simple-Tests-using-parallel_002dtests.html

--8<---cut here---start->8---
testenv/README
6:This Test Suite exploits the Parallel Test Harness available in GNU
Autotools.

testenv/Makefile
2077:AUTOMAKE_OPTIONS = parallel-tests

testenv/Makefile.am
109:AUTOMAKE_OPTIONS = parallel-tests

tests/Makefile
45:# see
http://www.gnu.org/software/automake/manual/html_node/Parallel-Test-Harness.html#Parallel-Test-Harness
--8<---cut here---end--->8---

Index: Makefile
===
RCS file: /cvs/ports/net/wget/Makefile,v
retrieving revision 1.91
diff -u -p -u -p -r1.91 Makefile
--- Makefile3 Apr 2022 23:42:36 -   1.91
+++ Makefile28 Jul 2023 01:43:27 -
@@ -1,6 +1,6 @@
 COMMENT =  retrieve files from the web via HTTP, HTTPS and FTP
 
-DISTNAME = wget-1.21.3
+DISTNAME = wget-1.21.4
 CATEGORIES =   net
 
 HOMEPAGE = https://www.gnu.org/software/wget/
@@ -30,6 +30,8 @@ TEST_DEPENDS =www/p5-HTTP-Daemon ${MOD
 TEST_DEPENDS +=www/p5-HTTP-Message security/p5-IO-Socket-SSL
 
 FAKE_FLAGS =   sysconfdir="${PREFIX}/share/examples/wget"
+
+USE_GMAKE =Yes
 
 CONFIGURE_STYLE =  gnu
 CONFIGURE_ARGS =   --with-ssl=openssl
Index: distinfo

Re: update net/wget 1.21.4

2023-07-27 Thread Stuart Henderson 
On 2023/07/27 14:44, Nam Nguyen wrote:
> Stuart Henderson writes:
> 
> > tests fail to run completely here:
> >
> > cc -I/usr/local/include -I/usr/local/include -DHAVE_LIBSSL
> > -I/usr/local/include -DNDEBUG -O2 -pipe -I/usr/local/include
> > -L/usr/local/lib -o ./unit-tests ./unit-tests.c
> > ./unit-tests.c:31:10: fatal error: 'wget.h' file not found
> 
> I can reproduce this if I run `make check' in ${WRKSRC}. If I run `make
> test' in the port directory it is able to run the test suite, and it
> omits that compile line.

It usually fails "make test" in the port directory for me.
Seems I am able to get it to work (not sure if reliably or just
sometimes) with MAKE_JOBS=6 though.

> > I would avoid patching tests infrastructure just to avoid test failures,
> > unless those failures prevent other tests from running.
> 
> Here is a simplified update to wget with test patching removed.
> 
> I am waiting for feedback from upstream on two better patches that
> ignore the wget-log output file in the python and perl test
> scripts. This does not have to hold up the update.

ok

> see:
> https://lists.gnu.org/archive/html/bug-wget/2023-07/msg9.html
> 
> OK?
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/wget/Makefile,v
> retrieving revision 1.91
> diff -u -p -u -p -r1.91 Makefile
> --- Makefile  3 Apr 2022 23:42:36 -   1.91
> +++ Makefile  26 Jul 2023 21:44:10 -
> @@ -1,6 +1,6 @@
>  COMMENT =retrieve files from the web via HTTP, HTTPS and FTP
>  
> -DISTNAME =   wget-1.21.3
> +DISTNAME =   wget-1.21.4
>  CATEGORIES = net
>  
>  HOMEPAGE =   https://www.gnu.org/software/wget/
> Index: distinfo
> ===
> RCS file: /cvs/ports/net/wget/distinfo,v
> retrieving revision 1.28
> diff -u -p -u -p -r1.28 distinfo
> --- distinfo  3 Apr 2022 23:42:36 -   1.28
> +++ distinfo  26 Jul 2023 21:44:10 -
> @@ -1,2 +1,2 @@
> -SHA256 (wget-1.21.3.tar.gz) = Vya7i8XKD23HEQ9kFuS7cBni0v9b+T0cov/MZlbyIOU=
> -SIZE (wget-1.21.3.tar.gz) = 5079864
> +SHA256 (wget-1.21.4.tar.gz) = gVQvXO+4+qzDm7vGyC3tgOPkqIUFrnLqUd8nUlvN4Ew=
> +SIZE (wget-1.21.4.tar.gz) = 5059591
> Index: patches/patch-Makefile_in
> ===
> RCS file: /cvs/ports/net/wget/patches/patch-Makefile_in,v
> retrieving revision 1.6
> diff -u -p -u -p -r1.6 patch-Makefile_in
> --- patches/patch-Makefile_in 3 Apr 2022 23:42:36 -   1.6
> +++ patches/patch-Makefile_in 26 Jul 2023 21:44:10 -
> @@ -1,7 +1,7 @@
>  Index: Makefile.in
>  --- Makefile.in.orig
>  +++ Makefile.in
> -@@ -1691,7 +1691,7 @@ distuninstallcheck_listfiles = find . -type f | \
> +@@ -1895,7 +1895,7 @@ distuninstallcheck_listfiles = find . -type f | \
>   ACLOCAL_AMFLAGS = -I m4
>   
>   # subdirectories in the distribution
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/net/wget/pkg/PLIST,v
> retrieving revision 1.29
> diff -u -p -u -p -r1.29 PLIST
> --- pkg/PLIST 11 Mar 2022 19:48:11 -  1.29
> +++ pkg/PLIST 26 Jul 2023 21:44:10 -
> @@ -50,6 +50,10 @@ share/locale/it/LC_MESSAGES/wget-gnulib.
>  share/locale/it/LC_MESSAGES/wget.mo
>  share/locale/ja/LC_MESSAGES/wget-gnulib.mo
>  share/locale/ja/LC_MESSAGES/wget.mo
> +share/locale/ka/
> +share/locale/ka/LC_MESSAGES/
> +share/locale/ka/LC_MESSAGES/wget-gnulib.mo
> +share/locale/ka/LC_MESSAGES/wget.mo
>  share/locale/ko/LC_MESSAGES/wget-gnulib.mo
>  share/locale/ko/LC_MESSAGES/wget.mo
>  share/locale/lt/

Re: update net/wget 1.21.4

2023-07-27 Thread Nam Nguyen 
Stuart Henderson writes:

> tests fail to run completely here:
>
> cc -I/usr/local/include -I/usr/local/include -DHAVE_LIBSSL
> -I/usr/local/include -DNDEBUG -O2 -pipe -I/usr/local/include
> -L/usr/local/lib -o ./unit-tests ./unit-tests.c
> ./unit-tests.c:31:10: fatal error: 'wget.h' file not found

I can reproduce this if I run `make check' in ${WRKSRC}. If I run `make
test' in the port directory it is able to run the test suite, and it
omits that compile line.

>
> I would avoid patching tests infrastructure just to avoid test failures,
> unless those failures prevent other tests from running.

Here is a simplified update to wget with test patching removed.

I am waiting for feedback from upstream on two better patches that
ignore the wget-log output file in the python and perl test
scripts. This does not have to hold up the update.

see:
https://lists.gnu.org/archive/html/bug-wget/2023-07/msg9.html

OK?

Index: Makefile
===
RCS file: /cvs/ports/net/wget/Makefile,v
retrieving revision 1.91
diff -u -p -u -p -r1.91 Makefile
--- Makefile3 Apr 2022 23:42:36 -   1.91
+++ Makefile26 Jul 2023 21:44:10 -
@@ -1,6 +1,6 @@
 COMMENT =  retrieve files from the web via HTTP, HTTPS and FTP
 
-DISTNAME = wget-1.21.3
+DISTNAME = wget-1.21.4
 CATEGORIES =   net
 
 HOMEPAGE = https://www.gnu.org/software/wget/
Index: distinfo
===
RCS file: /cvs/ports/net/wget/distinfo,v
retrieving revision 1.28
diff -u -p -u -p -r1.28 distinfo
--- distinfo3 Apr 2022 23:42:36 -   1.28
+++ distinfo26 Jul 2023 21:44:10 -
@@ -1,2 +1,2 @@
-SHA256 (wget-1.21.3.tar.gz) = Vya7i8XKD23HEQ9kFuS7cBni0v9b+T0cov/MZlbyIOU=
-SIZE (wget-1.21.3.tar.gz) = 5079864
+SHA256 (wget-1.21.4.tar.gz) = gVQvXO+4+qzDm7vGyC3tgOPkqIUFrnLqUd8nUlvN4Ew=
+SIZE (wget-1.21.4.tar.gz) = 5059591
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/net/wget/patches/patch-Makefile_in,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 patch-Makefile_in
--- patches/patch-Makefile_in   3 Apr 2022 23:42:36 -   1.6
+++ patches/patch-Makefile_in   26 Jul 2023 21:44:10 -
@@ -1,7 +1,7 @@
 Index: Makefile.in
 --- Makefile.in.orig
 +++ Makefile.in
-@@ -1691,7 +1691,7 @@ distuninstallcheck_listfiles = find . -type f | \
+@@ -1895,7 +1895,7 @@ distuninstallcheck_listfiles = find . -type f | \
  ACLOCAL_AMFLAGS = -I m4
  
  # subdirectories in the distribution
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/wget/pkg/PLIST,v
retrieving revision 1.29
diff -u -p -u -p -r1.29 PLIST
--- pkg/PLIST   11 Mar 2022 19:48:11 -  1.29
+++ pkg/PLIST   26 Jul 2023 21:44:10 -
@@ -50,6 +50,10 @@ share/locale/it/LC_MESSAGES/wget-gnulib.
 share/locale/it/LC_MESSAGES/wget.mo
 share/locale/ja/LC_MESSAGES/wget-gnulib.mo
 share/locale/ja/LC_MESSAGES/wget.mo
+share/locale/ka/
+share/locale/ka/LC_MESSAGES/
+share/locale/ka/LC_MESSAGES/wget-gnulib.mo
+share/locale/ka/LC_MESSAGES/wget.mo
 share/locale/ko/LC_MESSAGES/wget-gnulib.mo
 share/locale/ko/LC_MESSAGES/wget.mo
 share/locale/lt/

Re: update net/wget 1.21.4

2023-07-26 Thread Stuart Henderson 
On 2023/07/25 16:48, Nam Nguyen wrote:
> Here is an update to net/wget 1.21.4. I introduced two new patches as a
> workaround to pass unit tests, which falsely fail because of generating
> unexpected output when run in the background.

tests fail to run completely here:

cc -I/usr/local/include -I/usr/local/include  -DHAVE_LIBSSL 
-I/usr/local/include -DNDEBUG -O2 -pipe -I/usr/local/include -L/usr/local/lib 
-o ./unit-tests ./unit-tests.c 
./unit-tests.c:31:10: fatal error: 'wget.h' file not found

I would avoid patching tests infrastructure just to avoid test failures,
unless those failures prevent other tests from running.

update net/wget 1.21.4

2023-07-25 Thread Nam Nguyen 
Here is an update to net/wget 1.21.4. I introduced two new patches as a
workaround to pass unit tests, which falsely fail because of generating
unexpected output when run in the background.

see:
https://lists.gnu.org/archive/html/bug-wget/2023-07/msg1.html

NEWS:
https://git.savannah.gnu.org/cgit/wget.git/commit/?h=v1.21.4=e234354080aeb0db03d0604c8f592d472b6af489

To test I downloaded install73.img. Unit tests now pass (before, a
majority failed) and some are skipped. OK?

Index: Makefile
===
RCS file: /cvs/ports/net/wget/Makefile,v
retrieving revision 1.91
diff -u -p -r1.91 Makefile
--- Makefile3 Apr 2022 23:42:36 -   1.91
+++ Makefile25 Jul 2023 23:33:53 -
@@ -1,6 +1,6 @@
 COMMENT =  retrieve files from the web via HTTP, HTTPS and FTP
 
-DISTNAME = wget-1.21.3
+DISTNAME = wget-1.21.4
 CATEGORIES =   net
 
 HOMEPAGE = https://www.gnu.org/software/wget/
Index: distinfo
===
RCS file: /cvs/ports/net/wget/distinfo,v
retrieving revision 1.28
diff -u -p -r1.28 distinfo
--- distinfo3 Apr 2022 23:42:36 -   1.28
+++ distinfo25 Jul 2023 23:33:53 -
@@ -1,2 +1,2 @@
-SHA256 (wget-1.21.3.tar.gz) = Vya7i8XKD23HEQ9kFuS7cBni0v9b+T0cov/MZlbyIOU=
-SIZE (wget-1.21.3.tar.gz) = 5079864
+SHA256 (wget-1.21.4.tar.gz) = gVQvXO+4+qzDm7vGyC3tgOPkqIUFrnLqUd8nUlvN4Ew=
+SIZE (wget-1.21.4.tar.gz) = 5059591
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/net/wget/patches/patch-Makefile_in,v
retrieving revision 1.6
diff -u -p -r1.6 patch-Makefile_in
--- patches/patch-Makefile_in   3 Apr 2022 23:42:36 -   1.6
+++ patches/patch-Makefile_in   25 Jul 2023 23:33:53 -
@@ -1,7 +1,7 @@
 Index: Makefile.in
 --- Makefile.in.orig
 +++ Makefile.in
-@@ -1691,7 +1691,7 @@ distuninstallcheck_listfiles = find . -type f | \
+@@ -1895,7 +1895,7 @@ distuninstallcheck_listfiles = find . -type f | \
  ACLOCAL_AMFLAGS = -I m4
  
  # subdirectories in the distribution
Index: patches/patch-testenv_conf_expected_files_py
===
RCS file: patches/patch-testenv_conf_expected_files_py
diff -N patches/patch-testenv_conf_expected_files_py
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-testenv_conf_expected_files_py25 Jul 2023 23:33:53 
-
@@ -0,0 +1,13 @@
+failing tests generate unexpected output files in the background
+
+see:
+https://lists.gnu.org/archive/html/bug-wget/2023-07/msg1.html
+
+Index: testenv/conf/expected_files.py
+--- testenv/conf/expected_files.py.orig
 testenv/conf/expected_files.py
+@@ -55,4 +55,3 @@ class ExpectedFiles:
+ raise TestFailed('Expected file %s not found.' % file.name)
+ if local_fs:
+ print(local_fs)
+-raise TestFailed('Extra files downloaded.')
Index: patches/patch-tests_WgetTests_pm
===
RCS file: patches/patch-tests_WgetTests_pm
diff -N patches/patch-tests_WgetTests_pm
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-tests_WgetTests_pm25 Jul 2023 23:33:53 -
@@ -0,0 +1,17 @@
+failing tests generate unexpected output files in the background
+
+see:
+https://lists.gnu.org/archive/html/bug-wget/2023-07/msg1.html
+
+Index: tests/WgetTests.pm
+--- tests/WgetTests.pm.orig
 tests/WgetTests.pm
+@@ -365,8 +365,6 @@ sub _verify_download
+   );
+ if (@unexpected_downloads)
+ {
+-return 'Test failed: unexpected downloaded files [' .
+-  (join ', ', @unexpected_downloads) . "]\n";
+ 
+ }
+ 
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/wget/pkg/PLIST,v
retrieving revision 1.29
diff -u -p -r1.29 PLIST
--- pkg/PLIST   11 Mar 2022 19:48:11 -  1.29
+++ pkg/PLIST   25 Jul 2023 23:33:53 -
@@ -50,6 +50,10 @@ share/locale/it/LC_MESSAGES/wget-gnulib.
 share/locale/it/LC_MESSAGES/wget.mo
 share/locale/ja/LC_MESSAGES/wget-gnulib.mo
 share/locale/ja/LC_MESSAGES/wget.mo
+share/locale/ka/
+share/locale/ka/LC_MESSAGES/
+share/locale/ka/LC_MESSAGES/wget-gnulib.mo
+share/locale/ka/LC_MESSAGES/wget.mo
 share/locale/ko/LC_MESSAGES/wget-gnulib.mo
 share/locale/ko/LC_MESSAGES/wget.mo
 share/locale/lt/

Re: update net/wget 1.21.3

2022-04-02 Thread Christian Weisgerber 
Nam Nguyen:

> Here is an update to net/wget 1.21.3 released on February 26, 2022. I
> tested downloading install70.img.
> 
> Feedback? OK?

ok

That said, it would be nice if we were actually able to run the
regression tests:

--->
cc -I/usr/local/include -I/usr/local/include  -DHAVE_LIBSSL  
-I/usr/local/include -DNDEBUG -O2 -pipe -I/usr/local/include -L/usr/local/lib 
-o ./unit-tests ./unit-tests.c 
./unit-tests.c:31:10: fatal error: 'wget.h' file not found
#include "wget.h"
 ^~~~
1 error generated.
<---

That's already broken for the version in the tree, though.

-- 
Christian "naddy" Weisgerber  na...@mips.inka.de

update net/wget 1.21.3

2022-03-21 Thread Nam Nguyen 
Here is an update to net/wget 1.21.3 released on February 26, 2022. I
tested downloading install70.img.

NEWS:
https://git.savannah.gnu.org/cgit/wget.git/commit/?id=40747a11e44ced5a8ac628a41f879ced3e2ebce9

"Add option to select TLS 1.3 on the command line."
`wget --secure-protocol=TLSv1_3
https://cdn.openbsd.org/pub/OpenBSD/7.0/amd64/install70.img' errors out.

I sent a request upstream to enable support for libressl for TLS
1.3. see:
https://lists.gnu.org/archive/html/bug-wget/2022-03/msg00027.html

Feedback? OK?

Index: Makefile
===
RCS file: /cvs/ports/net/wget/Makefile,v
retrieving revision 1.90
diff -u -p -u -p -r1.90 Makefile
--- Makefile11 Mar 2022 19:48:11 -  1.90
+++ Makefile22 Mar 2022 03:16:05 -
@@ -1,6 +1,6 @@
 COMMENT =  retrieve files from the web via HTTP, HTTPS and FTP
 
-DISTNAME = wget-1.21.2
+DISTNAME = wget-1.21.3
 CATEGORIES =   net
 
 HOMEPAGE = https://www.gnu.org/software/wget/
Index: distinfo
===
RCS file: /cvs/ports/net/wget/distinfo,v
retrieving revision 1.27
diff -u -p -u -p -r1.27 distinfo
--- distinfo11 Sep 2021 22:48:22 -  1.27
+++ distinfo22 Mar 2022 03:16:05 -
@@ -1,2 +1,2 @@
-SHA256 (wget-1.21.2.tar.gz) = 5tTHa+gsZ23X6MYaKbKshRCuEIqBC10dGPyaHSyaJJc=
-SIZE (wget-1.21.2.tar.gz) = 5004576
+SHA256 (wget-1.21.3.tar.gz) = Vya7i8XKD23HEQ9kFuS7cBni0v9b+T0cov/MZlbyIOU=
+SIZE (wget-1.21.3.tar.gz) = 5079864
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/net/wget/patches/patch-Makefile_in,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-Makefile_in
--- patches/patch-Makefile_in   11 Mar 2022 19:48:11 -  1.5
+++ patches/patch-Makefile_in   22 Mar 2022 03:16:05 -
@@ -1,7 +1,7 @@
 Index: Makefile.in
 --- Makefile.in.orig
 +++ Makefile.in
-@@ -1669,7 +1669,7 @@ distuninstallcheck_listfiles = find . -type f | \
+@@ -1691,7 +1691,7 @@ distuninstallcheck_listfiles = find . -type f | \
  ACLOCAL_AMFLAGS = -I m4
  
  # subdirectories in the distribution

Re: update net/wget 1.21.2

2021-09-10 Thread Nam Nguyen 
Stuart Henderson writes:

> On 2021/09/09 03:44, Nam Nguyen wrote:
>> Here is an update to wget 1.21.2 released on September 7, 2021. It is
>> from tj@ with tweaks by me to revise the python3 hack.
>
> ok, though I'm not sure there's much benefit to keeping the hack for
> building without python; these days, with many things using meson,
> if you're building ports you are pretty much guaranteed to have python
> installed.

python3 seems safe to add back given its availability.

Here is a fresh diff that:
- Removes python3 hack and require python3 at build time instead.
  MODPY_RUN_DEPENDS is in TEST_DEPENDS (as before) and BUILD_DEPENDS
  (via removal of MODPY_BUILDDEP = No).

sthen@, still OK?

Index: Makefile
===
RCS file: /cvs/ports/net/wget/Makefile,v
retrieving revision 1.88
diff -u -p -u -p -r1.88 Makefile
--- Makefile10 Aug 2021 13:42:34 -  1.88
+++ Makefile10 Sep 2021 06:49:12 -
@@ -2,7 +2,7 @@
 
 COMMENT =  retrieve files from the web via HTTP, HTTPS and FTP
 
-DISTNAME = wget-1.21.1
+DISTNAME = wget-1.21.2
 CATEGORIES =   net
 
 HOMEPAGE = https://www.gnu.org/software/wget/
@@ -25,7 +25,6 @@ MASTER_SITES =${MASTER_SITE_GNU:=wget/
 
 # some regression tests require python3
 MODULES += lang/python
-MODPY_BUILDDEP =   No
 MODPY_RUNDEP = No
 
 TEST_DEPENDS = www/p5-HTTP-Daemon ${MODPY_RUN_DEPENDS}
@@ -36,9 +35,6 @@ FAKE_FLAGS =  sysconfdir="${PREFIX}/shar
 
 CONFIGURE_STYLE =  gnu
 CONFIGURE_ARGS =   --with-ssl=openssl
-# hack to avoid depending on python3 at build time
-CONFIGURE_ARGS +=  PYTHON="" \
-   am_cv_pathless_PYTHON="${MODPY_BIN}"
 CONFIGURE_ENV +=   CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
 MODGNU_CONFIG_GUESS_DIRS = ${WRKSRC}/build-aux
Index: distinfo
===
RCS file: /cvs/ports/net/wget/distinfo,v
retrieving revision 1.26
diff -u -p -u -p -r1.26 distinfo
--- distinfo27 Jun 2021 23:49:58 -  1.26
+++ distinfo10 Sep 2021 06:49:12 -
@@ -1,2 +1,2 @@
-SHA256 (wget-1.21.1.tar.gz) = WboL2t6a0TXtpYGuTlmnqfJeOkvealQZYysxkGEg4m4=
-SIZE (wget-1.21.1.tar.gz) = 4884887
+SHA256 (wget-1.21.2.tar.gz) = 5tTHa+gsZ23X6MYaKbKshRCuEIqBC10dGPyaHSyaJJc=
+SIZE (wget-1.21.2.tar.gz) = 5004576
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/net/wget/patches/patch-Makefile_in,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-Makefile_in
--- patches/patch-Makefile_in   27 Jun 2021 23:49:58 -  1.3
+++ patches/patch-Makefile_in   10 Sep 2021 06:49:12 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-Makefile_in,v 1.3 2021/0
 Index: Makefile.in
 --- Makefile.in.orig
 +++ Makefile.in
-@@ -1644,7 +1644,7 @@ distuninstallcheck_listfiles = find . -type f | \
+@@ -1669,7 +1669,7 @@ distuninstallcheck_listfiles = find . -type f | \
  ACLOCAL_AMFLAGS = -I m4
  
  # subdirectories in the distribution
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/wget/pkg/PLIST,v
retrieving revision 1.27
diff -u -p -u -p -r1.27 PLIST
--- pkg/PLIST   27 Jun 2021 23:49:58 -  1.27
+++ pkg/PLIST   10 Sep 2021 06:49:12 -
@@ -52,6 +52,7 @@ 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/ko/LC_MESSAGES/wget.mo
 share/locale/lt/
 share/locale/lt/LC_MESSAGES/
 share/locale/lt/LC_MESSAGES/wget.mo

Re: update net/wget 1.21.2

2021-09-09 Thread Stuart Henderson 
On 2021/09/09 03:44, Nam Nguyen wrote:
> Here is an update to wget 1.21.2 released on September 7, 2021. It is
> from tj@ with tweaks by me to revise the python3 hack.

ok, though I'm not sure there's much benefit to keeping the hack for
building without python; these days, with many things using meson,
if you're building ports you are pretty much guaranteed to have python
installed.

update net/wget 1.21.2

2021-09-09 Thread Nam Nguyen 
Here is an update to wget 1.21.2 released on September 7, 2021. It is
from tj@ with tweaks by me to revise the python3 hack.

Release notes:
https://lists.gnu.org/archive/html/info-gnu/2021-09/msg3.html
https://git.savannah.gnu.org/cgit/wget.git/commit/?id=c8d7a66217db9f5d85ce54caca449da5d825c9c3

"Release tarballs no longer have a dependency on Python." However, in my
testing, PYTHON="" is needed to avoid failing a python3 check during
configure.

This update:
- moves to 1.21.2
- `make test' runs two test suites: tests/ and testenv/. Only testenv/
  relies on python3. Rework python3 hack by uncommenting:
  #TESTS = $(DEFAULT_TESTS) $(am__append_2).
  This makes it easier to read than am_cv_pathless_PYTHON and still
  achieves the goal of running the python3 tests.

To test:
1. uninstall python3
2. `make update-plist' builds fine without python3
3. `make test' pulls in python3

I tested this by downloading install69.iso and verifying it.

Feedback is welcome. OK?

Index: Makefile
===
RCS file: /cvs/ports/net/wget/Makefile,v
retrieving revision 1.88
diff -u -p -u -p -r1.88 Makefile
--- Makefile10 Aug 2021 13:42:34 -  1.88
+++ Makefile9 Sep 2021 02:41:52 -
@@ -2,7 +2,7 @@
 
 COMMENT =  retrieve files from the web via HTTP, HTTPS and FTP
 
-DISTNAME = wget-1.21.1
+DISTNAME = wget-1.21.2
 CATEGORIES =   net
 
 HOMEPAGE = https://www.gnu.org/software/wget/
@@ -36,15 +36,17 @@ FAKE_FLAGS =sysconfdir="${PREFIX}/shar
 
 CONFIGURE_STYLE =  gnu
 CONFIGURE_ARGS =   --with-ssl=openssl
-# hack to avoid depending on python3 at build time
-CONFIGURE_ARGS +=  PYTHON="" \
-   am_cv_pathless_PYTHON="${MODPY_BIN}"
+CONFIGURE_ARGS +=  PYTHON=""
 CONFIGURE_ENV +=   CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
 MODGNU_CONFIG_GUESS_DIRS = ${WRKSRC}/build-aux
 
 pre-build:
@${SUBST_CMD} ${WRKSRC}/doc/wget.texi ${WRKSRC}/doc/sample.wgetrc
+
+# hack to run python3 tests while avoiding depending on python3 at build time
+pre-test:
+   @sed -i 's/^#TESTS/TESTS/' ${WRKSRC}/testenv/Makefile
 
 .include 
 .if !${PROPERTIES:Mclang}
Index: distinfo
===
RCS file: /cvs/ports/net/wget/distinfo,v
retrieving revision 1.26
diff -u -p -u -p -r1.26 distinfo
--- distinfo27 Jun 2021 23:49:58 -  1.26
+++ distinfo9 Sep 2021 02:41:52 -
@@ -1,2 +1,2 @@
-SHA256 (wget-1.21.1.tar.gz) = WboL2t6a0TXtpYGuTlmnqfJeOkvealQZYysxkGEg4m4=
-SIZE (wget-1.21.1.tar.gz) = 4884887
+SHA256 (wget-1.21.2.tar.gz) = 5tTHa+gsZ23X6MYaKbKshRCuEIqBC10dGPyaHSyaJJc=
+SIZE (wget-1.21.2.tar.gz) = 5004576
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/net/wget/patches/patch-Makefile_in,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-Makefile_in
--- patches/patch-Makefile_in   27 Jun 2021 23:49:58 -  1.3
+++ patches/patch-Makefile_in   9 Sep 2021 02:41:52 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-Makefile_in,v 1.3 2021/0
 Index: Makefile.in
 --- Makefile.in.orig
 +++ Makefile.in
-@@ -1644,7 +1644,7 @@ distuninstallcheck_listfiles = find . -type f | \
+@@ -1669,7 +1669,7 @@ distuninstallcheck_listfiles = find . -type f | \
  ACLOCAL_AMFLAGS = -I m4
  
  # subdirectories in the distribution
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/wget/pkg/PLIST,v
retrieving revision 1.27
diff -u -p -u -p -r1.27 PLIST
--- pkg/PLIST   27 Jun 2021 23:49:58 -  1.27
+++ pkg/PLIST   9 Sep 2021 02:41:52 -
@@ -52,6 +52,7 @@ 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/ko/LC_MESSAGES/wget.mo
 share/locale/lt/
 share/locale/lt/LC_MESSAGES/
 share/locale/lt/LC_MESSAGES/wget.mo

Re: [Update] net/wget : Update to 1.21

2021-06-26 Thread Daniel Jakots 
On Sat, 26 Jun 2021 02:22:21 -0700, Nam Nguyen 
wrote:

> Here is a fresh diff for 1.21.1

ok danj@

Re: [Update] net/wget : Update to 1.21

2021-06-26 Thread Nam Nguyen 


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
--- Makefile23 Feb 2021 19:39:35 -  1.86
+++ Makefile26 Jun 2021 09:10:48 -
@@ -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 
Index: distinfo
===
RCS file: /cvs/ports/net/wget/distinfo,v
retrieving revision 1.25
diff -u -p -u -p -r1.25 distinfo
--- distinfo23 Apr 2019 20:15:08 -  1.25
+++ distinfo26 Jun 2021 09:10:48 -
@@ -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 -   1.2
+++ patches/patch-Makefile_in   26 Jun 2021 09:10:48 -
@@ -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 -  1.16
+++ patches/patch-doc_wget_texi 26 Jun 2021 09:10:48 -
@@ -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

Re: [Update] net/wget : Update to 1.21

2021-01-08 Thread Nam Nguyen 
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

[Update] net/wget : Update to 1.21

2021-01-05 Thread wen heping 
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
Index: Makefile
===
RCS file: /cvs/ports/net/wget/Makefile,v
retrieving revision 1.85
diff -u -p -r1.85 Makefile
--- Makefile24 Jan 2020 04:53:37 -  1.85
+++ Makefile6 Jan 2021 02:52:50 -
@@ -2,9 +2,8 @@
 
 COMMENT =  retrieve files from the web via HTTP, HTTPS and FTP
 
-DISTNAME = wget-1.20.3
+DISTNAME = wget-1.21
 CATEGORIES =   net
-REVISION = 3
 
 HOMEPAGE = https://www.gnu.org/software/wget/
 MAINTAINER =   Nam Nguyen 
Index: distinfo
===
RCS file: /cvs/ports/net/wget/distinfo,v
retrieving revision 1.25
diff -u -p -r1.25 distinfo
--- distinfo23 Apr 2019 20:15:08 -  1.25
+++ distinfo6 Jan 2021 02:52:50 -
@@ -1,2 +1,2 @@
-SHA256 (wget-1.20.3.tar.gz) = MczPxmMFKNscjjoG9t7PKjcAYLmChBz6srhndAClCS4=
-SIZE (wget-1.20.3.tar.gz) = 4489249
+SHA256 (wget-1.21.tar.gz) = s7wam9DBmDbJcJwxjUHBnBEhWgdRT0n4m0C51Qq0kyU=
+SIZE (wget-1.21.tar.gz) = 4866788
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/net/wget/patches/patch-Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile_in
--- patches/patch-Makefile_in   4 Apr 2019 10:36:45 -   1.2
+++ patches/patch-Makefile_in   6 Jan 2021 02:52:50 -
@@ -1,14 +1,14 @@
-$OpenBSD: patch-Makefile_in,v 1.2 2019/04/04 10:36:45 sthen Exp $
+$OpenBSD$
 
 Index: Makefile.in
 --- Makefile.in.orig
 +++ Makefile.in
-@@ -1469,7 +1469,7 @@ distuninstallcheck_listfiles = find . -type f | \
+@@ -1637,7 +1637,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: pkg/PLIST
===
RCS file: /cvs/ports/net/wget/pkg/PLIST,v
retrieving revision 1.26
diff -u -p -r1.26 PLIST
--- pkg/PLIST   29 Jan 2014 06:08:42 -  1.26
+++ pkg/PLIST   6 Jan 2021 02:52:50 -
@@ -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

Re: UPDATE: net/wget-1.9.5

2018-05-07 Thread Stuart Henderson 
The file it's in is a new test. Given the security fix I'd go ahead and 
commit but please report it upstream.


--
Sent from a phone, apologies for poor formatting.
On 7 May 2018 04:36:09 Björn Ketelaars  wrote:


On Sun 06/05/2018 23:01, Gleydson Soares wrote:
update to wget-1.9.5. This update addresses a vunerability CVE-2018-0494, 
along with

several bug fixes.

builds and runs fine, @amd64
OK?


I'm unable to run 'make test', log is enclosed. On 1.9.4 'make test'
runs fine.

Re: UPDATE: net/wget-1.9.5

2018-05-06 Thread Björn Ketelaars 
On Sun 06/05/2018 23:01, Gleydson Soares wrote:
> update to wget-1.9.5. This update addresses a vunerability CVE-2018-0494, 
> along with
> several bug fixes.
> 
> builds and runs fine, @amd64
> OK?

I'm unable to run 'make test', log is enclosed. On 1.9.4 'make test'
runs fine.
make  check-recursive
Making check in lib
make  check-recursive
Making check in src
make  libunittest.a
cc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" 
-DLOCALEDIR=\"/usr/local/share/locale\" -I.  -DTESTING "-I../lib" "-I../lib" 
-I/usr/local/include  -I/usr/local/include  -DHAVE_LIBSSL  -I/usr/local/include 
-DNDEBUG -O2 -pipe -MT libunittest_a-connect.o -MD -MP -MF 
.deps/libunittest_a-connect.Tpo -c -o libunittest_a-connect.o `test -f 
'connect.c' || echo './'`connect.c
mv -f .deps/libunittest_a-connect.Tpo .deps/libunittest_a-connect.Po
cc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" 
-DLOCALEDIR=\"/usr/local/share/locale\" -I.  -DTESTING "-I../lib" "-I../lib" 
-I/usr/local/include  -I/usr/local/include  -DHAVE_LIBSSL  -I/usr/local/include 
-DNDEBUG -O2 -pipe -MT libunittest_a-convert.o -MD -MP -MF 
.deps/libunittest_a-convert.Tpo -c -o libunittest_a-convert.o `test -f 
'convert.c' || echo './'`convert.c
mv -f .deps/libunittest_a-convert.Tpo .deps/libunittest_a-convert.Po
cc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" 
-DLOCALEDIR=\"/usr/local/share/locale\" -I.  -DTESTING "-I../lib" "-I../lib" 
-I/usr/local/include  -I/usr/local/include  -DHAVE_LIBSSL  -I/usr/local/include 
-DNDEBUG -O2 -pipe -MT libunittest_a-cookies.o -MD -MP -MF 
.deps/libunittest_a-cookies.Tpo -c -o libunittest_a-cookies.o `test -f 
'cookies.c' || echo './'`cookies.c
mv -f .deps/libunittest_a-cookies.Tpo .deps/libunittest_a-cookies.Po
cc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" 
-DLOCALEDIR=\"/usr/local/share/locale\" -I.  -DTESTING "-I../lib" "-I../lib" 
-I/usr/local/include  -I/usr/local/include  -DHAVE_LIBSSL  -I/usr/local/include 
-DNDEBUG -O2 -pipe -MT libunittest_a-ftp.o -MD -MP -MF 
.deps/libunittest_a-ftp.Tpo -c -o libunittest_a-ftp.o `test -f 'ftp.c' || echo 
'./'`ftp.c
mv -f .deps/libunittest_a-ftp.Tpo .deps/libunittest_a-ftp.Po
cc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" 
-DLOCALEDIR=\"/usr/local/share/locale\" -I.  -DTESTING "-I../lib" "-I../lib" 
-I/usr/local/include  -I/usr/local/include  -DHAVE_LIBSSL  -I/usr/local/include 
-DNDEBUG -O2 -pipe -MT libunittest_a-css_.o -MD -MP -MF 
.deps/libunittest_a-css_.Tpo -c -o libunittest_a-css_.o `test -f 'css_.c' || 
echo './'`css_.c
mv -f .deps/libunittest_a-css_.Tpo .deps/libunittest_a-css_.Po
cc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" 
-DLOCALEDIR=\"/usr/local/share/locale\" -I.  -DTESTING "-I../lib" "-I../lib" 
-I/usr/local/include  -I/usr/local/include  -DHAVE_LIBSSL  -I/usr/local/include 
-DNDEBUG -O2 -pipe -MT libunittest_a-css-url.o -MD -MP -MF 
.deps/libunittest_a-css-url.Tpo -c -o libunittest_a-css-url.o `test -f 
'css-url.c' || echo './'`css-url.c
mv -f .deps/libunittest_a-css-url.Tpo .deps/libunittest_a-css-url.Po
cc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" 
-DLOCALEDIR=\"/usr/local/share/locale\" -I.  -DTESTING "-I../lib" "-I../lib" 
-I/usr/local/include  -I/usr/local/include  -DHAVE_LIBSSL  -I/usr/local/include 
-DNDEBUG -O2 -pipe -MT libunittest_a-ftp-basic.o -MD -MP -MF 
.deps/libunittest_a-ftp-basic.Tpo -c -o libunittest_a-ftp-basic.o `test -f 
'ftp-basic.c' || echo './'`ftp-basic.c
mv -f .deps/libunittest_a-ftp-basic.Tpo .deps/libunittest_a-ftp-basic.Po
cc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" 
-DLOCALEDIR=\"/usr/local/share/locale\" -I.  -DTESTING "-I../lib" "-I../lib" 
-I/usr/local/include  -I/usr/local/include  -DHAVE_LIBSSL  -I/usr/local/include 
-DNDEBUG -O2 -pipe -MT libunittest_a-ftp-ls.o -MD -MP -MF 
.deps/libunittest_a-ftp-ls.Tpo -c -o libunittest_a-ftp-ls.o `test -f 'ftp-ls.c' 
|| echo './'`ftp-ls.c
mv -f .deps/libunittest_a-ftp-ls.Tpo .deps/libunittest_a-ftp-ls.Po
cc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" 
-DLOCALEDIR=\"/usr/local/share/locale\" -I.  -DTESTING "-I../lib" "-I../lib" 
-I/usr/local/include  -I/usr/local/include  -DHAVE_LIBSSL  -I/usr/local/include 
-DNDEBUG -O2 -pipe -MT libunittest_a-hash.o -MD -MP -MF 
.deps/libunittest_a-hash.Tpo -c -o libunittest_a-hash.o `test -f 'hash.c' || 
echo './'`hash.c
mv -f .deps/libunittest_a-hash.Tpo .deps/libunittest_a-hash.Po
cc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" 
-DLOCALEDIR=\"/usr/local/share/locale\" -I.  -DTESTING "-I../lib" "-I../lib" 
-I/usr/local/include  -I/usr/local/include  -DHAVE_LIBSSL  -I/usr/local/include 
-DNDEBUG -O2 -pipe -MT libunittest_a-host.o -MD -MP -MF 
.deps/libunittest_a-host.Tpo -c -o libunittest_a-host.o `test -f 'host.c' || 
echo './'`host.c
mv -f .deps/libunittest_a-host.Tpo .deps/libunittest_a-host.Po
cc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" 
-DLOCALEDIR=\"/usr/local/share/locale\" -I.  -DTESTING "-I../lib" "-I../lib" 
-I/usr/local/include  -I/usr/local/include  -DHAVE_LIBSSL  -I/usr/local/include 
-DNDEBUG -O2

UPDATE: net/wget-1.9.5

2018-05-06 Thread Gleydson Soares 
update to wget-1.9.5. This update addresses a vunerability CVE-2018-0494, along 
with
several bug fixes.

builds and runs fine, @amd64
OK?

Index: Makefile
===
RCS file: /cvs/ports/net/wget/Makefile,v
retrieving revision 1.74
diff -u -p -r1.74 Makefile
--- Makefile5 Feb 2018 09:55:57 -   1.74
+++ Makefile7 May 2018 01:46:29 -
@@ -2,7 +2,7 @@
 
 COMMENT =  retrieve files from the web via HTTP, HTTPS and FTP
 
-DISTNAME = wget-1.19.4
+DISTNAME = wget-1.19.5
 CATEGORIES =   net
 
 HOMEPAGE = https://www.gnu.org/software/wget/
Index: distinfo
===
RCS file: /cvs/ports/net/wget/distinfo,v
retrieving revision 1.21
diff -u -p -r1.21 distinfo
--- distinfo5 Feb 2018 09:55:57 -   1.21
+++ distinfo7 May 2018 01:46:29 -
@@ -1,2 +1,2 @@
-SHA256 (wget-1.19.4.tar.gz) = k/uWsPSKIP9b4NnZ08SphrRpy4UxMfnV/kzJzsvItbU=
-SIZE (wget-1.19.4.tar.gz) = 4310657
+SHA256 (wget-1.19.5.tar.gz) = s5ISq+GnPyso9MbLIjxzhVnKrJHW5Bam2R1LnVXJ+u4=
+SIZE (wget-1.19.5.tar.gz) = 4455797
Index: patches/patch-doc_wget_texi
===
RCS file: /cvs/ports/net/wget/patches/patch-doc_wget_texi,v
retrieving revision 1.14
diff -u -p -r1.14 patch-doc_wget_texi
--- patches/patch-doc_wget_texi 5 Feb 2018 09:55:57 -   1.14
+++ patches/patch-doc_wget_texi 7 May 2018 01:46:29 -
@@ -20,7 +20,7 @@ Index: doc/wget.texi
  Default location of the @dfn{global} startup file.
  
  @item .wgetrc
-@@ -3145,9 +3145,8 @@ commands.
+@@ -3154,9 +3154,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
-@@ -3157,7 +3156,7 @@ If @code{WGETRC} is not set, Wget will try to load @fi
+@@ -3166,7 +3165,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

Re: UPDATE net/wget

2018-02-04 Thread Björn Ketelaars 
On Wed 31/01/2018 14:52, Björn Ketelaars wrote:
> Diff below brings net/wget to the latest version, which addresses:
> 
>   - A major bug that caused GZip'ed pages to never be decompressed has
> been fixed
>   - Support for Content-Encoding and Transfer-Encoding have been marked
> as experimental and disabled by default
>   - Prevent erroneous decompression of .gz and .tgz files with broken
> server
>   - Added support for HTTP 308 Permanent Redirect response
>   - Fix a segfault in some cases where the Content-Type header is not
> sent
>   - Several minor bug fixes
> 
> Output make test:
> 
> # TOTAL: 93
> # PASS:  84
> # SKIP:  9
> # XFAIL: 0
> # FAIL:  0
> # XPASS: 0
> # ERROR: 0
> ...
> # TOTAL: 44
> # PASS:  44
> # SKIP:  0
> # XFAIL: 0
> # FAIL:  0
> # XPASS: 0
> # ERROR: 0

Ping!

UPDATE net/wget

2018-01-31 Thread Björn Ketelaars 
Diff below brings net/wget to the latest version, which addresses:

  - A major bug that caused GZip'ed pages to never be decompressed has
been fixed
  - Support for Content-Encoding and Transfer-Encoding have been marked
as experimental and disabled by default
  - Prevent erroneous decompression of .gz and .tgz files with broken
server
  - Added support for HTTP 308 Permanent Redirect response
  - Fix a segfault in some cases where the Content-Type header is not
sent
  - Several minor bug fixes

Output make test:

# TOTAL: 93
# PASS:  84
# SKIP:  9
# XFAIL: 0
# FAIL:  0
# XPASS: 0
# ERROR: 0
...
# TOTAL: 44
# PASS:  44
# SKIP:  0
# XFAIL: 0
# FAIL:  0
# XPASS: 0
# ERROR: 0

-- 
Björn Ketelaars
GPG key: 0x4F0E5F21


diff --git Makefile Makefile
index b153454d731..fb757e361ab 100644
--- Makefile
+++ Makefile
@@ -2,7 +2,7 @@
 
 COMMENT =  retrieve files from the web via HTTP, HTTPS and FTP
 
-DISTNAME = wget-1.19.2
+DISTNAME = wget-1.19.4
 CATEGORIES =   net
 
 HOMEPAGE = https://www.gnu.org/software/wget/
diff --git distinfo distinfo
index 1739246e01f..3d027dcc684 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (wget-1.19.2.tar.gz) = T0pnO21GbvpQ+/unlr2EpGriTjcPpWLt5bIatTwRqSA=
-SIZE (wget-1.19.2.tar.gz) = 4349267
+SHA256 (wget-1.19.4.tar.gz) = k/uWsPSKIP9b4NnZ08SphrRpy4UxMfnV/kzJzsvItbU=
+SIZE (wget-1.19.4.tar.gz) = 4310657
diff --git patches/patch-doc_wget_texi patches/patch-doc_wget_texi
index 39ebc7e1a0e..4c35d92c6c4 100644
--- patches/patch-doc_wget_texi
+++ patches/patch-doc_wget_texi
@@ -2,7 +2,7 @@ $OpenBSD: patch-doc_wget_texi,v 1.13 2017/10/31 18:00:32 
rsadowski Exp $
 Index: doc/wget.texi
 --- doc/wget.texi.orig
 +++ doc/wget.texi
-@@ -191,7 +191,7 @@ gauge can be customized to your preferences.
+@@ -190,7 +190,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.
-@@ -200,7 +200,7 @@ If both --config and --no-config are given, --no-confi
+@@ -199,7 +199,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
-@@ -3143,9 +3143,8 @@ commands.
+@@ -3145,9 +3145,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
-@@ -3155,7 +3154,7 @@ If @code{WGETRC} is not set, Wget will try to load @fi
+@@ -3157,7 +3156,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

Re: UPDATE: net/wget -current,-stable (CVE-2017-13089, CVE-2017-13090)

2017-11-02 Thread Rafael Sadowski 
On Tue Oct 31, 2017 at 01:02:44PM +0100, Rafael Sadowski wrote:
> On Tue Oct 31, 2017 at 12:20:26PM +0100, Rafael Sadowski wrote:
> > Hi All,
> > 
> > Update Wget to the latest stable version 1.19.1. This version includes
> > the following CVE patches:
> > 
> > "Fix stack overflow in HTTP protocol handling (CVE-2017-13089)"
> > http://git.savannah.gnu.org/cgit/wget.git/commit/?id=d892291fb8ace4c3b734ea5125770989c215df3f
> > 
> > "Fix heap overflow in HTTP protocol handling (CVE-2017-13090)"
> > http://git.savannah.gnu.org/cgit/wget.git/commit/?id=ba6b44f6745b14dce414761a8e4b35d31b176bba
> > 
> > 1.19.1 provide only .tar.lz and tar.gz. Since we don't support *.lz, I
> > have decided to *.gz
> > 
> > Also please find attached a diff for -stable.
> > 
> 
> Forget the attachment, so here it is inline:
> 

*ping-stable*

> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/wget/Makefile,v
> retrieving revision 1.72
> diff -u -p -u -p -r1.72 Makefile
> --- Makefile  22 Feb 2017 02:49:25 -  1.72
> +++ Makefile  31 Oct 2017 11:09:04 -
> @@ -4,6 +4,7 @@ COMMENT = retrieve files from the web vi
>  
>  DISTNAME =   wget-1.19.1
>  CATEGORIES = net
> +REVISION =   0
>  
>  HOMEPAGE =   https://www.gnu.org/software/wget/
>  
> Index: patches/patch-src_http_c
> ===
> RCS file: patches/patch-src_http_c
> diff -N patches/patch-src_http_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_http_c  31 Oct 2017 11:09:04 -
> @@ -0,0 +1,16 @@
> +$OpenBSD$
> +Fix stack overflow in HTTP protocol handling (CVE-2017-13089)
> +Commit from upstream d892291fb8ace4c3b734ea5125770989c215df3f
> +Index: src/http.c
> +--- src/http.c.orig
>  src/http.c
> +@@ -973,6 +973,9 @@ skip_short_body (int fd, wgint contlen, bool chunked)
> +   remaining_chunk_size = strtol (line, , 16);
> +   xfree (line);
> + 
> ++  if (remaining_chunk_size < 0)
> ++  return false;
> ++
> +   if (remaining_chunk_size == 0)
> + {
> +   line = fd_read_line (fd);
> Index: patches/patch-src_retr_c
> ===
> RCS file: patches/patch-src_retr_c
> diff -N patches/patch-src_retr_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_retr_c  31 Oct 2017 11:09:04 -
> @@ -0,0 +1,19 @@
> +$OpenBSD$
> +Fix heap overflow in HTTP protocol handling (CVE-2017-13090)
> +Commit from upstream ba6b44f6745b14dce414761a8e4b35d31b176bba
> +Index: src/retr.c
> +--- src/retr.c.orig
>  src/retr.c
> +@@ -320,6 +320,12 @@ fd_read_body (const char *downloaded_filename, int fd,
> +   remaining_chunk_size = strtol (line, , 16);
> +   xfree (line);
> + 
> ++  if (remaining_chunk_size < 0)
> ++  {
> ++  ret = -1;
> ++  break;
> ++  }
> ++
> +   if (remaining_chunk_size == 0)
> + {
> +   ret = 0;
>

Re: UPDATE: net/wget -current,-stable (CVE-2017-13089, CVE-2017-13090)

2017-10-31 Thread Rafael Sadowski 
On Tue Oct 31, 2017 at 12:03:22PM +, Stuart Henderson wrote:
> On 2017/10/31 12:20, Rafael Sadowski wrote:
> > Hi All,
> > 
> > Update Wget to the latest stable version 1.19.1. This version includes
> > the following CVE patches:
> > 
> > "Fix stack overflow in HTTP protocol handling (CVE-2017-13089)"
> > http://git.savannah.gnu.org/cgit/wget.git/commit/?id=d892291fb8ace4c3b734ea5125770989c215df3f
> > 
> > "Fix heap overflow in HTTP protocol handling (CVE-2017-13090)"
> > http://git.savannah.gnu.org/cgit/wget.git/commit/?id=ba6b44f6745b14dce414761a8e4b35d31b176bba
> > 
> > 1.19.1 provide only .tar.lz and tar.gz. Since we don't support *.lz, I
> > have decided to *.gz
> > 
> > Also please find attached a diff for -stable.
> > 
> > Ok? Feedback?
> > 
> > Best regards,
> > 
> > Rafael Sadowski
> > 
> > 
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/net/wget/Makefile,v
> > retrieving revision 1.72
> > diff -u -p -u -p -r1.72 Makefile
> > --- Makefile22 Feb 2017 02:49:25 -  1.72
> > +++ Makefile31 Oct 2017 10:54:50 -
> > @@ -2,7 +2,7 @@
> >  
> >  COMMENT =  retrieve files from the web via HTTP, HTTPS and FTP
> >  
> > -DISTNAME = wget-1.19.1
> > +DISTNAME = wget-1.19.2
> >  CATEGORIES =   net
> >  
> >  HOMEPAGE = https://www.gnu.org/software/wget/
> > @@ -17,7 +17,7 @@ LIB_DEPENDS = converters/libunistring \
> > net/libpsl
> >  
> >  MASTER_SITES = ${MASTER_SITE_GNU:=wget/}
> > -EXTRACT_SUFX = .tar.xz
> > +EXTRACT_SUFX = .tar.gz
> 
> .tar.gz is the default, so just remove EXTRACT_SUFX. (We do have support
> for .lz but at least for -stable it's easier for people if they don't
> have to install a weird compression tool :)
> 
> > -+++ doc/wget.texi  Sat Feb 11 16:46:13 2017
> > -@@ -191,14 +191,14 @@ 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
> > --(@file{/usr/local/etc/wgetrc} by default) for site settings. You can also
> > -+(@file{${SYSCONFDIR}/wgetrc} by default) for site settings. You can also
> > - specify the location of a startup file with the --config option.
> > -  
> > - 
> > - @ignore
> > - @c man begin FILES
> > - @table @samp
> > --@item /usr/local/etc/wgetrc
> > -+@item ${SYSCONFDIR}/wgetrc
> > - Default location of the @dfn{global} startup file.
> > - 
> > - @item .wgetrc
> 
> That hunk of the patch needs merging by hand.
> 

Thanks for the notes. New diff below, plus I removed gettext as MODULE.


Index: Makefile
===
RCS file: /cvs/ports/net/wget/Makefile,v
retrieving revision 1.72
diff -u -p -u -p -r1.72 Makefile
--- Makefile22 Feb 2017 02:49:25 -  1.72
+++ Makefile31 Oct 2017 16:52:31 -
@@ -2,7 +2,7 @@
 
 COMMENT =  retrieve files from the web via HTTP, HTTPS and FTP
 
-DISTNAME = wget-1.19.1
+DISTNAME = wget-1.19.2
 CATEGORIES =   net
 
 HOMEPAGE = https://www.gnu.org/software/wget/
@@ -10,16 +10,17 @@ HOMEPAGE =  https://www.gnu.org/software/
 # GPLv3
 PERMIT_PACKAGE_CDROM = Yes
 
-WANTLIB =  c crypto idn2 pcre psl ssl unistring z
+WANTLIB += c crypto iconv idn2 intl pcre psl ssl unistring z
+
+BUILD_DEPENDS =devel/gettext-tools
+
 LIB_DEPENDS =  converters/libunistring \
+   devel/gettext \
devel/libidn2 \
devel/pcre \
net/libpsl
 
 MASTER_SITES = ${MASTER_SITE_GNU:=wget/}
-EXTRACT_SUFX = .tar.xz
-
-MODULES =  devel/gettext
 
 # some regression tests require python3
 MODULES += lang/python
Index: distinfo
===
RCS file: /cvs/ports/net/wget/distinfo,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 distinfo
--- distinfo22 Feb 2017 02:49:25 -  1.19
+++ distinfo31 Oct 2017 16:52:31 -
@@ -1,2 +1,2 @@
-SHA256 (wget-1.19.1.tar.xz) = DJULlnGIEiKk04WwE8lgTpioAl0ZiFKd/KDpNhd0TNI=
-SIZE (wget-1.19.1.tar.xz) = 2111756
+SHA256 (wget-1.19.2.tar.gz) = T0pnO21GbvpQ+/unlr2EpGriTjcPpWLt5bIatTwRqSA=
+SIZE (wget-1.19.2.tar.gz) = 4349267
Index: patches/patch-doc_wget_texi
===
RCS file: /cvs/ports/net/wget/patches/patch-doc_wget_texi,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 patch-doc_wget_texi
--- patches/patch-doc_wget_texi 22 Feb 2017 02:49:25 -  1.12
+++ patches/patch-doc_wget_texi 31 Oct 2017 16:52:31 -
@@ -1,15 +1,17 @@
 $OpenBSD: patch-doc_wget_texi,v 1.12 2017/02/22 02:49:25 danj Exp $
 doc/wget.texi.orig Sat Feb 11 05:45:22 2017
-+++ doc/wget.texi  Sat Feb 11 16:46:13

Re: UPDATE: net/wget -current,-stable (CVE-2017-13089, CVE-2017-13090)

2017-10-31 Thread Stuart Henderson 
On 2017/10/31 12:20, Rafael Sadowski wrote:
> Hi All,
> 
> Update Wget to the latest stable version 1.19.1. This version includes
> the following CVE patches:
> 
> "Fix stack overflow in HTTP protocol handling (CVE-2017-13089)"
> http://git.savannah.gnu.org/cgit/wget.git/commit/?id=d892291fb8ace4c3b734ea5125770989c215df3f
> 
> "Fix heap overflow in HTTP protocol handling (CVE-2017-13090)"
> http://git.savannah.gnu.org/cgit/wget.git/commit/?id=ba6b44f6745b14dce414761a8e4b35d31b176bba
> 
> 1.19.1 provide only .tar.lz and tar.gz. Since we don't support *.lz, I
> have decided to *.gz
> 
> Also please find attached a diff for -stable.
> 
> Ok? Feedback?
> 
> Best regards,
> 
> Rafael Sadowski
> 
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/wget/Makefile,v
> retrieving revision 1.72
> diff -u -p -u -p -r1.72 Makefile
> --- Makefile  22 Feb 2017 02:49:25 -  1.72
> +++ Makefile  31 Oct 2017 10:54:50 -
> @@ -2,7 +2,7 @@
>  
>  COMMENT =retrieve files from the web via HTTP, HTTPS and FTP
>  
> -DISTNAME =   wget-1.19.1
> +DISTNAME =   wget-1.19.2
>  CATEGORIES = net
>  
>  HOMEPAGE =   https://www.gnu.org/software/wget/
> @@ -17,7 +17,7 @@ LIB_DEPENDS =   converters/libunistring \
>   net/libpsl
>  
>  MASTER_SITES =   ${MASTER_SITE_GNU:=wget/}
> -EXTRACT_SUFX =   .tar.xz
> +EXTRACT_SUFX =   .tar.gz

.tar.gz is the default, so just remove EXTRACT_SUFX. (We do have support
for .lz but at least for -stable it's easier for people if they don't
have to install a weird compression tool :)

> -+++ doc/wget.texiSat Feb 11 16:46:13 2017
> -@@ -191,14 +191,14 @@ 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
> --(@file{/usr/local/etc/wgetrc} by default) for site settings. You can also
> -+(@file{${SYSCONFDIR}/wgetrc} by default) for site settings. You can also
> - specify the location of a startup file with the --config option.
> -  
> - 
> - @ignore
> - @c man begin FILES
> - @table @samp
> --@item /usr/local/etc/wgetrc
> -+@item ${SYSCONFDIR}/wgetrc
> - Default location of the @dfn{global} startup file.
> - 
> - @item .wgetrc

That hunk of the patch needs merging by hand.

Re: UPDATE: net/wget -current,-stable (CVE-2017-13089, CVE-2017-13090)

2017-10-31 Thread Rafael Sadowski 
On Tue Oct 31, 2017 at 12:20:26PM +0100, Rafael Sadowski wrote:
> Hi All,
> 
> Update Wget to the latest stable version 1.19.1. This version includes
> the following CVE patches:
> 
> "Fix stack overflow in HTTP protocol handling (CVE-2017-13089)"
> http://git.savannah.gnu.org/cgit/wget.git/commit/?id=d892291fb8ace4c3b734ea5125770989c215df3f
> 
> "Fix heap overflow in HTTP protocol handling (CVE-2017-13090)"
> http://git.savannah.gnu.org/cgit/wget.git/commit/?id=ba6b44f6745b14dce414761a8e4b35d31b176bba
> 
> 1.19.1 provide only .tar.lz and tar.gz. Since we don't support *.lz, I
> have decided to *.gz
> 
> Also please find attached a diff for -stable.
> 

Forget the attachment, so here it is inline:


Index: Makefile
===
RCS file: /cvs/ports/net/wget/Makefile,v
retrieving revision 1.72
diff -u -p -u -p -r1.72 Makefile
--- Makefile22 Feb 2017 02:49:25 -  1.72
+++ Makefile31 Oct 2017 11:09:04 -
@@ -4,6 +4,7 @@ COMMENT =   retrieve files from the web vi
 
 DISTNAME = wget-1.19.1
 CATEGORIES =   net
+REVISION = 0
 
 HOMEPAGE = https://www.gnu.org/software/wget/
 
Index: patches/patch-src_http_c
===
RCS file: patches/patch-src_http_c
diff -N patches/patch-src_http_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_http_c31 Oct 2017 11:09:04 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+Fix stack overflow in HTTP protocol handling (CVE-2017-13089)
+Commit from upstream d892291fb8ace4c3b734ea5125770989c215df3f
+Index: src/http.c
+--- src/http.c.orig
 src/http.c
+@@ -973,6 +973,9 @@ skip_short_body (int fd, wgint contlen, bool chunked)
+   remaining_chunk_size = strtol (line, , 16);
+   xfree (line);
+ 
++  if (remaining_chunk_size < 0)
++  return false;
++
+   if (remaining_chunk_size == 0)
+ {
+   line = fd_read_line (fd);
Index: patches/patch-src_retr_c
===
RCS file: patches/patch-src_retr_c
diff -N patches/patch-src_retr_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_retr_c31 Oct 2017 11:09:04 -
@@ -0,0 +1,19 @@
+$OpenBSD$
+Fix heap overflow in HTTP protocol handling (CVE-2017-13090)
+Commit from upstream ba6b44f6745b14dce414761a8e4b35d31b176bba
+Index: src/retr.c
+--- src/retr.c.orig
 src/retr.c
+@@ -320,6 +320,12 @@ fd_read_body (const char *downloaded_filename, int fd,
+   remaining_chunk_size = strtol (line, , 16);
+   xfree (line);
+ 
++  if (remaining_chunk_size < 0)
++  {
++  ret = -1;
++  break;
++  }
++
+   if (remaining_chunk_size == 0)
+ {
+   ret = 0;

UPDATE: net/wget -current,-stable (CVE-2017-13089, CVE-2017-13090)

2017-10-31 Thread Rafael Sadowski 
Hi All,

Update Wget to the latest stable version 1.19.1. This version includes
the following CVE patches:

"Fix stack overflow in HTTP protocol handling (CVE-2017-13089)"
http://git.savannah.gnu.org/cgit/wget.git/commit/?id=d892291fb8ace4c3b734ea5125770989c215df3f

"Fix heap overflow in HTTP protocol handling (CVE-2017-13090)"
http://git.savannah.gnu.org/cgit/wget.git/commit/?id=ba6b44f6745b14dce414761a8e4b35d31b176bba

1.19.1 provide only .tar.lz and tar.gz. Since we don't support *.lz, I
have decided to *.gz

Also please find attached a diff for -stable.

Ok? Feedback?

Best regards,

Rafael Sadowski


Index: Makefile
===
RCS file: /cvs/ports/net/wget/Makefile,v
retrieving revision 1.72
diff -u -p -u -p -r1.72 Makefile
--- Makefile22 Feb 2017 02:49:25 -  1.72
+++ Makefile31 Oct 2017 10:54:50 -
@@ -2,7 +2,7 @@
 
 COMMENT =  retrieve files from the web via HTTP, HTTPS and FTP
 
-DISTNAME = wget-1.19.1
+DISTNAME = wget-1.19.2
 CATEGORIES =   net
 
 HOMEPAGE = https://www.gnu.org/software/wget/
@@ -17,7 +17,7 @@ LIB_DEPENDS = converters/libunistring \
net/libpsl
 
 MASTER_SITES = ${MASTER_SITE_GNU:=wget/}
-EXTRACT_SUFX = .tar.xz
+EXTRACT_SUFX = .tar.gz
 
 MODULES =  devel/gettext
 
Index: distinfo
===
RCS file: /cvs/ports/net/wget/distinfo,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 distinfo
--- distinfo22 Feb 2017 02:49:25 -  1.19
+++ distinfo31 Oct 2017 10:54:50 -
@@ -1,2 +1,2 @@
-SHA256 (wget-1.19.1.tar.xz) = DJULlnGIEiKk04WwE8lgTpioAl0ZiFKd/KDpNhd0TNI=
-SIZE (wget-1.19.1.tar.xz) = 2111756
+SHA256 (wget-1.19.2.tar.gz) = T0pnO21GbvpQ+/unlr2EpGriTjcPpWLt5bIatTwRqSA=
+SIZE (wget-1.19.2.tar.gz) = 4349267
Index: patches/patch-doc_wget_texi
===
RCS file: /cvs/ports/net/wget/patches/patch-doc_wget_texi,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 patch-doc_wget_texi
--- patches/patch-doc_wget_texi 22 Feb 2017 02:49:25 -  1.12
+++ patches/patch-doc_wget_texi 31 Oct 2017 10:54:50 -
@@ -1,24 +1,8 @@
 $OpenBSD: patch-doc_wget_texi,v 1.12 2017/02/22 02:49:25 danj Exp $
 doc/wget.texi.orig Sat Feb 11 05:45:22 2017
-+++ doc/wget.texi  Sat Feb 11 16:46:13 2017
-@@ -191,14 +191,14 @@ 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
--(@file{/usr/local/etc/wgetrc} by default) for site settings. You can also
-+(@file{${SYSCONFDIR}/wgetrc} by default) for site settings. You can also
- specify the location of a startup file with the --config option.
-  
- 
- @ignore
- @c man begin FILES
- @table @samp
--@item /usr/local/etc/wgetrc
-+@item ${SYSCONFDIR}/wgetrc
- Default location of the @dfn{global} startup file.
- 
- @item .wgetrc
-@@ -3113,9 +3113,8 @@ commands.
+Index: doc/wget.texi
+--- doc/wget.texi.orig
 doc/wget.texi
+@@ -3143,9 +3143,8 @@ commands.
  @cindex location of wgetrc
  
  When initializing, Wget will look for a @dfn{global} startup file,
@@ -30,7 +14,7 @@ $OpenBSD: patch-doc_wget_texi,v 1.12 201
  
  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
-@@ -3125,7 +3124,7 @@ If @code{WGETRC} is not set, Wget will try to load @fi
+@@ -3155,7 +3154,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

Re: update net/wget

2016-03-26 Thread Stuart Henderson 
On 2016/03/25 23:01, Daniel Jakots wrote:
> Hi,
> 
> Here's a patch to update wget to latest release. Changelog is available
> in their repository [0].
> 
> make test on amd64 and i386 is fine. There is no more any failed test
> as in 1.16.3.
> 
> [0]: http://git.savannah.gnu.org/cgit/wget.git/tree/NEWS

Makes sense I think. Please regenerate patches (make clean; make patch;
make update-patches), if you set PATCH_DEBUG=Yes in mk.conf it's easier to
see when this is needed then ok with me.

Please mention in the commit message that FTP no longer automatically
falls back to passive (this was due to whining from Tor people) so
sometimes it may now be necessary to use --no-passive-ftp.

update net/wget

2016-03-25 Thread Daniel Jakots 
Hi,

Here's a patch to update wget to latest release. Changelog is available
in their repository [0].

make test on amd64 and i386 is fine. There is no more any failed test
as in 1.16.3.

[0]: http://git.savannah.gnu.org/cgit/wget.git/tree/NEWS

Cheers,
Daniel

Index: Makefile
===
RCS file: /cvs/ports/net/wget/Makefile,v
retrieving revision 1.69
diff -u -p -r1.69 Makefile
--- Makefile9 Apr 2015 11:32:04 -   1.69
+++ Makefile25 Mar 2016 21:15:19 -
@@ -2,8 +2,7 @@
 
 COMMENT =  retrieve files from the web via HTTP, HTTPS and FTP
 
-DISTNAME = wget-1.16.3
-REVISION = 0
+DISTNAME = wget-1.17.1
 CATEGORIES =   net
 
 HOMEPAGE = https://www.gnu.org/software/wget/
Index: distinfo
===
RCS file: /cvs/ports/net/wget/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- distinfo19 Mar 2015 20:53:43 -  1.16
+++ distinfo25 Mar 2016 21:15:19 -
@@ -1,2 +1,2 @@
-SHA256 (wget-1.16.3.tar.xz) = Z/e3sPXBTbYz47GPUxcnhsAB4VPVRc/IXYJ1nFwv+zc=
-SIZE (wget-1.16.3.tar.xz) = 1794148
+SHA256 (wget-1.17.1.tar.xz) = /lWbYeucwBY1rGIGoU4Cy1FZGDjDX6g8ekqsrgvdl8k=
+SIZE (wget-1.17.1.tar.xz) = 1894140

Re: Update: net/wget 1.16

2014-11-05 Thread David Coppa 
On Tue, Nov 4, 2014 at 11:58 PM, Christian Weisgerber
na...@mips.inka.de wrote:
 Here's an update of net/wget to 1.16.

 I've added the required dependencies to (successfully) run all the
 regression tests.  wget 1.15 would just skip most tests if the
 dependencies weren't installed, but 1.16 treats them as errors.

 I think the src/Makefile.in patch can go because @LIBINTL@ includes
 libiconv, i.e., @LIBICONV@ @LIBINTL@ will expand to something like
 -liconv -lintl -liconv.  Somebody who cares about vax may want to
 double check.

 Comments, questions, ok?

works for me. Ok dcoppa@

 Index: Makefile
 ===
 RCS file: /cvs/ports/net/wget/Makefile,v
 retrieving revision 1.63
 diff -u -p -r1.63 Makefile
 --- Makefile27 Oct 2014 15:28:39 -  1.63
 +++ Makefile4 Nov 2014 22:39:22 -
 @@ -2,8 +2,7 @@

  COMMENT =  retrieve files from the web via HTTP, HTTPS and FTP

 -DISTNAME = wget-1.15
 -REVISION = 0
 +DISTNAME = wget-1.16
  CATEGORIES =   net

  HOMEPAGE = https://www.gnu.org/software/wget/
 @@ -16,19 +15,28 @@ LIB_DEPENDS =   devel/libidn \
 devel/pcre

  MASTER_SITES = ${MASTER_SITE_GNU:=wget/}
 +EXTRACT_SUFX = .tar.xz

  MODULES =  devel/gettext

 -FAKE_FLAGS =   sysconfdir=${PREFIX}/share/examples/wget
 +TEST_DEPENDS = www/p5-HTTP-Daemon lang/python/3.4
 +# Test-proxied-https-auth.px
 +TEST_DEPENDS +=www/p5-HTTP-Message security/p5-IO-Socket-SSL
 +
 +FAKE_FLAGS =   sysconfdir=${PREFIX}/share/examples/wget

  CONFIGURE_STYLE =  gnu
 -CONFIGURE_ARGS =   --with-ssl=openssl
 +CONFIGURE_ARGS =   --without-libpsl --with-ssl=openssl
  CONFIGURE_ENV +=   CPPFLAGS=-I${LOCALBASE}/include \
 LDFLAGS=-L${LOCALBASE}/lib
  # do not pick up libuuid from sysutils/e2fsprogs
  CONFIGURE_ENV +=   ac_cv_header_uuid_uuid_h=no
 +MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/build-aux

  pre-build:
 @${SUBST_CMD} ${WRKSRC}/doc/wget.texi ${WRKSRC}/doc/sample.wgetrc
 +
 +pre-test:
 +   @ln -s ${LOCALBASE}/bin/python3.4 ${WRKDIR}/bin/python3

  .include bsd.port.mk
 Index: distinfo
 ===
 RCS file: /cvs/ports/net/wget/distinfo,v
 retrieving revision 1.13
 diff -u -p -r1.13 distinfo
 --- distinfo29 Jan 2014 06:08:42 -  1.13
 +++ distinfo4 Nov 2014 22:39:22 -
 @@ -1,2 +1,2 @@
 -SHA256 (wget-1.15.tar.gz) = UhJr6M8b3ddTaIbnTAU619DtKqibS2MPdnhbrCFpX80=
 -SIZE (wget-1.15.tar.gz) = 3417936
 +SHA256 (wget-1.16.tar.xz) = kmHdCQoXaHttwGgqJX6QqSbe8VYktlDo95mvV+XIsOc=
 +SIZE (wget-1.16.tar.xz) = 1697308
 Index: patches/patch-doc_wget_texi
 ===
 RCS file: /cvs/ports/net/wget/patches/patch-doc_wget_texi,v
 retrieving revision 1.7
 diff -u -p -r1.7 patch-doc_wget_texi
 --- patches/patch-doc_wget_texi 27 Oct 2014 15:28:39 -  1.7
 +++ patches/patch-doc_wget_texi 4 Nov 2014 22:39:22 -
 @@ -1,23 +1,7 @@
  $OpenBSD: patch-doc_wget_texi,v 1.7 2014/10/27 15:28:39 jasper Exp $
 -
 -Security fix for CVE-2014-4877, Arbitrary Symlink Access
 -http://git.savannah.gnu.org/cgit/wget.git/commit/?id=18b0979357ed7dc4e11d4f2b1d7e0f5932d82aa7
 -
  doc/wget.texi.orig Sat Jan  4 13:49:47 2014
 -+++ doc/wget.texi  Mon Oct 27 16:19:34 2014
 -@@ -10,6 +10,11 @@
 - @setchapternewpage on
 - @c %**end of header
 -
 -+@dircategory Networking tools
 -+@direntry
 -+* Wget: (wget.info).A utility for network download.
 -+@end direntry
 -+
 - @iftex
 - @c Remove this if you don't use A4 paper.
 - @afourpaper
 -@@ -190,14 +195,14 @@ gauge can be customized to your preferences.
 +--- doc/wget.texi.orig Mon Oct 27 09:18:13 2014
  doc/wget.texi  Tue Nov  4 22:27:21 2014
 +@@ -190,14 +190,14 @@ 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
 @@ -34,36 +18,7 @@ http://git.savannah.gnu.org/cgit/wget.gi
   Default location of the @dfn{global} startup file.

   @item .wgetrc
 -@@ -1837,17 +1842,18 @@ Preserve remote file permissions instead of 
 permission
 -
 - @cindex symbolic links, retrieving
 - @item --retr-symlinks
 --Usually, when retrieving @sc{ftp} directories recursively and a symbolic
 --link is encountered, the linked-to file is not downloaded.  Instead, a
 --matching symbolic link is created on the local filesystem.  The
 --pointed-to file will not be downloaded unless this recursive retrieval
 --would have encountered it separately and downloaded it anyway.
 -+By default, when retrieving @sc{ftp} directories recursively and a symbolic 
 link
 -+is encountered, the symbolic link is traversed and the pointed-to files are
 -+retrieved.

Re: Update: net/wget 1.16

2014-11-05 Thread Christian Weisgerber 
On 2014-11-04, Christian Weisgerber na...@mips.inka.de wrote:

 Here's an update of net/wget to 1.16.

 I've added the required dependencies to (successfully) run all the
 regression tests.  wget 1.15 would just skip most tests if the
 dependencies weren't installed, but 1.16 treats them as errors.

 I think the src/Makefile.in patch can go because @LIBINTL@ includes
 libiconv, i.e., @LIBICONV@ @LIBINTL@ will expand to something like
 -liconv -lintl -liconv.  Somebody who cares about vax may want to
 double check.

ajacoutot@ has kindly reminded me that the python module can be
used so we don't have to hardcode the exact python version.
How's this look?

Index: Makefile
===
RCS file: /cvs/ports/net/wget/Makefile,v
retrieving revision 1.63
diff -u -p -r1.63 Makefile
--- Makefile27 Oct 2014 15:28:39 -  1.63
+++ Makefile5 Nov 2014 15:10:54 -
@@ -2,8 +2,7 @@
 
 COMMENT =  retrieve files from the web via HTTP, HTTPS and FTP
 
-DISTNAME = wget-1.15
-REVISION = 0
+DISTNAME = wget-1.16
 CATEGORIES =   net
 
 HOMEPAGE = https://www.gnu.org/software/wget/
@@ -16,19 +15,34 @@ LIB_DEPENDS =   devel/libidn \
devel/pcre
 
 MASTER_SITES = ${MASTER_SITE_GNU:=wget/}
+EXTRACT_SUFX = .tar.xz
 
 MODULES =  devel/gettext
 
-FAKE_FLAGS =   sysconfdir=${PREFIX}/share/examples/wget
+# some regression tests require python3
+MODULES += lang/python
+MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
+MODPY_BUILDDEP =   No
+MODPY_RUNDEP = No
+
+TEST_DEPENDS = www/p5-HTTP-Daemon ${MODPY_RUN_DEPENDS}
+# Test-proxied-https-auth.px
+TEST_DEPENDS +=www/p5-HTTP-Message security/p5-IO-Socket-SSL
+
+FAKE_FLAGS =   sysconfdir=${PREFIX}/share/examples/wget
 
 CONFIGURE_STYLE =  gnu
-CONFIGURE_ARGS =   --with-ssl=openssl
+CONFIGURE_ARGS =   --without-libpsl --with-ssl=openssl
 CONFIGURE_ENV +=   CPPFLAGS=-I${LOCALBASE}/include \
LDFLAGS=-L${LOCALBASE}/lib
 # do not pick up libuuid from sysutils/e2fsprogs
 CONFIGURE_ENV +=   ac_cv_header_uuid_uuid_h=no
+MODGNU_CONFIG_GUESS_DIRS = ${WRKSRC}/build-aux
 
 pre-build:
@${SUBST_CMD} ${WRKSRC}/doc/wget.texi ${WRKSRC}/doc/sample.wgetrc
+
+pre-test:
+   @ln -s ${MODPY_BIN} ${WRKDIR}/bin/python3
 
 .include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/net/wget/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo29 Jan 2014 06:08:42 -  1.13
+++ distinfo5 Nov 2014 15:10:54 -
@@ -1,2 +1,2 @@
-SHA256 (wget-1.15.tar.gz) = UhJr6M8b3ddTaIbnTAU619DtKqibS2MPdnhbrCFpX80=
-SIZE (wget-1.15.tar.gz) = 3417936
+SHA256 (wget-1.16.tar.xz) = kmHdCQoXaHttwGgqJX6QqSbe8VYktlDo95mvV+XIsOc=
+SIZE (wget-1.16.tar.xz) = 1697308
Index: patches/patch-doc_wget_texi
===
RCS file: /cvs/ports/net/wget/patches/patch-doc_wget_texi,v
retrieving revision 1.7
diff -u -p -r1.7 patch-doc_wget_texi
--- patches/patch-doc_wget_texi 27 Oct 2014 15:28:39 -  1.7
+++ patches/patch-doc_wget_texi 5 Nov 2014 15:10:54 -
@@ -1,23 +1,7 @@
 $OpenBSD: patch-doc_wget_texi,v 1.7 2014/10/27 15:28:39 jasper Exp $
-
-Security fix for CVE-2014-4877, Arbitrary Symlink Access
-http://git.savannah.gnu.org/cgit/wget.git/commit/?id=18b0979357ed7dc4e11d4f2b1d7e0f5932d82aa7
-
 doc/wget.texi.orig Sat Jan  4 13:49:47 2014
-+++ doc/wget.texi  Mon Oct 27 16:19:34 2014
-@@ -10,6 +10,11 @@
- @setchapternewpage on
- @c %**end of header
- 
-+@dircategory Networking tools
-+@direntry
-+* Wget: (wget.info).A utility for network download.
-+@end direntry
-+
- @iftex
- @c Remove this if you don't use A4 paper.
- @afourpaper
-@@ -190,14 +195,14 @@ gauge can be customized to your preferences.
+--- doc/wget.texi.orig Mon Oct 27 09:18:13 2014
 doc/wget.texi  Tue Nov  4 22:27:21 2014
+@@ -190,14 +190,14 @@ 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
@@ -34,36 +18,7 @@ http://git.savannah.gnu.org/cgit/wget.gi
  Default location of the @dfn{global} startup file.
  
  @item .wgetrc
-@@ -1837,17 +1842,18 @@ Preserve remote file permissions instead of permission
- 
- @cindex symbolic links, retrieving
- @item --retr-symlinks
--Usually, when retrieving @sc{ftp} directories recursively and a symbolic
--link is encountered, the linked-to file is not downloaded.  Instead, a
--matching symbolic link is created on the local filesystem.  The
--pointed-to file will not be downloaded unless this recursive retrieval
--would have encountered it separately and downloaded it anyway.
-+By

Update: net/wget 1.16

2014-11-04 Thread Christian Weisgerber 
Here's an update of net/wget to 1.16.

I've added the required dependencies to (successfully) run all the
regression tests.  wget 1.15 would just skip most tests if the
dependencies weren't installed, but 1.16 treats them as errors.

I think the src/Makefile.in patch can go because @LIBINTL@ includes
libiconv, i.e., @LIBICONV@ @LIBINTL@ will expand to something like
-liconv -lintl -liconv.  Somebody who cares about vax may want to
double check.

Comments, questions, ok?

Index: Makefile
===
RCS file: /cvs/ports/net/wget/Makefile,v
retrieving revision 1.63
diff -u -p -r1.63 Makefile
--- Makefile27 Oct 2014 15:28:39 -  1.63
+++ Makefile4 Nov 2014 22:39:22 -
@@ -2,8 +2,7 @@
 
 COMMENT =  retrieve files from the web via HTTP, HTTPS and FTP
 
-DISTNAME = wget-1.15
-REVISION = 0
+DISTNAME = wget-1.16
 CATEGORIES =   net
 
 HOMEPAGE = https://www.gnu.org/software/wget/
@@ -16,19 +15,28 @@ LIB_DEPENDS =   devel/libidn \
devel/pcre
 
 MASTER_SITES = ${MASTER_SITE_GNU:=wget/}
+EXTRACT_SUFX = .tar.xz
 
 MODULES =  devel/gettext
 
-FAKE_FLAGS =   sysconfdir=${PREFIX}/share/examples/wget
+TEST_DEPENDS = www/p5-HTTP-Daemon lang/python/3.4
+# Test-proxied-https-auth.px
+TEST_DEPENDS +=www/p5-HTTP-Message security/p5-IO-Socket-SSL
+
+FAKE_FLAGS =   sysconfdir=${PREFIX}/share/examples/wget
 
 CONFIGURE_STYLE =  gnu
-CONFIGURE_ARGS =   --with-ssl=openssl
+CONFIGURE_ARGS =   --without-libpsl --with-ssl=openssl
 CONFIGURE_ENV +=   CPPFLAGS=-I${LOCALBASE}/include \
LDFLAGS=-L${LOCALBASE}/lib
 # do not pick up libuuid from sysutils/e2fsprogs
 CONFIGURE_ENV +=   ac_cv_header_uuid_uuid_h=no
+MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/build-aux
 
 pre-build:
@${SUBST_CMD} ${WRKSRC}/doc/wget.texi ${WRKSRC}/doc/sample.wgetrc
+
+pre-test:
+   @ln -s ${LOCALBASE}/bin/python3.4 ${WRKDIR}/bin/python3
 
 .include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/net/wget/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo29 Jan 2014 06:08:42 -  1.13
+++ distinfo4 Nov 2014 22:39:22 -
@@ -1,2 +1,2 @@
-SHA256 (wget-1.15.tar.gz) = UhJr6M8b3ddTaIbnTAU619DtKqibS2MPdnhbrCFpX80=
-SIZE (wget-1.15.tar.gz) = 3417936
+SHA256 (wget-1.16.tar.xz) = kmHdCQoXaHttwGgqJX6QqSbe8VYktlDo95mvV+XIsOc=
+SIZE (wget-1.16.tar.xz) = 1697308
Index: patches/patch-doc_wget_texi
===
RCS file: /cvs/ports/net/wget/patches/patch-doc_wget_texi,v
retrieving revision 1.7
diff -u -p -r1.7 patch-doc_wget_texi
--- patches/patch-doc_wget_texi 27 Oct 2014 15:28:39 -  1.7
+++ patches/patch-doc_wget_texi 4 Nov 2014 22:39:22 -
@@ -1,23 +1,7 @@
 $OpenBSD: patch-doc_wget_texi,v 1.7 2014/10/27 15:28:39 jasper Exp $
-
-Security fix for CVE-2014-4877, Arbitrary Symlink Access
-http://git.savannah.gnu.org/cgit/wget.git/commit/?id=18b0979357ed7dc4e11d4f2b1d7e0f5932d82aa7
-
 doc/wget.texi.orig Sat Jan  4 13:49:47 2014
-+++ doc/wget.texi  Mon Oct 27 16:19:34 2014
-@@ -10,6 +10,11 @@
- @setchapternewpage on
- @c %**end of header
- 
-+@dircategory Networking tools
-+@direntry
-+* Wget: (wget.info).A utility for network download.
-+@end direntry
-+
- @iftex
- @c Remove this if you don't use A4 paper.
- @afourpaper
-@@ -190,14 +195,14 @@ gauge can be customized to your preferences.
+--- doc/wget.texi.orig Mon Oct 27 09:18:13 2014
 doc/wget.texi  Tue Nov  4 22:27:21 2014
+@@ -190,14 +190,14 @@ 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
@@ -34,36 +18,7 @@ http://git.savannah.gnu.org/cgit/wget.gi
  Default location of the @dfn{global} startup file.
  
  @item .wgetrc
-@@ -1837,17 +1842,18 @@ Preserve remote file permissions instead of permission
- 
- @cindex symbolic links, retrieving
- @item --retr-symlinks
--Usually, when retrieving @sc{ftp} directories recursively and a symbolic
--link is encountered, the linked-to file is not downloaded.  Instead, a
--matching symbolic link is created on the local filesystem.  The
--pointed-to file will not be downloaded unless this recursive retrieval
--would have encountered it separately and downloaded it anyway.
-+By default, when retrieving @sc{ftp} directories recursively and a symbolic 
link
-+is encountered, the symbolic link is traversed and the pointed-to files are
-+retrieved.  Currently, Wget does not traverse symbolic links to directories to
-+download them recursively, though this feature may be added in the future.
- 
--When @samp{--retr-symlinks} is specified, however,

UPDATE: net/wget

2009-10-01 Thread Benoit Lecocq 
Hi,

This diff updates wget to the latest release 1.12.
Tested on amd64/sparc64.

Comments ? OK ?

Cheers,
benoit
Index: Makefile
===
RCS file: /cvs/openbsd/ports/net/wget/Makefile,v
retrieving revision 1.47
diff -u -r1.47 Makefile
--- Makefile16 Sep 2009 17:34:41 -  1.47
+++ Makefile1 Oct 2009 14:22:32 -
@@ -2,8 +2,7 @@
 
 COMMENT=   retrieve files from the web via HTTP, HTTPS and FTP
 
-DISTNAME=  wget-1.11.4
-PKGNAME=   ${DISTNAME}p0
+DISTNAME=  wget-1.12
 CATEGORIES=net
 MASTER_SITES=  ${MASTER_SITE_GNU:=wget/}
 
Index: distinfo
===
RCS file: /cvs/openbsd/ports/net/wget/distinfo,v
retrieving revision 1.9
diff -u -r1.9 distinfo
--- distinfo9 Oct 2008 18:50:44 -   1.9
+++ distinfo1 Oct 2009 14:22:32 -
@@ -1,5 +1,5 @@
-MD5 (wget-1.11.4.tar.gz) = aeinKWwOEsU72f/XhkYuhw==
-RMD160 (wget-1.11.4.tar.gz) = HOyZsHP89k3TYpd7C4ilX49Hu7g=
-SHA1 (wget-1.11.4.tar.gz) = p4o7cf1ZUE3z/z28CiGVoUEOnqw=
-SHA256 (wget-1.11.4.tar.gz) = cxWWO27vt1MLSk9jpdXM2rMAeHhM9BzLUpeHP5reovM=
-SIZE (wget-1.11.4.tar.gz) = 1475149
+MD5 (wget-1.12.tar.gz) = FBRhucBORU3IkzydHyq/gw==
+RMD160 (wget-1.12.tar.gz) = Iy0Kpvs2cxwWLStzdKqatZ5nG30=
+SHA1 (wget-1.12.tar.gz) = UNTtJEHmfbeqUGHYpN3kHuDpQkg=
+SHA256 (wget-1.12.tar.gz) = dXjtCXThLKpxEgWB+jli7lpp9xdd3D1qbbDs3LpltXI=
+SIZE (wget-1.12.tar.gz) = 2464747
Index: patches/patch-configure
===
RCS file: /cvs/openbsd/ports/net/wget/patches/patch-configure,v
retrieving revision 1.7
diff -u -r1.7 patch-configure
--- patches/patch-configure 9 Oct 2008 18:50:45 -   1.7
+++ patches/patch-configure 1 Oct 2009 14:22:32 -
@@ -1,21 +0,0 @@
-$OpenBSD: patch-configure,v 1.7 2008/10/09 18:50:45 sthen Exp $
 configure.orig Mon Jun 30 02:41:15 2008
-+++ configure  Thu Oct  9 15:34:59 2008
-@@ -12562,7 +12562,7 @@ if test ${ac_cv_lib_intl_gettext+set} = set; then
-   echo $ECHO_N (cached) $ECHO_C 6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS=-lintl  $LIBS
-+LIBS=-lintl -liconv $LIBS
- cat conftest.$ac_ext _ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -12619,7 +12619,7 @@ fi
- echo ${ECHO_T}$ac_cv_lib_intl_gettext 6; }
- if test $ac_cv_lib_intl_gettext = yes; then
- 
--LIBS=-lintl $LIBS
-+LIBS=-lintl -liconv $LIBS
- 
- cat confdefs.h \_ACEOF
- #define HAVE_GETTEXT 1
Index: patches/patch-doc_Makefile_in
===
RCS file: /cvs/openbsd/ports/net/wget/patches/patch-doc_Makefile_in,v
retrieving revision 1.3
diff -u -r1.3 patch-doc_Makefile_in
--- patches/patch-doc_Makefile_in   9 Oct 2008 18:50:45 -   1.3
+++ patches/patch-doc_Makefile_in   1 Oct 2009 14:22:32 -
@@ -1,28 +1,19 @@
-$OpenBSD: patch-doc_Makefile_in,v 1.3 2008/10/09 18:50:45 sthen Exp $
 doc/Makefile.in.orig   Sun Apr 27 05:48:19 2008
-+++ doc/Makefile.inThu Oct  9 15:34:59 2008
-@@ -51,7 +51,7 @@ RM = rm -f
- TEXI2POD = $(srcdir)/texi2pod.pl
- POD2MAN  = @POD2MAN@
- MAN  = wget.$(manext)
--WGETRC   = $(sysconfdir)/wgetrc
-+WGETRCDIR= $(prefix)/share/examples/wget
+--- doc/Makefile.in.orig   Tue Sep 22 18:40:11 2009
 doc/Makefile.inThu Oct  1 14:53:44 2009
+@@ -598,7 +598,7 @@
+ RM = rm -f
+ TEXI2POD = $(srcdir)/texi2pod.pl
+ MAN = wget.$(manext)
+-WGETRC = $(sysconfdir)/wgetrc
++WGETRCDIR = $(prefix)/share/examples/wget
  SAMPLERCTEXI = sample.wgetrc.munged_for_texi_inclusion
  
  #
-@@ -66,6 +66,7 @@ $(SAMPLERCTEXI): $(srcdir)/sample.wgetrc
-   sed s/@/@@/g $?  $@
- 
- wget.info: $(srcdir)/wget.texi $(SAMPLERCTEXI) $(srcdir)/version.texi
-+  @rm -f wget.info*
-   $(MAKEINFO) -I$(srcdir) $(srcdir)/wget.texi
- 
- .SECONDARY: wget.pod
-@@ -128,22 +129,8 @@ install.man: $(MAN)
+@@ -1067,23 +1067,9 @@
  
  # install sample.wgetrc
  install.wgetrc: $(srcdir)/sample.wgetrc
--  $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir)
+-  $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
 -  @if test -f $(DESTDIR)$(WGETRC); then \
 -if cmp -s $(srcdir)/sample.wgetrc $(DESTDIR)$(WGETRC); then echo ; \
 -   else \
@@ -38,8 +29,10 @@
 -  else \
 -$(INSTALL_DATA) $(srcdir)/sample.wgetrc $(DESTDIR)$(WGETRC); \
 -  fi
-+  $(top_srcdir)/mkinstalldirs $(DESTDIR)$(WGETRCDIR)
+-
++  $(mkinstalldirs) $(DESTDIR)$(WGETRCDIR)
 +  $(INSTALL_DATA) $(srcdir)/sample.wgetrc $(DESTDIR)$(WGETRCDIR)
- 
- # uninstall info pages
- uninstall.info:
++  
+ # uninstall man page
+ uninstall.man:
+   $(RM) $(DESTDIR)$(mandir)/man$(manext)/$(MAN)
Index: patches/patch-doc_sample_wgetrc
===
RCS file: /cvs/openbsd/ports/net/wget/patches/patch-doc_sample_wgetrc,v
retrieving revision 1.3
diff -u -r1.3 patch-doc_sample_wgetrc
---