rpms/amavisd-new/devel amavisd-snmp.init, NONE, 1.1 .cvsignore, 1.12, 1.13 amavisd-conf.patch, 1.7, 1.8 amavisd-new.spec, 1.26, 1.27 sources, 1.12, 1.13

[Steven Pritchard]

Author: steve

Update of /cvs/pkgs/rpms/amavisd-new/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7257

Modified Files:
	.cvsignore amavisd-conf.patch amavisd-new.spec sources 
Added Files:
	amavisd-snmp.init 
Log Message:
Update to 2.6.4.
Make a snmp sub-package for amavisd-snmp-subagent.



--- NEW FILE amavisd-snmp.init ---
#!/bin/sh
#
# amavisd-snmp:        Init script for amavisd-snmp-subagent
#
# chkconfig: - 79 31
# description: Exports amavisd SNMP data
# pidfile: /var/run/amavisd-snmp-subagent.pid

# Source function library.
. /etc/init.d/functions

RETVAL=0

start() {
    echo -n $"Starting amavisd-snmp-subagent: "
    [ $RETVAL -eq 0 ] && { daemon amavisd-snmp-subagent -P /var/run/amavisd-snmp-subagent.pid; RETVAL=$?; };
    [ $RETVAL -eq 0 ] && { touch /var/lock/subsys/amavisd-snmp-subagent; RETVAL=$?; };
    [ $RETVAL -eq 0 ] && echo_success || echo_failure
    echo
}

stop() {
    echo -n $"Shutting down amavisd-snmp-subagent: "
    kill $( cat /var/run/amavisd-snmp-subagent.pid ) || RETVAL=1
    [ $RETVAL -eq 0 ] && { rm -f /var/lock/subsys/amavisd-snmp-subagent; RETVAL=$?; };
    [ $RETVAL -eq 0 ] && echo_success || echo_failure
    echo
}

restart() {
    stop
    start
}

# See how we were called.
case "$1" in
    start)
        start
        ;;

    stop)
        stop
        ;;

    status)
        status amavisd-snmp-subagent
        ;;

    reload)
	restart
	;;

    restart)
	restart
        ;;

    condrestart)
        [ -f /var/lock/subsys/amavisd-snmp-subagent ] && restart || :
        ;;

    *)
        echo $"Usage: $0 {start|stop|status|restart|condrestart}"
        exit 1
esac

exit $RETVAL



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/amavisd-new/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	17 Dec 2008 17:03:45 -0000	1.12
+++ .cvsignore	10 Aug 2009 20:22:18 -0000	1.13
@@ -1 +1 @@
-amavisd-new-2.6.2.tar.gz
+amavisd-new-2.6.4.tar.gz

amavisd-conf.patch:
 amavisd.conf |   38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

Index: amavisd-conf.patch
===================================================================
RCS file: /cvs/pkgs/rpms/amavisd-new/devel/amavisd-conf.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- amavisd-conf.patch	1 Mar 2009 18:38:53 -0000	1.7
+++ amavisd-conf.patch	10 Aug 2009 20:22:19 -0000	1.8
@@ -1,5 +1,5 @@
---- amavisd-new-2.6.2/amavisd.conf	2008-12-15 01:50:03.000000000 +0100
-+++ amavisd-new-2.6.2/amavisd.conf.conf	2009-03-01 19:11:48.000000000 +0100
+--- amavisd-new-2.6.4/amavisd.conf.orig	2009-06-25 07:38:47.000000000 -0500
++++ amavisd-new-2.6.4/amavisd.conf	2009-08-10 14:28:13.000000000 -0500
 @@ -15,25 +15,25 @@
  # $bypass_decode_parts = 1;         # controls running of decoders&dearchivers
  
@@ -70,11 +70,11 @@
  # ### http://www.clamav.net/
 -# ['ClamAV-clamd',
 -#   \&ask_daemon, ["CONTSCAN {}\n", "/var/run/clamav/clamd"],
--#   qr/\bOK$/, qr/\bFOUND$/,
+-#   qr/\bOK$/m, qr/\bFOUND$/m,
 -#   qr/^.*?: (?!Infected Archive)(.*) FOUND$/m ],
 +['ClamAV-clamd',
 +  \&ask_daemon, ["CONTSCAN {}\n", "/var/spool/amavisd/clamd.sock"],
-+  qr/\bOK$/, qr/\bFOUND$/,
++  qr/\bOK$/m, qr/\bFOUND$/m,
 +  qr/^.*?: (?!Infected Archive)(.*) FOUND$/m ],
  # # NOTE: run clamd under the same user as amavisd, or run it under its own
  # #   uid such as clamav, add user clamav to the amavis group, and then add


Index: amavisd-new.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amavisd-new/devel/amavisd-new.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- amavisd-new.spec	24 Jul 2009 16:50:06 -0000	1.26
+++ amavisd-new.spec	10 Aug 2009 20:22:19 -0000	1.27
@@ -2,8 +2,8 @@
 
 Summary:        Email filter with virus scanner and spamassassin support
 Name:           amavisd-new
