rpms/exim
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New version

Browse Source 
Resolves: rhbz#2119687
This commit is contained in:
Jaroslav Škarvada 2022-08-19 21:05:11 +02:00
parent 46a901ca46
commit 53c3306443
7 changed files with 53 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
exim-4.95-openssl30-build-fix.patch
View File

@ -1,22 +0,0 @@
diff --git a/src/tls-openssl.c b/src/tls-openssl.c
index bc454c8..c6da62c 100644
--- a/src/tls-openssl.c
+++ b/src/tls-openssl.c
@@ -232,10 +232,14 @@ static exim_openssl_option exim_openssl_options[] = {
{ US"no_tlsv1", SSL_OP_NO_TLSv1 },
#endif
#ifdef SSL_OP_NO_TLSv1_1
-# if SSL_OP_NO_TLSv1_1 == 0x00000400L
+# if OPENSSL_VERSION_NUMBER < 0x30000000L
+# if SSL_OP_NO_TLSv1_1 == 0x00000400L
/* Error in chosen value in 1.0.1a; see first item in CHANGES for 1.0.1b */
-# warning OpenSSL 1.0.1a uses a bad value for SSL_OP_NO_TLSv1_1, ignoring
-# else
+# warning OpenSSL 1.0.1a uses a bad value for SSL_OP_NO_TLSv1_1, ignoring
+# define NO_SSL_OP_NO_TLSv1_1
+# endif
+# endif
+# ifndef NO_SSL_OP_NO_TLSv1_1
{ US"no_tlsv1_1", SSL_OP_NO_TLSv1_1 },
# endif
#endif

46
exim-4.95-config.patch → exim-4.96-config.patch
View File

@ -1,8 +1,8 @@
diff --git a/scripts/Configure-Makefile b/scripts/Configure-Makefile
index 61368ec..e8fe9ef 100755
index ed77b6a..b9eb64d 100755
--- a/scripts/Configure-Makefile
+++ b/scripts/Configure-Makefile
@@ -297,7 +297,7 @@ if [ "${EXIM_PERL}" != "" ] ; then
@@ -317,7 +317,7 @@ if [ "${EXIM_PERL}" != "" ] ; then
mv $mft $mftt
echo "PERL_CC=`$PERL_COMMAND -MConfig -e 'print $Config{cc}'`" >>$mft
@ -12,7 +12,7 @@ index 61368ec..e8fe9ef 100755
echo "" >>$mft
cat $mftt >> $mft
diff --git a/src/EDITME b/src/EDITME
index f4329fa..b0643e0 100644
index 53022e5..cf0b33e 100644
--- a/src/EDITME
+++ b/src/EDITME
@@ -99,7 +99,7 @@
@ -133,7 +133,7 @@ index f4329fa..b0643e0 100644
#------------------------------------------------------------------------------
# If you have set LOOKUP_LDAP=yes, you should set LDAP_LIB_TYPE to indicate
@@ -504,7 +510,7 @@ SUPPORT_DANE=yes
@@ -511,7 +517,7 @@ SUPPORT_DANE=yes
# files are defaulted in the OS/Makefile-Default file, but can be overridden in
# local OS-specific make files.
@ -142,7 +142,7 @@ index f4329fa..b0643e0 100644
#------------------------------------------------------------------------------
@@ -514,7 +520,7 @@ SUPPORT_DANE=yes
@@ -521,7 +527,7 @@ SUPPORT_DANE=yes
# and the MIME ACL. Please read the documentation to learn more about these
# features.
@ -151,7 +151,7 @@ index f4329fa..b0643e0 100644
# If you have content scanning you may wish to only include some of the scanner
# interfaces. Uncomment any of these lines to remove that code.
@@ -607,12 +613,12 @@ DISABLE_MAL_MKS=yes
@@ -604,12 +610,12 @@ DISABLE_MAL_MKS=yes
# 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.
@ -167,7 +167,7 @@ index f4329fa..b0643e0 100644
# Uncomment the following line to add ARC (Authenticated Received Chain)
# support. You must have SPF and DKIM support enabled also.
@@ -712,7 +718,7 @@ FIXED_NEVER_USERS=root
@@ -709,7 +715,7 @@ FIXED_NEVER_USERS=root
# CONFIGURE_OWNER setting, to specify a configuration file which is listed in
# the TRUSTED_CONFIG_LIST file, then root privileges are not dropped by Exim.
@ -176,7 +176,7 @@ index f4329fa..b0643e0 100644
#------------------------------------------------------------------------------
@@ -764,18 +770,18 @@ ALLOW_INSECURE_TAINTED_DATA=yes
@@ -754,18 +760,18 @@ FIXED_NEVER_USERS=root
# included in the Exim binary. You will then need to set up the run time
# configuration to make use of the mechanism(s) selected.
@ -203,7 +203,7 @@ index f4329fa..b0643e0 100644
# Heimdal through 1.5 required pkg-config 'heimdal-gssapi'; Heimdal 7.1
# requires multiple pkg-config files to work with Exim, so the second example
@@ -802,7 +808,7 @@ ALLOW_INSECURE_TAINTED_DATA=yes
@@ -792,7 +798,7 @@ FIXED_NEVER_USERS=root
# one that is set in the headers_charset option. The default setting is
# defined by this setting:
@ -212,7 +212,7 @@ index f4329fa..b0643e0 100644
# 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
@@ -822,7 +828,7 @@ HEADERS_CHARSET="ISO-8859-1"
@@ -812,7 +818,7 @@ HEADERS_CHARSET="ISO-8859-1"
# the Sieve filter support. For those OS where iconv() is known to be installed
# as standard, the file in OS/Makefile-xxxx contains
#
@ -221,7 +221,7 @@ index f4329fa..b0643e0 100644
#
# If you are not using one of those systems, but have installed iconv(), you
# need to uncomment that line above. In some cases, you may find that iconv()
@@ -898,7 +904,7 @@ HEADERS_CHARSET="ISO-8859-1"
@@ -888,7 +894,7 @@ HEADERS_CHARSET="ISO-8859-1"
# Once you have done this, "make install" will build the info files and
# install them in the directory you have defined.
@ -230,7 +230,7 @@ index f4329fa..b0643e0 100644
#------------------------------------------------------------------------------
@@ -911,7 +917,7 @@ HEADERS_CHARSET="ISO-8859-1"
@@ -901,7 +907,7 @@ HEADERS_CHARSET="ISO-8859-1"
# %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:
@ -239,7 +239,7 @@ index f4329fa..b0643e0 100644
# 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
@@ -983,7 +989,7 @@ ZCAT_COMMAND=/usr/bin/zcat
@@ -973,7 +979,7 @@ ZCAT_COMMAND=/usr/bin/zcat
# (version 5.004 or later) installed, set EXIM_PERL to perl.o. Using embedded
# Perl costs quite a lot of resources. Only do this if you really need it.
@ -248,7 +248,7 @@ index f4329fa..b0643e0 100644
#------------------------------------------------------------------------------
@@ -993,7 +999,7 @@ ZCAT_COMMAND=/usr/bin/zcat
@@ -983,7 +989,7 @@ ZCAT_COMMAND=/usr/bin/zcat
# 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.
@ -257,7 +257,7 @@ index f4329fa..b0643e0 100644
#------------------------------------------------------------------------------
@@ -1003,7 +1009,7 @@ ZCAT_COMMAND=/usr/bin/zcat
@@ -993,7 +999,7 @@ ZCAT_COMMAND=/usr/bin/zcat
# support, which is intended for use in conjunction with the SMTP AUTH
# facilities, is included only when requested by the following setting:
@ -266,7 +266,7 @@ index f4329fa..b0643e0 100644
# You probably need to add -lpam to EXTRALIBS, and in some releases of
# GNU/Linux -ldl is also needed.
@@ -1015,12 +1021,12 @@ ZCAT_COMMAND=/usr/bin/zcat
@@ -1005,12 +1011,12 @@ ZCAT_COMMAND=/usr/bin/zcat
# If you may want to use outbound (client-side) proxying, using Socks5,
# uncomment the line below.
@ -281,7 +281,7 @@ index f4329fa..b0643e0 100644
#------------------------------------------------------------------------------
@@ -1044,9 +1050,9 @@ ZCAT_COMMAND=/usr/bin/zcat
@@ -1034,9 +1040,9 @@ ZCAT_COMMAND=/usr/bin/zcat
# installed on your system (www.libspf2.org). Depending on where it is installed
# you may have to edit the CFLAGS and LDFLAGS lines.
@ -293,7 +293,7 @@ index f4329fa..b0643e0 100644
#------------------------------------------------------------------------------
@@ -1111,7 +1117,7 @@ ZCAT_COMMAND=/usr/bin/zcat
@@ -1101,7 +1107,7 @@ ZCAT_COMMAND=/usr/bin/zcat
# group. Once you have installed saslauthd, you should arrange for it to be
# started by root at boot time.
@ -302,7 +302,7 @@ index f4329fa..b0643e0 100644
#------------------------------------------------------------------------------
@@ -1125,8 +1131,8 @@ ZCAT_COMMAND=/usr/bin/zcat
@@ -1115,8 +1121,8 @@ ZCAT_COMMAND=/usr/bin/zcat
# library for TCP wrappers, so you probably need something like this:
#
# USE_TCP_WRAPPERS=yes
@ -313,7 +313,7 @@ index f4329fa..b0643e0 100644
#
# but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM
# as well.
@@ -1178,7 +1184,7 @@ SYSTEM_ALIASES_FILE=/etc/aliases
@@ -1168,7 +1174,7 @@ SYSTEM_ALIASES_FILE=/etc/aliases
# is "yes", as well as supporting line editing, a history of input lines in the
# current run is maintained.
@ -322,7 +322,7 @@ index f4329fa..b0643e0 100644
# You may need to add -ldl to EXTRALIBS when you set USE_READLINE=yes.
# Note that this option adds to the size of the Exim binary, because the
@@ -1195,7 +1201,7 @@ SYSTEM_ALIASES_FILE=/etc/aliases
@@ -1185,7 +1191,7 @@ SYSTEM_ALIASES_FILE=/etc/aliases
#------------------------------------------------------------------------------
# Uncomment this setting to include IPv6 support.
@ -331,7 +331,7 @@ index f4329fa..b0643e0 100644
###############################################################################
# THINGS YOU ALMOST NEVER NEED TO MENTION #
@@ -1216,13 +1222,13 @@ SYSTEM_ALIASES_FILE=/etc/aliases
@@ -1206,13 +1212,13 @@ SYSTEM_ALIASES_FILE=/etc/aliases
# haven't got Perl, Exim will still build and run; you just won't be able to
# use those utilities.
@ -352,7 +352,7 @@ index f4329fa..b0643e0 100644
#------------------------------------------------------------------------------
@@ -1424,7 +1430,7 @@ EXIM_TMPDIR="/tmp"
@@ -1414,7 +1420,7 @@ EXIM_TMPDIR="/tmp"
# (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:

26
exim-4.95-dlopen-localscan.patch → exim-4.96-dlopen-localscan.patch
View File

@ -1,8 +1,8 @@
diff --git a/src/EDITME b/src/EDITME
index b0643e0..31366ae 100644
index cf0b33e..7d4cbf3 100644
--- a/src/EDITME
+++ b/src/EDITME
@@ -888,6 +888,21 @@ HAVE_ICONV=yes
@@ -878,6 +878,21 @@ HAVE_ICONV=yes
# *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING ***
@ -25,10 +25,10 @@ index b0643e0..31366ae 100644
# The default distribution of Exim contains only the plain text form of the
# documentation. Other forms are available separately. If you want to install
diff --git a/src/config.h.defaults b/src/config.h.defaults
index 877cc7b..94abf58 100644
index 25ab755..e27a51d 100644
--- a/src/config.h.defaults
+++ b/src/config.h.defaults
@@ -35,6 +35,8 @@ Do not put spaces between # and the 'define'.
@@ -33,6 +33,8 @@ Do not put spaces between # and the 'define'.
#define AUTH_VARS 4
@ -38,10 +38,10 @@ index 877cc7b..94abf58 100644
#define CONFIGURE_FILE
diff --git a/src/globals.c b/src/globals.c
index 5d9f7f8..6f11de5 100644
index ff246fe..b9dfbbb 100644
--- a/src/globals.c
+++ b/src/globals.c
@@ -155,6 +155,10 @@ time_t tls_watch_trigger_time = (time_t)0;
@@ -151,6 +151,10 @@ time_t tls_watch_trigger_time = (time_t)0;
uschar *tls_advertise_hosts = NULL;
#endif
@ -53,10 +53,10 @@ index 5d9f7f8..6f11de5 100644
/* Per Recipient Data Response variables */
BOOL prdr_enable = FALSE;
diff --git a/src/globals.h b/src/globals.h
index b610ac0..3b97a5d 100644
index fe099e4..7530a76 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -149,6 +149,11 @@ extern uschar *tls_verify_hosts; /* Mandatory client verification */
@@ -148,6 +148,11 @@ extern uschar *tls_verify_hosts; /* Mandatory client verification */
extern int tls_watch_fd; /* for inotify of creds files */
extern time_t tls_watch_trigger_time; /* non-0: triggered */
#endif
@ -69,11 +69,11 @@ index b610ac0..3b97a5d 100644
extern uschar *dsn_envid; /* DSN envid string */
diff --git a/src/local_scan.c b/src/local_scan.c
index 2032ae7..43dfe99 100644
index 7a3bae7..6ea5d2d 100644
--- a/src/local_scan.c
+++ b/src/local_scan.c
@@ -5,59 +5,133 @@
/* Copyright (c) University of Cambridge 1995 - 2009 */
@@ -6,59 +6,133 @@
/* Copyright (c) The Exim Maintainers 2021 */
/* See the file NOTICE for conditions of use and distribution. */
+#include <local_scan.h>
@ -254,10 +254,10 @@ index 2032ae7..43dfe99 100644
+
/* End of local_scan.c */
diff --git a/src/readconf.c b/src/readconf.c
index 987f9fa..b05896f 100644
index 06bc50f..6ecb0af 100644
--- a/src/readconf.c
+++ b/src/readconf.c
@@ -215,6 +215,9 @@ static optionlist optionlist_config[] = {
@@ -212,6 +212,9 @@ static optionlist optionlist_config[] = {
{ "local_from_prefix", opt_stringptr, {&local_from_prefix} },
{ "local_from_suffix", opt_stringptr, {&local_from_suffix} },
{ "local_interfaces", opt_stringptr, {&local_interfaces} },

4
exim-4.94.2-opendmarc-1.4-build-fix.patch → exim-4.96-opendmarc-1.4-build-fix.patch
View File

@ -1,6 +1,8 @@
diff --git a/src/dmarc.c b/src/dmarc.c
index 17bba9d..a218380 100644
--- a/src/dmarc.c
+++ b/src/dmarc.c
@@ -446,7 +446,7 @@ if (!dmarc_abort && !sender_host_authenticated)
@@ -459,7 +459,7 @@ if (!dmarc_abort && !sender_host_authenticated)
vs == PDKIM_VERIFY_INVALID ? DMARC_POLICY_DKIM_OUTCOME_TMPFAIL :
DMARC_POLICY_DKIM_OUTCOME_NONE;
libdm_status = opendmarc_policy_store_dkim(dmarc_pctx, US sig->domain,

4
exim-4.95-pic.patch → exim-4.96-pic.patch
View File

@ -1,8 +1,8 @@
diff --git a/src/lookups/Makefile b/src/lookups/Makefile
index 1fd1394..a24ea2a 100644
index 19585bf..a0d355f 100644
--- a/src/lookups/Makefile
+++ b/src/lookups/Makefile
@@ -22,7 +22,7 @@ lookups.a: $(OBJ)
@@ -24,7 +24,7 @@ lookups.a: $(OBJ)
$(FE)$(CC) -c $(CFLAGS) $(INCLUDE) $*.c
.c.so:; @echo "$(CC) -shared $*.c"

19
exim.spec
View File

@ -11,8 +11,8 @@
Summary: The exim mail transfer agent
Name: exim
Version: 4.95
Release: 3%{?dist}
Version: 4.96
Release: 1%{?dist}
License: GPLv2+
Url: https://www.exim.org/
@ -42,14 +42,12 @@ Source24: exim.service
Source25: exim-gen-cert
Source26: clamd.exim.service
Patch0: exim-4.95-config.patch
Patch0: exim-4.96-config.patch
Patch1: exim-4.94-libdir.patch
Patch2: exim-4.95-dlopen-localscan.patch
Patch3: exim-4.95-pic.patch
Patch2: exim-4.96-dlopen-localscan.patch
Patch3: exim-4.96-pic.patch
# https://bugs.exim.org/show_bug.cgi?id=2728
Patch4: exim-4.94.2-opendmarc-1.4-build-fix.patch
# https://bugs.exim.org/show_bug.cgi?id=2810
Patch5: exim-4.95-openssl30-build-fix.patch
Patch4: exim-4.96-opendmarc-1.4-build-fix.patch
Requires: /etc/pki/tls/certs /etc/pki/tls/private
Requires: /etc/aliases
@ -165,7 +163,6 @@ greylisting unconditional.
%patch2 -p1 -b .dl
%patch3 -p1 -b .fpic
%patch4 -p1 -b .opendmarc-1.4-build-fix
%patch5 -p1 -b .openssl30-build-fix
cp src/EDITME Local/Makefile
sed -i 's@^# LOOKUP_MODULE_DIR=.*@LOOKUP_MODULE_DIR=%{_libdir}/exim/%{version}-%{release}/lookups@' Local/Makefile
@ -483,6 +480,10 @@ fi
%{_sysconfdir}/cron.daily/greylist-tidy.sh
%changelog
* Fri Aug 19 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 4.96-1
- New version
Resolves: rhbz#2119687
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.95-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

4
sources
View File

@ -1,2 +1,2 @@
SHA512 (exim-4.95.tar.xz) = 93d09c20d99f27da5edbe3e6dc7d25aa4548faa2b67ca26f2cc0b4aeaf58398dd468e0263714fcf0df97531f05d16fcd3f1f0e9d0656ead7858a66b248a44a65
SHA512 (exim-4.95.tar.xz.asc) = 3f975f0d1da4642a89a0c0f07b0c64a021c31fa47a252734710fff1bab46011d174a28986f4743b83a42418537afe41c1e7ded1c324bcf6025e5e46d5f94f1f9
SHA512 (exim-4.96.tar.xz) = 6b863661465a0b9897c1b71875c5196a1903cf560dd85de45b08242b9731edb2bc10eb56945d62e477e5d15cc7a8d493915bff2ca81689673a8091c66f62c89e
SHA512 (exim-4.96.tar.xz.asc) = a231c97e44a7365ac5961f2827b89d8cdf6ad94964633814f31e44d94ada9900f76664c45c2f55e378245e44739a0ef323786ca29b4093e44ce2b008eca4ad64