exim: update to 4.97.1

[feed/packages.git] / mail / exim / patches / 030-openssl-deprecated.patch

diff --git a/mail/exim/patches/030-openssl-deprecated.patch b/mail/exim/patches/030-openssl-deprecated.patch
index 2561de7852586041394e4189013921e781090923..b3ecb566269d318fe15bd5a0e44280891c2b84cf 100644 (file)
--- a/mail/exim/patches/030-openssl-deprecated.patch
+++ b/mail/exim/patches/030-openssl-deprecated.patch
@@ -13,7 +13,7 @@
    }
 --- a/src/pdkim/signing.c
 +++ b/src/pdkim/signing.c
-@@ -703,7 +703,6 @@ return NULL;
+@@ -704,7 +704,6 @@ return NULL;
  void
  exim_dkim_init(void)
  {
@@ -23,7 +23,7 @@
  
 --- a/src/tls-openssl.c
 +++ b/src/tls-openssl.c
-@@ -22,7 +22,10 @@ functions from the OpenSSL library. */
+@@ -23,7 +23,10 @@ functions from the OpenSSL library. */
  #include <openssl/lhash.h>
  #include <openssl/ssl.h>
  #include <openssl/err.h>
@@ -34,7 +34,7 @@
  #ifndef OPENSSL_NO_ECDH
  # include <openssl/ec.h>
  #endif
-@@ -885,8 +888,9 @@ pkey = EVP_RSA_gen(2048);
+@@ -944,8 +947,9 @@ pkey = EVP_RSA_gen(2048);
  
  X509_set_version(x509, 2);                            /* N+1 - version 3 */
  ASN1_INTEGER_set(X509_get_serialNumber(x509), 1);
@@ -46,7 +46,7 @@
  X509_set_pubkey(x509, pkey);
  
  name = X509_get_subject_name(x509);
-@@ -4670,8 +4674,8 @@ return string_fmt_append(g,
+@@ -4979,8 +4983,8 @@ return string_fmt_append(g,
      "                          Runtime: %s\n"
      "                                 : %s\n",
             OPENSSL_VERSION_TEXT,
@@ -57,7 +57,7 @@
    /* third line is 38 characters for the %s and the line is 73 chars long;
    the OpenSSL output includes a "built on: " prefix already. */
  }
-@@ -4713,8 +4717,6 @@ if (pidnow != pidlast)
+@@ -5022,8 +5026,6 @@ if (pidnow != pidlast)
    is unique for each thread", this doesn't apparently apply across processes,
    so our own warning from vaguely_random_number_fallback() applies here too.
    Fix per PostgreSQL. */
@@ -68,7 +68,7 @@
  
 --- a/src/tlscert-openssl.c
 +++ b/src/tlscert-openssl.c
-@@ -218,13 +218,13 @@ return mod ? tls_field_from_dn(cp, mod)
+@@ -219,13 +219,13 @@ return mod ? tls_field_from_dn(cp, mod)
  uschar *
  tls_cert_not_before(void * cert, uschar * mod)
  {