kiwi/klara-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

No more TCP_WRAPPER

Browse Source
This commit is contained in:
Xavier Beaudouin
2025-12-18 03:32:55 +01:00
parent 19e7e133d1
commit 3df13746aa
3 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mail/exim/Makefile
View File

@ -299,13 +299,6 @@ SEDLIST+= -e 's,^\# (DISABLE_TLS=),\1,'
SEDLIST+= -e 's,^\# (EXIM_PERL=),\1,'
.endif
.if ${PORT_OPTIONS:MTCP_WRAPPERS}
SEDLIST+= -e 's,XX_TCP_WRAPPERS_LIBS_XX,-lwrap,' \
-e 's,^\# (USE_TCP_WRAPPERS=),\1,'
.else
SEDLIST+= -e 's,XX_TCP_WRAPPERS_LIBS_XX,,'
.endif
.if ${PORT_OPTIONS:MICONV}
SEDLIST+= -e 's,XX_ICONV_LIBS_XX,-L${LOCALBASE:S/,/\\,/g}/lib ${ICONV_LIB},' \
-e 's,^\# (HAVE_ICONV=),\1,'

17
mail/exim/files/patch-src__EDITME
View File

@ -1,5 +1,5 @@
--- src/EDITME.orig 2025-12-17 18:47:37.694788000 +0100
+++ src/EDITME 2025-12-17 18:47:41.432166000 +0100
--- src/EDITME.orig 2025-12-14 13:38:51.000000000 +0100
+++ src/EDITME 2025-12-18 03:31:28.070641000 +0100
@@ -104,7 +104,7 @@
# /usr/local/sbin. The installation script will try to create this directory,
# and any superior directories, if they do not exist.
@ -88,7 +88,7 @@
# but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM
# as well.
+CFLAGS=XX_CFLAGS_XX XX_SPF_FLAGS_XX XX_SRS_FLAGS_XX XX_SQLITE_FLAGS_XX
+EXTRALIBS=XX_TCP_WRAPPERS_LIBS_XX XX_PAM_LIBS_XX XX_ICONV_LIBS_XX XX_SPF_LIBS_XX XX_SRS_LIBS_XX XX_RADIUS_LIBS_XX XX_SQLITE_LIBS_XX XX_DMARC_LIBS_XX XX_REDIS_LIBS_XX XX_DYNAMIC_LDFLAGS_XX XX_IDN_LIBS_XX
+EXTRALIBS=XX_PAM_LIBS_XX XX_ICONV_LIBS_XX XX_SPF_LIBS_XX XX_SRS_LIBS_XX XX_RADIUS_LIBS_XX XX_SQLITE_LIBS_XX XX_DMARC_LIBS_XX XX_REDIS_LIBS_XX XX_DYNAMIC_LDFLAGS_XX XX_IDN_LIBS_XX
#
# nb: FreeBSD as of 4.89 defines LIBICONV_PLUG to pick up the system iconv
# more reliably. If you explicitly want the libiconv Port then as well
@ -119,19 +119,18 @@
#------------------------------------------------------------------------------
@@ -1179,8 +1185,16 @@
# SUPPORT_SPF=yes
@@ -1180,7 +1186,15 @@
# CFLAGS += -I/usr/local/include
# LDFLAGS += -lspf2
+
+# IPv6 is coming. Exim has experimental support that has been tried out on
+# one or two OS. See the file README.IPV6 for the current status of this
+# support. Do not set this option unless you are working on IPv6 and know
+# what you are doing.
+
+# HAVE_IPV6=YES
+
+
+
#------------------------------------------------------------------------------
# Support for authentication via Radius is also available. The Exim support,

4
mail/exim/options
View File

@ -18,7 +18,6 @@ OPTIONS_DEFINE+= ALT_CONFIG_PREFIX \
PRDR \
READLINE \
SUID \
TCP_WRAPPERS \
WISHLIST \
EVENT \
PROXY \
@ -79,7 +78,7 @@ ARC_DESC= Enable experimental ARC support
AUTH_CRAM_MD5_DESC= Enable CRAM-MD5 authentication mechanisms
AUTH_DOVECOT_DESC= Enable Dovecot authentication mechanisms
AUTH_PLAINTEXT_DESC= Enable plaintext authentication
AUTH_RADIUS_DESC= Enable radius (RFC 2865) authentication (broken)
AUTH_RADIUS_DESC= Enable radius (RFC 2865) authentication
AUTH_SASL_DESC= Enable use of Cyrus SASL auth library
AUTH_SPA_DESC= Enable Secure Password Authentication
AUTH_TLS_DESC= Enable TLS client certificate authentication
@ -129,6 +128,5 @@ SQLITE_DESC= Enable SQLite lookups
SRS_DESC= Enable Sender Rewriting Scheme
SUID_DESC= Install the exim binary suid root
TAINTWARN_DESC= Allow insecure tainted data (pre-4.93 config style, deprecated)
TCP_WRAPPERS_DESC= Enable /etc/hosts.allow access control (broken)
GNUTLS_DESC= Use GnuTLS instead of OpenSSL for TLS
WISHLIST_DESC= Include the unsupported patches