summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mail/exim/Makefile4
-rw-r--r--mail/exim/distinfo13
-rw-r--r--mail/exim/patches/patch-ba81
-rw-r--r--mail/exim/patches/patch-bb19
-rw-r--r--mail/exim/patches/patch-bc19
-rw-r--r--mail/exim/patches/patch-bd20
6 files changed, 16 insertions, 140 deletions
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index a4ae8fe5534..1a93c4df290 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.105 2011/01/27 07:48:51 adam Exp $
+# $NetBSD: Makefile,v 1.106 2011/03/22 13:52:19 adam Exp $
-DISTNAME= exim-4.74
+DISTNAME= exim-4.75
CATEGORIES= mail net
MASTER_SITES= ftp://ftp.exim.org/pub/exim/exim4/ \
http://dl.ambiweb.de/mirrors/ftp.exim.org/exim/exim4/
diff --git a/mail/exim/distinfo b/mail/exim/distinfo
index 2b8a20e65fd..2ef5bed4c59 100644
--- a/mail/exim/distinfo
+++ b/mail/exim/distinfo
@@ -1,14 +1,11 @@
-$NetBSD: distinfo,v 1.48 2011/01/27 07:48:51 adam Exp $
+$NetBSD: distinfo,v 1.49 2011/03/22 13:52:19 adam Exp $
-SHA1 (exim-4.74.tar.bz2) = b981c2a519194d0812c88f07b441181737ca37ee
-RMD160 (exim-4.74.tar.bz2) = 53fec0a4e44e10b5c48da73e77a8555cedc31641
-Size (exim-4.74.tar.bz2) = 1588636 bytes
+SHA1 (exim-4.75.tar.bz2) = e3196a9035f433c380bb2cec4cbbcfd7ad6c00b3
+RMD160 (exim-4.75.tar.bz2) = 2dfea8750cc95d057c0b804c0379f69fbed927a9
+Size (exim-4.75.tar.bz2) = 1600867 bytes
SHA1 (patch-aa) = 2ec7f3c7c6e18c7cc2388de00c1108b56c239ab8
SHA1 (patch-ab) = ffb9fb28e4e5548777db31b3de34673a08a1c0fa
SHA1 (patch-ac) = 9a260a07f5e8cc89c60188925f01fc5b46164a37
SHA1 (patch-ae) = 4a9d2fde403cfd6386742b31f062e7801ef081b9
SHA1 (patch-ag) = 8512795060ad913f4699c277867fd24e7a785519
-SHA1 (patch-ba) = 7f1fac71d1ccb42ac8d82217f8f1b3dbc4fb830b
-SHA1 (patch-bb) = b8e5e52026da5740bb2742d3054b54aab9ab2278
-SHA1 (patch-bc) = 230965aba99adceb413dbc77e8e6bb022c2173ff
-SHA1 (patch-bd) = 50c26f08ccbb6254b99c38cd704839788ffc0494
+SHA1 (patch-ba) = 6647a95bb8e3bce2bc7f075e4be2217b3a97ce8b
diff --git a/mail/exim/patches/patch-ba b/mail/exim/patches/patch-ba
index eaff3478491..92eb17b3c25 100644
--- a/mail/exim/patches/patch-ba
+++ b/mail/exim/patches/patch-ba
@@ -1,76 +1,13 @@
-$NetBSD: patch-ba,v 1.1 2011/01/12 07:52:44 adam Exp $
+$NetBSD: patch-ba,v 1.2 2011/03/22 13:52:19 adam Exp $
---- src/lookups/ldap.c.orig 2009-11-16 19:50:38.000000000 +0000
+--- src/lookups/ldap.c.orig 2011-03-22 11:32:30.000000000 +0000
+++ src/lookups/ldap.c
-@@ -445,6 +445,60 @@ if (lcp == NULL)
+@@ -481,7 +481,7 @@ if (lcp == NULL)
+ {
+ cert_option = LDAP_OPT_X_TLS_TRY;
+ }
+- ldap_set_option(ld, LDAP_OPT_X_TLS_REQUIRE_CERT, cert_option);
++ ldap_set_option(ld, LDAP_OPT_X_TLS_REQUIRE_CERT, &cert_option);
}
- #endif /* LDAP_OPT_X_TLS */
+ #endif
-+ #ifdef LDAP_OPT_X_TLS_CACERTFILE
-+ if (eldap_ca_cert_file != NULL)
-+ {
-+ ldap_set_option(ld, LDAP_OPT_X_TLS_CACERTFILE, eldap_ca_cert_file);
-+ }
-+ #endif
-+ #ifdef LDAP_OPT_X_TLS_CACERTDIR
-+ if (eldap_ca_cert_dir != NULL)
-+ {
-+ ldap_set_option(ld, LDAP_OPT_X_TLS_CACERTDIR, eldap_ca_cert_dir);
-+ }
-+ #endif
-+ #ifdef LDAP_OPT_X_TLS_CERTFILE
-+ if (eldap_cert_file != NULL)
-+ {
-+ ldap_set_option(ld, LDAP_OPT_X_TLS_CERTFILE, eldap_cert_file);
-+ }
-+ #endif
-+ #ifdef LDAP_OPT_X_TLS_KEYFILE
-+ if (eldap_cert_key != NULL)
-+ {
-+ ldap_set_option(ld, LDAP_OPT_X_TLS_KEYFILE, eldap_cert_key);
-+ }
-+ #endif
-+ #ifdef LDAP_OPT_X_TLS_CIPHER_SUITE
-+ if (eldap_cipher_suite != NULL)
-+ {
-+ ldap_set_option(ld, LDAP_OPT_X_TLS_CIPHER_SUITE, eldap_cipher_suite);
-+ }
-+ #endif
-+ #ifdef LDAP_OPT_X_TLS_REQUIRE_CERT
-+ if (eldap_require_cert != NULL)
-+ {
-+ int cert_option = LDAP_OPT_X_TLS_NEVER;
-+ if (Ustrcmp(eldap_require_cert, "hard") == 0)
-+ {
-+ cert_option = LDAP_OPT_X_TLS_HARD;
-+ }
-+ else if (Ustrcmp(eldap_require_cert, "demand") == 0)
-+ {
-+ cert_option = LDAP_OPT_X_TLS_DEMAND;
-+ }
-+ else if (Ustrcmp(eldap_require_cert, "allow") == 0)
-+ {
-+ cert_option = LDAP_OPT_X_TLS_ALLOW;
-+ }
-+ else if (Ustrcmp(eldap_require_cert, "try") == 0)
-+ {
-+ cert_option = LDAP_OPT_X_TLS_TRY;
-+ }
-+ ldap_set_option(ld, LDAP_OPT_X_TLS_REQUIRE_CERT, cert_option);
-+ }
-+ #endif
-+
- /* Now add this connection to the chain of cached connections */
-
- lcp = store_get(sizeof(LDAP_CONNECTION));
-@@ -481,6 +535,10 @@ if (!lcp->bound ||
- {
- DEBUG(D_lookup) debug_printf("%sbinding with user=%s password=%s\n",
- (lcp->bound)? "re-" : "", user, password);
-+ if (eldap_start_tls)
-+ {
-+ ldap_start_tls_s(lcp->ld, NULL, NULL);
-+ }
- if ((msgid = ldap_bind(lcp->ld, CS user, CS password, LDAP_AUTH_SIMPLE))
- == -1)
- {
diff --git a/mail/exim/patches/patch-bb b/mail/exim/patches/patch-bb
deleted file mode 100644
index e416f6d5443..00000000000
--- a/mail/exim/patches/patch-bb
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-bb,v 1.1 2011/01/12 07:52:44 adam Exp $
-
---- src/globals.h.orig 2009-11-16 19:50:37.000000000 +0000
-+++ src/globals.h
-@@ -35,7 +35,14 @@ extern uschar *ibase_servers;
- #endif
-
- #ifdef LOOKUP_LDAP
-+extern uschar *eldap_ca_cert_dir; /* Directory with CA certificates */
-+extern uschar *eldap_ca_cert_file; /* CA certificate file */
-+extern uschar *eldap_cert_file; /* Certificate file */
-+extern uschar *eldap_cert_key; /* Certificate key file */
-+extern uschar *eldap_cipher_suite; /* Allowed cipher suite */
- extern uschar *eldap_default_servers; /* List of default servers */
-+extern uschar *eldap_require_cert; /* Peer certificate checking strategy */
-+extern BOOL eldap_start_tls; /* Use STARTTLS */
- extern int eldap_version; /* LDAP version */
- #endif
-
diff --git a/mail/exim/patches/patch-bc b/mail/exim/patches/patch-bc
deleted file mode 100644
index 3105168560f..00000000000
--- a/mail/exim/patches/patch-bc
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-bc,v 1.1 2011/01/12 07:52:44 adam Exp $
-
---- src/readconf.c.orig 2009-11-16 19:50:37.000000000 +0000
-+++ src/readconf.c
-@@ -262,7 +262,14 @@ static optionlist optionlist_config[] =
- { "ignore_fromline_local", opt_bool, &ignore_fromline_local },
- { "keep_malformed", opt_time, &keep_malformed },
- #ifdef LOOKUP_LDAP
-+ { "ldap_ca_cert_dir", opt_stringptr, &eldap_ca_cert_dir },
-+ { "ldap_ca_cert_file", opt_stringptr, &eldap_ca_cert_file },
-+ { "ldap_cert_file", opt_stringptr, &eldap_cert_file },
-+ { "ldap_cert_key", opt_stringptr, &eldap_cert_key },
-+ { "ldap_cipher_suite", opt_stringptr, &eldap_cipher_suite },
- { "ldap_default_servers", opt_stringptr, &eldap_default_servers },
-+ { "ldap_require_cert", opt_stringptr, &eldap_require_cert },
-+ { "ldap_start_tls", opt_bool, &eldap_start_tls },
- { "ldap_version", opt_int, &eldap_version },
- #endif
- { "local_from_check", opt_bool, &local_from_check },
diff --git a/mail/exim/patches/patch-bd b/mail/exim/patches/patch-bd
deleted file mode 100644
index e881663c4ab..00000000000
--- a/mail/exim/patches/patch-bd
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-bd,v 1.1 2011/01/12 07:52:44 adam Exp $
-
---- src/globals.c.orig 2009-11-16 19:50:37.000000000 +0000
-+++ src/globals.c
-@@ -75,8 +75,15 @@ uschar *ibase_servers = NULL;
- #endif
-
- #ifdef LOOKUP_LDAP
-+uschar *eldap_ca_cert_dir = NULL;
-+uschar *eldap_ca_cert_file = NULL;
-+uschar *eldap_cert_file = NULL;
-+uschar *eldap_cert_key = NULL;
-+uschar *eldap_cipher_suite = NULL;
- uschar *eldap_default_servers = NULL;
-+uschar *eldap_require_cert = NULL;
- int eldap_version = -1;
-+BOOL eldap_start_tls = FALSE;
- #endif
-
- #ifdef LOOKUP_MYSQL
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-25 05:47:40 +0000