update INN to version 2.5.4. Excerpt from the upstream release announcement:

Changes in 2.5.4

  * An up-to-date control.ctl file is provided with this release.  You
    should manually update your control.ctl file with the new information
    recorded about Usenet hierarchies.

  * A test has been improved in innwatch.ctl so that innwatch no longer
    throttles innd when no overview directory exists.  You should manually
    update your innwatch.ctl file to get this improvement.

  * Fixed a long-standing limitation on how controlchan and pgpverify were
    checking the signer of control messages.  They now properly handle the
    case of several UIDs being defined on a single PGP key, as well as the
    presence of spaces into UIDs.  In previous versions of INN, a few
    valid control messages got ignored because of that limitation
    (fido.ger.* and grisbi.* were for instance impacted).

  * As the name of the radius.conf configuration file shipped with INN for
    the nnrpd authenticator against a RADIUS server conflicts with the
    libradius package, this file is renamed to inn-radius.conf (innupgrade
    takes care of the rename during the update).

  * The attributes hash is now accessible to nnrpd Perl posting filter.
    As a result, filter_nnrpd.pl can make use of it.  Only authentication
    and access Perl hooks could previously use the attributes hash.
    Thanks to Steve Crook for this addition.

  * INN now properly builds fine with flex 2.5.36 (this version introduced
    a change of type for a variable used by INN).

  * When using funnel feeds, innfeed log files were open forever, which
    resulted in empty log files, once rotated by scanlogs.  innfeed now
    reopens its log files upon receiving a HUP signal; this signal is in
    particular sent by scanlogs during log rotation.  Thanks to Florian
    Schlichting for the patch.

  * Exploder and process channels are now reopened when "ctlinnd
    flushlogs" is used.  Otherwise, they could hold open an already
    deleted errlog file.  The issue affected in particular controlchan or
    ninpaths, running as such channels.

  * Fixed a buffer overflow when using imapfeed with more than a million
    commands during the same IMAP session.  Thanks to David Binderman for
    the bug report.

  * Fixed a segfault occurring in innd on systems where time_t is a 64-bit
    integer.  Thanks to S.P. Zeidler for the patch.

  * Fixed a segfault occurring in nnrpd when a res block was used in
    readers.conf without the program: key.

  * Fixed an issue where users were denied posting because of an
    overlapping buffer copy in a check nnrpd was doing.  Thanks to Florian
    Schlichting for the patch.

  * Fixed a regression that occurred in INN 2.5.3 regarding the path used
    by default by pullnews for its configuration file.  Instead of looking
    in the running user's home directory, it was looking in the *pathnews*
    directory set in inn.conf.  Thanks to Tony Evans for the bug report.

  * When neither wget nor ncftpget nor ncftp was found at configure time,
    the path to the simpleftp substitution program shipped with INN was
    not properly set in innshellvars, innshellvars.pl, and the
    "INN::Config" Perl module.  Thanks to Christian Garbs for the bug
    report.

  * ckpasswd no longer tries to use the ndbm compatibility layer provided
    by Berkeley DB if Berkeley DB has been built without ndbm support.
    Also add support for gdbm libraries in ckpasswd.

  * Fixed a Perl warning in inncheck; using "defined(@array)" has been
    deprecated since Perl 5.16.

  * Fixed the occurrence of an unexpected "cant select" error generated by
    innd.  Thanks to Paul Tomblin for having caught that long-standing
    issue.

  * When building INN with Berkeley DB support, no longer add -L/usr/lib
    to the linker include flags; unconditionally adding it may break the
    build on systems using lib32 and lib64 directories.

  * On a fresh INN install, motd.innd and motd.nnrpd are no longer
    installed by default.  Instead, samples for these files are provided
    in *pathetc*, named differently so that their default contents are not
    displayed to news clients before they get customised.

  * Other minor bug fixes and documentation improvements (like the
    addition in the readers.conf man page of the log: and program:
    parameters in res blocks, and the include directive).

14 files changed, 42 insertions, 98 deletions

diff --git a/news/inn/Makefile b/news/inn/Makefile
index aad962a674b..61502bfd961 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.117 2014/05/29 23:37:13 wiz Exp $
+# $NetBSD: Makefile,v 1.118 2014/08/03 17:33:34 spz Exp $
 
-DISTNAME=		inn-2.5.3
-PKGREVISION=		7
+DISTNAME=		inn-2.5.4
 CATEGORIES=		news
 MASTER_SITES=		ftp://ftp.isc.org/isc/inn/ \
 			ftp://ftp.fu-berlin.de/unix/news/inn/
@@ -120,7 +119,7 @@ CFILES=			actsync.cfg actsync.ign buffindexed.conf \
 			motd.innd motd.nnrpd \
 			news2mail.cf newsfeeds nnrpd.track \
 			nntpsend.ctl nocem.ctl ovdb.conf passwd.nntp \
-			radius.conf readers.conf send-uucp.cf \
+			inn-radius.conf readers.conf send-uucp.cf \
 			storage.conf subscriptions
 .for file in ${CFILES}
 CONF_FILES_PERMS+=	${EXAMPLEDIR}/${file} ${PKG_SYSCONFDIR}/${file} \
diff --git a/news/inn/PLIST b/news/inn/PLIST
index 6ad5c5dd3ba..141fdfcd5dd 100644
--- a/news/inn/PLIST
+++ b/news/inn/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2014/03/11 14:05:12 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.25 2014/08/03 17:33:34 spz Exp $
 bin/inews
 bin/rnews
 include/inn/buffer.h
@@ -187,7 +187,7 @@ man/man5/nntpsend.ctl.5
 man/man5/nocem.ctl.5
 man/man5/ovdb.5
 man/man5/passwd.nntp.5
-man/man5/radius.conf.5
+man/man5/inn-radius.conf.5
 man/man5/readers.conf.5
 man/man5/storage.conf.5
 man/man5/subscriptions.5
@@ -315,7 +315,7 @@ share/examples/inn/nntpsend.ctl
 share/examples/inn/nocem.ctl
 share/examples/inn/ovdb.conf
 share/examples/inn/passwd.nntp
-share/examples/inn/radius.conf
+share/examples/inn/inn-radius.conf
 share/examples/inn/readers.conf
 share/examples/inn/send-uucp.cf
 share/examples/inn/storage.conf
diff --git a/news/inn/distinfo b/news/inn/distinfo
index f163d88850f..150c5d949dc 100644
--- a/news/inn/distinfo
+++ b/news/inn/distinfo
@@ -1,16 +1,14 @@
-$NetBSD: distinfo,v 1.32 2013/12/11 09:45:14 spz Exp $
+$NetBSD: distinfo,v 1.33 2014/08/03 17:33:34 spz Exp $
 
-SHA1 (inn-2.5.3.tar.gz) = 98f22ef02e48c28f5eb931ce506ebe99557dc46e
-RMD160 (inn-2.5.3.tar.gz) = 7c4593d8880426a8961befbfa600450b23482d35
-Size (inn-2.5.3.tar.gz) = 2412119 bytes
-SHA1 (patch-aa) = 8ed86de4d20ab8510c7521528a9979c1d3e6d9e8
-SHA1 (patch-ab) = 5f98336273de9763c38df3bb122f141cbd16527a
-SHA1 (patch-ac) = 2b801b9b8c5eae1feacaa3532e78b4c46210f755
-SHA1 (patch-ad) = d36131ad21a1d8ea0edb463dfff6f1800dc8291d
-SHA1 (patch-ag) = c03866cc8fce1327f7e79f1e3fed4ae338957c19
-SHA1 (patch-ah) = ed5ef5f504eb9a95ad3da933ba5d00ee73885b00
-SHA1 (patch-ai) = cf0af9de01dc7e06c5f9f7f1dd91ac2201e8c212
-SHA1 (patch-ak) = c15b9067eeff701a7f2cc443fe6d1cb89136d974
-SHA1 (patch-al) = a3d9fad5c045dc7a240e0f0c0a88a5321e6135d5
-SHA1 (patch-backends_ninpaths.c) = 8b8cec4e19c23bc62290192d6481e75915fe5b76
-SHA1 (patch-innd_cc.c) = ee94cd8c27365d5b6724e81261df00d2337e6172
+SHA1 (inn-2.5.4.tar.gz) = 6bac5aee105dbed9b96ba112783ddb7b254ea197
+RMD160 (inn-2.5.4.tar.gz) = 18b165d3aca8f6221b945b38d5eab84a3198f6fe
+Size (inn-2.5.4.tar.gz) = 2408600 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-ak) = cdc37267d5f5151300b4c595b9274dc984c66651
+SHA1 (patch-al) = 3751913f2e7f1e530db9b2f6e762bdda314fd4fd
diff --git a/news/inn/patches/patch-aa b/news/inn/patches/patch-aa
index 825f5acd958..fadf6c17537 100644
--- a/news/inn/patches/patch-aa
+++ b/news/inn/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.12 2009/09/22 13:17:00 spz Exp $
+$NetBSD: patch-aa,v 1.13 2014/08/03 17:33:34 spz Exp $
 
---- configure.orig	2009-05-21 20:08:33.000000000 +0000
+--- configure.orig	2014-05-17 08:24:49.000000000 +0000
 +++ configure
-@@ -13549,7 +13549,7 @@ else
+@@ -13018,7 +13018,7 @@ else
    RANLIB="$ac_cv_prog_RANLIB"
  fi
  
diff --git a/news/inn/patches/patch-ab b/news/inn/patches/patch-ab
index b5cebdc10e1..01a7895003a 100644
--- a/news/inn/patches/patch-ab
+++ b/news/inn/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.10 2010/04/13 21:18:00 spz Exp $
+$NetBSD: patch-ab,v 1.11 2014/08/03 17:33:34 spz Exp $
 
---- scripts/news.daily.in.orig	2009-05-21 22:08:33.000000000 +0200
+--- scripts/news.daily.in.orig	2014-05-17 08:24:49.000000000 +0000
 +++ scripts/news.daily.in
-@@ -256,6 +256,10 @@ fi
+@@ -276,6 +276,10 @@ fi
  
  cd ${PATHETC}
  
diff --git a/news/inn/patches/patch-ac b/news/inn/patches/patch-ac
index 6c8c7d058f7..d3f138cd1b3 100644
--- a/news/inn/patches/patch-ac
+++ b/news/inn/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.11 2009/09/22 13:17:00 spz Exp $
+$NetBSD: patch-ac,v 1.12 2014/08/03 17:33:34 spz Exp $
 
---- Makefile.global.in.orig	2009-05-21 20:08:33.000000000 +0000
+--- Makefile.global.in.orig	2014-05-17 08:24:49.000000000 +0000
 +++ Makefile.global.in
-@@ -302,7 +302,7 @@ INSTALL		= $(top)/support/install-sh -c
+@@ -303,7 +303,7 @@ INSTALL		= $(top)/support/install-sh -c
  ##  files like active and newsgroups that should have the same permissions as
  ##  article files.
  
diff --git a/news/inn/patches/patch-ad b/news/inn/patches/patch-ad
index cb477bc4e4f..805b17ccff6 100644
--- a/news/inn/patches/patch-ad
+++ b/news/inn/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.7 2009/09/22 13:17:00 spz Exp $
+$NetBSD: patch-ad,v 1.8 2014/08/03 17:33:34 spz Exp $
 
---- scripts/rc.news.in.orig	2009-05-21 20:08:33.000000000 +0000
+--- scripts/rc.news.in.orig	2014-05-17 08:24:49.000000000 +0000
 +++ scripts/rc.news.in
 @@ -77,6 +77,9 @@ Xstop)
  ;;
diff --git a/news/inn/patches/patch-ag b/news/inn/patches/patch-ag
index 5e0707bb8b7..a888d2e59ef 100644
--- a/news/inn/patches/patch-ag
+++ b/news/inn/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.12 2013/06/16 21:41:47 wiz Exp $
+$NetBSD: patch-ag,v 1.13 2014/08/03 17:33:34 spz Exp $
 
---- control/pgpverify.in.orig	2012-06-15 18:25:36.000000000 +0000
+--- control/pgpverify.in.orig	2014-05-17 08:24:49.000000000 +0000
 +++ control/pgpverify.in
-@@ -131,7 +131,7 @@
+@@ -139,7 +139,7 @@
  # Path to pgp binary; for PGP 5.0, set the path to the pgpv binary.  If
  # you have INN and the script is able to successfully include your
  # INN::Config module, the value of $INN::Config::pgp will override this.
@@ -11,27 +11,3 @@ $NetBSD: patch-ag,v 1.12 2013/06/16 21:41:47 wiz Exp $
  
  # If you keep your keyring somewhere that is not the default used by pgp,
  # uncomment the next line and set appropriately.  If you have INN and the
-@@ -738,19 +738,19 @@ B<pgpverify> may exit with the following
- 
- The control message had a good PGP signature.
- 
--=item 1
-+=item "1"
- 
- The control message had no PGP signature.
- 
--=item 2
-+=item "2"
- 
- The control message had an unknown PGP signature.
- 
--=item 3
-+=item "3"
- 
- The control message had a bad PGP signature.
- 
--=item 255
-+=item "255"
- 
- A problem occurred not directly related to PGP analysis of signature.
- 
diff --git a/news/inn/patches/patch-ah b/news/inn/patches/patch-ah
index 858a77db44a..4933cbd009c 100644
--- a/news/inn/patches/patch-ah
+++ b/news/inn/patches/patch-ah
@@ -1,6 +1,6 @@
-$NetBSD: patch-ah,v 1.15 2012/08/23 19:00:42 spz Exp $
+$NetBSD: patch-ah,v 1.16 2014/08/03 17:33:34 spz Exp $
 
---- site/Makefile.orig	2012-06-15 18:25:36.000000000 +0000
+--- site/Makefile.orig	2014-05-17 08:24:49.000000000 +0000
 +++ site/Makefile
 @@ -75,35 +75,11 @@ REST		= \
  
