[Midnightbsd-cvs] src [11209] trunk/sbin/ipf: sync with freebsd
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Jul 1 16:45:08 EDT 2018
Revision: 11209
http://svnweb.midnightbsd.org/src/?rev=11209
Author: laffer1
Date: 2018-07-01 16:45:07 -0400 (Sun, 01 Jul 2018)
Log Message:
-----------
sync with freebsd
Modified Paths:
--------------
trunk/sbin/ipf/Makefile
trunk/sbin/ipf/Makefile.inc
trunk/sbin/ipf/ipf/Makefile
trunk/sbin/ipf/ipfs/Makefile
trunk/sbin/ipf/ipfstat/Makefile
trunk/sbin/ipf/ipftest/Makefile
trunk/sbin/ipf/ipmon/Makefile
trunk/sbin/ipf/ipnat/Makefile
trunk/sbin/ipf/ippool/Makefile
trunk/sbin/ipf/ipresend/Makefile
trunk/sbin/ipf/ipsend/Makefile
trunk/sbin/ipf/iptest/Makefile
trunk/sbin/ipf/libipf/Makefile
trunk/sbin/ipf/rules/Makefile
Property Changed:
----------------
trunk/sbin/ipf/Makefile.inc
Modified: trunk/sbin/ipf/Makefile
===================================================================
--- trunk/sbin/ipf/Makefile 2018-07-01 20:44:37 UTC (rev 11208)
+++ trunk/sbin/ipf/Makefile 2018-07-01 20:45:07 UTC (rev 11209)
@@ -1,8 +1,8 @@
-# $MidnightBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sbin/ipf/Makefile 289247 2015-10-13 18:43:49Z bdrewery $
-#.WAIT
-SUBDIR= libipf
+SUBDIR= libipf .WAIT
SUBDIR+= ipf ipfs ipfstat ipftest ipmon ipnat ippool ipresend
-#SUBDIR+= ipsend iptest rules
+SUBDIR_PARALLEL=
.include <bsd.subdir.mk>
Modified: trunk/sbin/ipf/Makefile.inc
===================================================================
--- trunk/sbin/ipf/Makefile.inc 2018-07-01 20:44:37 UTC (rev 11208)
+++ trunk/sbin/ipf/Makefile.inc 2018-07-01 20:45:07 UTC (rev 11209)
@@ -1,5 +1,8 @@
-# $MidnightBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sbin/ipf/Makefile.inc 269696 2014-08-08 00:58:24Z cy $
+.include <bsd.own.mk>
+
WARNS?= 2
NO_WFORMAT=
NO_WARRAY_BOUNDS=
@@ -10,6 +13,12 @@
CFLAGS+= -I${.CURDIR}/../../../sys/contrib/ipfilter
CFLAGS+= -DSTATETOP -D__UIO_EXPOSE
+.if ${MK_INET6_SUPPORT} != "no"
+CFLAGS+= -DUSE_INET6
+.else
+CFLAGS+= -DNOINET6
+.endif
+
LIBIPF= ${.OBJDIR}/../libipf/libipf.a
DPADD+= ${LIBIPF} ${LIBKVM}
LDADD+= ${LIBIPF} -lkvm
Property changes on: trunk/sbin/ipf/Makefile.inc
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sbin/ipf/ipf/Makefile
===================================================================
--- trunk/sbin/ipf/ipf/Makefile 2018-07-01 20:44:37 UTC (rev 11208)
+++ trunk/sbin/ipf/ipf/Makefile 2018-07-01 20:45:07 UTC (rev 11209)
@@ -1,14 +1,13 @@
# $MidnightBSD$
+# $FreeBSD: stable/10/sbin/ipf/ipf/Makefile 291814 2015-12-04 18:50:12Z bdrewery $
PROG= ipf
SRCS= ${GENHDRS} ipf.c ipfcomp.c ipf_y.c ipf_l.c bpf_filter.c
MAN= ipfilter.4 ipfilter.5 ipf.8 ipf.4 ipf.5 ipl.4
MLINKS= ipf.5 ipf.conf.5 ipf.5 ipf6.conf.5
-CFLAGS+= -I. -DIPFILTER_BPF
+CFLAGS+= -I. -DIPFILTER_BPF -DHAS_SYS_MD5_H
GENHDRS= ipf_l.h ipf_y.h
-DPSRCS+= ${GENHDRS}
-
CLEANFILES+= ${GENHDRS} ipf_y.c ipf_l.c
ipf_y.c: ipf_y.y
Modified: trunk/sbin/ipf/ipfs/Makefile
===================================================================
--- trunk/sbin/ipf/ipfs/Makefile 2018-07-01 20:44:37 UTC (rev 11208)
+++ trunk/sbin/ipf/ipfs/Makefile 2018-07-01 20:45:07 UTC (rev 11209)
@@ -1,4 +1,5 @@
-# $FreeBSD: src/sbin/ipf/ipfs/Makefile,v 1.1 2005/04/25 18:55:50 darrenr Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sbin/ipf/ipfs/Makefile 145524 2005-04-25 18:55:52Z darrenr $
PROG= ipfs
MAN= ipfs.8
Modified: trunk/sbin/ipf/ipfstat/Makefile
===================================================================
--- trunk/sbin/ipf/ipfstat/Makefile 2018-07-01 20:44:37 UTC (rev 11208)
+++ trunk/sbin/ipf/ipfstat/Makefile 2018-07-01 20:45:07 UTC (rev 11209)
@@ -1,4 +1,5 @@
-# $FreeBSD: src/sbin/ipf/ipfstat/Makefile,v 1.1 2005/04/25 18:55:50 darrenr Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sbin/ipf/ipfstat/Makefile 145524 2005-04-25 18:55:52Z darrenr $
NOGCCERROR= # defined
Modified: trunk/sbin/ipf/ipftest/Makefile
===================================================================
--- trunk/sbin/ipf/ipftest/Makefile 2018-07-01 20:44:37 UTC (rev 11208)
+++ trunk/sbin/ipf/ipftest/Makefile 2018-07-01 20:45:07 UTC (rev 11209)
@@ -1,21 +1,28 @@
-# $MidnightBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sbin/ipf/ipftest/Makefile 291814 2015-12-04 18:50:12Z bdrewery $
PROG= ipftest
SRCS= ${GENHDRS} ipftest.c fil.c ip_frag.c ip_state.c ip_nat.c \
+ ip_nat6.c \
ip_proxy.c ip_auth.c ip_htable.c ip_lookup.c \
ip_pool.c ip_scan.c ip_sync.c ip_rules.c \
ip_fil.c ip_log.c ippool_y.c ippool_l.c ipf_y.c \
- ipf_l.c ipnat_y.c ipnat_l.c md5.c radix.c bpf_filter.c
+ ipf_l.c ipnat_y.c ipnat_l.c md5.c radix_ipf.c ip_dstlist.c
MAN= ipftest.1
WARNS?= 0
CFLAGS+= -DIPFILTER_LOG -DIPFILTER_COMPILED -DIPFILTER_LOOKUP \
- -DIPFILTER_SCAN -DIPFILTER_SYNC -DIPFILTER_CKSUM -I.
+ -DIPFILTER_SYNC -DIPFILTER_CKSUM -DHAS_SYS_MD5_H -I.
+# XXX The original tarball does not define IPFILTER_SCAN when building this
+# XXX and other modules. It is believed the reason is it fails to build.
+# XXX It has been removed for now.
+# XXX CFLAGS+= -DIPFILTER_SCAN
+
+
.PATH: ${.CURDIR}/../../../sys/contrib/ipfilter/netinet
GENHDRS= ipnat_l.h ipnat_y.h ippool_l.h ippool_y.h ipf_l.h ipf_y.h
-DPSRCS+= ${GENHDRS}
CLEANFILES+= ${GENHDRS}
CLEANFILES+= ipf_y.c ipf_l.c
@@ -25,15 +32,19 @@
CLEANFILES+= ippool_y.c ippool_l.c
CLEANFILES+= ippool.tab.c ippool.tab.h
-ipnat_y.c: ipnat_y.y
+ipnat.tab.c ipnat.tab.h: ipnat_y.y
${YACC} -b ipnat -d ${.ALLSRC}
+
+ipnat_y.c: ipnat.tab.c
sed -e 's/yy/ipnat_yy/g' \
-e 's/y.tab.c/ipnat_y.c/' \
-e s/\"ipnat_y.y\"/\"..\\/tools\\/ipnat_y.y\"/ \
ipnat.tab.c > ${.TARGET}
+
+ipnat_y.h: ipnat.tab.h
sed -e 's/yy/ipnat_yy/g' \
-e 's/y.tab.h/ipnat_y.h/' \
- ipnat.tab.h > ${.TARGET:.c=.h}
+ ipnat.tab.h > ${.TARGET}
ipnat_y.h: ipnat_y.c
@@ -47,13 +58,17 @@
sed -e 's/yy/ipnat_yy/g' \
${.ALLSRC} > ${.TARGET}
-ippool_y.c: ippool_y.y
+ippool.tab.c ippool.tab.h: ippool_y.y
${YACC} -b ippool -d ${.ALLSRC}
+
+ippool_y.c: ippool.tab.c
sed -e 's/yy/ippool_yy/g' \
-e 's/"ippool_y.y"/"..\/tools\/ippool_y.y"/' \
ippool.tab.c > ${.TARGET}
+
+ippool_y.h: ippool.tab.h
sed -e 's/yy/ippool_yy/g' \
- ippool.tab.h > ${.TARGET:.c=.h}
+ ippool.tab.h > ${.TARGET}
ippool_y.h: ippool_y.c
@@ -67,13 +82,17 @@
sed -e 's/yy/ippool_yy/g' \
${.ALLSRC} > ${.TARGET}
-ipf_y.c: ipf_y.y
+ipf.tab.c ipf.tab.h: ipf_y.y
${YACC} -b ipf -d ${.ALLSRC}
+
+ipf_y.c: ipf.tab.c
sed -e 's/yy/ipf_yy/g' \
-e 's/"ipf_y.y"/"..\/tools\/ipf_y.y"/' \
ipf.tab.c > ${.TARGET}
+
+ipf_y.h: ipf.tab.h
sed -e 's/yy/ipf_yy/g' \
- ipf.tab.h > ${.TARGET:.c=.h}
+ ipf.tab.h > ${.TARGET}
ipf_y.h: ipf_y.c
Modified: trunk/sbin/ipf/ipmon/Makefile
===================================================================
--- trunk/sbin/ipf/ipmon/Makefile 2018-07-01 20:44:37 UTC (rev 11208)
+++ trunk/sbin/ipf/ipmon/Makefile 2018-07-01 20:45:07 UTC (rev 11209)
@@ -1,4 +1,5 @@
-# $FreeBSD: src/sbin/ipf/ipmon/Makefile,v 1.3 2006/09/10 08:58:47 obrien Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sbin/ipf/ipmon/Makefile 291814 2015-12-04 18:50:12Z bdrewery $
PROG= ipmon
SRCS= ${GENHDRS} ipmon.c ipmon_y.c ipmon_l.c
@@ -7,8 +8,6 @@
CFLAGS+= -DLOGFAC=LOG_LOCAL0 -I.
GENHDRS+= ipmon_l.h ipmon_y.h
-DPSRCS+= ${GENHDRS}
-
CLEANFILES+= ${GENHDRS} ipmon_y.c ipmon_l.c
ipmon_y.c: ipmon_y.y
Modified: trunk/sbin/ipf/ipnat/Makefile
===================================================================
--- trunk/sbin/ipf/ipnat/Makefile 2018-07-01 20:44:37 UTC (rev 11208)
+++ trunk/sbin/ipf/ipnat/Makefile 2018-07-01 20:45:07 UTC (rev 11209)
@@ -1,4 +1,5 @@
-# $FreeBSD: src/sbin/ipf/ipnat/Makefile,v 1.3 2006/09/10 08:58:47 obrien Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sbin/ipf/ipnat/Makefile 291814 2015-12-04 18:50:12Z bdrewery $
PROG= ipnat
SRCS= ${GENHDRS} ipnat.c ipnat_y.c ipnat_l.c
@@ -7,8 +8,6 @@
CFLAGS+= -I.
GENHDRS= ipnat_l.h ipnat_y.h
-DPSRCS+= ${GENHDRS}
-
CLEANFILES+= ${GENHDRS} ipnat_y.c ipnat_l.c
ipnat_y.c: ipnat_y.y
Modified: trunk/sbin/ipf/ippool/Makefile
===================================================================
--- trunk/sbin/ipf/ippool/Makefile 2018-07-01 20:44:37 UTC (rev 11208)
+++ trunk/sbin/ipf/ippool/Makefile 2018-07-01 20:45:07 UTC (rev 11209)
@@ -1,4 +1,5 @@
-# $FreeBSD: src/sbin/ipf/ippool/Makefile,v 1.3 2006/09/10 08:58:47 obrien Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sbin/ipf/ippool/Makefile 291814 2015-12-04 18:50:12Z bdrewery $
PROG= ippool
SRCS= ${GENHDRS} ippool_y.c ippool_l.c kmem.c ippool.c
@@ -6,8 +7,6 @@
CFLAGS+= -I.
GENHDRS= ippool_l.h ippool_y.h
-DPSRCS+= ${GENHDRS}
-
CLEANFILES+= ${GENHDRS} ippool_y.c ippool_l.c
ippool_y.c: ippool_y.y
Modified: trunk/sbin/ipf/ipresend/Makefile
===================================================================
--- trunk/sbin/ipf/ipresend/Makefile 2018-07-01 20:44:37 UTC (rev 11208)
+++ trunk/sbin/ipf/ipresend/Makefile 2018-07-01 20:45:07 UTC (rev 11209)
@@ -1,4 +1,5 @@
-# $FreeBSD: src/sbin/ipf/ipresend/Makefile,v 1.2 2005/04/28 16:26:34 darrenr Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sbin/ipf/ipresend/Makefile 145630 2005-04-28 16:26:35Z darrenr $
PROG= ipresend
SRCS= ipresend.c ip.c resend.c sbpf.c sock.c 44arp.c
Modified: trunk/sbin/ipf/ipsend/Makefile
===================================================================
--- trunk/sbin/ipf/ipsend/Makefile 2018-07-01 20:44:37 UTC (rev 11208)
+++ trunk/sbin/ipf/ipsend/Makefile 2018-07-01 20:45:07 UTC (rev 11209)
@@ -1,4 +1,5 @@
-# $FreeBSD: src/sbin/ipf/ipsend/Makefile,v 1.2 2005/04/28 16:26:35 darrenr Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sbin/ipf/ipsend/Makefile 145630 2005-04-28 16:26:35Z darrenr $
NOGCCERROR= # defined
Modified: trunk/sbin/ipf/iptest/Makefile
===================================================================
--- trunk/sbin/ipf/iptest/Makefile 2018-07-01 20:44:37 UTC (rev 11208)
+++ trunk/sbin/ipf/iptest/Makefile 2018-07-01 20:45:07 UTC (rev 11209)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
# $FreeBSD: src/sbin/ipf/iptest/Makefile,v 1.1 2005/04/25 18:55:52 darrenr Exp $
.include <bsd.own.mk>
Modified: trunk/sbin/ipf/libipf/Makefile
===================================================================
--- trunk/sbin/ipf/libipf/Makefile 2018-07-01 20:44:37 UTC (rev 11208)
+++ trunk/sbin/ipf/libipf/Makefile 2018-07-01 20:45:07 UTC (rev 11209)
@@ -1,28 +1,46 @@
-# $FreeBSD: src/sbin/ipf/libipf/Makefile,v 1.7 2007/06/11 19:38:38 cognet Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sbin/ipf/libipf/Makefile 255332 2013-09-06 23:11:19Z cy $
LIB= ipf
INTERNALLIB=
-SRCS= addicmp.c addipopt.c alist_free.c alist_new.c bcopywrap.c \
- binprint.c buildopts.c checkrev.c count4bits.c count6bits.c \
- debug.c facpri.c fill6bits.c flags.c gethost.c getifname.c \
+SRCS= addicmp.c addipopt.c alist_free.c alist_new.c allocmbt.c \
+ assigndefined.c bcopywrap.c \
+ binprint.c buildopts.c checkrev.c connecttcp.c \
+ count4bits.c count6bits.c \
+ debug.c dupmbt.c \
+ facpri.c familyname.c \
+ fill6bits.c findword.c \
+ flags.c freembt.c ftov.c \
+ genmask.c \
+ gethost.c getifname.c geticmptype.c \
getnattype.c getport.c getportproto.c getproto.c getsumd.c \
- hostname.c icmpcode.c initparse.c ionames.c \
- ipf_dotuning.c ipft_ef.c ipft_hx.c ipft_pc.c ipft_sn.c \
- ipft_td.c ipft_tx.c ipoptsec.c kmem.c kmemcpywrap.c \
- kvatoname.c load_file.c load_hash.c load_hashnode.c \
+ hostname.c icmpcode.c icmptypename.c icmptypes.c \
+ initparse.c interror.c ionames.c \
+ ipf_dotuning.c ipf_perror.c ipft_hx.c ipft_pc.c \
+ ipft_tx.c ipoptsec.c kmem.c kmemcpywrap.c \
+ kvatoname.c load_dstlist.c load_dstlistnode.c load_file.c \
+ load_hash.c load_hashnode.c \
load_http.c load_pool.c load_poolnode.c load_url.c \
+ mb_hexdump.c msgdsize.c \
mutex_emul.c nametokva.c nat_setgroupmap.c ntomask.c \
- optname.c optprint.c optprintv6.c optvalue.c portname.c \
- print_toif.c printactivenat.c printaps.c printbuf.c \
+ optname.c optprint.c optprintv6.c optvalue.c parsefields.c \
+ parseipfexpr.c parsewhoisline.c poolio.c portname.c \
+ prependmbt.c \
+ print_toif.c printactiveaddr.c printactivenat.c printaddr.c \
+ printaps.c printbuf.c printdstl_live.c printdstlist.c \
+ printdstlistdata.c printdstlistnode.c printdstlistpolicy.c \
+ printfieldhdr.c \
printfr.c printfraginfo.c printhash.c printhash_live.c \
- printhashdata.c printhashnode.c printhostmap.c \
- printhostmask.c printifname.c printip.c printlog.c \
- printmask.c printnat.c printpacket.c printpacket6.c \
- printpool.c printpool_live.c printpooldata.c printpoolnode.c \
- printportcmp.c printproto.c printsbuf.c printstate.c \
- printtqtable.c printtunable.c remove_hash.c remove_hashnode.c \
+ printhashdata.c printhashnode.c printhost.c printhostmap.c \
+ printhostmask.c printifname.c printip.c printipfexpr.c printiphdr.c printlog.c printlookup.c \
+ printmask.c printnat.c printnataddr.c printnatfield.c printnatside.c printpacket.c printpacket6.c \
+ printpool.c printpool_live.c printpooldata.c printpoolfield.c printpoolnode.c \
+ printportcmp.c printproto.c printsbuf.c printstate.c printstatefields.c \
+ printtcpflags.c \
+ printtqtable.c printtunable.c printunit.c remove_hash.c remove_hashnode.c \
remove_pool.c remove_poolnode.c resetlexer.c rwlock_emul.c \
+ save_execute.c save_file.c save_nothing.c save_syslog.c save_v1trap.c save_v2trap.c vtof.c \
tcp_flags.c tcpflags.c tcpoptnames.c v6ionames.c v6optvalue.c \
var.c verbose.c
Modified: trunk/sbin/ipf/rules/Makefile
===================================================================
--- trunk/sbin/ipf/rules/Makefile 2018-07-01 20:44:37 UTC (rev 11208)
+++ trunk/sbin/ipf/rules/Makefile 2018-07-01 20:45:07 UTC (rev 11209)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
# $FreeBSD: src/sbin/ipf/rules/Makefile,v 1.1 2005/04/25 18:55:52 darrenr Exp $
.include <bsd.own.mk>
More information about the Midnightbsd-cvs
mailing list