From owner-svn-src-projects@FreeBSD.ORG Tue Nov 27 06:20:41 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7C30BB66; Tue, 27 Nov 2012 06:20:41 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 5F0B18FC12; Tue, 27 Nov 2012 06:20:41 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAR6KfF1096707; Tue, 27 Nov 2012 06:20:41 GMT (envelope-from lstewart@svn.freebsd.org) Received: (from lstewart@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAR6KelE096690; Tue, 27 Nov 2012 06:20:40 GMT (envelope-from lstewart@svn.freebsd.org) Message-Id: <201211270620.qAR6KelE096690@svn.freebsd.org> From: Lawrence Stewart Date: Tue, 27 Nov 2012 06:20:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r243600 - in projects/diffused_head: contrib/pf/man contrib/pf/pfctl include sbin/pfctl sbin/pfctl/missing share/man/man4 share/man/man5 sys/conf sys/modules/dummynet sys/modules/ipfw s... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Nov 2012 06:20:41 -0000 Author: lstewart Date: Tue Nov 27 06:20:40 2012 New Revision: 243600 URL: http://svnweb.freebsd.org/changeset/base/243600 Log: Reverse the merge of r240494 from head. It needs to be done again, but this time remembering to move the DIFFUSE code to its new home. Added: projects/diffused_head/contrib/pf/man/ - copied from r243597, projects/diffused_head/contrib/pf/man/ projects/diffused_head/contrib/pf/pfctl/ - copied from r243597, projects/diffused_head/contrib/pf/pfctl/ projects/diffused_head/sbin/pfctl/missing/ - copied from r243597, projects/diffused_head/sbin/pfctl/missing/ - copied from r243597, projects/diffused_head/sys/contrib/pf/ projects/diffused_head/sys/netinet/ipfw/ - copied from r243597, projects/diffused_head/sys/netinet/ipfw/ Directory Properties: projects/diffused_head/sys/contrib/pf/ (props changed) Deleted: projects/diffused_head/sbin/pfctl/parse.y projects/diffused_head/sbin/pfctl/pf_print_state.c projects/diffused_head/sbin/pfctl/pfctl.8 projects/diffused_head/sbin/pfctl/pfctl.c projects/diffused_head/sbin/pfctl/pfctl.h projects/diffused_head/sbin/pfctl/pfctl_altq.c projects/diffused_head/sbin/pfctl/pfctl_optimize.c projects/diffused_head/sbin/pfctl/pfctl_osfp.c projects/diffused_head/sbin/pfctl/pfctl_parser.c projects/diffused_head/sbin/pfctl/pfctl_parser.h projects/diffused_head/sbin/pfctl/pfctl_qstats.c projects/diffused_head/sbin/pfctl/pfctl_radix.c projects/diffused_head/sbin/pfctl/pfctl_table.c projects/diffused_head/share/man/man4/pf.4 projects/diffused_head/share/man/man4/pflog.4 projects/diffused_head/share/man/man4/pfsync.4 projects/diffused_head/share/man/man5/pf.conf.5 projects/diffused_head/share/man/man5/pf.os.5 projects/diffused_head/sys/net/if_pflog.h projects/diffused_head/sys/net/if_pfsync.h projects/diffused_head/sys/net/pf_mtag.h projects/diffused_head/sys/net/pfvar.h projects/diffused_head/sys/netpfil/ Modified: projects/diffused_head/include/Makefile projects/diffused_head/sbin/pfctl/Makefile projects/diffused_head/share/man/man4/Makefile projects/diffused_head/share/man/man5/Makefile projects/diffused_head/sys/conf/files projects/diffused_head/sys/conf/kern.pre.mk projects/diffused_head/sys/modules/dummynet/Makefile projects/diffused_head/sys/modules/ipfw/Makefile projects/diffused_head/sys/modules/ipfw_nat/Makefile projects/diffused_head/sys/modules/pf/Makefile projects/diffused_head/sys/modules/pflog/Makefile projects/diffused_head/sys/modules/pfsync/Makefile projects/diffused_head/sys/netgraph/ng_ipfw.c projects/diffused_head/usr.sbin/authpf/Makefile projects/diffused_head/usr.sbin/ftp-proxy/ftp-proxy/Makefile Directory Properties: projects/diffused_head/ (props changed) projects/diffused_head/contrib/pf/ (props changed) projects/diffused_head/sbin/ (props changed) projects/diffused_head/share/man/man4/ (props changed) projects/diffused_head/sys/ (props changed) projects/diffused_head/sys/conf/ (props changed) Modified: projects/diffused_head/include/Makefile ============================================================================== --- projects/diffused_head/include/Makefile Tue Nov 27 06:07:58 2012 (r243599) +++ projects/diffused_head/include/Makefile Tue Nov 27 06:20:40 2012 (r243600) @@ -186,6 +186,9 @@ copies: ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ ${DESTDIR}${INCLUDEDIR}/netinet .endif + cd ${.CURDIR}/../sys/contrib/pf/net; \ + ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ + ${DESTDIR}${INCLUDEDIR}/net cd ${.CURDIR}/../sys/crypto; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 rijndael/rijndael.h \ ${DESTDIR}${INCLUDEDIR}/crypto @@ -278,6 +281,11 @@ symlinks: ${DESTDIR}${INCLUDEDIR}/netinet; \ done .endif + cd ${.CURDIR}/../sys/contrib/pf/net; \ + for h in *.h; do \ + ln -fs ../../../sys/contrib/pf/net/$$h \ + ${DESTDIR}${INCLUDEDIR}/net; \ + done cd ${.CURDIR}/../sys/crypto; \ for h in rijndael/rijndael.h; do \ ln -fs ../../../sys/crypto/$$h \ Modified: projects/diffused_head/sbin/pfctl/Makefile ============================================================================== --- projects/diffused_head/sbin/pfctl/Makefile Tue Nov 27 06:07:58 2012 (r243599) +++ projects/diffused_head/sbin/pfctl/Makefile Tue Nov 27 06:20:40 2012 (r243600) @@ -1,10 +1,11 @@ # $FreeBSD$ -# pf_ruleset.c is shared between kernel and pfctl -.PATH: ${.CURDIR}/../../sys/netpfil/pf +.PATH: ${.CURDIR}/../../contrib/pf/pfctl +.PATH: ${.CURDIR}/../../sys/contrib/pf/net +.PATH: ${.CURDIR}/../../contrib/pf/man PROG= pfctl -MAN= pfctl.8 +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 @@ -13,8 +14,11 @@ SRCS+= pf_ruleset.c WARNS?= 2 CFLAGS+= -Wall -Wmissing-prototypes -Wno-uninitialized -CFLAGS+= -Wstrict-prototypes -CFLAGS+= -DENABLE_ALTQ -I${.CURDIR} +CFLAGS+= -Wstrict-prototypes -I${.CURDIR}/../../contrib/pf/pfctl + +# XXX ALTQ +CFLAGS+= -DENABLE_ALTQ +#CFLAGS+= -I${.CURDIR}/missing YFLAGS= Modified: projects/diffused_head/share/man/man4/Makefile ============================================================================== --- projects/diffused_head/share/man/man4/Makefile Tue Nov 27 06:07:58 2012 (r243599) +++ projects/diffused_head/share/man/man4/Makefile Tue Nov 27 06:20:40 2012 (r243600) @@ -355,9 +355,6 @@ MAN= aac.4 \ pcii.4 \ pcm.4 \ pcn.4 \ - pf.4 \ - pflog.4 \ - pfsync.4 \ pim.4 \ polling.4 \ ppbus.4 \ Modified: projects/diffused_head/share/man/man5/Makefile ============================================================================== --- projects/diffused_head/share/man/man5/Makefile Tue Nov 27 06:07:58 2012 (r243599) +++ projects/diffused_head/share/man/man5/Makefile Tue Nov 27 06:20:40 2012 (r243600) @@ -50,8 +50,6 @@ MAN= acct.5 \ passwd.5 \ pbm.5 \ periodic.conf.5 \ - pf.conf.5 \ - pf.os.5 \ phones.5 \ portindex.5 \ portsnap.conf.5 \ Modified: projects/diffused_head/sys/conf/files ============================================================================== --- projects/diffused_head/sys/conf/files Tue Nov 27 06:07:58 2012 (r243599) +++ projects/diffused_head/sys/conf/files Tue Nov 27 06:20:40 2012 (r243600) @@ -270,19 +270,19 @@ cddl/contrib/opensolaris/uts/common/zmod cddl/contrib/opensolaris/uts/common/zmod/zmod_subr.c optional zfs compile-with "${ZFS_C}" cddl/contrib/opensolaris/uts/common/zmod/zutil.c optional zfs compile-with "${ZFS_C}" contrib/altq/altq/altq_cbq.c optional altq \ - compile-with "${NORMAL_C}" + compile-with "${NORMAL_C} -I$S/contrib/pf" contrib/altq/altq/altq_cdnr.c optional altq contrib/altq/altq/altq_hfsc.c optional altq \ - compile-with "${NORMAL_C}" + compile-with "${NORMAL_C} -I$S/contrib/pf" contrib/altq/altq/altq_priq.c optional altq \ - compile-with "${NORMAL_C}" + compile-with "${NORMAL_C} -I$S/contrib/pf" contrib/altq/altq/altq_red.c optional altq \ - compile-with "${NORMAL_C}" + compile-with "${NORMAL_C} -I$S/contrib/pf" contrib/altq/altq/altq_rio.c optional altq \ - compile-with "${NORMAL_C}" + compile-with "${NORMAL_C} -I$S/contrib/pf" contrib/altq/altq/altq_rmclass.c optional altq contrib/altq/altq/altq_subr.c optional altq \ - compile-with "${NORMAL_C}" + compile-with "${NORMAL_C} -I$S/contrib/pf" contrib/dev/acpica/components/debugger/dbcmds.c optional acpi acpi_debug contrib/dev/acpica/components/debugger/dbdisply.c optional acpi acpi_debug contrib/dev/acpica/components/debugger/dbexec.c optional acpi acpi_debug @@ -513,6 +513,27 @@ contrib/ngatm/netnatm/sig/sig_unimsgcpy. compile-with "${NORMAL_C} -I$S/contrib/ngatm" contrib/ngatm/netnatm/sig/sig_verify.c optional ngatm_uni \ compile-with "${NORMAL_C} -I$S/contrib/ngatm" +contrib/pf/net/if_pflog.c optional pflog pf inet \ + compile-with "${NORMAL_C} -I$S/contrib/pf" +contrib/pf/net/if_pfsync.c optional pfsync pf inet \ + compile-with "${NORMAL_C} -I$S/contrib/pf" +contrib/pf/net/pf.c optional pf inet \ + compile-with "${NORMAL_C} -I$S/contrib/pf" +contrib/pf/net/pf_if.c optional pf inet \ + compile-with "${NORMAL_C} -I$S/contrib/pf" +contrib/pf/net/pf_ioctl.c optional pf inet \ + compile-with "${NORMAL_C} -I$S/contrib/pf" +contrib/pf/net/pf_lb.c optional pf inet \ + compile-with "${NORMAL_C} -I$S/contrib/pf" +contrib/pf/net/pf_norm.c optional pf inet \ + compile-with "${NORMAL_C} -I$S/contrib/pf" +contrib/pf/net/pf_osfp.c optional pf inet \ + compile-with "${NORMAL_C} -I$S/contrib/pf" +contrib/pf/net/pf_ruleset.c optional pf inet \ + compile-with "${NORMAL_C} -I$S/contrib/pf" +contrib/pf/net/pf_table.c optional pf inet \ + compile-with "${NORMAL_C} -I$S/contrib/pf" +contrib/pf/netinet/in4_cksum.c optional pf inet crypto/blowfish/bf_ecb.c optional ipsec crypto/blowfish/bf_skey.c optional crypto | ipsec crypto/camellia/camellia.c optional crypto | ipsec @@ -2860,7 +2881,8 @@ net/if_edsc.c optional edsc net/if_ef.c optional ef net/if_enc.c optional enc ipsec inet | enc ipsec inet6 net/if_epair.c optional epair -net/if_ethersubr.c optional ether +net/if_ethersubr.c optional ether \ + compile-with "${NORMAL_C} -I$S/contrib/pf" net/if_faith.c optional faith net/if_fddisubr.c optional fddi net/if_fwsubr.c optional fwip @@ -3039,12 +3061,30 @@ netinet/ip_id.c optional inet netinet/in_mcast.c optional inet netinet/in_pcb.c optional inet | inet6 netinet/in_pcbgroup.c optional inet pcbgroup | inet6 pcbgroup -netinet/in_proto.c optional inet | inet6 +netinet/in_proto.c optional inet | inet6 \ + compile-with "${NORMAL_C} -I$S/contrib/pf" netinet/in_rmx.c optional inet netinet/ip_divert.c optional inet ipdivert ipfirewall +netinet/ipfw/dn_heap.c optional inet dummynet +netinet/ipfw/dn_sched_fifo.c optional inet dummynet +netinet/ipfw/dn_sched_prio.c optional inet dummynet +netinet/ipfw/dn_sched_qfq.c optional inet dummynet +netinet/ipfw/dn_sched_rr.c optional inet dummynet +netinet/ipfw/dn_sched_wf2q.c optional inet dummynet +netinet/ipfw/ip_dummynet.c optional inet dummynet +netinet/ipfw/ip_dn_io.c optional inet dummynet +netinet/ipfw/ip_dn_glue.c optional inet dummynet netinet/ip_ecn.c optional inet | inet6 netinet/ip_encap.c optional inet | inet6 netinet/ip_fastfwd.c optional inet +netinet/ipfw/ip_fw2.c optional inet ipfirewall \ + compile-with "${NORMAL_C} -I$S/contrib/pf" +netinet/ipfw/ip_fw_dynamic.c optional inet ipfirewall +netinet/ipfw/ip_fw_log.c optional inet ipfirewall +netinet/ipfw/ip_fw_pfil.c optional inet ipfirewall +netinet/ipfw/ip_fw_sockopt.c optional inet ipfirewall +netinet/ipfw/ip_fw_table.c optional inet ipfirewall +netinet/ipfw/ip_fw_nat.c optional inet ipfirewall_nat netinet/ip_icmp.c optional inet | inet6 netinet/ip_input.c optional inet netinet/ip_ipsec.c optional inet ipsec @@ -3152,33 +3192,6 @@ netncp/ncp_nls.c optional ncp netncp/ncp_rq.c optional ncp netncp/ncp_sock.c optional ncp netncp/ncp_subr.c optional ncp -netpfil/ipfw/dn_heap.c optional inet dummynet -netpfil/ipfw/dn_sched_fifo.c optional inet dummynet -netpfil/ipfw/dn_sched_prio.c optional inet dummynet -netpfil/ipfw/dn_sched_qfq.c optional inet dummynet -netpfil/ipfw/dn_sched_rr.c optional inet dummynet -netpfil/ipfw/dn_sched_wf2q.c optional inet dummynet -netpfil/ipfw/ip_dummynet.c optional inet dummynet -netpfil/ipfw/ip_dn_io.c optional inet dummynet -netpfil/ipfw/ip_dn_glue.c optional inet dummynet -netpfil/ipfw/ip_fw2.c optional inet ipfirewall -netpfil/ipfw/ip_fw_dynamic.c optional inet ipfirewall -netpfil/ipfw/ip_fw_log.c optional inet ipfirewall -netpfil/ipfw/ip_fw_pfil.c optional inet ipfirewall -netpfil/ipfw/ip_fw_sockopt.c optional inet ipfirewall -netpfil/ipfw/ip_fw_table.c optional inet ipfirewall -netpfil/ipfw/ip_fw_nat.c optional inet ipfirewall_nat -netpfil/pf/if_pflog.c optional pflog pf inet -netpfil/pf/if_pfsync.c optional pfsync pf inet -netpfil/pf/pf.c optional pf inet -netpfil/pf/pf_if.c optional pf inet -netpfil/pf/pf_ioctl.c optional pf inet -netpfil/pf/pf_lb.c optional pf inet -netpfil/pf/pf_norm.c optional pf inet -netpfil/pf/pf_osfp.c optional pf inet -netpfil/pf/pf_ruleset.c optional pf inet -netpfil/pf/pf_table.c optional pf inet -netpfil/pf/in4_cksum.c optional pf inet netsmb/smb_conn.c optional netsmb netsmb/smb_crypt.c optional netsmb netsmb/smb_dev.c optional netsmb Modified: projects/diffused_head/sys/conf/kern.pre.mk ============================================================================== --- projects/diffused_head/sys/conf/kern.pre.mk Tue Nov 27 06:07:58 2012 (r243599) +++ projects/diffused_head/sys/conf/kern.pre.mk Tue Nov 27 06:20:40 2012 (r243600) @@ -64,6 +64,9 @@ INCLUDES+= -I$S/contrib/altq # ... and the same for ipfilter INCLUDES+= -I$S/contrib/ipfilter +# ... and the same for pf +INCLUDES+= -I$S/contrib/pf + # ... and the same for ath INCLUDES+= -I$S/dev/ath -I$S/dev/ath/ath_hal Modified: projects/diffused_head/sys/modules/dummynet/Makefile ============================================================================== --- projects/diffused_head/sys/modules/dummynet/Makefile Tue Nov 27 06:07:58 2012 (r243599) +++ projects/diffused_head/sys/modules/dummynet/Makefile Tue Nov 27 06:20:40 2012 (r243600) @@ -2,7 +2,7 @@ .include -.PATH: ${.CURDIR}/../../netpfil/ipfw +.PATH: ${.CURDIR}/../../netinet/ipfw KMOD= dummynet SRCS= ip_dummynet.c SRCS+= ip_dn_glue.c ip_dn_io.c Modified: projects/diffused_head/sys/modules/ipfw/Makefile ============================================================================== --- projects/diffused_head/sys/modules/ipfw/Makefile Tue Nov 27 06:07:58 2012 (r243599) +++ projects/diffused_head/sys/modules/ipfw/Makefile Tue Nov 27 06:20:40 2012 (r243600) @@ -2,7 +2,7 @@ .include -.PATH: ${.CURDIR}/../../netpfil/ipfw +.PATH: ${.CURDIR}/../../netinet/ipfw KMOD= ipfw SRCS= ip_fw2.c ip_fw_pfil.c @@ -11,6 +11,7 @@ SRCS+= ip_fw_sockopt.c ip_fw_table.c SRCS+= opt_inet.h opt_inet6.h opt_ipdivert.h opt_ipfw.h opt_ipsec.h CFLAGS+= -DIPFIREWALL +CFLAGS+= -I${.CURDIR}/../../contrib/pf # #If you want it verbose #CFLAGS+= -DIPFIREWALL_VERBOSE Modified: projects/diffused_head/sys/modules/ipfw_nat/Makefile ============================================================================== --- projects/diffused_head/sys/modules/ipfw_nat/Makefile Tue Nov 27 06:07:58 2012 (r243599) +++ projects/diffused_head/sys/modules/ipfw_nat/Makefile Tue Nov 27 06:20:40 2012 (r243600) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../netpfil/ipfw +.PATH: ${.CURDIR}/../../netinet/ipfw KMOD= ipfw_nat SRCS= ip_fw_nat.c Modified: projects/diffused_head/sys/modules/pf/Makefile ============================================================================== --- projects/diffused_head/sys/modules/pf/Makefile Tue Nov 27 06:07:58 2012 (r243599) +++ projects/diffused_head/sys/modules/pf/Makefile Tue Nov 27 06:20:40 2012 (r243600) @@ -2,7 +2,8 @@ .include -.PATH: ${.CURDIR}/../../netpfil/pf +.PATH: ${.CURDIR}/../../contrib/pf/net +.PATH: ${.CURDIR}/../../contrib/pf/netinet KMOD= pf SRCS= pf.c pf_if.c pf_lb.c pf_osfp.c pf_ioctl.c pf_norm.c pf_table.c \ @@ -10,6 +11,8 @@ SRCS= pf.c pf_if.c pf_lb.c pf_osfp.c pf_ bus_if.h device_if.h \ opt_pf.h opt_inet.h opt_inet6.h opt_bpf.h opt_global.h +CFLAGS+= -I${.CURDIR}/../../contrib/pf + .if !defined(KERNBUILDDIR) .if ${MK_INET_SUPPORT} != "no" opt_inet.h: Modified: projects/diffused_head/sys/modules/pflog/Makefile ============================================================================== --- projects/diffused_head/sys/modules/pflog/Makefile Tue Nov 27 06:07:58 2012 (r243599) +++ projects/diffused_head/sys/modules/pflog/Makefile Tue Nov 27 06:20:40 2012 (r243600) @@ -2,11 +2,13 @@ .include -.PATH: ${.CURDIR}/../../netpfil/pf +.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 SRCS+= bus_if.h device_if.h .if defined(KERNBUILDDIR) Modified: projects/diffused_head/sys/modules/pfsync/Makefile ============================================================================== --- projects/diffused_head/sys/modules/pfsync/Makefile Tue Nov 27 06:07:58 2012 (r243599) +++ projects/diffused_head/sys/modules/pfsync/Makefile Tue Nov 27 06:20:40 2012 (r243600) @@ -2,11 +2,13 @@ .include -.PATH: ${.CURDIR}/../../netpfil/pf +.PATH: ${.CURDIR}/../../contrib/pf/net KMOD= pfsync SRCS= if_pfsync.c \ opt_pf.h opt_inet.h opt_inet6.h + +CFLAGS+= -I${.CURDIR}/../../contrib/pf SRCS+= bus_if.h device_if.h .if defined(KERNBUILDDIR) Modified: projects/diffused_head/sys/netgraph/ng_ipfw.c ============================================================================== --- projects/diffused_head/sys/netgraph/ng_ipfw.c Tue Nov 27 06:07:58 2012 (r243599) +++ projects/diffused_head/sys/netgraph/ng_ipfw.c Tue Nov 27 06:20:40 2012 (r243600) @@ -48,12 +48,11 @@ #include #include #include +#include #include #include #include -#include - #include #include #include Modified: projects/diffused_head/usr.sbin/authpf/Makefile ============================================================================== --- projects/diffused_head/usr.sbin/authpf/Makefile Tue Nov 27 06:07:58 2012 (r243599) +++ projects/diffused_head/usr.sbin/authpf/Makefile Tue Nov 27 06:20:40 2012 (r243600) @@ -1,6 +1,7 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../contrib/pf/authpf +.PATH: ${.CURDIR}/../../contrib/pf/pfctl PROG= authpf MAN= authpf.8 @@ -10,6 +11,8 @@ BINMODE= 6555 SRCS= authpf.c +CFLAGS+= -I${.CURDIR}/../../contrib/pf/pfctl + # XXX ALTQ: CFLAGS+= -DENABLE_ALTQ Modified: projects/diffused_head/usr.sbin/ftp-proxy/ftp-proxy/Makefile ============================================================================== --- projects/diffused_head/usr.sbin/ftp-proxy/ftp-proxy/Makefile Tue Nov 27 06:07:58 2012 (r243599) +++ projects/diffused_head/usr.sbin/ftp-proxy/ftp-proxy/Makefile Tue Nov 27 06:20:40 2012 (r243600) @@ -8,6 +8,7 @@ MAN= ftp-proxy.8 SRCS= ftp-proxy.c filter.c CFLAGS+= -I${.CURDIR}/../../../contrib/pf/libevent +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/pf LDADD+= ${LIBEVENT} DPADD+= ${LIBEVENT}