ports/127825: [PATCH] mail/exim: add support for DKIM

Fri Oct 3 16:40:01 UTC 2008

>Number:         127825
>Category:       ports
>Synopsis:       [PATCH] mail/exim: add support for DKIM
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Oct 03 16:40:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Sergey Skvortsov
>Release:        FreeBSD 7.1-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD vega.protey.ru 7.1-PRERELEASE FreeBSD 7.1-PRERELEASE #3: Mon Sep  8 18:35:31 MSD
>Description:

Add support for DKIM.

>How-To-Repeat:
>Fix:

--- exim-4.69.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/mail/exim/Makefile,v
retrieving revision 1.237
diff -u -u -r1.237 Makefile
--- Makefile	19 Apr 2008 17:51:39 -0000	1.237
+++ Makefile	3 Oct 2008 16:33:52 -0000
@@ -231,6 +231,9 @@
 # Enable DomainKeys support
 #WITH_DOMAINKEYS=	yes
 #
+# Enable DKIM (DomainKeys Identified Mail) support
+#WITH_DKIM=	yes
+#
 # Enable Sender Rewriting Scheme (SRS)
 #WITH_SRS=		yes
 #
@@ -506,6 +509,14 @@
 SEDLIST+=	-e 's,XX_DOMAINKEYS_LIBS_XX,,'
 .endif
 
+.if defined(WITH_DKIM)
+LIB_DEPENDS+=	dkim.1:${PORTSDIR}/mail/libdkim
+SEDLIST+=	-e 's,XX_DKIM_LIBS_XX,-ldkim,' \
+		-e 's,^\# (EXPERIMENTAL_DKIM=),\1,'
+.else
+SEDLIST+=	-e 's,XX_DKIM_LIBS_XX,,'
+.endif
+
 .if defined(WITH_SRS)
 LIB_DEPENDS+=	srs2.0:${PORTSDIR}/mail/libsrs2
 SEDLIST+=	-e 's,XX_SRS_FLAGS_XX,-DSRS,' \
Index: options
===================================================================
RCS file: /home/pcvs/ports/mail/exim/options,v
retrieving revision 1.10
diff -u -u -r1.10 options
--- options	31 May 2007 06:48:14 -0000	1.10
+++ options	3 Oct 2008 16:33:52 -0000
@@ -139,6 +139,9 @@
 # Enable Yahoo DomainKeys support.
 # DomainKeys support depends on exiscan.
 
+#WITHOUT_DKIM
+# Enable DKIM (DomainKeys Identified Mail) support.
+
 #WITHOUT_TCP_WRAPPERS
 # Link against libwrap to support /etc/hosts.allow access control.
 
@@ -279,6 +282,9 @@
 .ifndef WITH_DOMAINKEYS
 WITHOUT_DOMAINKEYS?=yes
 .endif
+.ifndef WITH_DKIM
+WITHOUT_DKIM?=yes
+.endif
 .ifndef WITH_TCP_WRAPPERS
 WITHOUT_TCP_WRAPPERS?=yes
 .endif
Index: files/patch-src::EDITME
===================================================================
RCS file: /home/pcvs/ports/mail/exim/files/patch-src::EDITME,v
retrieving revision 1.26
diff -u -u -r1.26 patch-src::EDITME
--- files/patch-src::EDITME	28 May 2007 21:09:37 -0000	1.26
+++ files/patch-src::EDITME	3 Oct 2008 16:33:52 -0000
@@ -69,15 +69,16 @@
  
  
  #------------------------------------------------------------------------------
-@@ -372,6 +375,7 @@
+@@ -372,6 +375,8 @@
  
  
  
 +# EXPERIMENTAL_DOMAINKEYS=yes
++# EXPERIMENTAL_DKIM=yes
  ###############################################################################
  #                 THESE ARE THINGS YOU MIGHT WANT TO SPECIFY                  #
  ###############################################################################
-@@ -440,6 +444,7 @@
+@@ -440,6 +445,7 @@
  
  # ALT_CONFIG_PREFIX=/some/directory/
  # ALT_CONFIG_PREFIX=/some/directory/exim.conf-
@@ -85,7 +86,7 @@
  
  
  #------------------------------------------------------------------------------
-@@ -494,7 +499,7 @@
+@@ -494,7 +500,7 @@
  # one that is set in the headers_charset option. The default setting is
  # defined by this setting:
  
@@ -94,7 +95,7 @@
  
  # If you are going to make use of $header_xxx expansions in your configuration
  # file, or if your users are going to use them in filter files, and the normal
-@@ -579,7 +584,7 @@
+@@ -579,7 +585,7 @@
  # SUPPORT_TLS=yes
  
  # Uncomment this setting if you are using OpenSSL
@@ -103,7 +104,7 @@
  
  # Uncomment these settings if you are using GnuTLS
  # USE_GNUTLS=yes
-@@ -630,7 +635,7 @@
+@@ -630,7 +636,7 @@
  # Once you have done this, "make install" will build the info files and
  # install them in the directory you have defined.
  
@@ -112,7 +113,7 @@
  
  
  #------------------------------------------------------------------------------
-@@ -643,7 +648,7 @@
+@@ -643,7 +649,7 @@
  # %s. This will be replaced by one of the strings "main", "panic", or "reject"
  # to form the final file names. Some installations may want something like this:
  
@@ -121,7 +122,7 @@
  
  # which results in files with names /var/log/exim_mainlog, etc. The directory
  # in which the log files are placed must exist; Exim does not try to create
-@@ -719,7 +724,7 @@
+@@ -719,7 +725,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.
  
@@ -130,7 +131,7 @@
  
  
  #------------------------------------------------------------------------------
-@@ -811,13 +816,21 @@
+@@ -811,13 +817,21 @@
  # library for TCP wrappers, so you probably need something like this:
  #
  # USE_TCP_WRAPPERS=yes
@@ -138,7 +139,7 @@
 -# EXTRALIBS_EXIM=-L/usr/local/lib -lwrap
 -#
 +CFLAGS=XX_CFLAGS_XX XX_SPF_FLAGS_XX XX_SRS_FLAGS_XX XX_SQLITE_FLAGS_XX
-+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
++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
 +
  # but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM
  # as well.
@@ -155,7 +156,7 @@
  #------------------------------------------------------------------------------
  # The default action of the exim_install script (which is run by "make
  # install") is to install the Exim binary with a unique name such as
-@@ -1082,7 +1095,7 @@
+@@ -1082,7 +1096,7 @@
  # (process id) to a file so that it can easily be identified. The path of the
  # file can be specified here. Some installations may want something like this:
  
--- exim-4.69.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:

