View | Details | Raw Unified | Return to bug 127825
Collapse All | Expand All

(-)Makefile (+11 lines)
Lines 231-236 Link Here
231
# Enable DomainKeys support
231
# Enable DomainKeys support
232
#WITH_DOMAINKEYS=	yes
232
#WITH_DOMAINKEYS=	yes
233
#
233
#
234
# Enable DKIM (DomainKeys Identified Mail) support
235
#WITH_DKIM=	yes
236
#
234
# Enable Sender Rewriting Scheme (SRS)
237
# Enable Sender Rewriting Scheme (SRS)
235
#WITH_SRS=		yes
238
#WITH_SRS=		yes
236
#
239
#
Lines 506-511 Link Here
506
SEDLIST+=	-e 's,XX_DOMAINKEYS_LIBS_XX,,'
509
SEDLIST+=	-e 's,XX_DOMAINKEYS_LIBS_XX,,'
507
.endif
510
.endif
508
511
512
.if defined(WITH_DKIM)
513
LIB_DEPENDS+=	dkim.1:${PORTSDIR}/mail/libdkim
514
SEDLIST+=	-e 's,XX_DKIM_LIBS_XX,-ldkim,' \
515
		-e 's,^\# (EXPERIMENTAL_DKIM=),\1,'
516
.else
517
SEDLIST+=	-e 's,XX_DKIM_LIBS_XX,,'
518
.endif
519
509
.if defined(WITH_SRS)
520
.if defined(WITH_SRS)
510
LIB_DEPENDS+=	srs2.0:${PORTSDIR}/mail/libsrs2
521
LIB_DEPENDS+=	srs2.0:${PORTSDIR}/mail/libsrs2
511
SEDLIST+=	-e 's,XX_SRS_FLAGS_XX,-DSRS,' \
522
SEDLIST+=	-e 's,XX_SRS_FLAGS_XX,-DSRS,' \
(-)options (+6 lines)
Lines 139-144 Link Here
139
# Enable Yahoo DomainKeys support.
139
# Enable Yahoo DomainKeys support.
140
# DomainKeys support depends on exiscan.
140
# DomainKeys support depends on exiscan.
141
141
142
#WITHOUT_DKIM
143
# Enable DKIM (DomainKeys Identified Mail) support.
144
142
#WITHOUT_TCP_WRAPPERS
145
#WITHOUT_TCP_WRAPPERS
143
# Link against libwrap to support /etc/hosts.allow access control.
146
# Link against libwrap to support /etc/hosts.allow access control.
144
147
Lines 279-284 Link Here
279
.ifndef WITH_DOMAINKEYS
282
.ifndef WITH_DOMAINKEYS
280
WITHOUT_DOMAINKEYS?=yes
283
WITHOUT_DOMAINKEYS?=yes
281
.endif
284
.endif
285
.ifndef WITH_DKIM
286
WITHOUT_DKIM?=yes
287
.endif
282
.ifndef WITH_TCP_WRAPPERS
288
.ifndef WITH_TCP_WRAPPERS
283
WITHOUT_TCP_WRAPPERS?=yes
289
WITHOUT_TCP_WRAPPERS?=yes
284
.endif
290
.endif
(-)files/patch-src::EDITME (-10 / +11 lines)
Lines 69-83 Link Here
69
 
69
 
70
 
70
 
71
 #------------------------------------------------------------------------------
71
 #------------------------------------------------------------------------------
72
@@ -372,6 +375,7 @@
72
@@ -372,6 +375,8 @@
73
 
73
 
74
 
74
 
75
 
75
 
76
+# EXPERIMENTAL_DOMAINKEYS=yes
76
+# EXPERIMENTAL_DOMAINKEYS=yes
77
+# EXPERIMENTAL_DKIM=yes
77
 ###############################################################################
78
 ###############################################################################
78
 #                 THESE ARE THINGS YOU MIGHT WANT TO SPECIFY                  #
79
 #                 THESE ARE THINGS YOU MIGHT WANT TO SPECIFY                  #
79
 ###############################################################################
80
 ###############################################################################
80
@@ -440,6 +444,7 @@
81
@@ -440,6 +445,7 @@
81
 
82
 
82
 # ALT_CONFIG_PREFIX=/some/directory/
83
 # ALT_CONFIG_PREFIX=/some/directory/
83
 # ALT_CONFIG_PREFIX=/some/directory/exim.conf-
84
 # ALT_CONFIG_PREFIX=/some/directory/exim.conf-
Lines 85-91 Link Here
85
 
86
 
86
 
87
 
87
 #------------------------------------------------------------------------------
88
 #------------------------------------------------------------------------------
88
@@ -494,7 +499,7 @@
89
@@ -494,7 +500,7 @@
89
 # one that is set in the headers_charset option. The default setting is
90
 # one that is set in the headers_charset option. The default setting is
90
 # defined by this setting:
91
 # defined by this setting:
91
 
92
 
Lines 94-100 Link Here
94
 
95
 
95
 # If you are going to make use of $header_xxx expansions in your configuration
