CVS commit: pkgsrc/www

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Apr 27 13:26:19 UTC 2023

Modified Files:
        pkgsrc/www/w3m: Makefile Makefile.common PLIST distinfo options.mk
        pkgsrc/www/w3m-img: Makefile

Log Message:
w3m*: update to 0.5.3git20230121

2023-01-21  Tatsuya Kinoshita  <tats%debian.org@localhost>

        * NEWS: Update NEWS to 0.5.3+git20230121.

2023-01-15  Tatsuya Kinoshita  <tats%debian.org@localhost>

        * scripts/w3mman/w3mman2html.cgi.in:
        Add GROFF_NO_SGR=1 to w3mman2html.cgi for non-Debian groff.
        Bug-Debian: https://github.com/tats/w3m/pull/238
        Bug-Debian: https://github.com/tats/w3m/issues/201

        * scripts/w3mman/w3mman2html.cgi.in:
        Revert "Turn ansi escape sequences into html tags".
        This reverts commit 44af9271e0e984544762e2212549f134c86b4418.
        cf. https://github.com/tats/w3m/pull/238

2023-01-12  Tatsuya Kinoshita  <tats%debian.org@localhost>

        * fm.h, rc.c: Do not expand config value of tmp_dir.

        * config.h.dist, config.h.in, configure, configure.ac, rc.c:
        Use faccessat for rc_dir and tmp_dir.

        * local.c: Allow writeLocalCookie even when no_rc_dir.

        * main.c, rc.c: Call wtf_init in sync_with_option.

        * rc.c: Avoid modifying read-only rc_dir.

        * fm.h, main.c, proto.h, rc.c: Make tmp_dir if not found.

2023-01-09  Tatsuya Kinoshita  <tats%debian.org@localhost>

        * NEWS: Prepare NEWS for w3m 0.5.3+git202301XX.

        * doc-de/FAQ.html, doc-jp/FAQ.html, doc/FAQ.html:
        Remove obsolete documents.

        * doc-de/FAQ.html, doc-de/MANUAL.html:
        Wrap long lines to avoid Lintian warnings.

2023-01-07  Tatsuya Kinoshita  <tats%debian.org@localhost>

        * file.c: Only read a first title.
        * file.c, fm.h: Revert "Only read title when in head".
        This reverts commit 0189e8aa5c4c4919a9bbc4dcbe0e521aada51e3c.
        Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1020215

2023-01-06  Tatsuya Kinoshita  <tats%debian.org@localhost>

        * file.c: Indentation fix for HTMLtagproc1.

2023-01-06  Robert Alm Nilsson  <robert%robalni.org@localhost>

        * file.c, fm.h: Only read title when in head.
        Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1020215

2023-01-06  Tatsuya Kinoshita  <tats%debian.org@localhost>

        * libwc/charset.c: Avoid locale sensitive tolower in wc_charset_to_ces.

2023-01-06  Sertaç Ö. Yıldız  <sertacyildiz%gmail.com@localhost>

        * libwc/charset.c:
        Fix charset declaration parser fails with turkish locale.
        Origin: https://bugzilla-attachments.redhat.com/attachment.cgi?id=160014
        Bug-Fedora: https://bugzilla.redhat.com/show_bug.cgi?id=249675

        * history.c: Use st_mtime instead of st_mtim.tv_sec to compile on macos.
        cf. https://github.com/tats/w3m/pull/247

2023-01-06  Rene Kita  <mail%rkta.de@localhost>

        * html.c, html.h, tagtable.tab: Recognize link targets in dfn elements.
        Refactor html.c.  Align in html.c.
        Origin: https://github.com/tats/w3m/pull/259
        Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1018696

        * Makefile.in, form.c, main.c, util.c, util.h:
        Handle failed system calls.
        * display.c, display.h, file.c, form.c, main.c, proto.h, terms.h:
        Move declarations to appropiate header files.
        Origin: https://github.com/tats/w3m/pull/257
        Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=398989

        * entity.js, etc.c, table.c, tests/allentity.expected:
        * tests/allentity.html: Skip soft hyphen when reading token.
        Fix generated HTML for entity test.
        Origin: https://github.com/tats/w3m/pull/256
        Bug-Debian: https://github.com/tats/w3m/issues/224
        Bug-Debian: https://github.com/tats/w3m/issues/258
        Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=830173

        * file.c: Check LESSOPEN to avoid undefined behaviour.
        Refactor lessopen_stream.
        Origin: https://github.com/tats/w3m/pull/254
        Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=991608

2023-01-05  Markus Hiereth  <translation%hiereth.de@localhost>

        * po/de.po: Update German message catalogue.
        Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1011945#10

