news/inn: Update to 2.7.0

See https://lists.isc.org/pipermail/inn-announce/2022-July/000015.html

4 files changed, 39 insertions, 36 deletions

diff --git a/UPDATING b/UPDATING
index d73e9010cf42..25f23d648185 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,16 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20220807:
+  AFFECTS: users of news/inn
+  AUTHOR: kbowling@FreeBSD.org
+
+  The inn port has been updated to 2.7 release.  Users upgrading from
+  prior versions should read through the announcement for any manual
+  upgrading steps that apply to your environment.
+
+  https://lists.isc.org/pipermail/inn-announce/2022-July/000015.html
+
 20220711:
   AFFECTS: users of security/stunnel
   AUTHOR: zi@FreeBSD.org
diff --git a/news/inn/Makefile b/news/inn/Makefile
index eceff0609dcd..9e5fe5e783f4 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -1,5 +1,5 @@
 PORTNAME?=		inn
-PORTVERSION?=		2.6.5
+PORTVERSION?=		2.7.0
 PORTREVISION?=		0
 CATEGORIES=		news
 MASTER_SITES=		ISC
@@ -21,32 +21,30 @@ CPE_VENDOR=	isc
 
 CONFLICTS?=	inn-current
 
-OPTIONS_DEFINE=		BERKELEYDB GNUPG KERBEROS PYTHON SASL KEYWORDS \
-			LARGE_FILES OPENSSL SETGID_INEWS TAGGED_HASH \
-			UUCP_RNEWS DOCS EXAMPLES
-OPTIONS_DEFAULT=	BERKELEYDB GNUPG KEYWORDS OPENSSL LARGE_FILES \
-			SETGID_INEW UUCP_RNEWS
+OPTIONS_DEFINE=		BERKELEYDB BLACKLISTD GNUPG KERBEROS PYTHON SASL \
+			SQLITE KEYWORDS LARGE_FILES OPENSSL SETGID_INEWS \
+			TAGGED_HASH UUCP_RNEWS DOCS EXAMPLES
+OPTIONS_DEFAULT=	BERKELEYDB BLACKLISTD GNUPG SQLITE KEYWORDS OPENSSL \
+			LARGE_FILES SETGID_INEW UUCP_RNEWS
 OPTIONS_SUB=		yes
 
 KERBEROS_DESC=		Enable Kerberos v5 (for auth_krb5)
 PYTHON_DESC=		Enable support for embedded Python
 SASL_DESC=		Enable SASL (for imapfeed authentication)
+SQLITE_DESC=		Enable SQLite (for ovsqlite overview method)
 TAGGED_HASH_DESC=	Use tagged hash table for history
 LARGE_FILES_DESC=	Support for files larger than 2GB
 KEYWORDS_DESC=		Automatic keyword generation support
 BERKELEYDB_DESC=	Enable BerkeleyDB (for ovdb overview method)
+BLACKLISTD_DESC=	Enable blacklistd support
 OPENSSL_DESC=		Enable OpenSSL (for NNTP over TLS/SSL support)
 GNUPG_DESC=		GnuPG support (for pgpverify control message)
 UUCP_RNEWS_DESC=	Install rnews suitable for use with net/freebsd-uucp
 SETGID_INEWS_DESC=	Enable posting articles locally for all users
 
-.if ${BRANCH:U} == 2.7
-OPTIONS_DEFINE+=		BLACKLISTD SQLITE
-OPTIONS_DEFAULT+=		BLACKLISTD SQLITE
-BLACKLISTD_DESC=		Enable blacklistd support
 BLACKLISTD_CONFIGURE_WITH=	blacklist
-SQLITE_DESC=			Enable SQLite (for ovsqlite overview method)
 
+.if ${BRANCH:U} == 2.8
 PLIST_SUB+=		SNAPSHOT=""
 .else
 PLIST_SUB+=		SNAPSHOT="@comment "
