aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortabthorpe <tabthorpe@FreeBSD.org>2010-01-12 05:37:27 +0800
committertabthorpe <tabthorpe@FreeBSD.org>2010-01-12 05:37:27 +0800
commit97acfe0dc3f40ef90ebdbb76228a2a365887404b (patch)
tree5263eb371cc90d0a28c4b52b8575a7a7e9c6e8f0
parent20707ee00c7b2d5744e33e8ca63f5bf31e2f059e (diff)
downloadfreebsd-ports-graphics-97acfe0dc3f40ef90ebdbb76228a2a365887404b.tar.gz
freebsd-ports-graphics-97acfe0dc3f40ef90ebdbb76228a2a365887404b.tar.zst
freebsd-ports-graphics-97acfe0dc3f40ef90ebdbb76228a2a365887404b.zip
- Fix rejecttext1 extrapatch
- Reassign to ports@ PR: ports/142593 Submitted by: Marshal Newrock <marshal zordio.com>
-rw-r--r--mail/spamass-milter/Makefile2
-rw-r--r--mail/spamass-milter/files/extra-patch-rejecttext113
2 files changed, 8 insertions, 7 deletions
diff --git a/mail/spamass-milter/Makefile b/mail/spamass-milter/Makefile
index 56066d7c751..1b4568f568a 100644
--- a/mail/spamass-milter/Makefile
+++ b/mail/spamass-milter/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= spamass-milt
-MAINTAINER= tabthorpe@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Sendmail Milter (mail filter) plugin for SpamAssassin
BUILD_DEPENDS= spamc:${PORTSDIR}/mail/p5-Mail-SpamAssassin
diff --git a/mail/spamass-milter/files/extra-patch-rejecttext1 b/mail/spamass-milter/files/extra-patch-rejecttext1
index 22365bda9f1..5052335b720 100644
--- a/mail/spamass-milter/files/extra-patch-rejecttext1
+++ b/mail/spamass-milter/files/extra-patch-rejecttext1
@@ -1,5 +1,5 @@
---- spamass-milter.cpp.ORIG 2006-06-17 11:06:30.000000000 +0200
-+++ spamass-milter.cpp 2006-06-17 11:10:11.000000000 +0200
+--- spamass-milter.cpp.orig 2006-03-23 16:41:36.000000000 -0500
++++ spamass-milter.cpp 2010-01-11 09:32:07.000000000 -0500
@@ -161,6 +161,7 @@
char *defaultuser; /* Username to send to spamc if there are multiple recipients */
char *defaultdomain; /* Domain to append if incoming address has none */
@@ -20,16 +20,17 @@
/* Process command line options */
while ((c = getopt(argc, argv, args)) != -1) {
switch (c) {
-@@ -232,6 +238,8 @@
+@@ -232,6 +238,9 @@
flag_reject = true;
reject_score = atoi(optarg);
break;
+ case 'R':
+ rejecttext = strdup (optarg);
++ break;
case 'u':
flag_sniffuser = true;
defaultuser = strdup(optarg);
-@@ -299,6 +307,7 @@
+@@ -299,6 +308,7 @@
cout << " -P pidfile: Put processid in pidfile" << endl;
cout << " -r nn: reject messages with a score >= nn with an SMTP error.\n"
" use -1 to reject any messages tagged by SA." << endl;
@@ -37,7 +38,7 @@
cout << " -u defaultuser: pass the recipient's username to spamc.\n"
" Uses 'defaultuser' if there are multiple recipients." << endl;
cout << " -x: pass email address through alias and virtusertable expansion." << endl;
-@@ -307,6 +316,11 @@
+@@ -307,6 +317,11 @@
exit(EX_USAGE);
}
@@ -49,7 +50,7 @@
if (pidfilename)
{
unlink(pidfilename);
-@@ -452,7 +466,7 @@
+@@ -452,7 +467,7 @@
if (do_reject)
{
debug(D_MISC, "Rejecting");