inn: Update to 2.7.0

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: inn: Update to 2.7.0
From: Michael Baeuerle <micha%NetBSD.org@localhost>
Date: Mon, 18 Jul 2022 14:29:32 +0000
Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Mon Jul 18 16:29:32 2022 +0200
Changeset:	a6d7d0ebe866b0fc0e253d5e921f9b041cdc625e

Modified Files:
	Makefile
Added Files:
	inn/DESCR
	inn/MESSAGE
	inn/Makefile
	inn/Makefile.common
	inn/PLIST
	inn/buildlink3.mk
	inn/distinfo
	inn/files/innd.sh
	inn/options.mk
	inn/patches/patch-aa
	inn/patches/patch-ab
	inn/patches/patch-ac
	inn/patches/patch-ad
	inn/patches/patch-ag
	inn/patches/patch-ah
	inn/patches/patch-ak
	inn/patches/patch-al

Log Message:
inn: Update to 2.7.0

- Renamed libstorage to libinnstorage
- Added "canlock" option
- Enable options "canlock" and "gnupg2" by default
- Updated PLIST
- Fixed some warnings from pkglint

Changes in 2.7.0:

 * Upgrading to a major release is a good time to ensure that your
   configuration files, that are usually kept untouched during normal
   updates, are up-to-date: notably control.ctl (with your local changes
   in a separate control.ctl.local file), new better default values in
   inn.conf and innfeed.conf, improvements in innreport.conf (along with
   innreport-display.conf) and innreport.css, fixes in innwatch.ctl,
   updated moderators and nocem.ctl files.

   You may also want to check that the PGP keys used to verify the
   signature of control articles and NoCeM notices are still up-to-date
   and working. The keys of a few hierarchies and NoCeM issuers have
   recently changed.

 * Bo Lindbergh has implemented a new overview storage method based on
   SQLite, known for its long-term stability and compatibility. Robust
   and faster at reading ranges of overview data, but somewhat slower at
   writing, this new SQLite-based method is a perfect choice to store
   overview data.

   To select it as your overview method, set the *ovmethod* parameter in
   inn.conf to "ovsqlite". Details about ovsqlite, the ovsqlite.conf
   configuration file and how to switch to that new modern overview
   storage method can be found in the ovsqlite(5) and makehistory(8) man
   pages.

 * Julien Elie has implemented Cancel-Lock support in innd and nnrpd,
   based on RFC 8315 and libcanlock. A new inn-secrets.conf configuration
   file has been added in *pathetc* wherein you can set the secrets to
   use for Cancel-Lock. See the inn-secrets.conf(5) man page for more
   details.

   A new -F flag is recognized by innconfval to indicate the type of file
   to parse (by default, "inn.conf"); just run "innconfval -F
   inn-secrets.conf" to get the values of that new configuration file.
   Another new flag, -f, permits specifying another file name to parse
   than the standard one.

   The *addcanlockuser* parameter has been added in readers.conf to
   deactivate the generation of user-specific hashes when several
   different posters have the same identity in an access group. This
   parameter also permits setting whether the hash, when generated, is
   based on the username or the (static) IP of the connection.

 * Added a new tool, gencancel, to help the news administrator generate
   authenticated cancel control messages, with the expected admin
   Cancel-Key hashes. See the gencancel(1) man page for more details.

 * A new *docancels* parameter has been added in inn.conf to define which
   types of cancels innd should process. The -C flag given to innd is
   deprecated in favour of that new parameter (you'll see in your logs
   the message "innd -C flag has been deprecated and has no effect; use
   docancels in inn.conf" in case you're passing that flag to innd).

 * Andreas Kempe has implemented blacklistd support in nnrpd. This
   daemon, available notably in FreeBSD and NetBSD, can be used to
   prevent brute force attacks by blocking attackers after a number of
   failed login attempts. When nnrpd is run with the new -B flag, and INN
   has been configured with the new --with-blacklist option, it will
   report login attempts to the blacklistd daemon for potential blocking.

 * Building INN with TLS support using LibreSSL is now supported (only
   OpenSSL was previously officially supported and tested).

 * Fixed the parsing of *hosts* and *localaddress* parameters in
   readers.conf; exclusion patterns (beginning with "!") have not been
   working since INN 2.5.0.

 * Improved the robustness of innxmit when receiving 500 or 501 response
   codes from peers, indicating they do not understand the NNTP command
   or (wrongly) think there is a syntax error. Richard Kettlewell added a
   proper handling of these responses, making innxmit dropping the
   refused article instead of keeping sending it over and over (and thus
   receiving each time the same error in response codes).

 * innreport now collects statistics from innxbatch and generates a
   section for them in its reports.

 * The innreport.conf file in *pathetc*, previously containing almost
   2500 lines, has been split into a general configuration file
   (innreport.conf itself, still in *pathetc*, with about 60 lines) and a
   display configuration file (innreport-display.conf, a new separate
   file in *pathlib*). The name of this display configuration file can be
   parametered in the new *display_conf_file* option in innreport.conf.

 * The -m flag given to mailpost now sets a List-ID header field instead
   of a Mailing-List header field.

 * rc.news, used to start and stop INN daemons, now checks whether it is
   run as the news user. It will exit if not the case, to ensure not to
   tamper with the ownership of files INN manipulates.

 * filechan has been removed; it was just a simple version of buffchan,
   which should now be used.

 * send-nntp has been removed; it was just a simple version of nntpsend,
   which should now be used (or, even better, innfeed).

 * The *refusecybercancels* and *verifycancels* parameters have been
   removed from inn.conf. Besides, inews no longer checks if the From or
   Sender header fields of a cancel or supersede request match the ones
   of the original article being withdrawn. All of these were either
   inefficient or inexact checks.

 * The *xbatch* parameter has been added in incoming.conf to enable the
   XBATCH command in innd for specific remote peers. The default is to
   disable the capability.

 * The *nolist* and *noresendid* parameters in incoming.conf have been
   respectively renamed to *list* and *resendid* (and the meaning of
   their related boolean values is now the opposite). Besides, the unused
   *comment* and *email* parameters in incoming.conf have been removed.

 * inews no longer adds a Sender header field nor overwrites an existing
   one in articles it processes if the new -P flag is used. The Path
   header field, if unset, no longer systematically contains the path
   identity of the local news server (you may want to add it manually
   with the -x flag, if needed). Finally, inews also no longer adds the
   obsolescent Lines header field.

 * A new -E flag can now be given to inews to silently discard empty
   articles, instead of bailing out with an error. Another new -m flag
   permits setting the Message-ID instead of letting inews generate one.
   And a third new flag, -Y, forces inews to authenticate to the remote
   news server even if not asked to.

 * signcontrol has been removed as it embeds per-site configuration which
   is overwritten each time INN is updated to a newer version, and it is
   unlikely you ever need it. Nonetheless, if you need to issue
   PGP-signed control messages, you can still download it from
   <https://ftp.isc.org/pub/pgpcontrol/>.

 * Support in controlchan for obsolete *sendsys*, *senduuname* and
   *version* control messages has been removed. These control messages,
   long been deprecated, should no longer be sent nor honoured nowadays.
   Besides, the "doifarg" keyword in control.ctl is no longer recognized
   (it was only used for these three kinds of control messages).

 * The *require_ssl* parameter in readers.conf has been renamed to
   *require_encryption*, which is a better name as it applies to any kind
   of encryption layers, including TLS and SASL security layers.

 * Fixed the use of a deprecated API in Kerberos V5. INN now requires
   version 1.6.1 or higher of MIT Kerberos v5 to build.

 * The libauth.h header file and the libstorage library have been renamed
   to libinnauth.h and libinnstorage to homogenize their name with
   existing libinnhist library.

 * All of the applicable bug fixes from the INN 2.6 STABLE series are
   also included in INN 2.7.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a6d7d0ebe866b0fc0e253d5e921f9b041cdc625e

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

diffstat:
 Makefile             |   1 +
 inn/DESCR            |  11 ++
 inn/MESSAGE          |  15 +++
 inn/Makefile         | 222 ++++++++++++++++++++++++++++++++++
 inn/Makefile.common  |  14 +++
 inn/PLIST            | 336 +++++++++++++++++++++++++++++++++++++++++++++++++++
 inn/buildlink3.mk    |  13 ++
 inn/distinfo         |  13 ++
 inn/files/innd.sh    |  78 ++++++++++++
 inn/options.mk       |  76 ++++++++++++
 inn/patches/patch-aa |  13 ++
 inn/patches/patch-ab |  15 +++
 inn/patches/patch-ac |  13 ++
 inn/patches/patch-ad |  14 +++
 inn/patches/patch-ag |  13 ++
 inn/patches/patch-ah |  24 ++++
 inn/patches/patch-ak |  13 ++
 inn/patches/patch-al |  15 +++
 18 files changed, 899 insertions(+)

diffs:
diff --git a/Makefile b/Makefile
index 9c7998e9a4..a28b03f4bb 100644
--- a/Makefile
+++ b/Makefile
@@ -1770,6 +1770,7 @@ SUBDIR+=	info2man
 SUBDIR+=	infraarcana
 SUBDIR+=	inicpp
 SUBDIR+=	initware-git
+SUBDIR+=	inn
 SUBDIR+=	input-mono-ttf
 SUBDIR+=	intel-gpu-tools
 SUBDIR+=	interbase-docs
diff --git a/inn/DESCR b/inn/DESCR
new file mode 100644
index 0000000000..2308d4f6c4
--- /dev/null
+++ b/inn/DESCR
@@ -0,0 +1,11 @@
+This is the public release of InterNet News (INN). This work is
+sponsored by the Internet Software Consortium.
+
+InterNetNews is a complete Usenet system.  The cornerstone of the
+package is innd, an NNTP server that multiplexes all I/O. Newsreading
+is handled by a separate server, nnrpd, that is spawned for each
+client.  Both innd and nnrpd have some slight variances from the
+NNTP protocol.
+
+You can set the environment variable INN_SPOOL to whatever you like
+to change the default spool directory when building this pkg.
diff --git a/inn/MESSAGE b/inn/MESSAGE
new file mode 100644
index 0000000000..1a903645a9
--- /dev/null
+++ b/inn/MESSAGE
@@ -0,0 +1,15 @@
+===========================================================================
+$NetBSD$
+
+The following program has been installed suid root on your machine:
+
+	${PREFIX}/${INN_PATHBIN}/innbind
+
+---------------------------------------------------------------------------
+If you are upgrading from 2.5.5 or earlier: this is a major version bump.
+Config files have changed. Read ${PREFIX}/share/doc/inn/NEWS for details.
+
+If this is a first install: ${PREFIX}/share/doc/inn/INSTALL will help you
+getting set up.
+---------------------------------------------------------------------------
+===========================================================================
diff --git a/inn/Makefile b/inn/Makefile
new file mode 100644
index 0000000000..461dddfe74
--- /dev/null
+++ b/inn/Makefile
@@ -0,0 +1,222 @@
+# $NetBSD$
+
+DISTNAME=		inn-2.7.0
+CATEGORIES=		news
+MASTER_SITES=		ftp://ftp.isc.org/isc/inn/
+MASTER_SITES+=		ftp://ftp.fu-berlin.de/unix/news/inn/
+
+MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=		http://www.isc.org/software/inn/
+COMMENT=		The public release of InterNet News (INN)
+LICENSE=		modified-bsd AND gnu-gpl-v2
+
+CONFLICTS+=		libradius-[0-9]* nntpclnt-[0-9]*
+
+USE_LIBTOOL=		yes
+
+.include "../../news/inn/Makefile.common"
+
+BUILD_DEFS+=		INN_DATA_DIR
+BUILD_DEFS+=		VARBASE
+
+FILES_SUBST+=		INN_DATA_DIR=${INN_DATA_DIR}
+
+BUILD_DEFS+=		INN_PATHBIN
+FILES_SUBST+=		INN_PATHBIN=${PREFIX}/${INN_PATHBIN:Q}
+
+MESSAGE_SUBST+=		INN_PATHBIN=${INN_PATHBIN:Q}
+
+PLIST_SUBST+=		INN_PATHBIN=${INN_PATHBIN:Q}
+
+PKG_SYSCONFSUBDIR=	inn
+
+GNU_CONFIGURE=		YES
+GNU_CONFIGURE_PREFIX=	${INN_PREFIX}
+GNU_CONFIGURE_MANDIR=	${PREFIX}/${PKGMANDIR}
+CONFIGURE_ARGS+=	--enable-setgid-inews 				\
+			--enable-largefiles				\
+			--bindir=${PREFIX}/${INN_PATHBIN}		\
+			--sbindir=${PREFIX}/${INN_PATHBIN}		\
+			--sysconfdir=${PKG_SYSCONFDIR} 			\
+			--with-openssl=${SSLBASE:Q}			\
+			--with-doc-dir=${PREFIX}/share/doc/inn	 	\
+			--with-control-dir=${PREFIX}/${INN_PATHBIN}/control \
+			--with-filter-dir=${PREFIX}/${INN_PATHBIN}/filter \
+			--with-tmp-dir=${INN_DATA_DIR}/tmp		\
+			--with-db-dir=${INN_DATA_DIR}/db 		\
+			--with-http-dir=${INN_DATA_DIR}/http		\
+			--with-log-dir=${INN_DATA_DIR}/log 		\
+			--with-run-dir=${INN_DATA_DIR}/run 		\
+			--includedir=${PREFIX}/include 			\
+			--with-spool-dir=${INN_SPOOL:Q}			\
+			--with-news-user=${INN_USER}			\
+			--with-news-group=${INN_GROUP}
+CONFIGURE_ENV+=		_PATH_AWK=${TOOLS_AWK}
+CONFIGURE_ENV+=		_PATH_EGREP=${TOOLS_EGREP}
+CONFIGURE_ENV+=		_PATH_SED=${TOOLS_SED}
+CONFIGURE_ENV+=		_PATH_SH=${TOOLS_SH}
+CONFIGURE_ENV+=		_PATH_SORT=${TOOLS_SORT}
+CONFIGURE_ENV+=		GZIP=${TOOLS_GZIP_CMD}
+USE_TOOLS+=		awk egrep gzip perl:run sed sh sort yacc
+
+LDFLAGS.SunOS+=	-lsocket -lnsl
+
+DEPENDS+=		p5-MIME-tools-[0-9]*:../../mail/p5-MIME-tools
+DEPENDS+=		p5-GD-[0-9]*:../../graphics/p5-GD
+DEPENDS+=		gnupg-[0-9]*:../../security/gnupg
+
+USERGROUP_PHASE=	pre-install
+PKG_USERS_VARS+=	INN_USER
+PKG_GROUPS_VARS+=	INN_GROUP
+
+PKG_GROUPS+=		${INN_GROUP}
+PKG_USERS+=		${INN_USER}:${INN_GROUP}
+PKG_GECOS.${INN_USER}=	Internet\ News
+PKG_HOME.${INN_USER}=	${INN_DATA_DIR}
+PKG_SHELL.${INN_USER}=	${SH}
+
+EXAMPLEDIR=		${PREFIX}/share/examples/inn
+INN_DATADIRS=		log log/OLD tmp db spool http
+INN_SPOOLDIRS=		archive articles overview incoming incoming/bad	\
+			outgoing uniover innfeed
+
+INSTALL_ENV+=		CHOWNPROG="echo chmod"
+INSTALL_ENV+=		CHGRPPROG="echo chgrp"
+
+INSTALLATION_DIRS+=	sbin
+INSTALLATION_DIRS+=	bin
+INSTALLATION_DIRS+=	${EXAMPLEDIR}
+INSTALLATION_DIRS+=	${EXAMPLEDIR}/filter
+
+INN_DIRS+=		${PKG_SYSCONFDIR}
+INN_DIRS+=		${INN_DATA_DIR}
+
+MAKE_DIRS+=	${PREFIX}/${INN_PATHBIN}
+MAKE_DIRS+=	${PREFIX}/${INN_PATHBIN}/auth
+MAKE_DIRS+=	${PREFIX}/${INN_PATHBIN}/auth/resolv
+MAKE_DIRS+=	${PREFIX}/${INN_PATHBIN}/auth/passwd
+MAKE_DIRS+=	${PREFIX}/${INN_PATHBIN}/control
+MAKE_DIRS+=	${PREFIX}/${INN_PATHBIN}/filter
+MAKE_DIRS+=	${PREFIX}/${INN_PATHBIN}/rnews.libexec
+MAKE_DIRS+=	${EXAMPLEDIR}
+
+.for dir in ${INN_DIRS}
+OWN_DIRS_PERMS+=	${dir}	${INN_USER} ${INN_GROUP} 0775
+.endfor
+
+.for dir in ${INN_DATADIRS}
+OWN_DIRS_PERMS+=	${INN_DATA_DIR}/${dir}	${INN_USER} ${INN_GROUP} 0775
+.endfor
+
+OWN_DIRS_PERMS+=	${INN_DATA_DIR}/run	${INN_USER} ${INN_GROUP} 0770
+
+.for dir in ${INN_SPOOLDIRS}
+OWN_DIRS_PERMS+=	${INN_DATA_DIR}/spool/${dir} \
+						${INN_USER} ${INN_GROUP} 0775
+.endfor
+
+CFILES=			actsync.cfg actsync.ign buffindexed.conf \
+			control.ctl control.ctl.local cycbuff.conf \
+			distrib.pats distributions \
+			expire.ctl incoming.conf inn.conf innfeed.conf \
+			innreport.conf innwatch.ctl \
+			innshellvars.local innshellvars.pl.local \
+			innshellvars.tcl.local \
+			localgroups moderators \
+			motd.innd motd.nnrpd \
+			news2mail.cf newsfeeds nnrpd.track \
+			nntpsend.ctl nocem.ctl ovdb.conf passwd.nntp \
+			inn-radius.conf readers.conf send-uucp.cf \
+			storage.conf subscriptions
+.for file in ${CFILES}
+CONF_FILES_PERMS+=	${EXAMPLEDIR}/${file} ${PKG_SYSCONFDIR}/${file} \
+			${INN_USER} ${INN_GROUP} 0664
+.endfor
+
+CONF_FILES_PERMS+=	${EXAMPLEDIR}/active.minimal ${INN_DATA_DIR}/db/active ${INN_USER} ${INN_GROUP} 0664
+CONF_FILES_PERMS+=	${EXAMPLEDIR}/newsgroups.minimal ${INN_DATA_DIR}/db/newsgroups ${INN_USER} ${INN_GROUP} 0664
+
+DBFILES=		active.times history
+
+HTTPFILES=		innreport.css
+
+CONF_FILES_PERMS+=	${EXAMPLEDIR}/innreport.css ${INN_DATA_DIR}/http/innreport.css ${INN_USER} ${INN_GROUP} 0664
+
+.for file in ${DBFILES}
+CONF_FILES_PERMS+=	${EXAMPLEDIR}/${file} ${INN_DATA_DIR}/db/${file} \
+			${INN_USER} ${INN_GROUP} 0664
+.endfor
+
+FILTERFILES=		INN.py filter_innd.py nnrpd.py nnrpd_access.py \
+			nnrpd_auth.py nnrpd_dynamic.py \
+			filter_innd.pl filter_nnrpd.pl nnrpd_access.pl \
+			nnrpd_auth.pl startup_innd.pl
+
+.for file in ${FILTERFILES}
+CONF_FILES_PERMS+=	${EXAMPLEDIR}/filter/${file} ${INN_PATHBIN}/filter/${file} \
+			${INN_USER} ${INN_GROUP} 0664
+.endfor
+
+SPECIAL_PERMS+=		${PREFIX}/${INN_PATHBIN}/innbind ${REAL_ROOT_USER} ${INN_GROUP} 4555
+SPECIAL_PERMS+=		${PREFIX}/${INN_PATHBIN}/inews ${INN_USER} ${INN_GROUP} 2555
+SPECIAL_PERMS+=		${PREFIX}/${INN_PATHBIN}/rnews ${INN_USER} ${UUCP_GROUP} 2555
+
+NEWSONLYBINS+=		buffindexed_d cnfsheadconf ctlinnd expire expireover
+NEWSONLYBINS+=		expirerm imapfeed inncheck innd innfeed innstat
+NEWSONLYBINS+=		innupgrade innwatch makedbz makehistory mod-active
+NEWSONLYBINS+=		news.daily ovdb_init ovdb_monitor ovdb_server ovdb_stat
+NEWSONLYBINS+=		overchan procbatch prunehistory rc.news scanlogs
+NEWSONLYBINS+=		tally.control tdx-util writelog
+.for file in ${NEWSONLYBINS}
+SPECIAL_PERMS+=		${PREFIX}/${INN_PATHBIN}/${file} ${INN_USER} ${INN_GROUP} 0550
+.endfor
+
+
+RCD_SCRIPTS=		innd
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ARGS+=	--with-sendmail=/usr/lib/sendmail
+.else
+CONFIGURE_ARGS+=	--with-sendmail=/usr/sbin/sendmail
+.endif
+
+.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
+GCC_REQD+=		2.95.3
+.endif
+
+.include "options.mk"
+
+TEST_TARGET=	tests
+
+pre-install:
+.for file in ${CFILES} active.minimal newsgroups.minimal
+	${INSTALL_DATA} ${WRKSRC}/site/${file} ${DESTDIR}${EXAMPLEDIR}
+.endfor
+.for file in ${DBFILES} ${HTTPFILES}
+	${TOUCH} ${WRKSRC}/site/${file}
+	${INSTALL_DATA} ${WRKSRC}/site/${file} ${DESTDIR}${EXAMPLEDIR}
+.endfor
+.for file in ${FILTERFILES}
+	${INSTALL_DATA} ${WRKSRC}/site/${file} ${DESTDIR}${EXAMPLEDIR}/filter
+.endfor
+
+post-install:
+.for file in cnfsstat ctlinnd makehistory innbind
+	${RM} -f ${DESTDIR}${PREFIX}/sbin/${file}
+	${LN} -s ${DESTDIR}${PREFIX}/${INN_PATHBIN}/${file}	\
+				${DESTDIR}${PREFIX}/sbin
+.endfor
+	${RM} -f ${DESTDIR}${PREFIX}/bin/inews
+	${LN} -s ${DESTDIR}${PREFIX}/${INN_PATHBIN}/inews	\
+			${DESTDIR}${PREFIX}/bin
+	${RM} -f ${DESTDIR}${PREFIX}/bin/rnews
+	${LN} -s ${DESTDIR}${PREFIX}/${INN_PATHBIN}/rnews	\
+			${DESTDIR}${PREFIX}/bin
+.for file in libinn.a libinnstorage.a libinnhist.a
+	${CHMOD} 644 ${DESTDIR}${PREFIX}/lib/${file}
+.endfor
+
+.include "../../security/openssl/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/inn/Makefile.common b/inn/Makefile.common
new file mode 100644
index 0000000000..e3b743f76d
--- /dev/null
+++ b/inn/Makefile.common
@@ -0,0 +1,14 @@
+# $NetBSD$
+#
+# used by news/inn/Makefile
+# used by news/newsx/Makefile
+
+INN_PREFIX?=	${PREFIX}
+INN_PATHBIN?=	libexec/inn
+INN_DATA_DIR?=	${VARBASE}/news
+INN_SPOOL?=	${INN_DATA_DIR}/spool
+
+BUILD_DEFS+=	INN_DATA_DIR
+BUILD_DEFS+=	VARBASE
+BUILD_DEFS+=	INN_USER
+BUILD_DEFS+=	INN_GROUP
diff --git a/inn/PLIST b/inn/PLIST
new file mode 100644
index 0000000000..51c10dc2d5
--- /dev/null
+++ b/inn/PLIST
@@ -0,0 +1,336 @@
+@comment $NetBSD$
+bin/inews
+bin/rnews
+include/inn/buffer.h
+include/inn/concat.h
+include/inn/confparse.h
+include/inn/dbz.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
+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/secrets.h
+include/inn/sequence.h
+include/inn/storage.h
+include/inn/system.h
+include/inn/timer.h
+include/inn/tst.h
+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-display.conf
+lib/innreport_inn.pm
+lib/innshellvars
+lib/innshellvars.pl
+lib/innshellvars.tcl
+lib/libinn.la
+lib/libinnhist.la
+lib/libinnstorage.la
+lib/perl/INN/Config.pm
+lib/perl/INN/Utils/Shlock.pm
+${INN_PATHBIN}/actmerge
+${INN_PATHBIN}/actsync
+${INN_PATHBIN}/actsyncd
+${INN_PATHBIN}/archive
+${INN_PATHBIN}/auth/passwd/ckpasswd
+${INN_PATHBIN}/auth/passwd/radius
+${INN_PATHBIN}/auth/resolv/domain
+${INN_PATHBIN}/auth/resolv/ident
+${INN_PATHBIN}/batcher
+${INN_PATHBIN}/buffchan
+${INN_PATHBIN}/buffindexed_d
+${INN_PATHBIN}/cnfsheadconf
+${INN_PATHBIN}/cnfsstat
+${INN_PATHBIN}/control/checkgroups.pl
+${INN_PATHBIN}/control/ihave.pl
+${INN_PATHBIN}/control/newgroup.pl
+${INN_PATHBIN}/control/rmgroup.pl
+${INN_PATHBIN}/control/sendme.pl
+${INN_PATHBIN}/controlbatch
+${INN_PATHBIN}/controlchan
+${INN_PATHBIN}/convdate
+${INN_PATHBIN}/ctlinnd
+${INN_PATHBIN}/cvtbatch
+${INN_PATHBIN}/docheckgroups
+${INN_PATHBIN}/expire
+${INN_PATHBIN}/expireover
+${INN_PATHBIN}/expirerm
+${INN_PATHBIN}/fastrm
+${INN_PATHBIN}/getlist
+${INN_PATHBIN}/grephistory
+${INN_PATHBIN}/imapfeed
+${INN_PATHBIN}/inews
+${INN_PATHBIN}/innbind
+${INN_PATHBIN}/inncheck
+${INN_PATHBIN}/innconfval
+${INN_PATHBIN}/innd
+${INN_PATHBIN}/inndf
+${INN_PATHBIN}/innfeed
+${INN_PATHBIN}/innmail
+${INN_PATHBIN}/innreport
+${INN_PATHBIN}/innstat
+${INN_PATHBIN}/innupgrade
+${INN_PATHBIN}/innwatch
+${INN_PATHBIN}/innxbatch
+${INN_PATHBIN}/innxmit
+${INN_PATHBIN}/mailpost
+${INN_PATHBIN}/makedbz
+${INN_PATHBIN}/makehistory
+${INN_PATHBIN}/mod-active
+${INN_PATHBIN}/news.daily
+${INN_PATHBIN}/news2mail
+${INN_PATHBIN}/ninpaths
+${INN_PATHBIN}/nnrpd
+${INN_PATHBIN}/nntpget
+${INN_PATHBIN}/nntpsend
+${INN_PATHBIN}/ovdb_init
+${INN_PATHBIN}/ovdb_monitor
+${INN_PATHBIN}/ovdb_server
+${INN_PATHBIN}/ovdb_stat
+${INN_PATHBIN}/overchan
+${INN_PATHBIN}/perl-nocem
+${INN_PATHBIN}/pgpverify
+${INN_PATHBIN}/procbatch
+${INN_PATHBIN}/prunehistory
+${INN_PATHBIN}/pullnews
+${INN_PATHBIN}/rc.news
+${INN_PATHBIN}/rnews
+${INN_PATHBIN}/rnews.libexec/bunbatch
+${INN_PATHBIN}/rnews.libexec/c7unbatch
+${INN_PATHBIN}/rnews.libexec/decode
+${INN_PATHBIN}/rnews.libexec/encode
+${INN_PATHBIN}/rnews.libexec/gunbatch
+${INN_PATHBIN}/scanlogs
+${INN_PATHBIN}/scanspool
+${INN_PATHBIN}/send-ihave
+${INN_PATHBIN}/send-uucp
+${INN_PATHBIN}/sendinpaths
+${INN_PATHBIN}/sendxbatches
+${INN_PATHBIN}/shlock
+${INN_PATHBIN}/shrinkfile
+${INN_PATHBIN}/simpleftp
+${INN_PATHBIN}/sm
+${INN_PATHBIN}/tally.control
+${INN_PATHBIN}/tdx-util
+${INN_PATHBIN}/tinyleaf
+${INN_PATHBIN}/writelog
+man/man1/convdate.1
+man/man1/fastrm.1
+man/man1/gencancel.1
+man/man1/getlist.1
+man/man1/grephistory.1
+man/man1/inews.1
+man/man1/innconfval.1
+man/man1/innmail.1
+man/man1/nntpget.1
+man/man1/pgpverify.1
+man/man1/pullnews.1
+man/man1/rnews.1
+man/man1/shlock.1
+man/man1/shrinkfile.1
+man/man1/simpleftp.1
+man/man1/sm.1
+man/man3/INN::Config.3pm
+man/man3/INN::Utils::Shlock.3pm
+man/man3/libinn.3
+man/man3/libinn_clientlib.3
+man/man3/libinn_dbz.3
+man/man3/libinn_inndcomm.3
+man/man3/libinn_list.3
+man/man3/libinn_qio.3
+man/man3/libinn_tst.3
+man/man3/libinn_uwildmat.3
+man/man3/libinnauth.3
+man/man3/libinnhist.3
+man/man3/libinnstorage.3
+man/man5/active.5
+man/man5/active.times.5
+man/man5/buffindexed.conf.5
+man/man5/control.ctl.5
+man/man5/cycbuff.conf.5
+man/man5/distrib.pats.5
+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-secrets.conf.5
+man/man5/inn.conf.5
+man/man5/innfeed.conf.5
+man/man5/innreport.conf.5
+man/man5/innwatch.ctl.5
+man/man5/localgroups.5
+man/man5/moderators.5
+man/man5/motd.innd.5
+man/man5/motd.news.5
+man/man5/motd.nnrpd.5
+man/man5/newsfeeds.5
+man/man5/newsgroups.5
+man/man5/newslog.5
+man/man5/nnrpd.track.5
+man/man5/nntpsend.ctl.5
+man/man5/nocem.ctl.5
+man/man5/ovdb.5
+man/man5/ovsqlite.5
+man/man5/passwd.nntp.5
+man/man5/readers.conf.5
+man/man5/storage.conf.5
+man/man5/subscriptions.5
+man/man8/actsync.8
+man/man8/actsyncd.8
+man/man8/archive.8
+${PLIST.kerberos}man/man8/auth_krb5.8
+man/man8/batcher.8
+man/man8/buffchan.8
+man/man8/ckpasswd.8
+man/man8/cnfsheadconf.8
+man/man8/cnfsstat.8
+man/man8/controlchan.8
+man/man8/ctlinnd.8
+man/man8/cvtbatch.8
+man/man8/docheckgroups.8
+man/man8/domain.8
+man/man8/expire.8
+man/man8/expireover.8
+man/man8/expirerm.8
+man/man8/ident.8
+man/man8/imapfeed.8
+man/man8/innbind.8
+man/man8/inncheck.8
+man/man8/innd.8
+man/man8/inndf.8
+man/man8/innfeed.8
+man/man8/innreport.8
+man/man8/innstat.8
+man/man8/innupgrade.8
+man/man8/innwatch.8
+man/man8/innxbatch.8
+man/man8/innxmit.8
+man/man8/inpaths.8
+man/man8/mailpost.8
+man/man8/makedbz.8
+man/man8/makehistory.8
+man/man8/mod-active.8
+man/man8/news.daily.8
+man/man8/news2mail.8
+man/man8/ninpaths.8
+man/man8/nnrpd.8
+man/man8/nntpsend.8
+man/man8/ovdb_init.8
+man/man8/ovdb_monitor.8
+man/man8/ovdb_server.8
+man/man8/ovdb_stat.8
+man/man8/overchan.8
+man/man8/ovsqlite-server.8
+man/man8/perl-nocem.8
+man/man8/procbatch.8
+man/man8/prunehistory.8
+man/man8/radius.8
+man/man8/rc.news.8
+man/man8/scanlogs.8
+man/man8/scanspool.8
+man/man8/send-ihave.8
+man/man8/send-uucp.8
+man/man8/sendinpaths.8
+man/man8/sendxbatches.8
+man/man8/tally.control.8
+man/man8/tdx-util.8
+man/man8/tinyleaf.8
+man/man8/writelog.8
+sbin/cnfsstat
+sbin/ctlinnd
+sbin/innbind
+sbin/makehistory
+share/doc/inn/CONTRIBUTORS
+share/doc/inn/GPL
+share/doc/inn/HACKING
+share/doc/inn/INSTALL
+share/doc/inn/LICENSE
+share/doc/inn/NEWS
+share/doc/inn/README
+share/doc/inn/TODO
+share/doc/inn/config-design
+share/doc/inn/config-semantics
+share/doc/inn/config-syntax
+share/doc/inn/external-auth
+share/doc/inn/history
+share/doc/inn/history-innfeed
+share/doc/inn/hook-perl
+share/doc/inn/hook-python
+share/doc/inn/sample-control
+share/examples/inn/active.minimal
+share/examples/inn/active.times
+share/examples/inn/actsync.cfg
+share/examples/inn/actsync.ign
+share/examples/inn/buffindexed.conf
+share/examples/inn/control.ctl
+share/examples/inn/control.ctl.local
+share/examples/inn/cycbuff.conf
+share/examples/inn/distrib.pats
+share/examples/inn/distributions
+share/examples/inn/expire.ctl
+share/examples/inn/filter/INN.py
+share/examples/inn/filter/filter_innd.pl
+share/examples/inn/filter/filter_innd.py
+share/examples/inn/filter/filter_nnrpd.pl
+share/examples/inn/filter/nnrpd.py
+share/examples/inn/filter/nnrpd_access.pl
+share/examples/inn/filter/nnrpd_access.py
+share/examples/inn/filter/nnrpd_auth.pl
+share/examples/inn/filter/nnrpd_auth.py
+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
+share/examples/inn/innreport.css
+share/examples/inn/innshellvars.local
+share/examples/inn/innshellvars.pl.local
+share/examples/inn/innshellvars.tcl.local
+share/examples/inn/innwatch.ctl
+share/examples/inn/localgroups
+share/examples/inn/moderators
+share/examples/inn/motd.innd
+share/examples/inn/motd.nnrpd
+share/examples/inn/news2mail.cf
+share/examples/inn/newsfeeds
+share/examples/inn/newsgroups.minimal
+share/examples/inn/nnrpd.track
+share/examples/inn/nntpsend.ctl
+share/examples/inn/nocem.ctl
+share/examples/inn/ovdb.conf
+share/examples/inn/passwd.nntp
+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/inn
diff --git a/inn/buildlink3.mk b/inn/buildlink3.mk
new file mode 100644
index 0000000000..24c1eb4373
--- /dev/null
+++ b/inn/buildlink3.mk
@@ -0,0 +1,13 @@
+# $NetBSD$
+
+BUILDLINK_TREE+=	inn
+
+.if !defined(INN_BUILDLINK3_MK)
+INN_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.inn+=	inn>=2.3.4
+BUILDLINK_ABI_DEPENDS.inn?=	inn>=2.7.0
+BUILDLINK_PKGSRCDIR.inn?=	../../wip/inn
+.endif # INN_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-inn
diff --git a/inn/distinfo b/inn/distinfo
new file mode 100644
index 0000000000..a4f756ca26
--- /dev/null
+++ b/inn/distinfo
@@ -0,0 +1,13 @@
+$NetBSD$
+
+BLAKE2s (inn-2.7.0.tar.gz) = 7db6d505e582ac5b3a821383bf720e10340fe8c2d10a935a3f9a206727d4c746
+SHA512 (inn-2.7.0.tar.gz) = 5c54816edfab667b12ea330714656de6501d780f3f622fd3cc7721d767f17eb38e7a18ddfe123fd0d8e67c4f21e0beb9ea05668ef77e1c52abd7e32f603824c4
+Size (inn-2.7.0.tar.gz) = 2718463 bytes
+SHA1 (patch-aa) = 1801206391e5f37e75edad0955cfc426d4701e45
+SHA1 (patch-ab) = 28b341559ba7d132e8a6dbb0989e964b1d5849fd
+SHA1 (patch-ac) = e60a9f39aed6aed2004dc625d08afb7403ac18a1
+SHA1 (patch-ad) = 96a38291dcd9a836dcaaa9f48ec6a8d2133dc7c6
+SHA1 (patch-ag) = 31bee657a4e35475e902cd179716328aa39ee4b1
+SHA1 (patch-ah) = 231ccb7c0402441760692c32fa0dafcf5c6a72aa
+SHA1 (patch-ak) = cdc37267d5f5151300b4c595b9274dc984c66651
+SHA1 (patch-al) = 3751913f2e7f1e530db9b2f6e762bdda314fd4fd
diff --git a/inn/files/innd.sh b/inn/files/innd.sh
new file mode 100644
index 0000000000..805fa71470
--- /dev/null
+++ b/inn/files/innd.sh
@@ -0,0 +1,78 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: innd.sh,v 1.18 2011/10/07 22:37:05 shattered Exp $
+#
+# PROVIDE: inn
+# REQUIRE: DAEMON
+# KEYWORD: shutdown
+
+if [ -d @INN_DATA_DIR@/etc ] ; then
+	echo ""
+	echo "WARNING WARNING WARNING WARNING WARNING WARNING WARNING"
+	echo ""
+	echo "WARNING: old inn config directory @INN_DATA_DIR@/etc found"
+	echo "WARNING: please move your config to @PREFIX@/etc/inn"
+	echo "WARNING: before starting your new inn install"
+	echo ""
+	echo "WARNING WARNING WARNING WARNING WARNING WARNING WARNING"
+	echo ""
+	sleep 120
+fi
+
+if [ -x @INN_PATHBIN@/rc.news -a -s @INN_DATA_DIR@/db/active ]
+then
+	if [ ! -d @PREFIX@/etc/nntp ]
+	then
+		mkdir @PREFIX@/etc/nntp
+	fi
+
+	if [ ! -f @PREFIX@/etc/nntp/server ]
+	then
+		hostname >@PREFIX@/etc/nntp/server
+	fi
+
+	if [ ! -f @PREFIX@/etc/nntp/domainname ]
+	then
+		(set - X `grep ^fromhost: @PKG_SYSCONFDIR@/inn.conf`
+		if [ $# -eq 3 ]
+		then
+			echo $3 >@PREFIX@/etc/nntp/domainname
+		fi)
+	fi
+
+	if [ -f @INN_DATA_DIR@/db/history -a \
+		! -s @INN_DATA_DIR@/db/history ]
+	then
+		@INN_PATHBIN@/makedbz -i -o -s 10000
+	fi
+
+	if [ $# -eq 0 ]
+	then
+		echo -n ' innd'
+		su -m news -c "@INN_PATHBIN@/rc.news start" >/dev/null
+		exit 0
+	fi
+
+	case "$1" in
+	start )
+		echo "Starting INN."
+		su -m news -c "@INN_PATHBIN@/rc.news $1" >/dev/null
+		exit 0
+		;;
+	stop )
+		su -m news -c "@INN_PATHBIN@/rc.news $1"
+		exit 0
+		;;
+	restart )
+		$0 stop
+		sleep 5
+		exec $0 start
+		;;
+	* )
+		echo "Usage: $0 (start|stop|restart)"
+		exit 1
+		;;
+	esac
+fi
+
+exit 0
diff --git a/inn/options.mk b/inn/options.mk
new file mode 100644
index 0000000000..92ffe170fb
--- /dev/null
+++ b/inn/options.mk
@@ -0,0 +1,76 @@
+# $NetBSD$
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.inn
+PKG_SUPPORTED_OPTIONS=	perl python uucp canlock kerberos gnupg2
+PKG_SUGGESTED_OPTIONS=	perl canlock gnupg2
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=		kerberos
+
+###
+### uucp support (requires a group uucp to exist)
+###
+.if !empty(PKG_OPTIONS:Muucp)
+PKG_GROUPS_VARS+=	UUCP_GROUP
+PKG_GROUPS+=		${UUCP_GROUP}
+
+CONFIGURE_ARGS+=	--enable-uucp-rnews
+.else
+CONFIGURE_ARGS+=	--disable-uucp-rnews
+.endif
+
+###
+### perl support for INN
+###
+.if !empty(PKG_OPTIONS:Mperl)
+CONFIGURE_ARGS+=	--with-perl
+CONFIGURE_ENV+=		_PATH_PERL=${PERL5:Q}
+
+.include "../../lang/perl5/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-perl
+.endif
+
+###
+### Python support for INN
+###
+.if !empty(PKG_OPTIONS:Mpython)
+CONFIGURE_ARGS+=	--with-python
+CONFIGURE_ENV+=		_PATH_PYTHON=${PYTHONBIN:Q}
+
+.include "../../lang/python/application.mk"
+.endif
+
+###
+### canlock support for INN
+###
+.if !empty(PKG_OPTIONS:Mcanlock)
+BUILDLINK_API_DEPENDS.libcanlock+=libcanlock>=3.3.0
+.  include "../../news/libcanlock/buildlink3.mk"
+
+CONFIGURE_ARGS+=	--with-canlock
+.else
+CONFIGURE_ARGS+=	--without-canlock
+.endif
+
+###
+### kerberos support for INN
+###
+.if !empty(PKG_OPTIONS:Mkerberos)
+.  include "../../mk/krb5.buildlink3.mk"
+
+PLIST.kerberos=		yes
+CONFIGURE_ARGS+=	--with-krb5
+.else
+CONFIGURE_ARGS+=	--without-krb5
+.endif
+
+###
+### pick either gnupg2 or gnupg
+###
+.if !empty(PKG_OPTIONS:Mgnupg2)
+DEPENDS+=		gnupg2-[0-9]*:../../security/gnupg2
+.else
+DEPENDS+=		gnupg-[0-9]*:../../security/gnupg
+.endif
diff --git a/inn/patches/patch-aa b/inn/patches/patch-aa
new file mode 100644
index 0000000000..fadf6c1753
--- /dev/null
+++ b/inn/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.13 2014/08/03 17:33:34 spz Exp $
+
+--- configure.orig	2014-05-17 08:24:49.000000000 +0000
++++ configure
+@@ -13018,7 +13018,7 @@ else
+   RANLIB="$ac_cv_prog_RANLIB"
+ fi
+ 
+-for ac_prog in 'bison -y' byacc
++for ac_prog in 'bison -y' byacc yacc
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
diff --git a/inn/patches/patch-ab b/inn/patches/patch-ab
new file mode 100644
index 0000000000..01a7895003
--- /dev/null
+++ b/inn/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.11 2014/08/03 17:33:34 spz Exp $
+
+--- scripts/news.daily.in.orig	2014-05-17 08:24:49.000000000 +0000
++++ scripts/news.daily.in
+@@ -276,6 +276,10 @@ fi
+ 
+ cd ${PATHETC}
+ 
++## Unlimit
++ulimit -d `ulimit -H -d`
++ulimit -n `ulimit -H -n`
++
+ ##  Show the status of the news system.
+ ${DOSTAT} && {
+     ${INNSTAT}
diff --git a/inn/patches/patch-ac b/inn/patches/patch-ac
new file mode 100644
index 0000000000..32ba72d0b0
--- /dev/null
+++ b/inn/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.13 2022/04/16 11:44:53 spz Exp $
+
+--- Makefile.global.in.orig	2014-05-17 08:24:49.000000000 +0000
++++ Makefile.global.in
+@@ -340,7 +340,7 @@ INSTALL		= $(top)/support/install-sh -c
+ ##  files like active and newsgroups that should have the same permissions as
+ ##  article files.
+ 
+-BACKUP_OPTION	= -S .OLD
++#BACKUP_OPTION	= -S .OLD
+ 
+ LI_SPRI		= $(LIBTOOLINST) $(INSTALL) -o root -g $(RUNASGROUP) -m 4550 $(BACKUP_OPTION)
+ LI_XPRI		= $(LIBTOOLINST) $(INSTALL) $(OWNER) -m 0550 $(BACKUP_OPTION)
diff --git a/inn/patches/patch-ad b/inn/patches/patch-ad
new file mode 100644
index 0000000000..805b17ccff
--- /dev/null
+++ b/inn/patches/patch-ad
@@ -0,0 +1,14 @@
+$NetBSD: patch-ad,v 1.8 2014/08/03 17:33:34 spz Exp $
+
+--- scripts/rc.news.in.orig	2014-05-17 08:24:49.000000000 +0000
++++ scripts/rc.news.in
+@@ -77,6 +77,9 @@ Xstop)
+ ;;
+ esac
+ 
++## Unlimit
++ulimit -n `ulimit -H -n`
++
+ ##  Pick ${INND} or ${INNDSTART}
+ WHAT=${INND}
+ 
diff --git a/inn/patches/patch-ag b/inn/patches/patch-ag
new file mode 100644
index 0000000000..a888d2e59e
--- /dev/null
+++ b/inn/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.13 2014/08/03 17:33:34 spz Exp $
+
+--- control/pgpverify.in.orig	2014-05-17 08:24:49.000000000 +0000
++++ control/pgpverify.in
+@@ -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.
+-$pgp = '/usr/local/bin/pgp';
++# $pgp = '/usr/local/bin/pgp';
+ 
+ # 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
diff --git a/inn/patches/patch-ah b/inn/patches/patch-ah
new file mode 100644
index 0000000000..8a41b00ea0
--- /dev/null
+++ b/inn/patches/patch-ah
@@ -0,0 +1,24 @@
+$NetBSD: patch-ah,v 1.17 2017/05/20 06:53:05 spz Exp $
+
+--- site/Makefile.orig	2016-11-27 14:03:42.000000000 +0000
++++ site/Makefile
+@@ -75,7 +75,8 @@ REST		= \
+ 
+ ALL		= $(REST)
+ 
+-REST_INSTALLED	= \
++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	= $(REST_INSTALLED)
+ 
+-SPECIAL		= $D$(PATH_ACTIVE) $D$(PATH_ACTIVE_TIMES) \
++SPECIAL		=
++NOTUSED2	= $D$(PATH_ACTIVE) $D$(PATH_ACTIVE_TIMES) \
+ 		$D$(PATH_NEWSGROUPS) $D$(PATH_HISTORY)
+ 
+ ##  Get new versions of everything from samples directory.
diff --git a/inn/patches/patch-ak b/inn/patches/patch-ak
new file mode 100644
index 0000000000..4a9c32b1ce
--- /dev/null
+++ b/inn/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.3 2014/08/03 17:33:34 spz Exp $
+
+--- 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@";
+ 
+ ##  Then, process the variables provided by innconfval.
+ my @INNCONFVAR = ();
+-my @values = `${exec_prefix}/bin/innconfval -p`;
++my @values = `@bindir@/innconfval -p`;
+ foreach my $line (@values) {
+   eval 'our '.$line;
+   if ($line =~ /^(.*?) = /m) {
diff --git a/inn/patches/patch-al b/inn/patches/patch-al
new file mode 100644
index 0000000000..39c6460f0d
--- /dev/null
+++ b/inn/patches/patch-al
@@ -0,0 +1,15 @@
+$NetBSD: patch-al,v 1.2 2014/08/03 17:33:34 spz Exp $
+
+--- lib/fdlimit.c.orig	2014-05-17 08:24:49.000000000 +0000
++++ lib/fdlimit.c
+@@ -59,6 +59,10 @@ setfdlimit(unsigned int limit)
+     }
+ #endif
+ 
++    /* will we mind if the limit is higher? I think not. */
++    if (rl.rlim_cur >= limit)
++	return 0;
++
+     rl.rlim_cur = limit;
+     if (limit > rl.rlim_max)
+         rl.rlim_max = limit;
Prev by Date: flnews-devel: Update to 1.2.0pre0
Next by Date: RigelEngine: update to RigelEngine-0.8.5
Previous by Thread: flnews-devel: Update to 1.2.0pre0
Next by Thread: RigelEngine: update to RigelEngine-0.8.5
Indexes:
Home | Main Index | Thread Index | Old Index