head	1.10;
access;
symbols
	RELENG_8_4:1.10.0.2
	RELENG_9_1_0_RELEASE:1.8.2.1.4.2
	RELENG_9_1:1.8.2.1.0.4
	RELENG_9_1_BP:1.8.2.1
	RELENG_8_3_0_RELEASE:1.7.2.1.8.1
	RELENG_8_3:1.7.2.1.0.8
	RELENG_8_3_BP:1.7.2.1
	RELENG_9_0_0_RELEASE:1.8.2.1.2.1
	RELENG_9_0:1.8.2.1.0.2
	RELENG_9_0_BP:1.8.2.1
	RELENG_9:1.8.0.2
	RELENG_9_BP:1.8
	RELENG_7_4_0_RELEASE:1.6.12.1
	RELENG_8_2_0_RELEASE:1.7.2.1.6.1
	RELENG_7_4:1.6.0.12
	RELENG_7_4_BP:1.6
	RELENG_8_2:1.7.2.1.0.6
	RELENG_8_2_BP:1.7.2.1
	RELENG_8_1_0_RELEASE:1.7.2.1.4.1
	RELENG_8_1:1.7.2.1.0.4
	RELENG_8_1_BP:1.7.2.1
	RELENG_7_3_0_RELEASE:1.6.10.1
	RELENG_7_3:1.6.0.10
	RELENG_7_3_BP:1.6
	RELENG_8_0_0_RELEASE:1.7.2.1.2.1
	RELENG_8_0:1.7.2.1.0.2
	RELENG_8_0_BP:1.7.2.1
	RELENG_8:1.7.0.2
	RELENG_8_BP:1.7
	RELENG_7_2_0_RELEASE:1.6.8.1
	RELENG_7_2:1.6.0.8
	RELENG_7_2_BP:1.6
	RELENG_7_1_0_RELEASE:1.6.6.1
	RELENG_6_4_0_RELEASE:1.4.2.2.8.1
	RELENG_7_1:1.6.0.6
	RELENG_7_1_BP:1.6
	RELENG_6_4:1.4.2.2.0.8
	RELENG_6_4_BP:1.4.2.2
	RELENG_7_0_0_RELEASE:1.6
	RELENG_6_3_0_RELEASE:1.4.2.2
	RELENG_7_0:1.6.0.4
	RELENG_7_0_BP:1.6
	RELENG_6_3:1.4.2.2.0.6
	RELENG_6_3_BP:1.4.2.2
	RELENG_7:1.6.0.2
	RELENG_7_BP:1.6
	RELENG_6_2_0_RELEASE:1.4.2.2
	RELENG_6_2:1.4.2.2.0.4
	RELENG_6_2_BP:1.4.2.2
	RELENG_6_1_0_RELEASE:1.4.2.2
	RELENG_6_1:1.4.2.2.0.2
	RELENG_6_1_BP:1.4.2.2
	RELENG_6:1.4.0.2;
locks; strict;
comment	@# @;


1.10
date	2012.11.17.01.52.59;	author svnexp;	state Exp;
branches
	1.10.2.1;
next	1.9;

1.9
date	2012.09.14.11.51.49;	author glebius;	state Exp;
branches;
next	1.8;

1.8
date	2011.06.28.11.57.25;	author bz;	state Exp;
branches
	1.8.2.1;
next	1.7;

1.7
date	2008.09.01.23.59.00;	author imp;	state Exp;
branches
	1.7.2.1;
next	1.6;

1.6
date	2006.03.17.18.54.37;	author ru;	state Exp;
branches
	1.6.2.1
	1.6.6.1
	1.6.8.1
	1.6.10.1
	1.6.12.1;
next	1.5;

1.5
date	2006.03.09.15.48.45;	author yar;	state Exp;
branches;
next	1.4;

1.4
date	2006.02.05.17.17.32;	author mlaier;	state Exp;
branches
	1.4.2.1;
next	1.3;

1.3
date	2004.06.16.22.59.06;	author mlaier;	state dead;
branches;
next	1.2;

1.2
date	2004.04.06.15.12.50;	author mlaier;	state Exp;
branches;
next	1.1;

1.1
date	2004.02.26.03.53.53;	author mlaier;	state Exp;
branches;
next	;

1.10.2.1
date	2012.11.17.01.52.59;	author svnexp;	state dead;
branches;
next	1.10.2.2;

1.10.2.2
date	2013.03.28.13.05.23;	author svnexp;	state Exp;
branches;
next	;

1.8.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.8.2.1.2.1
	1.8.2.1.4.1;
next	1.8.2.2;

1.8.2.2
date	2012.11.17.11.37.18;	author svnexp;	state Exp;
branches;
next	;

1.8.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.8.2.1.2.2;

1.8.2.1.2.2
date	2012.11.17.08.37.14;	author svnexp;	state Exp;
branches;
next	;

1.8.2.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.8.2.1.4.2;

1.8.2.1.4.2
date	2012.11.17.08.48.05;	author svnexp;	state Exp;
branches;
next	;

