cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Update to version 4.88

Browse Source 
- Add experimental LMDB lookup option
- Add experimental queuefile option
- Remove rspamd pacth which is now included in Exim

Changes: ftp://ftp.exim.org/pub/exim/exim4/NewStuff
This commit is contained in:
Vsevolod Stakhov 2017-01-02 11:57:25 +00:00
parent 6e50202209
commit 2149bdc512
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=430351
8 changed files with 43 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mail/exim-doc-html/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= exim
PORTVERSION= 4.87
PORTVERSION= 4.88
CATEGORIES= mail
MASTER_SITES= EXIM
MASTER_SITE_SUBDIR= /exim4/ \
@ -31,7 +31,7 @@ NO_BUILD= yes
.if defined(FETCH_ALL)
. for _df in ${AVAILABLE_FORMATS}
. if ${_df} != ${DOCFORMAT}
DISTFILES+= exim-${_df}-${PORTVERSION}${EXTRACT_SUFX}:exim
DISTFILES+= exim-${_df}-${PORTVERSION}${EXTRACT_SUFX}
. endif
. endfor
.endif

14
mail/exim-doc-html/distinfo
View File

@ -1,7 +1,7 @@
TIMESTAMP = 1482674149
SHA256 (exim/exim-html-4.87.tar.bz2) = 8f87876d4a392f59d1009ba64ac461862951a3f4eed9c0b14a49be7bcbdc1f12
SIZE (exim/exim-html-4.87.tar.bz2) = 478953
SHA256 (exim/exim-pdf-4.87.tar.bz2) = 52c6205ec31fe8162a7068ba86dfd1ac6e370c76a5377bdc7bd29555f8d6ca0c
SIZE (exim/exim-pdf-4.87.tar.bz2) = 1917123
SHA256 (exim/exim-postscript-4.87.tar.bz2) = 7241b80d724d473cb9e47823eaa219d89bf2a56d6e80e710b850bbd90f271b49
SIZE (exim/exim-postscript-4.87.tar.bz2) = 1052132
TIMESTAMP = 1483358167
SHA256 (exim/exim-html-4.88.tar.bz2) = afae7d298e7571026635d6377b26eb0849b27c28b1490cc2f1ac424937e90521
SIZE (exim/exim-html-4.88.tar.bz2) = 478405
SHA256 (exim/exim-pdf-4.88.tar.bz2) = 33736fafb45c5922fcbc0def7626f46cb74927987b78943aa26949ef30789574
SIZE (exim/exim-pdf-4.88.tar.bz2) = 1922494
SHA256 (exim/exim-postscript-4.88.tar.bz2) = a932809a80657195f3163f889512eb1f705c7e41e061150ae41561ac6d86cb4c
SIZE (exim/exim-postscript-4.88.tar.bz2) = 1062025

18
mail/exim/Makefile
View File

@ -50,6 +50,7 @@ EXIMON_USE= xorg=x11,xaw,xt
GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls
ICONV_USES= iconv:lib,build
INTERNATIONAL_LIB_DEPENDS= libidn.so:dns/libidn
LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb
MYSQL_USE= mysql=yes
OPENLDAP_USE= openldap=yes
PGSQL_USES= pgsql
@ -96,7 +97,7 @@ MASTER_SITES+= http://marc.merlins.org/linux/exim/files/:sa_exim \
DISTFILES+= sa-exim-${SA_EXIM_VERSION}.tar.gz:sa_exim
.endif
EXIM_VERSION= 4.87.1
EXIM_VERSION= 4.88
SA_EXIM_VERSION=4.2
EXIM_INSTALL_ARG+= "-no_chown" "-no_symlink"
@ -317,6 +318,17 @@ SEDLIST+= -e 's,^(DBMLIB=),\# \1,'
SEDLIST+= -e 's,XX_DB_LIBS_XX,${DB_LIBS:S/,/\\,/g},' \
-e 's,XX_DB_INCLUDES_XX,${DB_INCLUDES:S/,/\\,/g},'
.if ${PORT_OPTIONS:MLMDB}
LMDB_LIBS= -L${LOCALBASE}/lib -llmdb
LMDB_INCLUDES= -I${LOCALBASE}/include
SEDLIST+= -e 's,^\# (EXPERIMENTAL_LMDB=),\1,'
.else
LMDB_LIBS=
LMDB_INCLUDES=
.endif
SEDLIST+= -e 's,XX_LMDB_LIBS_XX,${LMDB_LIBS:S/,/\\,/g},' \
-e 's,XX_LMDB_INCLUDES_XX,${LMDB_INCLUDES:S/,/\\,/g},'
.if ${PORT_OPTIONS:MMYSQL}
SEDLIST+= -e 's,XX_MYSQL_LIBS_XX,-L${LOCALBASE:S/,/\\,/g}/lib/mysql -lmysqlclient,' \
-e 's,XX_MYSQL_INCLUDE_XX,-I${LOCALBASE:S/,/\\,/g}/include/mysql,' \
@ -505,6 +517,10 @@ SEDLIST+= -e 's,^\# (WHITELIST_D_MACROS=).*$$,\1${WHITELIST_D_MACROS:S/,/\\,/g},
SEDLIST+= -e 's,^\# (TRUSTED_CONFIG_LIST=).*$$,\1${TRUSTED_CONFIG_LIST:S/,/\\,/g},'
.endif
.if ${PORT_OPTIONS:MQUEUEFILE}
SEDLIST+= -e 's,^\# (EXPERIMENTAL_QUEUEFILE=),\1,'
.endif
MAKE_ENV+= INSTALL_ARG="${EXIM_INSTALL_ARG}"
DUMMY_LDFLAGS!= ${ECHO_CMD} ${LDFLAGS} | ${SED} -e 's|-Wl,-rpath|-Wl,-DUMMYrpath|g; s|-rpath|-Wl,-rpath|g; s|-DUMMYrpath|-rpath|g'

6
mail/exim/distinfo
View File

@ -1,5 +1,5 @@
TIMESTAMP = 1482673582
SHA256 (exim/exim-4.87.1.tar.bz2) = d4b7994c89240d2f9a9fcd7a2dffa4b72f14379001a24266f4dbb0fbe5131514
SIZE (exim/exim-4.87.1.tar.bz2) = 1789634
TIMESTAMP = 1483356878
SHA256 (exim/exim-4.88.tar.bz2) = 119d5fd7e31fc224e84dfa458fe182f200856bae7adf852a8287c242161f8a2d
SIZE (exim/exim-4.88.tar.bz2) = 1824610
SHA256 (exim/sa-exim-4.2.tar.gz) = 72e0a735547f18b05785e6c58a71d24623858f0f5234a5dc0e24cb453999e99a
SIZE (exim/sa-exim-4.2.tar.gz) = 66575

13
mail/exim/files/patch-rspamd-shutdown
View File

@ -1,13 +0,0 @@
--- src/spam.c.orig 2016-04-02 20:24:15.000000000 +0100
+++ src/spam.c 2016-04-21 16:42:49.297221000 +0100
@@ -494,7 +494,9 @@
(void)fclose(mbox_file);
/* we're done sending, close socket for writing */
-shutdown(spamd_sock,SHUT_WR);
+if (!sd->is_rspamd) {
+ shutdown(spamd_sock,SHUT_WR);
+}
/* read spamd response using what's left of the timeout. */
memset(spamd_buffer, 0, sizeof(spamd_buffer));

18
mail/exim/files/patch-scripts__exim_install
View File

