news/tin: Update to 2.6.0

-- 2.6.0 release 20210823 "Coleburn" --

 027) Dennis Preiser <dennis@d--p.de>
      ADD. allow multibyte chars in art_marked_*
      ADD. jump to article in posting history screen
      ADD. untaint variable used for connection info output
      ADD. skip_scope() to check if the attribute is set
      ADD. right-justify txt_thread_x_of_n and txt_x_resp in page level
      ADD. filter update comment to related entry, not the following
      BUG. spurious newline before signature with sigdashes=OFF
      BUG. crash when trying to respond to an article with an empty Subject
      BUG. unfinished rfc2047 encodings may lead to out of bound reads
      BUG. hypothetic resource leak in lookup_msgid()
      BUG. swapped check to avoid possible out of bound read in
           find_first_unread()
      BUG. aborting jump to n-th article in thread in page level switched
           to 1st article in thread instead of doing nothing
      BUG. possible integer overflow if high watermark equals maximal
           possible article number supporetd
      FIX. art.c, attrib.c, config.c, filter.c, group.c, help.c, init.c
           keymap.c, lang.c, misc.c, newsrc.c, nntplib.c, options_menu.c
           page.c, post.c, prompt.c, rfc2047.c, screen.c, search.c, select.c
           sigfile.c, signal.c, thread.c, extern.h, keymap.h, proto.h, tin.h
           tinrc.h

 026) Thomas E. Dickey <dickey@invisible-island.net>
      ADD. update configure macros
      ADD. lots of casts to silence compiler warnings
      FIX. art.c, attrib.c, charset.c, color.c, config.c, cook.c, curses.c
           envarg.c, feed.c, filter.c, getline.c, global.c, group.c, header.c
           help.c, inews.c, keymap.c, memory.c, misc.c, nntplib.c
           options_menu.c, page.c, pgp.c, post.c, prompt.c, read.c, refs.c
           regex.c, rfc1524.c, rfc2045.c, rfc2046.c, rfc2047.c, save.c
           screen.c, search.c, select.c, sigfile.c, string.c, thread.c, trace.c
           wildmat.c, parsdate.y, keymap.h, tcurses.h, tin.h, aclocal.m4
           configure[.in]

 025) Urs Janssen <urs@tin.org>
      REM. 3rd party tool expand_aliases
      REM. redundant condition
      REM. auto_save tinrc and attributes option
      REM. start_editor_offset tinrc and attributes option
      BUG. after toggling through thread methods via 'u' go to parent in pager
           could lead to crash if no more read article in thread were left
      BUG. hypothetic use of uninitialized variable when saving article
           without From-header in mbox format
      BUG. using right-mouse actions (use_mouse=ON) outside the active
           screen-aerea (clicking below the last group/subject on screen)
           could lead to a crash
      BUG. get_initials() may leave initials uninitiaized
      BUG. detection of idn_decodename() from libidnkit may fail
      BUG. gnksa parser still prohibited some chars in dqotes which are
           allowed since RFC 5322
      BUG. spin_cursor() was only called for valid entries when parsing the
           active file
      ADD. always show full path in upgrade_prompt_quit()
      ADD. replace elm(1) with mutt(1) in examples
      ADD. update included libcanlock
      ADD. config.guess, config.sub update
      ADD. reorder t_filter to reduce mem usage
      ADD. quit early if screen is too small, reduce MIN_COLUMNS_ON_TERMINAL
           from 50 to 40
      REM. some unnecessary initializations
      ADD. suppress some unused-result warnings
      FIX. active.c, art.c, attrib.c, charset.c, config.c, cook.c, debug.c
           feed.c, filter.c, global.c, group.c, help.c, inews.c, init.c, lang.c
           main.c, makecfg.c, memory.c, misc.c, nntplib.c, options_menu.c
           page.c, pgp.c, post.c, prompt.c, rfc2046.c, rfc2047.c, save.c
           search.c, sigfile.c, string.c, tcurses.c, thread.c, xface.c
           extern.h, proto.h tin.h, tinrc.h, trace.h, version.h, tincfg.tbl
           tin.[15], libcanlock/*, expand_aliases.tgz, config.guess, config.sub
           configure[.in]

 024) Matt Anton <tin@lv223.org>
      ADD. updated French translation
      FIX. fr.po

 023) Toomas Soome <tsoome@me.com>
      ADD. updated Estonian translation
      FIX. et.po

8 files changed, 85 insertions, 36 deletions

diff --git a/news/tin/Makefile b/news/tin/Makefile
index aa4d8cacb43..f385edac626 100644
--- a/news/tin/Makefile
+++ b/news/tin/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.95 2021/05/24 19:53:40 wiz Exp $
+# $NetBSD: Makefile,v 1.96 2021/08/27 17:45:26 micha Exp $
 
-DISTNAME=	tin-2.4.5
-PKGREVISION=	2
+DISTNAME=	tin-2.6.0
 CATEGORIES=	news
 MASTER_SITES=	ftp://ftp.tin.org/pub/news/clients/tin/stable/
 MASTER_SITES+=	http://ftp.funet.fi/pub/unix/news/tin-unoff/
diff --git a/news/tin/distinfo b/news/tin/distinfo
index 403ae44b09b..eb28f70e289 100644
--- a/news/tin/distinfo
+++ b/news/tin/distinfo
@@ -1,9 +1,12 @@
-$NetBSD: distinfo,v 1.28 2021/01/04 15:30:46 micha Exp $
+$NetBSD: distinfo,v 1.29 2021/08/27 17:45:26 micha Exp $
 
-SHA1 (tin-2.4.5.tar.xz) = 1abe3f78e5dcd4c468ef0b0b3597114670ef4ec8
-RMD160 (tin-2.4.5.tar.xz) = 8c4f20ab8de2816b939f057643815e0a8bc007c3
-SHA512 (tin-2.4.5.tar.xz) = 4ec1c4990ce8d9a46204c0064f19c5c2b99848201c37562f8df76de5be84fdd2bcd35cbc3e9f20233f636522e086ac031a5a9cb65bd22a53eda619dcce86adbc
-Size (tin-2.4.5.tar.xz) = 1559164 bytes
-SHA1 (patch-Makefile) = cb55674fbb02a1ba1be823332b325b0ac164dd4d
-SHA1 (patch-configure) = 6fdeb045df9e61bba6195eae3c3d2fd8b6e7a0e8
+SHA1 (tin-2.6.0.tar.xz) = af5d36e909876f0fe7b17bd30995fb4a3e9efa6c
+RMD160 (tin-2.6.0.tar.xz) = cbc37af5a42aadbd6df835400c696c5315d0a5e5
+SHA512 (tin-2.6.0.tar.xz) = d843bd313fd144fbb5f4c40e3f0f776cab3a974494adc7004ee265235ab538dde520bc72c956d5a8517225fdb50e754b444f25bd3b661ddf51ff9e4135904862
+Size (tin-2.6.0.tar.xz) = 1575564 bytes
+SHA1 (patch-Makefile) = 7f9048d31e70d9630ba6511d834db5d0c60a7de1
+SHA1 (patch-configure) = 124a69bda73e55fbde04076f6f1b4ec9293a1b31
+SHA1 (patch-configure.in) = 9a43c69dc722b3613324afca34ae79b9f369f7ae
+SHA1 (patch-include_autoconf.hin) = e35e4cbf9ed74b8bd50542f4b9bb03be6343187d
+SHA1 (patch-include_tcurses.h) = 37aab6936786ee1639416b1f5ab7f440f9118952
 SHA1 (patch-src_Makefile.in) = f6fbe7aee324cd844ed6e1870d3c871c247e06ce
diff --git a/news/tin/options.mk b/news/tin/options.mk
index a0f7ebdfe9a..c18b28a12fc 100644
--- a/news/tin/options.mk
+++ b/news/tin/options.mk
@@ -1,12 +1,13 @@
-# $NetBSD: options.mk,v 1.19 2019/01/15 15:48:17 wiz Exp $
+# $NetBSD: options.mk,v 1.20 2021/08/27 17:45:26 micha Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.tin
 PKG_OPTIONS_REQUIRED_GROUPS=	display
-PKG_OPTIONS_GROUP.display=	curses termcap # wide-curses removed, see below
+PKG_OPTIONS_GROUP.display=	curses termcap
 PKG_SUPPORTED_OPTIONS=		canlock icu inet6 nls tin-use-inn-spool
-PKG_SUGGESTED_OPTIONS=		canlock inet6 nls termcap # see PR #51819
-# untested
-#PKG_SUPPORTED_OPTIONS+=	socks
+# Combination of options curses(configured to pdcurses) and icu does not work
+# curses(configured to curses) still does not work on NetBSD, see PR #51819
+# Suggest termcap instead of curses.
+PKG_SUGGESTED_OPTIONS=		canlock inet6 nls termcap
 
 .include "../../mk/bsd.options.mk"
 
@@ -15,8 +16,7 @@ PKG_SUGGESTED_OPTIONS=		canlock inet6 nls termcap # see PR #51819
 CONFIGURE_ARGS+=	--enable-cancel-locks
 .endif
 
-# Option wide-curses removed
-# Use curses option and set CURSES_DEFAULT in mk.conf to select type
+# Use curses option and CURSES_DEFAULT in mk.conf to select type
 .if !empty(PKG_OPTIONS:Mcurses)
 .include "../../mk/curses.buildlink3.mk"
 CONFIGURE_ARGS+=	--with-screen=${CURSES_TYPE}
@@ -54,8 +54,3 @@ CONFIGURE_ARGS+=	--with-inews-dir=${PREFIX}/inn/bin \
 .else
 CONFIGURE_ARGS+=	--enable-nntp-only
 .endif
-
-#.if !empty(PKG_OPTIONS:Msocks)
-#.include "../../net/dante/buildlink3.mk"
-#CONFIGURE_ARGS+=	--with-socks=${BUILDLINK_PREFIX.dante}
-#.endif
diff --git a/news/tin/patches/patch-Makefile b/news/tin/patches/patch-Makefile
index ead5ad03f61..4dbd8a5009d 100644
--- a/news/tin/patches/patch-Makefile
+++ b/news/tin/patches/patch-Makefile
@@ -1,10 +1,10 @@
-$NetBSD: patch-Makefile,v 1.3 2021/01/04 15:30:46 micha Exp $
+$NetBSD: patch-Makefile,v 1.4 2021/08/27 17:45:26 micha Exp $
 
 Do not ignore error for missing src/Makefile.
 
 --- Makefile.orig
 +++ Makefile
-@@ -408,7 +408,7 @@ all:
+@@ -407,7 +407,7 @@ all:
  	@$(ECHO) " "
  
  build:
diff --git a/news/tin/patches/patch-configure b/news/tin/patches/patch-configure
index f4d6a8d4de1..0cfbe3d2283 100644
--- a/news/tin/patches/patch-configure
+++ b/news/tin/patches/patch-configure
@@ -1,16 +1,15 @@
-$NetBSD: patch-configure,v 1.3 2021/01/04 15:30:46 micha Exp $
+$NetBSD: patch-configure,v 1.4 2021/08/27 17:45:26 micha Exp $
 
 Skip missing include directories.
 
---- configure.orig
+--- configure.orig	2021-08-27 08:01:40.268475849 +0000
 +++ configure
-@@ -13015,6 +13015,9 @@ echo "$ac_t""$cf_cv_ncurses_h2" 1>&6
- if test -n "$cf_1st_incdir" ; then
-   for cf_add_incdir in $cf_1st_incdir
-   do
-+    if ! [ -d $cf_add_incdir ]; then
-+      continue;
-+    fi
- 	while test $cf_add_incdir != /usr/include
- 	do
- 	  if test -d $cf_add_incdir
+@@ -35720,7 +35720,7 @@ EOF
+ 	;;
+ esac
+ 
+-for cf_func in vw_printw
++for cf_func in vw_printw get_wch
+ do
+ 
+ cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
diff --git a/news/tin/patches/patch-configure.in b/news/tin/patches/patch-configure.in
new file mode 100644
index 00000000000..e5d62c0a90a
--- /dev/null
+++ b/news/tin/patches/patch-configure.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure.in,v 1.1 2021/08/27 17:45:26 micha Exp $
+
+Backported upstream patch for ncurses (without w).
+
+--- configure.in.orig	2021-08-23 05:13:12.000000000 +0000
++++ configure.in
+@@ -1577,7 +1577,7 @@ esac
+ if test "$cf_cv_termlib" = pdcurses ; then
+ 	CF_PDCURSES_X11
+ fi
+-CF_CURSES_FUNCS(vw_printw)
++CF_CURSES_FUNCS(vw_printw get_wch)
+ 
+ ### sum up warnings
+ if test "$cf_cv_termlib" = none ; then
diff --git a/news/tin/patches/patch-include_autoconf.hin b/news/tin/patches/patch-include_autoconf.hin
new file mode 100644
index 00000000000..8eaf23bf4fb
--- /dev/null
+++ b/news/tin/patches/patch-include_autoconf.hin
@@ -0,0 +1,23 @@
+$NetBSD: patch-include_autoconf.hin,v 1.1 2021/08/27 17:45:26 micha Exp $
+
+Backported upstream patch for ncurses (without w).
+
+--- include/autoconf.hin.orig	2020-12-01 10:52:11.000000000 +0000
++++ include/autoconf.hin
+@@ -3,7 +3,7 @@
+  *  Module    : autoconf.hin
+  *  Author    : Thomas Dickey
+  *  Created   : 1995-08-24
+- *  Updated   : 2020-04-23
++ *  Updated   : 2021-08-25
+  *  Notes     : #include files, #defines & struct's
+  *
+  * Copyright (c) 1995-2021 Thomas Dickey <dickey@invisible-island.net>
+@@ -256,6 +256,7 @@
+ #	undef HAVE_GETSERVBYNAME
+ #	undef HAVE_GETTIMEOFDAY
+ #	undef HAVE_GETWD
++#	undef HAVE_GET_WCH
+ #	undef HAVE_HEAPSORT
+ #	undef HAVE_ICONV
+ #	undef HAVE_INET_ADDR
diff --git a/news/tin/patches/patch-include_tcurses.h b/news/tin/patches/patch-include_tcurses.h
new file mode 100644
index 00000000000..a9a86580150
--- /dev/null
+++ b/news/tin/patches/patch-include_tcurses.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-include_tcurses.h,v 1.1 2021/08/27 17:45:26 micha Exp $
+
+Backported upstream patch for ncurses (without w).
+
+--- include/tcurses.h.orig	2021-07-13 05:56:52.000000000 +0000
++++ include/tcurses.h
+@@ -75,7 +75,7 @@
+ #					endif /* HAVE_NCURSES_NCURSES_H */
+ #				endif /* HAVE_NCURSES_H */
+ #			endif /* HAVE_NCURSESW_NCURSES_H */
+-#			if defined(NCURSES_WIDECHAR)
++#			if defined(NCURSES_WIDECHAR) && defined(HAVE_GET_WCH)
+ #				define HAVE_NCURSESW 1
+ #			endif
+ #		endif /* HAVE_NCURSES_H */