File: EDITME.exim4-mod.diff

package info (click to toggle)
exim4 4.99.1-3
  • links: PTS, VCS
  • area: main
  • in suites: experimental
  • size: 26,208 kB
  • sloc: ansic: 119,253; sh: 4,083; xml: 2,112; perl: 918; makefile: 550
file content (233 lines) | stat: -rw-r--r-- 7,175 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
--- EDITME.exim4-light	2025-12-23 13:47:08.804643222 +0100
+++ EDITME.exim4-mod	2025-12-23 13:47:58.451360543 +0100
@@ -333,7 +333,7 @@
 
 # This one is very special-purpose, so is not included by default.
 
-# ROUTER_IPLOOKUP=yes
+ROUTER_IPLOOKUP=yes
 
 
 #------------------------------------------------------------------------------
@@ -374,7 +374,7 @@
 
 SUPPORT_MAILDIR=yes
 SUPPORT_MAILSTORE=yes
-# SUPPORT_MBX=yes
+SUPPORT_MBX=yes
 
 
 #------------------------------------------------------------------------------
@@ -391,12 +391,12 @@
 # and we suggest that such packagings' integrity checks should be paranoid
 # about the permissions of the directory and the files within.
 
-# LOOKUP_MODULE_DIR=/usr/lib/exim/lookups/
+LOOKUP_MODULE_DIR=/usr/lib/exim4/lookups/
 
 # To build a module dynamically, you'll need to define CFLAGS_DYNAMIC for
 # your platform.  Eg:
 # CFLAGS_DYNAMIC=-shared -rdynamic
-# CFLAGS_DYNAMIC=-shared -rdynamic -fPIC
+CFLAGS_DYNAMIC=-shared -rdynamic -fPIC
 
 #------------------------------------------------------------------------------
 # These settings determine which file and database lookup methods are included
@@ -439,16 +439,16 @@
 LOOKUP_DSEARCH=yes
 # LOOKUP_IBASE=yes
 # LOOKUP_JSON=yes
-# LOOKUP_LDAP=yes
+LOOKUP_LDAP=2
 # LOOKUP_LMDB=yes
 
-# LOOKUP_MYSQL=yes
+LOOKUP_MYSQL=2
 # LOOKUP_MYSQL_PC=mariadb
-LOOKUP_NIS=yes
+LOOKUP_NIS=2
 # LOOKUP_NISPLUS=yes
 # LOOKUP_ORACLE=yes
 LOOKUP_PASSWD=yes
-# LOOKUP_PGSQL=yes
+LOOKUP_PGSQL=2
 # LOOKUP_REDIS=yes
 LOOKUP_SQLITE=yes
 # LOOKUP_SQLITE_PC=sqlite3
@@ -474,7 +474,7 @@
 # with Solaris 7 onwards. Uncomment whichever of these you are using.
 
 # LDAP_LIB_TYPE=OPENLDAP1
-# LDAP_LIB_TYPE=OPENLDAP2
+LDAP_LIB_TYPE=OPENLDAP2
 # LDAP_LIB_TYPE=NETSCAPE
 # LDAP_LIB_TYPE=SOLARIS
 
@@ -482,7 +482,7 @@
 # Michigan (OpenLDAP 1) library.
 
 # For building as a modules, set LOOKUP_LDAP_INCLUDE and LOOKUP_LDAP_LIBS
-
+LOOKUP_LDAP_LIBS = -lldap -llber
 #------------------------------------------------------------------------------
 # The PCRE2 library is required for Exim.  There is no longer an embedded
 # version of the PCRE library included with the source code, instead you
@@ -531,7 +531,7 @@
 
 # LOOKUP_LIBS=-L/usr/local/lib -lldap -llber
 # Some platforms may need this for LOOKUP_NIS:
-LOOKUP_LIBS += -lnsl
+LOOKUP_NIS_LIBS = -lnsl
 LOOKUP_LIBS += -lsqlite3
 #LOOKUP_LIBS += -ljansson
 #LOOKUP_LIBS += -lhiredis
@@ -544,6 +544,10 @@
 # LOOKUP_LIBS += -llmdb
 # For dynamic-modules builds, use instead LOOKUP_LMDB_INCLUDE & LOOKUP_LMDB_LIBS
 
+LOOKUP_MYSQL_INCLUDE = -I/usr/include/mysql
+LOOKUP_MYSQL_LIBS = -lmysqlclient
+LOOKUP_PGSQL_INCLUDE = -I`pg_config --includedir`
+LOOKUP_PGSQL_LIBS = -lpq
 
 #------------------------------------------------------------------------------
 # Compiling the Exim monitor: If you want to compile the Exim monitor, a
@@ -553,7 +557,7 @@
 # files are defaulted in the OS/Makefile-Default file, but can be overridden in
 # local OS-specific make files.
 
-EXIM_MONITOR=eximon.bin
+# EXIM_MONITOR=eximon.bin
 
 
 #------------------------------------------------------------------------------
@@ -585,7 +589,7 @@
 # and the MIME ACL. Please read the documentation to learn more about these
 # features.
 
-# WITH_CONTENT_SCAN=yes
+WITH_CONTENT_SCAN=yes
 
 # If you have content scanning you may wish to only include some of the scanner
 # interfaces.  Uncomment any of these lines to remove that code.
