svn commit: r537532 - in branches/2020Q2/mail/exim: . files
Dima Panov
fluffy at FreeBSD.org
Tue Jun 2 09:38:39 UTC 2020
Author: fluffy
Date: Tue Jun 2 09:38:37 2020
New Revision: 537532
URL: https://svnweb.freebsd.org/changeset/ports/537532
Log:
MFH: r537520
mail/exim: update to 4.94 release
while here, convert POST-INSTALL-NOTES* to ucl
PR: 246922
Submitted by: pi
Approved by: ports-secteam (joneum)
Deleted:
branches/2020Q2/mail/exim/files/74_19-SPF-fix-result-for-case-of-only-non-spf-TXT-RRs.patch
branches/2020Q2/mail/exim/files/74_20-Fix-error-logging-for-dynamically-loaded-modules.patch
branches/2020Q2/mail/exim/files/74_21-heimdal-auth-fix-the-increase-of-big_buffer-size.patch
branches/2020Q2/mail/exim/files/74_22-Taint-hybrid-checking-mode.patch
branches/2020Q2/mail/exim/files/74_23-Fix-taint-hybrid-checking-on-BSD.patch
branches/2020Q2/mail/exim/files/74_24-TFO-even-in-binary-built-for-modern-Linux-handle-err.patch
branches/2020Q2/mail/exim/files/74_25-Taint-slow-mode-checking-only.patch
branches/2020Q2/mail/exim/files/74_26-Auths-fix-cyrus-sasl-driver-for-gssapi-use.patch
branches/2020Q2/mail/exim/files/74_27-GnuTLS-fix-hanging-callout-connections.patch
Modified:
branches/2020Q2/mail/exim/Makefile
branches/2020Q2/mail/exim/distinfo
branches/2020Q2/mail/exim/files/POST-INSTALL-NOTES
branches/2020Q2/mail/exim/files/POST-INSTALL-NOTES.clamd
branches/2020Q2/mail/exim/files/patch-src-auths-call_radius.c
Directory Properties:
branches/2020Q2/ (props changed)
Modified: branches/2020Q2/mail/exim/Makefile
==============================================================================
--- branches/2020Q2/mail/exim/Makefile Tue Jun 2 09:33:07 2020 (r537531)
+++ branches/2020Q2/mail/exim/Makefile Tue Jun 2 09:38:37 2020 (r537532)
@@ -3,7 +3,7 @@
PORTNAME= exim
PORTVERSION?= ${EXIM_VERSION}
-PORTREVISION?= 3
+PORTREVISION?= 0
CATEGORIES= mail
MASTER_SITES= EXIM:exim
MASTER_SITE_SUBDIR= /exim4/:exim \
@@ -57,11 +57,13 @@ INTERNATIONAL_LIB_DEPENDS= libidn.so:dns/libidn
LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb
MYSQL_USES= mysql
OPENLDAP_USE= openldap=yes
-PGSQL_USES= pgsql
+PGSQL_LIB_DEPENDS= libicudata.so:devel/icu
+PGSQL_USES= pgsql pkgconfig
REDIS_LIB_DEPENDS= libhiredis.so:databases/hiredis
SASLAUTHD_RUN_DEPENDS= ${LOCALBASE}/sbin/saslauthd:security/cyrus-sasl2-saslauthd
SA_EXIM_RUN_DEPENDS= ${LOCALBASE}/bin/spamc:mail/spamassassin
SPF_LIB_DEPENDS= libspf2.so:mail/libspf2
+SQLITE_LIB_DEPENDS= libicudata.so:devel/icu
SQLITE_USES= pkgconfig sqlite
.include <bsd.port.options.mk>
@@ -103,7 +105,7 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-Local-sa-exim.
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-Local-sa-exim.conf
.endif
-EXIM_VERSION= 4.93.0.4
+EXIM_VERSION= 4.94
SA_EXIM_VERSION=4.2.1
EXIM_INSTALL_ARG+= "-no_chown" "-no_symlink"
EXTRA_PATCHES+= `${FIND} ${PATCHDIR} -name '74_*.patch'|${SORT} -h`
Modified: branches/2020Q2/mail/exim/distinfo
==============================================================================
--- branches/2020Q2/mail/exim/distinfo Tue Jun 2 09:33:07 2020 (r537531)
+++ branches/2020Q2/mail/exim/distinfo Tue Jun 2 09:38:37 2020 (r537532)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1582564322
-SHA256 (exim/exim-4.93.0.4.tar.bz2) = b67336ba06f8d8233060de073d6082d75a378faaafad660c5f124bb13d75e4d9
-SIZE (exim/exim-4.93.0.4.tar.bz2) = 1974190
+TIMESTAMP = 1591032067
+SHA256 (exim/exim-4.94.tar.bz2) = 73feeaa5ddb43363782db0c307b593aacb49542dd7e4b795a2880779595affe5
+SIZE (exim/exim-4.94.tar.bz2) = 1997217
SHA256 (exim/sa-exim-4.2.1.tar.gz) = 24d4bf7b0fdddaea11f132981cebb6a86a4ab20ef54111a8ebd481b421c6e2c1
SIZE (exim/sa-exim-4.2.1.tar.gz) = 68933
Modified: branches/2020Q2/mail/exim/files/POST-INSTALL-NOTES
==============================================================================
--- branches/2020Q2/mail/exim/files/POST-INSTALL-NOTES Tue Jun 2 09:33:07 2020 (r537531)
+++ branches/2020Q2/mail/exim/files/POST-INSTALL-NOTES Tue Jun 2 09:38:37 2020 (r537532)
@@ -1,3 +1,6 @@
+[
+{ type: install
+ message: <<EOM
The following documentation has been installed:
man exim -> Exim options (command line)
@@ -40,3 +43,6 @@ You may also want to configure newsyslog(8) to rotate
Additional scripts to help upgrading are installed in:
%%EXAMPLESDIR%%
+EOM
+}
+]
Modified: branches/2020Q2/mail/exim/files/POST-INSTALL-NOTES.clamd
==============================================================================
--- branches/2020Q2/mail/exim/files/POST-INSTALL-NOTES.clamd Tue Jun 2 09:33:07 2020 (r537531)
+++ branches/2020Q2/mail/exim/files/POST-INSTALL-NOTES.clamd Tue Jun 2 09:38:37 2020 (r537532)
@@ -1,3 +1,6 @@
+[
+{ type: install
+ message: <<EOM
The following steps will enable clamd malware scanning using exiscan ACLs.
It is important to follow them in sequence.
@@ -44,3 +47,6 @@ It is important to follow them in sequence.
Sheldon Hearn <sheldonh at FreeBSD.org>
+EOM
+}
+]
Modified: branches/2020Q2/mail/exim/files/patch-src-auths-call_radius.c
==============================================================================
--- branches/2020Q2/mail/exim/files/patch-src-auths-call_radius.c Tue Jun 2 09:33:07 2020 (r537531)
+++ branches/2020Q2/mail/exim/files/patch-src-auths-call_radius.c Tue Jun 2 09:38:37 2020 (r537532)
@@ -1,6 +1,6 @@
---- src/auths/call_radius.c.orig 2019-12-08 12:53:48 UTC
-+++ src/auths/call_radius.c
-@@ -112,37 +112,37 @@ rc_openlog("exim");
+--- src/auths/call_radius.c.orig 2020-05-30 22:35:38.000000000 +0200
++++ src/auths/call_radius.c 2020-06-01 19:54:14.402105000 +0200
+@@ -113,37 +113,37 @@
#ifdef RADIUS_LIB_RADIUSCLIENT
if (rc_read_config(RADIUS_CONFIG_FILE) != 0)
@@ -8,65 +8,65 @@
+ *errptr = string_sprintf("%s", "RADIUS: can't open %s", RADIUS_CONFIG_FILE);
else if (rc_read_dictionary(rc_conf_str("dictionary")) != 0)
-- *errptr = string_sprintf("RADIUS: can't read dictionary");
+- *errptr = US"RADIUS: can't read dictionary";
+ *errptr = string_sprintf("%s", "RADIUS: can't read dictionary");
- else if (rc_avpair_add(&send, PW_USER_NAME, user, 0) == NULL)
-- *errptr = string_sprintf("RADIUS: add user name failed\n");
+ else if (!rc_avpair_add(&send, PW_USER_NAME, user, 0))
+- *errptr = US"RADIUS: add user name failed";
+ *errptr = string_sprintf("%s", "RADIUS: add user name failed\n");
- else if (rc_avpair_add(&send, PW_USER_PASSWORD, CS radius_args, 0) == NULL)
-- *errptr = string_sprintf("RADIUS: add password failed\n");
+ else if (!rc_avpair_add(&send, PW_USER_PASSWORD, CS radius_args, 0))
+- *errptr = US"RADIUS: add password failed");
+ *errptr = string_sprintf("%s", "RADIUS: add password failed\n");
- else if (rc_avpair_add(&send, PW_SERVICE_TYPE, &service, 0) == NULL)
-- *errptr = string_sprintf("RADIUS: add service type failed\n");
+ else if (!rc_avpair_add(&send, PW_SERVICE_TYPE, &service, 0))
+- *errptr = US"RADIUS: add service type failed";
+ *errptr = string_sprintf("%s", "RADIUS: add service type failed\n");
#else /* RADIUS_LIB_RADIUSCLIENT unset => RADIUS_LIB_RADIUSCLIENT2 */
- if ((h = rc_read_config(RADIUS_CONFIG_FILE)) == NULL)
+ if (!(h = rc_read_config(RADIUS_CONFIG_FILE)))
- *errptr = string_sprintf("RADIUS: can't open %s", RADIUS_CONFIG_FILE);
+ *errptr = string_sprintf("%s", "RADIUS: can't open %s", RADIUS_CONFIG_FILE);
else if (rc_read_dictionary(h, rc_conf_str(h, "dictionary")) != 0)
-- *errptr = string_sprintf("RADIUS: can't read dictionary");
+- *errptr = US"RADIUS: can't read dictionary";
+ *errptr = string_sprintf("%s", "RADIUS: can't read dictionary");
- else if (rc_avpair_add(h, &send, PW_USER_NAME, user, Ustrlen(user), 0) == NULL)
-- *errptr = string_sprintf("RADIUS: add user name failed\n");
+ else if (!rc_avpair_add(h, &send, PW_USER_NAME, user, Ustrlen(user), 0))
+- *errptr = US"RADIUS: add user name failed";
+ *errptr = string_sprintf("%s", "RADIUS: add user name failed\n");
- else if (rc_avpair_add(h, &send, PW_USER_PASSWORD, CS radius_args,
- Ustrlen(radius_args), 0) == NULL)
-- *errptr = string_sprintf("RADIUS: add password failed\n");
+ else if (!rc_avpair_add(h, &send, PW_USER_PASSWORD, CS radius_args,
+ Ustrlen(radius_args), 0))
+- *errptr = US"RADIUS: add password failed";
+ *errptr = string_sprintf("%s", "RADIUS: add password failed\n");
- else if (rc_avpair_add(h, &send, PW_SERVICE_TYPE, &service, 0, 0) == NULL)
-- *errptr = string_sprintf("RADIUS: add service type failed\n");
+ else if (!rc_avpair_add(h, &send, PW_SERVICE_TYPE, &service, 0, 0))
+- *errptr = US"RADIUS: add service type failed";
+ *errptr = string_sprintf("%s", "RADIUS: add service type failed\n");
#endif /* RADIUS_LIB_RADIUSCLIENT */
-@@ -175,7 +175,7 @@ switch (result)
+@@ -176,7 +176,7 @@
- default:
case BADRESP_RC:
-- *errptr = string_sprintf("RADIUS: unexpected response (%d)", result);
-+ *errptr = string_sprintf("%s", "RADIUS: unexpected response (%d)", result);
- return ERROR;
+ default:
+- *errptr = string_sprintf("RADIUS: unexpected response (%d)", result);
++ *errptr = string_sprintf("%s", "RADIUS: unexpected response (%d)", result);
+ return ERROR;
}
-@@ -186,7 +186,7 @@ switch (result)
- h = rad_auth_open();
- if (h == NULL)
+@@ -186,7 +186,7 @@
+
+ if (!(h = rad_auth_open()))
{
- *errptr = string_sprintf("RADIUS: can't initialise libradius");
+ *errptr = string_sprintf("%s", "RADIUS: can't initialise libradius");
return ERROR;
}
if (rad_config(h, RADIUS_CONFIG_FILE) != 0 ||
-@@ -196,7 +196,7 @@ if (rad_config(h, RADIUS_CONFIG_FILE) != 0 ||
+@@ -196,7 +196,7 @@
rad_put_int(h, RAD_SERVICE_TYPE, RAD_AUTHENTICATE_ONLY) != 0 ||
rad_put_string(h, RAD_NAS_IDENTIFIER, CS primary_hostname) != 0)
{
@@ -75,18 +75,18 @@
result = ERROR;
}
else
-@@ -214,12 +214,12 @@ else
- break;
+@@ -211,12 +211,12 @@
+ break;
case -1:
-- *errptr = string_sprintf("RADIUS: %s", rad_strerror(h));
-+ *errptr = string_sprintf("%s", "RADIUS: %s", rad_strerror(h));
- result = ERROR;
- break;
+- *errptr = string_sprintf("RADIUS: %s", rad_strerror(h));
++ *errptr = string_sprintf("%s", "RADIUS: %s", rad_strerror(h));
+ result = ERROR;
+ break;
default:
-- *errptr = string_sprintf("RADIUS: unexpected response (%d)", result);
-+ *errptr = string_sprintf("%s", "RADIUS: unexpected response (%d)", result);
- result= ERROR;
- break;
+- *errptr = string_sprintf("RADIUS: unexpected response (%d)", result);
++ *errptr = string_sprintf("%s", "RADIUS: unexpected response (%d)", result);
+ result= ERROR;
+ break;
}
More information about the svn-ports-all
mailing list