CVS commit: pkgsrc/mail/exim

["David Brownlee" <abs%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   abs
Date:           Tue Nov  4 16:48:54 UTC 2025

Modified Files:
        pkgsrc/mail/exim: DESCR Makefile options.mk

Log Message:
Remove tcp_wrappers option to fix exim build

Exim has removed support for tcpwrappers, and the remaining -lwrap
in the linking flags causes the build to fail on NetBSD with:

/usr/lib/libwrap.so: undefined reference to `allow_severity'
/usr/lib/libwrap.so: undefined reference to `deny_severity'

Bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/mail/exim/DESCR
cvs rdiff -u -r1.213 -r1.214 pkgsrc/mail/exim/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/mail/exim/options.mk

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

Modified files:

Index: pkgsrc/mail/exim/DESCR
diff -u pkgsrc/mail/exim/DESCR:1.3 pkgsrc/mail/exim/DESCR:1.4
--- pkgsrc/mail/exim/DESCR:1.3  Wed Sep 20 22:13:13 2006
+++ pkgsrc/mail/exim/DESCR      Tue Nov  4 16:48:54 2025
@@ -10,7 +10,7 @@ This build of exim has the following non
 
 TRANSPORT_LMTP          SUPPORT_MAILDIR         SUPPORT_MAILSTORE
 SUPPORT_MBX             AUTH_CRAM_MD5           AUTH_PLAINTEXT
-AUTH_SPA                SUPPORT_TLS             USE_TCP_WRAPPERS
+AUTH_SPA                SUPPORT_TLS
 
 The following default feature is disabled by default, but may be enabled by
 setting the 'exim-build-eximon' option:

Index: pkgsrc/mail/exim/Makefile
diff -u pkgsrc/mail/exim/Makefile:1.213 pkgsrc/mail/exim/Makefile:1.214
--- pkgsrc/mail/exim/Makefile:1.213     Mon Nov  3 09:50:51 2025
+++ pkgsrc/mail/exim/Makefile   Tue Nov  4 16:48:54 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.213 2025/11/03 09:50:51 adam Exp $
+# $NetBSD: Makefile,v 1.214 2025/11/04 16:48:54 abs Exp $
 
 DISTNAME=      exim-4.99
+PKGREVISION=   1
 CATEGORIES=    mail net
 MASTER_SITES=  https://ftp.exim.org/pub/exim/exim4/
 MASTER_SITES+= https://ftp.exim.org/pub/exim/exim4/fixes/

Index: pkgsrc/mail/exim/options.mk
diff -u pkgsrc/mail/exim/options.mk:1.27 pkgsrc/mail/exim/options.mk:1.28
--- pkgsrc/mail/exim/options.mk:1.27    Mon Sep 29 14:56:34 2025
+++ pkgsrc/mail/exim/options.mk Tue Nov  4 16:48:54 2025
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.27 2025/09/29 14:56:34 ryoon Exp $
+# $NetBSD: options.mk,v 1.28 2025/11/04 16:48:54 abs Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.exim
 PKG_SUPPORTED_OPTIONS= exim-arc
@@ -9,12 +9,12 @@ PKG_SUPPORTED_OPTIONS+=       exim-lookup-cdb 
 PKG_SUPPORTED_OPTIONS+=        exim-lookup-dsearch exim-lookup-ldap exim-lookup-mysql
 PKG_SUPPORTED_OPTIONS+=        exim-lookup-pgsql exim-lookup-redis exim-lookup-sqlite
 PKG_SUPPORTED_OPTIONS+=        exim-lookup-whoson exim-old-demime exim-router-iplookup
-PKG_SUPPORTED_OPTIONS+=        exim-tcp-wrappers exim-tls exim-transport-lmtp gdbm
+PKG_SUPPORTED_OPTIONS+=        exim-tls exim-transport-lmtp gdbm
 PKG_SUPPORTED_OPTIONS+=        gsasl inet6 opendmarc saslauthd spf readline
 
 PKG_SUGGESTED_OPTIONS= exim-appendfile-maildir exim-appendfile-mailstore
 PKG_SUGGESTED_OPTIONS+=        exim-appendfile-mbx exim-content-scan
-PKG_SUGGESTED_OPTIONS+=        exim-lookup-dsearch exim-old-demime exim-tcp-wrappers
+PKG_SUGGESTED_OPTIONS+=        exim-lookup-dsearch exim-old-demime
 PKG_SUGGESTED_OPTIONS+=        exim-tls inet6
 
 .include "../../mk/bsd.options.mk"
@@ -117,12 +117,6 @@ LOCAL_MAKEFILE_OPTIONS+=   WITH_OLD_DEMIME
 LOCAL_MAKEFILE_OPTIONS+=       ROUTER_IPLOOKUP=yes
 .endif
 
-.if !empty(PKG_OPTIONS:Mexim-tcp-wrappers)
-LOCAL_MAKEFILE_OPTIONS+=USE_TCP_WRAPPERS=yes
-LOOKUP_LIBS+=-lwrap
-.  include "../../security/tcp_wrappers/buildlink3.mk"
-.endif
-
 .if !empty(PKG_OPTIONS:Mexim-tls)
 LOCAL_MAKEFILE_OPTIONS+=SUPPORT_TLS=yes
 LOCAL_MAKEFILE_OPTIONS+=USE_OPENSSL=yes