- Update to 0.97

- Introduce OPTIONS: WITH_DW_AUTH - include Dale Woolridge's experimental
  auth patch [1]

Submitted by:	Dale Woolridge (via e-mail)
This commit is contained in:
Sergei Kolobov 2005-10-25 17:41:47 +00:00
parent 9ead6bca4f
commit dc7eb9a1fe
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=146336
4 changed files with 35 additions and 7 deletions

View file

@ -6,7 +6,7 @@
#
PORTNAME= mailfront
PORTVERSION= 0.96
PORTVERSION= 0.97
CATEGORIES= mail
MASTER_SITES= http://untroubled.org/${PORTNAME}/
@ -28,6 +28,14 @@ CVM_LIB= ${LOCALBASE}/lib
DOCS= NEWS README TODO *.html
OPTIONS= DW_AUTH "Include Dale Woolridge's auth patch" off
.include <bsd.port.pre.mk>
.if defined(WITH_DW_AUTH)
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-mailfront-0.92-dw-auth
.endif
do-configure:
${ECHO_CMD} "${PREFIX}/bin" > ${WRKSRC}/conf-bin
${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
@ -42,4 +50,4 @@ post-install:
cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
.endif
.include <bsd.port.mk>
.include <bsd.port.post.mk>

View file

@ -1,4 +1,4 @@
MD5 (mailfront-0.96.tar.gz) = f084f00f58be10c95c7e8062777da7db
SIZE (mailfront-0.96.tar.gz) = 72002
MD5 (mailfront-0.96.tar.gz.sig) = 6c97a09e2f1495b6c843cee1800282d1
SIZE (mailfront-0.96.tar.gz.sig) = 189
MD5 (mailfront-0.97.tar.gz) = 02d490bbe87258c68278f1aae7747551
SIZE (mailfront-0.97.tar.gz) = 72245
MD5 (mailfront-0.97.tar.gz.sig) = 5ac8adb12a40dba7f1d45484a106454e
SIZE (mailfront-0.97.tar.gz.sig) = 189

View file

@ -0,0 +1,21 @@
Index: mailrules.c
===================================================================
--- mailrules.c (revision 326)
+++ mailrules.c (working copy)
@@ -296,7 +296,7 @@
struct rule* r;
unsigned long databytes;
- if (*l != 'k' && *l != 'd' && *l != 'z' && *l != 'p' && *l != 'n') return 0;
+ if (*l != 'k' && *l != 'd' && *l != 'z' && *l != 'p' && *l != 'n' && *l != 'a') return 0;
r = alloc_rule();
r->code = *l++;
@@ -423,6 +423,7 @@
case 'k': code = 250; defmsg = "OK"; break;
case 'd': code = 553; defmsg = "Rejected"; break;
case 'z': code = 451; defmsg = "Deferred"; break;
+ case 'a': code = 553; defmsg = "Authenticate first"; if (authenticated) return 0; break;
default: code = 451; defmsg = "Temporary failure"; break;
}

View file

@ -12,7 +12,6 @@ bin/smtpfront-reject
%%PORTDOCS%%%%DOCSDIR%%/NEWS
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/TODO
%%PORTDOCS%%%%DOCSDIR%%/cvm-sasl.html
%%PORTDOCS%%%%DOCSDIR%%/imapfront.html
%%PORTDOCS%%%%DOCSDIR%%/mailfront.html
%%PORTDOCS%%%%DOCSDIR%%/mailrules.html