From owner-svn-ports-head@freebsd.org Sat Jan 21 17:07:05 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DA794CBB99B; Sat, 21 Jan 2017 17:07:05 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9B50196B; Sat, 21 Jan 2017 17:07:05 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0LH743v035125; Sat, 21 Jan 2017 17:07:04 GMT (envelope-from dinoex@FreeBSD.org) Received: (from dinoex@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0LH74eO035123; Sat, 21 Jan 2017 17:07:04 GMT (envelope-from dinoex@FreeBSD.org) Message-Id: <201701211707.v0LH74eO035123@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dinoex set sender to dinoex@FreeBSD.org using -f From: Dirk Meyer Date: Sat, 21 Jan 2017 17:07:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r432062 - head/mail/antivirus-milter/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Jan 2017 17:07:06 -0000 Author: dinoex Date: Sat Jan 21 17:07:04 2017 New Revision: 432062 URL: https://svnweb.freebsd.org/changeset/ports/432062 Log: - make portlint happier Modified: head/mail/antivirus-milter/files/patch-Makefile head/mail/antivirus-milter/files/patch-antivirus.c Modified: head/mail/antivirus-milter/files/patch-Makefile ============================================================================== --- head/mail/antivirus-milter/files/patch-Makefile Sat Jan 21 17:01:49 2017 (r432061) +++ head/mail/antivirus-milter/files/patch-Makefile Sat Jan 21 17:07:04 2017 (r432062) @@ -1,5 +1,5 @@ ---- Makefile.orig Fri Jun 27 19:55:26 2003 -+++ Makefile Fri Jan 2 14:21:02 2004 +--- Makefile.orig 2003-06-27 17:55:26 UTC ++++ Makefile @@ -1,5 +1,5 @@ -SENDMAILBASE=/system/compile/sendmail-8.12.9 -SENDMAILOBJ=obj.Linux.2.2.19.i686 @@ -8,7 +8,7 @@ INCDIRS=\ -I$(SENDMAILBASE)/include/libmilter/ \ -@@ -10,8 +10,8 @@ +@@ -10,8 +10,8 @@ LIBDIRS=\ -L$(SENDMAILBASE)/$(SENDMAILOBJ)/libsm/ # Linux Modified: head/mail/antivirus-milter/files/patch-antivirus.c ============================================================================== --- head/mail/antivirus-milter/files/patch-antivirus.c Sat Jan 21 17:01:49 2017 (r432061) +++ head/mail/antivirus-milter/files/patch-antivirus.c Sat Jan 21 17:07:04 2017 (r432062) @@ -1,6 +1,6 @@ ---- antivirus.c.orig Tue Jul 15 21:27:14 2003 -+++ antivirus.c Mon Jun 20 17:45:16 2005 -@@ -85,6 +85,8 @@ +--- antivirus.c.orig 2003-07-15 19:27:14 UTC ++++ antivirus.c +@@ -85,6 +85,8 @@ static char *VIRUSACTION=NULL; static char *FORMAT=NULL; static sfsistat avfailcode=0; static int purgevirus=0; @@ -9,7 +9,7 @@ static char *avargs[]={NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}; /* -@@ -128,6 +130,12 @@ +@@ -128,6 +130,12 @@ static char *badext[]={".com",".scr",".v #define FORMAT_SOPHOS ">>> Virus '%[^']s' found in file %*s" /* @@ -22,7 +22,7 @@ ** this can be given on the command line */ static char *configfile=NULL; -@@ -502,6 +510,7 @@ +@@ -502,6 +510,7 @@ sfsistat virusscan(SMFICTX *ctx, char *p int retval; int fd; int i; @@ -30,7 +30,7 @@ char *p=NULL; char *av[]={NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}; -@@ -552,13 +561,26 @@ +@@ -552,13 +561,26 @@ sfsistat virusscan(SMFICTX *ctx, char *p (int)ctx, retval,priv->workdir); } @@ -58,7 +58,7 @@ { if (viruses[0]) strncat(viruses," ",sizeof(viruses)); -@@ -572,10 +594,8 @@ +@@ -572,10 +594,8 @@ sfsistat virusscan(SMFICTX *ctx, char *p if (viruses[0]) priv->viruses=strdup(viruses); else @@ -70,7 +70,7 @@ return(avfailcode); } return(SMFIS_REJECT); -@@ -1211,6 +1231,7 @@ +@@ -1211,6 +1231,7 @@ int init(void) if (AVFAILACTION==NULL) AVFAILACTION=CONF_AVFAILACTION; if (VIRUSACTION==NULL) VIRUSACTION=CONF_VIRUSACTION; @@ -78,7 +78,7 @@ if (strcasecmp(AVPRODUCT,"mcafee")==0) { FORMAT=FORMAT_MCAFEE; -@@ -1225,10 +1246,17 @@ +@@ -1225,10 +1246,17 @@ int init(void) { FORMAT=FORMAT_FSAV; }