From d92715e24fbac90376115fafa95b306dc022df24 Mon Sep 17 00:00:00 2001
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Wed, 18 Feb 2004 02:42:35 +0000
Subject: Update mail/p3scan:

	Fix the code to check for the disksize.

Submitted by:	edwin@mavetju.org
---
 mail/p3scan/Makefile             |  1 +
 mail/p3scan/files/patch-p3scan.c | 24 +++++++++++++-----------
 2 files changed, 14 insertions(+), 11 deletions(-)

(limited to 'mail/p3scan')

diff --git a/mail/p3scan/Makefile b/mail/p3scan/Makefile
index 01a61886da8c..ba34feca65be 100644
--- a/mail/p3scan/Makefile
+++ b/mail/p3scan/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	p3scan
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/mail/p3scan/files/patch-p3scan.c b/mail/p3scan/files/patch-p3scan.c
index 7e9011b947e7..08cd4fdc9db0 100644
--- a/mail/p3scan/files/patch-p3scan.c
+++ b/mail/p3scan/files/patch-p3scan.c
@@ -1,5 +1,5 @@
 --- p3scan.c.orig	Wed Jan 21 01:26:48 2004
-+++ p3scan.c	Wed Feb 18 12:52:37 2004
++++ p3scan.c	Wed Feb 18 13:32:33 2004
 @@ -30,34 +30,39 @@
   *
   */
@@ -64,7 +64,7 @@
  #define DEBUG                    0
  #define QUIET                    0
  #define OVERWRITE                0
-@@ -340,11 +345,22 @@
+@@ -340,11 +345,24 @@
  #define MOVEIT "/bin/mv"
     FILE * scanner;
     static char  line[4096*16];
@@ -74,21 +74,23 @@
     int res, htmlfd, html, toggle;
  
 +#ifdef __FreeBSD__
-+/*
-+    struct statfs fsstats[10];
-+    if ((ret=getfsstat(fsstats,sizeof(fsstats)/sizeof(fsid_t),MNT_WAIT))!=0) {
++    struct statfs fs;
++    if ((ret=statfs(config->virusdir,&fs))!=0) {
 +      do_log(LOG_EMERG, "Unable to get available space!");
 +      return SCANNER_RET_CRIT; // Should never reach here, but keep it clean. :)
 +    }
-+*/
-+#warning I should do something with this information - getfsstat
++    kbfree=fs.f_bavail*fs.f_bsize/1024;
++    if ( config->freespace != 0 && kbfree < config->freespace ){
++      do_log(LOG_CRIT, "Not enough space! Available space: %d", kbfree);
++      return SCANNER_RET_CRIT;
++    }
 +#else
 +   struct statvfs fs;
 +
    /* See if we have enough room to process the message based upon
     what the user determines is enough room in p3scan.conf */
     if ( statvfs( config->virusdir, &fs ) == SCANNER_RET_ERR){
-@@ -356,6 +372,7 @@
+@@ -356,6 +374,7 @@
        do_log(LOG_CRIT, "Not enough space! Available space: %d", kbfree);
        return SCANNER_RET_CRIT;
     }
@@ -96,7 +98,7 @@
  
     /* This is where we should scan for spam - before demime to
        give SpamAssassin the virgin message */
-@@ -820,8 +837,8 @@
+@@ -820,8 +839,8 @@
     do_log(LOG_NOTICE, "Connection from %s:%i", inet_ntoa(p->client_addr.sin_addr), ntohs(p->client_addr.sin_port));
  
     p->server_addr.sin_family = AF_INET;
@@ -107,7 +109,7 @@
        return 1;
     }
     do_log(LOG_NOTICE, "Real-server adress is %s:%i", inet_ntoa(p->server_addr.sin_addr), ntohs(p->server_addr.sin_port));
-@@ -1534,7 +1551,7 @@
+@@ -1534,7 +1553,7 @@
     char * responsemsg;
     int virusdirlen;
     char chownit[100];
@@ -116,7 +118,7 @@
     int len;
     int ret;
     FILE * chowncmd;
-@@ -1574,8 +1591,8 @@
+@@ -1574,8 +1593,8 @@
        };
        // chown /var/run/p3scan/p3scan.pid mail.mail
        len=strlen(CHOWNCMD)+1+strlen(config->runasuser)+1+strlen(config->runasuser)+1+strlen(config->pidfile)+1;
-- 
cgit v1.2.3