head	1.1;
branch	1.1.1;
access;
symbols
	RELENG_8_4:1.1.1.8.0.18
	RELENG_9_1_0_RELEASE:1.1.1.8
	RELENG_9_1:1.1.1.8.0.16
	RELENG_9_1_BP:1.1.1.8
	RELENG_8_3_0_RELEASE:1.1.1.8
	RELENG_8_3:1.1.1.8.0.14
	RELENG_8_3_BP:1.1.1.8
	RELENG_9_0_0_RELEASE:1.1.1.8
	RELENG_9_0:1.1.1.8.0.12
	RELENG_9_0_BP:1.1.1.8
	RELENG_9:1.1.1.8.0.10
	RELENG_9_BP:1.1.1.8
	RELENG_7_4_0_RELEASE:1.1.1.7.2.1
	RELENG_8_2_0_RELEASE:1.1.1.8
	RELENG_7_4:1.1.1.7.2.1.0.10
	RELENG_7_4_BP:1.1.1.7.2.1
	RELENG_8_2:1.1.1.8.0.8
	RELENG_8_2_BP:1.1.1.8
	RELENG_8_1_0_RELEASE:1.1.1.8
	RELENG_8_1:1.1.1.8.0.6
	RELENG_8_1_BP:1.1.1.8
	RELENG_7_3_0_RELEASE:1.1.1.7.2.1
	RELENG_7_3:1.1.1.7.2.1.0.8
	RELENG_7_3_BP:1.1.1.7.2.1
	RELENG_8_0_0_RELEASE:1.1.1.8
	RELENG_8_0:1.1.1.8.0.4
	RELENG_8_0_BP:1.1.1.8
	RELENG_8:1.1.1.8.0.2
	RELENG_8_BP:1.1.1.8
	RELENG_7_2_0_RELEASE:1.1.1.7.2.1
	RELENG_7_2:1.1.1.7.2.1.0.6
	RELENG_7_2_BP:1.1.1.7.2.1
	RELENG_7_1_0_RELEASE:1.1.1.7.2.1
	RELENG_6_4_0_RELEASE:1.1.1.6.2.2
	RELENG_7_1:1.1.1.7.2.1.0.4
	RELENG_7_1_BP:1.1.1.7.2.1
	RELENG_6_4:1.1.1.6.2.2.0.4
	RELENG_6_4_BP:1.1.1.6.2.2
	RELENG_7_0_0_RELEASE:1.1.1.7.2.1
	RELENG_6_3_0_RELEASE:1.1.1.6.2.2
	RELENG_7_0:1.1.1.7.2.1.0.2
	RELENG_7_0_BP:1.1.1.7.2.1
	RELENG_6_3:1.1.1.6.2.2.0.2
	RELENG_6_3_BP:1.1.1.6.2.2
	v4-1-28:1.1.1.8
	RELENG_7:1.1.1.7.0.2
	RELENG_7_BP:1.1.1.7
	v4-1-23:1.1.1.7
	RELENG_6_2_0_RELEASE:1.1.1.6.2.1
	RELENG_6_2:1.1.1.6.2.1.0.2
	RELENG_6_2_BP:1.1.1.6.2.1
	v4-1-13:1.1.1.7
	RELENG_5_5_0_RELEASE:1.1.1.5
	RELENG_5_5:1.1.1.5.0.8
	RELENG_5_5_BP:1.1.1.5
	RELENG_6_1_0_RELEASE:1.1.1.6
	RELENG_6_1:1.1.1.6.0.6
	RELENG_6_1_BP:1.1.1.6
	v4-1-10:1.1.1.7
	RELENG_6_0_0_RELEASE:1.1.1.6
	RELENG_6_0:1.1.1.6.0.4
	RELENG_6_0_BP:1.1.1.6
	RELENG_6:1.1.1.6.0.2
	RELENG_6_BP:1.1.1.6
	RELENG_5_4_0_RELEASE:1.1.1.5
	v4-1-8:1.1.1.6
	RELENG_5_4:1.1.1.5.0.6
	RELENG_5_4_BP:1.1.1.5
	RELENG_4_11_0_RELEASE:1.1.1.1.2.3
	RELENG_4_11:1.1.1.1.2.3.0.2
	RELENG_4_11_BP:1.1.1.1.2.3
	RELENG_5_3_0_RELEASE:1.1.1.5
	RELENG_5_3:1.1.1.5.0.4
	RELENG_5_3_BP:1.1.1.5
	RELENG_5:1.1.1.5.0.2
	RELENG_5_BP:1.1.1.5
	v3-4-35:1.1.1.5
	RELENG_4_10_0_RELEASE:1.1.1.1.2.2
	RELENG_4_10:1.1.1.1.2.2.0.6
	RELENG_4_10_BP:1.1.1.1.2.2
	RELENG_5_2_1_RELEASE:1.1.1.4
	RELENG_5_2_0_RELEASE:1.1.1.4
	RELENG_5_2:1.1.1.4.0.4
	RELENG_5_2_BP:1.1.1.4
	RELENG_4_9_0_RELEASE:1.1.1.1.2.2
	RELENG_4_9:1.1.1.1.2.2.0.4
	RELENG_4_9_BP:1.1.1.1.2.2
	RELENG_5_1_0_RELEASE:1.1.1.4
	RELENG_5_1:1.1.1.4.0.2
	RELENG_5_1_BP:1.1.1.4
	RELENG_4_8_0_RELEASE:1.1.1.1.2.2
	RELENG_4_8:1.1.1.1.2.2.0.2
	RELENG_4_8_BP:1.1.1.1.2.2
	v3-4-31:1.1.1.4
	RELENG_5_0_0_RELEASE:1.1.1.3
	RELENG_5_0:1.1.1.3.0.2
	RELENG_5_0_BP:1.1.1.3
	RELENG_4_7_0_RELEASE:1.1.1.1.2.1
	RELENG_4_7:1.1.1.1.2.1.0.4
	RELENG_4_7_BP:1.1.1.1.2.1
	v3-4-29:1.1.1.3
	RELENG_4_6_2_RELEASE:1.1.1.1.2.1
	RELENG_4_6_1_RELEASE:1.1.1.1.2.1
	RELENG_4_6_0_RELEASE:1.1.1.1.2.1
	v3-4-28:1.1.1.3
	RELENG_4_6:1.1.1.1.2.1.0.2
	RELENG_4_6_BP:1.1.1.1.2.1
	v3-4-27:1.1.1.3
	v3-4-26:1.1.1.3
	v3-4-25:1.1.1.2
	RELENG_4_5_0_RELEASE:1.1.1.1
	RELENG_4_5:1.1.1.1.0.8
	RELENG_4_5_BP:1.1.1.1
	RELENG_4_4_0_RELEASE:1.1.1.1
	RELENG_4_4:1.1.1.1.0.6
	RELENG_4_4_BP:1.1.1.1
	v3-4-20:1.1.1.1
	RELENG_4_3_0_RELEASE:1.1.1.1
	RELENG_4_3:1.1.1.1.0.4
	RELENG_4_3_BP:1.1.1.1
	v3-4-16:1.1.1.1
	rev:1.1.1.1
	RELENG_4_2_0_RELEASE:1.1.1.1
	v3-4-13:1.1.1.1
	v3-4-12:1.1.1.1
	RELENG_4_1_1_RELEASE:1.1.1.1
	PRE_SMPNG:1.1.1.1
	v3-4-9:1.1.1.1
	RELENG_4_1_0_RELEASE:1.1.1.1
	v3-4-8:1.1.1.1
	v3_4_4:1.1.1.1
	RELENG_4_0_0_RELEASE:1.1.1.1
	RELENG_4:1.1.1.1.0.2
	RELENG_4_BP:1.1.1.1
	v3_3_8:1.1.1.1
	v3_3_6:1.1.1.1
	v3_3_3:1.1.1.1
	DARRENR:1.1.1;
