[Ipcop-svn] SF.net SVN: ipcop: [1136] ipcop/trunk

[<ow...@us...>]

Revision: 1136
          http://ipcop.svn.sourceforge.net/ipcop/?rev=1136&view=rev
Author:   owes
Date:     2008-02-21 11:07:13 -0800 (Thu, 21 Feb 2008)

Log Message:
-----------
Remove ipac-ng from build & ISO.

ipac-ng is broken with current iptables and looks unsupported.
Maybe some day we find fix or alternative...

Modified Paths:
--------------
    ipcop/trunk/config/cron/crontab
    ipcop/trunk/config/rc.d/rc.netaddress.up
    ipcop/trunk/config/rc.d/rc.updatered
    ipcop/trunk/config/rootfiles/common/ipac-ng
    ipcop/trunk/make.sh

Modified: ipcop/trunk/config/cron/crontab
===================================================================
--- ipcop/trunk/config/cron/crontab	2008-02-21 18:50:27 UTC (rev 1135)
+++ ipcop/trunk/config/cron/crontab	2008-02-21 19:07:13 UTC (rev 1136)
@@ -17,10 +17,11 @@
 # Backup logs to flashdisk
 30 * * * *	[ -f "/FLASH" ] && /etc/rc.d/rc.flash.down
 
+# ipac is broken with current iptables
 # Summarize ip accounting info:
-2 1 * * * 	/usr/sbin/ipacsum -r -H `/bin/hostname` -t "the day 2 days ago" >/dev/null
-3 1 * * 0 	/usr/sbin/ipacsum -r -H `/bin/hostname` -t "the week 4 weeks ago" >/dev/null
-4 1 1 2 * 	/usr/sbin/ipacsum -r -H `/bin/hostname` -t "the year 2 years ago" >/dev/null
+#2 1 * * * 	/usr/sbin/ipacsum -r -H `/bin/hostname` -t "the day 2 days ago" >/dev/null
+#3 1 * * 0 	/usr/sbin/ipacsum -r -H `/bin/hostname` -t "the week 4 weeks ago" >/dev/null
+#4 1 1 2 * 	/usr/sbin/ipacsum -r -H `/bin/hostname` -t "the year 2 years ago" >/dev/null
 
 # Make some nice graphs
 */5 * * * * 	/usr/local/bin/makegraphs >/dev/null

Modified: ipcop/trunk/config/rc.d/rc.netaddress.up
===================================================================
--- ipcop/trunk/config/rc.d/rc.netaddress.up	2008-02-21 18:50:27 UTC (rev 1135)
+++ ipcop/trunk/config/rc.d/rc.netaddress.up	2008-02-21 19:07:13 UTC (rev 1136)
@@ -11,9 +11,10 @@
 /etc/rc.d/rc.firewall start
 # echo "Setting IPCOP DMZ pinholes"
 # /usr/local/bin/setdmzholes
-echo "Setting up IP Accounting"
-/etc/rc.d/helper/writeipac.pl
-/usr/sbin/fetchipac -S
+# ipac is broken with current iptables
+#echo "Setting up IP Accounting"
+#/etc/rc.d/helper/writeipac.pl
+#/usr/sbin/fetchipac -S
 
 echo "Bringing network up"
 

Modified: ipcop/trunk/config/rc.d/rc.updatered
===================================================================
--- ipcop/trunk/config/rc.d/rc.updatered	2008-02-21 18:50:27 UTC (rev 1135)
+++ ipcop/trunk/config/rc.d/rc.updatered	2008-02-21 19:07:13 UTC (rev 1136)
@@ -139,8 +139,9 @@
 	if [ "$ENABLE" == "on" ]; then
 		/usr/local/bin/restartshaping
 	fi
-	/etc/rc.d/helper/writeipac.pl
-	/usr/sbin/fetchipac -S
+# ipac is broken with current iptables
+#	/etc/rc.d/helper/writeipac.pl
+#	/usr/sbin/fetchipac -S
 else
 	/usr/local/bin/ipsecctrl D
 	/etc/rc.d/rc.firewall reload

Modified: ipcop/trunk/config/rootfiles/common/ipac-ng
===================================================================
--- ipcop/trunk/config/rootfiles/common/ipac-ng	2008-02-21 18:50:27 UTC (rev 1135)
+++ ipcop/trunk/config/rootfiles/common/ipac-ng	2008-02-21 19:07:13 UTC (rev 1136)
@@ -1,13 +1,13 @@
 ## ipac-ng-1.31
 ##
-bin/mail
+#bin/mail
 #etc/ipac-ng
-etc/ipac-ng/ipac.conf
-etc/ipac-ng/rules.conf
-usr/sbin/fetchipac
+#etc/ipac-ng/ipac.conf
+#etc/ipac-ng/rules.conf
+#usr/sbin/fetchipac
 #usr/sbin/ipac-convert
-usr/sbin/ipacsum
+#usr/sbin/ipacsum
 #usr/share/man/man8/fetchipac.8
 #usr/share/man/man8/ipac-convert.8
 #usr/share/man/man8/ipacsum.8
-var/log/ip-acct
+#var/log/ip-acct

Modified: ipcop/trunk/make.sh
===================================================================
--- ipcop/trunk/make.sh	2008-02-21 18:50:27 UTC (rev 1135)
+++ ipcop/trunk/make.sh	2008-02-21 19:07:13 UTC (rev 1136)
@@ -1752,7 +1752,7 @@
 	chroot_make ibod
 	chroot_make initscripts
 	chroot_make iptables
-	chroot_make ipac-ng
+	#chroot_make ipac-ng		# DEBUG -- broken with current iptables
 	#chroot_make iptstate		# DEBUG -- wants libnetfilter and libstdc++
 	chroot_make iftop
 	chroot_make iputils


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.