OS-7667 IPFilter needs to keep and report state for cloud firewall logging
Portions contributed by: Mike Gerdts <mike.gerdts@joyent.com>

*** 21,31 ****
  #
  # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  # Use is subject to license terms.
  #
  # Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
! # Copyright (c) 2012, Joyent Inc. All rights reserved.
  #
  
  PROG=           ipf ipfs ipmon ipnat ippool ipfstat
  IPFPROG=        ipftest
  
--- 21,31 ----
  #
  # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  # Use is subject to license terms.
  #
  # Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
! # Copyright 2019 Joyent, Inc.
  #
  
  PROG=           ipf ipfs ipmon ipnat ippool ipfstat
  IPFPROG=        ipftest
  
*** 33,43 ****
  IPFS_OBJS=      ipfs.o ipfzone.o
  IPFSTAT_OBJS=   ipfstat.o ipfzone.o
  IPMON_OBJS=     ipmon.o ipfzone.o ipmon_y.o ipmon_l.o
  IPNAT_OBJS=     ipnat.o ipfzone.o ipnat_y.o ipnat_l.o
  IPPOOL_OBJS=    ippool.o ipfzone.o ippool_y.o ippool_l.o
! IPFTEST_OBJS=   ipftest.o ipfzone.o \
                  ip_fil.o ip_state.o ip_compat.o \
                  ip_frag.o ip_nat.o ip_nat6.o fil.o \
                  ip_htable.o ip_lookup.o \
                  ip_proxy.o ip_auth.o ip_log.o \
                  ipf_y.o ipf_l.o \
--- 33,43 ----
  IPFS_OBJS=      ipfs.o ipfzone.o
  IPFSTAT_OBJS=   ipfstat.o ipfzone.o
  IPMON_OBJS=     ipmon.o ipfzone.o ipmon_y.o ipmon_l.o
  IPNAT_OBJS=     ipnat.o ipfzone.o ipnat_y.o ipnat_l.o
  IPPOOL_OBJS=    ippool.o ipfzone.o ippool_y.o ippool_l.o
! IPFTEST_OBJS=   cfw.o ipftest.o ipfzone.o \
                  ip_fil.o ip_state.o ip_compat.o \
                  ip_frag.o ip_nat.o ip_nat6.o fil.o \
                  ip_htable.o ip_lookup.o \
                  ip_proxy.o ip_auth.o ip_log.o \
                  ipf_y.o ipf_l.o \
*** 54,64 ****
  SRCS=           $(OBJSL:%.o=../%.c)
  
  include ../../../Makefile.cmd
  include ../../Makefile.ipf
  
! LDLIBS          += $(LIBBPF)
  LDFLAGS         += $(MAPFILE.NGB:%=-M%)
  
  CPPFLAGS        += -I. -DIPFILTER_LOOKUP -DIPFILTER_LOG
  
  ipfstat.o       :=      CPPFLAGS += -DSTATETOP
--- 54,64 ----
  SRCS=           $(OBJSL:%.o=../%.c)
  
  include ../../../Makefile.cmd
  include ../../Makefile.ipf
  
! LDLIBS          += $(LIBBPF) -luuid
  LDFLAGS         += $(MAPFILE.NGB:%=-M%)
  
  CPPFLAGS        += -I. -DIPFILTER_LOOKUP -DIPFILTER_LOG
  
  ipfstat.o       :=      CPPFLAGS += -DSTATETOP