summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MOVED1
-rw-r--r--security/Makefile1
-rw-r--r--security/amavis-stats/Makefile64
-rw-r--r--security/amavis-stats/distinfo2
-rw-r--r--security/amavis-stats/files/DEINSTALL.in16
-rw-r--r--security/amavis-stats/files/INSTALL.in37
-rw-r--r--security/amavis-stats/files/patch-amavis-stats86
-rw-r--r--security/amavis-stats/files/patch-amavis-stats.php11
-rw-r--r--security/amavis-stats/files/pkg-message.in16
-rw-r--r--security/amavis-stats/pkg-descr7
-rw-r--r--security/amavis-stats/pkg-plist6
11 files changed, 1 insertions, 246 deletions
diff --git a/MOVED b/MOVED
index ac96f3b4b259..3cb611300050 100644
--- a/MOVED
+++ b/MOVED
@@ -5699,3 +5699,4 @@ japanese/zangband||2014-03-10|Has expired: No more public distfiles
audio/xmms-wma||2014-03-10|Has expired: No more public distfiles
misc/projectionlib||2014-03-10|Has expired: No more public distfiles
net-mgmt/nagios-pf-plugin||2014-03-10|Has expired: No more public distfiles
+security/amavis-stats||2014-03-10|Has expired: No more public distfiles
diff --git a/security/Makefile b/security/Makefile
index efe17b4f0359..ee5c95a64ba3 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -13,7 +13,6 @@
SUBDIR += aide
SUBDIR += aimsniff
SUBDIR += amap
- SUBDIR += amavis-stats
SUBDIR += amavisd-milter
SUBDIR += amavisd-new
SUBDIR += aolserver-nsencrypt
diff --git a/security/amavis-stats/Makefile b/security/amavis-stats/Makefile
deleted file mode 100644
index 4448acdd4f95..000000000000
--- a/security/amavis-stats/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-# Created by: Mantas Kaulakys <stone@tainet.lt>
-# $FreeBSD$
-
-PORTNAME= amavis-stats
-PORTVERSION= 0.1.12
-PORTREVISION= 3
-CATEGORIES= security
-MASTER_SITES= http://downloads.topicdesk.com/amavis_stats/
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= Simple AMaViS statistics generator based on rrdtool
-
-DEPRECATED= No more public distfiles
-EXPIRATION_DATE= 2014-03-10
-
-RUN_DEPENDS= rrdtool>=0:${PORTSDIR}/databases/rrdtool
-
-USES= perl5
-USE_PERL5= run
-USE_PHP= pcre
-
-MAN1= amavis-stats.1
-
-NO_BUILD= yes
-
-PORTDOCS= README
-
-WEBOWN?= www
-WEBGRP?= www
-
-AMAVISUSER?= amavis
-AMAVISGROUP?= amavis
-
-PKGINSTALL= ${WRKDIR}/INSTALL
-PKGDEINSTALL= ${WRKDIR}/DEINSTALL
-PKGMESSAGE= ${WRKDIR}/pkg-message
-
-SUB_FILES= INSTALL DEINSTALL pkg-message
-SUB_LIST+= AMAVISUSER=${AMAVISUSER} AMAVISGROUP=${AMAVISGROUP}
-
-pre-install: apply-slist
- @${SH} ${PKGINSTALL} ${DISTNAME} PRE-INSTALL
-
-NO_STAGE= yes
-do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/amavis-stats ${PREFIX}/sbin
- ${INSTALL_MAN} ${WRKSRC}/amavis-stats.1 ${MAN1PREFIX}/man/man1
- ${MKDIR} ${PREFIX}/www/amavis-stats
- ${MKDIR} ${PREFIX}/www/amavis-stats/img
- ${TOUCH} ${PREFIX}/www/amavis-stats/img/.keep
- ${INSTALL_DATA} ${WRKSRC}/amavis-stats.php ${PREFIX}/www/amavis-stats
- cd ${PREFIX}/www/amavis-stats && ${LN} -s amavis-stats.php index.php
- ${CHOWN} -R ${AMAVISUSER}:${AMAVISGROUP} ${PREFIX}/www/amavis-stats
- ${CHOWN} ${WEBOWN}:${WEBGRP} ${PREFIX}/www/amavis-stats/img
-
-.if !defined(NOPORTDOCS)
- ${MKDIR} ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${DOCSDIR}
-.endif
-
-post-install:
- @${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.mk>
diff --git a/security/amavis-stats/distinfo b/security/amavis-stats/distinfo
deleted file mode 100644
index dadd9f459cc4..000000000000
--- a/security/amavis-stats/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (amavis-stats-0.1.12.tar.gz) = 0c802f43a0107cd094c422c9771133bef6d4a2b36e5676ed7d02f2e91787be1b
-SIZE (amavis-stats-0.1.12.tar.gz) = 60626
diff --git a/security/amavis-stats/files/DEINSTALL.in b/security/amavis-stats/files/DEINSTALL.in
deleted file mode 100644
index e36d3bff9222..000000000000
--- a/security/amavis-stats/files/DEINSTALL.in
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-USER=%%AMAVISUSER%%
-GROUP=%%AMAVISGROUP%%
-
-if [ "$2" = "POST-DEINSTALL" ]; then
-
- if /usr/sbin/pw group show "${GROUP}" 2>&1 >/dev/null; then
- echo "You should manually remove the \"${GROUP}\" group."
- fi
-
- if /usr/sbin/pw user show "${USER}" 2>&1 >/dev/null; then
- echo "You should manually remove the \"${USER}\" user."
- fi
-
-fi
diff --git a/security/amavis-stats/files/INSTALL.in b/security/amavis-stats/files/INSTALL.in
deleted file mode 100644
index b94fe76d2802..000000000000
--- a/security/amavis-stats/files/INSTALL.in
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-USER=%%AMAVISUSER%%
-GROUP=%%AMAVISGROUP%%
-
-if [ "$2" = "PRE-INSTALL" ]; then
-
- if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then
- echo "You already have a group \"${GROUP}\", so I will use it."
- else
- if /usr/sbin/pw groupadd ${GROUP} -g 113 -h -
- then
- echo "Added group \"${GROUP}\"."
- else
- echo "Adding group \"${GROUP}\" failed..."
- echo "Please create it, and try again."
- exit 1
- fi
- fi
-
- if /usr/sbin/pw user show "${USER}" 2>/dev/null; then
- echo "You already have a user \"${USER}\", so I will use it."
- else
- if /usr/sbin/pw useradd ${USER} -u 113 -g ${GROUP} -h - \
- -d /nonexistent \
- -s /sbin/nologin \
- -c "Amavis-stats Account"
- then
- echo "Added user \"${USER}\"."
- else
- echo "Adding user \"${USER}\" failed..."
- echo "Please create it, and try again."
- exit 1
- fi
- fi
-
-fi
diff --git a/security/amavis-stats/files/patch-amavis-stats b/security/amavis-stats/files/patch-amavis-stats
deleted file mode 100644
index 486550ad55ff..000000000000
--- a/security/amavis-stats/files/patch-amavis-stats
+++ /dev/null
@@ -1,86 +0,0 @@
---- amavis-stats.orig Sat Mar 27 23:25:27 2004
-+++ amavis-stats Mon Jul 10 22:55:19 2006
-@@ -1,4 +1,4 @@
--#! /usr/bin/perl
-+#!/usr/bin/perl -w
- #
- # amavis-stats -- generate rrds from amavis log output
- #
-@@ -28,6 +28,7 @@
- # ########################################################################
- use strict;
- use warnings;
-+use diagnostics;
- use Getopt::Std;
- use Time::localtime;
- use Time::Local;
-@@ -83,8 +84,8 @@
- $version = "0.1.12"; # this value is auto-updated by packing system
- $pkg = "amavis-stats";
- $locale = "C";
--$lockfile = "/var/lock/$pkg";
--$statedir = "/var/lib/$pkg";
-+$lockfile = "/var/tmp/$pkg";
-+$statedir = "/usr/local/www/$pkg";
- $statefile = "$statedir/$pkg.state"; # last read position of the logfile
- $namesfile = "$statedir/$pkg.names"; # stores the virus name to id mappings
- $countfile = "$statedir/$pkg.count"; # per virus totals
-@@ -212,7 +213,7 @@
- sub semlock {
- open (LOCKF, ">$lockfile") or do_exit(1, "Could not open $lockfile: $!");
- unless (flock(LOCKF, LOCK_EX | LOCK_NB)) {
-- err("warning: Could not lock $lockfile: $!");
-+ print_err("warning: Could not lock $lockfile: $!");
- sleep 2;
- unless (flock(LOCKF, LOCK_EX | LOCK_NB)) {
- do_exit(1, "Could not lock $lockfile: $!");
-@@ -680,8 +681,8 @@
- if (defined($rotlogfile)) {
- parseFile ($rotlogfile, $spos, (stat $rotlogfile)[7]);
- } else {
-- err("Could not open rotated logfile.");
-- err(" Tried extentions .0, .1, .01, -$today, -$yesterday");
-+ print_err("Could not open rotated logfile.");
-+ print_err(" Tried extentions .0, .1, .01, -$today, -$yesterday");
- do_exit(1);
- }
- }
-@@ -707,7 +708,7 @@
-
- my $err = RRDs::error;
- if ($err) {
-- err("createRRD: $err");
-+ print_err("createRRD: $err");
- return -1;
- }
-
-@@ -736,7 +737,7 @@
- $last = RRDs::last($rrdfile);
- $err = RRDs::error;
- if ($err) {
-- err("updateRRD: $err");
-+ print_err("updateRRD: $err");
- return -1;
- }
-
-@@ -750,8 +751,8 @@
-
- $err = RRDs::error;
- if ($err) {
-- err("updateRRD: $err");
-- err("Attempted to update $rrdfile at $epoch count $count");
-+ print_err("updateRRD: $err");
-+ print_err("Attempted to update $rrdfile at $epoch count $count");
- return -1;
- }
- }
-@@ -769,7 +770,8 @@
- print "$me: @_\n" if ($verbose);
- }
-
--sub err {
-+sub print_err
-+{
- print STDERR "$me: error: @_\n";
- }
-
diff --git a/security/amavis-stats/files/patch-amavis-stats.php b/security/amavis-stats/files/patch-amavis-stats.php
deleted file mode 100644
index 52386d7b543f..000000000000
--- a/security/amavis-stats/files/patch-amavis-stats.php
+++ /dev/null
@@ -1,11 +0,0 @@
---- amavis-stats.php.orig Sat Mar 27 17:25:27 2004
-+++ amavis-stats.php Sun Jun 6 01:21:35 2004
-@@ -286,7 +286,7 @@
- function asLoadStats () {
- global $as_libdir, $virus, $pid, $psid, $iid, $bid,$nid,$nsid, $lastupdate, $maxi;
-
-- $as_libdir = "/var/lib/amavis-stats";
-+ $as_libdir = "/usr/local/www/amavis-stats";
- $as_statefile = $as_libdir . "/amavis-stats.state";
- $as_namefile = $as_libdir . "/amavis-stats.names";
- $as_seenfile = $as_libdir . "/amavis-stats.seen";
diff --git a/security/amavis-stats/files/pkg-message.in b/security/amavis-stats/files/pkg-message.in
deleted file mode 100644
index f1872470d97b..000000000000
--- a/security/amavis-stats/files/pkg-message.in
+++ /dev/null
@@ -1,16 +0,0 @@
------
-
-To view the statistics via you browser you must:
-create a symlink, like:
-cd /usr/local/www/data ; ln -s ../amavis-stats amavis-stats
-
-or modify your Apache httpd.conf including this line:
-Alias /amavis-stats %%PREFIX%%/www/amavis-stats
-
-You can view then the statistics in http://your-site/amavis-stats
-
-To update the statistics every 5 minutes, you also
-can setup cronjob for amavis-stats by putting this line to /etc/crontab
-*/5 * * * * amavis %%PREFIX%%/sbin/amavis-stats /var/log/maillog 2>&1 > /dev/null
-
------
diff --git a/security/amavis-stats/pkg-descr b/security/amavis-stats/pkg-descr
deleted file mode 100644
index a314d6498cd4..000000000000
--- a/security/amavis-stats/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-amavis-stats is a simple AMaViS statistics generator based on rrdtool.
-It produces graphs of clean emails, spam emails and infected emails
-broken down by virus, from amavis log entries. RRD files are created
-and updated by a perl script run from cron. Graphs are generated by
-a php script and viewed with a web browser.
-
-WWW: http://rekudos.net/amavis-stats/
diff --git a/security/amavis-stats/pkg-plist b/security/amavis-stats/pkg-plist
deleted file mode 100644
index 0db17f88a6c5..000000000000
--- a/security/amavis-stats/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-sbin/amavis-stats
-www/amavis-stats/index.php
-www/amavis-stats/amavis-stats.php
-www/amavis-stats/img/.keep
-@dirrm www/amavis-stats/img
-@dirrm www/amavis-stats