locks; strict;
comment	@# @;


1.1
date	99.11.08.20.50.35;	author guido;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	99.11.08.20.50.35;	author guido;	state Exp;
branches
	1.1.1.1.2.1;
next	1.1.1.2;

1.1.1.2
date	2002.03.19.11.45.07;	author darrenr;	state Exp;
branches;
next	1.1.1.3;

1.1.1.3
date	2002.04.25.03.34.19;	author darrenr;	state Exp;
branches;
next	1.1.1.4;

1.1.1.4
date	2003.02.15.06.27.40;	author darrenr;	state Exp;
branches;
next	1.1.1.5;

1.1.1.5
date	2004.06.21.22.47.51;	author darrenr;	state Exp;
branches;
next	1.1.1.6;

1.1.1.6
date	2005.04.25.17.30.46;	author darrenr;	state Exp;
branches
	1.1.1.6.2.1;
next	1.1.1.7;

1.1.1.7
date	2005.12.30.11.34.49;	author guido;	state Exp;
branches
	1.1.1.7.2.1;
next	1.1.1.8;

1.1.1.8
date	2007.10.18.21.41.04;	author darrenr;	state Exp;
branches
	1.1.1.8.18.1;
next	;

1.1.1.1.2.1
date	2002.04.27.17.30.46;	author darrenr;	state Exp;
branches;
next	1.1.1.1.2.2;

