Date: Sun, 03 May 2026 08:42:47 +0000
From: Kevin Bowling <kbowling@FreeBSD.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject: git: d4853e9126e5 - main - news/inn{-current}: Update current and handle blocklistd rename
Message-ID: <69f70a87.470e5.28e5ee05@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/ports/commit/?id=d4853e9126e5fddf58ed7fdd4e8097e26802da68 commit d4853e9126e5fddf58ed7fdd4e8097e26802da68 Author: Kevin Bowling <kbowling@FreeBSD.org> AuthorDate: 2026-05-03 08:39:11 +0000 Commit: Kevin Bowling <kbowling@FreeBSD.org> CommitDate: 2026-05-03 08:42:41 +0000 news/inn{-current}: Update current and handle blocklistd rename Update inn-current snapshot from 20260121 to 20260419. Rename the BLACKLISTD option to BLOCKLISTD to match the upstream and FreeBSD 15+ rename. Add version-conditional logic to fall back to the old blacklist API names on FreeBSD < 15.0 for the 2.8 branch. Co-Authored-By: Jose Luis Duran <jlduran@FreeBSD.org> --- news/inn-current/Makefile | 2 +- news/inn-current/distinfo | 6 +++--- news/inn/Makefile | 29 +++++++++++++++++++++++++---- 3 files changed, 29 insertions(+), 8 deletions(-) diff --git a/news/inn-current/Makefile b/news/inn-current/Makefile index 33c032aa7999..88eae5e6e33b 100644 --- a/news/inn-current/Makefile +++ b/news/inn-current/Makefile @@ -5,7 +5,7 @@ MASTER_SITE_SUBDIR= inn/snapshots DISTNAME= inn-${BRANCH}-${SNAPSHOT} BRANCH= 2.8 -SNAPSHOT= 20260121 +SNAPSHOT= 20260419 CONFLICTS= inn-2.[0-9]* diff --git a/news/inn-current/distinfo b/news/inn-current/distinfo index dc2daf3cf71d..4206c6415897 100644 --- a/news/inn-current/distinfo +++ b/news/inn-current/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1769252519 -SHA256 (inn-2.8-20260121.tar.gz) = 50c76328556c70963975b78cc7cdf12027fad6bebb26663040a01a446abff4e7 -SIZE (inn-2.8-20260121.tar.gz) = 2833981 +TIMESTAMP = 1777796549 +SHA256 (inn-2.8-20260419.tar.gz) = 6c5ac86d213445f656d50483e68adfeaf2a9cf35bece5c90acfc7405a0d7df4d +SIZE (inn-2.8-20260419.tar.gz) = 2835406 diff --git a/news/inn/Makefile b/news/inn/Makefile index d24e813380ad..a671e2e386ea 100644 --- a/news/inn/Makefile +++ b/news/inn/Makefile @@ -75,15 +75,15 @@ PLIST_SUB+= ETCFILES="${CONFIG_FILES}" \ LIBVER_LONG=${LIBVER_LONG} PORTDOCS= CONTRIBUTORS HACKING INSTALL LICENSE MANIFEST NEWS README TODO -OPTIONS_DEFINE= BERKELEYDB BLACKLISTD DOCS EXAMPLES GNUPG KERBEROS \ +OPTIONS_DEFINE= BERKELEYDB BLOCKLISTD DOCS EXAMPLES GNUPG KERBEROS \ KEYWORDS LARGE_FILES OPENSSL PYTHON SASL SETGID_INEWS \ SQLITE TAGGED_HASH UUCP_RNEWS -OPTIONS_DEFAULT= BERKELEYDB BLACKLISTD GNUPG KEYWORDS LARGE_FILES \ +OPTIONS_DEFAULT= BERKELEYDB BLOCKLISTD GNUPG KEYWORDS LARGE_FILES \ OPENSSL PYTHON SETGID_INEWS SQLITE UUCP_RNEWS OPTIONS_SUB= yes BERKELEYDB_DESC= Enable BerkeleyDB (for ovdb overview method) -BLACKLISTD_DESC= Enable blacklistd support +BLOCKLISTD_DESC= Enable blocklistd support GNUPG_DESC= GnuPG support (for pgpverify control message) KERBEROS_DESC= Enable Kerberos v5 (for auth_krb5) KEYWORDS_DESC= Automatic keyword generation support @@ -101,7 +101,11 @@ BERKELEYDB_CONFIGURE_ON= --with-bdb-include=${BDB_INCLUDE_DIR} \ --with-bdb-lib=${LOCALBASE}/lib \ --with-bdb=${LOCALBASE} -BLACKLISTD_CONFIGURE_WITH= blacklist +.if ${BRANCH:U} == 2.8 && ${OSVERSION} >= 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. @@ -158,6 +162,23 @@ post-patch: .if ${PORT_OPTIONS:MBERKELEYDB} @${REINPLACE_CMD} -e 's!-ldb!-ldb-${BDB_VER}!' ${WRKSRC}/configure .endif +.if ${BRANCH:U} == 2.8 && ${OSVERSION} < 1500000 && ${PORT_OPTIONS:MBLOCKLISTD} + @${REINPLACE_CMD} -e 's|blocklist\.h|blacklist.h|g' \ + -e 's|libblocklist|libblacklist|g' \ + -e 's|-lblocklist|-lblacklist|g' \ + -e 's|blocklist_open|blacklist_open|g' \ + -e 's|blocklist_close|blacklist_close|g' \ + -e 's|blocklist_r|blacklist_r|g' \ + -e 's|BLOCKLIST_AUTH|BLACKLIST_AUTH|g' \ + -e 's|struct blocklist|struct blacklist|g' \ + -e 's|HAVE_BLOCKLIST|HAVE_BLACKLIST|g' \ + ${WRKSRC}/nnrpd/perm.c \ + ${WRKSRC}/include/config.h.in + @${REINPLACE_CMD} -e 's|blocklist|blacklist|g' \ + -e 's|BLOCKLIST|BLACKLIST|g' \ + ${WRKSRC}/m4/blocklist.m4 \ + ${WRKSRC}/configure +.endif pre-install: @${MKDIR} ${STAGEDIR}${INN_DBDIR} \home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69f70a87.470e5.28e5ee05>