1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-06 06:30:19 +00:00

- fix clamd socket file location in default config file [1]

- prevent error messages from amavisd-p0fanalyzer rc script [2]
- add a patch to fix dkim siging that was broken in 2.11.0 [3]

PR:		200036 [1], 209038 [2], 214202 [3]
Submitted by:	barnerd [1]
		Miroslav Lachman <000.fbsd@quip.cz> [2]
		ari@stonepile.fi [3]
This commit is contained in:
Florian Smeets 2016-12-13 14:52:23 +00:00
parent ddefcc3d30
commit 0656c2cb81
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=428490
3 changed files with 14 additions and 3 deletions

View File

@ -2,6 +2,7 @@
PORTNAME= amavisd-new
PORTVERSION= 2.11.0
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= security
MASTER_SITES= http://www.ijs.si/software/amavisd/ \
@ -229,7 +230,7 @@ post-patch:
-e "s|/var/lib/amavis|${AMAVISDIR}|" \
-e "s|/var/virusmails|${AMAVISQUARANTINE}|" \
-e 's|$$localhost_name = .localhost.;|$$localhost_name = $$myhostname;|' \
-e 's|/var/run/clamav/clamd|/var/run/clamav/clamd.sock|g' \
-e 's|/var/run/clamav/clamd|/var/run/clamav/clamd|g' \
${WRKSRC}/amavisd.conf
@${REINPLACE_CMD} "s|/var/amavis/db|${AMAVISDIR}/db|" ${WRKSRC}/amavisd-agent
@${REINPLACE_CMD} "s|/var/amavis/db|${AMAVISDIR}/db|" ${WRKSRC}/amavisd-nanny

View File

@ -32,8 +32,8 @@ p0fanalyzer_start()
p0fanalyzer_stop()
{
/bin/kill `cat ${amavis_p0fanalyzer_pidfile2}` && rm ${amavis_p0fanalyzer_pidfile2}
/bin/kill `cat ${amavis_p0fanalyzer_pidfile1}` && rm ${amavis_p0fanalyzer_pidfile1}
test -s ${amavis_p0fanalyzer_pidfile1} && /bin/kill `cat ${amavis_p0fanalyzer_pidfile2}`
test -s ${amavis_p0fanalyzer_pidfile1} && /bin/kill `cat ${amavis_p0fanalyzer_pidfile1}`
}
run_rc_command $1

View File

@ -0,0 +1,10 @@
--- amavisd.orig 2016-12-10 16:31:50 UTC
+++ amavisd
@@ -34338,6 +34338,7 @@ sub collect_some_dkim_info($) {
$sig_ind++;
}
Amavis::load_policy_bank($_,$msginfo) for @bank_names;
+ $msginfo->originating(c('originating'));
$msginfo->dkim_signatures_valid(\@signatures_valid) if @signatures_valid;
# if (ll(5) && $sig_ind > 0) {
# # show which header fields are covered by which signature