1.1.1.1.2.2
date	2003.03.01.03.55.52;	author darrenr;	state Exp;
branches;
next	1.1.1.1.2.3;

1.1.1.1.2.3
date	2004.07.04.09.24.40;	author darrenr;	state Exp;
branches;
next	;

1.1.1.6.2.1
date	2006.08.24.07.37.03;	author guido;	state Exp;
branches;
next	1.1.1.6.2.2;

1.1.1.6.2.2
date	2007.11.18.11.03.18;	author darrenr;	state Exp;
branches;
next	;

1.1.1.7.2.1
date	2007.10.31.05.00.34;	author darrenr;	state Exp;
branches;
next	;

1.1.1.8.18.1
date	2007.10.18.21.41.04;	author svnexp;	state dead;
branches;
next	1.1.1.8.18.2;

1.1.1.8.18.2
date	2013.03.28.13.01.20;	author svnexp;	state Exp;
branches;
next	;


desc
@@


1.1
log
@Initial revision
@
text
@#!/bin/sh
#
PATH=/sbin:/usr/sbin:/bin:/usr/bin; export PATH
 
# try to bomb out fast if anything fails....
set -e
 
argv0=`basename $0`
dir=`pwd`
karch=`uname -m`
archdir="/sys/arch/$karch"
confdir="$archdir/conf"
 
echo -n "Installing "
for i in ip_fil.[ch] fil.c ip_nat.[ch] ip_frag.[ch] ip_state.[ch] ip_proxy.[ch] ip_auth.[ch] ip_log.c ip_compat.h ipl.h ip_ftp_pxy.c ip_rcmd_pxy.c ip_raudio_pxy.c ; do
	echo -n "$i "
	cp $i /sys/netinet/
	chmod 644 /sys/netinet/$i
done
echo ""
if [ -f /sys/netinet/ip_fil_compat.h ] ; then
	echo "Linking /sys/netinet/ip_compat.h to /sys/netinet/ip_fil_compat.h"
	rm /sys/netinet/ip_fil_compat.h
	ln -s /sys/netinet/ip_compat.h /sys/netinet/ip_fil_compat.h
fi
exit 0
@


1.1.1.1
log
@Import of ipfilter 3.3.3  in anticipation of its revival.
More to come in the next days.
@
text
@@


1.1.1.1.2.1
log
@Update (finally) IPFilter on RELENG_4 CVS branch.
@
text
@a10 9
os=`uname -s`
if [ $os = FreeBSD ] ; then
	rev=`uname -r`
	rev=`expr $rev : '\([0-9]*\)\..*'`
	if [ $rev = 2 ] ; then
		echo "Copying /usr/include/osreldate.h to /sys/sys"
		cp /usr/include/osreldate.h /sys/sys
	fi
fi
a11 4
ipfdir=/sys/netinet
if [ -d /sys/contrib/ipfilter ] ; then
	ipfdir=/sys/contrib/ipfilter/netinet
fi
d15 1
a15 1
for i in ip_fil.[ch] fil.c ip_nat.[ch] ip_frag.[ch] ip_state.[ch] ip_proxy.[ch] ip_auth.[ch] ip_log.c ip_compat.h ipl.h ip_*_pxy.c ; do
d17 2
a18 2
	cp $i $ipfdir
	chmod 644 $ipfdir/$i
@


1.1.1.1.2.2
log
@Merge IPFilter 3.4.31 from -current into RELENG_4  for upcoming 4.8 release.

Approved by:	murray@@freebsd.org / re@@freebsd.org
@
text
@a33 18
echo -n "Installing into /usr/include/netinet"
for j in auth compat fil frag nat proxy state ; do
	i=ip_$j.h
	if [ -f "$i" ] ; then
		echo -n " $i"
		cp $i /usr/include/netinet/$i
		chmod 644 /usr/include/netinet/$i
	fi
done
for j in ipl.h; do
	if [ -f "$j" ] ; then
		echo -n " $j"
		cp $j /usr/include/netinet/$j
		chmod 644 /usr/include/netinet/$j
	fi
done
echo

@


1.1.1.1.2.3
log
@MFC of IPFilter 3.4.35.
@
text
@a18 3
	if [ -f /sys/contrib/ipfilter/netinet/mlfk_ipl.c ] ; then
		/bin/cp mlfk_ipl.c /sys/contrib/ipfilter/netinet/
	fi
@


