From 9fc0099f695885b47ec56a12eb546f501e813d9f Mon Sep 17 00:00:00 2001 From: Thomas Morper Date: Sun, 15 Dec 2019 04:53:09 +0700 Subject: network/exim: Updated for version 4.93. Signed-off-by: Willy Sudiarto Raharjo --- network/exim/README.SBo | 6 +- network/exim/exim.Makefile | 219 ++++++++++++++++++++++++++----------------- network/exim/exim.SlackBuild | 5 +- network/exim/exim.info | 6 +- 4 files changed, 145 insertions(+), 91 deletions(-) (limited to 'network/exim') diff --git a/network/exim/README.SBo b/network/exim/README.SBo index d2da77c32b..b72f41afb4 100644 --- a/network/exim/README.SBo +++ b/network/exim/README.SBo @@ -15,6 +15,7 @@ The database lookups will not be built by default, but you can enable them easily by passing the directives on the command line when calling this script, e.g. + LOOKUP_JSON=yes \ LOOKUP_LDAP=yes \ LOOKUP_MYSQL=yes \ LOOKUP_PGSQL=yes \ @@ -22,8 +23,9 @@ this script, e.g. LOOKUP_SQLITE=yes \ sh exim.SlackBuild -For including the Redis and PostgreSQL lookups you'll need the "hiredis" -resp. "postgresql" packages, both available from SlackBuilds.org. +For including the JSON, PostgreSQL and Redis lookups you'll need the +"jansson", "hiredis" and "postgresql" packages respectively, all available +from SlackBuilds.org. WARNING: this package is intended as a drop-in replacement for Sendmail. As a result, there are some inevitable filename conflicts between diff --git a/network/exim/exim.Makefile b/network/exim/exim.Makefile index db91d5526e..3479dc2b45 100644 --- a/network/exim/exim.Makefile +++ b/network/exim/exim.Makefile @@ -12,11 +12,13 @@ # Exim distribution directory before running the "make" command. # Things that depend on the operating system have default settings in -# OS/Makefile-Default, but these are overridden for some OS by files called -# called OS/Makefile-. You can further override these by creating files -# called Local/Makefile-, where "" stands for the name of your -# operating system - look at the names in the OS directory to see which names -# are recognized. +# OS/Makefile-Default, but these are overridden for some OS by files +# called called OS/Makefile-. You can further override these by +# creating files called Local/Makefile-, and +# Local/Makefile- (where "" stands for the name of +# your operating system - look at the names in the OS directory to see +# which names are recognized, and "" is derived from the +# environment variable "build") # However, if you are building Exim for a single OS only, you don't need to # worry about setting up Local/Makefile-. Any build-time configuration @@ -177,6 +179,105 @@ SPOOL_DIRECTORY=/var/spool/exim +############################################################################### +# TLS # +############################################################################### +# Exim is built by default to support the SMTP STARTTLS command, which implements +# Transport Layer Security using SSL (Secure Sockets Layer). This requires you +# must install the OpenSSL library package or the GnuTLS library. Exim contains +# no cryptographic code of its own. + +# If you are running Exim as a (TLS) server, just building it with TLS support +# is all you need to do, as tls_advertise_hosts is set to '*' by +# default. But you are advised to create a suiteable certificate, and tell +# Exim about it by means of the tls_certificate and tls_privatekey run +# time options, otherwise Exim will create a self signed certificate on +# the fly. If you are running Exim only as a (TLS) client, building it with +# TLS support is all you need to do. +# +# If you are using pkg-config then you should not need to worry where +# the libraries and headers are installed, as the pkg-config .pc +# specification should include all -L/-I information necessary. +# Enabling the USE_*_PC options should be sufficient. If not using +# pkg-config, then you have to specify the libraries, and you mmight +# need to specify the locations too. + +# Uncomment the following lines if you want +# to build Exim without any TLS support (either OpenSSL or GnuTLS): +# DISABLE_TLS=yes +# Unless you do this, you must define one of USE_OPENSSL or USE_GNUTLS +# below. + +# If you are buliding with TLS, the library configuration must be done: + +# Uncomment this if you are using OpenSSL +USE_OPENSSL=yes +# Uncomment one of these settings if you are using OpenSSL; pkg-config vs not +# and an optional location. +USE_OPENSSL_PC=openssl +# TLS_LIBS=-lssl -lcrypto +# TLS_LIBS=-L/usr/local/openssl/lib -lssl -lcrypto + +# Uncomment this if you are using GnuTLS +# USE_GNUTLS=yes +# Uncomment one of these settings if you are using GnuTLS; pkg-config vs not +# and an optional location. If you disable SUPPORT_DANE below, you +# can remove the gnutls-dane references here. Earlier versions of GnuTLS +# required libtasn1 and libgrypt also; add if needed. +# USE_GNUTLS_PC=gnutls gnutls-dane +# TLS_LIBS=-lgnutls -lgnutls-dane +# TLS_LIBS=-L/usr/local/gnu/lib -lgnutls -ltasn1 -lgcrypt -lgnutls-dane + +# If using GnuTLS older than 2.10 and using pkg-config then note that Exim's +# build process will require libgcrypt-config to exist in your $PATH. A +# version that old is likely to become unsupported by Exim in 2017. + +# The security fix we provide with the gnutls_allow_auto_pkcs11 option +# (4.82 PP/09) introduces a compatibility regression. The symbol is +# not available if GnuTLS is build without p11-kit (--without-p11-kit +# configure option). In this case use AVOID_GNUTLS_PKCS11=yes when +# building Exim. +# AVOID_GNUTLS_PKCS11=yes + +# If you are running Exim as a server, note that just building it with TLS +# support is not all you need to do. You also need to set up a suitable +# certificate, and tell Exim about it by means of the tls_certificate +# and tls_privatekey run time options. You also need to set tls_advertise_hosts +# to specify the hosts to which Exim advertises TLS support. On the other hand, +# if you are running Exim only as a client, building it with TLS support +# is all you need to do. + +# If you are using pkg-config then you should not need to worry where the +# libraries and headers are installed, as the pkg-config .pc specification +# should include all -L/-I information necessary. If not using pkg-config +# then you might need to specify the locations too. + +# Additional libraries and include files are required for both OpenSSL and +# GnuTLS. The TLS_LIBS settings above assume that the libraries are installed +# with all your other libraries. If they are in a special directory, you may +# need something like + +# TLS_LIBS=-L/usr/local/openssl/lib -lssl -lcrypto + +# or + +# TLS_LIBS=-L/opt/gnu/lib -lgnutls -ltasn1 -lgcrypt -lgnutls-dane +# If not using DANE under GnuTLS we can lose one library +# TLS_LIBS=-L/opt/gnu/lib -lgnutls -ltasn1 -lgcrypt + +# TLS_LIBS is included only on the command for linking Exim itself, not on any +# auxiliary programs. If the include files are not in a standard place, you can +# set TLS_INCLUDE to specify where they are, for example: + +# TLS_INCLUDE=-I/usr/local/openssl/include/ +# or +# TLS_INCLUDE=-I/opt/gnu/include + +# You don't need to set TLS_INCLUDE if the relevant directories are already +# specified in INCLUDE. + + + ############################################################################### # THESE ARE THINGS YOU PROBABLY WANT TO SPECIFY # ############################################################################### @@ -309,6 +410,8 @@ LOOKUP_DNSDB=yes LOOKUP_CDB=yes LOOKUP_DSEARCH=yes # LOOKUP_IBASE=yes +# LOOKUP_JSON=yes +LOOKUP_JSON_PC=jansson # LOOKUP_LDAP=yes # LOOKUP_MYSQL=yes # LOOKUP_MYSQL_PC=mariadb @@ -332,6 +435,9 @@ LOOKUP_SQLITE_PC=sqlite3 # LOOKUP_NWILDLSEARCH=yes +# Some platforms may need this for LOOKUP_NIS: +# LIBS += -lnsl + #------------------------------------------------------------------------------ # If you have set LOOKUP_LDAP=yes, you should set LDAP_LIB_TYPE to indicate # which LDAP library you have. Unfortunately, though most of their functions @@ -366,9 +472,11 @@ PCRE_CONFIG=yes #------------------------------------------------------------------------------ -# Uncomment the following line to add DANE support +# Comment out the following line to remove DANE support # Note: Enabling this unconditionally overrides DISABLE_DNSSEC -# For DANE under GnuTLS we need an additional library. See TLS_LIBS below. +# forces you to have SUPPORT_TLS enabled (the default). For DANE under +# GnuTLS we need an additional library. See TLS_LIBS or USE_GNUTLS_PC +# below. SUPPORT_DANE=yes #------------------------------------------------------------------------------ @@ -378,7 +486,7 @@ SUPPORT_DANE=yes # don't need to set LOOKUP_INCLUDE if the relevant directories are already # specified in INCLUDE. The settings below are just examples; -lpq is for # PostgreSQL, -lgds is for Interbase, -lsqlite3 is for SQLite, -lhiredis -# is for Redis. +# is for Redis, -ljansson for JSON. # # You do not need to use this for any lookup information added via pkg-config. @@ -396,10 +504,11 @@ LOOKUP_INCLUDE+=-I/usr/include/mysql LOOKUP_LIBS+=-L/usr/lib$(LIBDIRSUFFIX)/mysql -lmysqlclient endif + #------------------------------------------------------------------------------ # Compiling the Exim monitor: If you want to compile the Exim monitor, a # program that requires an X11 display, then EXIM_MONITOR should be set to the -# value "eximon.bin". Comment out this setting to disable compilation of the +# value "eximon.bin". De-comment this setting to enable compilation of the # monitor. The locations of various X11 directories for libraries and include # files are defaulted in the OS/Makefile-Default file, but can be overridden in # local OS-specific make files. @@ -470,6 +579,11 @@ DISABLE_MAL_MKS=yes # DISABLE_EVENT=yes +# Uncomment this line to include support for early pipelining, per +# https://datatracker.ietf.org/doc/draft-harris-early-pipe/ +# SUPPORT_PIPE_CONNECT=yes + + #------------------------------------------------------------------------------ # Compiling Exim with experimental features. These are documented in # experimental-spec.txt. "Experimental" means that the way these features are @@ -492,10 +606,12 @@ DISABLE_MAL_MKS=yes # Uncomment the following line to add DMARC checking capability, implemented # using libopendmarc libraries. You must have SPF and DKIM support enabled also. -# EXPERIMENTAL_DMARC=yes -# DMARC_TLD_FILE= /etc/exim/opendmarc.tlds +# SUPPORT_DMARC=yes # CFLAGS += -I/usr/local/include # LDFLAGS += -lopendmarc +# Uncomment the following if you need to change the default. You can +# override it at runtime (main config option dmarc_tld_file) +# DMARC_TLD_FILE=/etc/exim/opendmarc.tlds # Uncomment the following line to add ARC (Authenticated Received Chain) # support. You must have SPF and DKIM support enabled also. @@ -523,10 +639,8 @@ DISABLE_MAL_MKS=yes # Uncomment the following line to add queuefile transport support # EXPERIMENTAL_QUEUEFILE=yes -# Uncomment the following to add REQUIRETLS support. -# You must also have SUPPORT_TLS enabled. -# Ref: https://datatracker.ietf.org/doc/draft-fenton-smtp-require-tls -# EXPERIMENTAL_REQUIRETLS=yes +# Uncomment the following line to include support for TLS Resumption +# EXPERIMENTAL_TLS_RESUME=yes ############################################################################### # THESE ARE THINGS YOU MIGHT WANT TO SPECIFY # @@ -655,6 +769,7 @@ FIXED_NEVER_USERS=root AUTH_CRAM_MD5=yes AUTH_CYRUS_SASL=yes AUTH_DOVECOT=yes +AUTH_EXTERNAL=yes # AUTH_GSASL=yes # AUTH_GSASL_PC=libgsasl # AUTH_HEIMDAL_GSSAPI=yes @@ -668,7 +783,6 @@ AUTH_TLS=yes # requires multiple pkg-config files to work with Exim, so the second example # above is needed. - #------------------------------------------------------------------------------ # If you specified AUTH_CYRUS_SASL above, you should ensure that you have the # Cyrus SASL library installed before trying to build Exim, and you probably @@ -767,75 +881,6 @@ HEADERS_CHARSET="ISO-8859-1" # *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING *** -#------------------------------------------------------------------------------ -# Exim can be built to support the SMTP STARTTLS command, which implements -# Transport Layer Security using SSL (Secure Sockets Layer). To do this, you -# must install the OpenSSL library package or the GnuTLS library. Exim contains -# no cryptographic code of its own. Uncomment the following lines if you want -# to build Exim with TLS support. If you don't know what this is all about, -# leave these settings commented out. - -# This setting is required for any TLS support (either OpenSSL or GnuTLS) -SUPPORT_TLS=yes - -# Uncomment one of these settings if you are using OpenSSL; pkg-config vs not -USE_OPENSSL_PC=openssl -# TLS_LIBS=-lssl -lcrypto - -# Uncomment the first and either the second or the third of these if you -# are using GnuTLS. If you have pkg-config, then the second, else the third. -# USE_GNUTLS=yes -# USE_GNUTLS_PC=gnutls -# TLS_LIBS=-lgnutls -ltasn1 -lgcrypt - -# If using GnuTLS older than 2.10 and using pkg-config then note that Exim's -# build process will require libgcrypt-config to exist in your $PATH. A -# version that old is likely to become unsupported by Exim in 2017. - -# The security fix we provide with the gnutls_allow_auto_pkcs11 option -# (4.82 PP/09) introduces a compatibility regression. The symbol is -# not available if GnuTLS is build without p11-kit (--without-p11-kit -# configure option). In this case use AVOID_GNUTLS_PKCS11=yes when -# building Exim. -# AVOID_GNUTLS_PKCS11=yes - -# If you are running Exim as a server, note that just building it with TLS -# support is not all you need to do. You also need to set up a suitable -# certificate, and tell Exim about it by means of the tls_certificate -# and tls_privatekey run time options. You also need to set tls_advertise_hosts -# to specify the hosts to which Exim advertises TLS support. On the other hand, -# if you are running Exim only as a client, building it with TLS support -# is all you need to do. - -# If you are using pkg-config then you should not need to worry where the -# libraries and headers are installed, as the pkg-config .pc specification -# should include all -L/-I information necessary. If not using pkg-config -# then you might need to specify the locations too. - -# Additional libraries and include files are required for both OpenSSL and -# GnuTLS. The TLS_LIBS settings above assume that the libraries are installed -# with all your other libraries. If they are in a special directory, you may -# need something like - -# TLS_LIBS=-L/usr/local/openssl/lib -lssl -lcrypto -# or -# TLS_LIBS=-L/opt/gnu/lib -lgnutls -ltasn1 -lgcrypt - -# For DANE under GnuTLS we need an additional library. -# TLS_LIBS += -lgnutls-dane - -# TLS_LIBS is included only on the command for linking Exim itself, not on any -# auxiliary programs. If the include files are not in a standard place, you can -# set TLS_INCLUDE to specify where they are, for example: - -# TLS_INCLUDE=-I/usr/local/openssl/include/ -# or -# TLS_INCLUDE=-I/opt/gnu/include - -# You don't need to set TLS_INCLUDE if the relevant directories are already -# specified in INCLUDE. - - #------------------------------------------------------------------------------ # The default distribution of Exim contains only the plain text form of the # documentation. Other forms are available separately. If you want to install @@ -1450,4 +1495,8 @@ PID_FILE_PATH=/var/run/exim.pid # ENABLE_DISABLE_FSYNC=yes +#------------------------------------------------------------------------------ +# For development, add this to include code to time various stages and report. +# CFLAGS += -DMEASURE_TIMING + # End of EDITME for Exim 4. diff --git a/network/exim/exim.SlackBuild b/network/exim/exim.SlackBuild index 9e5204563f..889c6d34e0 100644 --- a/network/exim/exim.SlackBuild +++ b/network/exim/exim.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=exim -VERSION=${VERSION:-4.92.3} +VERSION=${VERSION:-4.93} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -128,5 +128,8 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh +# Adjust version info for release candidates. +VERSION=${VERSION/-/_} + cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/network/exim/exim.info b/network/exim/exim.info index 1d6c1be9cd..a20827bb05 100644 --- a/network/exim/exim.info +++ b/network/exim/exim.info @@ -1,8 +1,8 @@ PRGNAM="exim" -VERSION="4.92.3" +VERSION="4.93" HOMEPAGE="https://www.exim.org/" -DOWNLOAD="https://ftp.exim.org/pub/exim/exim4/exim-4.92.3.tar.xz" -MD5SUM="9be05c609af824ce19666e31d910cefd" +DOWNLOAD="https://ftp.exim.org/pub/exim/exim4/exim-4.93.tar.xz" +MD5SUM="60aa3b38844a8ccece06670e8ff7d657" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="%README%" -- cgit v1.2.3