commit 09549a6f91b280da89cfa9f2d581180459678259 Author: Juergen Daubert <jue@jue.li> Date: Mon Oct 2 14:55:19 2023 +0200 [notify] exim: update to 4.96.1 security fixes, see https://www.openwall.com/lists/oss-security/2023/10/01/4 diff --git a/exim/.signature b/exim/.signature index b3511144..543c8a2d 100644 --- a/exim/.signature +++ b/exim/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVeqiu3qGJbnURd4x58v7Pn4wtYwg7p8rzJCHVyXD8RUZoupa6mcXtxQcP2a5FPk1lQGjdkzPL4uLDcJkNmbm6W/wE= -SHA256 (Pkgfile) = 28586da44447ec328c3ddcdb473bc8b76b6625b79c4b1e379778010045173028 +RWRJc1FUaeVeqov1mxfewbfvNjdIDeJOI6OnVTyJ3ytw/8wCVt1UFq+MvZkhMxc9jNVPabUo5/EEbIFsOOEXCbfMNqP2u6ihYw0= +SHA256 (Pkgfile) = 4640c97301cf8ec9b8322f29008f3032a31777e0110e93a5e3e35ec0d8b6d3a5 SHA256 (.footprint) = 3e5fe8471a7a9057c0c7486c016ea2ed1dc5ebd72adc13c23f432ef468d2fc5d -SHA256 (exim-4.96.tar.xz) = 299a56927b2eb3477daafd3c5bda02bc67e5c4e5898a7aeaf2740875278cf1a3 +SHA256 (exim-4.96.1.tar.xz) = 93ac0755c317e1fdbbea8ccb70a868876bdf3148692891c72ad0fe816767033d SHA256 (exim) = fcc6489769d9b4503f6435747dca79d9f8aca1da05628dc82de6a27335cd27a7 -SHA256 (exim-config.patch) = 174097a1e0f92a6b87f3a9c757c13623113b300d5f3b7b79ef0774bd4a1ca4f3 +SHA256 (exim-config.patch) = 7cc7b24a7a28215d88fb70b0e8ed7c9e02c780b0f207ece81574e59111a7f405 diff --git a/exim/Pkgfile b/exim/Pkgfile index 36295c9d..9361fd01 100644 --- a/exim/Pkgfile +++ b/exim/Pkgfile @@ -4,7 +4,7 @@ # Depends on: db libpcre2 openssl name=exim -version=4.96 +version=4.96.1 release=1 source=(https://ftp.exim.org/pub/exim/exim4/$name-$version.tar.xz $name $name-config.patch) diff --git a/exim/exim-4.95-openssl30-build-fix.patch b/exim/exim-4.95-openssl30-build-fix.patch deleted file mode 100644 index 7331f5c1..00000000 --- a/exim/exim-4.95-openssl30-build-fix.patch +++ /dev/null @@ -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 diff --git a/exim/exim-config.patch b/exim/exim-config.patch index 8781fafa..e772823f 100644 --- a/exim/exim-config.patch +++ b/exim/exim-config.patch @@ -1,6 +1,6 @@ -diff -Nru exim-4.95.orig/src/EDITME exim-4.95/src/EDITME ---- exim-4.95.orig/src/EDITME 2022-01-17 18:08:22.578366880 +0100 -+++ exim-4.95/src/EDITME 2022-01-17 18:12:07.286282151 +0100 +diff -Nru exim-4.96.1.orig/src/EDITME exim-4.96.1/src/EDITME +--- exim-4.96.1.orig/src/EDITME 2023-10-02 14:52:52.316712933 +0200 ++++ exim-4.96.1/src/EDITME 2023-10-02 14:53:24.177000884 +0200 @@ -73,7 +73,7 @@ # this would be wanted. ############################################################################### @@ -70,7 +70,7 @@ diff -Nru exim-4.95.orig/src/EDITME exim-4.95/src/EDITME # LOOKUP_IBASE=yes # LOOKUP_JSON=yes # LOOKUP_LDAP=yes -@@ -764,7 +764,7 @@ +@@ -754,7 +754,7 @@ # included in the Exim binary. You will then need to set up the run time # configuration to make use of the mechanism(s) selected. @@ -79,7 +79,7 @@ diff -Nru exim-4.95.orig/src/EDITME exim-4.95/src/EDITME # AUTH_CYRUS_SASL=yes # AUTH_DOVECOT=yes # AUTH_EXTERNAL=yes -@@ -773,7 +773,7 @@ +@@ -763,7 +763,7 @@ # AUTH_HEIMDAL_GSSAPI=yes # AUTH_HEIMDAL_GSSAPI_PC=heimdal-gssapi # AUTH_HEIMDAL_GSSAPI_PC=heimdal-gssapi heimdal-krb5 @@ -88,7 +88,7 @@ diff -Nru exim-4.95.orig/src/EDITME exim-4.95/src/EDITME # AUTH_SPA=yes # AUTH_TLS=yes -@@ -911,7 +911,7 @@ +@@ -901,7 +901,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: @@ -97,7 +97,7 @@ diff -Nru exim-4.95.orig/src/EDITME exim-4.95/src/EDITME # 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 -@@ -960,7 +960,7 @@ +@@ -950,7 +950,7 @@ # files. Both the name of the command and the suffix that it adds to files # need to be defined here. See also the EXICYCLOG_MAX configuration. @@ -106,7 +106,7 @@ diff -Nru exim-4.95.orig/src/EDITME exim-4.95/src/EDITME COMPRESS_SUFFIX=gz -@@ -975,7 +975,7 @@ +@@ -965,7 +965,7 @@ # ZCAT_COMMAND=zcat # # Or specify the full pathname: @@ -115,7 +115,7 @@ diff -Nru exim-4.95.orig/src/EDITME exim-4.95/src/EDITME #------------------------------------------------------------------------------ # Compiling in support for embedded Perl: If you want to be able to -@@ -1126,7 +1126,7 @@ +@@ -1116,7 +1116,7 @@ # # USE_TCP_WRAPPERS=yes # CFLAGS=-O -I/usr/local/include @@ -124,7 +124,7 @@ diff -Nru exim-4.95.orig/src/EDITME exim-4.95/src/EDITME # # but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM # as well. -@@ -1159,7 +1159,7 @@ +@@ -1149,7 +1149,7 @@ # aliases). The following setting can be changed to specify a different # location for the system alias file. @@ -133,7 +133,7 @@ diff -Nru exim-4.95.orig/src/EDITME exim-4.95/src/EDITME #------------------------------------------------------------------------------ -@@ -1195,7 +1195,7 @@ +@@ -1185,7 +1185,7 @@ #------------------------------------------------------------------------------ # Uncomment this setting to include IPv6 support. @@ -142,7 +142,7 @@ diff -Nru exim-4.95.orig/src/EDITME exim-4.95/src/EDITME ############################################################################### # THINGS YOU ALMOST NEVER NEED TO MENTION # -@@ -1216,13 +1216,13 @@ +@@ -1206,13 +1206,13 @@ # haven't got Perl, Exim will still build and run; you just won't be able to # use those utilities. @@ -163,7 +163,7 @@ diff -Nru exim-4.95.orig/src/EDITME exim-4.95/src/EDITME #------------------------------------------------------------------------------ -@@ -1424,7 +1424,7 @@ +@@ -1414,7 +1414,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: @@ -172,9 +172,9 @@ diff -Nru exim-4.95.orig/src/EDITME exim-4.95/src/EDITME # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory # using the name "exim-daemon.pid". -diff -Nru exim-4.95.orig/src/configure.default exim-4.95/src/configure.default ---- exim-4.95.orig/src/configure.default 2022-01-17 18:08:22.578366880 +0100 -+++ exim-4.95/src/configure.default 2022-01-17 18:10:47.748198676 +0100 +diff -Nru exim-4.96.1.orig/src/configure.default exim-4.96.1/src/configure.default +--- exim-4.96.1.orig/src/configure.default 2023-10-02 14:52:52.316712933 +0200 ++++ exim-4.96.1/src/configure.default 2023-10-02 14:53:24.177000884 +0200 @@ -67,7 +67,7 @@ # +local_domains, +relay_to_domains, and +relay_from_hosts, respectively. They # are all colon-separated lists: