Project import/exim - Diff 73b3a44ca4...b146958bcb

... ... --- a/.abf.yml
... ... +++ b/.abf.yml
... ... @@ -1,9 +1,9 @@
1 1
sources:
2 2
  exim-4.43-config.samples.tar.bz2: 6cff584a724c9ac8dfa36f0db3fbaaae513ca94f
3
  exim-4.89.tar.xz: 75c4008100f313dfca73a1050e8ca59c7ee1dcf4
4
  exim-4.89.tar.xz.asc: 2b0d3e82a2d3cd578be8ea43579eae1ee4e1df1c
5
  exim-html-4.89.tar.xz: caad6a87d34516b74422fa89a2ba86bbd43c34ba
6
  exim-html-4.89.tar.xz.asc: 3557c7fb2965a3fdb2d9b7365f3ea52725894e04
3
  exim-4.90.1.tar.xz: ae89fd6fe0d377f68b4c4b96d9e3d0d630226aba
4
  exim-4.90.1.tar.xz.asc: 197b5526450715f51703da9470f3dcaa8d9f70c0
5
  exim-html-4.90.1.tar.xz: ded60f8741511fed7f6057ccb33f7a8bb7df9d72
6
  exim-html-4.90.1.tar.xz.asc: 545b1c770defd20db9984476cacc3cf5c7f152d2
7 7
  exim_monitor-16x16.png: d590389d4ea5cd564034703d6936b3e4d0a6fb3b
8 8
  exim_monitor-32x32.png: d709108f487aec24a25ae15fa763274e56fa2190
9 9
  exim_monitor-48x48.png: 50d8c5a37eca288e32abf1e7e33ba7fd0bf7549e
view file @ b146958bcb
... ... --- a/exim-4.87-pamconfig.patch
... ... +++ b/exim-4.87-pamconfig.patch
... ... @@ -1,8 +1,7 @@
1
diff --git a/src/configure.default b/src/configure.default
2
index 0af6fb8..531435b 100644
3
--- a/src/configure.default
4
+++ b/src/configure.default
5
@@ -142,7 +142,7 @@ acl_smtp_data = acl_check_data
1
diff -Naur exim-4.90.1.orig/src/configure.default exim-4.90.1/src/configure.default
2
--- exim-4.90.1.orig/src/configure.default	2018-02-13 11:38:31.743978852 +0300
3
+++ exim-4.90.1/src/configure.default	2018-02-13 11:38:31.761979176 +0300
4
@@ -142,7 +142,7 @@
6 5
 
7 6
 # Allow any client to use TLS.
8 7
 
... ... @@ -11,7 +10,7 @@ index 0af6fb8..531435b 100644
10 10
 
11 11
 # Specify the location of the Exim server's TLS certificate and private key.
12 12
 # The private key must not be encrypted (password protected). You can put
13
@@ -150,8 +150,8 @@ acl_smtp_data = acl_check_data
13
@@ -150,8 +150,8 @@
14 14
 # need the first setting, or in separate files, in which case you need both
15 15
 # options.
16 16
 
... ... @@ -20,9 +19,9 @@ index 0af6fb8..531435b 100644
19 19
+tls_certificate = /etc/pki/tls/certs/exim.pem
20 20
+tls_privatekey = /etc/pki/tls/private/exim.pem
21 21
 
22
 # In order to support roaming users who wish to send email from anywhere,
23
 # you may want to make Exim listen on other ports as well as port 25, in
24
@@ -162,8 +162,8 @@ acl_smtp_data = acl_check_data
22
 # For OpenSSL, prefer EC- over RSA-authenticated ciphers
23
 # tls_require_ciphers = ECDSA:RSA:!COMPLEMENTOFDEFAULT
24
@@ -165,8 +165,8 @@
25 25
 # them you should also allow TLS-on-connect on the traditional but
26 26
 # non-standard port 465.
27 27
 
... ... @@ -33,7 +32,7 @@ index 0af6fb8..531435b 100644
32 32
 
33 33
 
34 34
 # Specify the domain you want to be added to all unqualified addresses
35
@@ -221,6 +221,24 @@ never_users = root
35
@@ -224,6 +224,24 @@
36 36
 
37 37
 host_lookup = *
38 38
 
... ... @@ -58,7 +57,7 @@ index 0af6fb8..531435b 100644
57 57
 
58 58
 # The settings below cause Exim to make RFC 1413 (ident) callbacks
59 59
 # for all incoming SMTP calls. You can limit the hosts to which these
60
@@ -842,7 +860,7 @@ begin authenticators
60
@@ -837,7 +855,7 @@
61 61
 #  driver                     = plaintext