1.1.1.2
log
@Import IPFilter 3.4.25
@
text
@a11 4
ipfdir=/sys/netinet
if [ -d /sys/contrib/ipfilter ] ; then
	ipfdir=/sys/contrib/ipfilter/netinet
fi
d15 1
a15 1
for i in ip_fil.[ch] fil.c ip_nat.[ch] ip_frag.[ch] ip_state.[ch] ip_proxy.[ch] ip_auth.[ch] ip_log.c ip_compat.h ipl.h ip_*_pxy.c ; do
d17 2
a18 2
	cp $i $ipfdir
	chmod 644 $ipfdir/$i
@


1.1.1.3
log
@Import IPFilter 3.4.26
@
text
@a10 9
os=`uname -s`
if [ $os = FreeBSD ] ; then
	rev=`uname -r`
	rev=`expr $rev : '\([0-9]*\)\..*'`
	if [ $rev = 2 ] ; then
		echo "Copying /usr/include/osreldate.h to /sys/sys"
		cp /usr/include/osreldate.h /sys/sys
	fi
fi
@


1.1.1.4
log
@Import userland tools for IPFilter 3.4.31 into -current
@
text
@a33 18
echo -n "Installing into /usr/include/netinet"
for j in auth compat fil frag nat proxy state ; do
	i=ip_$j.h
	if [ -f "$i" ] ; then
		echo -n " $i"
		cp $i /usr/include/netinet/$i
		chmod 644 /usr/include/netinet/$i
	fi
done
for j in ipl.h; do
	if [ -f "$j" ] ; then
		echo -n " $j"
		cp $j /usr/include/netinet/$j
		chmod 644 /usr/include/netinet/$j
	fi
done
echo

@


1.1.1.5
log
@Import ipfilter 3.4.35 onto vendor branch
@
text
@a18 3
	if [ -f /sys/contrib/ipfilter/netinet/mlfk_ipl.c ] ; then
		/bin/cp mlfk_ipl.c /sys/contrib/ipfilter/netinet/
	fi
@


1.1.1.6
log
@import ipfilter 4.1.8 into the vendor branch
@
text
@a3 1
argv0=`basename $0`
a4 6
os=`uname -s`
rev=`uname -r`
maj=`expr $rev : '\([0-9]*\)\.'`
min=`expr $rev : '[0-9]*\.\([0-9]*\)'`
sub=`expr $rev : '[0-9]*\.[0-9]*\.\([0-9]*\)'`

d7 2
a8 2

fullrev=`printf '%02d%02d%02d' $maj $min $sub`
d11 12
a27 3
if [ -d /sys/dist/ipf ] ; then
	ipfdir=/sys/dist/ipf/netinet
fi
a28 6
if [ -f /dev/ipnat ] ; then
	major=`ls -l /dev/ipnat | sed -e 's/.* \([0-9]*\),.*/\1/'`
	echo "Major number for IP Filter is $major"
else
	major=x
fi
d31 2
a32 46
for j in auth frag nat proxy scan state sync pool htable lookup rules; do
	for i in ip_$j.[ch]; do
		if [ -f "$i" ] ; then
			echo -n " $i"
			cp $i $ipfdir
			chmod 644 $ipfdir/$i
		fi
	done
done

case $os in
SunOS)
	case `uname -r` in
	5.*)
		filc=ip_fil_solaris.c
		;;
	4.*)
		filc=ip_fil_sunos.c
		;;
	esac
	;;
*BSD)
	filc=ip_fil_`echo $os | tr A-Z a-z`.c
	case $os in
	FreeBSD)
		cp mlfk_ipl.c $ipfdir/
		;;
	*)
		;;
	esac
	;;
esac

if [ -f $ipfdir/$filc ] ; then
	echo -n "$filc -> $ipfdir/$filc "
	cp $filc $ipfdir/$filc
	chmod 644 $ipfdir/$filc
fi
if [ -f $ipfdir/ip_fil.c ] ; then
	echo -n "$filc -> $ipfdir/ip_fil.c "
	cp $filc $ipfdir/ip_fil.c
	chmod 644 $ipfdir/ip_fil.c
fi

for i in ip_fil.h fil.c ip_log.c ip_compat.h ipl.h ip_*_pxy.c; do
	echo -n " $i"
d38 1
a38 1
for j in auth compat fil frag nat proxy scan state sync pool htable lookup; do
a59 144

