Update to version 4.51

This commit is contained in:
Kirill Ponomarev 2005-05-05 13:30:38 +00:00
parent b0b919cb23
commit a23799b077
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=134654
4 changed files with 7 additions and 43 deletions

View file

@ -7,7 +7,7 @@
PORTNAME= exim
PORTVERSION?= ${EXIM_VERSION}
PORTREVISION= 2
PORTREVISION= 0
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_EXIM:S/$/:exim/}
MASTER_SITE_SUBDIR= exim4/:exim
@ -28,7 +28,7 @@ MASTER_SITE_SUBDIR+= sa-exim/:sa_exim
DISTFILES+= sa-exim-${SA_EXIM_VERSION}.tar.gz:sa_exim
.endif
EXIM_VERSION= 4.50
EXIM_VERSION= 4.51
SA_EXIM_VERSION=4.2
IGNOREFILES= FAQ.txt.bz2
@ -295,7 +295,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"
@ -315,7 +315,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
@ -339,7 +339,7 @@ DB_LIBS= -L${LOCALBASE}/lib -ldb-4.3
DB_INCLUDES= -I${LOCALBASE}/include/db43
LIB_DEPENDS+= db-4.3.0:${PORTSDIR}/databases/db43
.else
BROKEN= WITH_BDB_VER must be either 1, 4, 41, 42 or 43
BROKEN= "WITH_BDB_VER must be either 1, 4, 41, 42 or 43"
.endif
SEDLIST+= -e 's,XX_DB_LIBS_XX,${DB_LIBS},' \
-e 's,XX_DB_INCLUDES_XX,${DB_INCLUDES},'

View file

@ -1,5 +1,5 @@
MD5 (exim/exim-4.50.tar.bz2) = 7844eff82171872f6b3971a4183368d9
SIZE (exim/exim-4.50.tar.bz2) = 1434928
MD5 (exim/exim-4.51.tar.bz2) = 36c0c005e012d13beb7edfd8d124c049
SIZE (exim/exim-4.51.tar.bz2) = 1462114
MD5 (exim/sa-exim-4.2.tar.gz) = ad76f73c6b3d01caa88078e3e622745a
SIZE (exim/sa-exim-4.2.tar.gz) = 66575
MD5 (exim/FAQ.txt.bz2) = IGNORE

View file

@ -1,14 +0,0 @@
$FreeBSD$
--- src/acl.c.orig
+++ src/acl.c
@@ -325,7 +325,7 @@
(1<<ACL_WHERE_ETRN)|(1<<ACL_WHERE_EXPN)|
(1<<ACL_WHERE_MAILAUTH)|(1<<ACL_WHERE_QUIT)|
(1<<ACL_WHERE_MAIL)|(1<<ACL_WHERE_STARTTLS)|
- (1<<ACL_WHERE_VRFY)|(1<<ACL_WHERE_MIME),
+ (1<<ACL_WHERE_VRFY),
#endif
(1<<ACL_WHERE_AUTH)|(1<<ACL_WHERE_CONNECT)| /* sender_domains */

View file

@ -1,22 +0,0 @@
$FreeBSD$
--- src/smtp_in.c.orig
+++ src/smtp_in.c
@@ -1610,6 +1610,8 @@
&tzero) > 0)
{
int rc = read(fileno(smtp_in), smtp_inbuffer, in_buffer_size);
+ if (rc > 0)
+ {
if (rc > 150) rc = 150;
smtp_inbuffer[rc] = 0;
log_write(0, LOG_MAIN|LOG_REJECT, "SMTP protocol violation: "
@@ -1618,6 +1620,7 @@
string_printing(smtp_inbuffer));
smtp_printf("554 SMTP synchronization error\r\n");
return FALSE;
+ }
}
}