From 3ed9a01649305f84eca5c91cb97fbb46d5c24b27 Mon Sep 17 00:00:00 2001 From: Volker Stolz Date: Mon, 12 Jul 2004 15:36:53 +0000 Subject: Update to 0.9.18: * vacation.cache.create configuration directive * experimental libtre-support * new user commands "archive" and "archive2" * quota.timefatal.acl configuration directive * bug fixes PR: ports/68851 Submitted by: Xavier Beaudouin (maintainer) --- mail/lmtpd/Makefile | 13 ++++++++++--- mail/lmtpd/distinfo | 4 ++-- mail/lmtpd/files/patch-re::re-tre.c | 31 +++++++++++++++++++++++++++++++ mail/lmtpd/pkg-plist | 24 ------------------------ 4 files changed, 43 insertions(+), 29 deletions(-) create mode 100644 mail/lmtpd/files/patch-re::re-tre.c (limited to 'mail/lmtpd') diff --git a/mail/lmtpd/Makefile b/mail/lmtpd/Makefile index 3e9c0457ff82..f466a4b630be 100644 --- a/mail/lmtpd/Makefile +++ b/mail/lmtpd/Makefile @@ -6,10 +6,9 @@ # PORTNAME= lmtpd -PORTVERSION= 0.9.16 -PORTREVISION= 1 +PORTVERSION= 0.9.18 CATEGORIES= mail -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= ftp://ftp.oav.net/pll/ ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= pll MAINTAINER= kiwi@oav.net @@ -23,6 +22,7 @@ OPTIONS= PCRE "Support for PCRE" on OPTIONS+= MYSQL "Support for MySQL Queries and Logs" on OPTIONS+= DB3 "Support for DB3" on OPTIONS+= DB4 "Support for DB4" off +OPTIONS+= TRE "Support for TRE regexp (Approx regexp)" on .include @@ -37,6 +37,13 @@ CONFIGURE_ARGS+= --with-pcre CONFIGURE_ARGS+= --without-pcre .endif +.if defined(WITH_TRE) +LIB_DEPENDS+= tre:${PORTSDIR}/textproc/libtre/ +CONFIGURE_ARGS+= --with-tre +.else +CONFIGURE_ARGS+= --without-tre +.endif + .if defined(WITH_MYSQL) USE_MYSQL= yes CONFIGURE_ARGS+= --with-mysql=${LOCALBASE}/include/mysql --with-mysqllog diff --git a/mail/lmtpd/distinfo b/mail/lmtpd/distinfo index c17c64b8d90a..17edbdb4f5d6 100644 --- a/mail/lmtpd/distinfo +++ b/mail/lmtpd/distinfo @@ -1,2 +1,2 @@ -MD5 (lmtpd-0.9.16.tar.gz) = 5df6bcdbdc68ecdb6cca8ad237076b4a -SIZE (lmtpd-0.9.16.tar.gz) = 274224 +MD5 (lmtpd-0.9.18.tar.gz) = 45cc49c3b1bc85a3de35d2ada8f9fa1e +SIZE (lmtpd-0.9.18.tar.gz) = 446618 diff --git a/mail/lmtpd/files/patch-re::re-tre.c b/mail/lmtpd/files/patch-re::re-tre.c new file mode 100644 index 000000000000..f9678b248919 --- /dev/null +++ b/mail/lmtpd/files/patch-re::re-tre.c @@ -0,0 +1,31 @@ +--- re/re-tre.c.orig Mon Jul 12 14:33:52 2004 ++++ re/re-tre.c Mon Jul 12 14:36:05 2004 +@@ -117,6 +117,7 @@ + static int re_exec(RE *re, char *string) { + regaparams_t regparams ; + regamatch_t regamatch = {0,}; ++ int ret; + + memcpy(®params, re->hint, sizeof(regaparams_t)); + +@@ -131,16 +132,17 @@ + regparams.max_err=1; + #endif + +- int ret = tre_regaexec(re->code, string, ®amatch, regparams, 0); ++ ret = tre_regaexec(re->code, string, ®amatch, regparams, 0); + return ret!=0; + } + + char *re_tre_params(RE *re, char *s) { ++ int *counter; ++ int end = 0; + regaparams_t *params = malloc(sizeof(regaparams_t)); + tre_regaparams_default(params); +- int *counter = ¶ms->max_err; ++ counter = ¶ms->max_err; + *counter = 1; +- int end = 0; + printf("s=%s\n", s); + while(*s && !end) { + if (*s>='0' && *s<='9') { diff --git a/mail/lmtpd/pkg-plist b/mail/lmtpd/pkg-plist index 063444332fd4..e1b8a0ea5412 100644 --- a/mail/lmtpd/pkg-plist +++ b/mail/lmtpd/pkg-plist @@ -3,30 +3,6 @@ bin/filtercheck bin/lmtpdlogsum etc/lmtpd.conf.dist libexec/lmtpd -share/nls/C/filtercheck.cat -share/nls/en_AU.ISO8859-1/filtercheck.cat -share/nls/en_AU.ISO8859-15/filtercheck.cat -share/nls/en_AU.US-ASCII/filtercheck.cat -share/nls/en_CA.ISO8859-1/filtercheck.cat -share/nls/en_CA.ISO8859-15/filtercheck.cat -share/nls/en_CA.US-ASCII/filtercheck.cat -share/nls/en_GB.ISO8859-1/filtercheck.cat -share/nls/en_GB.ISO8859-15/filtercheck.cat -share/nls/en_GB.US-ASCII/filtercheck.cat -share/nls/en_NZ.ISO8859-1/filtercheck.cat -share/nls/en_NZ.ISO8859-15/filtercheck.cat -share/nls/en_NZ.US-ASCII/filtercheck.cat -share/nls/en_US.ISO8859-1/filtercheck.cat -share/nls/en_US.ISO8859-15/filtercheck.cat -share/nls/fr_BE.ISO8859-1/filtercheck.cat -share/nls/fr_BE.ISO8859-15/filtercheck.cat -share/nls/fr_CA.ISO8859-1/filtercheck.cat -share/nls/fr_CA.ISO8859-15/filtercheck.cat -share/nls/fr_CH.ISO8859-1/filtercheck.cat -share/nls/fr_CH.ISO8859-15/filtercheck.cat -share/nls/fr_FR.ISO8859-1/filtercheck.cat -share/nls/fr_FR.ISO8859-15/filtercheck.cat -share/nls/fr_FR.ISO_8859-1/filtercheck.cat %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/TODO -- cgit v1.2.3