From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jul 17 07:20:10 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 68BA710656AB for ; Fri, 17 Jul 2009 07:20:05 +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 A91F08FC0A for ; Fri, 17 Jul 2009 07:20: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 n6H7K4YK045949 for ; Fri, 17 Jul 2009 07:20:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n6H7K4ZG045948; Fri, 17 Jul 2009 07:20:04 GMT (envelope-from gnats) Resent-Date: Fri, 17 Jul 2009 07:20:04 GMT Resent-Message-Id: <200907170720.n6H7K4ZG045948@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, "Philip M. Gollucci" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3B0711065670; Fri, 17 Jul 2009 07:14:11 +0000 (UTC) (envelope-from pgollucci@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 2A0DC8FC14; Fri, 17 Jul 2009 07:14:11 +0000 (UTC) (envelope-from pgollucci@FreeBSD.org) Received: from freefall.freebsd.org (pgollucci@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n6H7EB9S043054; Fri, 17 Jul 2009 07:14:11 GMT (envelope-from pgollucci@freefall.freebsd.org) Received: (from pgollucci@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n6H7EBln043053; Fri, 17 Jul 2009 07:14:11 GMT (envelope-from pgollucci) Message-Id: <200907170714.n6H7EBln043053@freefall.freebsd.org> Date: Fri, 17 Jul 2009 07:14:11 GMT From: "Philip M. Gollucci" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: novel@FreeBSD.org Subject: ports/136849: [PATCH] security/scanlogd: USE_RC_SUBR != yes X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jul 2009 07:20:11 -0000 >Number: 136849 >Category: ports >Synopsis: [PATCH] security/scanlogd: USE_RC_SUBR != yes >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Jul 17 07:20:04 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Philip M. Gollucci >Release: FreeBSD 7.2-STABLE i386 >Organization: RideCharge Inc. >Environment: System: FreeBSD freefall.freebsd.org 7.2-STABLE FreeBSD 7.2-STABLE #38 r194101: Sat Jun 13 11:12:24 UTC >Description: Added file(s): - files/scanlogd.in Removed file(s): - files/scanlogd.sh Port maintainer (novel@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- scanlogd-2.2.6_1.patch begins here --- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/security/scanlogd/Makefile,v retrieving revision 1.8 diff -u -u -r1.8 Makefile --- Makefile 3 Apr 2006 18:03:12 -0000 1.8 +++ Makefile 17 Jul 2009 07:14:00 -0000 @@ -7,6 +7,7 @@ PORTNAME= scanlogd PORTVERSION= 2.2.6 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= http://openwall.com/scanlogd/ \ ftp://ftp.openwall.com/pub/projects/scanlogd/ \ @@ -15,7 +16,7 @@ MAINTAINER= novel@FreeBSD.org COMMENT= TCP port scan detection tool -USE_RC_SUBR= yes +USE_RC_SUBR= ${PORTNAME} .if defined(WITH_LIBNIDS) BUILD_DEPENDS+= ${LOCALBASE}/lib/libnids.a:${PORTSDIR}/net/libnids @@ -26,20 +27,13 @@ MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} -c" LD="${CC}" MAN8= scanlogd.8 -PLIST_FILES= bin/scanlogd \ - etc/rc.d/scanlogd.sh - -RC_SCRIPTS_SUB= PREFIX=${PREFIX} \ - RC_SUBR=${RC_SUBR} +PLIST_FILES= bin/scanlogd do-install: ${INSTALL_PROGRAM} ${WRKSRC}/scanlogd ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/scanlogd.8 ${MANPREFIX}/man/man8 post-install: - @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${FILESDIR}/scanlogd.sh > ${PREFIX}/etc/rc.d/scanlogd.sh - @${CHMOD} ${BINMODE} ${PREFIX}/etc/rc.d/scanlogd.sh @${CAT} ${PKGMESSAGE} .include Index: files/scanlogd.in =================================================================== RCS file: files/scanlogd.in diff -N files/scanlogd.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/scanlogd.in 17 Jul 2009 07:14:00 -0000 @@ -0,0 +1,25 @@ +#!/bin/sh + +# Start or stop scanlogd +# $FreeBSD: ports/security/scanlogd/files/scanlogd.sh,v 1.4 2009/07/15 16:56:04 dougb Exp $ + +# PROVIDE: scanlogd +# REQUIRE: DAEMON +# BEFORE: LOGIN +# KEYWORD: shutdown + +# Add the following lines to /etc/rc.conf to enable scanlogd: +# scanlogd_enable="YES" +# scanlogd_flags="" + +scanlogd_enable=${scanlogd_enable:-"NO"} # Enable scanlogd + +. %%RC_SUBR%% + +name="scanlogd" +rcvar=`set_rcvar` +command="%%PREFIX%%/bin/${name}" +required_files="" + +load_rc_config $name +run_rc_command "$1" Index: files/scanlogd.sh =================================================================== RCS file: files/scanlogd.sh diff -N files/scanlogd.sh --- files/scanlogd.sh 15 Jul 2009 16:56:04 -0000 1.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,25 +0,0 @@ -#!/bin/sh - -# Start or stop scanlogd -# $FreeBSD: ports/security/scanlogd/files/scanlogd.sh,v 1.4 2009/07/15 16:56:04 dougb Exp $ - -# PROVIDE: scanlogd -# REQUIRE: DAEMON -# BEFORE: LOGIN -# KEYWORD: shutdown - -# Add the following lines to /etc/rc.conf to enable scanlogd: -# scanlogd_enable="YES" -# scanlogd_flags="" - -scanlogd_enable=${scanlogd_enable:-"NO"} # Enable scanlogd - -. %%RC_SUBR%% - -name="scanlogd" -rcvar=`set_rcvar` -command="%%PREFIX%%/bin/${name}" -required_files="" - -load_rc_config $name -run_rc_command "$1" --- scanlogd-2.2.6_1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: