hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-11-23 11:51:08 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix world build WITHOUT_PF.

Browse Source 
Sponsored by:	Nginx, Inc.
This commit is contained in:
Gleb Smirnoff 2014-02-12 09:59:48 +00:00
parent 19b5cffe0b
commit 9968f056d6
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=261797
5 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sbin/ipfw/Makefile
View File

@ -1,8 +1,16 @@
# $FreeBSD$ # $FreeBSD$
.include <bsd.own.mk>
PROG= ipfw PROG= ipfw
SRCS= ipfw2.c dummynet.c ipv6.c main.c nat.c altq.c SRCS= ipfw2.c dummynet.c ipv6.c main.c nat.c
WARNS?= 2 WARNS?= 2
.if ${MK_PF} != "no"
SRCS+= altq.c
CFLAGS+=-DPF
.endif
DPADD= ${LIBUTIL} DPADD= ${LIBUTIL}
LDADD= -lutil LDADD= -lutil
MAN= ipfw.8 MAN= ipfw.8

5
sbin/ipfw/ipfw2.h
View File

@ -268,11 +268,14 @@ void ipfw_flush(int force);
void ipfw_zero(int ac, char *av[], int optname); void ipfw_zero(int ac, char *av[], int optname);
void ipfw_list(int ac, char *av[], int show_counters); void ipfw_list(int ac, char *av[], int show_counters);
#ifdef PF
/* altq.c */ /* altq.c */
void altq_set_enabled(int enabled); void altq_set_enabled(int enabled);
u_int32_t altq_name_to_qid(const char *name); u_int32_t altq_name_to_qid(const char *name);
void print_altq_cmd(struct _ipfw_insn_altq *altqptr); void print_altq_cmd(struct _ipfw_insn_altq *altqptr);
#else
#define NO_ALTQ
#endif
/* dummynet.c */ /* dummynet.c */
void dummynet_list(int ac, char *av[], int show_counters); void dummynet_list(int ac, char *av[], int show_counters);

4
usr.bin/kdump/Makefile
View File

@ -20,6 +20,10 @@ LDADD+= -lcapsicum -lnv
CFLAGS+=-DHAVE_LIBCAPSICUM CFLAGS+=-DHAVE_LIBCAPSICUM
.endif .endif
.if ${MK_PF} != "no"
CFLAGS+=-DPF
.endif
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
SRCS+= linux_syscalls.c SRCS+= linux_syscalls.c
.endif .endif

6
usr.bin/kdump/mkioctls
View File

@ -21,7 +21,8 @@ LC_ALL=C; export LC_ALL
# XXX should we use an ANSI cpp? # XXX should we use an ANSI cpp?
ioctl_includes=$( ioctl_includes=$(
cd $includedir cd $includedir
find -H -s * -name '*.h' | grep -v '.*disk.*\.h' | \ find -H -s * -name '*.h' | \
egrep -v '(.*disk.*|net/pfvar|net/if_pfsync)\.h' | \
xargs egrep -l \ xargs egrep -l \
'^#[ ]*define[ ]+[A-Za-z_][A-Za-z0-9_]*[ ]+_IO[^a-z0-9_]' | '^#[ ]*define[ ]+[A-Za-z_][A-Za-z0-9_]*[ ]+_IO[^a-z0-9_]' |
awk '{printf("#include <%s>\\n", $1)}' awk '{printf("#include <%s>\\n", $1)}'
@ -54,7 +55,10 @@ BEGIN {
print "#include <net/ethernet.h>" print "#include <net/ethernet.h>"
print "#include <net/if.h>" print "#include <net/if.h>"
print "#include <net/if_var.h>" print "#include <net/if_var.h>"
print "#ifdef PF"
print "#include <net/pfvar.h>" print "#include <net/pfvar.h>"
print "#include <net/if_pfsync.h>"
print "#endif"
print "#include <net/route.h>" print "#include <net/route.h>"
print "#include <netinet/in.h>" print "#include <netinet/in.h>"
print "#include <netinet/ip_mroute.h>" print "#include <netinet/ip_mroute.h>"

5
usr.sbin/bsnmpd/modules/Makefile
View File

@ -13,12 +13,15 @@ SUBDIR= ${_snmp_atm} \
snmp_hast \ snmp_hast \
snmp_hostres \ snmp_hostres \
snmp_mibII \ snmp_mibII \
snmp_pf \
snmp_target \ snmp_target \
snmp_usm \ snmp_usm \
snmp_vacm \ snmp_vacm \
snmp_wlan snmp_wlan
.if ${MK_PF} != "no"
SUBDIR+=snmp_pf
.endif
.if ${MK_NETGRAPH_SUPPORT} != "no" .if ${MK_NETGRAPH_SUPPORT} != "no"
SUBDIR+=snmp_netgraph SUBDIR+=snmp_netgraph
.endif .endif