4 files changed, 278 insertions, 2 deletions

diff --git a/news/inn-current/distinfo b/news/inn-current/distinfo
index 4206c6415897..87308d5595d9 100644
--- a/news/inn-current/distinfo
+++ b/news/inn-current/distinfo
@@ -1,3 +1,11 @@
-TIMESTAMP = 1777796549
+TIMESTAMP = 1778137220
 SHA256 (inn-2.8-20260419.tar.gz) = 6c5ac86d213445f656d50483e68adfeaf2a9cf35bece5c90acfc7405a0d7df4d
 SIZE (inn-2.8-20260419.tar.gz) = 2835406
+SHA256 (cf4a8ecac2f3149505f9a55cdd95383e9b3f725b.patch) = 2f5191a6f69cbe7e700da982239f52174abf0813a33751246fe067ed4bf4b571
+SIZE (cf4a8ecac2f3149505f9a55cdd95383e9b3f725b.patch) = 5366
+SHA256 (0d84255b417c89219225f0a034fd4c068d9749a0.patch) = 1b9c03c1155d5d82ce181c23d68c901e48f3de35ff78a7a3b1dc1e764b276ad0
+SIZE (0d84255b417c89219225f0a034fd4c068d9749a0.patch) = 77142
+SHA256 (93a36682f7ba9d013d07859882c2b8c501da249e.patch) = 1bbb3b8213754779a8c1947e8a065bff6089066e290c4b52b93bb2b8d678fe21
+SIZE (93a36682f7ba9d013d07859882c2b8c501da249e.patch) = 3577
+SHA256 (d0c379ee3f325f4a80dada6c3129c23496b1c83e.patch) = 33ab2f245e198c5999739959d17d3a16ba7c1086b4671568bdf52374780c0db9
+SIZE (d0c379ee3f325f4a80dada6c3129c23496b1c83e.patch) = 43317
diff --git a/news/inn-current/files/gitignore b/news/inn-current/files/gitignore
new file mode 100644
index 000000000000..4fc5e98b04a9
--- /dev/null
+++ b/news/inn-current/files/gitignore
@@ -0,0 +1,252 @@
+# Ignore list for Git.  -*- conf -*-
+
+/config.cache
+/config.log
+/config.status
+/config.status.lineno
+/configure
+/configure.lineno
+/HACKING
+/inn-*
+/INSTALL
+/libtool
+/LIST.*
+/Makefile.global
+/NEWS
+/README
+/README.*
+/snapshot.log
+/authprogs/auth_krb5
+/authprogs/ckpasswd
+/authprogs/domain
+/authprogs/ident
+/authprogs/radius
+/autom4te.cache/
+/backends/actmerge
+/backends/actsync
+/backends/actsyncd
+/backends/archive
+/backends/batcher
+/backends/buffchan
+/backends/cvtbatch
+/backends/delayer
+/backends/innbind
+/backends/inndf
+/backends/innxbatch
+/backends/innxmit
+/backends/mod-active
+/backends/news2mail
+/backends/ninpaths
+/backends/nntpget
+/backends/nntpsend
+/backends/overchan
+/backends/send-ihave
+/backends/send-nntp
+/backends/send-uucp
+/backends/sendinpaths
+/backends/sendxbatches
+/backends/shlock
+/backends/shrinkfile
+/contrib/analyze-traffic
+/contrib/archivegz
+/contrib/auth_pass
+/contrib/authmysql
+/contrib/backlogstat
+/contrib/cleannewsgroups
+/contrib/count_overview
+/contrib/expirectl
+/contrib/findreadgroups
+/contrib/fixhist
+/contrib/innconfcheck
+/contrib/makeexpctl
+/contrib/makestorconf
+/contrib/mkbuf
+/contrib/mlockfile
+/contrib/newsresp
+/contrib/nnrp.access2readers.conf
+/contrib/ovsqlite-dump
+/contrib/ovsqlite-undump
+/contrib/pullart
+/contrib/reset-cnfs
+/contrib/respool
+/contrib/stathist
+/contrib/thdexpire
+/contrib/tunefeed
+/control/controlbatch
+/control/controlchan
+/control/docheckgroups
+/control/gencancel
+/control/perl-nocem
+/control/pgpverify
+/doc/checklist
+/doc/external-auth
+/doc/hook-perl
+/doc/hook-python
+# Assume we no longer add rough man pages without POD,
+# so that there is no need to exclude existing man pages
+# waiting to be converted to POD.
+/doc/man/*.1
+/doc/man/*.3
+/doc/man/*.3pm
+/doc/man/*.5
+/doc/man/*.8
+/expire/convdate
+/expire/expire
+/expire/expireover
+/expire/expirerm
+/expire/fastrm
+/expire/grephistory
+/expire/makedbz
+/expire/makehistory
+/expire/prunehistory
+/frontends/bunbatch
+/frontends/c7unbatch
+/frontends/cnfsheadconf
+/frontends/cnfsstat
+/frontends/ctlinnd
+/frontends/decode
+/frontends/encode
+/frontends/feedone
+/frontends/getlist
+/frontends/gunbatch
+/frontends/inews
+/frontends/innconfval
+/frontends/mailpost
+/frontends/ovdb_init
+/frontends/ovdb_monitor
+/frontends/ovdb_server
+/frontends/ovdb_stat
+/frontends/pullnews
+/frontends/rnews
+/frontends/scanspool
+/frontends/sm
+/frontends/sys2nf
+/history/Make.methods
+/history/buildconfig
+/history/hismethods.c
+/history/hismethods.h
+/include/config.h
+/include/config.h.in
+/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/system.h
+/include/inn/version.h
+/innd/innd
+/innd/tinyleaf
+/innfeed/config_l.c
+/innfeed/config_y.c
+/innfeed/config_y.h
+/innfeed/imapfeed
+/innfeed/innfeed
+/innfeed/procbatch
+/nnrpd/nnrpd
+/perl/INN/Config.pm
+/perl/INN/Utils/Shlock.pm
+/samples/buffindexed.conf
+/samples/inn.conf
+/samples/innreport.conf
+/samples/newsfeeds
+/samples/nnrpd_access.pl
+/samples/nnrpd_auth.pl
+/scripts/inncheck
+/scripts/innmail
+/scripts/innreport
+/scripts/innshellvars
+/scripts/innshellvars.pl
+/scripts/innshellvars.tcl
+/scripts/innstat
+/scripts/innupgrade
+/scripts/innwatch
+/scripts/news.daily
+/scripts/rc.news
+/scripts/scanlogs
+/scripts/simpleftp
+/scripts/tally.control
+/scripts/writelog
+/site/*
+!/site/Makefile
+!/site/getsafe.sh
+/storage/Make.methods
+/storage/buildconfig
+/storage/methods.c
+/storage/methods.h
+/storage/ovmethods.c
+/storage/ovmethods.h
+/storage/buffindexed/buffindexed_d
+/storage/ovsqlite/ovsqlite-server
+/storage/ovsqlite/ovsqlite-util
+/storage/ovsqlite/sql-init.c
+/storage/ovsqlite/sql-init.h
+/storage/ovsqlite/sql-main.c
+/storage/ovsqlite/sql-main.h
+/storage/ovsqlite/sqlite-helper-gen
+/storage/tradindexed/tdx-util
+/support/fixconfig
+/support/fixscript
+/tests/runtests
+/tests/authprogs/ident.t
+/tests/clients/server-list
+/tests/docs/pod.t
+/tests/innd/artparse.t
+/tests/innd/chan.t
+/tests/lib/artnumber.t
+/tests/lib/asprintf.t
+/tests/lib/buffer.t
+/tests/lib/canlock.t
+/tests/lib/concat.t
+/tests/lib/conffile.t
+/tests/lib/confparse.t
+/tests/lib/daemon.t
+/tests/lib/date.t
+/tests/lib/dispatch.t
+/tests/lib/fdflag.t
+/tests/lib/getaddrinfo.t
+/tests/lib/getnameinfo.t
+/tests/lib/hash.t
+/tests/lib/hashtab.t
+/tests/lib/headers.t
+/tests/lib/hex.t
+/tests/lib/inet_aton.t
+/tests/lib/inet_ntoa.t
+/tests/lib/inet_ntop.t
+/tests/lib/innconf.t
+/tests/lib/list.t
+/tests/lib/md5.t
+/tests/lib/messageid.t
+/tests/lib/messages.t
+/tests/lib/mkstemp.t
+/tests/lib/pread.t
+/tests/lib/pwrite.t
+/tests/lib/qio.t
+/tests/lib/reallocarray.t
+/tests/lib/setenv.t
+/tests/lib/snprintf.t
+/tests/lib/strlcat.t
+/tests/lib/strlcpy.t
+/tests/lib/tst.t
+/tests/lib/uwildmat.t
+/tests/lib/vector.t
+/tests/lib/wire.t
+/tests/lib/xmalloc
+/tests/lib/xwrite.t
+/tests/lib/network/addr-ipv4.t
+/tests/lib/network/addr-ipv6.t
+/tests/lib/network/client.t
+/tests/lib/network/server.t
+/tests/nnrpd/auth-ext.t
+/tests/overview/api.t
+/tests/overview/buffindexed.t
+/tests/overview/tradindexed.t
+/tests/overview/xref.t
+/tests/perl/minimum-version.t
+/tests/util/innbind.t
+**/.libs/
+**/.pure/
+*.a
+*.la
+*.lo
+*.o
diff --git a/news/inn-current/pkg-plist b/news/inn-current/pkg-plist
index c08382a90d97..74391c16f80f 100644
--- a/news/inn-current/pkg-plist
+++ b/news/inn-current/pkg-plist
@@ -127,6 +127,7 @@ http/innreport.css
 include/inn/buffer.h
 include/inn/concat.h
 include/inn/confparse.h
