6 files changed, 40 insertions, 62 deletions
diff --git a/news/inn/Makefile b/news/inn/Makefile
index b87e0c6c430..8dee3061c1c 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -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
diff --git a/news/inn/Makefile.common b/news/inn/Makefile.common
index 19db4628fd3..c776b0ebe62 100644
--- a/news/inn/Makefile.common
+++ b/news/inn/Makefile.common
@@ -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}
diff --git a/news/inn/PLIST b/news/inn/PLIST
index 141fdfcd5dd..e064487ec39 100644
--- a/news/inn/PLIST
+++ b/news/inn/PLIST
@@ -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.py
 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
diff --git a/news/inn/distinfo b/news/inn/distinfo
index 7abe3826dd0..4081b1ba74d 100644
--- a/news/inn/distinfo
+++ b/news/inn/distinfo
@@ -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
diff --git a/news/inn/patches/patch-ah b/news/inn/patches/patch-ah
index 4933cbd009c..8a41b00ea00 100644
--- a/news/inn/patches/patch-ah
+++ b/news/inn/patches/patch-ah
@@ -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
diff --git a/news/inn/patches/patch-ai b/news/inn/patches/patch-ai
deleted file mode 100644
index 4d3e53006a2..00000000000
--- a/news/inn/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.8 2014/08/03 17:33:34 spz Exp $
-
---- 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;
- } dbzoptions;
- 
--#ifdef __GNUC__
-+#if defined(__GNUC__) && !defined(PACKED)
- #define PACKED __attribute__ ((packed))
- #else
- #if !defined(PACKED)