96
 # If you are going to make use of $header_xxx expansions in your configuration
96
 # file, or if your users are going to use them in filter files, and the normal
97
 # file, or if your users are going to use them in filter files, and the normal
97
@@ -579,7 +584,7 @@
98
@@ -579,7 +585,7 @@
98
 # SUPPORT_TLS=yes
99
 # SUPPORT_TLS=yes
99
 
100
 
100
 # Uncomment this setting if you are using OpenSSL
101
 # Uncomment this setting if you are using OpenSSL
Lines 103-109 Link Here
103
 
104
 
104
 # Uncomment these settings if you are using GnuTLS
105
 # Uncomment these settings if you are using GnuTLS
105
 # USE_GNUTLS=yes
106
 # USE_GNUTLS=yes
106
@@ -630,7 +635,7 @@
107
@@ -630,7 +636,7 @@
107
 # Once you have done this, "make install" will build the info files and
108
 # Once you have done this, "make install" will build the info files and
108
 # install them in the directory you have defined.
109
 # install them in the directory you have defined.
109
 
110
 
Lines 112-118 Link Here
112
 
113
 
113
 
114
 
114
 #------------------------------------------------------------------------------
115
 #------------------------------------------------------------------------------
115
@@ -643,7 +648,7 @@
116
@@ -643,7 +649,7 @@
116
 # %s. This will be replaced by one of the strings "main", "panic", or "reject"
117
 # %s. This will be replaced by one of the strings "main", "panic", or "reject"
117
 # to form the final file names. Some installations may want something like this:
118
 # to form the final file names. Some installations may want something like this:
118
 
119
 
Lines 121-127 Link Here
121
 
122
 
122
 # which results in files with names /var/log/exim_mainlog, etc. The directory
123
 # which results in files with names /var/log/exim_mainlog, etc. The directory
123
 # in which the log files are placed must exist; Exim does not try to create
124
 # in which the log files are placed must exist; Exim does not try to create
124
@@ -719,7 +724,7 @@
125
@@ -719,7 +725,7 @@
125
 # that the local_scan API is made available by the linker. You may also need
126
 # that the local_scan API is made available by the linker. You may also need
126
 # to add -ldl to EXTRALIBS so that dlopen() is available to Exim.
127
 # to add -ldl to EXTRALIBS so that dlopen() is available to Exim.
127
 
128
 
Lines 130-136 Link Here
130
 
131
 
131
 
132
 
132
 #------------------------------------------------------------------------------
133
 #------------------------------------------------------------------------------
133
@@ -811,13 +816,21 @@
134
@@ -811,13 +817,21 @@
134
 # library for TCP wrappers, so you probably need something like this:
135
 # library for TCP wrappers, so you probably need something like this:
135
 #
136
 #
136
 # USE_TCP_WRAPPERS=yes
137
 # USE_TCP_WRAPPERS=yes
Lines 138-144 Link Here
138
-# EXTRALIBS_EXIM=-L/usr/local/lib -lwrap
139
-# EXTRALIBS_EXIM=-L/usr/local/lib -lwrap
139
-#
140
-#
140
+CFLAGS=XX_CFLAGS_XX XX_SPF_FLAGS_XX XX_SRS_FLAGS_XX XX_SQLITE_FLAGS_XX
141
+CFLAGS=XX_CFLAGS_XX XX_SPF_FLAGS_XX XX_SRS_FLAGS_XX XX_SQLITE_FLAGS_XX
141
+EXTRALIBS=XX_TCP_WRAPPERS_LIBS_XX XX_PAM_LIBS_XX XX_ICONV_LIBS_XX XX_SPF_LIBS_XX XX_SRS_LIBS_XX XX_DOMAINKEYS_LIBS_XX XX_RADIUS_LIBS_XX XX_SQLITE_LIBS_XX
142
+EXTRALIBS=XX_TCP_WRAPPERS_LIBS_XX XX_PAM_LIBS_XX XX_ICONV_LIBS_XX XX_SPF_LIBS_XX XX_SRS_LIBS_XX XX_DOMAINKEYS_LIBS_XX XX_DKIM_LIBS_XX XX_RADIUS_LIBS_XX XX_SQLITE_LIBS_XX
142
+
143
+
143
 # but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM
144
 # but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM
144
 # as well.
145
 # as well.
Lines 155-161 Link Here
155
 #------------------------------------------------------------------------------
156
 #------------------------------------------------------------------------------
156
 # The default action of the exim_install script (which is run by "make
157
 # The default action of the exim_install script (which is run by "make
157
 # install") is to install the Exim binary with a unique name such as
158
 # install") is to install the Exim binary with a unique name such as
158
@@ -1082,7 +1095,7 @@
159
@@ -1082,7 +1096,7 @@
159
 # (process id) to a file so that it can easily be identified. The path of the
160
 # (process id) to a file so that it can easily be identified. The path of the
160
 # file can be specified here. Some installations may want something like this:
161
 # file can be specified here. Some installations may want something like this:

Return to bug 127825