if [ $major != x ] ; then
	if [ ! -e /dev/ipsync ] ; then
		echo "Creating /dev/ipsync"
		mknod /dev/ipsync c $major 4
	fi

	if [ ! -e /dev/ipsync ] ; then
		echo "Creating /dev/ipscan"
		mknod /dev/ipsync c $major 5
	fi

	if [ ! -e /dev/iplookup ] ; then
		echo "Creating /dev/iplookup"
		mknod /dev/iplookup c $major 6
	fi
fi

set +e
os=`uname -s`
if [ $os = FreeBSD -a -f /sys/conf/files ] ; then
	cd /sys/conf
	if [ -f options ] ; then
		if [ ! -f options.preipf4 ] ; then
			mv options options.preipf4
			cp -p options.preipf4 options
		fi
		for i in SCAN SYNC LOOKUP COMPILED; do
			grep IPFILTER_$i options >/dev/null 2>&1
			if [ $? -ne 0 ] ; then
				echo >> options
				echo "# extra option for IP Filter" >> options
				echo "IPFILTER_$i	opt_ipfilter.h" >> options
			fi
		done
	fi
	if [ ! -f files.preipf4 ] ; then
		mv files files.preipf4
		cp -p files.preipf4 files
	fi
	for i in htable pool lookup; do
		grep ip_$i.c files >/dev/null 2>&1
		if [ $? -ne 0 ] ; then
			echo "contrib/ipfilter/netinet/ip_$i.c	optional ipfilter inet ipfilter_lookup" >> files
		fi
	done
	grep ip_sync.c files >/dev/null 2>&1
	if [ $? -ne 0 ] ; then
		echo 'contrib/ipfilter/netinet/ip_sync.c	optional ipfilter inet ipfilter_sync' >> files
	fi
	grep ip_scan.c files >/dev/null 2>&1
	if [ $? -ne 0 ] ; then
		echo 'contrib/ipfilter/netinet/ip_scan.c	optional ipfilter inet ipfilter_scan' >> files
	fi
	grep ip_rules.c files >/dev/null 2>&1
	if [ $? -ne 0 ] ; then
		echo 'contrib/ipfilter/netinet/ip_rules.c	optional ipfilter inet ipfilter_compiled' >> files
	fi
fi
if [ $os = NetBSD -a -f /sys/conf/files ] ; then
	cd /sys/conf
	if [ ! -f files.preipf4 ] ; then
		mv files files.preipf4
		cp -p files.preipf4 files
	fi
	if [ $fullrev -ge 010600 -a $fullrev -lt 020000 ] ; then
		for i in htable pool lookup; do
			grep ip_$i.c files >/dev/null 2>&1
			if [ $? -ne 0 ] ; then
				echo "file	netinet/ip_$i.c	ipfilter & ipfilter_lookup" >> files
			fi
		done
		grep ip_sync.c files >/dev/null 2>&1
		if [ $? -ne 0 ] ; then
			echo 'file	netinet/ip_sync.c	ipfilter & ipfilter_sync' >> files
		fi
		grep ip_scan.c files >/dev/null 2>&1
		if [ $? -ne 0 ] ; then
			echo 'file	netinet/ip_scan.c	ipfilter & ipfilter_scan' >> files
		fi
		grep ip_rules.c files >/dev/null 2>&1
		if [ $? -ne 0 ] ; then
			echo 'file	netinet/ip_rules.c	ipfilter & ipfilter_compiled' >> files
		fi
	fi
fi
if [ $os = OpenBSD -a -f /sys/conf/files ] ; then
	cd /sys/conf
	if [ ! -f files.preipf4 ] ; then
		mv files files.preipf4
		cp -p files.preipf4 files
	fi
	if [ $fullrev -ge 030400 ] ; then
		for i in htable pool lookup; do
			grep ip_$i.c files >/dev/null 2>&1
			if [ $? -ne 0 ] ; then
				echo "file	netinet/ip_$i.c	ipfilter & ipfilter_lookup" >> files
			fi
		done
		grep ip_sync.c files >/dev/null 2>&1
		if [ $? -ne 0 ] ; then
			echo 'file	netinet/ip_sync.c	ipfilter & ipfilter_sync' >> files
		fi
		grep ip_scan.c files >/dev/null 2>&1
		if [ $? -ne 0 ] ; then
			echo 'file	netinet/ip_scan.c	ipfilter & ipfilter_scan' >> files
		fi
		grep ip_rules.c files >/dev/null 2>&1
		if [ $? -ne 0 ] ; then
			echo 'file	netinet/ip_rules.c	ipfilter & ipfilter_compiled' >> files
		fi
	fi
fi

if [ -f /usr/src/sys/modules/ipfilter/Makefile -a \
   ! -f /usr/src/sys/modules/ipfilter/Makefile.orig ] ; then