+%%EXPERIMENTAL%%include/inn/bloom.h
 include/inn/dbz.h
 include/inn/dispatch.h
 include/inn/fdflag.h
diff --git a/news/inn/Makefile b/news/inn/Makefile
index 2eb84d393911..705b4d7e1998 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -80,10 +80,14 @@ OPTIONS_DEFINE=		BERKELEYDB BLOCKLISTD DOCS EXAMPLES GNUPG KERBEROS \
 			SQLITE TAGGED_HASH UUCP_RNEWS
 OPTIONS_DEFAULT=	BERKELEYDB BLOCKLISTD GNUPG KEYWORDS LARGE_FILES \
 			OPENSSL PYTHON SETGID_INEWS SQLITE UUCP_RNEWS
+.if ${BRANCH:U} == 2.8
+OPTIONS_DEFINE+=	EXPERIMENTAL
+.endif
 OPTIONS_SUB=		yes
 
 BERKELEYDB_DESC=	Enable BerkeleyDB (for ovdb overview method)
 BLOCKLISTD_DESC=	Enable blocklistd support
+EXPERIMENTAL_DESC=	Experimental upstream patches (ovsqlite, bloom filter)
 GNUPG_DESC=		GnuPG support (for pgpverify control message)
 KERBEROS_DESC=		Enable Kerberos v5 (for auth_krb5)
 KEYWORDS_DESC=		Automatic keyword generation support
