diff options
-rw-r--r-- | network/exim/exim.Makefile | 51 | ||||
-rw-r--r-- | network/exim/exim.SlackBuild | 2 | ||||
-rw-r--r-- | network/exim/exim.info | 6 |
3 files changed, 27 insertions, 32 deletions
diff --git a/network/exim/exim.Makefile b/network/exim/exim.Makefile index edd9de5a7eb9..9b9a86e32593 100644 --- a/network/exim/exim.Makefile +++ b/network/exim/exim.Makefile @@ -460,19 +460,19 @@ LDAP_LIB_TYPE=OPENLDAP2 #------------------------------------------------------------------------------ -# The PCRE library is required for Exim. There is no longer an embedded +# The PCRE2 library is required for Exim. There is no longer an embedded # version of the PCRE library included with the source code, instead you -# must use a system library or build your own copy of PCRE. +# must use a system library or build your own copy of PCRE2. # In either case you must specify the library link info here. If the -# PCRE header files are not in the standard search path you must also +# PCRE2 header files are not in the standard search path you must also # modify the INCLUDE path (above) # # Use PCRE_CONFIG to query the pcre-config command (first found in $PATH) # to find the include files and libraries, else use PCRE_LIBS and set INCLUDE # too if needed. -PCRE_CONFIG=yes -# PCRE_LIBS=-lpcre +PCRE2_CONFIG=yes +# PCRE_LIBS=-lpcre2 #------------------------------------------------------------------------------ @@ -498,6 +498,13 @@ SUPPORT_DANE=yes # LOOKUP_INCLUDE +=-I /usr/local/include # LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq -lgds -lsqlite3 -llmdb +#------------------------------------------------------------------------------ +# If you included LOOKUP_LMDB above you will need the library. Depending +# on where installed you may also need an include directory +# +# LOOKUP_INCLUDE += -I/usr/local/include +# LOOKUP_LIBS += -llmdb + # ...or just enable your favourite lookups and let GNUmake handle the rest ifeq ($(LOOKUP_LDAP),yes) @@ -592,8 +599,8 @@ DISABLE_MAL_MKS=yes # DISABLE_QUEUE_RAMP=yes # Uncomment the following lines to add SRS (Sender Rewriting Scheme) support -# using only native facilities. See EXPERIMENTAL_SRS_ALT for an alternative. -# SUPPORT_SRS=yes +# using only native facilities. +SUPPORT_SRS=yes #------------------------------------------------------------------------------ @@ -607,16 +614,6 @@ DISABLE_MAL_MKS=yes # EXPERIMENTAL_DCC=yes -# Uncomment the following lines to add SRS (Sender rewriting scheme) support -# using the implementation in linbsrs_alt. -# You need to have libsrs_alt installed on your system (srs.mirtol.com). -# Depending on where it is installed you may have to edit the CFLAGS and -# LDFLAGS lines. - -# EXPERIMENTAL_SRS_ALT=yes -# CFLAGS += -I/usr/local/include -# LDFLAGS += -lsrs_alt - # Uncomment the following line to add DMARC checking capability, implemented # using libopendmarc libraries. You must have SPF and DKIM support enabled also. # Library version libopendmarc-1.4.1-1.fc33.x86_64 (on Fedora 33) is known broken; @@ -762,13 +759,6 @@ FIXED_NEVER_USERS=root # WHITELIST_D_MACROS=TLS:SPOOL -# The next setting enables a main config option -# "allow_insecure_tainted_data" to turn taint failures into warnings. -# Though this option is new, it is deprecated already now, and will be -# ignored in future releases of Exim. It is meant as mitigation for -# upgrading old (possibly insecure) configurations to more secure ones. -ALLOW_INSECURE_TAINTED_DATA=yes - #------------------------------------------------------------------------------ # Exim has support for the AUTH (authentication) extension of the SMTP # protocol, as defined by RFC 2554. If you don't know what SMTP authentication @@ -1048,10 +1038,10 @@ EXTRALIBS += -ldl # If you want IDNA2008 mappings per RFCs 5890, 6530 and 6533, you additionally # need libidn2 and SUPPORT_I18N_2008. -SUPPORT_I18N=yes -LDFLAGS += -lidn -# SUPPORT_I18N_2008=yes -# LDFLAGS += -lidn -lidn2 +# SUPPORT_I18N=yes +# LDFLAGS += -lidn +SUPPORT_I18N_2008=yes +LDFLAGS += -lidn -lidn2 #------------------------------------------------------------------------------ @@ -1514,4 +1504,9 @@ PID_FILE_PATH=/var/run/exim.pid # For development, add this to include code to time various stages and report. # CFLAGS += -DMEASURE_TIMING +# For a very slightly smaller build, for constrained systems, uncomment this. +# The feature involved is purely for debugging. + +# DISABLE_CLIENT_CMD_LOG=yes + # End of EDITME for Exim 4. diff --git a/network/exim/exim.SlackBuild b/network/exim/exim.SlackBuild index 04150351181b..6a16c11957c7 100644 --- a/network/exim/exim.SlackBuild +++ b/network/exim/exim.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=exim -VERSION=${VERSION:-4.95} +VERSION=${VERSION:-4.96} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/network/exim/exim.info b/network/exim/exim.info index 1833d9e0b876..2076e94bf54b 100644 --- a/network/exim/exim.info +++ b/network/exim/exim.info @@ -1,8 +1,8 @@ PRGNAM="exim" -VERSION="4.95" +VERSION="4.96" HOMEPAGE="https://www.exim.org/" -DOWNLOAD="https://ftp.exim.org/pub/exim/exim4/exim-4.95.tar.xz" -MD5SUM="b57515d34e97b0be12f7d38d316b15eb" +DOWNLOAD="https://ftp.exim.org/pub/exim/exim4/exim-4.96.tar.xz" +MD5SUM="0d10d5b10f2af77ec8c2c2fe5be6c1ad" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="%README%" |