cat | (cd /usr/src/sys/modules/ipfilter; patch) <<__EOF__
*** Makefile.orig	Mon Mar 28 09:10:11 2005
--- Makefile	Mon Mar 28 09:12:51 2005
***************
*** 5,13 ****
  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
  
  .if !defined(NOINET6)
  CFLAGS+= -DUSE_INET6
  .endif
  CFLAGS+=  -I$${.CURDIR}/../../contrib/ipfilter
! CFLAGS+= -DIPFILTER=1 -DIPFILTER_LKM -DIPFILTER_LOG -DPFIL_HOOKS
--- 5,15 ----
  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 ip_lookup.c ip_pool.c ip_htable.c \\
! 	ip_sync.c ip_scan.c ip_rules.c
  
  .if !defined(NOINET6)
  CFLAGS+= -DUSE_INET6
  .endif
  CFLAGS+=  -I$${.CURDIR}/../../contrib/ipfilter
! CFLAGS+= -DIPFILTER=1 -DIPFILTER_LKM -DIPFILTER_LOG -DPFIL_HOOKS \\
! 	-DIPFILTER_LOOKUP -DIPFILTER_COMPILED
__EOF__
fi
@


1.1.1.6.2.1
log
@MFC: ipfilter 4.1.13
@
text
@a33 8
if [ ! -f ip_rules.c -o ! -f ip_rules.h ] ; then
	echo "Please do a build of ipfilter and then run the following"
	echo "command to build extra files:"
	echo
	echo "make ip_rules.c"
	exit 1
fi

@


1.1.1.6.2.2
log
@MFC IPFilter update from 4.1.13 to 4.1.28, including additional fixes applied
post 4.1.28 for FreeBSD.  See src/contrib/ipfilter/HISTORY for more details
of the bugs fixed, etc.
@
text
@d35 5
a39 9
	echo "Trying to build ip_rules.c and ip_rules.h"
	make ip_rules.c
	if [ ! -f ip_rules.c -o ! -f ip_rules.h ] ; then
		echo "Please do a build of ipfilter and then run the following"
		echo "command to build extra files:"
		echo
		echo "make ip_rules.c"
		exit 1
	fi
@


1.1.1.7
log
@Import IP Filter 4.1.10
@
text
@a33 8
if [ ! -f ip_rules.c -o ! -f ip_rules.h ] ; then
	echo "Please do a build of ipfilter and then run the following"
	echo "command to build extra files:"
	echo
	echo "make ip_rules.c"
	exit 1
fi

@


1.1.1.7.2.1
log
@MFC the following:
Apply a few changes from ipfilter-current:
* Do not hold any locks over calls to copyin/copyout.
* Clean up some #ifdefs
* fix a possible mbuf leak when NAT fails on policy routed packets

PR:		117216
Approved by:	re
@
text
@d35 5
a39 9
	echo "Trying to build ip_rules.c and ip_rules.h"
	make ip_rules.c
	if [ ! -f ip_rules.c -o ! -f ip_rules.h ] ; then
		echo "Please do a build of ipfilter and then run the following"
		echo "command to build extra files:"
		echo
		echo "make ip_rules.c"
		exit 1
	fi
@


1.1.1.8
log
@Import IPFilter 4.1.28
@
text
@d35 5
a39 9
	echo "Trying to build ip_rules.c and ip_rules.h"
	make ip_rules.c
	if [ ! -f ip_rules.c -o ! -f ip_rules.h ] ; then
		echo "Please do a build of ipfilter and then run the following"
		echo "command to build extra files:"
		echo
		echo "make ip_rules.c"
		exit 1
	fi
@


1.1.1.8.18.1
log
@file kupgrade was added on branch RELENG_8_4 on 2013-03-28 13:01:20 +0000
@
text
@d1 264
@


1.1.1.8.18.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 264
#!/bin/sh
#
PATH=/sbin:/usr/sbin:/bin:/usr/bin; export PATH
argv0=`basename $0`
 
os=`uname -s`
rev=`uname -r`
maj=`expr $rev : '\([0-9]*\)\.'`
min=`expr $rev : '[0-9]*\.\([0-9]*\)'`
sub=`expr $rev : '[0-9]*\.[0-9]*\.\([0-9]*\)'`

# try to bomb out fast if anything fails....
set -e

fullrev=`printf '%02d%02d%02d' $maj $min $sub`
dir=`pwd`
karch=`uname -m`
archdir="/sys/arch/$karch"
ipfdir=/sys/netinet
if [ -d /sys/contrib/ipfilter ] ; then
	ipfdir=/sys/contrib/ipfilter/netinet
