[ipfilter-cvs] ipfilter/BSD kupgrade, v5-1-RELEASE upgrade, v5-1-RELEASE
Brought to you by:
darren_r
From: Darren <dar...@us...> - 2012-07-20 08:44:19
|
Update of /cvsroot/ipfilter/ipfilter/BSD In directory vz-cvs-4.sog:/tmp/cvs-serv32039/BSD Modified Files: Tag: v5-1-RELEASE 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.8.2.1 retrieving revision 1.8.2.2 diff -C2 -d -r1.8.2.1 -r1.8.2.2 *** kupgrade 26 Feb 2010 09:34:18 -0000 1.8.2.1 --- kupgrade 20 Jul 2012 08:44:17 -0000 1.8.2.2 *************** *** 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.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** upgrade 29 May 2012 13:35:35 -0000 1.1.2.2 --- upgrade 20 Jul 2012 08:44:17 -0000 1.1.2.3 *************** *** 23,31 **** 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 --- 23,36 ---- 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 |