From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jun 29 00:10:04 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 97B571065672 for ; Mon, 29 Jun 2009 00:10:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 72FD28FC19 for ; Mon, 29 Jun 2009 00:10:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n5T0A41g097224 for ; Mon, 29 Jun 2009 00:10:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n5T0A4Di097223; Mon, 29 Jun 2009 00:10:04 GMT (envelope-from gnats) Resent-Date: Mon, 29 Jun 2009 00:10:04 GMT Resent-Message-Id: <200906290010.n5T0A4Di097223@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, olli hauer Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3707D1065678 for ; Mon, 29 Jun 2009 00:08:38 +0000 (UTC) (envelope-from ohauer@gmx.de) Received: from mail.gmx.net (mail.gmx.net [213.165.64.20]) by mx1.freebsd.org (Postfix) with SMTP id ABF2B8FC12 for ; Mon, 29 Jun 2009 00:08:37 +0000 (UTC) (envelope-from ohauer@gmx.de) Received: (qmail invoked by alias); 29 Jun 2009 00:08:35 -0000 Received: from u18-124.dsl.vianetworks.de (EHLO u18-124.dsl.vianetworks.de) [194.231.39.124] by mail.gmx.net (mp008) with SMTP; 29 Jun 2009 02:08:35 +0200 Received: by u18-124.dsl.vianetworks.de (Postfix, from userid 1100) id 8C38F2613F; Mon, 29 Jun 2009 02:08:31 +0200 (CEST) Message-Id: <20090629000831.8C38F2613F@u18-124.dsl.vianetworks.de> Date: Mon, 29 Jun 2009 02:08:31 +0200 (CEST) From: olli hauer To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: ohauer@gmx.de Subject: ports/136151: [patch] port security/amavisd-new add snmp subagent X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: olli hauer List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Jun 2009 00:10:05 -0000 >Number: 136151 >Category: ports >Synopsis: [patch] port security/amavisd-new add snmp subagent >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Jun 29 00:10:03 UTC 2009 >Closed-Date: >Last-Modified: >Originator: ohauer >Release: FreeBSD 7.2-RELEASE i386 >Organization: >Environment: >Description: amavisd-new has now a snmp-subagent. Since p5-Net-SNMP is required for the agent it is disabled in the default OPTIONS To use this subagent the following line in snmpd.conf is required. master agentx With the following example the values can get via snmpwalk snmpwalk -v $SNMPVER -c $COMMUNITY $HOSTNAME .1.3.6.1.4.1.15312.2.1 For more information see http://www.ijs.si/software/amavisd/release-notes.txt -> NEW FEATURES >How-To-Repeat: >Fix: --- patch_amavisd-new_2009-06-29 begins here --- --- Makefile +++ Makefile @@ -37,8 +37,8 @@ CONFIGURE_WRKSRC= ${WRKSRC}/helper-progs BUILD_WRKSRC= ${WRKSRC}/helper-progs -DOCS= AAAREADME.first INSTALL LDAP.schema LICENSE RELEASE_NOTES \ - README_FILES/README.* README_FILES/screen.css \ +DOCS= AAAREADME.first AMAVIS-MIB.txt INSTALL LDAP.schema LICENSE \ + RELEASE_NOTES README_FILES/README.* README_FILES/screen.css \ README_FILES/amavisd-new-docs.html AMAVISUSER?= vscan @@ -48,6 +48,7 @@ DAEMON?= /usr/sbin/daemon -p OPTIONS= BDB "Use BerkeleyDB for nanny/cache/snmp" on \ + SNMP "Install amavisd snmp subagent" off \ SQLITE "Use SQLite for lookups" off \ MYSQL "Use MySQL for lookups/logging/quarantine" off \ PGSQL "Use PgSQL for lookups/logging/quarantine" off \ @@ -87,10 +88,16 @@ AMAVIS_NOMILTER=${AMAVIS_NOMILTER} \ AMAVIS_NOP0F=${AMAVIS_NOP0F} -.include +.include USE_RC_SUBR+= amavisd.sh +.if defined(WITH_SNMP) && defined(WITH_BDB) +SUB_LIST+= PERL=${PERL} +USE_RC_SUBR+= amavisd-snmp.sh +RUN_DEPENDS+= ${SITE_PERL}/Net/SNMP.pm:${PORTSDIR}/net-mgmt/p5-Net-SNMP +.endif + .if !defined(WITH_MILTER) || (!exists(/usr/lib/libmilter.a) && !exists(${PREFIX}/lib/libmilter.a)) AMAVIS_NOAMAVIS="@comment " .endif @@ -239,6 +246,8 @@ .endfor @${REINPLACE_CMD} "s|/var/amavis/db|${AMAVISDIR}/db|" ${WRKSRC}/amavisd-agent @${REINPLACE_CMD} "s|/var/amavis/db|${AMAVISDIR}/db|" ${WRKSRC}/amavisd-nanny + @${REINPLACE_CMD} -e "s|/var/amavis/db|${AMAVISDIR}/db|" \ + -e "s|/usr/bin/perl|${PERL}|" ${WRKSRC}/amavisd-snmp-subagent @${REINPLACE_CMD} "s|/var/amavis/amavisd.sock|${AMAVISDIR}/amavisd.sock|" \ ${WRKSRC}/amavisd-release @${REINPLACE_CMD} "s|#define HAVE_MKTEMP|#undef HAVE_MKTEMP|" \ @@ -266,7 +275,7 @@ .if defined(WITH_P0F) ${INSTALL_SCRIPT} ${WRKSRC}/p0f-analyzer.pl ${PREFIX}/sbin .endif -.for i in amavisd amavisd-agent amavisd-nanny amavisd-release +.for i in amavisd amavisd-agent amavisd-nanny amavisd-release amavisd-snmp-subagent ${INSTALL_SCRIPT} ${WRKSRC}/${i} ${PREFIX}/sbin .endfor ${INSTALL_SCRIPT} ${WRKSRC}/amavisd.conf ${PREFIX}/etc/amavisd.conf-dist @@ -295,4 +304,4 @@ ${LN} -s ${PREFIX}/sbin/amavisd-release ${PREFIX}/sbin/amavisd-requeue @${CAT} ${PKGMESSAGE} -.include +.include --- pkg-plist +++ pkg-plist @@ -1,6 +1,7 @@ @comment $FreeBSD: ports/security/amavisd-new/pkg-plist,v 1.26 2009/06/28 08:53:46 gabor Exp $ @unexec if cmp -s %%PREFIX%%/etc/amavisd-custom.conf %%PREFIX%%/etc/amavisd-custom.conf-dist; then rm %%PREFIX%%/etc/amavisd-custom.conf; fi %%PORTDOCS%%%%DOCSDIR%%/AAAREADME.first +%%PORTDOCS%%%%DOCSDIR%%/AMAVIS-MIB.txt %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/LDAP.schema %%PORTDOCS%%%%DOCSDIR%%/LICENSE @@ -79,3 +80,4 @@ sbin/amavisd-nanny sbin/amavisd-release sbin/amavisd-requeue +sbin/amavisd-snmp-subagent --- files/amavisd-snmp.sh.in +++ files/amavisd-snmp.sh.in @@ -0,0 +1,36 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# PROVIDE: amavisd_snmp +# REQUIRE: snmpd +# KEYWORD: shutdown + +# +# Add the following lines to /etc/rc.conf to enable amavisd-snmp-subagent: +# +#amavisd_snmp_enable="YES" +# + +. /etc/rc.subr + +name=amavisd_snmp +rcvar=`set_rcvar` + +command="%%PREFIX%%/sbin/amavisd-snmp-subagent" +command_interpreter="%%PERL%%" +pidfile="%%AMAVISDIR%%/amavisd-snmp.pid" + +# defaults +amavisd_snmp_enable=${amavisd_snmp_enable:-"NO"} +# amavis database directory +amavisd_snmp_dbdir=${amavisd_snmp_dbdir:-"%%AMAVISDIR%%/db"} +# log_level 0..5, default 0 +amavisd_snmp_loglevel=${amavisd_snmp_loglevel:-"0"} + +load_rc_config $name + +required_dirs=${amavisd_snmp_dbdir} +amavisd_snmp_flags="-D ${amavisd_snmp_dbdir} -d ${amavisd_snmp_loglevel} -P ${pidfile}" +run_rc_command "$1" --- patch_amavisd-new_2009-06-29 ends here --- >Release-Note: >Audit-Trail: >Unformatted: