diff --git a/mail/exim-ldap2/Makefile b/mail/exim-ldap2/Makefile deleted file mode 100644 index 0619677..0000000 --- a/mail/exim-ldap2/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -PKGNAMESUFFIX= -ldap2 -MASTERDIR= ${.CURDIR}/../exim - -OPTIONS_SLAVE= OPENLDAP - -.include "${MASTERDIR}/Makefile" diff --git a/mail/exim-monitor/Makefile b/mail/exim-monitor/Makefile deleted file mode 100644 index d9baff2..0000000 --- a/mail/exim-monitor/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -PKGNAMESUFFIX= -monitor - -COMMENT= The Exim monitor for the Exim MTA - -MASTERDIR= ${.CURDIR}/../exim - -EXIMON_ONLY= yes -OPTIONS_SLAVE= EXIMON - -# This dependency is disabled, because it prevents package users from -# using the exim-monitor package with any of the exim slave packages. -# -#RUN_DEPENDS= ${LOCALBASE}/sbin/exim:mail/exim - -.include "${MASTERDIR}/Makefile" diff --git a/mail/exim-monitor/files/patch-OS__Makefile-Base b/mail/exim-monitor/files/patch-OS__Makefile-Base deleted file mode 100644 index 9dc53c9..0000000 --- a/mail/exim-monitor/files/patch-OS__Makefile-Base +++ /dev/null @@ -1,12 +0,0 @@ ---- OS/Makefile-Base.orig Wed Aug 15 13:09:05 2001 -+++ OS/Makefile-Base Mon Aug 27 14:59:04 2001 -@@ -19,7 +19,8 @@ - # up-to-date. Then the os-specific source files and the C configuration file - # are set up, and finally it goes to the main Exim target. - --all: $(EDITME) checklocalmake Makefile os.h os.c config.h allexim -+all: $(EDITME) checklocalmake Makefile os.h os.c config.h buildpcre \ -+ eximon.bin - - checklocalmake: - @if $(SHELL) $(SCRIPTS)/newer $(EDITME)-$(OSTYPE) $(EDITME) || \ diff --git a/mail/exim-monitor/files/patch-OS__Makefile-FreeBSD b/mail/exim-monitor/files/patch-OS__Makefile-FreeBSD deleted file mode 100644 index 58f6355..0000000 --- a/mail/exim-monitor/files/patch-OS__Makefile-FreeBSD +++ /dev/null @@ -1,10 +0,0 @@ ---- OS/Makefile-FreeBSD.orig Mon Jun 11 12:04:05 2001 -+++ OS/Makefile-FreeBSD Mon Jun 11 12:04:33 2001 -@@ -5,6 +5,7 @@ - PORTOBJFORMAT!= test -x /usr/bin/objformat && /usr/bin/objformat || echo aout - - CHOWN_COMMAND=/usr/sbin/chown -+STRIP_COMMAND=/usr/bin/strip - - HAVE_SA_LEN=YES - diff --git a/mail/exim-monitor/files/patch-src__EDITME b/mail/exim-monitor/files/patch-src__EDITME deleted file mode 100644 index 0ee15f3..0000000 --- a/mail/exim-monitor/files/patch-src__EDITME +++ /dev/null @@ -1,55 +0,0 @@ ---- src/EDITME.orig Mon Aug 27 14:35:47 2001 -+++ src/EDITME Mon Aug 27 14:37:31 2001 -@@ -98,7 +98,7 @@ - # /usr/local/sbin. The installation script will try to create this directory, - # and any superior directories, if they do not exist. - --BIN_DIRECTORY=/usr/exim/bin -+BIN_DIRECTORY=XX_PREFIX_XX/sbin - - - #------------------------------------------------------------------------------ -@@ -113,7 +113,7 @@ - # directories if they don't exist. It will also install a default run time - # configuration if this file does not exist. - --CONFIGURE_FILE=/usr/exim/configure -+CONFIGURE_FILE=XX_PREFIX_XX/etc/exim/configure - - - #------------------------------------------------------------------------------ -@@ -126,14 +126,14 @@ - # owner of a local mailbox.) Specifying these values as root is very strongly - # discouraged. These values are compiled into the binary. - --EXIM_USER= -+EXIM_USER=mailnull - - # If the setting of EXIM_USER is numeric (e.g. EXIM_USER=42), there must - # also be a setting of EXIM_GROUP. If, on the other hand, you use a name - # for EXIM_USER (e.g. EXIM_USER=exim), you don't need to set EXIM_GROUP unless - # you want to use a group other than the default group for the given user. - --# EXIM_GROUP= -+EXIM_GROUP=mail - - # Many sites define a user called "exim", with an appropriate default group, - # and use -@@ -371,7 +373,7 @@ - # %s. This will be replaced by one of the strings "main", "panic", or "reject" - # to form the final file names. Some installations may want something like this: - --# LOG_FILE_PATH=/var/log/exim_%slog -+LOG_FILE_PATH=/var/log/exim/%slog - - # which results in files with names /var/log/exim_mainlog, etc. The directory - # in which the log files are placed must exist; Exim does not try to create -@@ -695,7 +705,7 @@ - # (process id) to a file so that it can easily be identified. The path of the - # file can be specified here. Some installations may want something like this: - --# PID_FILE_PATH=/var/lock/exim.pid -+PID_FILE_PATH=/var/run/exim.pid - - # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory - # using the name "exim-daemon.pid". diff --git a/mail/exim-monitor/pkg-descr b/mail/exim-monitor/pkg-descr deleted file mode 100644 index c3fc07a..0000000 --- a/mail/exim-monitor/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -The Exim monitor (eximon) is a graphical user interface for the Exim -mail transfer agent for Unix systems. Eximon is distributed as part -of the standard Exim distribution, but its dependency on XFree86 -annoys many administrators. - -For this reason, it is available as its own package to allow -administrators to easily install Exim without installing XFree86. diff --git a/mail/exim-monitor/pkg-message b/mail/exim-monitor/pkg-message deleted file mode 100644 index 473687d..0000000 --- a/mail/exim-monitor/pkg-message +++ /dev/null @@ -1,14 +0,0 @@ -[ -{ type: install - message: <0:devel/p5-File-FcntlLock -RUN_DEPENDS= p5-File-FcntlLock>0:devel/p5-File-FcntlLock - -USES= compiler cpe tar:bzip2 perl5 -USE_CSTD= c99 - -# Exim build system is job unsafe atm -MAKE_JOBS_UNSAFE= yes -# One can tune the following "hidden" knobs: -# - EXIM_USER: user exim is running as; -# - EXIM_GROUP: ditto for the group; -# - LOGDIR: where Exim logs will be put; -# - LOG_FILE_PATH: path where '%s' will be substituted with -# the target name (main, reject, etc); -# - CONFIG_FILE_PATH: path to the default configuration file; -# - ALT_CONFIG_PREFIX: path to the default prefix for all -# configuration files, excluding the main one; -# will be effective only when WITH_ALT_CONFIG_PREFIX -# will be set via OPTIONS. - -.if make(makesum) && !defined(FETCH_ALL) -.error "You forgot to define FETCH_ALL to create the sane distinfo" -.endif - -.include "options" - -OPTIONS_SUB= yes - -AUTH_SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 -BDB_USES= bdb -DMARC_LIB_DEPENDS= libopendmarc.so:mail/opendmarc -EXIMON_USES= xorg -EXIMON_USE= xorg=x11,xaw,xext,xmu,xt -GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls -ICONV_USES= iconv:lib,build -INTERNATIONAL_LIB_DEPENDS= libidn.so:dns/libidn libidn2.so:dns/libidn2 -LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb -MYSQL_USES= mysql -OPENLDAP_USES= ldap -PGSQL_LIB_DEPENDS= libicudata.so:devel/icu -PGSQL_USES= pgsql pkgconfig -REDIS_LIB_DEPENDS= libhiredis.so:databases/hiredis -SASLAUTHD_RUN_DEPENDS= ${LOCALBASE}/sbin/saslauthd:security/cyrus-sasl2-saslauthd -SA_EXIM_RUN_DEPENDS= ${LOCALBASE}/bin/spamc:mail/spamassassin -SPF_LIB_DEPENDS= libspf2.so:mail/libspf2 -SQLITE_LIB_DEPENDS= libicudata.so:devel/icu -SQLITE_USES= pkgconfig sqlite - -#DEBIAN_PATCHES_PREFIX= ${FILESDIR}/debian/75 -#EXTRA_PATCHES= \ -# ${DEBIAN_PATCHES_PREFIX}_01-Fix-exit-on-attempt-to-rewrite-a-malformed-address.-.patch:-p1 \ -# ${DEBIAN_PATCHES_PREFIX}_05-SPF-fix-memory-accounting-for-error-case.patch:-p1 - -.include - -# OCSP is supported for openssl only -.if ${PORT_OPTIONS:MOCSP} -.if ! ${PORT_OPTIONS:MTLS} -IGNORE= you cannot enable OCSP stapling without TLS support -.elif ${PORT_OPTIONS:MGNUTLS} -IGNORE= you cannot enable OCSP stapling with gnutls -.endif -.endif - -# DMARC implies SPF and DKIM -.if ${PORT_OPTIONS:MDMARC} -.if ! ${PORT_OPTIONS:MSPF} || ! ${PORT_OPTIONS:MDKIM} -IGNORE= you cannot enable DMARC without SPF and DKIM support -.endif -.endif - -# ARC implies SPF and DKIM -.if ${PORT_OPTIONS:MARC} -.if ! ${PORT_OPTIONS:MSPF} || ! ${PORT_OPTIONS:MDKIM} -IGNORE= you cannot enable ARC without SPF and DKIM support -.endif -.endif -# DANE implies DNSSEC -.if ${PORT_OPTIONS:MDANE} -.if ! ${PORT_OPTIONS:MDNSSEC} || ! ${PORT_OPTIONS:MTLS} -IGNORE= you cannot enable DANE without DNSSEC support or without TLS support -.endif -.endif - -.if ${PORT_OPTIONS:MSA_EXIM} || defined(FETCH_ALL) -BROKEN= Unmaintained extension -MASTER_SITES+= http://marc.merlins.org/linux/exim/files/:sa_exim \ - SF/sa-exim/sa-exim/${SA_EXIM_VERSION}:sa_exim -DISTFILES+= sa-exim-${SA_EXIM_VERSION}.tar.gz:sa_exim -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-Local-sa-exim.c -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-Local-sa-exim.conf -.endif - -EXIM_VERSION= 4.99.3 -SA_EXIM_VERSION=4.2.1 -EXIM_INSTALL_ARG+= "-no_chown" "-no_symlink" -EXTRA_PATCHES+= `${FIND} ${PATCHDIR} -name '74_*.patch'|${SORT} -h` - -.if !defined(EXIMON_ONLY) -PLIST_SUB+= EXIM="" -.if defined(PKGNAMESUFFIX) -CONFLICTS+= ${PKGNAMEPREFIX}${PORTNAME}-4.* -.endif -.for suffix in -ldap2 -mysql -postgresql -sa-exim -sqlite -.if !defined(PKGNAMESUFFIX) || ${PKGNAMESUFFIX} != ${suffix} -CONFLICTS+= ${PKGNAMEPREFIX}${PORTNAME}${suffix}-4.* -.endif -.endfor -.if ${PORT_OPTIONS:MEXIMON} -CONFLICTS+= ${PKGNAMEPREFIX}${PORTNAME}-monitor-4.* -.endif -PKGMESSAGE= ${WRKDIR}/POST-INSTALL-NOTES -.else # !EXIMON_ONLY -PLIST_SUB+= EXIM="@comment " -PORT_OPTIONS+= EXIMON -PKGMESSAGE= ${WRKDIR}/pkg-message -EXIM_INSTALL_ARG+= "eximon" "eximon.bin" -.endif # !EXIMON_ONLY - -PORTDOC_BASE= ACKNOWLEDGMENTS NOTICE README.UPDATING -PORTDOC_FILES= ChangeLog NewStuff DANE-draft-notes \ - OptionLists.txt README README.SIEVE dbm.discuss.txt \ - experimental-spec.txt filter.txt spec.txt - -PORT_EXAMPLES= transport-filter.pl - -DAILY_SCRIPTS= 150.exim-tidydb 460.exim-mail-rejects - -MAKE_ENV+= OSTYPE="${OPSYS}" ARCHTYPE="${ARCH}" DUMMY_LDFLAGS="${DUMMY_LDFLAGS}" STRIP_COMMAND="${STRIP_CMD}" - -EXIM_USER?= mailnull -EXIM_GROUP?= mail - -# Default user/group are system ones, so we don't want to check them -.if ${EXIM_USER} != "mailnull" -USERS= ${EXIM_USER} -.endif -.if ${EXIM_GROUP} != "mail" -GROUPS= ${EXIM_GROUP} -.endif - -LOGDIR?= /var/log/exim -LOG_FILE_PATH?= ${LOGDIR}/%slog -CONFIG_FILE_PATH?= ${PREFIX}/etc/exim/configure -ALT_CONFIG_PREFIX?= ${PREFIX}/etc/exim/ - -EXIM_DYNAMIC_LDFLAGS= -fPIC -rdynamic -Wl,--export-dynamic - -SED_SCRIPT= -e 's,%%PREFIX%%,${PREFIX},g' \ - -e 's,%%DOCSDIR%%,${DOCSDIR},g' \ - -e 's,%%EXAMPLESDIR%%,${EXAMPLESDIR},g' \ - -e 's,%%EXIM_USER%%,${EXIM_USER},g' \ - -e 's,%%EXIM_GROUP%%,${EXIM_GROUP},g' \ - -e 's,%%LOGDIR%%,${LOGDIR},g' - -SEDLIST+= -e 's,XX_CFLAGS_XX,${CFLAGS:S/,/\\,/g},' \ - -e 's,XX_PREFIX_XX,${PREFIX:S/,/\\,/g},' \ - -e 's,XX_LOCALBASE_XX,${LOCALBASE:S/,/\\,/g},' \ - -e 's,XX_LOG_FILE_PATH_XX,${LOG_FILE_PATH:S/,/\\,/g},' \ - -e 's,XX_CONFIG_FILE_PATH_XX,${CONFIG_FILE_PATH:S/,/\\,/g},' \ - -e 's,XX_ALT_CONFIG_PREFIX_XX,${ALT_CONFIG_PREFIX:S/,/\\,/g},' \ - -e 's,XX_EXIM_USER_XX,${EXIM_USER:S/,/\\,/g},' \ - -e 's,XX_EXIM_GROUP_XX,${EXIM_GROUP:S/,/\\,/g},' \ - -e 's,XX_DEFAULT_CHARSET_XX,${WITH_DEFAULT_CHARSET:S/,/\\,/g},' \ - -e 's,XX_DYNAMIC_LDFLAGS_XX,${EXIM_DYNAMIC_LDFLAGS:S/,/\\,/g},' - -PLIST_SUB+= EXIM_VERSION="${EXIM_VERSION}-${PORTREVISION}" \ - EXIM_USER=${EXIM_USER} \ - EXIM_GROUP=${EXIM_GROUP} \ - LOGDIR="${LOGDIR:S/^\///}" - -# Exim refuses to run local deliveries as root by default. You can -# add other users to this colon-separated list that cannot be -# overridden at runtime below, but are advised not to remove "root". -#WITH_FIXED_NEVER_USERS= root:daemon:bin - -# When Exim is decoding MIME "words" in header lines it converts any foreign -# character sets to the one that is set in the headers_charset option. -# The default setting is defined by this setting: -WITH_DEFAULT_CHARSET?= ISO-8859-1 - -# You should not need to fiddle with anything below this point. - -LIB_DEPENDS+= libpcre2-posix.so:devel/pcre2 - -.if ! ${PORT_OPTIONS:MDKIM} -SEDLIST+= -e 's,^\# (DISABLE_DKIM=),\1,' -.endif - -.if ${PORT_OPTIONS:MLISTMATCH_RHS} -SEDLIST+= -e 's,^\# (EXPAND_LISTMATCH_RHS=),\1,' -.endif - -.if ${PORT_OPTIONS:MDCC} -SEDLIST+= -e 's,^\# (EXPERIMENTAL_DCC=),\1,' -.endif - -.if ${PORT_OPTIONS:MPROXY} -SEDLIST+= -e 's,^\# (SUPPORT_PROXY=),\1,' -.endif - -.if ${PORT_OPTIONS:MCERTNAMES} -SEDLIST+= -e 's,^\# (EXPERIMENTAL_CERTNAMES=),\1,' -.endif - -.if ${PORT_OPTIONS:MDSN} -SEDLIST+= -e 's,^\# (EXPERIMENTAL_DSN=),\1,' -.endif - -.if !${PORT_OPTIONS:MDANE} -SEDLIST+= -e 's,^(SUPPORT_DANE=),\#\1,' -.endif - -.if ${PORT_OPTIONS:MARC} -SEDLIST+= -e 's,^\# (EXPERIMENTAL_ARC=),\1,' -.endif - -.if !${PORT_OPTIONS:MEVENT} -SEDLIST+= -e 's,^\# (DISABLE_EVENT=),\1,' -.endif - -.if ${PORT_OPTIONS:MINTERNATIONAL} -SEDLIST+= -e 's,^\# (SUPPORT_I18N=),\1,' \ - -e 's,^\# (SUPPORT_I18N_2008=),\1,' \ - -e 's,XX_IDN_LIBS_XX,-L${LOCALBASE}/lib -lidn -lidn2,' -.else -SEDLIST+= -e 's,XX_IDN_LIBS_XX,,' -.endif - -.if ${PORT_OPTIONS:MSOCKS} -SEDLIST+= -e 's,^\# (SUPPORT_SOCKS=),\1,' -.endif - -.if !${PORT_OPTIONS:MPRDR} -SEDLIST+= -e 's,^\# (DISABLE_PRDR=),\1,' -.endif - -.if !${PORT_OPTIONS:MOCSP} -SEDLIST+= -e 's,^\# (DISABLE_OCSP=),\1,' -.endif - -.if !${PORT_OPTIONS:MDNSSEC} -SEDLIST+= -e 's,^\# (DISABLE_DNSSEC=),\1,' -.endif - -.if ${PORT_OPTIONS:MDMARC} -SEDLIST+= -e 's,XX_DMARC_LIBS_XX,-L${LOCALBASE}/lib -lopendmarc,' \ - -e 's,^\# (SUPPORT_DMARC=),\1,' -.else -SEDLIST+= -e 's,XX_DMARC_LIBS_XX,,' -.endif - -.if ${PORT_OPTIONS:MWISHLIST} -EXTRA_PATCHES+= `${FIND} ${PATCHDIR} -name 'wishlist-*.patch'` -.endif - -.if ${PORT_OPTIONS:MFIXED_NEVER_USERS} -SEDLIST+= -e 's,^(FIXED_NEVER_USERS=).*,\1${WITH_FIXED_NEVER_USERS:S/,/\\,/g},' -.endif - -.if ${PORT_OPTIONS:MEXIMON} -SEDLIST+= -e 's,^\# (EXIM_MONITOR=),\1,' -.endif - -.if ${PORT_OPTIONS:MTLS} -.if ! ${PORT_OPTIONS:MGNUTLS} -USES+= ssl -SEDLIST+= -e 's,^\# (USE_OPENSSL=),\1,' -SEDLIST+= -e 's,^\# (TLS_LIBS=.*-lssl[[:space:]]),\1,' -BROKEN_SSL= openssl31 -BROKEN_SSL_REASON= error: token is not a valid binary operator in a preprocessor subexpression -.else -SEDLIST+= -e 's,^\# (USE_GNUTLS=),\1,' -SEDLIST+= -e 's,^\# (TLS_LIBS=.*-lgnutls[[:space:]]),\1,' -.endif -.else # TLS support -SEDLIST+= -e 's,^\# (DISABLE_TLS=),\1,' -.endif - -.if ${PORT_OPTIONS:MEMBEDDED_PERL} -SEDLIST+= -e 's,^\# (EXIM_PERL=),\1,' -.endif - -.if ${PORT_OPTIONS:MICONV} -SEDLIST+= -e 's,XX_ICONV_LIBS_XX,-L${LOCALBASE:S/,/\\,/g}/lib ${ICONV_LIB},' \ - -e 's,^\# (HAVE_ICONV=),\1,' -.else -SEDLIST+= -e 's,XX_ICONV_LIBS_XX,,' -.endif - -.if ${PORT_OPTIONS:MOPENLDAP} -LDAP_LIB_TYPE= OPENLDAP2 -SEDLIST+= -e 's,XX_LDAP_LIBS_XX,-L${LOCALBASE:S/,/\\,/g}/lib -llber -lldap,' \ - -e 's,XX_LDAP_INCLUDE_XX,-I${LOCALBASE:S/,/\\,/g}/include,' \ - -e 's,XX_LDAP_TYPE_XX,${LDAP_LIB_TYPE:S/,/\\,/g},' \ - -e 's,^\# (LOOKUP_LDAP=),\1,' -.else -SEDLIST+= -e 's,XX_LDAP_[^ ]*_XX,,' \ - -e 's,^(LDAP_LIB_TYPE=),\# \1,' -.endif - -.if ${PORT_OPTIONS:MBDB} -INVALID_BDB_VER= 2 3 6 18 -DB_LIBS= -L${BDB_LIB_DIR} -l${BDB_LIB_NAME} -DB_INCLUDES= -I${BDB_INCLUDE_DIR} -.else -DB_LIBS= -DB_INCLUDES= -SEDLIST+= -e 's,^(DBMLIB=),\# \1,' -.endif -SEDLIST+= -e 's,XX_DB_LIBS_XX,${DB_LIBS:S/,/\\,/g},' \ - -e 's,XX_DB_INCLUDES_XX,${DB_INCLUDES:S/,/\\,/g},' - -.if ${PORT_OPTIONS:MLMDB} -_LMDB_LIBS= -L${LOCALBASE}/lib -llmdb -_LMDB_INCLUDES= -I${LOCALBASE}/include -SEDLIST+= -e 's,^\# (EXPERIMENTAL_LMDB=),\1,' -.else -_LMDB_LIBS= -_LMDB_INCLUDES= -.endif -SEDLIST+= -e 's,XX_LMDB_LIBS_XX,${_LMDB_LIBS:S/,/\\,/g},' \ - -e 's,XX_LMDB_INCLUDES_XX,${_LMDB_INCLUDES:S/,/\\,/g},' - -.if ${PORT_OPTIONS:MMYSQL} -SEDLIST+= -e 's,XX_MYSQL_LIBS_XX,-L${LOCALBASE:S/,/\\,/g}/lib/mysql -l${_MYSQL_SHLIB:S/lib//},' \ - -e 's,XX_MYSQL_INCLUDE_XX,-I${LOCALBASE:S/,/\\,/g}/include/mysql,' \ - -e 's,^\# (LOOKUP_MYSQL=),\1,' -.else -SEDLIST+= -e 's,XX_MYSQL_[^ ]*_XX,,' -.endif - -.if ${PORT_OPTIONS:MSASLAUTHD} -SASLAUTHD_SOCKET?= /var/run/saslauthd/mux -SEDLIST+= -e 's,^\# (CYRUS_SASLAUTHD_SOCKET=).*,\1${SASLAUTHD_SOCKET:S/,/\\,/g},' -.endif - -.if ${PORT_OPTIONS:MPAM} -SEDLIST+= -e 's,XX_PAM_LIBS_XX,-lpam,' \ - -e 's,^\# (SUPPORT_PAM=),\1,' -.else -SEDLIST+= -e 's,XX_PAM_LIBS_XX,,' -.endif - -.if ${PORT_OPTIONS:MAUTH_CRAM_MD5} -SEDLIST+= -e 's,^\# (AUTH_CRAM_MD5=),\1,' -.endif - -.if ${PORT_OPTIONS:MAUTH_PLAINTEXT} -SEDLIST+= -e 's,^\# (AUTH_PLAINTEXT=),\1,' -.endif - -.if ${PORT_OPTIONS:MAUTH_DOVECOT} -SEDLIST+= -e 's,^\# (AUTH_DOVECOT=),\1,' -.endif - -.if ${PORT_OPTIONS:MAUTH_SPA} -SEDLIST+= -e 's,^\# (AUTH_SPA=),\1,' -.endif - -.if ${PORT_OPTIONS:MAUTH_SASL} -SEDLIST+= -e 's,^\# (AUTH_CYRUS_SASL=),\1,' \ - -e 's,^\# (AUTH_LIBS=.*-lsasl2),\1,' -.endif - -.if ${PORT_OPTIONS:MAUTH_TLS} -SEDLIST+= -e 's,^\# (AUTH_TLS=),\1,' -.endif - -.if ${PORT_OPTIONS:MAUTH_RADIUS} -WITH_RADIUS_TYPE?= RADLIB -.if ${WITH_RADIUS_TYPE:tl} == radlib -SEDLIST+= -e 's,XX_RADIUS_LIBS_XX,-lradius,' \ - -e 's,^\# (RADIUS_CONFIG_FILE=).*,\1/etc/radius.conf,' \ - -e 's,^\# (RADIUS_LIB_TYPE=).*,\1RADLIB,' -.elif ${WITH_RADIUS_TYPE:tl} == radiusclient -LIB_DEPENDS+= libfreeradius-client.so:net/freeradius-client -SEDLIST+= -e 's,XX_RADIUS_LIBS_XX,-L${LOCALBASE:S/,/\\,/g}/lib -lfreeradius-client,' \ - -e 's,^\# (RADIUS_CONFIG_FILE=).*,\1${LOCALBASE:S/,/\\,/g}/etc/radiusclient/radiusclient.conf,' \ - -e 's,^\# (RADIUS_LIB_TYPE=).*,\1RADIUSCLIENTNEW,' -.else -IGNORE= the variable WITH_RADIUS_TYPE must be either RADLIB or RADIUSCLIENT -.endif -.else -SEDLIST+= -e 's,XX_RADIUS_LIBS_XX,,' -.endif - -.if ${PORT_OPTIONS:MPGSQL} -SEDLIST+= -e 's,XX_PGSQL_LIBS_XX,-L${LOCALBASE:S/,/\\,/g}/lib -lpq,' \ - -e 's,XX_PGSQL_INCLUDE_XX,-I${LOCALBASE:S/,/\\,/g}/include/pgsql,' \ - -e 's,^\# (LOOKUP_PGSQL=),\1,' -.else -SEDLIST+= -e 's,XX_PGSQL_[^ ]*_XX,,' -.endif - -.if ! ${PORT_OPTIONS:MPGSQL} && ! ${PORT_OPTIONS:MMYSQL} && !defined(LDAP_LIB_TYPE) && \ - ! ${PORT_OPTIONS:MBDB} && ! ${PORT_OPTIONS:MLMDB} -SEDLIST+= -e 's,^(LOOKUP_LIBS=),\# \1,' \ - -e 's,^(LOOKUP_INCLUDE=),\# \1,' -.endif - -.if ! ${PORT_OPTIONS:MDNSDB} -SEDLIST+= -e 's,^(LOOKUP_DNSDB=),\# \1,' -.endif - -.if ${PORT_OPTIONS:MMAILDIR} -SEDLIST+= -e 's,^\# (SUPPORT_MAILDIR=),\1,' -.endif - -.if ${PORT_OPTIONS:MMAILSTORE} -SEDLIST+= -e 's,^\# (SUPPORT_MAILSTORE=),\1,' -.endif - -.if ${PORT_OPTIONS:MMBX} -SEDLIST+= -e 's,^\# (SUPPORT_MBX=),\1,' -.endif - -.if ${PORT_OPTIONS:MCDB} -SEDLIST+= -e 's,^\# (LOOKUP_CDB=),\1,' -.endif - -.if ${PORT_OPTIONS:MDSEARCH} -SEDLIST+= -e 's,^\# (LOOKUP_DSEARCH=),\1,' -.endif - -.if ! ${PORT_OPTIONS:MLSEARCH} -SEDLIST+= -e 's,^(LOOKUP_LSEARCH=),\# \1,' -.endif - -.if ${PORT_OPTIONS:MNIS} -SEDLIST+= -e 's,^\# (LOOKUP_NIS=),\1,' -.endif - -.if ${PORT_OPTIONS:MPASSWD} -SEDLIST+= -e 's,^\# (LOOKUP_PASSWD=),\1,' -.endif - -.if ${PORT_OPTIONS:MSQLITE} -SEDLIST+= -e 's,XX_SQLITE_LIBS_XX,`pkg-config --static --libs sqlite3`,' \ - -e 's,XX_SQLITE_FLAGS_XX,`pkg-config --cflags sqlite3`,' \ - -e 's,^\# (LOOKUP_SQLITE=),\1,' -.else -SEDLIST+= -e 's,XX_SQLITE_LIBS_XX,,' \ - -e 's,XX_SQLITE_FLAGS_XX,,' -.endif - -.if ${PORT_OPTIONS:MREDIS} -SEDLIST+= -e 's,XX_REDIS_LIBS_XX,-L${LOCALBASE}/lib -lhiredis,' \ - -e 's,^\# (LOOKUP_REDIS=),\1,' \ - -e 's,^\# (REDIS=),\1,' -.else -SEDLIST+= -e 's,XX_REDIS_LIBS_XX,,' -.endif - -.if ${PORT_OPTIONS:MLMTP} -SEDLIST+= -e 's,^\# (TRANSPORT_LMTP=),\1,' -.endif - -.if ! ${PORT_OPTIONS:MALT_CONFIG_PREFIX} -SEDLIST+= -e 's,^(ALT_CONFIG_PREFIX=),\# \1,' -.endif - -.if ${PORT_OPTIONS:MSPF} -SEDLIST+= -e 's,XX_SPF_FLAGS_XX,-DSPF,' \ - -e 's,XX_SPF_LIBS_XX,-L${LOCALBASE}/lib -lspf2 -lpthread,' \ - -e 's,^\# (SUPPORT_SPF=),\1,' -.else -SEDLIST+= -e 's,XX_SPF_FLAGS_XX,,' \ - -e 's,XX_SPF_LIBS_XX,,' -.endif - -.if ${PORT_OPTIONS:MSRS} -SEDLIST+= -e 's,XX_SRS_FLAGS_XX,-DSUPPORT_SRS,' \ - -e 's,XX_SRS_LIBS_XX,,' -.elif ${PORT_OPTIONS:MOLD_SRS} -LIB_DEPENDS+= libsrs_alt.so:mail/libsrs_alt -SEDLIST+= -e 's,XX_SRS_FLAGS_XX,-DEXPERIMENTAL_SRS_ALT,' \ - -e 's,XX_SRS_LIBS_XX,-L${LOCALBASE}/lib -lsrs_alt,' -.else -SEDLIST+= -e 's,XX_SRS_FLAGS_XX,,' \ - -e 's,XX_SRS_LIBS_XX,,' -.endif - -.if ${PORT_OPTIONS:MREADLINE} -SEDLIST+= -e 's,^\# (USE_READLINE=),\1,' -.endif - -.if ${PORT_OPTIONS:MCONTENT_SCAN} -SEDLIST+= -e 's,^\# (WITH_CONTENT_SCAN=),\1,' -.endif - -.if !defined(EXIMON_ONLY) && ${PORT_OPTIONS:MDAEMON} -USE_RC_SUBR= exim -PLIST_SUB+= EXIMDAEMON="" -SUB_LIST+= LOGDIR="${LOGDIR}" -.else -PLIST_SUB+= EXIMDAEMON="@comment " -.endif - -.if ${PORT_OPTIONS:MIPV6} -SEDLIST+= -e 's,^\# (HAVE_IPV6=),\1,' -.endif - -.if ${PORT_OPTIONS:MDISABLE_D_OPT} -SEDLIST+= -e 's,^\# (DISABLE_D_OPTION=),\1,' -.else -.if defined(WHITELIST_D_MACROS) -SEDLIST+= -e 's,^\# (WHITELIST_D_MACROS=).*$$,\1${WHITELIST_D_MACROS:S/,/\\,/g},' -.endif -.endif - -.if defined(TRUSTED_CONFIG_LIST) -SEDLIST+= -e 's,^\# (TRUSTED_CONFIG_LIST=).*$$,\1${TRUSTED_CONFIG_LIST:S/,/\\,/g},' -.endif - -.if ${PORT_OPTIONS:MQUEUEFILE} -SEDLIST+= -e 's,^\# (EXPERIMENTAL_QUEUEFILE=),\1,' -.endif - -MAKE_ENV+= INSTALL_ARG="${EXIM_INSTALL_ARG}" -DUMMY_LDFLAGS!= ${ECHO_CMD} ${LDFLAGS} | ${SED} -e 's|-Wl,-rpath|-Wl,-DUMMYrpath|g; s|-rpath|-Wl,-rpath|g; s|-DUMMYrpath|-rpath|g' - -pre-everything:: - @${ECHO} 'Exim now drops privileges when alternate configuration' - @${ECHO} 'files are used. You can set make variable TRUSTED_CONFIG_LIST' - @${ECHO} 'to specify the list of configuration files for which' - @${ECHO} 'root privileges will be retained.' - @${ECHO} '' - @${ECHO} 'You can whitelist some macros using the make variable' - @${ECHO} 'WHITELIST_D_MACROS. This is useful if you are running' - @${ECHO} 'with DISABLE_D_OPT set, but macros whitelisting will be' - @${ECHO} 'removed in some future Exim release, so it is better' - @${ECHO} 'to use TRUSTED_CONFIG_LIST to set the list of trusted' - @${ECHO} 'configuration files.' -.if empty(.MAKEFLAGS:M-s) && ${PORT_OPTIONS:MWISHLIST} - @${ECHO} '' - @${ECHO} 'Included extra patches:' - @${FIND} ${PATCHDIR} -name 'wishlist-*.patch' \ - -exec ${SED} -ne 's,^# , ,p' {} \; - @${ECHO} '' -.endif - -post-extract: -.if ${PORT_OPTIONS:MSA_EXIM} - @cd ${WRKDIR} && ${TAR} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/sa-exim-${SA_EXIM_VERSION}.tar.gz ${EXTRACT_AFTER_ARGS} - @@${CP} ${WRKDIR}/sa-exim-${SA_EXIM_VERSION}/sa-exim.c ${WRKSRC}/Local - @@${CP} ${WRKDIR}/sa-exim-${SA_EXIM_VERSION}/sa-exim.conf ${WRKSRC}/Local -.endif - -do-configure: - @${MKDIR} ${WRKSRC}/Local - @${SED} -E ${SEDLIST} ${WRKSRC}/src/EDITME > ${WRKSRC}/Local/Makefile -.if ${PORT_OPTIONS:MEXIMON} - @${CP} ${WRKSRC}/exim_monitor/EDITME ${WRKSRC}/Local/eximon.conf -.endif - @${REINPLACE_CMD} -E ${SEDLIST} ${WRKSRC}/src/configure.default - @${REINPLACE_CMD} -e 's!$$(LDFLAGS)!$$(DUMMY_LDFLAGS) -L$${LOCALBASE}/lib!' ${WRKSRC}/OS/Makefile-Base - @${REINPLACE_CMD} -e 's/"(Exim $$version_number)\\n\\t"/"(Exim $$version_number (${OPSYS}))\\n\\t"/' \ - ${WRKSRC}/src/globals.c - @${REINPLACE_CMD} -e 's/Exim version %s \(#%s \)\{0,1\}/&(${OPSYS} ${OSREL}) /' ${WRKSRC}/src/exim.c - @${REINPLACE_CMD} -e 's/^#include "cnumber\.h"$$/${PORTREVISION}/' ${WRKSRC}/src/version.c - @${REINPLACE_CMD} -E -e 's/^(PERL_COMMAND=).*/\1${PERL:S,/,\/,g}/' \ - -e 's/^(CC=).*/\1${CC:S,/,\/,g}/' ${WRKSRC}/OS/Makefile-Default -.if ${PORT_OPTIONS:MSA_EXIM} - @${REINPLACE_CMD} -E -e 's/^\# (HAVE_LOCAL_SCAN=).*/\1yes/' \ - ${WRKSRC}/OS/Makefile-Default - @${REINPLACE_CMD} -E -e 's/^(LOCAL_SCAN_SOURCE=).*/\1Local\/sa-exim.c/' \ - ${WRKSRC}/OS/Makefile-Default - @{ \ - ${ECHO_CMD} "char *version=\"${SA_EXIM_VERSION}\";"; \ - ${ECHO_CMD} "#define SPAMC_LOCATION \"${LOCALBASE}/bin/spamc\""; \ - ${ECHO_CMD} "#define SPAMASSASSIN_CONF \"${PREFIX}/etc/exim/sa-exim.conf\""; \ - } > ${WRKSRC}/Local/sa-exim.h - @${REINPLACE_CMD} -e 's,/usr/bin/spamc,${LOCALBASE}/bin/spamc,' \ - ${WRKSRC}/Local/sa-exim.conf -.endif - @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} configure) - -post-build: -.for script in ${DAILY_SCRIPTS} - @${SED} ${SED_SCRIPT} ${FILESDIR}/${script}.sh > ${WRKDIR}/${script}.sh -.endfor - @${SED} ${SED_SCRIPT} ${FILESDIR}/POST-INSTALL-NOTES > \ - ${WRKDIR}/POST-INSTALL-NOTES - @${SED} ${SED_SCRIPT} ${FILESDIR}/POST-INSTALL-NOTES.clamd > ${WRKDIR}/POST-INSTALL-NOTES.clamd - @${SED} ${SED_SCRIPT} ${FILESDIR}/POST-INSTALL-NOTES > ${WRKDIR}/POST-INSTALL-NOTES - @[ ! -f ${PKGDIR}/pkg-message ] || ${SED} ${SED_SCRIPT} ${PKGDIR}/pkg-message > ${WRKDIR}/pkg-message - -.if !defined(EXIMON_ONLY) -post-install: -.if ${PORT_OPTIONS:MDAEMON} - ${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily -.for script in ${DAILY_SCRIPTS} - ${INSTALL_SCRIPT} ${WRKDIR}/${script}.sh ${STAGEDIR}${PREFIX}/etc/periodic/daily/${script} -.endfor -.endif - @${MKDIR} -m 750 ${STAGEDIR}${LOGDIR} - ${INSTALL_MAN} ${WRKSRC}/doc/exim.8 ${STAGEDIR}${PREFIX}/share/man/man8 -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKDIR}/POST-INSTALL-NOTES ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKDIR}/POST-INSTALL-NOTES.clamd ${STAGEDIR}${DOCSDIR} -.for docfile in ${PORTDOC_BASE} - ${INSTALL_DATA} ${WRKSRC}/${docfile} ${STAGEDIR}${DOCSDIR} -.endfor -.for docfile in ${PORTDOC_FILES} - ${INSTALL_DATA} ${WRKSRC}/doc/${docfile} ${STAGEDIR}${DOCSDIR} -.endfor - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} -.for example in ${PORT_EXAMPLES} - ${INSTALL_SCRIPT} ${WRKSRC}/build-${OPSYS}-${ARCH}/${example} ${STAGEDIR}${EXAMPLESDIR} -.endfor -.endif -.if ${PORT_OPTIONS:MSA_EXIM} - ${INSTALL_DATA} ${WRKSRC}/Local/sa-exim.conf \ - ${STAGEDIR}${PREFIX}/etc/exim/sa-exim.conf.sample -.endif - -.endif # ! defined(EXIMON_ONLY) - -.include - -# If using clang, avoid too many warnings due to Exim code style -.if ${CHOSEN_COMPILER_TYPE} == "clang" -EXIM_WARN_FLAGS?= -Wno-logical-op-parentheses -Wno-macro-redefined -Wno-parentheses -Wno-dangling-else -.endif -CFLAGS+= ${EXIM_WARN_FLAGS} - -.include diff --git a/mail/exim/distinfo b/mail/exim/distinfo deleted file mode 100644 index aaea060..0000000 --- a/mail/exim/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -TIMESTAMP = 1778635962 -SHA256 (exim/exim-4.99.3.tar.bz2) = 08f3096a9de857c040e2f5bb13517cf7eae97553b31c76f3846970de13744691 -SIZE (exim/exim-4.99.3.tar.bz2) = 2134633 -SHA256 (exim/sa-exim-4.2.1.tar.gz) = 24d4bf7b0fdddaea11f132981cebb6a86a4ab20ef54111a8ebd481b421c6e2c1 -SIZE (exim/sa-exim-4.2.1.tar.gz) = 68933 diff --git a/mail/exim/files/150.exim-tidydb.sh b/mail/exim/files/150.exim-tidydb.sh deleted file mode 100644 index 67e6895..0000000 --- a/mail/exim/files/150.exim-tidydb.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh -# -# Exim hints database maintenance -# -# contributed by: Oliver Eikemeier -# - -# If there is a global system configuration file, suck it in. -# -if [ -r /etc/defaults/periodic.conf ]; then - . /etc/defaults/periodic.conf - source_periodic_confs -fi - -: ${exim_tidydb_enable="YES"} -: ${exim_tidydb="%%PREFIX%%/sbin/exim_tidydb"} -# Set this to arbitrary shell command to filter -# the output from this periodic script, for example, -# exim_tidydb_filter="| tail -100". -: ${exim_tidydb_filter=""} -: ${exim_dbdir="/var/spool/exim"} - -tidy () { - for db in "$exim_dbdir"/db/*.lockfile; do - [ "$db" = "$exim_dbdir/db/*.lockfile" ] && continue - echo - db_name=`basename "$db" .lockfile` - if [ -e "${exim_dbdir}/db/${db_name}.db" ]; then - "$exim_tidydb" "$exim_dbdir" "$db_name" - fi - done -} - -case "$exim_tidydb_enable" in - [Yy][Ee][Ss]) - echo "" - echo "Tidying Exim hints databases:" - eval tidy "$exim_tidydb_filter" - if [ $? = 0 ]; then - rc=0 - else - rc=1 - fi - ;; - - *) rc=0;; -esac - -exit $rc diff --git a/mail/exim/files/460.exim-mail-rejects.sh b/mail/exim/files/460.exim-mail-rejects.sh deleted file mode 100644 index d23d1e7..0000000 --- a/mail/exim/files/460.exim-mail-rejects.sh +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/sh -# -# Check for rejected mail -# Log lines that end with ' : IGNORE' will not be reported -# -# contributed by: Oliver Eikemeier -# - -# If there is a global system configuration file, suck it in. -# -if [ -r /etc/defaults/periodic.conf ] -then - . /etc/defaults/periodic.conf - source_periodic_confs -fi - -: ${exim_status_mail_rejects_enable="YES"} -: ${exim_status_mail_rejects_logs=2} -: ${exim_rejectlog="%%LOGDIR%%/rejectlog"} - -case "$exim_status_mail_rejects_enable" in - [Yy][Ee][Ss]) - if [ ! -d `dirname "$exim_rejectlog"` ] - then - echo '$exim_status_mail_rejects_enable is set but' \ - "`dirname "$exim_rejectlog"` doesn't exist" - rc=2 - elif [ "$exim_status_mail_rejects_logs" -le 0 ] - then - echo '$exim_status_mail_rejects_enable is set but' \ - '$exim_status_mail_rejects_logs is not greater than zero' - rc=2 - else - echo - echo "Checking for rejected mail:" - - start=`date -v-1d '+%Y-%m-%d'` - n=$(($exim_status_mail_rejects_logs - 2)) - rc=$({ - while [ $n -ge 0 ] - do - if [ -f "$exim_rejectlog.$n" ] - then - cat "$exim_rejectlog.$n" - elif [ -f "$exim_rejectlog.$n.gz" ] - then - zcat -fc "$exim_rejectlog.$n.gz" - elif [ -f "$exim_rejectlog.$n.bz2" ] - then - bzcat -fc "$exim_rejectlog.$n.bz2" - fi - n=$(($n - 1)) - done - if [ -f "$exim_rejectlog" ] - then - cat "$exim_rejectlog" - fi - } | - grep -e "^$start" | grep -v ' : IGNORE$' | tee /dev/stderr | wc -l) - [ $rc -gt 0 ] && rc=1 - fi;; - - *) rc=0;; -esac - -exit $rc diff --git a/mail/exim/files/POST-INSTALL-NOTES b/mail/exim/files/POST-INSTALL-NOTES deleted file mode 100644 index 2ff6ce5..0000000 --- a/mail/exim/files/POST-INSTALL-NOTES +++ /dev/null @@ -1,48 +0,0 @@ -[ -{ type: install - message: < Exim options (command line) - %%DOCSDIR%%/spec.txt -> Exim Specification (User Guide) - %%DOCSDIR%%/filter.txt -> Exim Filter Specification (for end-users) - -Postscript, PDF, HTML and texinfo versions of these documents can be -installed via one of the mail/exim-doc-* ports. - -An online version as well as a comprehensive FAQ and a mailing list -archive is available at: - - http://www.exim.org/ - -Descriptions of new features not available it the manual, and a listing -of all changes, including bug fixes are documented in: - - %%DOCSDIR%%/NewStuff - %%DOCSDIR%%/ChangeLog - -To use Exim instead of sendmail on startup: - -*) Clear the sendmail queue and stop the sendmail daemon. -*) Adjust mailer.conf(5) as appropriate. -*) Set the 'sendmail_enable' rc.conf(5) variable to 'NONE'. -*) Set the 'daily_status_include_submit_mailq' and - 'daily_clean_hoststat_enable' periodic.conf(5) - variables to 'NO'. -*) Consider setting 'daily_queuerun_enable' and - 'daily_submit_queuerun' to "NO" in periodic.conf(5), - if you intend to manage queue runners / deliveries closely. -*) Set the 'exim_enable' rc.conf(5) variable to 'YES'. -*) Start exim with '%%PREFIX%%/etc/rc.d/exim start'. - -You may also want to configure newsyslog(8) to rotate Exim log files: - -%%LOGDIR%%/mainlog mailnull:mail 640 7 * @T00 ZN -%%LOGDIR%%/rejectlog mailnull:mail 640 7 * @T00 ZN - -Additional scripts to help upgrading are installed in: - - %%EXAMPLESDIR%% -EOM -} -] diff --git a/mail/exim/files/POST-INSTALL-NOTES.clamd b/mail/exim/files/POST-INSTALL-NOTES.clamd deleted file mode 100644 index 6837b29..0000000 --- a/mail/exim/files/POST-INSTALL-NOTES.clamd +++ /dev/null @@ -1,52 +0,0 @@ -[ -{ type: install - message: < - -EOM -} -] diff --git a/mail/exim/files/exim.in b/mail/exim/files/exim.in deleted file mode 100644 index 355b93d..0000000 --- a/mail/exim/files/exim.in +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/sh - -# PROVIDE: mail -# REQUIRE: LOGIN -# KEYWORD: shutdown -# we make mail start late, so that things like .forward's are not -# processed until the system is fully operational - -# -# Add the following lines to /etc/rc.conf to enable exim: -# -#exim_enable="YES" -# -# See exim(8) for flags -# - -. /etc/rc.subr - -name=exim -rcvar=exim_enable - -command=%%PREFIX%%/sbin/exim -pidfile=/var/run/exim.pid -required_dirs=%%LOGDIR%% -required_files=%%PREFIX%%/etc/exim/configure - -start_precmd=start_precmd -stop_postcmd=stop_postcmd - -extra_commands="reload" - -start_precmd() -{ - case $sendmail_enable in - [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) - warn "sendmail_enable should be set to NONE" - ;; - [Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0) - case $sendmail_submit_enable in - [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) - warn "sendmail_submit_enable should be set to NO" - ;; - esac - ;; - [Nn][Oo][Nn][Ee]) - ;; - esac -} - -stop_postcmd() -{ - rm -f $pidfile -} - -# read settings, set default values -load_rc_config $name -: ${exim_enable="NO"} -: ${exim_flags="-bd -q30m"} - -run_rc_command "$1" diff --git a/mail/exim/files/extra-patch-Local-sa-exim.c b/mail/exim/files/extra-patch-Local-sa-exim.c deleted file mode 100644 index 8fe2854..0000000 --- a/mail/exim/files/extra-patch-Local-sa-exim.c +++ /dev/null @@ -1,225 +0,0 @@ ---- Local/sa-exim.c.orig 2025-12-18 04:08:13.593344000 +0100 -+++ Local/sa-exim.c 2025-12-18 04:10:17.527828000 +0100 -@@ -29,10 +29,7 @@ - #include "sa-exim.h" - - /* Exim includes */ --#include "local_scan.h" --extern FILE *smtp_out; /* Exim's incoming SMTP output file */ --extern int body_linecount; /* Line count in body */ --extern uschar *primary_hostname; -+#include - - #ifdef DLOPEN_LOCAL_SCAN - -@@ -409,6 +406,11 @@ - if (buffer[strlen(buffer)-1] == '\n') - { - buffer[strlen(buffer)-1]=0; -+ /* and any carriage return */ -+ if (buffer[strlen(buffer)-1] == '\r') -+ { -+ buffer[strlen(buffer)-1]=0; -+ } - } - if (SAEximDebug > 5) - { -@@ -515,6 +517,7 @@ - int pid; - int writefd[2]; - int readfd[2]; -+ char *spamc_argv[10]; - int i; - /* These are the only values that we want working after the longjmp - * The automatic ones can be clobbered, but we don't really care */ -@@ -536,8 +539,8 @@ - time_t beforescan; - time_t afterscan; - time_t afterwait; -- time_t scantime=0; -- time_t fulltime=0; -+ int scantime=0; -+ int fulltime=0; - struct stat stbuf; - - uschar *expand; -@@ -550,8 +553,9 @@ - static char *SAspamcpath=SPAMC_LOCATION; - static char *SAsafemesgidchars=SAFEMESGIDCHARS - static char *SAspamcSockPath=NULL; -- static char *SAspamcPort="783"; -- static char *SAspamcHost="127.0.0.1"; -+ static char *SAspamcPort=NULL; -+ static char *SAspamcHost=NULL; -+ static char *SAspamcUser=NULL; - static char *SAEximRunCond="0"; - static char *SAEximRejCond="1"; - static int SAmaxbody=250*1024; -@@ -602,6 +606,10 @@ - /* Do not put a %s in there, or you'll segfault */ - static char *SAmsgerror="Temporary local error while processing message, please contact postmaster"; - -+ /* This needs to be retrieved through expand_string in order -+ not to violate the API. */ -+ uschar *primary_hostname=expand_string("$primary_hostname"); -+ - /* New values we read from spamassassin */ - char *xspamstatus=NULL; - char *xspamflag=NULL; -@@ -712,6 +720,7 @@ - M_CHECKFORSTR(SAspamcSockPath); - M_CHECKFORSTR(SAspamcPort); - M_CHECKFORSTR(SAspamcHost); -+ M_CHECKFORSTR(SAspamcUser); - M_CHECKFORSTR(SAEximRunCond); - M_CHECKFORSTR(SAEximRejCond); - M_CHECKFORVAR(SAmaxbody, "%d"); -@@ -914,6 +923,22 @@ - ret=dup2(readfd[1],2); - CHECKERR(ret,"dup2 stderr",__LINE__); - -+ i = 0; -+ spamc_argv[i++] = "spamc"; -+ if (SAspamcUser && SAspamcUser[0]) -+ { -+ expand=expand_string(SAspamcUser); -+ if (expand == NULL) -+ { -+ log_write(0, LOG_MAIN | LOG_PANIC, "SA: SAspamcUser expansion failure on %s, will run as Exim user instead.", SAspamcUser); -+ } -+ else if (expand[0] != '\0') -+ { -+ spamc_argv[i++] = "-u"; -+ spamc_argv[i++] = expand; -+ } -+ } -+ - /* - * I could implement the spamc protocol and talk to spamd directly - * instead of forking spamc, but considering the overhead spent -@@ -924,17 +949,30 @@ - /* Ok, we cheat, spamc cares about how big the whole message is and - * we only know about the body size, so I'll give an extra 16K - * to account for any headers that can accompany the message */ -+ -+ spamc_argv[i++] = "-s"; -+ spamc_argv[i++] = string_sprintf("%d", SAmaxbody+16384); -+ - if(SAspamcSockPath) - { -- ret=execl(SAspamcpath, "spamc", "-s", string_sprintf("%d", SAmaxbody+16384), "-U", SAspamcSockPath, NULL); -- CHECKERR(ret,string_sprintf("exec %s", SAspamcpath),__LINE__); -+ spamc_argv[i++] = "-U"; -+ spamc_argv[i++] = SAspamcSockPath; - } - else - { -- ret=execl(SAspamcpath, "spamc", "-s", string_sprintf("%d", SAmaxbody+16384), "-d", SAspamcHost, "-p", SAspamcPort, NULL); -- CHECKERR(ret,string_sprintf("exec %s", SAspamcpath),__LINE__); -+ if (SAspamcHost) { -+ spamc_argv[i++] = "-d"; -+ spamc_argv[i++] = SAspamcHost; -+ } -+ if (SAspamcPort) { -+ spamc_argv[i++] = "-p"; -+ spamc_argv[i++] = SAspamcPort; -+ } - } -- -+ spamc_argv[i++] = NULL; -+ -+ ret=execv(SAspamcpath, spamc_argv); -+ CHECKERR(ret,string_sprintf("exec %s", SAspamcpath),__LINE__); - } - - if (SAEximDebug > 8) -@@ -1045,6 +1083,11 @@ - if (buffer[strlen(buffer)-1] == '\n') - { - buffer[strlen(buffer)-1]=0; -+ /* and any carriage return */ -+ if (buffer[strlen(buffer)-1] == '\r') -+ { -+ buffer[strlen(buffer)-1]=0; -+ } - } - restart: - if (SAEximDebug > 5) -@@ -1154,7 +1197,7 @@ - { - if (SAEximDebug > 5) - { -- log_write(0, LOG_MAIN, "SA: Debug6: spamc read got newline, end of headers", buffer); -+ log_write(0, LOG_MAIN, "SA: Debug6: spamc read got newline, end of headers"); - } - goto exit; - } -@@ -1214,11 +1257,11 @@ - { - if (SAEximDebug > 8) - { -- log_write(0, LOG_MAIN, "SA: Debug9: Read body from SA; line %d (read %d)", line, strlen(buffer)); -+ log_write(0, LOG_MAIN, "SA: Debug9: Read body from SA; line %d (read %zd)", line, strlen(buffer)); - } - - stret=write(fd, buffer, strlen(buffer)); -- CHECKERR(stret,string_sprintf("SA body write to msg"),__LINE__); -+ CHECKERR(stret,string_sprintf("%s", "SA body write to msg"),__LINE__); - if (SAEximDebug > 8) - { - log_write(0, LOG_MAIN, "SA: Debug9: Wrote to msg; line %d (wrote %d)", line, ret); -@@ -1229,18 +1272,20 @@ - } - } - -+ - if (SAEximDebug > 1) - { - log_write(0, LOG_MAIN, "SA: Debug2: body_linecount before SA: %d", body_linecount); - } - - /* update global variable $body_linecount to reflect the new body size*/ -- body_linecount = (line - 1); -+ if (body_linecount > 0) body_linecount = (line - 1); // Not updating if zero, indicating spool_wireformat - - if (SAEximDebug > 1) - { - log_write(0, LOG_MAIN, "SA: Debug2: body_linecount after SA: %d", body_linecount); - } -+ - } - - fclose((FILE *)readfh); -@@ -1331,6 +1376,9 @@ - - if (dorej && doteergrube) - { -+ char *teergrubewaitstr; -+ teergrubewaitstr=string_sprintf(SAmsgteergrubewait, spamstatus); -+ - /* By default, we'll only save temp bounces by message ID so - * that when the same message is submitted several times, we - * overwrite the same file on disk and not create a brand new -@@ -1353,20 +1401,8 @@ - - for (i=0;i/dev/null | \ -- awk '/Exim version/ { OFS=""; print $3,"-",substr($4,2,length($4)-1) }'`${EXE} -+ version=exim - - if [ "${version}" = "exim-${EXE}" ]; then - echo $com "" -@@ -384,9 +386,8 @@ - echo $com ' ' ${CONFIGURE_FILE} - echo $com Therefore, skipping automatic installation. - --elif [ ! -f ${CONFIGURE_FILE} ]; then -- echo $com Installing default configuration in ${CONFIGURE_FILE} -- echo $com because there is no existing configuration file. -+else -+ echo $com Installing default configuration in ${CONFIGURE_FILE}.sample - if [ "${SYSTEM_ALIASES_FILE}" = "" ] ; then - SYSTEM_ALIASES_FILE=/etc/aliases - echo $com This configuration has system aliases in ${SYSTEM_ALIASES_FILE}. -@@ -396,8 +397,8 @@ - ${real} ${MKDIR} -p `${DIRNAME} ${CONFIGURE_FILE}` - - echo sed -e '\\' -- echo " \"/SYSTEM_ALIASES_FILE/ s'SYSTEM_ALIASES_FILE'${ACTUAL_SYSTEM_ALIASES_FILE}'\"" '\\' -- echo " ../src/configure.default > \${CONFIGURE_FILE}" -+ echo " \"/SYSTEM_ALIASES_FILE/ s'SYSTEM_ALIASES_FILE'/etc/aliases'\"" '\\' -+ echo " ../src/configure.default > \${CONFIGURE_FILE}.sample" - - # I can't find a way of writing this using the ${real} feature because - # it seems that the output redirection always happens, even when -n was -@@ -405,8 +406,8 @@ - - if [ "$real" = "" ] ; then - sed -e \ -- "/SYSTEM_ALIASES_FILE/ s'SYSTEM_ALIASES_FILE'${ACTUAL_SYSTEM_ALIASES_FILE}'" \ -- ../src/configure.default > ${CONFIGURE_FILE} -+ "/SYSTEM_ALIASES_FILE/ s'SYSTEM_ALIASES_FILE'/etc/aliases'" \ -+ ../src/configure.default > ${CONFIGURE_FILE}.sample - else - true - fi -@@ -416,24 +417,22 @@ - echo $com "*** Exim installation ${ver}failed ***" - exit 1 - fi -- if [ ! -f ${SYSTEM_ALIASES_FILE} ]; then -- echo $com '****' -- echo $com Installing a dummy ${SYSTEM_ALIASES_FILE} file because you do not have -- echo $com one, and the default configuration requires it. You should -- echo $com edit ${SYSTEM_ALIASES_FILE} and at least create an alias for postmaster. -- echo $com '***' -- echo ${CP} ../src/aliases.default ${SYSTEM_ALIASES_FILE} -- ${real} ${CP} ../src/aliases.default ${SYSTEM_ALIASES_FILE} -- fi -+# if [ ! -f ${SYSTEM_ALIASES_FILE} ]; then -+# echo $com '****' -+# echo $com Installing a dummy ${SYSTEM_ALIASES_FILE} file because you do not have -+# echo $com one, and the default configuration requires it. You should -+# echo $com edit ${SYSTEM_ALIASES_FILE} and at least create an alias for postmaster. -+# echo $com '***' -+# echo ${CP} ../src/aliases.default ${SYSTEM_ALIASES_FILE} -+# ${real} ${CP} ../src/aliases.default ${SYSTEM_ALIASES_FILE} -+# fi - --else -- echo $com Configuration file ${CONFIGURE_FILE} already exists - fi - - # Install info files if the directory is defined and the Texinfo - # source documentation is present. - --if [ "${INFO_DIRECTORY}" != "" -a -f ../doc/spec.texinfo ] ; then -+if [ "$do_info" != "no" -a -f ../doc/spec.texinfo ] ; then - echo $com "" - if [ ! -d "${INFO_DIRECTORY}" ] ; then - echo mkdir -p ${INFO_DIRECTORY} diff --git a/mail/exim/files/patch-src-lookups-mysql.c b/mail/exim/files/patch-src-lookups-mysql.c deleted file mode 100644 index db54d35..0000000 --- a/mail/exim/files/patch-src-lookups-mysql.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/lookups/mysql.c.orig 2017-03-05 00:21:35.000000000 +0300 -+++ src/lookups/mysql.c 2017-08-15 01:12:26.508519000 +0300 -@@ -13,6 +13,7 @@ - #include "lf_functions.h" - - #include /* The system header */ -+#include - - - /* Structure and anchor for caching connections. */ diff --git a/mail/exim/files/patch-src__EDITME b/mail/exim/files/patch-src__EDITME deleted file mode 100644 index a01bbba..0000000 --- a/mail/exim/files/patch-src__EDITME +++ /dev/null @@ -1,146 +0,0 @@ ---- 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. - --BIN_DIRECTORY=/usr/exim/bin -+BIN_DIRECTORY=XX_PREFIX_XX/sbin - - - #------------------------------------------------------------------------------ -@@ -120,7 +120,7 @@ - # don't exist. It will also install a default runtime configuration if this - # file does not exist. - --CONFIGURE_FILE=/usr/exim/configure -+CONFIGURE_FILE=XX_CONFIG_FILE_PATH_XX - - # It is possible to specify a colon-separated list of files for CONFIGURE_FILE. - # In this case, Exim will use the first of them that exists when it is run. -@@ -137,7 +137,7 @@ - # deliveries. (Local deliveries run as various non-root users, typically as the - # owner of a local mailbox.) Specifying these values as root is not supported. - --EXIM_USER= -+EXIM_USER=ref:XX_EXIM_USER_XX - - # If you specify EXIM_USER as a name, this is looked up at build time, and the - # uid number is built into the binary. However, you can specify that this -@@ -158,7 +158,7 @@ - # for EXIM_USER (e.g. EXIM_USER=exim), you don't need to set EXIM_GROUP unless - # you want to use a group other than the default group for the given user. - --# EXIM_GROUP= -+EXIM_GROUP=ref:XX_EXIM_GROUP_XX - - # Many sites define a user called "exim", with an appropriate default group, - # and use -@@ -476,6 +476,7 @@ - # LDAP_LIB_TYPE=OPENLDAP2 - # LDAP_LIB_TYPE=NETSCAPE - # LDAP_LIB_TYPE=SOLARIS -+LDAP_LIB_TYPE=XX_LDAP_TYPE_XX - - # If you don't set any of these, Exim assumes the original University of - # Michigan (OpenLDAP 1) library. -@@ -524,9 +525,10 @@ - # LSEARCH, DSEARCH & CDB have no external library needs. - # DNSDB needs the resolver library which the core uses anyway. - --# LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include -I /usr/local/pgsql/include --# LOOKUP_INCLUDE +=-I /usr/local/include --# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq -lgds -lsqlite3 -llmdb -+INCLUDE=-IXX_LOCALBASE_XX/include XX_DB_INCLUDES_XX XX_LMDB_INCLUDES_XX -+LOOKUP_INCLUDE=XX_MYSQL_INCLUDE_XX XX_PGSQL_INCLUDE_XX XX_LDAP_INCLUDE_XX -+LOOKUP_LIBS=XX_MYSQL_LIBS_XX XX_PGSQL_LIBS_XX XX_LDAP_LIBS_XX XX_LMDB_LIBS_XX -+DBMLIB=XX_DB_LIBS_XX - - # LOOKUP_LIBS=-L/usr/local/lib -lldap -llber - # Some platforms may need this for LOOKUP_NIS: -@@ -715,6 +717,7 @@ - # Uncomment the following line to add XCLIENT support - # EXPERIMENTAL_XCLIENT=yes - -+# EXPERIMENTAL_DCC=yes - ############################################################################### - # THESE ARE THINGS YOU MIGHT WANT TO SPECIFY # - ############################################################################### -@@ -809,6 +812,7 @@ - - # ALT_CONFIG_PREFIX=/some/directory/ - # ALT_CONFIG_PREFIX=/some/directory/exim.conf- -+ALT_CONFIG_PREFIX=XX_ALT_CONFIG_PREFIX_XX - - - #------------------------------------------------------------------------------ -@@ -917,7 +921,7 @@ - # one that is set in the headers_charset option. The default setting is - # defined by this setting: - --HEADERS_CHARSET="ISO-8859-1" -+HEADERS_CHARSET="XX_DEFAULT_CHARSET_XX" - - # If you are going to make use of $header_xxx expansions in your configuration - # file, or if your users are going to use them in filter files, and the normal -@@ -950,6 +954,8 @@ - # - # 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_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 -@@ -1013,7 +1019,7 @@ - # Once you have done this, "make install" will build the info files and - # install them in the directory you have defined. - --# INFO_DIRECTORY=/usr/share/info -+INFO_DIRECTORY=XX_PREFIX_XX/share/info - - - #------------------------------------------------------------------------------ -@@ -1026,7 +1032,7 @@ - # %s. This will be replaced by one of the strings "main", "panic", or "reject" - # to form the final file names. Some installations may want something like this: - --# LOG_FILE_PATH=/var/log/exim_%slog -+LOG_FILE_PATH=XX_LOG_FILE_PATH_XX - - # which results in files with names /var/log/exim_mainlog, etc. The directory - # in which the log files are placed must exist; Exim does not try to create -@@ -1114,7 +1120,7 @@ - # that the local_scan API is made available by the linker. You may also need - # to add -ldl to EXTRALIBS so that dlopen() is available to Exim. - --# EXPAND_DLFUNC=yes -+EXPAND_DLFUNC=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, - # which is intended for use in conjunction with the SMTP AUTH facilities, -@@ -1534,7 +1548,7 @@ - # (process id) to a file so that it can easily be identified. The path of the - # file can be specified here. Some installations may want something like this: - --# PID_FILE_PATH=/var/lock/exim.pid -+PID_FILE_PATH=/var/run/exim.pid - - # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory - # using the name "exim-daemon.pid". diff --git a/mail/exim/files/patch-src__configure.default b/mail/exim/files/patch-src__configure.default deleted file mode 100644 index 24bf1df..0000000 --- a/mail/exim/files/patch-src__configure.default +++ /dev/null @@ -1,42 +0,0 @@ ---- src/configure.default.orig Wed May 5 12:08:35 2004 -+++ src/configure.default Wed May 5 15:09:40 2004 -@@ -153,6 +153,8 @@ - # as if it were a normal user. This isn't usually a problem, as most sites have - # an alias for root that redirects such mail to a human administrator. - -+exim_user = XX_EXIM_USER_XX -+exim_group = XX_EXIM_GROUP_XX - never_users = root - - -@@ -412,7 +414,8 @@ - allow_fail - allow_defer - data = ${lookup{$local_part}lsearch{SYSTEM_ALIASES_FILE}} --# user = exim -+ user = XX_EXIM_USER_XX -+ group = XX_EXIM_GROUP_XX - file_transport = address_file - pipe_transport = address_pipe - -@@ -454,6 +457,7 @@ - file_transport = address_file - pipe_transport = address_pipe - reply_transport = address_reply -+ condition = ${if exists{$home/.forward} {yes} {no} } - - - # This router matches local user mailboxes. If the router fails, the error -@@ -506,8 +510,10 @@ - delivery_date_add - envelope_to_add - return_path_add --# group = mail --# mode = 0660 -+ group = XX_EXIM_GROUP_XX -+ user = $local_part -+ mode = 0660 -+ no_mode_fail_narrower - - - # This transport is used for handling pipe deliveries generated by alias or diff --git a/mail/exim/files/patch-src_miscmods_radius.c b/mail/exim/files/patch-src_miscmods_radius.c deleted file mode 100644 index 0fdd400..0000000 --- a/mail/exim/files/patch-src_miscmods_radius.c +++ /dev/null @@ -1,92 +0,0 @@ ---- src/miscmods/radius.c.orig 2025-12-18 03:23:48.333630000 +0100 -+++ src/miscmods/radius.c 2025-12-18 03:28:22.528909000 +0100 -@@ -104,37 +104,37 @@ - - #ifdef RADIUS_LIB_RADIUSCLIENT - if (rc_read_config(RADIUS_CONFIG_FILE) != 0) -- *errptr = string_sprintf("RADIUS: can't open %s", RADIUS_CONFIG_FILE); -+ *errptr = string_sprintf("%s","RADIUS: can't open %s", RADIUS_CONFIG_FILE); - - else if (rc_read_dictionary(rc_conf_str("dictionary")) != 0) -- *errptr = US"RADIUS: can't read dictionary"; -+ *errptr = string_sprintf("%","RADIUS: can't read dictionary"); - - else if (!rc_avpair_add(&send, PW_USER_NAME, user, 0)) -- *errptr = US"RADIUS: add user name failed"; -+ *errptr = string_sprintf("%","RADIUS: add user name failed"); - - else if (!rc_avpair_add(&send, PW_USER_PASSWORD, CS radius_args, 0)) -- *errptr = US"RADIUS: add password failed"); -+ *errptr = string_sprintf("%","RADIUS: add password failed"); - - else if (!rc_avpair_add(&send, PW_SERVICE_TYPE, &service, 0)) -- *errptr = US"RADIUS: add service type failed"; -+ *errptr = string_sprintf("%","RADIUS: add service type failed"); - - #else /* RADIUS_LIB_RADIUSCLIENT unset => RADIUS_LIB_RADIUSCLIENT2 */ - - if (!(h = rc_read_config(RADIUS_CONFIG_FILE))) -- *errptr = string_sprintf("RADIUS: can't open %s", RADIUS_CONFIG_FILE); -+ *errptr = string_sprintf("%","RADIUS: can't open %s", RADIUS_CONFIG_FILE); - - else if (rc_read_dictionary(h, rc_conf_str(h, "dictionary")) != 0) -- *errptr = US"RADIUS: can't read dictionary"; -+ *errptr = string_sprintf("%","RADIUS: can't read dictionary"); - - else if (!rc_avpair_add(h, &send, PW_USER_NAME, user, Ustrlen(user), 0)) -- *errptr = US"RADIUS: add user name failed"; -+ *errptr = string_sprintf("%","RADIUS: add user name failed"); - - else if (!rc_avpair_add(h, &send, PW_USER_PASSWORD, CS radius_args, - Ustrlen(radius_args), 0)) -- *errptr = US"RADIUS: add password failed"; -+ *errptr = string_sprintf("%","RADIUS: add password failed"); - - else if (!rc_avpair_add(h, &send, PW_SERVICE_TYPE, &service, 0, 0)) -- *errptr = US"RADIUS: add service type failed"; -+ *errptr = string_sprintf("%","RADIUS: add service type failed"); - - #endif /* RADIUS_LIB_RADIUSCLIENT */ - -@@ -167,7 +167,7 @@ - - case BADRESP_RC: - default: -- *errptr = string_sprintf("RADIUS: unexpected response (%d)", result); -+ *errptr = string_sprintf("%s","RADIUS: unexpected response (%d)", result); - return ERROR; - } - -@@ -177,7 +177,7 @@ - - if (!(h = rad_auth_open())) - { -- *errptr = string_sprintf("RADIUS: can't initialise libradius"); -+ *errptr = string_sprintf("%s","RADIUS: can't initialise libradius"); - return ERROR; - } - if (rad_config(h, RADIUS_CONFIG_FILE) != 0 || -@@ -187,7 +187,7 @@ - rad_put_int(h, RAD_SERVICE_TYPE, RAD_AUTHENTICATE_ONLY) != 0 || - rad_put_string(h, RAD_NAS_IDENTIFIER, CS primary_hostname) != 0) - { -- *errptr = string_sprintf("RADIUS: %s", rad_strerror(h)); -+ *errptr = string_sprintf("%s","RADIUS: %s", rad_strerror(h)); - result = ERROR; - } - else -@@ -202,12 +202,12 @@ - break; - - case -1: -- *errptr = string_sprintf("RADIUS: %s", rad_strerror(h)); -+ *errptr = string_sprintf("%s","RADIUS: %s", rad_strerror(h)); - result = ERROR; - break; - - default: -- *errptr = string_sprintf("RADIUS: unexpected response (%d)", result); -+ *errptr = string_sprintf("%s","RADIUS: unexpected response (%d)", result); - result= ERROR; - break; - } diff --git a/mail/exim/files/patch-sys-file-include b/mail/exim/files/patch-sys-file-include deleted file mode 100644 index 27aa1af..0000000 --- a/mail/exim/files/patch-sys-file-include +++ /dev/null @@ -1,20 +0,0 @@ ---- src/exim.h.orig 2017-02-14 19:13:41.381402389 +0200 -+++ src/exim.h 2017-02-14 19:13:53.330916377 +0200 -@@ -129,7 +129,6 @@ - #endif - - #include --#include - #include - #include - #ifndef NO_POLL_H ---- src/exim_lock.c.orig 2017-02-14 19:21:09.709389008 +0200 -+++ src/exim_lock.c 2017-02-14 19:21:23.994407794 +0200 -@@ -27,7 +27,6 @@ - #include - #include - #include --#include - #include - - /* Not all systems have flock() available. Those that do must define LOCK_SH diff --git a/mail/exim/options b/mail/exim/options deleted file mode 100644 index eee5b6c..0000000 --- a/mail/exim/options +++ /dev/null @@ -1,132 +0,0 @@ -OPTIONS_DEFINE+= ALT_CONFIG_PREFIX \ - CONTENT_SCAN \ - DAEMON \ - DANE \ - DEBUG \ - DISABLE_D_OPT \ - DKIM \ - SPF \ - DNSSEC \ - DOCS \ - EMBEDDED_PERL \ - EXIMON \ - ICONV \ - IPV6 \ - LISTMATCH_RHS \ - LMTP \ - OCSP \ - PRDR \ - READLINE \ - SUID \ - WISHLIST \ - EVENT \ - PROXY \ - SOCKS \ - INTERNATIONAL - -OPTIONS_DEFAULT+= AUTH_CRAM_MD5 \ - AUTH_DOVECOT \ - AUTH_PLAINTEXT \ - AUTH_SPA \ - CDB \ - CONTENT_SCAN \ - DAEMON \ - DISABLE_D_OPT \ - DKIM \ - DMARC \ - DNSDB \ - DNSSEC \ - DSEARCH \ - EMBEDDED_PERL \ - EVENT \ - ICONV \ - INTERNATIONAL \ - LMTP \ - LSEARCH \ - MAILDIR \ - MAILSTORE \ - MBX \ - OCSP \ - PAM \ - PASSWD \ - PRDR \ - SPF \ - SUID \ - TLS - -OPTIONS_RADIO_TLS= TLS GNUTLS -TLS_DESC= TLS support -OPTIONS_RADIO_LS= SA_EXIM -LS_DESC= Local scan patch -OPTIONS_RADIO_SRSR= SRS OLD_SRS -SRSR_DESC= Sender Rewriting Scheme -OLD_SRS_DESC= Enable Alternative Sender Rewriting Scheme -OPTIONS_RADIO= TLS LS SRSR - -OPTIONS_GROUP_AUTH= AUTH_CRAM_MD5 AUTH_DOVECOT AUTH_PLAINTEXT AUTH_RADIUS AUTH_SASL AUTH_SPA AUTH_TLS SASLAUTHD PAM PASSWD -AUTH_DESC= SMTP Authorization -OPTIONS_GROUP_LOOKUP= CDB BDB DNSDB DSEARCH LSEARCH MYSQL NIS OPENLDAP PGSQL REDIS SQLITE -LOOKUP_DESC= Lookup support -OPTIONS_GROUP_STORAGE= MAILDIR MAILSTORE MBX -STORAGE_DESC= Supported storage formats -OPTIONS_GROUP_EXPERIMENTAL= CERTNAMES DCC DMARC DSN ARC LMDB QUEUEFILE -EXPERIMENTAL_DESC= Experimental options -OPTIONS_GROUP= AUTH LOOKUP STORAGE EXPERIMENTAL - -ALT_CONFIG_PREFIX_DESC= Restrict the set of configuration files -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 -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 -CERTNAMES_DESC= Check certiticates ownership -BDB_DESC= Enable Berkeley DB lookups -CDB_DESC= Enable CDB-style lookups -CONTENT_SCAN_DESC= Enable exiscan email content scanner -DAEMON_DESC= Install scripts to run as a daemon -DANE_DESC= Enable experimental DANE support -DCC_DESC= Enable DCC at ACL support via dccifd -DISABLE_D_OPT_DESC= Disable macros overrides using option -D -DKIM_DESC= Enable support for DKIM -DMARC_DESC= Enable DMARC support -DNSDB_DESC= Enable DNS-style lookups -DNSSEC_DESC= Enable DNSSEC validation -DSEARCH_DESC= Enable directory-list lookups -DSN_DESC= Enable Delivery Status Notifications -EMBEDDED_PERL_DESC= Enable embedded Perl interpreter -EVENT_DESC= Messages events support (TPDA namely) -EXIMON_DESC= Build eximon monitor (requires X libraries) -ICONV_DESC= Enable header charset conversion -INTERNATIONAL_DESC= Enable support for the transmission of UTF-8 envelope addresses -LISTMATCH_RHS_DESC= Enable pre-4.77 behaviour for match_* -LMDB_DESC= Enable LMDB lookups -LMTP_DESC= RFC2033 SMTP over command pipe transport -LSEARCH_DESC= Enable wildcarded-file lookups -MAILDIR_DESC= Enable Maildir mailbox format -MAILSTORE_DESC= Enable Mailstore mailbox format -MBX_DESC= Enable MBX mailbox format -MYSQL_DESC= Enable mysql lookups -NIS_DESC= Enable NIS-style lookups -OPENLDAP_DESC= Enable LDAP lookups -OCSP_DESC= Enable OCSP stapling -QUEUEFILE_DESC= Enable queuefile transport -PAM_DESC= Enable PAM authentication mechanisms -PASSWD_DESC= Enable /etc/passwd lookups -PGSQL_DESC= Enable postgresql lookups -PRDR_DESC= Enable Per-Recipient-Data-Response support -PROXY_DESC= Enable Experimental Proxy Protocol -READLINE_DESC= Enable readline(3) library -REDIS_DESC= Enable redis lookups -SASLAUTHD_DESC= Enable use of Cyrus SASL auth daemon -SA_EXIM_DESC= Build with Spamassassin local scan (BROKEN) -SOCKS_DESC= Enable smtp transport via socks5 proxies -SPF_DESC= Enable Sender Policy Framework checking -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) -GNUTLS_DESC= Use GnuTLS instead of OpenSSL for TLS -WISHLIST_DESC= Include the unsupported patches diff --git a/mail/exim/pkg-descr b/mail/exim/pkg-descr deleted file mode 100644 index 221a8b7..0000000 --- a/mail/exim/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -Exim is a mail transfer agent for Unix systems connected to the Internet. -It is a monolithic MTA designed to be a command line compatible drop-in -replacement for Sendmail. - -Exim is an excellent mailer for an ISP, as its control and flexibility -are very good and its requeueing and retry algorithms are very powerful. -Exim's configuration syntax is well documented. diff --git a/mail/exim/pkg-message b/mail/exim/pkg-message deleted file mode 100644 index e237996..0000000 --- a/mail/exim/pkg-message +++ /dev/null @@ -1,57 +0,0 @@ -[ -{ type: install - message: <