[ipfilter-cvs] ipfilter/BSD kupgrade, upgrade,

[Darren <dar...@us...>]

Update of /cvsroot/ipfilter/ipfilter/BSD
In directory vz-cvs-4.sog:/tmp/cvs-serv32028/BSD

Modified Files:
	kupgrade upgrade 
Log Message:
3546261 scripts for updating BSD environment out of date

Index: kupgrade
===================================================================
RCS file: /cvsroot/ipfilter/ipfilter/BSD/kupgrade,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** kupgrade	26 Feb 2010 09:34:32 -0000	1.9
--- kupgrade	20 Jul 2012 08:44:08 -0000	1.10
***************
*** 57,64 ****
  done
  echo -n " net/radix_ipf.h"
! cp net/radix_ipf.h $ipfdir/../net
! chmod 644 $ipfdir/../net/radix_ipf.h
! echo -n " radix.c -> $ipfdir/radix_ipf.c"
! cp radix.c $ipfdir/radix_ipf.c
  chmod 644 $ipfdir/radix_ipf.c
  
--- 57,64 ----
  done
  echo -n " net/radix_ipf.h"
! cp radix_ipf.h $ipfdir
! chmod 644 $ipfdir/radix_ipf.h
! echo -n " radix_ipf.c -> $ipfdir/radix_ipf.c"
! cp radix_ipf.c $ipfdir/radix_ipf.c
  chmod 644 $ipfdir/radix_ipf.c
  
***************
*** 98,102 ****
  
  for i in ip_nat6.c ip_fil.h fil.c ip_log.c ip_compat.h ipl.h ip_*_pxy.c \
! 	 ip_fil_compat.c; do
  	echo -n " $i"
  	cp $i $ipfdir
--- 98,102 ----
  
  for i in ip_nat6.c ip_fil.h fil.c ip_log.c ip_compat.h ipl.h ip_*_pxy.c \
! 	 ip_fil_compat.c ipf_rb.h; do
  	echo -n " $i"
  	cp $i $ipfdir
***************
*** 114,118 ****
  	fi
  done
! for j in ipl.h; do
  	if [ -f "$j" ] ; then
  		echo -n " $j"
--- 114,118 ----
  	fi
  done
! for j in ipl.h ipf_rb.h; do
  	if [ -f "$j" ] ; then
  		echo -n " $j"

Index: upgrade
===================================================================
RCS file: /cvsroot/ipfilter/ipfilter/BSD/upgrade,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** upgrade	29 May 2012 13:35:25 -0000	1.1
--- upgrade	20 Jul 2012 08:44:08 -0000	1.2
***************
*** 22,31 ****
  set -e
  
  for i in ipf ipfstat ipmon ipnat ippool; do
! 	if [ ! -f /sbin/${i}.dist ] ; then
  		mv /sbin/${i} /sbin/${i}.dist
  		cp -p /sbin/${i}.dist /sbin/${i}
  	fi
- 	cp ${objdir}/${i} /sbin/
  done
  if [ -f /boot/kernel/ipl.ko ] ; then
--- 22,51 ----
  set -e
  
+ if [ "$1" = "backout" ] ; then
+ 	for i in ipf ipfstat ipmon ipnat ippool; do
+ 		if [ -f /sbin/${i}.dist ] ; then
+ 			mv /sbin/${i}.dist /sbin/${i}
+ 		else
+ 			mv /usr/sbin/${i}.dist /usr/sbin/${i}
+ 		fi
+ 	done
+ 	if [ -f /boot/kernel/ipl.ko ] ; then
+ 		mv /boot/kernel/ipl.ko.dist /boot/kernel/ipl.ko
+ 		mv /boot/kernel/ipl.ko.symbols.dist /boot/kernel/ipl.ko.symbols
+ 	fi
+ 	exit 0
+ fi
+ 
  for i in ipf ipfstat ipmon ipnat ippool; do
! 	if [ ! -f /sbin/${i}.dist -a -f /sbin/${i} ] ; then
  		mv /sbin/${i} /sbin/${i}.dist
  		cp -p /sbin/${i}.dist /sbin/${i}
+ 		cp ${objdir}/${i} /sbin/
+ 	fi
+ 	if [ ! -f /usr/sbin/${i}.dist -a -f /usr/sbin/${i} ] ; then
+ 		mv /usr/sbin/${i} /usr/sbin/${i}.dist
+ 		cp -p /usr/sbin/${i}.dist /usr/sbin/${i}
+ 		cp ${objdir}/${i} /usr/sbin/
  	fi
  done
  if [ -f /boot/kernel/ipl.ko ] ; then