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.10.1.8.1
	RELENG_8_3:1.7.10.1.0.8
	RELENG_8_3_BP:1.7.10.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.7.14.1
	RELENG_8_2_0_RELEASE:1.7.10.1.6.1
	RELENG_7_4:1.7.0.14
	RELENG_7_4_BP:1.7
	RELENG_8_2:1.7.10.1.0.6
	RELENG_8_2_BP:1.7.10.1
	RELENG_8_1_0_RELEASE:1.7.10.1.4.1
	RELENG_8_1:1.7.10.1.0.4
	RELENG_8_1_BP:1.7.10.1
	RELENG_7_3_0_RELEASE:1.7.12.1
	RELENG_7_3:1.7.0.12
	RELENG_7_3_BP:1.7
	RELENG_8_0_0_RELEASE:1.7.10.1.2.1
	RELENG_8_0:1.7.10.1.0.2
	RELENG_8_0_BP:1.7.10.1
	RELENG_8:1.7.0.10
	RELENG_8_BP:1.7
	RELENG_7_2_0_RELEASE:1.7.8.1
	RELENG_7_2:1.7.0.8
	RELENG_7_2_BP:1.7
	RELENG_7_1_0_RELEASE:1.7.6.1
	RELENG_6_4_0_RELEASE:1.5.12.1
	RELENG_7_1:1.7.0.6
	RELENG_7_1_BP:1.7
	RELENG_6_4:1.5.0.12
	RELENG_6_4_BP:1.5
	RELENG_7_0_0_RELEASE:1.7
	RELENG_6_3_0_RELEASE:1.5
	RELENG_7_0:1.7.0.4
	RELENG_7_0_BP:1.7
	RELENG_6_3:1.5.0.10
	RELENG_6_3_BP:1.5
	RELENG_7:1.7.0.2
	RELENG_7_BP:1.7
	RELENG_6_2_0_RELEASE:1.5
	RELENG_6_2:1.5.0.8
	RELENG_6_2_BP:1.5
	RELENG_5_5_0_RELEASE:1.3
	RELENG_5_5:1.3.0.8
	RELENG_5_5_BP:1.3
	RELENG_6_1_0_RELEASE:1.5
	RELENG_6_1:1.5.0.6
	RELENG_6_1_BP:1.5
	RELENG_6_0_0_RELEASE:1.5
	RELENG_6_0:1.5.0.4
	RELENG_6_0_BP:1.5
	RELENG_6:1.5.0.2
	RELENG_6_BP:1.5
	RELENG_5_4_0_RELEASE:1.3
	RELENG_5_4:1.3.0.6
	RELENG_5_4_BP:1.3
	RELENG_5_3_0_RELEASE:1.3
	RELENG_5_3:1.3.0.4
	RELENG_5_3_BP:1.3
	RELENG_5:1.3.0.2
	RELENG_5_BP:1.3;
locks; strict;
comment	@# @;


1.10
date	2012.11.17.01.50.24;	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	2009.10.19.16.00.24;	author ru;	state Exp;
branches
	1.8.2.1;
next	1.7;

1.7
date	2007.07.03.12.46.05;	author mlaier;	state Exp;
branches
	1.7.2.1
	1.7.6.1
	1.7.8.1
	1.7.10.1
	1.7.12.1
	1.7.14.1;
next	1.6;

1.6
date	2006.04.13.12.49.24;	author ru;	state Exp;
branches;
next	1.5;

1.5
date	2005.05.03.16.57.38;	author mlaier;	state Exp;
branches
	1.5.2.1
	1.5.12.1;
next	1.4;

1.4
date	2004.10.03.06.19.22;	author mlaier;	state Exp;
branches;
next	1.3;

1.3
date	2004.07.07.17.33.20;	author ru;	state Exp;
branches;
next	1.2;

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

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

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

1.10.2.2
date	2013.03.28.13.03.35;	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.36.32;	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.36.32;	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.47.22;	author svnexp;	state Exp;
branches;
next	;

1.7.2.1
date	2012.11.17.08.03.40;	author svnexp;	state Exp;
branches;
next	;

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

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

1.7.10.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.7.10.1.2.1
	1.7.10.1.4.1
	1.7.10.1.6.1
	1.7.10.1.8.1;
next	1.7.10.2;

1.7.10.2
date	2012.11.17.10.36.16;	author svnexp;	state Exp;
branches;
next	;

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

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

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

1.7.10.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.7.10.1.8.2;

1.7.10.1.8.2
date	2012.11.17.08.24.57;	author svnexp;	state Exp;
branches;
next	;

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

1.7.14.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.7.14.2;

1.7.14.2
date	2012.11.17.08.16.55;	author svnexp;	state Exp;
branches;
next	;

1.5.2.1
date	2012.11.17.07.41.22;	author svnexp;	state Exp;
branches;
next	;

1.5.12.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/sbin/pfctl/Makefile 240494 2012-09-14 11:51:49Z glebius $

# pf_ruleset.c is shared between kernel and pfctl
.PATH: ${.CURDIR}/../../sys/netpfil/pf

PROG=	pfctl
MAN=	pfctl.8

SRCS = pfctl.c parse.y pfctl_parser.c pf_print_state.c pfctl_altq.c
SRCS+= pfctl_osfp.c pfctl_radix.c pfctl_table.c pfctl_qstats.c
SRCS+= pfctl_optimize.c
SRCS+= pf_ruleset.c

WARNS?=	2
CFLAGS+= -Wall -Wmissing-prototypes -Wno-uninitialized
CFLAGS+= -Wstrict-prototypes
CFLAGS+= -DENABLE_ALTQ -I${.CURDIR}

YFLAGS=

LDADD+=	-lm -lmd
DPADD+=	${LIBM} ${LIBMD}

.include <bsd.prog.mk>
@


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


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 27
# $FreeBSD: releng/8.4/sbin/pfctl/Makefile 171173 2007-07-03 12:46:08Z mlaier $

.PATH:	${.CURDIR}/../../contrib/pf/pfctl
.PATH:	${.CURDIR}/../../sys/contrib/pf/net
.PATH:	${.CURDIR}/../../contrib/pf/man

PROG=	pfctl
MAN=	pfctl.8 pf.4 pflog.4 pfsync.4 pf.conf.5 pf.os.5

SRCS = pfctl.c parse.y pfctl_parser.c pf_print_state.c pfctl_altq.c
SRCS+= pfctl_osfp.c pfctl_radix.c pfctl_table.c pfctl_qstats.c
SRCS+= pfctl_optimize.c
SRCS+= pf_ruleset.c

CFLAGS+= -Wall -Wmissing-prototypes -Wno-uninitialized
CFLAGS+= -Wstrict-prototypes -I${.CURDIR}/../../contrib/pf/pfctl

# XXX ALTQ
CFLAGS+= -DENABLE_ALTQ
#CFLAGS+= -I${.CURDIR}/missing

YFLAGS=

LDADD+=	-lm -lmd
DPADD+=	${LIBM} ${LIBMD}

.include <bsd.prog.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 198236 on 2009-10-19 16:00:24Z by ru

Switch the default WARNS level for sbin/ to 6.

Submitted by:	Ulrich Spörlein
@
text
@d3 2
a4 3
.PATH:	${.CURDIR}/../../contrib/pf/pfctl
.PATH:	${.CURDIR}/../../sys/contrib/pf/net
.PATH:	${.CURDIR}/../../contrib/pf/man
d7 1
a7 1
MAN=	pfctl.8 pf.4 pflog.4 pfsync.4 pf.conf.5 pf.os.5
d16 2
a17 5
CFLAGS+= -Wstrict-prototypes -I${.CURDIR}/../../contrib/pf/pfctl

# XXX ALTQ
CFLAGS+= -DENABLE_ALTQ
#CFLAGS+= -I${.CURDIR}/missing
@


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/sbin/pfctl/Makefile 198236 2009-10-19 16:00:24Z ru $
@


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/sbin/pfctl/Makefile 198236 2009-10-19 16:00:24Z ru $
@


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/sbin/pfctl/Makefile 198236 2009-10-19 16:00:24Z ru $
@


1.7
log
@Link pf 4.1 to the build:
 - move ftp-proxy from libexec to usr.sbin
 - add tftp-proxy
 - new altq mtag link

Approved by:	re (kensmith)
@
text
@d15 1
@


1.7.2.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/sbin/pfctl/Makefile 171173 2007-07-03 12:46:08Z mlaier $
@


1.7.14.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.7.14.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/sbin/pfctl/Makefile 171173 2007-07-03 12:46:08Z mlaier $
@


1.7.12.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.7.10.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.10.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/sbin/pfctl/Makefile 171173 2007-07-03 12:46:08Z mlaier $
@


1.7.10.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.10.1.8.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/sbin/pfctl/Makefile 171173 2007-07-03 12:46:08Z mlaier $
@


1.7.10.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.10.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.10.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.7.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.7.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.6
log
@Add missing library dependencies.
@
text
@d4 1
d13 1
@


1.5
log
@Adapt Makefiles for pfctl(8) and authpf(8) to 3.7 sources.
@
text
@d23 1
a23 1
DPADD+=	${LIBM}
@


1.5.2.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/sbin/pfctl/Makefile 145841 2005-05-03 16:57:38Z mlaier $
@


1.5.12.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.4
log
@Remove -I from CFLAGS. This splipped in with the 3.5 import (as I was
building on a box with older pfvar.h installed). Didn't intend to commit it.

Requested by:	ru (on a C&P to ipfw's Makefile)
@
text
@d11 1
@


1.3
log
@Removed redundant and unsafe BINDIR redefinition.
@
text
@a13 1
CFLAGS+= -I${.CURDIR}/../../sys/contrib/pf
@


1.2
log
@Commit userland part of pf version 3.5 from OpenBSD (OPENBSD_3_5_BASE).
@
text
@a6 1
BINDIR=	${PREFIX}/sbin
@


1.1
log
@Add skeleton build dirs for pf userland:
 libexec/ftp-proxy	- ftp proxy for pf
 sbin/pfctl		- equivalent to sbin/ipf
 sbin/pflogd		- deamon logging packets via if_pflog in pcap format
 usr.sbin/authpf	- authentification shell to modify pf rulesets

Bring along some altq headers used to satisfy pfctl/authpf compile. This
helps to keep the diff down and will make it easy to have a altq-patchset
use the full powers of pf.

Also make sure that the pf headers are installed.

This does not link anything to the build. There will be a NO_PF switch for
make.conf once pf userland is linked.

Approved by:	bms(mentor)
@
text
@d15 1
d18 2
a19 2
#CFLAGS+= -DENABLE_ALTQ
CFLAGS+= -I${.CURDIR}/missing
@