62 62
 #  server_set_id              = $auth2
63 63
 #  server_prompts             = :
... ... @@ -67,7 +66,7 @@ index 0af6fb8..531435b 100644
66 66
 #  server_advertise_condition = ${if def:tls_in_cipher }
67 67
 
68 68
 # LOGIN authentication has traditional prompts and responses. There is no
69
@@ -854,7 +872,7 @@ begin authenticators
69
@@ -849,7 +867,7 @@
70 70
 #  driver                     = plaintext
71 71
 #  server_set_id              = $auth1
72 72
 #  server_prompts             = <| Username: | Password:
view file @ b146958bcb
... ... --- a/exim-4.88-mdv-config.patch
... ... +++ b/exim-4.88-mdv-config.patch
... ... @@ -62,7 +62,7 @@ diff -Naur exim-4.89-orig/src/EDITME exim-4.89/src/EDITME
62 62
 
63 63
 
64 64
 #------------------------------------------------------------------------------
65
@@ -301,15 +301,15 @@
65
@@ -306,16 +306,16 @@
66 66
 LOOKUP_LSEARCH=yes
67 67
 LOOKUP_DNSDB=yes
68 68
 
... ... @@ -73,9 +73,11 @@ diff -Naur exim-4.89-orig/src/EDITME exim-4.89/src/EDITME
73 73
 # LOOKUP_IBASE=yes
74 74
 # LOOKUP_LDAP=yes
75 75
-# LOOKUP_MYSQL=yes
76
-# LOOKUP_MYSQL_PC=mariadb
76 77
-# LOOKUP_NIS=yes
77 78
-# LOOKUP_NISPLUS=yes
78 79
+LOOKUP_MYSQL=yes
80
+LOOKUP_MYSQL_PC=mariadb
79 81
+LOOKUP_NIS=yes
80 82
+LOOKUP_NISPLUS=yes
81 83
 # LOOKUP_ORACLE=yes
... ... --- a/exim.spec
... ... +++ b/exim.spec
... ... @@ -21,7 +21,7 @@
21 21
22 22
Summary:	The exim mail transfer agent
23 23
Name:		exim
24
Version:	4.89
24
Version:	4.90.1
25 25
Release:	1
26 26
License:	GPLv2+
27 27
Group:		System/Servers
... ... @@ -167,6 +167,7 @@ messages per day.
167 167
%attr(0755,root,root) %{_bindir}/rsmtp
168 168
%attr(0755,root,root) %{_bindir}/runq
169 169
%attr(4755,root,root) %{_bindir}/exim
170
%attr(4755,root,root) %{_bindir}/exim-*
170 171
%attr(0755,root,root) %{_sbindir}/exim
171 172
%attr(0755,root,root) %{_sbindir}/sendmail.exim
172 173
%attr(0644,root,root) %{_prefix}/lib/sendmail.exim
... ... @@ -266,6 +267,7 @@ administrator can perform a number of control actions from the window
267 267
interface.
268 268
269 269
%files monitor
270
%doc CHANGES LICENCE NOTICE README*
270 271
%attr(0755,root,root) %{_bindir}/eximon
271 272
%attr(0755,root,root) %{_bindir}/eximon.bin
272 273
%{_iconsdir}/%{name}-monitor.png
... ... @@ -286,7 +288,7 @@ Allows running SpamAssassin on incoming mail and rejection
288 288
at SMTP time as well as other nasty things like teergrubbing.
289 289
290 290
%files plugins-SpamAssassin
291
%doc sa-exim-%{saversion}/*.html sa-exim-%{saversion}/{ACKNOWLEDGEMENTS,CHANGELOG,INSTALL,LICENSE,TODO,contrib}
291
%doc sa-exim-%{saversion}/*.html sa-exim-%{saversion}/{CHANGELOG,LICENSE,TODO,contrib}
292 292
%doc sa-exim-%{saversion}/{README,README.greylisting,*.diff}
293 293
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/exim/sa-exim.conf
294 294
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/exim/sa-exim_short.conf
... ... @@ -418,7 +420,6 @@ perl -pi -e "s|/usr/lib\b|%{_libdir}|g" Local/Makefile
420 420
421 421
# unpack some other stuff
422 422
mkdir -p mandriva
423
#cp %{SOURCE6} mandriva/eximconfig
424 423
cp %{SOURCE20} mandriva/exim.aliases
425 424
cp %{SOURCE21} mandriva/exim.init
426 425
cp %{SOURCE22} mandriva/exim.sysconfig