From owner-freebsd-bugs Sun Apr 22 0: 0:27 2001 Delivered-To: freebsd-bugs@hub.freebsd.org Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 43C6237B43E for ; Sun, 22 Apr 2001 00:00:07 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.1/8.11.1) id f3M707w65251; Sun, 22 Apr 2001 00:00:07 -0700 (PDT) (envelope-from gnats) Received: from mail.noos.fr (aragon.noos.net [212.198.2.75]) by hub.freebsd.org (Postfix) with ESMTP id C499C37B422 for ; Sat, 21 Apr 2001 23:53:05 -0700 (PDT) (envelope-from root@gits.dyndns.org) Received: (qmail 3256540 invoked by uid 0); 22 Apr 2001 06:53:04 -0000 Received: from d165.dhcp212-198-231.noos.fr (HELO gits.dyndns.org) ([212.198.231.165]) (envelope-sender ) by aragon.noos.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 22 Apr 2001 06:53:04 -0000 Received: (from root@localhost) by gits.dyndns.org (8.11.3/8.11.3) id f3M6r1k51757; Sun, 22 Apr 2001 08:53:02 +0200 (CEST) (envelope-from root) Message-Id: <200104220653.f3M6r1k51757@gits.dyndns.org> Date: Sun, 22 Apr 2001 08:53:02 +0200 (CEST) From: Cyrille Lefevre Reply-To: clefevre@poboxes.com To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: misc/26763: installing ipfilter sample files to share/examples Sender: owner-freebsd-bugs@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 26763 >Category: misc >Synopsis: installing ipfilter sample files to share/examples >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Apr 22 00:00:06 PDT 2001 >Closed-Date: >Last-Modified: >Originator: Cyrille Lefevre >Release: FreeBSD 4.3-BETA i386 >Organization: ACME >Environment: System: FreeBSD gits 4.3-BETA FreeBSD 4.3-BETA #18: Sat Mar 17 02:17:40 CET 2001 root@:/disk2/4.x-stable/src/sys/compile/CUSTOM i386 >Description: ipfilter sample files aren't available if you don't have the source tree installed. this patch copies ipfilter sample files to /usr/share/examples/ipfilter. >How-To-Repeat: n/a >Fix: take care, this patch is in two part. the first one has been obtain using cvs diff, and the second one using diff /dev/null ... Index: share/examples/Makefile =================================================================== RCS file: /home/ncvs/src/share/examples/Makefile,v retrieving revision 1.28 diff -u -r1.28 Makefile --- share/examples/Makefile 1999/12/09 09:35:36 1.28 +++ share/examples/Makefile 2001/04/22 06:42:57 @@ -2,7 +2,11 @@ # # Doing a make install builds /usr/share/examples -DIRS!= for i in *; do if test -d $$i -a $$i != CVS; then echo $$i; fi; done +DIRS!= for i in *; do \ + if test -d $$i -a $$i != CVS -a $$i != ipfilter; then \ + echo $$i; \ + fi; \ + done DDIR= ${DESTDIR}/usr/share/examples @@ -35,4 +39,8 @@ (cd ${.CURDIR}/../../etc; ${MAKE} etc-examples) .endif -.include +.if ${SHARED} != "symlinks" +SUBDIR= ipfilter +.endif + +.include Index: etc/mtree/BSD.usr.dist =================================================================== RCS file: /home/ncvs/src/etc/mtree/BSD.usr.dist,v retrieving revision 1.188.2.14 diff -u -r1.188.2.14 BSD.usr.dist --- etc/mtree/BSD.usr.dist 2001/03/05 12:08:49 1.188.2.14 +++ etc/mtree/BSD.usr.dist 2001/04/22 06:39:24 @@ -315,6 +315,8 @@ .. ibcs2 .. + ipfilter + .. isdn .. kld --- /dev/null Sun Apr 22 08:35:33 2001 +++ share/examples/ipfilter/Makefile Sun Apr 22 08:34:23 2001 @@ -0,0 +1,19 @@ +# $FreeBSD$ + +.PATH: ${.CURDIR}/../../../contrib/ipfilter/rules + +BINDIR= /usr/share/examples + +FILES= BASIC.NAT BASIC_1.FW BASIC_2.FW \ + example.1 example.2 example.3 example.4 example.5 \ + example.6 example.7 example.8 example.9 example.10 \ + example.11 example.12 example.13 example.sr firewall \ + ftp-proxy ftppxy nat-setup nat.eg server tcpstate + +all: + +install: ${FILES} + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${SHAREMODE} \ + ${.ALLSRC} ${DESTDIR}${BINDIR}/ipfilter + +.include >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-bugs" in the body of the message