CVS commit: pkgsrc/news/tin

["Michael Baeuerle" <micha%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   micha
Date:           Wed Jan 25 18:06:41 UTC 2023

Modified Files:
        pkgsrc/news/tin: Makefile distinfo options.mk
        pkgsrc/news/tin/patches: patch-Makefile patch-src_Makefile.in
Added Files:
        pkgsrc/news/tin/patches: patch-src_nntplib.c

Log Message:
news/tin: Update to 2.6.2

Added upstream patch to fix build.

-- 2.6.2 release 20221224 "Pittyvaich" --

 009) Florian Weimer <fweimer%redhat.com@localhost>
      Thomas E. Dickey <dickey%invisible-island.net@localhost>
      ADD. missing #include directives to improve C99 compatibility
      FIX. aclocal.m4, configure

 008) Enrik Berkhan <enrik%tin.org@localhost>
      BUG. remove alleged Y2K38 safety issues
      ADD. ~ and $VAR expansion to tinrc option tls_ca_cert_file
      ADD. simplify code and refactor to fix an unused variable complaint
      ADD. pcre2 support (debian bug #999941, fedora bug #2128388)
      ADD. NNTPS support based on libressl/GNUttls/OpenSSL (RFC 8143)
      ADD. TLS connection info
      ADD. switch from stdio to own buffer implementation
      FIX. config.c, cook.c, feed.c, filter.c, group.c, init.c, lang.c, main.c
           memory.c, misc.c, nntplib.c, nntps.c, options_menu.c, page.c, read.c
           regex.c, save.c, screen.c, search.c, select.c, wildmat.c
           autoconf.h[in], extern.h, nntplib.h, proto.h, tinrc.h, tin.h
           tnntp.h, tnntps.h, tincfg.tbl, parsdate.y, configure[.in]
           Makefile[.in], tin.1

 007) Dennis Preiser <dennis%d--p.de@localhost>
      BUG. backward search for a non empty line got stuck in endless loop
      BUG. reading a faulty mime article via NNTP could hang tin
           (debian bug #1005024)
      BUG. a long group name isn't shortened appropriately in group level
      BUG. config changes via 'M'enu were not immediately active for
           show_signatures, verbatim_handling, tex2iso_conf and
           trim_article_body
      BUG. after posting an article from selection or group level the cursor
           remains visible in the lower left corner
      ADD. tinrc.show_help_mail_sign
      ADD. get $TMPDIR just once
      ADD. option to remove SOFT HYPHENs (U+00AD) from non verbatim blocks of
           articles in UTF-8 and using a UTF-8 locale
      BUG. show actual help-key in txt_type_h_for_help
      FIX. config.c, cook.c, debug.c, filter.c, group.c, init.c, lang.c, mail.c
           misc.c, my_tmpfile.c, newsrc.c, options_menu.c, page.c, pgp.c
           regex.c, rfc2046.c, refs.c, save.c, screen.c, search.c, select.c
           thread.c, extern.h, proto.h, tin.h, tinrc.h, tincfg.tbl, tin.1
           tin.5

 006) Thomas E. Dickey <dickey%invisible-island.net@localhost>
      BUG. configure --with-included-gettext was non-functional since tin 2.4.2
      ADD. update configure macros
      FIX. aclocal.m4, intl/Makefile.in, intl/plural.c

 005) Urs Janssen <urs%tin.org@localhost>
      ADD. config.guess, config.sub update
      ADD. code cleanup; remove redundant condition and unused var;
           add some missing casts and _Noreturn
      ADD. ignore set but empty env.-vars
      ADD. try harder when looking for keymap-file, try locale "suffixes"
           from language[_territory[.codeset]][@modifier] with parts
           stripped off in order: codeset, normalized codeset, territory,
           modifier
      ADD. guard against empty inews_prog and empty mm_charset in
           !CHARSET_CONVERSION case
      ADD. warn about some more nonsensical cmd.-line option combinations
           -ow|-oz|-wz
      ADD. exit early at -o when there are no postponed articles
      ADD. reduce memory usage for xface
      ADD. list of leap years from 2040 to 2068
      ADD. restrict URL_REGEX to disallow non ascii chars in path
      ADD. accept active file lines even without moderation flag
      ADD. do not try NEXT again after an ERR_COMMAND response
      ADD. ConnectionInfo page ('J')
      ADD. update tin_atol() to new SI prefix names Ronna and Quetta
      ADD. experimental MAXARTNUM extension
      BUG. missing default tinrc.editor_format on first start
      BUG. typo in man page
      BUG. possible memleak in check_article_to_be_posted if article has
           multiple To:, Followup-To: or Newsgroups:-headers
      BUG. possible buffer overflow in find_reply_to_addr
      BUG. f'up to an article without a message-id (possible in mailgroups)
           crashes
      BUG. hypothetic missing string termination
      BUG. need to convert utf8pass to network charset unconditionally in
           do_authinfo_sasl_plain
      FIX. active.c, art.c, auth.c, config.c, filter.c, group.c, help.c
           inews.c, init.c, keymap.c, lang.c, main.c, makecfg.c, mimetypes.c
           misc.c, nntplib.c, options_menu.c, page.c, post.c, pgp.c, rfc1524.c
           rfc2046.c, save.c, select.c, signal.c, string.c, thread.c, wildmat.c
           xface.c, parsdate.y, extern.h, keymap.h, nntplib.h, proto.h, tin.h
           tin.1, tin.5, config.guess, config.sub, configure[.in]


