pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/news/inn



Module Name:    pkgsrc
Committed By:   spz
Date:           Sun Apr 30 14:58:59 UTC 2023

Modified Files:
        pkgsrc/news/inn: MESSAGE Makefile PLIST distinfo options.mk
        pkgsrc/news/inn/patches: patch-aa patch-ab patch-ac patch-ad patch-ag
            patch-ah patch-ak patch-al

Log Message:
update inn to 2.7.1
adding canlock option kudos micha@

upstream changelog:
Changes in 2.7.1 (2023-04-16)

    * Added a new *groupexactcount* parameter in readers.conf to force nnrpd
      to report the exact number of still existing articles in newsgroups
      instead of an estimated count.  When the estimated number of articles
      is strictly below *groupexactcount* (set to 5 by default), nnrpd now
      recounts them and reports the actual value (articles that have been
      cancelled or overwritten in self-expiring CNFS buffers may otherwise
      still be counted in the estimate).  News clients will then be directly
      aware of empty newsgroups; they would otherwise have tried to retrieve
      possible articles, to finally not show anything to the user.

    * Programs sending mails now include, when appropriate, an
      Auto-Submitted header field in the message headers (either set to
      "auto-generated" or "auto-replied", following the recommendation in
      RFC 3834).  Thanks to Harald Dunkel for this suggestion which will for
      instance help to avoid unnecessary vacation replies.

    * Added a new -a option to innmail to specify additional header fields
      to add in the headers of messages.  This is notably used to internally
      support the addition of the Auto-Submitted header field in outgoing
      mails.

    * Added new ovsqlite-util program to perform some basic consistency
      checks and dump operations on an overview database using the ovsqlite
      method.  More checks and features will be added in future releases.
      You'll need the "DBI" Perl module with the "DBD::SQLite" driver
      installed on your system to use this program.

    * Added TLS support in pullnews for connections to upstream servers
      configured in pullnews.marks, and to the downstream server in the
      existing -s flag.  A port can now also be specified for connections to
      upstream servers (it was already possible for the downstream server
      only).

    * Added a new -L option to pullnews to specify the largest wanted
      article size in bytes.  Articles whose size exceeds that value will no
      longer be downloaded by pullnews.

    * pullnews now detects a socket timeout while downloading articles from
      a remote peer.  The download gracefully stops, and another attempt can
      be automatically made according to the setting given with the -t flag.
      Thanks to Jesse Rehmer for the bug report.

    * Fixed the generation and the handling of storage tokens on wrapped
      CNFS buffers, thanks to bug reports from Kamil Jonca:

      * Duplicate entries were returned by makehistory on fully wrapped
        cyclic buffers (the first article of the cyclic buffer appeared
        twice in the output).

      * The first article of a fully wrapped cyclic buffer was removed too
        soon from history (expire wrongly thought its storage token was no
        longer existing after a wrap).

      * The first article of the previous cycle number of a cyclic buffer
        containing articles from two different cycle numbers was wrongly
        considered by makehistory to belong to the current cycle number.

    * innd no longer dies when a newsfeeds entry has an unexpected trailing
      whitespace.

    * The size of duplicated articles was counted twice in totals, average
      article sizes and graphs by innreport, when parsing innd checkpoints.
      Thanks to Hauke Lampe for the patch to count it only once.

    * Customizing the domain part of Message-IDs generated by nnrpd and the
      server name indicated in Injection-Info header fields is now easier:
      the *domain* parameter in the access blocks of readers.conf can be
      directly used (without needing to set *virtualhost* as it was
      previously the case).

    * If the *domain* parameter is set in inn.conf or in a readers.conf
      access block, and has invalid characters, or if the fully qualified
      domain name (FQDN) of the news server has invalid characters when
      *domain* is unset, a fatal error is now reported at startup.  It is a
      basic configuration error which otherwise leads to the generation of
      invalid article Message-IDs.

    * Improved the speed of article searches with HDR, LAST, NEXT, and XPAT
      commands when there is a (huge) gap in article numbers.  On newsgroups
      with several millions of consecutive missing articles (which is a rare
      situation), these commands could take several seconds to run.

    * Incoming articles in newsgroups that have exceeded the maximum number
      of articles they can contain (2^31-1) are now correctly rejected.  INN
      was otherwise happily accepting them but either numbers returned in
      NNTP responses were not right, or some news clients choked when
      receiving unexpected large article numbers.  (The current version of
      the NNTP protocol only allows article numbers up to 2^31-1.)

    * Fixed the renumbering of reported low water marks for empty newsgroups
      in active after overview expiration, when using the ovsqlite method.
      They were set to 1 for empty newsgroups whereas they were not supposed
      to decrease.  (These reported low water marks regained their expected
      values during the next overview expiration, provided that the
      newsgroup was no longer empty.)

    * The reported high water mark of empty newsgroups is now correctly set
      to one less than the reported low water mark in overview data.
      (Previously, the reported low water mark was set to one more than the
      reported high water mark.)

    * Fixed the output of the "ctlinnd feedinfo ''" command that was
      returning information only for the first site, and the output of the
      "ctlinnd name channel" command that was returning partial information
      for the requested channel.

    * The build of external programs which include inn/storage.h was failing
      because of the unexpected inclusion of config.h in one of the included
      headers.  Also, a few Autoconf results were not correctly made
      available to external programs.  This is now fixed.

    * Fixed the build on systems whose default shell does not completely
      meet the Posix standard.  A few build scripts were run with the
      default shell instead of the one found by Autoconf and afterwards used
      for INN.

    * Use standard daemon(3) C function, when available, to daemonize innd,
      nnrpd, ovdb_server and ovsqlite-server instead of an INN-specific
      function.