@@ -101,7 +105,7 @@ BERKELEYDB_CONFIGURE_ON=	--with-bdb-include=${BDB_INCLUDE_DIR} \
 				--with-bdb-lib=${LOCALBASE}/lib \
 				--with-bdb=${LOCALBASE}
 
-.if ${BRANCH:U} == 2.8 && ${OSVERSION} >= 1500000
+.if ${BRANCH:U} == 2.8 && ${OSVERSION:U} >= 1500000
 BLOCKLISTD_CONFIGURE_WITH=	blocklist
 .else
 BLOCKLISTD_CONFIGURE_WITH=	blacklist
@@ -152,10 +156,21 @@ TAGGED_HASH_PLIST_SUB_OFF=	WITH_TAGGED_HASH="@comment " \
 UUCP_RNEWS_RUN_DEPENDS=		uucp:net/freebsd-uucp
 UUCP_RNEWS_CONFIGURE_ENABLE=	uucp-rnews
 
+EXPERIMENTAL_PATCH_SITES=	https://github.com/InterNetNews/inn/commit/
+EXPERIMENTAL_PATCHFILES=	cf4a8ecac2f3149505f9a55cdd95383e9b3f725b.patch:-p1 \
+				0d84255b417c89219225f0a034fd4c068d9749a0.patch:-p1 \
+				93a36682f7ba9d013d07859882c2b8c501da249e.patch:-p1 \
+				d0c379ee3f325f4a80dada6c3129c23496b1c83e.patch:-p1
+EXPERIMENTAL_PLIST_SUB=		EXPERIMENTAL=""
+EXPERIMENTAL_PLIST_SUB_OFF=	EXPERIMENTAL="@comment "
+
 .include <bsd.port.pre.mk>
 
 GID?=		${.MAKE.GID}
 
+post-extract-EXPERIMENTAL-on:
+	@${CP} ${PKGDIR}/files/gitignore ${WRKSRC}/.gitignore
+
 post-patch:
 	@${REINPLACE_CMD} -E 's!\$$[{(]PATHETC[})]!${EXAMPLESDIR}!g' \
 	                  ${WRKSRC}/site/Makefile