From 7a553b4054fa330b38021373b282e22c1944826b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Mon, 21 Nov 2022 13:37:53 +0100 Subject: [PATCH] - rel 13; unbreak main config (duplicate openssl_options) --- exim.spec | 5 +---- exim4-disableSSLv3.patch | 13 ------------- 2 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 exim4-disableSSLv3.patch diff --git a/exim.spec b/exim.spec index cd1c528..594c2b1 100644 --- a/exim.spec +++ b/exim.spec @@ -23,7 +23,7 @@ Summary(pl.UTF-8): Agent Transferu Poczty Uniwersytetu w Cambridge Summary(pt_BR.UTF-8): Servidor de correio eletrônico exim Name: exim Version: 4.96 -Release: 12 +Release: 13 Epoch: 2 License: GPL v2+ Group: Networking/Daemons/SMTP @@ -62,8 +62,6 @@ Patch6: 90_localscan_dlopen-fixes.dpatch Patch7: linelength-show.patch Patch8: %{name}-spam-timeout.patch Patch9: autoreply-return-path.patch - -Patch20: %{name}4-disableSSLv3.patch URL: http://www.exim.org/ %{?with_sasl:BuildRequires: cyrus-sasl-devel >= 2.1.0} BuildRequires: db-devel @@ -190,7 +188,6 @@ Pliki nagłówkowe dla Exima. install %{SOURCE4} exim4.conf install %{SOURCE14} doc/config.samples.tar.bz2 -%patch20 -p1 install -d Local cat << 'EOF' >> Local/Makefile-Linux CC=%{__cc} diff --git a/exim4-disableSSLv3.patch b/exim4-disableSSLv3.patch deleted file mode 100644 index b3de65c..0000000 --- a/exim4-disableSSLv3.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -urN eximorg/exim4.conf exim/exim4.conf ---- eximorg/exim4.conf 2015-01-13 09:39:15.705251985 +0100 -+++ exim/exim4.conf 2015-01-13 09:43:24.017910803 +0100 -@@ -145,6 +145,8 @@ acl_smtp_data = acl_check_data - # Disable TLS - tls_advertise_hosts = - -+openssl_options = +no_sslv2 +no_sslv3 -+ - # Specify the location of the Exim server's TLS certificate and private key. - # The private key must not be encrypted (password protected). You can put - # the certificate and private key in the same file, in which case you only - -- 2.43.0