Upgrading from 2.6 to 2.7

    The following changes require your full attention because a manual
    intervention may be needed:

    * The *require_ssl* parameter in readers.conf has been renamed to
      *require_encryption* as it applies to any kind of encryption layers,
      including TLS and SASL security layers.  Since innupgrade only takes
      care of the change in the file named readers.conf, you will have to
      manually rename that parameter in configuration files for nnrpd with
      an alternate name.

    * The innreport.conf file in *pathetc* has been split into a general
      configuration file (innreport.conf itself) and a display configuration
      file (innreport-display.conf in *pathlib*).  If you made local changes
      in sections other than the *default* section in innreport.conf, and
      wish to keep them, then you need renaming the new
      innreport-display.conf file to another name in *pathlib*, setting this
      local file name in the new *display_conf_file* option in
      innreport.conf, and re-applying your local changes to that local
      display configuration file.

      As a matter of fact, the default display configuration file would
      otherwise be overwritten each time INN is updated.  Bug fixes or
      enhancements are made from time to time to the display configuration
      of innreport, and previously couldn't be automatically be merged in
      innreport.conf on update.  This new separate configuration file to
      parameterize the display will now permit an automatic update (if of
      course you use the default display configuration file).

    * A new inn-secrets.conf configuration file has been added in *pathetc*.
      The intent is that, from now on, new secrets used by INN are added to
      that file, and that all secrets currently stored in several other
      configuration files eventually move to that file.  Make sure it is
      properly created during the upgrade, and not world-readable.  It
      currently only stores the secrets used for the new Cancel-Lock
      functionality.

    * The -C flag given to innd to disable the execution of cancels has been
      deprecated and is no longer taken into account (an error message will
      be present in your logs if innd is started with it).  Instead, a new
      parameter has been added in inn.conf to tune the types of cancels innd
      should process.  If *docancels* is set to "require-auth", which is the
      default if INN has Cancel-Lock support, only articles originally
      protected by the Cancel-Lock authentication mechanism can be withdrawn
      by a valid authenticated cancel article or a valid authenticated
      supersede request.  Withdrawals of articles not originally protected
      by Cancel-Lock will not be executed.  See inn.conf(5) for more details
      about the different values of the new *docancels* parameter, and make
      sure to parameterize it according to your needs.

    * The *refusecybercancels* and *verifycancels* parameters have been
      removed from inn.conf.  The first was performing an inefficient and
      inexact check (that should be done, if wanted, in the special "ME"
      entry in newsfeeds, or even better, ask your peers not to feed you
      articles with "cyberspam" in the Path header field body); the second
      check performed on the newsgroups present in cancel articles was not
      useful in innd (this check is relevant to posting agents).

      The related lines in inn.conf will be commented by innupgrade during
      the upgrade.

    * The XBATCH command is no longer enabled by default in innd.  You'll
      have to explicitly enable that capability by setting the new *xbatch*
      parameter to true in incoming.conf for the peers sending you such
      compressed batches.

    * 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.  innupgrade will take care of the changes (inverting the
      boolean values, and commenting the lines with removed parameters).

    * filechan is no longer shipped with INN; it was just a simple version
      of buffchan.  All calls to "filechan" will be changed to "buffchan -u"
      (for its unbuffered mode) in newsfeeds by innupgrade.  If you have
      local scripts running filechan, you will have to manually take care of
      the change.

    * send-nntp is no longer shipped with INN.  If you have local scripts
      running it, you will have to manually adjust them to use nntpsend
      which basically does the same thing, better.  Or, even greater, use
      innfeed if that is possible.

    * Wrappers around old Perl and Python authentication and access hooks,
      pre-dating INN 2.4.0 and identifiable by the *nnrpperlauth* and
      *nnrppythonauth* parameters in inn.conf, are no longer shipped as
      samples in INN releases.  If not already done, you should either
      replace old hooks with new modern hooks or use the possibilities that
      readers.conf and regular authenticator and resolver programs offer.

    * 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.  External programs building or linking
      against them need a manual change.

    If you are upgrading from a version prior to INN 2.6, see also
    "Upgrading from 2.5 to 2.6".

Changes in 2.7.0 (2022-07-10)

    * 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 parameterized 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 generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/news/inn/MESSAGE
cvs rdiff -u -r1.137 -r1.138 pkgsrc/news/inn/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/news/inn/PLIST
cvs rdiff -u -r1.40 -r1.41 pkgsrc/news/inn/distinfo
cvs rdiff -u -r1.9 -r1.10 pkgsrc/news/inn/options.mk
cvs rdiff -u -r1.13 -r1.14 pkgsrc/news/inn/patches/patch-aa \
    pkgsrc/news/inn/patches/patch-ac pkgsrc/news/inn/patches/patch-ag
cvs rdiff -u -r1.11 -r1.12 pkgsrc/news/inn/patches/patch-ab
cvs rdiff -u -r1.8 -r1.9 pkgsrc/news/inn/patches/patch-ad
cvs rdiff -u -r1.17 -r1.18 pkgsrc/news/inn/patches/patch-ah
cvs rdiff -u -r1.3 -r1.4 pkgsrc/news/inn/patches/patch-ak
cvs rdiff -u -r1.2 -r1.3 pkgsrc/news/inn/patches/patch-al

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

Modified files:

Index: pkgsrc/news/inn/MESSAGE
diff -u pkgsrc/news/inn/MESSAGE:1.8 pkgsrc/news/inn/MESSAGE:1.9
--- pkgsrc/news/inn/MESSAGE:1.8 Sat May 20 06:56:29 2017
+++ pkgsrc/news/inn/MESSAGE     Sun Apr 30 14:58:58 2023
@@ -1,12 +1,12 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.8 2017/05/20 06:56:29 spz Exp $
+$NetBSD: MESSAGE,v 1.9 2023/04/30 14:58:58 spz Exp $
 
 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.
+If you are upgrading from 2.6.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

Index: pkgsrc/news/inn/Makefile
diff -u pkgsrc/news/inn/Makefile:1.137 pkgsrc/news/inn/Makefile:1.138
--- pkgsrc/news/inn/Makefile:1.137      Tue Jun 28 11:35:22 2022
+++ pkgsrc/news/inn/Makefile    Sun Apr 30 14:58:58 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.137 2022/06/28 11:35:22 wiz Exp $
+# $NetBSD: Makefile,v 1.138 2023/04/30 14:58:58 spz Exp $
 
-DISTNAME=              inn-2.6.5
-PKGREVISION=           1
+DISTNAME=              inn-2.7.1
 CATEGORIES=            news
 MASTER_SITES=          ftp://ftp.isc.org/isc/inn/
 MASTER_SITES+=         ftp://ftp.fu-berlin.de/unix/news/inn/
@@ -58,11 +57,13 @@ CONFIGURE_ENV+=             _PATH_SORT=${TOOLS_SORT
 CONFIGURE_ENV+=                GZIP=${TOOLS_GZIP_CMD}
 USE_TOOLS+=            awk egrep gzip perl:run sed sh sort yacc
 
+USE_LIBTOOL=           yes
+
 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
+DEPENDS+=              p5-DBD-SQLite-[0-9]*:../../databases/p5-DBD-SQLite
 
 USERGROUP_PHASE=       pre-install
 PKG_USERS_VARS+=       INN_USER
@@ -126,11 +127,15 @@ CFILES=                   actsync.cfg actsync.ign buffin
                        news2mail.cf newsfeeds nnrpd.track \
                        nntpsend.ctl nocem.ctl ovdb.conf passwd.nntp \
                        inn-radius.conf readers.conf send-uucp.cf \
-                       storage.conf subscriptions
+                       storage.conf subscriptions ovsqlite.conf
 .for file in ${CFILES}
 CONF_FILES_PERMS+=     ${EXAMPLEDIR}/${file} ${PKG_SYSCONFDIR}/${file} \
                        ${INN_USER} ${INN_GROUP} 0664
 .endfor
+.for file in inn-secrets.conf
+CONF_FILES_PERMS+=     ${EXAMPLEDIR}/${file} ${PKG_SYSCONFDIR}/${file} \
+                       ${INN_USER} ${INN_GROUP} 0600
+.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
@@ -158,14 +163,13 @@ CONF_FILES_PERMS+=        ${EXAMPLEDIR}/filter/
 
 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 
+NEWSONLYBINS+=         tally.control tdx-util writelog
 .for file in ${NEWSONLYBINS}
 SPECIAL_PERMS+=                ${PREFIX}/${INN_PATHBIN}/${file} ${INN_USER} ${INN_GROUP} 0550
 .endfor
@@ -181,6 +185,23 @@ CONFIGURE_ARGS+=   --with-sendmail=/usr/li
 CONFIGURE_ARGS+=       --with-sendmail=/usr/sbin/sendmail
 .endif
 
+.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} > 099967
+SUBST_CLASSES+=                blcklist
+SUBST_FILES.blcklist=  HACKING INSTALL MANIFEST NEWS \
+                       Makefile.global.in configure configure.ac \
+                       include/config.h.in \
+                       ci/test support/mksnapshot \
+                       nnrpd/perm.c nnrpd/nnrpd.c m4/blocklist.m4 \
+                       doc/pod/hacking.pod doc/pod/install.pod \
+                       doc/pod/news.pod doc/pod/nnrpd.pod doc/man/nnrpd.8
+SUBST_SED.blcklist=    -e 's,blacklist,blocklist,g'
+SUBST_STAGE.blcklist=  pre-configure
+
+post-extract:
+       ${MV} ${WRKSRC}/m4/blacklist.m4 ${WRKSRC}/m4/blocklist.m4
+
+.endif
+
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
 GCC_REQD+=             2.95.3
 .endif
@@ -190,7 +211,7 @@ GCC_REQD+=          2.95.3
 TEST_TARGET=   tests
 
 pre-install:
-.for file in ${CFILES} active.minimal newsgroups.minimal
+.for file in ${CFILES} active.minimal newsgroups.minimal inn-secrets.conf
        ${INSTALL_DATA} ${WRKSRC}/site/${file} ${DESTDIR}${EXAMPLEDIR}
 .endfor
 .for file in ${DBFILES} ${HTTPFILES}
@@ -213,9 +234,10 @@ post-install:
        ${RM} -f ${DESTDIR}${PREFIX}/bin/rnews
        ${LN} -s ${DESTDIR}${PREFIX}/${INN_PATHBIN}/rnews       \
                        ${DESTDIR}${PREFIX}/bin
-.for file in libinn.a libstorage.a libinnhist.a
+.for file in libinn.a libinnstorage.a libinnhist.a
        ${CHMOD} 644 ${DESTDIR}${PREFIX}/lib/${file}
 .endfor
 
 .include "../../security/openssl/buildlink3.mk"
+.include "../../databases/sqlite3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/news/inn/PLIST
diff -u pkgsrc/news/inn/PLIST:1.28 pkgsrc/news/inn/PLIST:1.29
--- pkgsrc/news/inn/PLIST:1.28  Sat Apr 16 11:44:53 2022
+++ pkgsrc/news/inn/PLIST       Sun Apr 30 14:58:58 2023
@@ -1,11 +1,10 @@
-@comment $NetBSD: PLIST,v 1.28 2022/04/16 11:44:53 spz Exp $
+@comment $NetBSD: PLIST,v 1.29 2023/04/30 14:58:58 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
@@ -32,6 +31,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
@@ -43,13 +43,14 @@ 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/libstorage.la
+lib/libinnstorage.la
 lib/perl/INN/Config.pm
 lib/perl/INN/Utils/Shlock.pm
 ${INN_PATHBIN}/actmerge
@@ -70,9 +71,6 @@ ${INN_PATHBIN}/control/ihave.pl
 ${INN_PATHBIN}/control/newgroup.pl
 ${INN_PATHBIN}/control/rmgroup.pl
 ${INN_PATHBIN}/control/sendme.pl
