CVS commit: pkgsrc/news/inn

["S.P.Zeidler" <spz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   spz
Date:           Sat May 20 06:53:05 UTC 2017

Modified Files:
        pkgsrc/news/inn: Makefile Makefile.common PLIST distinfo
        pkgsrc/news/inn/patches: patch-ah
Removed Files:
        pkgsrc/news/inn/patches: patch-ai

Log Message:
update to 2.6.1. Excerpt from NEWS:

Upgrading from 2.5 to 2.6

The following changes require your full attention because a manual intervention may be needed:

    The name and location of the pullnews configuration file have changed. It is now pullnews.marks, located in pathdb when pullnews is run as the news user, or otherwise in the running user's home 
directory. This file was previously stored in .pullnews in the running user's home directory (even for the news user). If you use pullnews, you need to manually move and rename the configuration 
file; otherwise, it will no longer work. Note that the -c flag passed to pullnews allows to specify another configuration file, if need be.

    The default location of the mailpost database directory has changed from pathtmp to pathdb. If you use mailpost without an explicitly specified database directory (using the -b flag), then you 
should manually move your current database files mailpost-msgid.dir and mailpost-msgid.pag from pathtmp to pathdb.

    If you have been using TLS/SSL with nnrpd before, be aware that the default value of a few inn.conf parameters have changed: the server now decides the preferred cipher (instead of the client), 
and only TLS protocols are allowed (using the flawed SSLv2 and SSLv3 protocols is now disabled). If you want to change these settings, the respective tlspreferserverciphers and tlsprotocols 
parameters can be tuned to your needs.

    The --with-kerberos configure flag used to add Kerberos v5 support has been renamed to --with-krb5.

    The --with-berkeleydb configure flag used to add Berkeley DB support has been renamed to --with-bdb.

    The --enable-ipv6 configure flag no longer exists. IPv6 is now unconditionally enabled, if available.

    $HOME is no longer exported as an environment variable by innshellvars, innshellvars.tcl and the Perl module INN::Config. It was previously overriding the default user home directory with 
pathnews. If you use these scripts in your own scripts, you will have to take care of that change.

    Owing to the implementation of RFC 4643 (AUTHINFO USER/PASS) in innd, if remote peers have to authenticate in order to feed articles, they now have to send a username (which was previously 
wrongly optional), before sending their password. The mandatory username, though currently unused by innd, can be whatever the remote peer wishes. In previous versions of INN, inncheck was already 
complaining when passwd.nntp contained an empty username associated with a password.

    A manual review of authenticated feeds should then be done so as to ensure that they are properly working.

    The Injection-Date: and Injection-Info: headers are now generated by nnrpd at injection time instead of the NNTP-Posting-Date:, NNTP-Posting-Host:, X-Complaints-To: and X-Trace: headers. Local 
scripts that were using (for authentication, privacy, etc.) these now deprecated headers should be updated. Also note that the Path: header of locally posted articles can also contain the contents of 
the deprecated NNTP-Posting-Host: field.

    The two addnntppostingdate and addnntppostinghost parameters in inn.conf have been respectively renamed to addinjectiondate and addinjectionpostinghost. innupgrade takes care of the modification 
only for inn.conf; a manual change will therefore be needed for readers.conf, if these parameters are overridden in this file.

    The default values of a few inn.conf parameters have changed to make use of the vastly expanded storage and RAM commonly available today: datamovethreshold (from 8192 to 16384), msgidcachesize 
(from 16000 to 64000), overcachesize (from 64 to 128), and wireformat (now enabled by default).

    The generation of status reports and performance timings are now also enabled by default: logstatus and nnrpdoverstats parameters, with a frequency of 10 minutes (status and timer parameters).

    The default value of max-queue-size has changed from 5 to 20, and use-mmap now defaults to true for innfeed.conf.

Changes in 2.6.1

    nnrpd now uses -0000 as the time zone for Date: and Injection-Date: header fields it generates. It was previously using +0000, wrongly systematically indicating a local time zone at Universal 
Time when localtime is set to false (which is the default) in readers.conf. The +0000 time zone will now be used only if localtime is set to true and UTC is really the local time zone of the server.

    Julien Elie has implemented in nnrpd the new COMPRESS command described in draft-murchison-nntp-compress that extends the NNTP protocol to allow a connection to be effectively and efficiently 
compressed. News clients that also support that extension will be able to benefit from that bandwidth optimization and improvement in speed. Moreover, using COMPRESS is more secure than TLS-level 
compression, as far as authentication credentials are concerned.

    The default value for the tlscompression parameter in inn.conf has changed. TLS-level compression is now disabled by default, to comply with the best current practices for a secure use of TLS in 
application protocols like NNTP. Using the new COMPRESS command is recommended.

    The tlscompression parameter in inn.conf now also permits to disable TLS-level compression with OpenSSL 0.9.8. It previously had an effect only when OpenSSL 1.0.0 or later was used.

    rnews no longer segfaults at startup when started setuid news. Thanks to Marcus Jodorf for the bug report.

    Fixed slow nnrpd responses for a few NNTP commands. The TCP_NODELAY option was unconditionally set whereas only BSD/OS systems needed it. Thanks to Christian Mock for having discovered that.

    Articles containing a Received: or a Posted: header field are no longer rejected by nnrpd at injection time.

    Articles containing control characters or whitespace-only content lines in their headers are now rejected by nnrpd at injection time.

    OpenSSL 1.1.0 support has been added to INN.

    When an encryption layer is negotiated during a successful use of the STARTTLS command, or after a successful authentication using a SASL mechanism that negotiates an encryption layer, nnrpd now 
updates the permissions of the news client according to the new secure state of his connection (that is to say auth blocks in readers.conf using the require_ssl parameter are taken into account). 
Previously, only connections on a dedicated port (usually 563) were taking benefit from that parameter. Thanks to Steve Crook for the bug report.

    When a data integrity layer was negotiated during a successful SASL authentication, nnrpd was wrongly reseting any knowledge obtained from the client, such as the current newsgroup and article 
number. This behaviour now applies only when an encryption layer is negotiated.

    nntpsend now correctly waits until all of the child innxmit processes exit before it does. It was causing nntpsend to fail to work properly on systems that use systemd, because when it exits 
prematurely, systemd kills all of the processes it launched, including the innxmit processes. Thanks to Jonathan Kamens for the patch.

    Update from GNU Libtool 2.4.2 to 2.4.6.

    Other minor bug fixes and documentation improvements.
Changes in 2.6.0

    The NNTP protocol requires a username to be sent before a password when authentication is used. innd was wrongly allowing only a password to be sent by authenticated peers. See the note above for 
more details.

    The Lines: header is no longer generated by nnrpd at injection time.

    The Injection-Date: header is now generated by nnrpd at injection time instead of the deprecated NNTP-Posting-Date: header, when addinjectiondate is set to true. Note that addnntppostingdate has 
been renamed to addinjectiondate in inn.conf.

    The Injection-Info: header is now generated by nnrpd at injection time instead of the deprecated NNTP-Posting-Host: (when addinjectionpostinghost is set to true), X-Complaints-To: and X-Trace: 
headers. Note that addnntppostinghost has been renamed to addinjectionpostinghost in inn.conf. The Path: header of locally posted articles now also contains the contents of the NNTP-Posting-Host: 
header.

    A new addinjectionpostingaccount parameter has been added in inn.conf. When set to true, the Injection-Info: header field contains an additional posting-account attribute that mentions the 
username assigned to the user at connection time or after authentication. The default value for this parameter is false.

    A few headers are now considered as obsolete by nnrpd at injection time: NNTP-Posting-Date:, NNTP-Posting-Host:, X-Complaints-To:, X-Trace:, Also-Control:, Article-Names:, Article-Updates:, and 
See-Also: headers.

    Besides, nnrpd will similarly reject obsolete sendsys, senduuname and version control messages.

    The presence of a Subject: header field beginning with cmsg no longer causes an article to be interpreted as a control message by nnrpd at injection time.

    nnrpd no longer differentiates IHAVE from POST. Articles injected with IHAVE are now treated as though they were injected with POST. It means that if the previous behaviour of IHAVE was expected, 
innd should handle itself the connection instead of nnrpd.

    The name of the pullnews configuration file is now pullnews.marks located in pathdb when pullnews is run as the news user, or otherwise in the running user's home directory. It was previously 
stored in .pullnews in the running user's home directory (even for the news user).

    Fixed a leak of semaphores when using buffindexed. Thanks to Richard Kettlewell for having fixed the issue.

    Building with Libtool is no longer optional. The --enable-libtool option to configure has been removed.

    DESTDIR and non-root installs are now properly supported and documented in INSTALL. The make install, make update and make cert steps properly obey DESTDIR. Besides, it is no longer a requirement 
that the installation step be done by the superuser, as long as the user executing the install has supplied a DESTDIR value that points to a writable directory, and the person or process performing 
the install corrects the file ownerships when INN is installed on the system on which it's going to run. Thanks to James Ralston for this support.

    When building INN with Berkeley DB, Cyrus SASL, Kerberos v5, OpenSSL, or zlib support, no longer add standard locations to compiler and linker include flags. Such default paths are now added only 
if explicitly given to one or more of the --with-bdb, --with-bdb-include, --with-bdb-lib, --with-sasl, --with-sasl-include, --with-sasl-lib, --with-krb5, --with-krb5-include, --with-krb5-lib, 
--with-openssl, --with-openssl-include, --with-openssl-lib, --with-zlib, --with-zlib-include, or --with-zlib-lib configure flags (the flags ending with -include and -lib are new in INN 2.6.0).

    If the Berkeley DB, Cyrus SASL, Kerberos v5, or OpenSSL SSL and crypto libraries are found at configure time, INN will now be built with support for them unless respectively the --without-bdb, 
--without-sasl, --without-krb5, or --without-openssl flags are explicitly passed to configure.

    Note that it was already the default behaviour for zlib support when Berkeley DB support was also enabled.

    The configure flag --enable-reduced-depends has been added to request that library probes assume shared libraries are in use and dependencies of libraries should not be probed. It therefore tries 
to minimize the shared library dependencies of the resulting binaries on platforms with proper shared library dependencies. This is not enabled by default, and is of interest primarily to people 
building packages for distributions.

    Building INN with Python support now requires the use of Python 2.2.0 or later as the distutils.sysconfig module used was introduced with Python 2.2.0.

    The INN test suite driver is now fully synchronized with the upstream version of the C TAP Harness package maintained by Russ Allbery. Keeping the INN test suite driver up-to-date will be 
possible thanks to a new getc-tap-harness script in the support directory that automatically fetches the latest upstream changes.

    Similarly, the new getrra-c-util script permits to keep most of the utility and portability functions synchronized with the upstream version of the rra-c-util package maintained by Russ Allbery.

    Other minor bug fixes and documentation improvements.


To generate a diff of this commit:
cvs rdiff -u -r1.124 -r1.125 pkgsrc/news/inn/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/news/inn/Makefile.common
cvs rdiff -u -r1.25 -r1.26 pkgsrc/news/inn/PLIST
cvs rdiff -u -r1.35 -r1.36 pkgsrc/news/inn/distinfo
cvs rdiff -u -r1.16 -r1.17 pkgsrc/news/inn/patches/patch-ah
cvs rdiff -u -r1.8 -r0 pkgsrc/news/inn/patches/patch-ai

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

Modified files:

Index: pkgsrc/news/inn/Makefile
diff -u pkgsrc/news/inn/Makefile:1.124 pkgsrc/news/inn/Makefile:1.125
--- pkgsrc/news/inn/Makefile:1.124      Thu Jan 19 18:52:21 2017
+++ pkgsrc/news/inn/Makefile    Sat May 20 06:53:05 2017
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.124 2017/01/19 18:52:21 agc Exp $
+# $NetBSD: Makefile,v 1.125 2017/05/20 06:53:05 spz Exp $
 
-DISTNAME=              inn-2.5.5
-PKGREVISION=           2
+DISTNAME=              inn-2.6.1
 CATEGORIES=            news
 MASTER_SITES=          ftp://ftp.isc.org/isc/inn/
 MASTER_SITES+=         ftp://ftp.fu-berlin.de/unix/news/inn/
@@ -13,7 +12,7 @@ LICENSE=              modified-bsd AND gnu-gpl-v2
 
 CONFLICTS+=            libradius-[0-9]* nntpclnt-[0-9]*
 
-.include "Makefile.common"
+.include "../../news/inn/Makefile.common"
 
 BUILD_DEFS+=           INN_DATA_DIR
 BUILD_DEFS+=           VARBASE

Index: pkgsrc/news/inn/Makefile.common
diff -u pkgsrc/news/inn/Makefile.common:1.7 pkgsrc/news/inn/Makefile.common:1.8
--- pkgsrc/news/inn/Makefile.common:1.7 Sun Oct  5 16:41:08 2014
+++ pkgsrc/news/inn/Makefile.common     Sat May 20 06:53:05 2017
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile.common,v 1.7 2014/10/05 16:41:08 wiz Exp $
+# $NetBSD: Makefile.common,v 1.8 2017/05/20 06:53:05 spz Exp $
 #
+# used by news/inn/Makefile
 # used by news/newsx/Makefile
 
 INN_PREFIX?=   ${PREFIX}

Index: pkgsrc/news/inn/PLIST
diff -u pkgsrc/news/inn/PLIST:1.25 pkgsrc/news/inn/PLIST:1.26
--- pkgsrc/news/inn/PLIST:1.25  Sun Aug  3 17:33:34 2014
+++ pkgsrc/news/inn/PLIST       Sat May 20 06:53:05 2017
@@ -1,20 +1,24 @@
-@comment $NetBSD: PLIST,v 1.25 2014/08/03 17:33:34 spz Exp $
+@comment $NetBSD: PLIST,v 1.26 2017/05/20 06:53:05 spz Exp $
 bin/inews
 bin/rnews
 include/inn/buffer.h
+include/inn/concat.h
 include/inn/confparse.h
 include/inn/dbz.h
 include/inn/defines.h
 include/inn/dispatch.h
+include/inn/fdflag.h
 include/inn/hashtab.h
 include/inn/history.h
 include/inn/innconf.h
 include/inn/inndcomm.h
 include/inn/libinn.h
 include/inn/list.h
+include/inn/macros.h
 include/inn/md5.h
 include/inn/messages.h
 include/inn/mmap.h
+include/inn/network-innbind.h
 include/inn/network.h
 include/inn/newsuser.h
 include/inn/nntp.h
@@ -22,6 +26,11 @@ include/inn/options.h
 include/inn/ov.h
 include/inn/overview.h
 include/inn/paths.h
+include/inn/portable-getaddrinfo.h
+include/inn/portable-getnameinfo.h
+include/inn/portable-macros.h
+include/inn/portable-socket.h
+include/inn/portable-stdbool.h
 include/inn/qio.h
 include/inn/sequence.h
 include/inn/storage.h
@@ -32,13 +41,15 @@ include/inn/utility.h
 include/inn/vector.h
 include/inn/version.h
 include/inn/wire.h
+include/inn/xmalloc.h
+include/inn/xwrite.h
 lib/innreport_inn.pm
 lib/innshellvars
 lib/innshellvars.pl
 lib/innshellvars.tcl
-lib/libinn.a
-lib/libinnhist.a
-lib/libstorage.a
+lib/libinn.la
+lib/libinnhist.la
+lib/libstorage.la
 lib/perl/INN/Config.pm
 lib/perl/INN/Utils/Shlock.pm
 ${INN_PATHBIN}/actmerge
@@ -171,6 +182,7 @@ man/man5/distributions.5
 man/man5/expire.ctl.5
 man/man5/history.5
 man/man5/incoming.conf.5
+man/man5/inn-radius.conf.5
 man/man5/inn.conf.5
 man/man5/innfeed.conf.5
 man/man5/innwatch.ctl.5
@@ -187,7 +199,6 @@ man/man5/nntpsend.ctl.5
 man/man5/nocem.ctl.5
 man/man5/ovdb.5
 man/man5/passwd.nntp.5
-man/man5/inn-radius.conf.5
 man/man5/readers.conf.5
 man/man5/storage.conf.5
 man/man5/subscriptions.5
@@ -295,6 +306,7 @@ share/examples/inn/filter/nnrpd_dynamic.
 share/examples/inn/filter/startup_innd.pl
 share/examples/inn/history
 share/examples/inn/incoming.conf
+share/examples/inn/inn-radius.conf
 share/examples/inn/inn.conf
 share/examples/inn/innfeed.conf
 share/examples/inn/innreport.conf
@@ -315,11 +327,9 @@ share/examples/inn/nntpsend.ctl
 share/examples/inn/nocem.ctl
 share/examples/inn/ovdb.conf
 share/examples/inn/passwd.nntp
-share/examples/inn/inn-radius.conf
 share/examples/inn/readers.conf
 share/examples/inn/send-uucp.cf
 share/examples/inn/storage.conf
 share/examples/inn/subscriptions
 @pkgdir ${INN_PATHBIN}/filter
-@pkgdir etc/nntp
 @pkgdir etc/inn

Index: pkgsrc/news/inn/distinfo
diff -u pkgsrc/news/inn/distinfo:1.35 pkgsrc/news/inn/distinfo:1.36
--- pkgsrc/news/inn/distinfo:1.35       Mon Nov  2 23:49:47 2015
+++ pkgsrc/news/inn/distinfo    Sat May 20 06:53:05 2017
@@ -1,15 +1,14 @@
-$NetBSD: distinfo,v 1.35 2015/11/02 23:49:47 agc Exp $
+$NetBSD: distinfo,v 1.36 2017/05/20 06:53:05 spz Exp $
 
-SHA1 (inn-2.5.5.tar.gz) = aef9be9d7e6089ef1c463a11f255e53ea1fed433
-RMD160 (inn-2.5.5.tar.gz) = fc16cc76cc95e64868a6cc2cce8a44cd1806afee
-SHA512 (inn-2.5.5.tar.gz) = aada60b15952810fa31c3b2078b4ca1b1e560cee348cc81d076e0ba1f8b785497310d60aca89b9ecc4af85a1493eefa8a2b976cb349b8ea96482c93cbcf049f1
-Size (inn-2.5.5.tar.gz) = 2419841 bytes
+SHA1 (inn-2.6.1.tar.gz) = 254ef2e8f0121334ee52eb2174e19a2a5e7fa3a1
+RMD160 (inn-2.6.1.tar.gz) = 5884482d06b997db8b2ea7fdb8e7a9db4e644e04
+SHA512 (inn-2.6.1.tar.gz) = 3764a1be4f3e83ca555f2399d9555af9811f7b0dc83915a555e2664c875188fd4a4a3abb0fe412826b434eedd1f96dad240573fb5f3d8c5a0e2e1692afdd8ab0
+Size (inn-2.6.1.tar.gz) = 2570558 bytes
 SHA1 (patch-aa) = 1801206391e5f37e75edad0955cfc426d4701e45
 SHA1 (patch-ab) = 28b341559ba7d132e8a6dbb0989e964b1d5849fd
 SHA1 (patch-ac) = edb03ca5998873627278764ed4e528f13f3f74fd
 SHA1 (patch-ad) = 96a38291dcd9a836dcaaa9f48ec6a8d2133dc7c6
 SHA1 (patch-ag) = 31bee657a4e35475e902cd179716328aa39ee4b1
-SHA1 (patch-ah) = 34d9db324db7797c7df8564a46d14eb5a6b834d4
-SHA1 (patch-ai) = 51645083f36a3404e41aedac44fe85396e680073
+SHA1 (patch-ah) = 231ccb7c0402441760692c32fa0dafcf5c6a72aa
 SHA1 (patch-ak) = cdc37267d5f5151300b4c595b9274dc984c66651
 SHA1 (patch-al) = 3751913f2e7f1e530db9b2f6e762bdda314fd4fd

Index: pkgsrc/news/inn/patches/patch-ah
diff -u pkgsrc/news/inn/patches/patch-ah:1.16 pkgsrc/news/inn/patches/patch-ah:1.17
--- pkgsrc/news/inn/patches/patch-ah:1.16       Sun Aug  3 17:33:34 2014
+++ pkgsrc/news/inn/patches/patch-ah    Sat May 20 06:53:05 2017
@@ -1,42 +1,24 @@
-$NetBSD: patch-ah,v 1.16 2014/08/03 17:33:34 spz Exp $
+$NetBSD: patch-ah,v 1.17 2017/05/20 06:53:05 spz Exp $
 
---- site/Makefile.orig 2014-05-17 08:24:49.000000000 +0000
+--- site/Makefile.orig 2016-11-27 14:03:42.000000000 +0000
 +++ site/Makefile
-@@ -75,35 +75,11 @@ REST               = \
+@@ -75,7 +75,8 @@ REST         = \
  
- ALL           = $(MOST) $(REST)
+ ALL           = $(REST)
  
 -REST_INSTALLED        = \
--      $D$(PATH_NEWSFEEDS) $D$(PATH_INNDHOSTS) \
--      $D$(PATH_NNRPDTRACK) $D$(PATH_NNTPPASS) \
--      $D$(PATH_CONFIG) $D$(PATH_MODERATORS) \
--      $D$(PATH_CONTROLCTL) $D$(PATH_CONTROLCTLLOCAL) $D$(PATH_EXPIRECTL) \
--      $D$(PATHETC)/nntpsend.ctl \
--      $D$(PATHETC)/innreport.conf $D$(PATHHTTP)/innreport.css \
--      $D$(PATHETC)/localgroups \
--      $D$(PATH_CTLWATCH) $D$(PATH_DISTPATS) $D$(PATH_DISTRIBUTIONS) \
--      $D$(PATH_ACTSYNC_CFG) $D$(PATH_ACTSYNC_IGN) \
--      $D$(PATH_MOTD_INND) $D$(PATH_MOTD_NNRPD) $D$(PATH_STORAGECONF) \
--      $D$(PATH_CYCBUFFCONFIG) $D$(PATH_BUFFINDEXED) \
--      $D$(PATH_INNFEEDCTL) $D$(PATH_PERL_STARTUP_INND) \
--      $D$(PATH_PERL_FILTER_INND) $D$(PATH_PERL_FILTER_NNRPD) \
--      $D$(PATH_PYTHON_FILTER_INND) $D$(PATH_PYTHON_INN_MODULE) \
--      $D$(PATH_PYTHON_NNRPD_MODULE) \
--      $D$(PATH_TCL_STARTUP) $D$(PATH_TCL_FILTER) \
--      $D$(PATHETC)/innshellvars.local $D$(PATHETC)/innshellvars.pl.local \
--      $D$(PATHETC)/innshellvars.tcl.local \
--      $D$(PATHETC)/nocem.ctl \
--      $D$(PATH_NNRPAUTH) $D$(PATHETC)/news2mail.cf $D$(PATH_READERSCONF) \
--      $D$(PATH_RADIUS_CONF) $D$(PATH_NNRPYAUTH) $D$(PATH_NNRPYACCESS) $D$(PATH_NNRPYDYNAMIC) \
--      $D$(PATH_OVDB_CONF) \
--      $D$(PATH_SENDUUCP_CF) $D$(PATH_SUBSCRIPTIONS) $D$(PATH_NNRPACCESS)
 +REST_INSTALLED        = 
++NOTUSED               = \
+       $D$(PATH_NEWSFEEDS) $D$(PATH_INNDHOSTS) \
+       $D$(PATH_NNRPDTRACK) $D$(PATH_NNTPPASS) \
+       $D$(PATH_CONFIG) $D$(PATH_MODERATORS) \
+@@ -102,7 +103,8 @@ REST_INSTALLED     = \
  
- ALL_INSTALLED = $(MOST_INSTALLED) $(REST_INSTALLED)
+ ALL_INSTALLED = $(REST_INSTALLED)
  
 -SPECIAL               = $D$(PATH_ACTIVE) $D$(PATH_ACTIVE_TIMES) \
--              $D$(PATH_NEWSGROUPS) $D$(PATH_HISTORY)
 +SPECIAL               =
++NOTUSED2      = $D$(PATH_ACTIVE) $D$(PATH_ACTIVE_TIMES) \
+               $D$(PATH_NEWSGROUPS) $D$(PATH_HISTORY)
  
  ##  Get new versions of everything from samples directory.
- all:          $(ALL) config