-Version:        2.6.2
-Release:        4%{?prerelease:.%{prerelease}}%{?dist}
+Version:        2.6.4
+Release:        1%{?prerelease:.%{prerelease}}%{?dist}
 # LDAP schema is GFDL, some helpers are BSD, core is GPLv2+
 License:        GPLv2+ and BSD and GFDL
 Group:          Applications/System
@@ -15,6 +15,7 @@ Source3:        amavis-clamd.sysconfig
 Source4:        README.fedora
 Source5:        README.quarantine
 Source6:        amavisd.cron
+Source7:        amavisd-snmp.init
 Patch0:         amavisd-conf.patch
 Patch1:         amavisd-init.patch
 Patch2:         amavisd-condrestart.patch
@@ -78,6 +79,15 @@ Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 BuildArch:      noarch
 
+%package snmp
+Group:          Applications/System
+Summary:        Exports amavisd SNMP data
+Requires:       %{name} = %{version}-%{release}
+Requires(post): /sbin/chkconfig
+Requires(post): /sbin/service
+Requires(preun): /sbin/chkconfig
+Requires(preun): /sbin/service
+
 %description
 amavisd-new is a high-performance and reliable interface between mailer
 (MTA) and one or more content checkers: virus scanners, and/or
@@ -86,6 +96,18 @@ reliability, portability and maintainabi
 or LMTP, or by using helper programs. No timing gaps exist in the design
 which could cause a mail loss.
 
+%description snmp
+This package contains the program amavisd-snmp-subagent, which can be
+used as a SNMP AgentX, exporting amavisd statistical counters database
+(snmp.db) as well as a child process status database (nanny.db) to a
+SNMP daemon supporting the AgentX protocol (RFC 2741), such as NET-SNMP.
+
+It is similar to combined existing utility programs amavisd-agent and
+amavisd-nanny, but instead of writing results as text to stdout, it
+exports data to a SNMP server running on a host (same or remote), making
+them available to SNMP clients (such a Cacti or mrtg) for monitoring or
+alerting purposes.
+
 %prep
 %setup -q -n %{name}-%{version}%{?prerelease:-%{prerelease}}
 %patch0 -p1
@@ -102,7 +124,7 @@ sed -i -e 's,/var/amavis/amavisd.sock\>,
 rm -rf "$RPM_BUILD_ROOT"
 
 mkdir -p $RPM_BUILD_ROOT%{_sbindir}
-install -m755 amavisd $RPM_BUILD_ROOT%{_sbindir}/
+install -m755 amavisd{,-snmp-subagent} $RPM_BUILD_ROOT%{_sbindir}/
 ( cd $RPM_BUILD_ROOT%{_sbindir} && ln -s clamd clamd.amavisd )
 
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
@@ -111,6 +133,7 @@ install -m755 amavisd-{agent,nanny,relea
 mkdir -p $RPM_BUILD_ROOT%{_initrddir}
 install -m755 amavisd_init.sh $RPM_BUILD_ROOT%{_initrddir}/amavisd
 install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/clamd.amavisd
+install -m755 %{SOURCE7} $RPM_BUILD_ROOT%{_initrddir}/amavisd-snmp
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/amavisd
 install -m644 amavisd.conf $RPM_BUILD_ROOT%{_sysconfdir}/amavisd/
@@ -144,12 +167,22 @@ if [ "$1" = 0 ]; then
     /sbin/chkconfig --del clamd.amavisd || :
 fi
 
+%preun snmp
+if [ "$1" = 0 ]; then
+    /sbin/service amavisd-snmp stop 2>/dev/null || :
+    /sbin/chkconfig --del amavisd-snmp || :
+fi
+
 %post
 /sbin/chkconfig --add clamd.amavisd || :
 /sbin/service clamd.amavisd condrestart || :
 /sbin/chkconfig --add amavisd || :
 /sbin/service amavisd condrestart || :
 
+%post snmp
+/sbin/chkconfig --add amavisd-snmp || :
+/sbin/service amavisd-snmp condrestart || :
+
 %files
 %defattr(-,root,root)
 %doc AAAREADME.first LDAP.schema LICENSE RELEASE_NOTES TODO
@@ -171,7 +204,16 @@ fi
 %dir %attr(755,amavis,amavis) /var/run/amavisd
 %ghost /var/spool/amavisd/clamd.sock
 
+%files snmp
+%defattr(-,root,root)
+%attr(755,root,root) %{_initrddir}/amavisd-snmp
+%{_sbindir}/amavisd-snmp-subagent
+
 %changelog
+* Mon Aug 10 2009 Steven Pritchard <steve at kspei.com> 2.6.4-1
+- Update to 2.6.4.
+- Make a snmp sub-package for amavisd-snmp-subagent.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/amavisd-new/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	17 Dec 2008 17:03:45 -0000	1.12
+++ sources	10 Aug 2009 20:22:19 -0000	1.13
@@ -1 +1 @@
-0b3b0ef8771af8e4a950e7381d42adbd  amavisd-new-2.6.2.tar.gz
+03d31657f14cd64c1cb38786214234b4  amavisd-new-2.6.4.tar.gz