Date: Wed, 27 Nov 2013 04:39:09 +0000 (UTC) From: Dirk Meyer <dinoex@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334995 - in head/mail/milter-regex: . files Message-ID: <201311270439.rAR4d935098085@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dinoex Date: Wed Nov 27 04:39:09 2013 New Revision: 334995 URL: http://svnweb.freebsd.org/changeset/ports/334995 Log: - update to 2.0 Modified: head/mail/milter-regex/Makefile head/mail/milter-regex/distinfo head/mail/milter-regex/files/patch-milter-regex.c (contents, props changed) head/mail/milter-regex/pkg-plist Modified: head/mail/milter-regex/Makefile ============================================================================== --- head/mail/milter-regex/Makefile Wed Nov 27 03:08:05 2013 (r334994) +++ head/mail/milter-regex/Makefile Wed Nov 27 04:39:09 2013 (r334995) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= milter-regex -PORTVERSION= 1.9 +PORTVERSION= 2.0 CATEGORIES= mail MASTER_SITES= http://www.benzedrine.cx/ @@ -15,7 +15,6 @@ LICENSE_FILE= ${FILESDIR}/COPYRIGHT USE_RC_SUBR= milterregex SUB_LIST= SPOOLDIR=${SPOOLDIR} PLIST_SUB= SPOOLDIR=${SPOOLDIR} -PLIST_FILES= libexec/milter-regex man/man8/milter-regex.8.gz MAILUSER?= mailnull SPOOLDIR?= /var/run/milter-regex @@ -25,15 +24,15 @@ SPOOLDIR?= /var/run/milter-regex .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk" post-patch: - @${REINPLACE_CMD} -e \ + ${REINPLACE_CMD} -e \ "s:/etc/milter-regex.conf:${PREFIX}/etc/milter-regex.conf:g; \ s:/var/spool/milter-regex:${SPOOLDIR}:g; \ s:_milter-regex:${MAILUSER}:g;" ${WRKSRC}/milter-regex.c - @${REINPLACE_CMD} -e \ + ${REINPLACE_CMD} -e \ "s:/etc/milter-regex.conf:${PREFIX}/etc/milter-regex.conf:g; \ s:/var/spool/milter-regex:${SPOOLDIR}:g; \ s:mailstats 1:mailstats 8:;" ${WRKSRC}/milter-regex.8 - @${REINPLACE_CMD} -e "s:-lpthread:${PTHREAD_LIBS}:g; \ + ${REINPLACE_CMD} -e "s:-lpthread:${PTHREAD_LIBS}:g; \ s:-I/usr/src/gnu/usr.sbin/sendmail/include:${PTHREAD_CFLAGS}:g; \ s:-L/usr/local/lib:-L${LOCALBASE}/lib:g; \ s/-Werror//g" ${WRKSRC}/Makefile Modified: head/mail/milter-regex/distinfo ============================================================================== --- head/mail/milter-regex/distinfo Wed Nov 27 03:08:05 2013 (r334994) +++ head/mail/milter-regex/distinfo Wed Nov 27 04:39:09 2013 (r334995) @@ -1,2 +1,2 @@ -SHA256 (milter-regex-1.9.tar.gz) = 6a708b0ff31d9f6db0e5b96915354c15f65ca09a730c599970b37e30699b18e4 -SIZE (milter-regex-1.9.tar.gz) = 19880 +SHA256 (milter-regex-2.0.tar.gz) = ac0388766e5780c42d39e72b694986524e312ea17e5da4823749c7c5b7a55a70 +SIZE (milter-regex-2.0.tar.gz) = 19891 Modified: head/mail/milter-regex/files/patch-milter-regex.c ============================================================================== --- head/mail/milter-regex/files/patch-milter-regex.c Wed Nov 27 03:08:05 2013 (r334994) +++ head/mail/milter-regex/files/patch-milter-regex.c Wed Nov 27 04:39:09 2013 (r334995) @@ -1,14 +1,14 @@ ---- milter-regex.c.orig 2011-11-21 13:13:33.000000000 +0100 -+++ milter-regex.c 2011-12-10 08:02:10.000000000 +0100 +--- milter-regex.c.orig 2013-11-25 09:41:55.000000000 +0100 ++++ milter-regex.c 2013-11-27 05:25:43.000000000 +0100 @@ -60,6 +60,7 @@ static const char *rule_file_name = "/etc/milter-regex.conf"; static int debug = 0; +static int quiet = 0; + static unsigned maxlines = 0; static pthread_mutex_t mutex; - struct context { -@@ -95,6 +96,7 @@ +@@ -97,6 +98,7 @@ #define USER "_milter-regex" #define OCONN "unix:/var/spool/milter-regex/sock" @@ -16,7 +16,7 @@ #define RCODE_REJECT "554" #define RCODE_TEMPFAIL "451" #define XCODE_REJECT "5.7.1" -@@ -630,6 +632,9 @@ +@@ -645,6 +647,9 @@ va_list ap; char msg[8192]; @@ -26,7 +26,7 @@ va_start(ap, fmt); if (context != NULL) snprintf(msg, sizeof(msg), "%s [%s]: ", context->host_name, -@@ -667,15 +672,19 @@ +@@ -682,15 +687,19 @@ { int ch; const char *oconn = OCONN; @@ -42,12 +42,12 @@ tzset(); openlog("milter-regex", LOG_PID | LOG_NDELAY, LOG_DAEMON); -- while ((ch = getopt(argc, argv, "c:dj:p:u:")) != -1) { -+ while ((ch = getopt(argc, argv, "c:dj:p:qr:u:")) != -1) { +- while ((ch = getopt(argc, argv, "c:dj:l:m:p:u:")) != -1) { ++ while ((ch = getopt(argc, argv, "c:dj:l:m:p:qr:u:")) != -1) { switch (ch) { case 'c': rule_file_name = optarg; -@@ -689,6 +698,12 @@ +@@ -710,6 +719,12 @@ case 'p': oconn = optarg; break; @@ -60,7 +60,7 @@ case 'u': user = optarg; break; -@@ -761,9 +776,22 @@ +@@ -782,9 +797,22 @@ perror("daemon"); goto done; } Modified: head/mail/milter-regex/pkg-plist ============================================================================== --- head/mail/milter-regex/pkg-plist Wed Nov 27 03:08:05 2013 (r334994) +++ head/mail/milter-regex/pkg-plist Wed Nov 27 04:39:09 2013 (r334995) @@ -1,3 +1,5 @@ +libexec/milter-regex +man/man8/milter-regex.8.gz @cwd / @dirrmtry %%SPOOLDIR%% @cwd
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311270439.rAR4d935098085>