Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 13 Dec 2016 14:52:23 +0000 (UTC)
From:      Florian Smeets <flo@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r428490 - in head/security/amavisd-new: . files
Message-ID:  <201612131452.uBDEqNnp066240@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: flo
Date: Tue Dec 13 14:52:23 2016
New Revision: 428490
URL: https://svnweb.freebsd.org/changeset/ports/428490

Log:
  - 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]

Added:
  head/security/amavisd-new/files/patch-amavisd   (contents, props changed)
Modified:
  head/security/amavisd-new/Makefile
  head/security/amavisd-new/files/amavis-p0fanalyzer.in

Modified: head/security/amavisd-new/Makefile
==============================================================================
--- head/security/amavisd-new/Makefile	Tue Dec 13 14:28:51 2016	(r428489)
+++ head/security/amavisd-new/Makefile	Tue Dec 13 14:52:23 2016	(r428490)
@@ -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

Modified: head/security/amavisd-new/files/amavis-p0fanalyzer.in
==============================================================================
--- head/security/amavisd-new/files/amavis-p0fanalyzer.in	Tue Dec 13 14:28:51 2016	(r428489)
+++ head/security/amavisd-new/files/amavis-p0fanalyzer.in	Tue Dec 13 14:52:23 2016	(r428490)
@@ -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

Added: head/security/amavisd-new/files/patch-amavisd
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/amavisd-new/files/patch-amavisd	Tue Dec 13 14:52:23 2016	(r428490)
@@ -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

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612131452.uBDEqNnp066240>