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 @@ -1,412 +1,413 @@ @owner news @group news @dir %%NEWSBASE%% %%CWDNEWSBASE%% bin/actmerge bin/actsync bin/actsyncd bin/archive @(root,,4550) bin/auth/passwd/ckpasswd %%KERBEROS%%bin/auth/passwd/auth_krb5 bin/auth/passwd/radius bin/auth/resolv/domain bin/auth/resolv/ident bin/batcher bin/buffchan bin/buffindexed_d bin/cnfsheadconf bin/cnfsstat bin/control/checkgroups.pl bin/control/ihave.pl bin/control/newgroup.pl bin/control/rmgroup.pl bin/control/sendme.pl bin/controlbatch bin/controlchan bin/convdate bin/ctlinnd bin/cvtbatch bin/delayer bin/docheckgroups bin/expire bin/expireover bin/expirerm bin/fastrm bin/filter/INN.py bin/filter/nnrpd.py @sample %%NEWSBASE%%/bin/filter/filter_innd.pl.sample @sample %%NEWSBASE%%/bin/filter/filter_innd.py.sample @sample %%NEWSBASE%%/bin/filter/filter_nnrpd.pl.sample @sample %%NEWSBASE%%/bin/filter/nnrpd_access.pl.sample @sample %%NEWSBASE%%/bin/filter/nnrpd_access.py.sample @sample %%NEWSBASE%%/bin/filter/nnrpd_auth.pl.sample @sample %%NEWSBASE%%/bin/filter/nnrpd_auth.py.sample @sample %%NEWSBASE%%/bin/filter/nnrpd_dynamic.py.sample @sample %%NEWSBASE%%/bin/filter/startup_innd.pl.sample bin/gencancel bin/getlist bin/grephistory bin/imapfeed @(,news,%%MODE_INEWS%%) bin/inews bin/inncheck bin/innconfval @(root,,4550) bin/innbind bin/innd bin/inndf bin/innfeed bin/innmail bin/innreport bin/innstat bin/innupgrade bin/innwatch bin/innxbatch bin/innxmit bin/mailpost bin/makedbz bin/makehistory bin/mod-active bin/news.daily bin/news2mail bin/ninpaths bin/nnrpd bin/nntpget bin/nntpsend bin/ovdb_init bin/ovdb_monitor bin/ovdb_server bin/ovdb_stat bin/overchan %%SQLITE%%bin/ovsqlite-server %%SQLITE%%bin/ovsqlite-util bin/perl-nocem bin/pgpverify bin/procbatch bin/prunehistory bin/pullnews bin/rc.news %%UUCP_RNEWS%%@(,uucp,4550) bin/rnews %%NO_UUCP_RNEWS%%bin/rnews bin/rnews.libexec/c7unbatch bin/rnews.libexec/decode bin/rnews.libexec/encode bin/rnews.libexec/bunbatch bin/rnews.libexec/gunbatch bin/scanlogs bin/scanspool bin/send-ihave bin/send-uucp bin/sendinpaths bin/sendxbatches bin/shlock bin/shrinkfile bin/simpleftp bin/sm bin/tally.control bin/tinyleaf bin/tdx-util bin/writelog doc/CONTRIBUTORS doc/GPL doc/HACKING doc/INSTALL doc/LICENSE doc/NEWS doc/README %%SNAPSHOT%%doc/README.snapshot doc/TODO doc/config-design doc/config-semantics doc/config-syntax doc/external-auth doc/history doc/history-innfeed doc/hook-perl doc/hook-python doc/sample-control 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 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/perl/INN/Config.pm lib/perl/INN/ovsqlite_client.pm lib/perl/INN/Utils/Shlock.pm lib/innreport_inn.pm lib/innreport-display.conf lib/innshellvars lib/innshellvars.pl lib/innshellvars.tcl lib/libinn.a lib/libinn.so lib/libinn.so.%%INNLIB%% lib/libinn.so.%%INNLIB_LONG%% lib/libinnhist.a lib/libinnhist.so lib/libinnhist.so.%%LIBVER%% lib/libinnhist.so.%%LIBVER_LONG%% lib/libinnstorage.a lib/libinnstorage.so lib/libinnstorage.so.%%LIBSTORAGEVER%% lib/libinnstorage.so.%%LIBSTORAGEVER_LONG%% @comment -------------------------------------------------------------- @cwd share/man/man1/convdate.1.gz share/man/man1/fastrm.1.gz share/man/man1/gencancel.1.gz share/man/man1/getlist.1.gz share/man/man1/grephistory.1.gz share/man/man1/inews.1.gz share/man/man1/innconfval.1.gz share/man/man1/innmail.1.gz share/man/man1/nntpget.1.gz share/man/man1/pgpverify.1.gz share/man/man1/pullnews.1.gz share/man/man1/rnews.1.gz share/man/man1/shrinkfile.1.gz share/man/man1/simpleftp.1.gz share/man/man3/INN::Config.3pm.gz share/man/man3/INN::Utils::Shlock.3pm.gz share/man/man3/INN::ovsqlite_client.3pm.gz share/man/man3/libinn_clientlib.3.gz share/man/man3/libinn_dbz.3.gz share/man/man3/libinn_inndcomm.3.gz share/man/man3/libinn_list.3.gz share/man/man3/libinn_qio.3.gz share/man/man3/libinn_tst.3.gz share/man/man3/libinn_uwildmat.3.gz share/man/man3/libinnauth.3.gz share/man/man3/libinnstorage.3.gz share/man/man3/libinn.3.gz share/man/man3/libinnhist.3.gz share/man/man5/active.5.gz share/man/man5/active.times.5.gz share/man/man5/buffindexed.conf.5.gz share/man/man5/control.ctl.5.gz share/man/man5/cycbuff.conf.5.gz share/man/man5/distrib.pats.5.gz share/man/man5/distributions.5.gz share/man/man5/expire.ctl.5.gz share/man/man5/history.5.gz share/man/man5/incoming.conf.5.gz share/man/man5/inn-radius.conf.5.gz share/man/man5/inn-secrets.conf.5.gz share/man/man5/inn.conf.5.gz share/man/man5/innfeed.conf.5.gz share/man/man5/innreport.conf.5.gz share/man/man5/innwatch.ctl.5.gz share/man/man5/localgroups.5.gz share/man/man5/moderators.5.gz share/man/man5/motd.innd.5.gz share/man/man5/motd.news.5.gz share/man/man5/motd.nnrpd.5.gz share/man/man5/newsfeeds.5.gz share/man/man5/newsgroups.5.gz share/man/man5/newslog.5.gz share/man/man5/nnrpd.track.5.gz share/man/man5/nntpsend.ctl.5.gz share/man/man5/nocem.ctl.5.gz share/man/man5/ovdb.5.gz %%SQLITE%%share/man/man5/ovsqlite.5.gz share/man/man5/passwd.nntp.5.gz share/man/man5/readers.conf.5.gz share/man/man5/storage.conf.5.gz share/man/man5/subscriptions.5.gz share/man/man8/actsync.8.gz share/man/man8/actsyncd.8.gz share/man/man8/archive.8.gz %%KERBEROS%%share/man/man8/auth_krb5.8.gz share/man/man8/batcher.8.gz share/man/man8/buffchan.8.gz share/man/man8/ckpasswd.8.gz share/man/man8/cnfsheadconf.8.gz share/man/man8/cnfsstat.8.gz share/man/man8/controlchan.8.gz share/man/man8/ctlinnd.8.gz share/man/man8/cvtbatch.8.gz share/man/man8/delayer.8.gz share/man/man8/docheckgroups.8.gz share/man/man8/domain.8.gz share/man/man8/expire.8.gz share/man/man8/expireover.8.gz share/man/man8/expirerm.8.gz share/man/man8/ident.8.gz share/man/man8/imapfeed.8.gz share/man/man8/innbind.8.gz share/man/man8/inncheck.8.gz share/man/man8/innd.8.gz share/man/man8/inndf.8.gz share/man/man8/innfeed.8.gz share/man/man8/innreport.8.gz share/man/man8/innstat.8.gz share/man/man8/innupgrade.8.gz share/man/man8/innwatch.8.gz share/man/man8/innxbatch.8.gz share/man/man8/innxmit.8.gz share/man/man8/inpaths.8.gz share/man/man8/mailpost.8.gz share/man/man8/makedbz.8.gz share/man/man8/makehistory.8.gz share/man/man8/mod-active.8.gz share/man/man8/news.daily.8.gz share/man/man8/news2mail.8.gz share/man/man8/ninpaths.8.gz share/man/man8/nnrpd.8.gz share/man/man8/nntpsend.8.gz share/man/man8/ovdb_init.8.gz share/man/man8/ovdb_monitor.8.gz share/man/man8/ovdb_server.8.gz share/man/man8/ovdb_stat.8.gz %%SQLITE%%share/man/man8/ovsqlite-server.8.gz %%SQLITE%%share/man/man8/ovsqlite-util.8.gz share/man/man8/overchan.8.gz share/man/man8/perl-nocem.8.gz share/man/man8/procbatch.8.gz share/man/man8/prunehistory.8.gz share/man/man8/radius.8.gz share/man/man8/rc.news.8.gz share/man/man8/scanlogs.8.gz share/man/man8/scanspool.8.gz share/man/man8/send-ihave.8.gz share/man/man8/send-uucp.8.gz share/man/man8/sendinpaths.8.gz share/man/man8/sendxbatches.8.gz share/man/man8/shlock.8.gz share/man/man8/sm.8.gz share/man/man8/tally.control.8.gz share/man/man8/tdx-util.8.gz share/man/man8/tinyleaf.8.gz share/man/man8/writelog.8.gz @comment -------------------------------------------------------------- %%EXAMPLESDIR%%/actsync.cfg %%EXAMPLESDIR%%/actsync.ign %%EXAMPLESDIR%%/buffindexed.conf %%EXAMPLESDIR%%/control.ctl %%EXAMPLESDIR%%/control.ctl.local %%EXAMPLESDIR%%/cycbuff.conf %%EXAMPLESDIR%%/distrib.pats %%EXAMPLESDIR%%/distributions %%EXAMPLESDIR%%/expire.ctl %%EXAMPLESDIR%%/incoming.conf %%EXAMPLESDIR%%/inn-radius.conf %%EXAMPLESDIR%%/inn-secrets.conf %%EXAMPLESDIR%%/inn.conf %%EXAMPLESDIR%%/innfeed.conf %%EXAMPLESDIR%%/innreport.conf %%EXAMPLESDIR%%/innshellvars.local %%EXAMPLESDIR%%/innshellvars.pl.local %%EXAMPLESDIR%%/innshellvars.tcl.local %%EXAMPLESDIR%%/innwatch.ctl %%EXAMPLESDIR%%/localgroups %%EXAMPLESDIR%%/moderators %%EXAMPLESDIR%%/motd.innd.sample %%EXAMPLESDIR%%/motd.nnrpd.sample %%EXAMPLESDIR%%/news2mail.cf %%EXAMPLESDIR%%/newsfeeds %%EXAMPLESDIR%%/nnrpd.track %%EXAMPLESDIR%%/nntpsend.ctl %%EXAMPLESDIR%%/nocem.ctl %%EXAMPLESDIR%%/ovdb.conf %%SQLITE%%%%EXAMPLESDIR%%/ovsqlite.conf %%EXAMPLESDIR%%/passwd.nntp %%EXAMPLESDIR%%/readers.conf %%EXAMPLESDIR%%/send-uucp.cf %%EXAMPLESDIR%%/storage.conf %%EXAMPLESDIR%%/subscriptions @dir %%EXAMPLESDIR%%/db @comment -------------------------------------------------------------- @sample %%DBDIR%%/active.sample @sample %%DBDIR%%/active.times.sample @sample %%DBDIR%%/history.sample @sample %%DBDIR%%/newsgroups.sample @comment -------------------------------------------------------------- @sample %%DBDIR%%/history.dir.sample %%WITHOUT_TAGGED_HASH%%@sample %%DBDIR%%/history.hash.sample %%WITHOUT_TAGGED_HASH%%@sample %%DBDIR%%/history.index.sample %%WITH_TAGGED_HASH%%@sample %%DBDIR%%/history.pag.sample @sample %%CONFDIR%%/actsync.cfg.sample @sample %%CONFDIR%%/actsync.ign.sample @sample %%CONFDIR%%/buffindexed.conf.sample @sample %%CONFDIR%%/control.ctl.local.sample @sample %%CONFDIR%%/control.ctl.sample @sample %%CONFDIR%%/cycbuff.conf.sample @sample %%CONFDIR%%/distrib.pats.sample @sample %%CONFDIR%%/distributions.sample @sample %%CONFDIR%%/expire.ctl.sample @sample %%CONFDIR%%/incoming.conf.sample @sample %%CONFDIR%%/inn-radius.conf.sample @sample %%CONFDIR%%/inn-secrets.conf.sample @sample %%CONFDIR%%/inn.conf.sample @sample %%CONFDIR%%/innfeed.conf.sample @sample %%CONFDIR%%/innreport.conf.sample @sample %%CONFDIR%%/innshellvars.local.sample @sample %%CONFDIR%%/innshellvars.pl.local.sample @sample %%CONFDIR%%/innshellvars.tcl.local.sample @sample %%CONFDIR%%/innwatch.ctl.sample @sample %%CONFDIR%%/localgroups.sample @sample %%CONFDIR%%/moderators.sample @sample %%CONFDIR%%/news2mail.cf.sample @sample %%CONFDIR%%/newsfeeds.sample @sample %%CONFDIR%%/nnrpd.track.sample @sample %%CONFDIR%%/nntpsend.ctl.sample @sample %%CONFDIR%%/nocem.ctl.sample @sample %%CONFDIR%%/ovdb.conf.sample %%SQLITE%%@sample %%CONFDIR%%/ovsqlite.conf.sample @sample %%CONFDIR%%/passwd.nntp.sample @sample %%CONFDIR%%/readers.conf.sample @sample %%CONFDIR%%/send-uucp.cf.sample @sample %%CONFDIR%%/storage.conf.sample @sample %%CONFDIR%%/subscriptions.sample @comment -------------------------------------------------------------- @cwd / @dir %%TMPDIR%% @dir %%SHAREDIR%% @dir %%NEWSSPOOL%%/overview @dir %%NEWSSPOOL%%/outgoing @dir %%NEWSSPOOL%%/innfeed @dir %%NEWSSPOOL%%/incoming/bad @dir %%NEWSSPOOL%%/incoming @dir %%NEWSSPOOL%%/articles @dir %%NEWSSPOOL%%/archive @dir %%NEWSSPOOL%% @dir %%RUNDIR%% @dir %%DBDIR%% @dir %%LOGDIR%%/OLD @dir %%LOGDIR%% diff --git a/news/inn/Makefile b/news/inn/Makefile index 2eb84d393911..705b4d7e1998 100644 --- a/news/inn/Makefile +++ b/news/inn/Makefile @@ -1,226 +1,241 @@ PORTNAME?= inn PORTVERSION?= 2.7.3 PORTREVISION?= 1 CATEGORIES= news MASTER_SITES= ISC MASTER_SITE_SUBDIR?= ${PORTNAME} MAINTAINER= kbowling@FreeBSD.org COMMENT= InterNetNews -- the Internet meets Netnews WWW= https://www.eyrie.org/~eagle/software/inn/ LICENSE= GPLv2 ISCL LICENSE_COMB= multi LICENSE_FILE_ISCL= ${WRKSRC}/LICENSE BUILD_DEPENDS= p5-GD>=0:graphics/p5-GD \ p5-MIME-Tools>=0:mail/p5-MIME-Tools RUN_DEPENDS:= ${BUILD_DEPENDS} USES= cpe gmake libtool perl5 uidfix CPE_VENDOR= isc USE_RC_SUBR= innd .ifnmake portclippy VARBASE?= /var .endif .include "Makefile.layout" GNU_CONFIGURE= yes GNU_CONFIGURE_PREFIX= ${INN_NEWSBASE} # Point to base system mailwrapper to avoid configure failure in jails CONFIGURE_ARGS+= --datarootdir=${INN_SHAREDIR} \ --sysconfdir=${INN_CONFDIR} \ --with-db-dir=${INN_DBDIR} \ --with-log-dir=${INN_LOGDIR} \ --with-perl \ --with-run-dir=${INN_RUNDIR} \ --with-sendmail=/usr/sbin/sendmail \ --with-spool-dir=${INN_NEWSSPOOL} \ --with-tmp-dir=${INN_TMPDIR} CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} CONFIGURE_ENV+= ac_cv_prog_AWK="${AWK}" CONFLICTS?= inn-current SUB_FILES= pkg-install SUB_LIST+= EGDIR="${EXAMPLESDIR:C,^${PREFIX},\\$\\${PREFIX},}" INNLIB_LONG?= 9.0.2 LIBVER_LONG?= 3.0.9 LIBSTORAGEVER_LONG?= 3.1.3 CONFIG_FILES+= actsync.cfg actsync.ign buffindexed.conf control.ctl \ control.ctl.local cycbuff.conf distrib.pats distributions \ expire.ctl inn-radius.conf inn-secrets.conf incoming.conf \ inn.conf innfeed.conf innreport.conf innshellvars.local \ innshellvars.pl.local innshellvars.tcl.local innwatch.ctl \ localgroups moderators news2mail.cf newsfeeds nocem.ctl \ nnrpd.track nntpsend.ctl ovdb.conf passwd.nntp readers.conf \ send-uucp.cf storage.conf subscriptions .if ${BRANCH:U} == 2.8 PLIST_SUB+= SNAPSHOT="" .else PLIST_SUB+= SNAPSHOT="@comment " .endif PLIST_SUB+= ETCFILES="${CONFIG_FILES}" \ INNLIB=${INNLIB_LONG:R:R} \ INNLIB_LONG=${INNLIB_LONG} \ LIBSTORAGEVER=${LIBSTORAGEVER_LONG:R:R} \ LIBSTORAGEVER_LONG=${LIBSTORAGEVER_LONG} \ LIBVER=${LIBVER_LONG:R:R} \ LIBVER_LONG=${LIBVER_LONG} PORTDOCS= CONTRIBUTORS HACKING INSTALL LICENSE MANIFEST NEWS README TODO OPTIONS_DEFINE= BERKELEYDB BLOCKLISTD DOCS EXAMPLES GNUPG KERBEROS \ KEYWORDS LARGE_FILES OPENSSL PYTHON SASL SETGID_INEWS \ 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 LARGE_FILES_DESC= Support for files larger than 2GB OPENSSL_DESC= Enable OpenSSL (for NNTP over TLS/SSL support) PYTHON_DESC= Enable support for embedded Python SASL_DESC= Enable SASL (for imapfeed authentication) SETGID_INEWS_DESC= Enable posting articles locally for all users SQLITE_DESC= Enable SQLite (for ovsqlite overview method) TAGGED_HASH_DESC= Use tagged hash table for history UUCP_RNEWS_DESC= Install rnews suitable for use with net/freebsd-uucp BERKELEYDB_USES= bdb 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 .endif # Although pgpverify needs gpgv/gpgv2, # checking 'gpg' is the shortest way to check any version of GnuPG installed. GNUPG_BUILD_DEPENDS= gpg:security/gnupg GNUPG_RUN_DEPENDS= gpg:security/gnupg KERBEROS_USES= gssapi KERBEROS_CONFIGURE_ON= --with-krb5=${GSSAPIBASEDIR} KERBEROS_CONFIGURE_OFF= --without-krb5 KEYWORDS_CONFIGURE_ENABLE= keywords LARGE_FILES_PREVENTS= TAGGED_HASH LARGE_FILES_PREVENTS_MSG= cannot be compiled with both LARGE_FILES and \ TAGGED_HASH LARGE_FILES_CONFIGURE_ENABLE= largefiles OPENSSL_USES= ssl OPENSSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE} PYTHON_USES= gettext-runtime python PYTHON_CONFIGURE_ON= --with-python SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 SASL_CONFIGURE_ON= --with-sasl=${LOCALBASE} SETGID_INEWS_CONFIGURE_ENABLE= setgid-inews SETGID_INEWS_PLIST_SUB= MODE_INEWS="2555" SETGID_INEWS_PLIST_SUB_OFF= MODE_INEWS="" SQLITE_USES= sqlite SQLITE_CONFIGURE_ON= --with-sqlite3=${LOCALBASE} SQLITE_CONFIGURE_OFF= --without-sqlite3 SQLITE_VARS= CONFIG_FILES+=ovsqlite.conf TAGGED_HASH_CONFIGURE_ENABLE= tagged-hash TAGGED_HASH_SUB_LIST= DBZ_FILES="dir pag" TAGGED_HASH_SUB_LIST_OFF= DBZ_FILES="dir hash index" TAGGED_HASH_PLIST_SUB= WITH_TAGGED_HASH="" \ WITHOUT_TAGGED_HASH="@comment " TAGGED_HASH_PLIST_SUB_OFF= WITH_TAGGED_HASH="@comment " \ WITHOUT_TAGGED_HASH="" 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 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 .if ${PORT_OPTIONS:MBERKELEYDB} @${REINPLACE_CMD} -e 's!-ldb!-ldb-${BDB_VER}!' ${WRKSRC}/configure .endif .if ${BRANCH:U} == 2.8 . if ${OPSYS} == FreeBSD && ${OSVERSION} < 1500000 @${FIND} ${WRKSRC} -type f -exec ${SED} -i '' \ -e 's/BLOCKLIST/BLACKLIST/g' \ -e 's/Blocklist/Blacklist/g' \ -e 's/blocklist/blacklist/g' {} + . endif .else . if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1500000 @${FIND} ${WRKSRC} -type f -exec ${SED} -i '' \ -e 's/BLACKLIST/BLOCKLIST/g' \ -e 's/Blacklist/Blocklist/g' \ -e 's/blacklist/blocklist/g' {} + . endif .endif pre-install: @${MKDIR} ${STAGEDIR}${INN_DBDIR} \ ${STAGEDIR}${EXAMPLESDIR} \ ${STAGEDIR}${EXAMPLESDIR}/db @${REINPLACE_CMD} -e '/^RUNASUSER *=/s/=.*/= ${UID}/' \ -e '/^RUNASGROUP *=/s/=.*/= ${GID}/' \ -e '/^RNEWSGROUP *=/s/=.*/= ${GID}/' \ ${WRKSRC}/Makefile.global post-build: @${FIND} ${WRKSRC} -name "inn.conf" \ | ${XARGS} ${REINPLACE_CMD} -e 's/^pathhost:.*/pathhost: host.example.com/' post-install: ${FIND} ${STAGEDIR}${INN_NEWSBASE} -type f \ \( -perm +111 -o -name '*.so.*' \) ! -name '*.a' \ -exec ${STRIP_CMD} {} + 2>/dev/null || ${TRUE} ${MKDIR} ${STAGEDIR}${INN_NEWSSPOOL} ${MKDIR} ${STAGEDIR}${INN_CONFDIR} .for FILE in ${CONFIG_FILES} ${CP} -p ${STAGEDIR}${EXAMPLESDIR}/${FILE} ${STAGEDIR}${INN_CONFDIR}/${FILE}.sample .endfor ${MKDIR} ${STAGEDIR}${INN_DBDIR} .for FILE in active active.times history newsgroups ${MV} ${STAGEDIR}${INN_DBDIR}/${FILE} \ ${STAGEDIR}${INN_DBDIR}/${FILE}.sample .endfor ${TOUCH} ${STAGEDIR}${INN_DBDIR}/history.dir.sample .if ${PORT_OPTIONS:MTAGGED_HASH} ${TOUCH} ${STAGEDIR}${INN_DBDIR}/history.pag.sample .else ${TOUCH} ${STAGEDIR}${INN_DBDIR}/history.hash.sample ${TOUCH} ${STAGEDIR}${INN_DBDIR}/history.index.sample .endif .for FILE in filter_innd.pl filter_innd.py filter_nnrpd.pl nnrpd_access.pl \ nnrpd_access.py nnrpd_auth.pl nnrpd_auth.py nnrpd_dynamic.py \ startup_innd.pl ${MV} ${STAGEDIR}${INN_NEWSBASE}/bin/filter/${FILE} \ ${STAGEDIR}${INN_NEWSBASE}/bin/filter/${FILE}.sample .endfor ${MKDIR} ${STAGEDIR}${DOCSDIR} .for FILE in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR} .endfor .include