-${INN_PATHBIN}/control/sendsys.pl
-${INN_PATHBIN}/control/senduuname.pl
-${INN_PATHBIN}/control/version.pl
 ${INN_PATHBIN}/controlbatch
 ${INN_PATHBIN}/controlchan
 ${INN_PATHBIN}/convdate
@@ -83,7 +81,7 @@ ${INN_PATHBIN}/expire
 ${INN_PATHBIN}/expireover
 ${INN_PATHBIN}/expirerm
 ${INN_PATHBIN}/fastrm
-${INN_PATHBIN}/filechan
+${INN_PATHBIN}/gencancel
 ${INN_PATHBIN}/getlist
 ${INN_PATHBIN}/grephistory
 ${INN_PATHBIN}/imapfeed
@@ -116,6 +114,8 @@ ${INN_PATHBIN}/ovdb_monitor
 ${INN_PATHBIN}/ovdb_server
 ${INN_PATHBIN}/ovdb_stat
 ${INN_PATHBIN}/overchan
+${INN_PATHBIN}/ovsqlite-server
+${INN_PATHBIN}/ovsqlite-util
 ${INN_PATHBIN}/perl-nocem
 ${INN_PATHBIN}/pgpverify
 ${INN_PATHBIN}/procbatch
@@ -131,13 +131,11 @@ ${INN_PATHBIN}/rnews.libexec/gunbatch
 ${INN_PATHBIN}/scanlogs
 ${INN_PATHBIN}/scanspool
 ${INN_PATHBIN}/send-ihave
-${INN_PATHBIN}/send-nntp
 ${INN_PATHBIN}/send-uucp
 ${INN_PATHBIN}/sendinpaths
 ${INN_PATHBIN}/sendxbatches
 ${INN_PATHBIN}/shlock
 ${INN_PATHBIN}/shrinkfile
-${INN_PATHBIN}/signcontrol
 ${INN_PATHBIN}/simpleftp
 ${INN_PATHBIN}/sm
 ${INN_PATHBIN}/tally.control
