head	1.4;
access;
symbols
	RELENG_8_4:1.4.0.2
	RELENG_9_1_0_RELEASE:1.2.2.1.4.2
	RELENG_9_1:1.2.2.1.0.4
	RELENG_9_1_BP:1.2.2.1
	RELENG_8_3_0_RELEASE:1.1.10.1.8.1
	RELENG_8_3:1.1.10.1.0.8
	RELENG_8_3_BP:1.1.10.1
	RELENG_9_0_0_RELEASE:1.2.2.1.2.1
	RELENG_9_0:1.2.2.1.0.2
	RELENG_9_0_BP:1.2.2.1
	RELENG_9:1.2.0.2
	RELENG_9_BP:1.2
	RELENG_7_4_0_RELEASE:1.1.14.1
	RELENG_8_2_0_RELEASE:1.1.10.1.6.1
	RELENG_7_4:1.1.0.14
	RELENG_7_4_BP:1.1
	RELENG_8_2:1.1.10.1.0.6
	RELENG_8_2_BP:1.1.10.1
	RELENG_8_1_0_RELEASE:1.1.10.1.4.1
	RELENG_8_1:1.1.10.1.0.4
	RELENG_8_1_BP:1.1.10.1
	RELENG_7_3_0_RELEASE:1.1.12.1
	RELENG_7_3:1.1.0.12
	RELENG_7_3_BP:1.1
	RELENG_8_0_0_RELEASE:1.1.10.1.2.1
	RELENG_8_0:1.1.10.1.0.2
	RELENG_8_0_BP:1.1.10.1
	RELENG_8:1.1.0.10
	RELENG_8_BP:1.1
	RELENG_7_2_0_RELEASE:1.1.8.1
	RELENG_7_2:1.1.0.8
	RELENG_7_2_BP:1.1
	RELENG_7_1_0_RELEASE:1.1.6.1
	RELENG_7_1:1.1.0.6
	RELENG_7_1_BP:1.1
	RELENG_7_0_0_RELEASE:1.1
	RELENG_7_0:1.1.0.4
	RELENG_7_0_BP:1.1
	RELENG_7:1.1.0.2
	RELENG_7_BP:1.1;
locks; strict;
comment	@# @;


1.4
date	2012.11.17.01.54.45;	author svnexp;	state Exp;
branches
	1.4.2.1;
next	1.3;

1.3
date	2012.09.14.11.51.49;	author glebius;	state Exp;
branches;
next	1.2;

1.2
date	2011.06.28.11.57.25;	author bz;	state Exp;
branches
	1.2.2.1;
next	1.1;

1.1
date	2007.07.03.12.46.08;	author mlaier;	state Exp;
branches
	1.1.2.1
	1.1.6.1
	1.1.8.1
	1.1.10.1
	1.1.12.1
	1.1.14.1;
next	;

1.4.2.1
date	2012.11.17.01.54.45;	author svnexp;	state dead;
branches;
next	1.4.2.2;

1.4.2.2
date	2013.03.28.13.06.16;	author svnexp;	state Exp;
branches;
next	;

1.2.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.2.2.1.2.1
	1.2.2.1.4.1;
next	1.2.2.2;

1.2.2.2
date	2012.11.17.11.37.44;	author svnexp;	state Exp;
branches;
next	;

1.2.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.2.2.1.2.2;

1.2.2.1.2.2
date	2012.11.17.08.37.40;	author svnexp;	state Exp;
branches;
next	;

1.2.2.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.2.2.1.4.2;

1.2.2.1.4.2
date	2012.11.17.08.48.32;	author svnexp;	state Exp;
branches;
next	;

1.1.2.1
date	2012.11.17.08.09.01;	author svnexp;	state Exp;
branches;
next	;

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

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

1.1.10.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.1.10.1.2.1
	1.1.10.1.4.1
	1.1.10.1.6.1
	1.1.10.1.8.1;
next	1.1.10.2;

1.1.10.2
date	2012.11.17.10.37.22;	author svnexp;	state Exp;
branches;
next	;

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

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

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

1.1.10.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.1.10.1.8.2;

1.1.10.1.8.2
date	2012.11.17.08.25.54;	author svnexp;	state Exp;
branches;
next	;

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

1.1.14.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.1.14.2;

1.1.14.2
date	2012.11.17.08.17.47;	author svnexp;	state Exp;
branches;
next	;


desc
@@


1.4
log
@Switching exporter and resync
@
text
@# $FreeBSD: head/usr.sbin/ftp-proxy/ftp-proxy/Makefile 240494 2012-09-14 11:51:49Z glebius $

.PATH:	${.CURDIR}/../../../contrib/pf/ftp-proxy

PROG=	ftp-proxy
MAN=	ftp-proxy.8

SRCS=	ftp-proxy.c filter.c

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

LDADD+= ${LIBEVENT}
DPADD+= ${LIBEVENT}

WARNS?=	3

.include <bsd.prog.mk>
@


1.4.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:06:16 +0000
@
text
@d1 17
@


1.4.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 18
# $FreeBSD: releng/8.4/usr.sbin/ftp-proxy/ftp-proxy/Makefile 171173 2007-07-03 12:46:08Z mlaier $

.PATH:	${.CURDIR}/../../../contrib/pf/ftp-proxy

PROG=	ftp-proxy
MAN=	ftp-proxy.8

SRCS=   ftp-proxy.c filter.c

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

DPADD=	${LIBEVENT}
LDADD=	${LIBEVENT}

WARNS?=	2

.include <bsd.prog.mk>
@


1.3
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.2
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
@a10 1
CFLAGS+= -I${.CURDIR}/../../../sys/contrib/pf
@


1.2.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.2.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/usr.sbin/ftp-proxy/ftp-proxy/Makefile 223637 2011-06-28 11:57:25Z bz $
@


1.2.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.2.2.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/usr.sbin/ftp-proxy/ftp-proxy/Makefile 223637 2011-06-28 11:57:25Z bz $
@


1.2.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.2.2.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/usr.sbin/ftp-proxy/ftp-proxy/Makefile 223637 2011-06-28 11:57:25Z bz $
@


1.1
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
@d8 1
a8 1
SRCS=   ftp-proxy.c filter.c
d13 2
a14 2
DPADD=	${LIBEVENT}
LDADD=	${LIBEVENT}
d16 1
a16 1
WARNS?=	2
@


1.1.2.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/usr.sbin/ftp-proxy/ftp-proxy/Makefile 171173 2007-07-03 12:46:08Z mlaier $
@


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


1.1.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.1.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.1.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/usr.sbin/ftp-proxy/ftp-proxy/Makefile 171173 2007-07-03 12:46:08Z mlaier $
@


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


1.1.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.1.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.1.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.1.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.1.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
@@