2023-01-05  Rene Kita  <mail%rkta.de@localhost>

        * buffer.c: Exit with error if a new buffer can't be allocated.
        Origin: https://git.sr.ht/~rkta/w3m/commit/1f88544c1a009ed2088ff20973bcfffe6cbcb5de
        Bug-Debian: https://github.com/tats/w3m/pull/232
        Bug-Debian: https://github.com/tats/w3m/pull/233

        * history.c, history.h:
        Merge history file if it was modified after start.
        * history.h, proto.h: Move declarations to the appropriate header file.
        * history.c: Add comment to explain placement of the ifdef.
        * history.c, proto.h: Let loadHistory return an error code.
        * history.c: Use 'goto fail' to remove code duplication.
        Origin: https://github.com/tats/w3m/pull/247
        Bug-Debian: https://github.com/tats/w3m/issues/176

2023-01-05  Alberto Fanjul  <albertofanjul%gmail.com@localhost>

        * scripts/w3mman/w3mman2html.cgi.in:
        Turn ansi escape sequences into html tags.
        Origin: https://github.com/tats/w3m/pull/238
        Bug-Debian: https://github.com/tats/w3m/issues/201

2023-01-04  Tatsuya Kinoshita  <tats%debian.org@localhost>

        * po/de.po, po/it.po, po/ja.po, po/sv_SE.po, po/w3m.pot, po/zh_CN.po:
        * po/zh_TW.po: Update PO strings.

        * doc/MANUAL.html, doc/README.img, libwc/wc_types.h, main.c, rc.c:
        English fixes.
        cf. https://github.com/tats/w3m/pull/241

2023-01-04  Rene Kita  <mail%rkta.de@localhost>

        * rc.c: Remove unused variable.
        * table.c: Remove a warning for bzero with GCC 12.
        * file.c: Fix potential null pointer dereference.
        * .github/workflows/build.yml:
        Don't error out on deprecated declaration warnings.
        Origin: https://github.com/tats/w3m/pull/255
        cf. https://github.com/tats/w3m/issues/252

2023-01-04  nico  <smnicolas%gmail.com@localhost>

        * doc/MANUAL.html, doc/w3m.1, fm.h, main.c, rc.c, terms.c:
        Add high-intensity colors option and cli flag.
        Origin: https://github.com/tats/w3m/pull/251
        cf. https://github.com/tats/w3m/issues/250
        Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=626291

2023-01-04  Trafficone  <trafficone%gmail.com@localhost>

        * doc/README.SSL, doc/README.keymap, doc/README.menu: Translate from
        doc-jp.
        * doc/README.cookie, doc/README.func, doc/README.img, doc/README.m17n:
        * doc/README.passwd: Clarified wording.  Minor grammar changes.
        Origin: https://github.com/tats/w3m/pull/241

2022-12-25  Tatsuya Kinoshita  <tats%debian.org@localhost>

        * configure: Update configure with acinclude.m4.

2022-12-25  Sam James  <sam%gentoo.org@localhost>

        * acinclude.m4: Fix configure tests broken with Clang 16.
        Origin: https://github.com/tats/w3m/pull/248

2022-12-25  Rin Okuyama  <rokuyama.rk%gmail.com@localhost>

        * image.c, terms.c:
        For sixel, no need to round image size to multiple of character size.
        Origin: https://github.com/tats/w3m/pull/246

        * image.c: Display resized image for OSC 5379 (mlterm).
        Origin: https://github.com/tats/w3m/pull/245

2022-12-25  Rene Kita  <mail%rkta.de@localhost>

        * doc/README.siteconf: Say what the comment character is.
        Use the comment character in Examples.
        Origin: https://github.com/tats/w3m/pull/237

        * main.c: Retry if loading of a file fails when argv_is_url.
        Origin: https://github.com/tats/w3m/pull/235
        Bug-Debian: https://github.com/tats/w3m/issues/210
        Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=537761
        Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=946440

2022-12-25  NRK  <nrk%disroot.org@localhost>

        * image.c: remove duplicate declaration.
        * cookie.c, entity.c, file.c, frame.c, func.c, image.c, linein.c:
        * mailcap.c, main.c, rc.c, rc.h, table.c, terms.c, terms.h:
        * w3mbookmark.c, w3mhelperpanel.c:
        fix all -Wmissing-prototypes warnings.
        * file.c, history.c, history.h, indep.c, indep.h, mailcap.c, proto.h:
        * rc.c, terms.c, url.c: fix some -Wstrict-prototypes warnings.
        Origin: https://github.com/tats/w3m/pull/234

2022-12-25  Rene Kita  <mail%rkta.de@localhost>

        * .github/workflows/build.yml:
        Add GitHub Action to build source when pushing.
        Origin: https://github.com/tats/w3m/pull/228

2022-12-21  Tatsuya Kinoshita  <tats%debian.org@localhost>

        * po/de.po, po/it.po, po/ja.po, po/sv_SE.po, po/w3m.pot, po/zh_CN.po:
        * po/zh_TW.po: Update PO strings.

2022-12-21  Rene Kita  <mail%rkta.de@localhost>

        * etc.c, fm.h, history.c, rc.c:
        Add option to set directory for temporary files.
        Origin: https://github.com/tats/w3m/pull/219
        cf. https://github.com/tats/w3m/issues/130

2022-12-21  Yash Lala  <yashlala%gmail.com@localhost>

        * rc.c: Use `Strnew_charp()` to create `char *` instead of `strdup()`.

        * rc.c:
        refactor: Substitute some clunky code with a `strdup()`.

        * doc/FAQ.html, doc/MANUAL.html, doc/w3m.1, rc.c:
        Set `rc_dir` based on `W3M_DIR` environment variable.
        Origin: https://github.com/tats/w3m/pull/207
        cf. https://github.com/tats/w3m/issues/130

2022-12-20  Tatsuya Kinoshita  <tats%debian.org@localhost>

        * etc.c: Fix potential overflow in checkType.

        * etc.c:
        Fix m17n backspace handling causes out-of-bounds write in checkType.
        [CVE-2022-38223]
        Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1019599
        Bug-Debian: https://github.com/tats/w3m/issues/242


To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 pkgsrc/www/w3m/Makefile
cvs rdiff -u -r1.75 -r1.76 pkgsrc/www/w3m/Makefile.common
cvs rdiff -u -r1.19 -r1.20 pkgsrc/www/w3m/PLIST
cvs rdiff -u -r1.37 -r1.38 pkgsrc/www/w3m/distinfo
cvs rdiff -u -r1.16 -r1.17 pkgsrc/www/w3m/options.mk
cvs rdiff -u -r1.31 -r1.32 pkgsrc/www/w3m-img/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/w3m/Makefile
diff -u pkgsrc/www/w3m/Makefile:1.94 pkgsrc/www/w3m/Makefile:1.95
--- pkgsrc/www/w3m/Makefile:1.94        Tue Jan  3 17:38:25 2023
+++ pkgsrc/www/w3m/Makefile     Thu Apr 27 13:26:19 2023
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.94 2023/01/03 17:38:25 wiz Exp $
+# $NetBSD: Makefile,v 1.95 2023/04/27 13:26:19 wiz Exp $
 
 PKGNAME=       w3m-${W3M_PKGVERS}
-PKGREVISION=   2
 COMMENT=       Multilingualized version of a pager/text-based browser w3m
 
 CONFLICTS+=    w3m-img-[0-9]*
 
 .include "../../www/w3m/Makefile.common"
+.include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/w3m/Makefile.common
diff -u pkgsrc/www/w3m/Makefile.common:1.75 pkgsrc/www/w3m/Makefile.common:1.76
--- pkgsrc/www/w3m/Makefile.common:1.75 Thu Oct  6 21:33:55 2022
+++ pkgsrc/www/w3m/Makefile.common      Thu Apr 27 13:26:19 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.75 2022/10/06 21:33:55 wiz Exp $
+# $NetBSD: Makefile.common,v 1.76 2023/04/27 13:26:19 wiz Exp $
 #
 # used by www/w3m/Makefile
 # used by www/w3m-img/Makefile
@@ -21,7 +21,7 @@ USE_TOOLS+=           gmake   # Needed for some com
 USE_TOOLS+=            msgfmt
 USE_PKGLOCALEDIR=      yes
 
-W3M_VERS=      0.5.3+git20220429
+W3M_VERS=      0.5.3+git20230121
 W3M_PKGVERS=   ${W3M_VERS:S/+git/.0./}
 
 # For w3mman, xface2xpm, cgi scripts.
@@ -79,10 +79,8 @@ post-install:
        set -e; cd ${WRKSRC}; pax -r -w -s ',.*\.1$$,,' doc doc-jp \
            ${DESTDIR}${PREFIX}/${DOCDIR}
 
-BUILDLINK_API_DEPENDS.boehm-gc+=       boehm-gc>=7.2
 .include "../../devel/boehm-gc/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/termcap.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/w3m/PLIST
diff -u pkgsrc/www/w3m/PLIST:1.19 pkgsrc/www/w3m/PLIST:1.20
--- pkgsrc/www/w3m/PLIST:1.19   Mon Jul 25 08:54:29 2022
+++ pkgsrc/www/w3m/PLIST        Thu Apr 27 13:26:19 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2022/07/25 08:54:29 rin Exp $
+@comment $NetBSD: PLIST,v 1.20 2023/04/27 13:26:19 wiz Exp $
 bin/w3m
 bin/w3mman
 libexec/w3m/cgi-bin/dirlist.cgi
@@ -46,12 +46,15 @@ share/doc/w3m/doc/FAQ.html
 share/doc/w3m/doc/HISTORY
 share/doc/w3m/doc/MANUAL.html
 share/doc/w3m/doc/README
+share/doc/w3m/doc/README.SSL
 share/doc/w3m/doc/README.cookie
 share/doc/w3m/doc/README.cygwin
 share/doc/w3m/doc/README.dict
 share/doc/w3m/doc/README.func
 share/doc/w3m/doc/README.img
+share/doc/w3m/doc/README.keymap
 share/doc/w3m/doc/README.m17n
+share/doc/w3m/doc/README.menu
 share/doc/w3m/doc/README.mouse
 share/doc/w3m/doc/README.passwd
 share/doc/w3m/doc/README.pre_form

Index: pkgsrc/www/w3m/distinfo
diff -u pkgsrc/www/w3m/distinfo:1.37 pkgsrc/www/w3m/distinfo:1.38
--- pkgsrc/www/w3m/distinfo:1.37        Mon Jul 25 08:54:29 2022
+++ pkgsrc/www/w3m/distinfo     Thu Apr 27 13:26:19 2023
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.37 2022/07/25 08:54:29 rin Exp $
+$NetBSD: distinfo,v 1.38 2023/04/27 13:26:19 wiz Exp $
 
-BLAKE2s (w3m-0.5.3+git20220429.tar.gz) = ca03156aed2a40f440ebcfe3bfb38a449ac224b4df0e891042326d0288bde712
-SHA512 (w3m-0.5.3+git20220429.tar.gz) = 0f29d6a1f311c3f417ca041fe3788c94946d238b618eca923cd62a6e5e598aefd898fb8a54999876179011bf37d492a989872e38375ea96ac59914b244f1517e
-Size (w3m-0.5.3+git20220429.tar.gz) = 2312378 bytes
+BLAKE2s (w3m-0.5.3+git20230121.tar.gz) = 8dd724d95a676c9831ea20599767c6fec0a27e02b6487af970f749768b41967f
+SHA512 (w3m-0.5.3+git20230121.tar.gz) = f220aabf69cf11ca7560c1519a971bdb1cc0baa443b1b46cd8fca2a4defb614653dd9ba637afbf9315f3b63a349f972436348c2f93d06665573057e4232eab1c
+Size (w3m-0.5.3+git20230121.tar.gz) = 2322709 bytes

Index: pkgsrc/www/w3m/options.mk
diff -u pkgsrc/www/w3m/options.mk:1.16 pkgsrc/www/w3m/options.mk:1.17
--- pkgsrc/www/w3m/options.mk:1.16      Tue Mar 17 14:18:06 2020
+++ pkgsrc/www/w3m/options.mk   Thu Apr 27 13:26:19 2023
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.16 2020/03/17 14:18:06 wiz Exp $
+# $NetBSD: options.mk,v 1.17 2023/04/27 13:26:19 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.w3m
 PKG_SUPPORTED_OPTIONS= inet6 migemo w3m-lynx-key
@@ -35,7 +35,7 @@ CONFIGURE_ARGS+=      --enable-keymap=w3m
 .endif
 
 PLIST_VARS+=           image
-.if !empty(PKG_OPTIONS:Mw3m-image-*)
+.if ${PKG_OPTIONS:Mw3m-image-*}
 .  for _imagelib in ${PKG_OPTIONS_GROUP.imagelib}
 .    if !empty(PKG_OPTIONS:M${_imagelib})
 _W3M_IMAGELIB=         ${_imagelib:C|^w3m-image-||}

Index: pkgsrc/www/w3m-img/Makefile
diff -u pkgsrc/www/w3m-img/Makefile:1.31 pkgsrc/www/w3m-img/Makefile:1.32
--- pkgsrc/www/w3m-img/Makefile:1.31    Thu Mar 12 18:22:55 2020
+++ pkgsrc/www/w3m-img/Makefile Thu Apr 27 13:26:19 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2020/03/12 18:22:55 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2023/04/27 13:26:19 wiz Exp $
 
 PKGNAME=       w3m-img-${W3M_PKGVERS}
 COMMENT=       Multilingualized version of w3m with inline image support
@@ -15,3 +15,4 @@ USE_TOOLS+=   msgfmt
 _W3M_USE_IMAGE=        YES
 
 .include "../../www/w3m/Makefile.common"
+.include "../../mk/bsd.pkg.mk"