@ -1,5 +1,5 @@
--- scripts/exim_install.orig 2014-05-26 20:14:16.000000000 +0100
+++ scripts/exim_install 2014-07-04 12:40:45.002262243 +0100
--- scripts/exim_install.orig 2016-12-18 14:02:28.000000000 +0000
+++ scripts/exim_install 2017-01-02 11:48:46.939703000 +0000
@@ -29,6 +29,7 @@
do_chown=yes
@ -30,17 +30,17 @@
# Overrides of other things
case "$inst_uid" in ?*) INST_UID="$inst_uid";; esac
@@ -217,8 +220,7 @@
# The exim binary is handled specially
@@ -218,8 +221,7 @@
if [ $name = exim${EXE} ]; then
- version=exim-`./exim -bV -C /dev/null | \
exim="./exim -bV -C /dev/null"
- version=exim-`$exim 2>/dev/null | \
- awk '/Exim version/ { OFS=""; print $3,"-",substr($4,2,length($4)-1) }'`${EXE}
+ version=exim
if [ "${version}" = "exim-${EXE}" ]; then
echo $com ""
@@ -382,9 +384,8 @@
@@ -384,9 +386,8 @@
echo $com ' ' ${CONFIGURE_FILE}
echo $com Therefore, skipping automatic installation.
@ -52,7 +52,7 @@
if [ "${SYSTEM_ALIASES_FILE}" = "" ] ; then
SYSTEM_ALIASES_FILE=/etc/aliases
echo $com This configuration has system aliases in ${SYSTEM_ALIASES_FILE}.
@@ -394,8 +395,8 @@
@@ -396,8 +397,8 @@
${real} ${MKDIR} -p `${DIRNAME} ${CONFIGURE_FILE}`
echo sed -e '\\'
@ -63,7 +63,7 @@
# I can't find a way of writing this using the ${real} feature because
# it seems that the output redirection always happens, even when -n was
@@ -403,8 +404,8 @@
@@ -405,8 +406,8 @@
if [ "$real" = "" ] ; then
sed -e \
@ -74,7 +74,7 @@
else
true
fi
@@ -414,24 +415,22 @@
@@ -416,24 +417,22 @@
echo $com "*** Exim installation ${ver}failed ***"
exit 1
fi

4
mail/exim/files/patch-src__EDITME
View File

@ -50,9 +50,9 @@
-# LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include -I /usr/local/pgsql/include
-# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq -lgds -lsqlite3
+INCLUDE=-IXX_LOCALBASE_XX/include XX_DB_INCLUDES_XX
+INCLUDE=-IXX_LOCALBASE_XX/include XX_DB_INCLUDES_XX XX_LMDB_INCLUDES_XX
+LOOKUP_INCLUDE=XX_MYSQL_INCLUDE_XX XX_PGSQL_INCLUDE_XX XX_LDAP_INCLUDE_XX
+LOOKUP_LIBS=XX_MYSQL_LIBS_XX XX_PGSQL_LIBS_XX XX_LDAP_LIBS_XX
+LOOKUP_LIBS=XX_MYSQL_LIBS_XX XX_PGSQL_LIBS_XX XX_LDAP_LIBS_XX XX_LMDB_LIBS_XX
+DBMLIB=XX_DB_LIBS_XX

4
mail/exim/options
View File

@ -66,7 +66,7 @@ OPTIONS_GROUP_LOOKUP= CDB BDB DNSDB DSEARCH LSEARCH MYSQL NIS OPENLDAP PGSQL RED
LOOKUP_DESC= Lookup support
OPTIONS_GROUP_STORAGE= MAILDIR MAILSTORE MBX
STORAGE_DESC= Supported storage formats
OPTIONS_GROUP_EXPERIMENTAL= CERTNAMES DANE DCC DMARC DSN SPF
OPTIONS_GROUP_EXPERIMENTAL= CERTNAMES DANE DCC DMARC DSN SPF LMDB QUEUEFILE
EXPERIMENTAL_DESC= Experimental options
OPTIONS_GROUP= AUTH LOOKUP STORAGE EXPERIMENTAL
@ -97,6 +97,7 @@ EXIMON_DESC= Build eximon monitor (requires X libraries)
ICONV_DESC= Enable header charset conversion
INTERNATIONAL_DESC= Enable support for the transmission of UTF-8 envelope addresses
LISTMATCH_RHS_DESC= Enable pre-4.77 behaviour for match_*
LMDB_DESC= Enable LMDB lookups
LMTP_DESC= RFC2033 SMTP over command pipe transport
LSEARCH_DESC= Enable wildcarded-file lookups
MAILDIR_DESC= Enable Maildir mailbox format
@ -107,6 +108,7 @@ NIS_DESC= Enable NIS-style lookups
OLD_DEMIME_DESC= Enable old, deprecated "demime" ACL
OPENLDAP_DESC= Enable LDAP lookups
OCSP_DESC= Enable OCSP stapling
QUEUEFILE_DESC= Enable queuefile transport
PAM_DESC= Enable PAM authentication mechanisms
PASSWD_DESC= Enable /etc/passwd lookups
PGSQL_DESC= Enable postgresql lookups