fi
if [ -d /sys/dist/ipf ] ; then
	ipfdir=/sys/dist/ipf/netinet
fi
confdir="$archdir/conf"
if [ -f /dev/ipnat ] ; then
	major=`ls -l /dev/ipnat | sed -e 's/.* \([0-9]*\),.*/\1/'`
	echo "Major number for IP Filter is $major"
else
	major=x
fi
 
if [ ! -f ip_rules.c -o ! -f ip_rules.h ] ; then
	echo "Trying to build ip_rules.c and ip_rules.h"
	make ip_rules.c
	if [ ! -f ip_rules.c -o ! -f ip_rules.h ] ; then
		echo "Please do a build of ipfilter and then run the following"
		echo "command to build extra files:"
		echo
		echo "make ip_rules.c"
		exit 1
	fi
fi

echo -n "Installing "
for j in auth frag nat proxy scan state sync pool htable lookup rules; do
	for i in ip_$j.[ch]; do
		if [ -f "$i" ] ; then
			echo -n " $i"
			cp $i $ipfdir
			chmod 644 $ipfdir/$i
		fi
	done
done

case $os in
SunOS)
	case `uname -r` in
	5.*)
		filc=ip_fil_solaris.c
		;;
	4.*)
		filc=ip_fil_sunos.c
		;;
	esac
	;;
*BSD)
	filc=ip_fil_`echo $os | tr A-Z a-z`.c
	case $os in
	FreeBSD)
		cp mlfk_ipl.c $ipfdir/
		;;
	*)
		;;
	esac
	;;
esac

if [ -f $ipfdir/$filc ] ; then
	echo -n "$filc -> $ipfdir/$filc "
	cp $filc $ipfdir/$filc
	chmod 644 $ipfdir/$filc
fi
if [ -f $ipfdir/ip_fil.c ] ; then
	echo -n "$filc -> $ipfdir/ip_fil.c "
	cp $filc $ipfdir/ip_fil.c
	chmod 644 $ipfdir/ip_fil.c
fi

for i in ip_fil.h fil.c ip_log.c ip_compat.h ipl.h ip_*_pxy.c; do
	echo -n " $i"
	cp $i $ipfdir
	chmod 644 $ipfdir/$i
done
echo ""
echo -n "Installing into /usr/include/netinet"
for j in auth compat fil frag nat proxy scan state sync pool htable lookup; do
	i=ip_$j.h
	if [ -f "$i" ] ; then
		echo -n " $i"
		cp $i /usr/include/netinet/$i
		chmod 644 /usr/include/netinet/$i
	fi
done
for j in ipl.h; do
	if [ -f "$j" ] ; then
		echo -n " $j"
		cp $j /usr/include/netinet/$j
		chmod 644 /usr/include/netinet/$j
	fi
done
echo

if [ -f /sys/netinet/ip_fil_compat.h ] ; then
	echo "Linking /sys/netinet/ip_compat.h to /sys/netinet/ip_fil_compat.h"
	rm /sys/netinet/ip_fil_compat.h
	ln -s /sys/netinet/ip_compat.h /sys/netinet/ip_fil_compat.h
fi

if [ $major != x ] ; then
	if [ ! -e /dev/ipsync ] ; then
		echo "Creating /dev/ipsync"
		mknod /dev/ipsync c $major 4
	fi

	if [ ! -e /dev/ipsync ] ; then
		echo "Creating /dev/ipscan"
		mknod /dev/ipsync c $major 5
	fi

	if [ ! -e /dev/iplookup ] ; then
		echo "Creating /dev/iplookup"
		mknod /dev/iplookup c $major 6
	fi
fi

set +e
os=`uname -s`
if [ $os = FreeBSD -a -f /sys/conf/files ] ; then
	cd /sys/conf
	if [ -f options ] ; then
		if [ ! -f options.preipf4 ] ; then
			mv options options.preipf4
			cp -p options.preipf4 options
		fi
		for i in SCAN SYNC LOOKUP COMPILED; do
			grep IPFILTER_$i options >/dev/null 2>&1
			if [ $? -ne 0 ] ; then
				echo >> options
				echo "# extra option for IP Filter" >> options
				echo "IPFILTER_$i	opt_ipfilter.h" >> options
			fi
		done
	fi
	if [ ! -f files.preipf4 ] ; then
		mv files files.preipf4
		cp -p files.preipf4 files
	fi
	for i in htable pool lookup; do
		grep ip_$i.c files >/dev/null 2>&1
		if [ $? -ne 0 ] ; then
			echo "contrib/ipfilter/netinet/ip_$i.c	optional ipfilter inet ipfilter_lookup" >> files
		fi
	done
	grep ip_sync.c files >/dev/null 2>&1
	if [ $? -ne 0 ] ; then
		echo 'contrib/ipfilter/netinet/ip_sync.c	optional ipfilter inet ipfilter_sync' >> files
	fi
	grep ip_scan.c files >/dev/null 2>&1
	if [ $? -ne 0 ] ; then
		echo 'contrib/ipfilter/netinet/ip_scan.c	optional ipfilter inet ipfilter_scan' >> files
	fi
	grep ip_rules.c files >/dev/null 2>&1
	if [ $? -ne 0 ] ; then
		echo 'contrib/ipfilter/netinet/ip_rules.c	optional ipfilter inet ipfilter_compiled' >> files
	fi