@@ -146,6 +144,7 @@ ${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
@@ -161,7 +160,6 @@ man/man1/simpleftp.1
 man/man1/sm.1
 man/man3/INN::Config.3pm
 man/man3/INN::Utils::Shlock.3pm
-man/man3/libauth.3
 man/man3/libinn.3
 man/man3/libinn_clientlib.3
 man/man3/libinn_dbz.3
@@ -170,8 +168,9 @@ 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/libstorage.3
+man/man3/libinnstorage.3
 man/man5/active.5
 man/man5/active.times.5
 man/man5/buffindexed.conf.5
@@ -183,10 +182,11 @@ 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/innwatch.ctl.5
 man/man5/innreport.conf.5
+man/man5/innwatch.ctl.5
 man/man5/localgroups.5
 man/man5/moderators.5
 man/man5/motd.innd.5
@@ -199,6 +199,7 @@ 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
@@ -206,6 +207,7 @@ 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
@@ -219,7 +221,6 @@ man/man8/domain.8
 man/man8/expire.8
 man/man8/expireover.8
 man/man8/expirerm.8
-man/man8/filechan.8
 man/man8/ident.8
 man/man8/imapfeed.8
 man/man8/innbind.8
@@ -234,7 +235,6 @@ man/man8/innwatch.8
 man/man8/innxbatch.8
 man/man8/innxmit.8
 man/man8/inpaths.8
-${PLIST.kerberos}man/man8/auth_krb5.8
 man/man8/mailpost.8
 man/man8/makedbz.8
 man/man8/makehistory.8
@@ -249,6 +249,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/ovsqlite-util.8
 man/man8/perl-nocem.8
 man/man8/procbatch.8
 man/man8/prunehistory.8
@@ -257,7 +259,6 @@ man/man8/rc.news.8
 man/man8/scanlogs.8
 man/man8/scanspool.8
 man/man8/send-ihave.8
-man/man8/send-nntp.8
 man/man8/send-uucp.8
 man/man8/sendinpaths.8
 man/man8/sendxbatches.8
@@ -311,6 +312,7 @@ share/examples/inn/filter/startup_innd.p
 share/examples/inn/history
 share/examples/inn/incoming.conf
 share/examples/inn/inn-radius.conf
+share/examples/inn/inn-secrets.conf
 share/examples/inn/inn.conf
 share/examples/inn/innfeed.conf
 share/examples/inn/innreport.conf
@@ -330,6 +332,7 @@ share/examples/inn/nnrpd.track
 share/examples/inn/nntpsend.ctl
 share/examples/inn/nocem.ctl
 share/examples/inn/ovdb.conf
+share/examples/inn/ovsqlite.conf
 share/examples/inn/passwd.nntp
 share/examples/inn/readers.conf
 share/examples/inn/send-uucp.cf

Index: pkgsrc/news/inn/distinfo
diff -u pkgsrc/news/inn/distinfo:1.40 pkgsrc/news/inn/distinfo:1.41
--- pkgsrc/news/inn/distinfo:1.40       Sat Apr 16 11:44:53 2022
+++ pkgsrc/news/inn/distinfo    Sun Apr 30 14:58:58 2023
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.40 2022/04/16 11:44:53 spz Exp $
+$NetBSD: distinfo,v 1.41 2023/04/30 14:58:58 spz Exp $
 
-BLAKE2s (inn-2.6.5.tar.gz) = 227dfa235a50b6dc673c20e087e5441f4633afd991bdff7df11a7c46015cf71a
-SHA512 (inn-2.6.5.tar.gz) = 7200880e179ac10dcb04ed534d2f3119ad4045e912016342e2552e3fc129a2b2d4360615bc03bc9f4e17c440cf07c8017c55f4c17400af140a8bf7b96dc52a2f
-Size (inn-2.6.5.tar.gz) = 2646269 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
+BLAKE2s (inn-2.7.1.tar.gz) = 5d45999a8d0b5b44352dfbec34c95ad67f7555f9a6e16bf0409c5fa3130d1774
+SHA512 (inn-2.7.1.tar.gz) = 7d2430e5517bf13dd2acf792e376c18af8054ea4a177e5da0bbcaffbb4b89a80ed6528ed5b11a65559e5bf43f8fe40e5f7672582e9713d7b1312c607ea7e2235
+Size (inn-2.7.1.tar.gz) = 2753330 bytes
+SHA1 (patch-aa) = bf3de8a6aebae1fc8957fad31e46b1c536aa5224
+SHA1 (patch-ab) = 894d7c93485bb86ebf68899968829ce6aa60b7e6
+SHA1 (patch-ac) = 43e2db25f619a2c85d5e715e2044c5b4be31b62c
+SHA1 (patch-ad) = b19fa5553d18cebb4b52e24f2d4085fc40db244c
+SHA1 (patch-ag) = 0d1e4883ffefd0e2e7afeba2865e707ff6041a28
+SHA1 (patch-ah) = 22ff361d7a098d1cf09ecb0fc5d3336927238106
+SHA1 (patch-ak) = a2cd9d85881fc704f29de4f319380e89af67ef24
+SHA1 (patch-al) = c28c81e0c88c695cd06738dc7360c95a045afa1d

Index: pkgsrc/news/inn/options.mk
diff -u pkgsrc/news/inn/options.mk:1.9 pkgsrc/news/inn/options.mk:1.10
--- pkgsrc/news/inn/options.mk:1.9      Sat Jan  2 14:18:22 2021
+++ pkgsrc/news/inn/options.mk  Sun Apr 30 14:58:58 2023
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.9 2021/01/02 14:18:22 spz Exp $
+# $NetBSD: options.mk,v 1.10 2023/04/30 14:58:58 spz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.inn
-PKG_SUPPORTED_OPTIONS= perl python uucp kerberos gnupg2
-PKG_SUGGESTED_OPTIONS= perl
+PKG_SUPPORTED_OPTIONS= perl python uucp kerberos gnupg2 canlock
+PKG_SUGGESTED_OPTIONS= perl gnupg2 canlock
 
 .include "../../mk/bsd.options.mk"
 
@@ -12,8 +12,9 @@ PLIST_VARS+=          kerberos
 ### uucp support (requires a group uucp to exist)
 ###
 .if !empty(PKG_OPTIONS:Muucp)
-PKG_GROUPS_VARS+=       UUCP_GROUP
+PKG_GROUPS_VARS+=      UUCP_GROUP
 PKG_GROUPS+=           ${UUCP_GROUP}
+SPECIAL_PERMS+=                ${PREFIX}/${INN_PATHBIN}/rnews ${INN_USER} ${UUCP_GROUP} 2555
 
 CONFIGURE_ARGS+=       --enable-uucp-rnews
 .else
@@ -21,7 +22,7 @@ CONFIGURE_ARGS+=      --disable-uucp-rnews
 .endif
 
 ###
-### perl support for INN
+### perl hooks support for INN
 ###
 .if !empty(PKG_OPTIONS:Mperl)
 CONFIGURE_ARGS+=       --with-perl
@@ -33,7 +34,7 @@ CONFIGURE_ARGS+=      --without-perl
 .endif
 
 ###
-### Python support for INN
+### Python hooks support for INN
 ###
 .if !empty(PKG_OPTIONS:Mpython)
 CONFIGURE_ARGS+=       --with-python
@@ -43,12 +44,25 @@ CONFIGURE_ENV+=             _PATH_PYTHON=${PYTHONBI
 .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"
 
 CONFIGURE_ARGS+=       --with-krb5
+PLIST.kerberos=                yes
 .else
 CONFIGURE_ARGS+=       --without-krb5
 .endif
@@ -57,8 +71,7 @@ CONFIGURE_ARGS+=      --without-krb5
 ### pick either gnupg2 or gnupg
 ###
 .if !empty(PKG_OPTIONS:Mgnupg2)
-DEPENDS+=               gnupg2-[0-9]*:../../security/gnupg2
+DEPENDS+=              gnupg2-[0-9]*:../../security/gnupg2
 .else
-DEPENDS+=               gnupg-[0-9]*:../../security/gnupg
+DEPENDS+=              gnupg-[0-9]*:../../security/gnupg
 .endif
-

Index: pkgsrc/news/inn/patches/patch-aa
diff -u pkgsrc/news/inn/patches/patch-aa:1.13 pkgsrc/news/inn/patches/patch-aa:1.14
--- pkgsrc/news/inn/patches/patch-aa:1.13       Sun Aug  3 17:33:34 2014
+++ pkgsrc/news/inn/patches/patch-aa    Sun Apr 30 14:58:58 2023
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.13 2014/08/03 17:33:34 spz Exp $
+$NetBSD: patch-aa,v 1.14 2023/04/30 14:58:58 spz Exp $
+
+yacc can be yacc, too.
 
 --- configure.orig     2014-05-17 08:24:49.000000000 +0000
 +++ configure
Index: pkgsrc/news/inn/patches/patch-ac
diff -u pkgsrc/news/inn/patches/patch-ac:1.13 pkgsrc/news/inn/patches/patch-ac:1.14
--- pkgsrc/news/inn/patches/patch-ac:1.13       Sat Apr 16 11:44:53 2022
+++ pkgsrc/news/inn/patches/patch-ac    Sun Apr 30 14:58:58 2023
@@ -1,4 +1,6 @@
-$NetBSD: patch-ac,v 1.13 2022/04/16 11:44:53 spz Exp $
+$NetBSD: patch-ac,v 1.14 2023/04/30 14:58:58 spz Exp $
+
+no file backups for subsequent install runs please
 
 --- Makefile.global.in.orig    2014-05-17 08:24:49.000000000 +0000
 +++ Makefile.global.in
Index: pkgsrc/news/inn/patches/patch-ag
diff -u pkgsrc/news/inn/patches/patch-ag:1.13 pkgsrc/news/inn/patches/patch-ag:1.14
--- pkgsrc/news/inn/patches/patch-ag:1.13       Sun Aug  3 17:33:34 2014
+++ pkgsrc/news/inn/patches/patch-ag    Sun Apr 30 14:58:58 2023
@@ -1,4 +1,6 @@
-$NetBSD: patch-ag,v 1.13 2014/08/03 17:33:34 spz Exp $
+$NetBSD: patch-ag,v 1.14 2023/04/30 14:58:58 spz Exp $
+
+don't set the pgp path here, always use $INN::Config::pgp
 
 --- control/pgpverify.in.orig  2014-05-17 08:24:49.000000000 +0000
 +++ control/pgpverify.in

Index: pkgsrc/news/inn/patches/patch-ab
diff -u pkgsrc/news/inn/patches/patch-ab:1.11 pkgsrc/news/inn/patches/patch-ab:1.12
--- pkgsrc/news/inn/patches/patch-ab:1.11       Sun Aug  3 17:33:34 2014
+++ pkgsrc/news/inn/patches/patch-ab    Sun Apr 30 14:58:58 2023
@@ -1,4 +1,6 @@
-$NetBSD: patch-ab,v 1.11 2014/08/03 17:33:34 spz Exp $
+$NetBSD: patch-ab,v 1.12 2023/04/30 14:58:58 spz Exp $
+
+raise data and file descriptors limits to their hard limits
 
 --- scripts/news.daily.in.orig 2014-05-17 08:24:49.000000000 +0000
 +++ scripts/news.daily.in

Index: pkgsrc/news/inn/patches/patch-ad
diff -u pkgsrc/news/inn/patches/patch-ad:1.8 pkgsrc/news/inn/patches/patch-ad:1.9
--- pkgsrc/news/inn/patches/patch-ad:1.8        Sun Aug  3 17:33:34 2014
+++ pkgsrc/news/inn/patches/patch-ad    Sun Apr 30 14:58:58 2023
@@ -1,9 +1,11 @@
-$NetBSD: patch-ad,v 1.8 2014/08/03 17:33:34 spz Exp $
+$NetBSD: patch-ad,v 1.9 2023/04/30 14:58:58 spz Exp $
 
---- scripts/rc.news.in.orig    2014-05-17 08:24:49.000000000 +0000
-+++ scripts/rc.news.in
-@@ -77,6 +77,9 @@ Xstop)
- ;;
+raise file descriptors limit to hard limit
+
+--- scripts/rc.news.in.orig    2022-07-10 15:00:35.000000000 +0200
++++ scripts/rc.news.in 2022-09-25 13:15:39.442172637 +0200
+@@ -102,6 +102,9 @@
+     ;;
  esac
  
 +## Unlimit

Index: pkgsrc/news/inn/patches/patch-ah
diff -u pkgsrc/news/inn/patches/patch-ah:1.17 pkgsrc/news/inn/patches/patch-ah:1.18
--- pkgsrc/news/inn/patches/patch-ah:1.17       Sat May 20 06:53:05 2017
+++ pkgsrc/news/inn/patches/patch-ah    Sun Apr 30 14:58:58 2023
@@ -1,4 +1,7 @@
-$NetBSD: patch-ah,v 1.17 2017/05/20 06:53:05 spz Exp $
+$NetBSD: patch-ah,v 1.18 2023/04/30 14:58:58 spz Exp $
+
+don't install in site, we're installing in samples and then doing
+CONF_FILES_PERMS from that
 
 --- site/Makefile.orig 2016-11-27 14:03:42.000000000 +0000
 +++ site/Makefile

Index: pkgsrc/news/inn/patches/patch-ak
diff -u pkgsrc/news/inn/patches/patch-ak:1.3 pkgsrc/news/inn/patches/patch-ak:1.4
--- pkgsrc/news/inn/patches/patch-ak:1.3        Sun Aug  3 17:33:34 2014
+++ pkgsrc/news/inn/patches/patch-ak    Sun Apr 30 14:58:58 2023
@@ -1,13 +1,15 @@
-$NetBSD: patch-ak,v 1.3 2014/08/03 17:33:34 spz Exp $
+$NetBSD: patch-ak,v 1.4 2023/04/30 14:58:58 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@";
+fix bin path
+
+--- perl/INN/Config.pm.in.orig 2022-07-10 15:00:35.000000000 +0200
++++ perl/INN/Config.pm.in      2022-09-25 13:17:12.053797734 +0200
+@@ -15,7 +15,7 @@
  
  ##  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) {
+     eval 'our ' . $line;
+     if ($line =~ /^(.*?) = /m) {

Index: pkgsrc/news/inn/patches/patch-al
diff -u pkgsrc/news/inn/patches/patch-al:1.2 pkgsrc/news/inn/patches/patch-al:1.3
--- pkgsrc/news/inn/patches/patch-al:1.2        Sun Aug  3 17:33:34 2014
+++ pkgsrc/news/inn/patches/patch-al    Sun Apr 30 14:58:58 2023
@@ -1,15 +1,17 @@
-$NetBSD: patch-al,v 1.2 2014/08/03 17:33:34 spz Exp $
+$NetBSD: patch-al,v 1.3 2023/04/30 14:58:58 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)
+don't complain if the file descriptors limit is higher than what we asked for
+
+--- lib/fdlimit.c.orig 2022-07-10 15:00:35.000000000 +0200
++++ lib/fdlimit.c      2022-09-25 13:21:04.073161149 +0200
+@@ -56,6 +56,10 @@
+     if (getrlimit(RLIMIT_NOFILE, &rl) < 0) {
+         rl.rlim_cur = 0;
+         rl.rlim_max = 0;
++    } else {
++        /* will we mind if the limit is higher? I think not. */
++        if (rl.rlim_cur >= limit)
++            return 0;
      }
- #endif
+ #    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;



Home | Main Index | Thread Index | Old Index