@@ -885,8 +889,8 @@
 # The heimdal does build but we have no test coverage so it is not know to work.
 
 AUTH_CRAM_MD5=yes
-# AUTH_CYRUS_SASL=yes
-# AUTH_DOVECOT=yes
+AUTH_CYRUS_SASL=2
+AUTH_DOVECOT=yes
 AUTH_EXTERNAL=yes
 # AUTH_GSASL=yes
 # AUTH_GSASL_PC=libgsasl
@@ -894,8 +898,8 @@
 # AUTH_HEIMDAL_GSSAPI_PC=heimdal-gssapi
 # AUTH_HEIMDAL_GSSAPI_PC=heimdal-gssapi heimdal-krb5
 AUTH_PLAINTEXT=yes
-# AUTH_SPA=yes
-# AUTH_TLS=yes
+AUTH_SPA=yes
+AUTH_TLS=yes
 
 # Heimdal through 1.5 required pkg-config 'heimdal-gssapi'; Heimdal 7.1
 # requires multiple pkg-config files to work with Exim, so the second example
@@ -908,7 +912,7 @@
 # Similarly for GNU SASL, unless pkg-config is used via AUTH_GSASL_PC.
 # Ditto for AUTH_HEIMDAL_GSSAPI(_PC).
 
-# AUTH_LIBS=-lsasl2
+AUTH_CYRUS_SASL_LIBS = -lsasl2
 # AUTH_LIBS=-lgsasl
 # AUTH_LIBS=-lgssapi -lheimntlm -lkrb5 -lhx509 -lcom_err -lhcrypto -lasn1 -lwind -lroken -lcrypt
 
@@ -1008,16 +1012,13 @@
 # to be recompiled with the desired local_scan function. For a full
 # description of the API to this function, see the Exim specification.
 
-DLOPEN_LOCAL_SCAN=yes
-HAVE_LOCAL_SCAN=yes
+# DLOPEN_LOCAL_SCAN=yes
+# HAVE_LOCAL_SCAN=yes
 
 # If you set DLOPEN_LOCAL_SCAN, then you need to include -rdynamic in the
 # linker flags.  Without it, the loaded .so won't be able to access any
 # functions from exim.
 
-LDFLAGS += -rdynamic
-CFLAGS += -fvisibility=hidden
-
 #------------------------------------------------------------------------------
 # The default distribution of Exim contains only the plain text form of the
 # documentation. Other forms are available separately. If you want to install
@@ -1121,12 +1122,12 @@
 # Perl costs quite a lot of resources. Only do this if you really need it.
 #
 
-# EXIM_PERL=perl.o
+EXIM_PERL=perl.o
 
 # For a dynamic module build add also SUPPORT_PERL=2 and SUPPORT_PAM_(INCLUED,LIBS)
-#SUPPORT_PERL=2
-#SUPPORT_PERL_INCLUDE=$(PERL_CFLAGS)
-#SUPPORT_PERL_LIBS=$(PERL_LFLAGS) -lperl
+SUPPORT_PERL=2
+SUPPORT_PERL_INCLUDE=$(PERL_CFLAGS)
+SUPPORT_PERL_LIBS=$(PERL_LFLAGS) -lperl
 
 
 #------------------------------------------------------------------------------
@@ -1136,7 +1137,7 @@
 # that the local_scan API is made available by the linker. You may also need
 # to add -ldl to EXTRALIBS so that dlopen() is available to Exim.
 
-# EXPAND_DLFUNC=yes
+EXPAND_DLFUNC=yes
 
 
 #------------------------------------------------------------------------------
@@ -1148,11 +1149,11 @@
 #
 # For a dynamic module build add SUPPORT_PAM=2 and SUPPORT_PAM_LIBS=-lpam
 
-# SUPPORT_PAM=yes
+SUPPORT_PAM=2
 
 # You probably need to add -lpam to EXTRALIBS, and in some releases of
 # GNU/Linux -ldl is also needed.
-EXTRALIBS=-ldl
+SUPPORT_PAM_LIBS = -lpam
 
 
 #------------------------------------------------------------------------------
@@ -1166,7 +1167,7 @@
 # If you may want to use inbound (server-side) proxying, using Proxy Protocol,
 # uncomment the line below.
 
-# SUPPORT_PROXY=yes
+SUPPORT_PROXY=yes
 
 
 #------------------------------------------------------------------------------
@@ -1199,10 +1200,10 @@
 # is historic).  The same rules as for other module builds apply; use
 # SUPPORT_SPF_{INCLUDE,LIBS}.
 
-# SUPPORT_SPF=yes
+SUPPORT_SPF=2
 # CFLAGS  += -I/usr/local/include
 # LDFLAGS += -lspf2
-
+SUPPORT_SPF_LIBS = -lspf2
 
 #------------------------------------------------------------------------------
 # Support for authentication via Radius is also available. The Exim support,
@@ -1508,7 +1509,7 @@
 # local part) can be increased by changing this value. It should be set to
 # a multiple of 16.
 
-# MAX_NAMED_LIST=16
+MAX_NAMED_LIST=32
 
 
 #------------------------------------------------------------------------------