From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Apr 28 09:30:15 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8F8D416A4D0 for ; Wed, 28 Apr 2004 09:30:15 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 79EB543D3F for ; Wed, 28 Apr 2004 09:30:15 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i3SGUF62098092 for ; Wed, 28 Apr 2004 09:30:15 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i3SGUFv5098091; Wed, 28 Apr 2004 09:30:15 -0700 (PDT) (envelope-from gnats) Resent-Date: Wed, 28 Apr 2004 09:30:15 -0700 (PDT) Resent-Message-Id: <200404281630.i3SGUFv5098091@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, Udo Schweigert Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C7B7E16A4CE for ; Wed, 28 Apr 2004 09:26:20 -0700 (PDT) Received: from david.siemens.de (david.siemens.de [192.35.17.14]) by mx1.FreeBSD.org (Postfix) with ESMTP id 097E543D5E for ; Wed, 28 Apr 2004 09:26:20 -0700 (PDT) (envelope-from udo.schweigert@siemens.com) Received: from mail3.siemens.de (mail3.siemens.de [139.25.208.14]) by david.siemens.de (8.11.7/8.11.7) with ESMTP id i3SGQJj04567 for ; Wed, 28 Apr 2004 18:26:19 +0200 (MEST) Received: from mars.cert.siemens.de (ust.mchp.siemens.de [139.23.201.17]) by mail3.siemens.de (8.11.7/8.11.7) with ESMTP id i3SGQIl15433 for ; Wed, 28 Apr 2004 18:26:18 +0200 (MEST) Received: from alaska.cert.siemens.de (alaska.cert.siemens.de [139.23.202.134]) mail/cert.mc.pre,v 1.56 2003/11/06 20:07:28 ust Exp $) with ESMTP id i3SGQIum034121 for ; Wed, 28 Apr 2004 18:26:18 +0200 (CEST) Received: from alaska.cert.siemens.de (alaska.cert.siemens.de [127.0.0.1]) hosts/alaska/mail/config.mc,v 1.16 2003/10/13 08:06:06 ust Exp $) with ESMTP id i3SGQIgs012884 for ; Wed, 28 Apr 2004 18:26:18 +0200 (CEST) (envelope-from ust@alaska.cert.siemens.de) Received: (from ust@localhost) hosts/alaska/mail/submit.mc,v 1.4 2002/12/31 15:32:17 ust Exp $) id i3SGQI1x012456; Wed, 28 Apr 2004 18:26:18 +0200 (CEST) (envelope-from ust) Message-Id: <200404281626.i3SGQI1x012456@alaska.cert.siemens.de> Date: Wed, 28 Apr 2004 18:26:18 +0200 (CEST) From: Udo Schweigert To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/66052: maintainer-update of security/nessus-* X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Udo Schweigert List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Apr 2004 16:30:15 -0000 >Number: 66052 >Category: ports >Synopsis: maintainer-update of security/nessus-* >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Apr 28 09:30:15 PDT 2004 >Closed-Date: >Last-Modified: >Originator: Udo Schweigert >Release: FreeBSD 4.9-STABLE i386 >Organization: >Environment: >Description: Maintainer-update of the security/nessus-* ports: - Fix build for the amd64 architecture. - Add a rc script for the nessus daemon. Committer: new file (cvs add) nessus/files/nessusd.sh >How-To-Repeat: >Fix: diff -ru /usr/ports/security/nessus/Makefile nessus/Makefile --- /usr/ports/security/nessus/Makefile Sun Apr 11 06:07:25 2004 +++ nessus/Makefile Wed Apr 28 18:15:48 2004 @@ -27,6 +27,7 @@ USE_LIBTOOL_VER=13 WANT_GNOME= yes +USE_REINPLACE= YES .include @@ -40,7 +41,13 @@ MAN1= nessus.1 nessus-mkrand.1 nessus-mkcert-client.1 MAN8= nessusd.8 nessus-adduser.8 nessus-mkcert.8 nessus-rmuser.8 +post-extract: + @cp ${FILESDIR}/nessusd.sh ${WRKSRC}/nessusd.sh + @${REINPLACE_CMD} -E -e 's|%%PREFIX%%|${PREFIX}|g' \ + ${BUILD_WRKSRC}/nessusd.sh post-install: + ${INSTALL_SCRIPT} ${BUILD_WRKSRC}/nessusd.sh \ + ${LOCALBASE}/etc/rc.d/nessusd.sh.sample @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/move_nessus .if ! exists(${PREFIX}/var/CA/serverkey.pem) .if ! defined(BATCH) diff -ru /usr/ports/security/nessus/files/nessusd.sh nessus/files/nessusd.sh --- /usr/ports/security/nessus/files/nessusd.sh Thu Jan 1 01:00:00 1970 +++ nessus/files/nessusd.sh Wed Apr 28 17:58:44 2004 @@ -0,0 +1,28 @@ +#! /bin/sh +# +# $FreeBSD: $ +# + +umask 022 +arg=${1:-start} + +nessusd_bin=%%PREFIX%%/sbin/nessusd +nessus_arg="-D" +kill_arg=nessusd + +echo -n " nessusd" + +case $arg in +start) + test -x $nessusd_bin || exit 1 + $nessusd_bin $nessus_arg + ;; +stop) + killall $kill_arg > /dev/null 2>&1 + ;; +restart) + killall $kill_arg > /dev/null 2>&1 + test -x $nessusd_bin || exit 1 + $nessusd_bin $nessus_arg + ;; +esac diff -ru /usr/ports/security/nessus/pkg-plist nessus/pkg-plist --- /usr/ports/security/nessus/pkg-plist Sun Apr 11 06:07:27 2004 +++ nessus/pkg-plist Wed Apr 28 18:06:50 2004 @@ -1,3 +1,4 @@ +etc/rc.d/nessusd.sh.sample bin/nessus bin/nessus-mkcert-client bin/nessus-mkrand diff -ru /usr/ports/security/nessus-plugins/Makefile nessus-plugins/Makefile --- /usr/ports/security/nessus-plugins/Makefile Sun Apr 11 06:07:27 2004 +++ nessus-plugins/Makefile Wed Apr 28 18:10:43 2004 @@ -7,7 +7,7 @@ PORTNAME= nessus-plugins PORTVERSION= 2.0.10a -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security MASTER_SITES= ftp://ftp.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \ ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${PORTVERSION}/src/ \ @@ -20,8 +20,7 @@ MAINTAINER= udo.schweigert@siemens.com COMMENT= Plugins for Nessus, the security scanner -BUILD_DEPENDS= ${LOCALBASE}/include/nessus/nessus-devel.h:${PORTSDIR}/security/nessus \ - libnet-config:${PORTSDIR}/net/libnet +BUILD_DEPENDS= ${LOCALBASE}/include/nessus/nessus-devel.h:${PORTSDIR}/security/nessus RUN_DEPENDS= ${LOCALBASE}/include/nessus/nessus-devel.h:${PORTSDIR}/security/nessus \ nmap:${PORTSDIR}/security/nmap \ wget:${PORTSDIR}/ftp/wget @@ -38,7 +37,12 @@ .include .if ${ARCH} == "amd64" -BROKEN= "Does not compile on amd64 (libnet needs to provide a shared library)" +PLIST_SUB+= AMD="@comment " +pre-configure: + ${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-3com-hub-amd64 +.else +PLIST_SUB+= AMD="" +BUILD_DEPENDS+= libnet-config:${PORTSDIR}/net/libnet .endif post-install: diff -ru /usr/ports/security/nessus-plugins/files/extra-patch-3com-hub-amd64 nessus-plugins/files/extra-patch-3com-hub-amd64 --- /usr/ports/security/nessus-plugins/files/extra-patch-3com-hub-amd64 Thu Jan 1 01:00:00 1970 +++ nessus-plugins/files/extra-patch-3com-hub-amd64 Wed Apr 28 18:11:42 2004 @@ -0,0 +1,18 @@ +--- plugins/make_world.orig Sun Jun 9 13:07:06 2002 ++++ plugins/make_world Wed Apr 28 17:03:30 2004 +@@ -15,14 +15,7 @@ + do if [ -d $i -a $i != CVS ]; then + if [ "$i" = "3com_hub" ]; + then +- libnet-config && { +- cd $i +- ${MAKE:-make} $MAKEFLAG $1 +- if [ $? -ne 0 ];then +- BADPLUGINS="$BADPLUGINS $i" +- fi +- cd .. +- } ++ BADPLUGINS="$BADPLUGINS $i"; + else + cd $i + ${MAKE:-make} $MAKEFLAG $1 diff -ru /usr/ports/security/nessus-plugins/pkg-plist nessus-plugins/pkg-plist --- /usr/ports/security/nessus-plugins/pkg-plist Fri Jan 23 12:00:57 2004 +++ nessus-plugins/pkg-plist Wed Apr 28 18:11:11 2004 @@ -2,7 +2,7 @@ lib/nessus/plugins/12planet_chat_server_path_disclosure.nasl lib/nessus/plugins/12planet_chat_server_plaintext_password.nasl lib/nessus/plugins/3com_config_disclosure.nasl -lib/nessus/plugins/3com_hub.nes +%%AMD%%lib/nessus/plugins/3com_hub.nes lib/nessus/plugins/3com_ras_crash.nasl lib/nessus/plugins/3com_switches.nasl lib/nessus/plugins/404_path_disclosure.nasl >Release-Note: >Audit-Trail: >Unformatted: