Date: Monday, June 27, 2022 @ 21:34:25 Author: felixonmars Revision: 1239769
upgpkg: exim 4.96-1 Added: exim/trunk/keys/ exim/trunk/keys/pgp/ exim/trunk/keys/pgp/A986F3A6BD6377D8730958DEBCE58C8CE41F32DF.asc exim/trunk/keys/pgp/ACBB4324393ADE3515DA2DDA4D1E900E14C1CC04.asc exim/trunk/keys/pgp/C693A034E1ED6EE954CAE2DA13DAD99C7E41519C.asc exim/trunk/keys/pgp/E5CA331D44AB8E4C806FDBEE26101B62F69376CE.asc Modified: exim/trunk/PKGBUILD exim/trunk/exim.Makefile -------------------------------------------------------+ PKGBUILD | 10 - exim.Makefile | 87 ++++++++-------- keys/pgp/A986F3A6BD6377D8730958DEBCE58C8CE41F32DF.asc | 1 keys/pgp/ACBB4324393ADE3515DA2DDA4D1E900E14C1CC04.asc | 1 keys/pgp/C693A034E1ED6EE954CAE2DA13DAD99C7E41519C.asc | 1 keys/pgp/E5CA331D44AB8E4C806FDBEE26101B62F69376CE.asc | 1 6 files changed, 55 insertions(+), 46 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-06-27 21:32:52 UTC (rev 1239768) +++ PKGBUILD 2022-06-27 21:34:25 UTC (rev 1239769) @@ -5,14 +5,14 @@ # Contributor: judd <jvi...@zeroflux.org> pkgname=exim -pkgver=4.95 -pkgrel=2 +pkgver=4.96 +pkgrel=1 pkgdesc='Message Transfer Agent' arch=('x86_64') url='https://www.exim.org/' license=('GPL') backup=('etc/mail/aliases' 'etc/mail/exim.conf' 'etc/logrotate.d/exim') -depends=('gdbm' 'libldap' 'libidn' 'libidn2' 'libnsl' 'libspf2' 'libxcrypt' 'openssl' 'pam' 'pcre' 'sqlite') +depends=('gdbm' 'libldap' 'libidn' 'libidn2' 'libnsl' 'libspf2' 'libxcrypt' 'openssl' 'pam' 'pcre2' 'sqlite') provides=('smtp-server' 'smtp-forwarder') conflicts=('smtp-server' 'smtp-forwarder') source=("https://ftp.exim.org/pub/exim/exim4/exim-$pkgver.tar.bz2"{,.asc} @@ -26,11 +26,11 @@ exim-submission.socket exim.sysusers exim.tmpfiles) -sha512sums=('2ece1bf862553c747fda765698ae0d99ce1c37b6006576661580ec7671f6e25590d21fb2862058a276d8cc1862ecb703e8d72240e5395d8f00d67babbfc3dbbc' +sha512sums=('675dcb13dac449edede61926e7af6dcc3ff3a455c053d413a35c873b926dfc4d63540ba7d52347516c6a9b4b60a3627b449685210ddfba0a4c61ec7a0a0b8333' 'SKIP' '6494d9aae71a630935f3946a136855aadede54fd10b7b3cd7df47972d320ae142410076871e839f6caca8e02ec136604464b0b9c593721db243d8edf75c2f17f' 'd8e3b466e0bba8175cfe762058dec49018495a260aa5efd139f4ef435284c305958cbd7fc514e81042146368b749ae38f0bf276fc0b4b91918ef33126900aa81' - '107a30691c961e511a6ae86282c41e4d3dfac771f4a30295a0bdfd1b9229c38272aaabf38321707f3c6b235dc749b6fcb56a1cf732c97f01830e5e8348feaf8d' + '6e93e8154e9a19c79b72072cfa79e37ed742998fca823bfe87169a038c93e9ab0c11124633ca8c85d5b9ed6195ffb03ccc564f5cda3f1063f5ff62eda8157751' 'dc28698f15e8eaa4614ae81fc8cb76d92fed1110ce02f7a6ee8feace418dbb194711eb2d4dd444cf818628c11721e21d80b7b974879ab6ddd78cc717cce17c2f' 'b3c3b18652df435cb87d647cfd4f19e182fbf12b0b56f9c91f72b27ae5a819fb3d8c4c25445c5a3c184f70a0c181925fabda891f2057b8a917070d6c40529b8d' '11c8133ee15b3e5193c9b1c59aed66c81b6e045dd23310bede9fcde6c88905db5ef08afdb798b53b75a7465915ea1247e980edf95db07a7f9b7bb58ce95fbb5a' Modified: exim.Makefile =================================================================== --- exim.Makefile 2022-06-27 21:32:52 UTC (rev 1239768) +++ exim.Makefile 2022-06-27 21:34:25 UTC (rev 1239769) @@ -1,4 +1,3 @@ -# $Cambridge: exim/src/src/EDITME,v 4.93 $ ################################################## # The Exim mail transport agent # ################################################## @@ -14,12 +13,11 @@ # 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-<osname>. You can further override these by -# creating files called Local/Makefile-<osname>, and -# Local/Makefile-<buildname> (where "<osname>" stands for the name of -# your operating system - look at the names in the OS directory to see -# which names are recognized, and "<buildname>" is derived from the -# environment variable "build") +# called OS/Makefile-<osname>. You can further override these settings by +# creating files Local/Makefile-<osname>, and Local/Makefile-<build>. +# The suffix "<osname>" stands for the name of your operating system - look +# at the names in the OS directory to see which names are recognized, +# and "<build>" is the content of 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-<osname>. Any build-time configuration @@ -203,7 +201,7 @@ # 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 +# pkg-config, then you have to specify the libraries, and you might # need to specify the locations too. # Uncomment the following lines if you want @@ -212,7 +210,7 @@ # 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: +# If you are building with TLS, the library configuration must be done: # Uncomment this if you are using OpenSSL USE_OPENSSL=yes @@ -281,7 +279,10 @@ # specified in INCLUDE. +# Uncomment the following line to remove support for TLS Resumption +# DISABLE_TLS_RESUME=yes + ############################################################################### # THESE ARE THINGS YOU PROBABLY WANT TO SPECIFY # ############################################################################### @@ -416,6 +417,8 @@ # LOOKUP_IBASE=yes # LOOKUP_JSON=yes LOOKUP_LDAP=yes +# LOOKUP_LMDB=yes + # LOOKUP_MYSQL=yes # LOOKUP_MYSQL_PC=mariadb # LOOKUP_NIS=yes @@ -457,11 +460,11 @@ #------------------------------------------------------------------------------ -# 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) @@ -468,8 +471,8 @@ # 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 #------------------------------------------------------------------------------ @@ -492,10 +495,18 @@ # You do not need to use this for any lookup information added via pkg-config. # LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include -I /usr/local/pgsql/include -# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq -lgds -lsqlite3 +# LOOKUP_INCLUDE +=-I /usr/local/include +# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq -lgds -lsqlite3 -llmdb LOOKUP_LIBS=-lldap -llber +#------------------------------------------------------------------------------ +# 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 + #------------------------------------------------------------------------------ # 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 @@ -566,15 +577,22 @@ # DISABLE_DNSSEC=yes # To disable support for Events set DISABLE_EVENT to "yes" - # DISABLE_EVENT=yes -# Uncomment this line to include support for early pipelining, per +# Uncomment this line to remove support for early pipelining, per # https://datatracker.ietf.org/doc/draft-harris-early-pipe/ -# SUPPORT_PIPE_CONNECT=yes +# DISABLE_PIPE_CONNECT=yes +# Uncomment the following to remove the fast-ramp two-phase-queue-run support +# DISABLE_QUEUE_RAMP=yes + +# Uncomment the following lines to add SRS (Sender Rewriting Scheme) support +# using only native facilities. +# SUPPORT_SRS=yes + + #------------------------------------------------------------------------------ # Compiling Exim with experimental features. These are documented in # experimental-spec.txt. "Experimental" means that the way these features are @@ -586,21 +604,10 @@ # EXPERIMENTAL_DCC=yes -# Uncomment the following lines to add SRS (Sender rewriting scheme) support. -# 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=yes -# CFLAGS += -I/usr/local/include -# LDFLAGS += -lsrs_alt - -# Uncomment the following lines to add SRS (Sender rewriting scheme) support -# using only native facilities. -# EXPERIMENTAL_SRS_NATIVE=yes - # 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; +# 1.3.2-3 works. I seems that the OpenDMARC project broke their API. # SUPPORT_DMARC=yes # CFLAGS += -I/usr/local/include # LDFLAGS += -lopendmarc @@ -624,19 +631,9 @@ # Uncomment the following to include extra information in fail DSN message (bounces) # EXPERIMENTAL_DSN_INFO=yes -# Uncomment the following to add LMDB lookup support -# You need to have LMDB installed on your system (https://github.com/LMDB/lmdb) -# Depending on where it is installed you may have to edit the CFLAGS and LDFLAGS lines. -# EXPERIMENTAL_LMDB=yes -# CFLAGS += -I/usr/local/include -# LDFLAGS += -llmdb - # Uncomment the following line to add queuefile transport support # EXPERIMENTAL_QUEUEFILE=yes -# Uncomment the following line to include support for TLS Resumption -# EXPERIMENTAL_TLS_RESUME=yes - ############################################################################### # THESE ARE THINGS YOU MIGHT WANT TO SPECIFY # ############################################################################### @@ -789,7 +786,10 @@ # AUTH_LIBS=-lgsasl # AUTH_LIBS=-lgssapi -lheimntlm -lkrb5 -lhx509 -lcom_err -lhcrypto -lasn1 -lwind -lroken -lcrypt +# If using AUTH_GSASL with SCRAM methods, you should also be defining +# SUPPORT_I18N to get standards-conformant support of utf8 normalization. + #------------------------------------------------------------------------------ # When Exim is decoding MIME "words" in header lines, most commonly for use # in the $header_xxx expansion, it converts any foreign character sets to the @@ -1494,4 +1494,9 @@ # 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. Added: keys/pgp/A986F3A6BD6377D8730958DEBCE58C8CE41F32DF.asc =================================================================== (Binary files differ) Index: exim/trunk/keys/pgp/A986F3A6BD6377D8730958DEBCE58C8CE41F32DF.asc =================================================================== --- keys/pgp/A986F3A6BD6377D8730958DEBCE58C8CE41F32DF.asc 2022-06-27 21:32:52 UTC (rev 1239768) +++ keys/pgp/A986F3A6BD6377D8730958DEBCE58C8CE41F32DF.asc 2022-06-27 21:34:25 UTC (rev 1239769) Property changes on: exim/trunk/keys/pgp/A986F3A6BD6377D8730958DEBCE58C8CE41F32DF.asc ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/pgp-keys \ No newline at end of property Added: keys/pgp/ACBB4324393ADE3515DA2DDA4D1E900E14C1CC04.asc =================================================================== (Binary files differ) Index: exim/trunk/keys/pgp/ACBB4324393ADE3515DA2DDA4D1E900E14C1CC04.asc =================================================================== --- keys/pgp/ACBB4324393ADE3515DA2DDA4D1E900E14C1CC04.asc 2022-06-27 21:32:52 UTC (rev 1239768) +++ keys/pgp/ACBB4324393ADE3515DA2DDA4D1E900E14C1CC04.asc 2022-06-27 21:34:25 UTC (rev 1239769) Property changes on: exim/trunk/keys/pgp/ACBB4324393ADE3515DA2DDA4D1E900E14C1CC04.asc ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/pgp-keys \ No newline at end of property Added: keys/pgp/C693A034E1ED6EE954CAE2DA13DAD99C7E41519C.asc =================================================================== (Binary files differ) Index: exim/trunk/keys/pgp/C693A034E1ED6EE954CAE2DA13DAD99C7E41519C.asc =================================================================== --- keys/pgp/C693A034E1ED6EE954CAE2DA13DAD99C7E41519C.asc 2022-06-27 21:32:52 UTC (rev 1239768) +++ keys/pgp/C693A034E1ED6EE954CAE2DA13DAD99C7E41519C.asc 2022-06-27 21:34:25 UTC (rev 1239769) Property changes on: exim/trunk/keys/pgp/C693A034E1ED6EE954CAE2DA13DAD99C7E41519C.asc ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/pgp-keys \ No newline at end of property Added: keys/pgp/E5CA331D44AB8E4C806FDBEE26101B62F69376CE.asc =================================================================== (Binary files differ) Index: exim/trunk/keys/pgp/E5CA331D44AB8E4C806FDBEE26101B62F69376CE.asc =================================================================== --- keys/pgp/E5CA331D44AB8E4C806FDBEE26101B62F69376CE.asc 2022-06-27 21:32:52 UTC (rev 1239768) +++ keys/pgp/E5CA331D44AB8E4C806FDBEE26101B62F69376CE.asc 2022-06-27 21:34:25 UTC (rev 1239769) Property changes on: exim/trunk/keys/pgp/E5CA331D44AB8E4C806FDBEE26101B62F69376CE.asc ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/pgp-keys \ No newline at end of property