diff options
| author | Florian Smeets <flo@FreeBSD.org> | 2016-12-13 14:52:23 +0000 |
|---|---|---|
| committer | Florian Smeets <flo@FreeBSD.org> | 2016-12-13 14:52:23 +0000 |
| commit | 0656c2cb81fccb588fe70ab92117df2b74dae89d (patch) | |
| tree | dde83855b131e4d359353cacf3e410598d84bd90 /security/amavisd-new | |
| parent | ddefcc3d30c3f40848fcf9ca7d99c6687a660b4f (diff) | |
| download | ports-0656c2cb81fccb588fe70ab92117df2b74dae89d.tar.gz ports-0656c2cb81fccb588fe70ab92117df2b74dae89d.zip | |
- 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]
Notes
Notes:
svn path=/head/; revision=428490
Diffstat (limited to 'security/amavisd-new')
| -rw-r--r-- | security/amavisd-new/Makefile | 3 | ||||
| -rw-r--r-- | security/amavisd-new/files/amavis-p0fanalyzer.in | 4 | ||||
| -rw-r--r-- | security/amavisd-new/files/patch-amavisd | 10 |
3 files changed, 14 insertions, 3 deletions
diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile index a01de8ec700a..15b10e14e985 100644 --- a/security/amavisd-new/Makefile +++ b/security/amavisd-new/Makefile @@ -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 diff --git a/security/amavisd-new/files/amavis-p0fanalyzer.in b/security/amavisd-new/files/amavis-p0fanalyzer.in index 1f6844730e03..b2329b701e35 100644 --- a/security/amavisd-new/files/amavis-p0fanalyzer.in +++ b/security/amavisd-new/files/amavis-p0fanalyzer.in @@ -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 diff --git a/security/amavisd-new/files/patch-amavisd b/security/amavisd-new/files/patch-amavisd new file mode 100644 index 000000000000..fac22b6161c7 --- /dev/null +++ b/security/amavisd-new/files/patch-amavisd @@ -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 |