Date: Sun, 22 Apr 2001 08:53:02 +0200 (CEST) From: Cyrille Lefevre <clefevre@poboxes.com> To: FreeBSD-gnats-submit@freebsd.org Subject: misc/26763: installing ipfilter sample files to share/examples Message-ID: <200104220653.f3M6r1k51757@gits.dyndns.org>
next in thread | raw e-mail | index | archive | help
>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 <bsd.prog.mk>
+.if ${SHARED} != "symlinks"
+SUBDIR= ipfilter
+.endif
+
+.include <bsd.subdir.mk>
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 <bsd.prog.mk>
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200104220653.f3M6r1k51757>