@@ -72,9 +70,9 @@ CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man		\
 
 UUCP_RNEWS_RUN_DEPENDS=	uucp:net/freebsd-uucp
 
-INNLIB_LONG?=		6.1.0
-LIBVER_LONG?=		3.0.5
-LIBSTORAGEVER_LONG?=	3.0.5
+INNLIB_LONG?=		8.0.0
+LIBVER_LONG?=		3.0.6
+LIBSTORAGEVER_LONG?=	3.1.0
 PLIST_SUB+=		LIBVER=${LIBVER_LONG:R:R} LIBVER_LONG=${LIBVER_LONG} \
 			INNLIB=${INNLIB_LONG:R:R} INNLIB_LONG=${INNLIB_LONG} \
 			LIBSTORAGEVER=${LIBSTORAGEVER_LONG:R:R} LIBSTORAGEVER_LONG=${LIBSTORAGEVER_LONG}
@@ -89,9 +87,7 @@ PLIST_SUB+=		SQLITE=""
 TO_BE_STRIPPED+=	bin/ovsqlite-server
 CONFIG_FILES+=		ovsqlite.conf
 .else
-.  if ${BRANCH:U} == 2.7
 CONFIGURE_ARGS+=	--without-sqlite3
-.  endif
 PLIST_SUB+=		SQLITE="@comment "
 .endif
 
diff --git a/news/inn/distinfo b/news/inn/distinfo
index 36751b4371c5..61c962321ad0 100644
--- a/news/inn/distinfo
+++ b/news/inn/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1645911831
-SHA256 (inn-2.6.5.tar.gz) = 34236cb34486e8083111821388670e02de5588ac24e819ca4468eafbb7b67598
-SIZE (inn-2.6.5.tar.gz) = 2646269
+TIMESTAMP = 1659899363
+SHA256 (inn-2.7.0.tar.gz) = 75c17e02aac939149187766a448e706118e13b22fecd8802a987e1f8ce866066
+SIZE (inn-2.7.0.tar.gz) = 2718463
diff --git a/news/inn/pkg-plist b/news/inn/pkg-plist
index 9058e556b0c4..52753770e4cc 100644
--- a/news/inn/pkg-plist
+++ b/news/inn/pkg-plist
@@ -21,9 +21,6 @@ bin/control/ihave.pl
 bin/control/newgroup.pl
 bin/control/rmgroup.pl
 bin/control/sendme.pl
-bin/control/sendsys.pl
-bin/control/senduuname.pl
-bin/control/version.pl
 bin/controlbatch
 bin/controlchan
 bin/convdate
@@ -34,7 +31,6 @@ bin/expire
 bin/expireover
 bin/expirerm
 bin/fastrm
-bin/filechan
 bin/filter/INN.py
 bin/filter/filter_innd.pl
 bin/filter/filter_innd.py
@@ -46,6 +42,7 @@ bin/filter/nnrpd_auth.pl
 bin/filter/nnrpd_auth.py
 bin/filter/nnrpd_dynamic.py
 bin/filter/startup_innd.pl
+bin/gencancel
 bin/getlist
 bin/grephistory
 bin/imapfeed
@@ -94,13 +91,11 @@ bin/rnews.libexec/gunbatch
 bin/scanlogs
 bin/scanspool
 bin/send-ihave
-bin/send-nntp
 bin/send-uucp
 bin/sendinpaths
 bin/sendxbatches
 bin/shlock
 bin/shrinkfile
-bin/signcontrol
 bin/simpleftp
 bin/sm
 bin/tally.control
@@ -130,7 +125,6 @@ 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
@@ -157,6 +151,7 @@ include/inn/portable-macros.h
 include/inn/portable-socket.h
 include/inn/portable-stdbool.h
 include/inn/qio.h
+include/inn/secrets.h
 include/inn/sequence.h
 include/inn/storage.h
 include/inn/system.h
@@ -171,6 +166,7 @@ include/inn/xwrite.h
 lib/perl/INN/Config.pm
 lib/perl/INN/Utils/Shlock.pm
 lib/innreport_inn.pm
+lib/innreport-display.conf
 lib/innshellvars
 lib/innshellvars.pl
 lib/innshellvars.tcl
@@ -182,14 +178,15 @@ lib/libinnhist.a
 lib/libinnhist.so
 lib/libinnhist.so.%%LIBVER%%
 lib/libinnhist.so.%%LIBVER_LONG%%
-lib/libstorage.a
-lib/libstorage.so
-lib/libstorage.so.%%LIBSTORAGEVER%%
-lib/libstorage.so.%%LIBSTORAGEVER_LONG%%
+lib/libinnstorage.a
+lib/libinnstorage.so
+lib/libinnstorage.so.%%LIBSTORAGEVER%%
+lib/libinnstorage.so.%%LIBSTORAGEVER_LONG%%
 @comment --------------------------------------------------------------
 @cwd
 man/man1/convdate.1.gz
 man/man1/fastrm.1.gz
+man/man1/gencancel.1.gz
 man/man1/getlist.1.gz
 man/man1/grephistory.1.gz
 man/man1/inews.1.gz
@@ -205,9 +202,6 @@ man/man1/simpleftp.1.gz
 man/man1/sm.1.gz
 man/man3/INN::Config.3pm.gz
 man/man3/INN::Utils::Shlock.3pm.gz
-man/man3/libauth.3.gz
-man/man3/libinn.3.gz
-man/man3/libinnhist.3.gz
 man/man3/libinn_clientlib.3.gz
 man/man3/libinn_dbz.3.gz
 man/man3/libinn_inndcomm.3.gz
@@ -215,7 +209,10 @@ man/man3/libinn_list.3.gz
 man/man3/libinn_qio.3.gz
 man/man3/libinn_tst.3.gz
 man/man3/libinn_uwildmat.3.gz
-man/man3/libstorage.3.gz
+man/man3/libinnauth.3.gz
+man/man3/libinnstorage.3.gz
+man/man3/libinn.3.gz
+man/man3/libinnhist.3.gz
 man/man5/active.5.gz
 man/man5/active.times.5.gz
 man/man5/buffindexed.conf.5.gz
@@ -227,6 +224,7 @@ man/man5/expire.ctl.5.gz
 man/man5/history.5.gz
 man/man5/incoming.conf.5.gz
 man/man5/inn-radius.conf.5.gz
+man/man5/inn-secrets.conf.5.gz
 man/man5/inn.conf.5.gz
 man/man5/innfeed.conf.5.gz
 man/man5/innreport.conf.5.gz
@@ -265,7 +263,6 @@ man/man8/domain.8.gz
 man/man8/expire.8.gz
 man/man8/expireover.8.gz
 man/man8/expirerm.8.gz
-man/man8/filechan.8.gz
 man/man8/ident.8.gz
 man/man8/imapfeed.8.gz
 man/man8/innbind.8.gz
@@ -303,7 +300,6 @@ man/man8/rc.news.8.gz
 man/man8/scanlogs.8.gz
 man/man8/scanspool.8.gz
 man/man8/send-ihave.8.gz
-man/man8/send-nntp.8.gz
 man/man8/send-uucp.8.gz
 man/man8/sendinpaths.8.gz
 man/man8/sendxbatches.8.gz
@@ -323,6 +319,7 @@ man/man8/writelog.8.gz
 %%EXAMPLESDIR%%/expire.ctl
 %%EXAMPLESDIR%%/incoming.conf
 %%EXAMPLESDIR%%/inn-radius.conf
+%%EXAMPLESDIR%%/inn-secrets.conf
 %%EXAMPLESDIR%%/inn.conf
 %%EXAMPLESDIR%%/innfeed.conf
 %%EXAMPLESDIR%%/innreport.conf