1.7.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.7.2.1.2.1
	1.7.2.1.4.1
	1.7.2.1.6.1
	1.7.2.1.8.1;
next	1.7.2.2;

1.7.2.2
date	2012.11.17.10.36.58;	author svnexp;	state Exp;
branches;
next	;

1.7.2.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.7.2.1.4.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.7.2.1.6.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.7.2.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.7.2.1.8.2;

1.7.2.1.8.2
date	2012.11.17.08.25.33;	author svnexp;	state Exp;
branches;
next	;

1.6.2.1
date	2012.11.17.08.06.54;	author svnexp;	state Exp;
branches;
next	;

1.6.6.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.6.8.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.6.10.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.6.12.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.6.12.2;

1.6.12.2
date	2012.11.17.08.17.27;	author svnexp;	state Exp;
branches;
next	;

1.4.2.1
date	2006.03.06.16.10.19;	author mlaier;	state Exp;
branches;
next	1.4.2.2;

1.4.2.2
date	2006.03.22.15.56.32;	author yar;	state Exp;
branches
	1.4.2.2.8.1;
next	1.4.2.3;

1.4.2.3
date	2012.11.17.07.44.24;	author svnexp;	state Exp;
branches;
next	;

1.4.2.2.8.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;


desc
@@


1.10
log
@Switching exporter and resync
@
text
@# $FreeBSD: head/sys/modules/pflog/Makefile 240494 2012-09-14 11:51:49Z glebius $

.include <bsd.own.mk>

.PATH: ${.CURDIR}/../../netpfil/pf

KMOD=	pflog
SRCS=	if_pflog.c \
	opt_pf.h opt_inet.h opt_inet6.h opt_bpf.h
SRCS+=	bus_if.h device_if.h

.if defined(KERNBUILDDIR)
MKDEP+=		-include ${KERNBUILDDIR}/opt_global.h
.else
.if ${MK_INET_SUPPORT} != "no"
opt_inet.h:
	echo "#define INET 1" > ${.TARGET}
.endif

.if ${MK_INET6_SUPPORT} != "no"
opt_inet6.h:
	echo "#define INET6 1" > ${.TARGET}
.endif

opt_bpf.h:
	echo "#define DEV_BPF 1" > ${.TARGET}

.if defined(VIMAGE)
opt_global.h:
	echo "#define VIMAGE 1" >> ${.TARGET}
CFLAGS+=	-include opt_global.h
MKDEP+=		-include opt_global.h
.endif
.endif

.include <bsd.kmod.mk>
@


1.10.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:05:23 +0000
@
text
@d1 36
@


1.10.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 26
# $FreeBSD: releng/8.4/sys/modules/pflog/Makefile 182668 2008-09-01 23:59:00Z imp $

.include <bsd.own.mk>

.PATH: ${.CURDIR}/../../contrib/pf/net

KMOD=	pflog
SRCS = 	if_pflog.c \
	opt_pf.h opt_inet.h opt_inet6.h opt_bpf.h

CFLAGS+=  -I${.CURDIR}/../../contrib/pf

.if !defined(KERNBUILDDIR)
opt_inet.h:
	echo "#define INET 1" > ${.TARGET}

.if ${MK_INET6_SUPPORT} != "no"
opt_inet6.h:
	echo "#define INET6 1" > ${.TARGET}
.endif

opt_bpf.h:
	echo "#define DEV_BPF 1" > ${.TARGET}
.endif

.include <bsd.kmod.mk>
@


1.9
log
@SVN rev 240494 on 2012-09-14 11:51:49Z by glebius

o Create directory sys/netpfil, where all packet filters should
  reside, and move there ipfw(4) and pf(4).

o Move most modified parts of pf out of contrib.

Actual movements:

sys/contrib/pf/net/*.c		-> sys/netpfil/pf/
sys/contrib/pf/net/*.h		-> sys/net/
contrib/pf/pfctl/*.c		-> sbin/pfctl
contrib/pf/pfctl/*.h		-> sbin/pfctl
contrib/pf/pfctl/pfctl.8	-> sbin/pfctl
contrib/pf/pfctl/*.4		-> share/man/man4
contrib/pf/pfctl/*.5		-> share/man/man5

sys/netinet/ipfw		-> sys/netpfil/ipfw

The arguable movement is pf/net/*.h -> sys/net. There are
future plans to refactor pf includes, so I decided not to
break things twice.

Not modified bits of pf left in contrib: authpf, ftp-proxy,
tftp-proxy, pflogd.

The ipfw(4) movement is planned to be merged to stable/9,
to make head and stable match.

Discussed with:		bz, luigi
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.8
log
@SVN rev 223637 on 2011-06-28 11:57:25Z by bz

Update packet filter (pf) code to OpenBSD 4.5.

You need to update userland (world and ports) tools
to be in sync with the kernel.

Submitted by:	mlaier
Submitted by:	eri
@
text
@d5 1
a5 1
.PATH: ${.CURDIR}/../../contrib/pf/net
a9 2

CFLAGS+= -I${.CURDIR}/../../contrib/pf
@


1.8.2.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.8.2.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/sys/modules/pflog/Makefile 223637 2011-06-28 11:57:25Z bz $
@


1.8.2.1.4.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.8.2.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/sys/modules/pflog/Makefile 223637 2011-06-28 11:57:25Z bz $
@


1.8.2.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.8.2.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/sys/modules/pflog/Makefile 223637 2011-06-28 11:57:25Z bz $
@


1.7
log
@SVN rev 182668 on 2008-09-01 23:59:00Z by imp

Per email to arch@@ a little while ago (that was greeted with silence),
prefer the more common > ${.TARGET} over > opt_foo.h in modules
makefiles.
@
text
@d8 1
a8 1
SRCS = 	if_pflog.c \
d11 2
a12 1
CFLAGS+=  -I${.CURDIR}/../../contrib/pf
d14 4
a17 1
.if !defined(KERNBUILDDIR)
d20 1
d29 7
@


1.7.2.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.7.2.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/8/sys/modules/pflog/Makefile 182668 2008-09-01 23:59:00Z imp $
@


1.7.2.1.8.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.7.2.1.8.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/sys/modules/pflog/Makefile 182668 2008-09-01 23:59:00Z imp $
@


1.7.2.1.6.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.7.2.1.4.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.7.2.1.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.6
log
@Reimplementation of world/kernel build options.  For details, see:

http://lists.freebsd.org/pipermail/freebsd-current/2006-March/061725.html

The src.conf(5) manpage is to follow in a few days.

Brought to you by:	imp, jhb, kris, phk, ru (all bugs are mine)
@
text
@d15 1
a15 1
	echo "#define INET 1" > opt_inet.h
d19 1
a19 1
	echo "#define INET6 1" > opt_inet6.h
d23 1
a23 1
	echo "#define DEV_BPF 1" > opt_bpf.h
@


1.6.2.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/sys/modules/pflog/Makefile 156813 2006-03-17 18:54:44Z ru $
@


1.6.12.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.6.12.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/sys/modules/pflog/Makefile 156813 2006-03-17 18:54:44Z ru $
@


1.6.10.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.6.8.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.6.6.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


1.5
log
@The `pf' and `pflog' sources do not depend on DEV_PF or DEV_PFLOG,
which is normal for own files of a device driver.

DEV_FOO should be used if an unrelated kernel file needs to know of
the `foo' driver's static presence.  Obviously, module source files
should never use DEV_*.
@
text
@d3 2
d17 1
a17 1
.if !defined(NO_INET6)
@


1.4
log
@Make pflog a seperate module.  As a result pflog_packet() becomes a function
pointer that is declared in pf_ioctl.c

Requested by:	yar (as part of the module build reorg)
MFC after:	1 week
X-MFC with:	yar's module reorg
@
text
@a11 3
opt_pf.h:
	echo "#define DEV_PFLOG 1" > opt_pf.h

@


1.4.2.1
log
@MFC:
  Make pflog a seperate module.  As a result pflog_packet() becomes a
  function pointer that is declared in pf_ioctl.c

  Requested by:   yar (as part of the module build reorg)

Approved by:	re (scottl)
@
text
@@


1.4.2.2
log
@MFC in the pf and pflog modules:

pf: Respect KERNBUILDDIR.
both: Don't depend on DEV_*.

Approved by:	re (scottl)
@
text
@d12 3
@


1.4.2.3
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/sys/modules/pflog/Makefile 156996 2006-03-22 15:56:32Z yar $
@


1.4.2.2.8.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@@


1.3
log
@Prepare for pf 3.5 import:
 - Remove pflog and pfsync modules. Things will change in such a fashion
   that there will be one module with pf+pflog that can be loaded into
   GENERIC without problems (which is what most people want). pfsync is no
   longer possible as a module.
 - Add multicast address for in-kernel multicast pfsync protocol. Protocol
   glue will follow once the import is done.
 - Add one more mbuf tag
@
text
@d1 1
a1 1
# $FreeBSD: src/sys/modules/pflog/Makefile,v 1.2 2004/04/06 15:12:50 mlaier Exp $
d9 1
a9 1
CFLAGS+=  -Wall -I${.CURDIR}/../../contrib/pf
d11 1
d13 1
a13 3
	echo "#define DEV_PF 1" > opt_pf.h
	echo "#define DEV_PFLOG 1" >> opt_pf.h
	echo "#define DEV_PFSYNC 1" >> opt_pf.h
d18 1
a19 3
.if defined(NOINET6)
	echo > opt_inet6.h
.else
d25 1
@


1.2
log
@Make pf* modules respect NOINET6 from make.conf(5) in order to build them
for INET6-less kernel.

Requested by:	many
Approved by:	bms(mentor)
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.1
log
@Tweak existing header and other build infrastructure to be able to build
pf/pflog/pfsync as modules. Do not list them in NOTES or modules/Makefile
(i.e. do not connect it to any (automatic) builds - yet).

Approved by: bms(mentor)
@
text
@d20 3
d24 1
@