diff --git a/news/inn/patches/patch-ai b/news/inn/patches/patch-ai
index 49d3b4235d0..4d3e53006a2 100644
--- a/news/inn/patches/patch-ai
+++ b/news/inn/patches/patch-ai
@@ -1,6 +1,6 @@
-$NetBSD: patch-ai,v 1.7 2009/12/16 22:10:25 spz Exp $
+$NetBSD: patch-ai,v 1.8 2014/08/03 17:33:34 spz Exp $
 
---- include/inn/dbz.h.orig	2009-05-21 20:08:33.000000000 +0000
+--- include/inn/dbz.h.orig	2014-05-17 08:24:49.000000000 +0000
 +++ include/inn/dbz.h
 @@ -38,7 +38,7 @@ typedef struct {
      bool             nonblock;
diff --git a/news/inn/patches/patch-ak b/news/inn/patches/patch-ak
index 014c4bd5297..4a9c32b1ce0 100644
--- a/news/inn/patches/patch-ak
+++ b/news/inn/patches/patch-ak
@@ -1,6 +1,6 @@
-$NetBSD: patch-ak,v 1.2 2012/08/23 19:00:42 spz Exp $
+$NetBSD: patch-ak,v 1.3 2014/08/03 17:33:34 spz Exp $
 
---- perl/INN/Config.pm.in.orig	2012-06-15 18:25:36.000000000 +0000
+--- perl/INN/Config.pm.in.orig	2014-05-17 08:24:49.000000000 +0000
 +++ perl/INN/Config.pm.in
 @@ -20,7 +20,7 @@ our $exec_prefix = "@exec_prefix@";
  
diff --git a/news/inn/patches/patch-al b/news/inn/patches/patch-al
index 744223fb995..39c6460f0df 100644
--- a/news/inn/patches/patch-al
+++ b/news/inn/patches/patch-al
@@ -1,7 +1,7 @@
-$NetBSD: patch-al,v 1.1 2012/08/23 19:00:42 spz Exp $
+$NetBSD: patch-al,v 1.2 2014/08/03 17:33:34 spz Exp $
 
---- ./lib/fdlimit.c.orig	2009-10-12 18:24:04.000000000 +0000
-+++ ./lib/fdlimit.c
+--- lib/fdlimit.c.orig	2014-05-17 08:24:49.000000000 +0000
++++ lib/fdlimit.c
 @@ -59,6 +59,10 @@ setfdlimit(unsigned int limit)
      }
  #endif
diff --git a/news/inn/patches/patch-backends_ninpaths.c b/news/inn/patches/patch-backends_ninpaths.c
deleted file mode 100644
index 5b270b81268..00000000000
--- a/news/inn/patches/patch-backends_ninpaths.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-backends_ninpaths.c,v 1.1 2013/12/11 09:45:14 spz Exp $
-
---- backends/ninpaths.c.orig	2012-06-15 18:25:36.000000000 +0000
-+++ backends/ninpaths.c	2013-12-10 22:08:04.000000000 +0000
-@@ -147,7 +147,7 @@ writedump(FILE *f)
-     }
-     fprintf(f, "!!NINP " VERSION " %lu %lu %ld %ld %ld\n",
-             (unsigned long) starttime, (unsigned long) time(NULL), sites,
--            total, (long)(atimes/total)+starttime);
-+            total, (long)((atimes/total)+starttime));
-     n=j=0;
-     /* write the S-records (hosts), numbering them in the process */
-     for (i=0; i<HASH_TBL; ++i)
diff --git a/news/inn/patches/patch-innd_cc.c b/news/inn/patches/patch-innd_cc.c
deleted file mode 100644
index 4f10a625d57..00000000000
--- a/news/inn/patches/patch-innd_cc.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-innd_cc.c,v 1.1 2013/11/27 10:02:55 spz Exp $
-
-make sure the resulting type is long and not time_t, which would require
-%lld with 64bit time_t.
-
---- innd/cc.c.orig	2012-06-15 18:25:36.000000000 +0000
-+++ innd/cc.c
-@@ -940,7 +940,7 @@ CCname(char *av[])
-             mode = (cp->MaxCnx > 0 && cp->ActiveCnx == 0) ? "paused" : "";
-             buffer_sprintf(&CCreply, true, ":%s:%ld:%s",
-                            cp->State == CScancel ? "cancel" : "nntp",
--                           (long) Now.tv_sec - cp->LastActive, mode);
-+                           (long) (Now.tv_sec - cp->LastActive), mode);
- 	    break;
- 	case CTlocalconn:
-             buffer_sprintf(&CCreply, true, ":localconn::");