To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 pkgsrc/news/tin/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/news/tin/distinfo
cvs rdiff -u -r1.21 -r1.22 pkgsrc/news/tin/options.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/news/tin/patches/patch-Makefile \
    pkgsrc/news/tin/patches/patch-src_Makefile.in
cvs rdiff -u -r0 -r1.1 pkgsrc/news/tin/patches/patch-src_nntplib.c

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

Modified files:

Index: pkgsrc/news/tin/Makefile
diff -u pkgsrc/news/tin/Makefile:1.101 pkgsrc/news/tin/Makefile:1.102
--- pkgsrc/news/tin/Makefile:1.101      Wed Nov 23 16:20:56 2022
+++ pkgsrc/news/tin/Makefile    Wed Jan 25 18:06:41 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.101 2022/11/23 16:20:56 adam Exp $
+# $NetBSD: Makefile,v 1.102 2023/01/25 18:06:41 micha Exp $
 
-DISTNAME=      tin-2.6.1
-PKGREVISION=   3
+DISTNAME=      tin-2.6.2
 CATEGORIES=    news
 MASTER_SITES=  ftp://ftp.tin.org/pub/news/clients/tin/stable/
 MASTER_SITES+= http://ftp.funet.fi/pub/unix/news/tin-unoff/

Index: pkgsrc/news/tin/distinfo
diff -u pkgsrc/news/tin/distinfo:1.33 pkgsrc/news/tin/distinfo:1.34
--- pkgsrc/news/tin/distinfo:1.33       Wed Jan 12 11:41:41 2022
+++ pkgsrc/news/tin/distinfo    Wed Jan 25 18:06:41 2023
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.33 2022/01/12 11:41:41 micha Exp $
+$NetBSD: distinfo,v 1.34 2023/01/25 18:06:41 micha Exp $
 
-BLAKE2s (tin-2.6.1.tar.xz) = 489c1802956e8fa0e3728c1fbcf4976164e9d04745f147b3975f956a84c62df2
-SHA512 (tin-2.6.1.tar.xz) = dc9ace5e24cac1efcaac25df1747dd435573130cff4e9c846c89e8faaed8e8120d66a2021332c01f350744155bcb7be608657285560a1a2457b4635cc8fa22b3
-Size (tin-2.6.1.tar.xz) = 1570500 bytes
-SHA1 (patch-Makefile) = 7f9048d31e70d9630ba6511d834db5d0c60a7de1
-SHA1 (patch-src_Makefile.in) = aecb7ce01c60d232214c9499d761a7da33cb7fb8
+BLAKE2s (tin-2.6.2.tar.xz) = 632d2a39bc2ce3f23e0949edad87aa4681eb1ab69b68b4a55e7f7521a6341b3a
+SHA512 (tin-2.6.2.tar.xz) = 4c9e0edb3268d57fb89d9d53a90e8a5ba73da7c1da63c834224bed0f763502a7c3dd325351d3e57b1ddcb57494a84228cc38f227c49300b759fad8d112b1cac1
+Size (tin-2.6.2.tar.xz) = 1598732 bytes
+SHA1 (patch-Makefile) = c5787ae88d070844b43f56e968d2fab00a8613ad
+SHA1 (patch-src_Makefile.in) = 11785ab8fb5391d91ff34981bbb77191f228bed5
+SHA1 (patch-src_nntplib.c) = 75a14821af4a01b9f0787411edf1370c5af6da63

Index: pkgsrc/news/tin/options.mk
diff -u pkgsrc/news/tin/options.mk:1.21 pkgsrc/news/tin/options.mk:1.22
--- pkgsrc/news/tin/options.mk:1.21     Wed Sep  1 16:43:59 2021
+++ pkgsrc/news/tin/options.mk  Wed Jan 25 18:06:41 2023
@@ -1,12 +1,12 @@
-# $NetBSD: options.mk,v 1.21 2021/09/01 16:43:59 micha Exp $
+# $NetBSD: options.mk,v 1.22 2023/01/25 18:06:41 micha Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.tin
 PKG_OPTIONS_REQUIRED_GROUPS=   display
 PKG_OPTIONS_GROUP.display=     curses termcap
-PKG_SUPPORTED_OPTIONS=         canlock icu inet6 nls tin-use-inn-spool
+PKG_SUPPORTED_OPTIONS=         canlock icu inet6 nls tin-use-inn-spool tls
 # 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
+PKG_SUGGESTED_OPTIONS=         canlock inet6 nls termcap tls
 
 .include "../../mk/bsd.options.mk"
 
@@ -53,3 +53,8 @@ CONFIGURE_ARGS+=      --with-inews-dir=${PREF
 .else
 CONFIGURE_ARGS+=       --enable-nntp-only
 .endif
+
+.if !empty(PKG_OPTIONS:Mtls)
+.include "../../security/openssl/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-nntps=openssl
+.endif

Index: pkgsrc/news/tin/patches/patch-Makefile
diff -u pkgsrc/news/tin/patches/patch-Makefile:1.4 pkgsrc/news/tin/patches/patch-Makefile:1.5
--- pkgsrc/news/tin/patches/patch-Makefile:1.4  Fri Aug 27 17:45:26 2021
+++ pkgsrc/news/tin/patches/patch-Makefile      Wed Jan 25 18:06:41 2023
@@ -1,10 +1,10 @@
-$NetBSD: patch-Makefile,v 1.4 2021/08/27 17:45:26 micha Exp $
+$NetBSD: patch-Makefile,v 1.5 2023/01/25 18:06:41 micha Exp $
 
 Do not ignore error for missing src/Makefile.
 
 --- Makefile.orig
 +++ Makefile
-@@ -407,7 +407,7 @@ all:
+@@ -409,7 +409,7 @@ all:
        @$(ECHO) " "
  
  build:
Index: pkgsrc/news/tin/patches/patch-src_Makefile.in
diff -u pkgsrc/news/tin/patches/patch-src_Makefile.in:1.4 pkgsrc/news/tin/patches/patch-src_Makefile.in:1.5
--- pkgsrc/news/tin/patches/patch-src_Makefile.in:1.4   Wed Jan 12 11:41:41 2022
+++ pkgsrc/news/tin/patches/patch-src_Makefile.in       Wed Jan 25 18:06:41 2023
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_Makefile.in,v 1.4 2022/01/12 11:41:41 micha Exp $
+$NetBSD: patch-src_Makefile.in,v 1.5 2023/01/25 18:06:41 micha Exp $
 
 Do not install mbox manpage.
 
 --- src/Makefile.in.orig       2020-12-01 10:52:35.000000000 +0000
 +++ src/Makefile.in
-@@ -348,7 +348,6 @@ install_manpage : $(DESTDIR)$(INS_MANUAL
+@@ -351,7 +351,6 @@ install_manpage : $(DESTDIR)$(INS_MANUAL
        @-$(RM) -f $(DESTDIR)$(INS_MANUAL_DIR)5/r$(PROJECT).5
        @$(ECHO) ".so $(INS_MANUAL_DIR)5/$(PROJECT).5" > $(DESTDIR)$(INS_MANUAL_DIR)5/r$(PROJECT).5
        @$(CHMOD) 444 $(DESTDIR)$(INS_MANUAL_DIR)5/r$(PROJECT).5

Added files:

Index: pkgsrc/news/tin/patches/patch-src_nntplib.c
diff -u /dev/null pkgsrc/news/tin/patches/patch-src_nntplib.c:1.1
--- /dev/null   Wed Jan 25 18:06:41 2023
+++ pkgsrc/news/tin/patches/patch-src_nntplib.c Wed Jan 25 18:06:41 2023
@@ -0,0 +1,46 @@
+$NetBSD: patch-src_nntplib.c,v 1.1 2023/01/25 18:06:41 micha Exp $
+
+Adjust s_close() to close() because of move from stdio to own buffer
+implementation.
+
+From upstream:
+news://news.tin.org/mailman.1265.1672300926.1791.tin-dev%tin.org@localhost
+
+--- src/nntplib.c      2022-12-25 11:00:37 +0000
++++ src/nntplib.c      2022-12-29 07:56:58 +0000
+@@ -523,7 +523,7 @@
+               my_fprintf(stderr, _(txt_connection_to), (char *) inet_ntoa(sock_in.sin_addr));
+               perror("");
+ #                     endif /* HAVE_INET_NTOA */
+-              (void) s_close(s);
++              (void) close(s);
+       }
+ 
+       if (x < 0) {
+@@ -552,7 +552,7 @@
+       if (connect(s, (struct sockaddr *) &sock_in) < 0) {
+               save_errno = errno;
+               perror("connect");
+-              (void) s_close(s);
++              (void) close(s);
+               return -save_errno;
+       }
+ 
+@@ -571,7 +571,7 @@
+       if (connect(s, (struct sockaddr *) &sock_in, sizeof(sock_in)) < 0) {
+               save_errno = errno;
+               perror("connect");
+-              (void) s_close(s);
++              (void) close(s);
+               return -save_errno;
+       }
+ 
+@@ -723,7 +723,7 @@
+ 
+       if (connect(s, (struct sockaddr *) &sdn, sizeof(sdn)) < 0) {
+               nerror("connect");
+-              s_close(s);
++              close(s);
+               return -1;
+       }
+