fi
if [ $os = NetBSD -a -f /sys/conf/files ] ; then
	cd /sys/conf
	if [ ! -f files.preipf4 ] ; then
		mv files files.preipf4
		cp -p files.preipf4 files
	fi
	if [ $fullrev -ge 010600 -a $fullrev -lt 020000 ] ; then
		for i in htable pool lookup; do
			grep ip_$i.c files >/dev/null 2>&1
			if [ $? -ne 0 ] ; then
				echo "file	netinet/ip_$i.c	ipfilter & ipfilter_lookup" >> files
			fi
		done
		grep ip_sync.c files >/dev/null 2>&1
		if [ $? -ne 0 ] ; then
			echo 'file	netinet/ip_sync.c	ipfilter & ipfilter_sync' >> files
		fi
		grep ip_scan.c files >/dev/null 2>&1
		if [ $? -ne 0 ] ; then
			echo 'file	netinet/ip_scan.c	ipfilter & ipfilter_scan' >> files
		fi
		grep ip_rules.c files >/dev/null 2>&1
		if [ $? -ne 0 ] ; then
			echo 'file	netinet/ip_rules.c	ipfilter & ipfilter_compiled' >> files
		fi
	fi
fi
if [ $os = OpenBSD -a -f /sys/conf/files ] ; then
	cd /sys/conf
	if [ ! -f files.preipf4 ] ; then
		mv files files.preipf4
		cp -p files.preipf4 files
	fi
	if [ $fullrev -ge 030400 ] ; then
		for i in htable pool lookup; do
			grep ip_$i.c files >/dev/null 2>&1
			if [ $? -ne 0 ] ; then
				echo "file	netinet/ip_$i.c	ipfilter & ipfilter_lookup" >> files
			fi
		done
		grep ip_sync.c files >/dev/null 2>&1
		if [ $? -ne 0 ] ; then
			echo 'file	netinet/ip_sync.c	ipfilter & ipfilter_sync' >> files
		fi
		grep ip_scan.c files >/dev/null 2>&1
		if [ $? -ne 0 ] ; then
			echo 'file	netinet/ip_scan.c	ipfilter & ipfilter_scan' >> files
		fi
		grep ip_rules.c files >/dev/null 2>&1
		if [ $? -ne 0 ] ; then
			echo 'file	netinet/ip_rules.c	ipfilter & ipfilter_compiled' >> files
		fi
	fi
fi

if [ -f /usr/src/sys/modules/ipfilter/Makefile -a \
   ! -f /usr/src/sys/modules/ipfilter/Makefile.orig ] ; then
cat | (cd /usr/src/sys/modules/ipfilter; patch) <<__EOF__
*** Makefile.orig	Mon Mar 28 09:10:11 2005
--- Makefile	Mon Mar 28 09:12:51 2005
***************
*** 5,13 ****
  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
  
  .if !defined(NOINET6)
  CFLAGS+= -DUSE_INET6
  .endif
  CFLAGS+=  -I$${.CURDIR}/../../contrib/ipfilter
! CFLAGS+= -DIPFILTER=1 -DIPFILTER_LKM -DIPFILTER_LOG -DPFIL_HOOKS
--- 5,15 ----
  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 ip_lookup.c ip_pool.c ip_htable.c \\
! 	ip_sync.c ip_scan.c ip_rules.c
  
  .if !defined(NOINET6)
  CFLAGS+= -DUSE_INET6
  .endif
  CFLAGS+=  -I$${.CURDIR}/../../contrib/ipfilter
! CFLAGS+= -DIPFILTER=1 -DIPFILTER_LKM -DIPFILTER_LOG -DPFIL_HOOKS \\
! 	-DIPFILTER_LOOKUP -DIPFILTER_COMPILED
__EOF__
fi
exit 0
@


