diff options
| -rw-r--r-- | mail/exim/Makefile | 16 | ||||
| -rw-r--r-- | mail/exim/files/patch-doc::spec.txt | 25 | ||||
| -rw-r--r-- | mail/exim/options | 6 | ||||
| -rw-r--r-- | mail/exim/pkg-plist | 2 |
4 files changed, 18 insertions, 31 deletions
diff --git a/mail/exim/Makefile b/mail/exim/Makefile index c84b899bb409..aef22b3fecb9 100644 --- a/mail/exim/Makefile +++ b/mail/exim/Makefile @@ -54,7 +54,6 @@ USE_XLIB= yes .endif USE_BZIP2= yes -USE_REINPLACE= yes .if !defined(EXIMON_ONLY) MAN8= exim.8 @@ -235,6 +234,9 @@ WITH_DEFAULT_CHARSET?= ISO-8859-1 # Enable Sender Rewriting Scheme (SRS) #WITH_SRS= yes # +# Enable Sender Rewriting Scheme alternative library (SRS_ALT) +#WITH_SRS_ALT= yes +# # Use the readline(3) library for the test expansion option #WITH_READLINE= yes # @@ -300,7 +302,7 @@ SEDLIST+= -e 's,XX_ICONV_LIBS_XX,,' .if defined(WITH_LDAP) || defined(LDAP_LIB_TYPE) \ || defined(WITH_OPENLDAP1) || defined(WITH_OPENLDAP2) \ || defined(WITH_OPENLDAP20) || defined(WITH_OPENLDAP21) -BROKEN= "deprecated LDAP option defined, use WITH_OPENLDAP or WITH_OPENLDAP_VER" +BROKEN= deprecated LDAP option defined, use WITH_OPENLDAP or WITH_OPENLDAP_VER .endif .if defined(WITH_OPENLDAP_VER) && ${WITH_OPENLDAP_VER:L} != "auto" @@ -320,7 +322,7 @@ SEDLIST+= -e 's,XX_LDAP_[^ ]*_XX,,' \ .endif .if defined(DB_LIB_VERSION) -BROKEN= "deprecated option DB_LIB_VERSION used, use WITH_BDB_VER" +BROKEN= deprecated option DB_LIB_VERSION used, use WITH_BDB_VER .endif .if ${WITH_BDB_VER} == 1 @@ -348,7 +350,7 @@ DB_LIBS= -L${LOCALBASE}/lib -ldb-4.4 DB_INCLUDES= -I${LOCALBASE}/include/db44 LIB_DEPENDS+= db-4.4.0:${PORTSDIR}/databases/db44 .else -BROKEN= "WITH_BDB_VER must be either 1, 4, 41, 42, 43 or 44" +BROKEN= WITH_BDB_VER must be either 1, 4, 41, 42, 43 or 44 .endif SEDLIST+= -e 's,XX_DB_LIBS_XX,${DB_LIBS},' \ -e 's,XX_DB_INCLUDES_XX,${DB_INCLUDES},' @@ -417,7 +419,7 @@ SEDLIST+= -e 's,XX_RADIUS_LIBS_XX,-L${LOCALBASE}/lib -lradiusclient,' \ -e 's,^\# (RADIUS_CONFIG_FILE=).*,\1${LOCALBASE}/etc/radiusclient.conf,' \ -e 's,^\# (RADIUS_LIB_TYPE=).*,\1RADIUSCLIENT,' .else -IGNORE= WITH_RADIUS_TYPE must be either RADLIB or RADIUSCLIENT +IGNORE= the variable WITH_RADIUS_TYPE must be either RADLIB or RADIUSCLIENT .endif .else SEDLIST+= -e 's,XX_RADIUS_LIBS_XX,,' @@ -514,6 +516,10 @@ SEDLIST+= -e 's,XX_DOMAINKEYS_LIBS_XX,,' LIB_DEPENDS+= srs2.0:${PORTSDIR}/mail/libsrs2 SEDLIST+= -e 's,XX_SRS_FLAGS_XX,-DSRS,' \ -e 's,XX_SRS_LIBS_XX,-lsrs2,' +.elif defined(WITH_SRS_ALT) +LIB_DEPENDS+= srs_alt.1:${PORTSDIR}/mail/libsrs_alt +SEDLIST+= -e 's,XX_SRS_FLAGS_XX,-DEXPERIMENTAL_SRS,' \ + -e 's,XX_SRS_LIBS_XX,-lsrs_alt,' .else SEDLIST+= -e 's,XX_SRS_FLAGS_XX,,' \ -e 's,XX_SRS_LIBS_XX,,' diff --git a/mail/exim/files/patch-doc::spec.txt b/mail/exim/files/patch-doc::spec.txt deleted file mode 100644 index 28281ec779a9..000000000000 --- a/mail/exim/files/patch-doc::spec.txt +++ /dev/null @@ -1,25 +0,0 @@ - -$FreeBSD$ - ---- doc/spec.txt.orig -+++ doc/spec.txt -@@ -15622,6 +15622,19 @@ - message_prefix = "\1\1\1\1\n" - message_suffix = "\1\1\1\1\n" - -+However, many clients require that the certificate presented by Exim be a user -+(also called "leaf" or "site") certificate, and not a self-signed certificate. -+In this case, the self-signed certificate described above must be installed on -+the client host as a trusted root certification authority and the certificate -+used by Exim must be a user certificate signed with that self-signed -+certificate. -+ -+For information on creating self-signed CA certificates and using them to sign -+user certificates, see the "General implementation overview" chapter of the -+Open-source PKI Book, available online at: -+ -+ http://ospkibook.sourceforge.net/ -+ - +-----------------------------------------------------------------------------+ - |create_directory | Use: appendfile | Type: boolean | Default: true| - +-----------------------------------------------------------------------------+ diff --git a/mail/exim/options b/mail/exim/options index 9825b2a2c5cb..7be140280d49 100644 --- a/mail/exim/options +++ b/mail/exim/options @@ -131,6 +131,9 @@ # srs_recipient (string*) SRS recipient # srs_status (string*) SRS status +#WITHOUT_SRS_ALT +# Enable Sender Rewriting Scheme (SRS) + #WITHOUT_DOMAINKEYS # Enable Yahoo DomainKeys support. # DomainKeys support depends on exiscan. @@ -266,6 +269,9 @@ WITHOUT_SPF?=yes .ifndef WITH_SRS WITHOUT_SRS?=yes .endif +.ifndef WITH_SRS_ALT +WITHOUT_SRS_ALT?=yes +.endif .ifndef WITH_DOMAINKEYS WITHOUT_DOMAINKEYS?=yes .endif diff --git a/mail/exim/pkg-plist b/mail/exim/pkg-plist index 0216e257dafa..1d4bf3dd3fdd 100644 --- a/mail/exim/pkg-plist +++ b/mail/exim/pkg-plist @@ -56,4 +56,4 @@ etc/exim/configure.default @unexec rmdir %B 2>/dev/null || true %%DAEMON%%%%RCORDER%%@cwd / %%DAEMON%%etc/rc.d/exim%%RC_SUFX%% -@unexec rmdir %%LOGDIR%% 2>/dev/null || true +@dirrmtry %%LOGDIR%% |