Relocate IPFilter from sys/netinet to sys/contrib/ipfilter.
This commit is contained in:
parent
4422746fdf
commit
88d74af548
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=77854
@ -112,10 +112,10 @@ copies:
|
||||
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 $i/*.h \
|
||||
${DESTDIR}/usr/include/$i
|
||||
.endfor
|
||||
.if exists(${.CURDIR}/../sys/${MACHINE_ARCH}/include)
|
||||
cd ${.CURDIR}/../sys/${MACHINE_ARCH}/include; \
|
||||
.if exists(${.CURDIR}/../sys/contrib/ipfilter/netinet)
|
||||
cd ${.CURDIR}/../sys/contrib/ipfilter/netinet; \
|
||||
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
|
||||
${DESTDIR}/usr/include/machine
|
||||
${DESTDIR}/usr/include/netinet
|
||||
.endif
|
||||
.for i in ${SFILES}
|
||||
ln -sf ../sys/$i ${DESTDIR}/usr/include/machine/$i
|
||||
|
@ -48,6 +48,11 @@ INCLUDES+= -I$S/../include
|
||||
.else
|
||||
INCLUDES+= -I/usr/include
|
||||
.endif
|
||||
|
||||
# This hack lets us use the ipfilter code without spamming a new
|
||||
# include path into 100+ source files.
|
||||
INCLUDES+= -I$S/contrib/ipfilter
|
||||
|
||||
COPTS= ${INCLUDES} ${IDENT} -D_KERNEL -include opt_global.h
|
||||
CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
|
||||
|
||||
|
@ -53,6 +53,9 @@ INCLUDES+= -I/usr/include
|
||||
# include path into 100+ source files.
|
||||
INCLUDES+= -I$S/contrib/dev/acpica
|
||||
|
||||
# ... and the same for ipfilter
|
||||
INCLUDES+= -I$S/contrib/ipfilter
|
||||
|
||||
COPTS= ${INCLUDES} ${IDENT} -D_KERNEL -include opt_global.h
|
||||
CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
|
||||
|
||||
|
@ -63,6 +63,9 @@ INCLUDES+= -I/usr/include
|
||||
# include path into 100+ source files.
|
||||
INCLUDES+= -I$S/contrib/dev/acpica
|
||||
|
||||
# ... and the same for ipfilter
|
||||
INCLUDES+= -I$S/contrib/ipfilter
|
||||
|
||||
COPTS= ${INCLUDES} ${IDENT} -D_KERNEL -include opt_global.h
|
||||
CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
|
||||
|
||||
|
@ -55,6 +55,9 @@ INCLUDES+= -I/usr/include
|
||||
# include path into 100+ source files.
|
||||
INCLUDES+= -I$S/contrib/dev/acpica
|
||||
|
||||
# ... and the same for ipfilter
|
||||
INCLUDES+= -I$S/contrib/ipfilter
|
||||
|
||||
COPTS= ${INCLUDES} ${IDENT} -D_KERNEL -include opt_global.h
|
||||
CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
|
||||
|
||||
|
@ -53,6 +53,9 @@ INCLUDES+= -I/usr/include
|
||||
# include path into 100+ source files.
|
||||
INCLUDES+= -I$S/contrib/dev/acpica
|
||||
|
||||
# ... and the same for ipfilter
|
||||
INCLUDES+= -I$S/contrib/ipfilter
|
||||
|
||||
COPTS= ${INCLUDES} ${IDENT} -D_KERNEL -include opt_global.h
|
||||
CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
|
||||
|
||||
|
@ -153,6 +153,15 @@ contrib/dev/acpica/utinit.c optional acpica
|
||||
contrib/dev/acpica/utmisc.c optional acpica
|
||||
contrib/dev/acpica/utobject.c optional acpica
|
||||
contrib/dev/acpica/utxface.c optional acpica
|
||||
contrib/ipfilter/netinet/fil.c optional ipfilter inet
|
||||
contrib/ipfilter/netinet/ip_auth.c optional ipfilter inet
|
||||
contrib/ipfilter/netinet/ip_fil.c optional ipfilter inet
|
||||
contrib/ipfilter/netinet/ip_frag.c optional ipfilter inet
|
||||
contrib/ipfilter/netinet/ip_log.c optional ipfilter inet
|
||||
contrib/ipfilter/netinet/ip_nat.c optional ipfilter inet
|
||||
contrib/ipfilter/netinet/ip_proxy.c optional ipfilter inet
|
||||
contrib/ipfilter/netinet/ip_state.c optional ipfilter inet
|
||||
contrib/ipfilter/netinet/mlfk_ipl.c optional ipfilter inet
|
||||
crypto/blowfish/bf_cbc.c optional ipsec ipsec_esp
|
||||
crypto/blowfish/bf_cbc_m.c optional ipsec ipsec_esp
|
||||
crypto/blowfish/bf_enc.c optional ipsec ipsec_esp
|
||||
@ -1031,7 +1040,6 @@ netgraph/ng_vjc.c optional netgraph_vjc
|
||||
net/slcompress.c optional netgraph_vjc
|
||||
netinet/accf_data.c optional accept_filter_data
|
||||
netinet/accf_http.c optional accept_filter_http
|
||||
netinet/fil.c optional ipfilter inet
|
||||
netinet/if_atm.c optional atm
|
||||
netinet/if_ether.c optional ether
|
||||
netinet/igmp.c optional inet
|
||||
@ -1042,26 +1050,18 @@ netinet/ip_id.c optional inet
|
||||
netinet/in_pcb.c optional inet
|
||||
netinet/in_proto.c optional inet
|
||||
netinet/in_rmx.c optional inet
|
||||
netinet/ip_auth.c optional ipfilter inet
|
||||
netinet/ip_divert.c optional ipdivert
|
||||
netinet/ip_dummynet.c optional dummynet
|
||||
netinet/ip_ecn.c optional inet
|
||||
netinet/ip_ecn.c optional inet6
|
||||
netinet/ip_encap.c optional inet
|
||||
netinet/ip_encap.c optional inet6
|
||||
netinet/ip_fil.c optional ipfilter inet
|
||||
netinet/ip_flow.c optional inet
|
||||
netinet/ip_frag.c optional ipfilter inet
|
||||
netinet/ip_fw.c optional ipfirewall
|
||||
netinet/ip_icmp.c optional inet
|
||||
netinet/ip_input.c optional inet
|
||||
netinet/ip_log.c optional ipfilter inet
|
||||
netinet/ip_mroute.c optional inet
|
||||
netinet/ip_nat.c optional ipfilter inet
|
||||
netinet/ip_output.c optional inet
|
||||
netinet/ip_proxy.c optional ipfilter inet
|
||||
netinet/ip_state.c optional ipfilter inet
|
||||
netinet/mlfk_ipl.c optional ipfilter inet
|
||||
netinet/raw_ip.c optional inet
|
||||
netinet/tcp_debug.c optional tcpdebug
|
||||
netinet/tcp_input.c optional inet
|
||||
|
@ -1,12 +1,13 @@
|
||||
# $FreeBSD$
|
||||
|
||||
.PATH: ${.CURDIR}/../../netinet
|
||||
.PATH: ${.CURDIR}/../../contrib/ipfilter/netinet
|
||||
|
||||
KMOD= ipl
|
||||
SRCS= mlfk_ipl.c ip_nat.c ip_frag.c ip_state.c ip_proxy.c ip_auth.c \
|
||||
ip_log.c ip_fil.c fil.c
|
||||
NOMAN=
|
||||
|
||||
CFLAGS+= -I${.CURDIR}/../../contrib/ipfilter
|
||||
CFLAGS+= -DIPFILTER=1 -DIPFILTER_LKM -DIPFILTER_LOG
|
||||
#
|
||||
# If you don't want log functionality remove -DIPFILTER_LOG
|
||||
|
Loading…
Reference in New Issue
Block a user