Old version cleanout and version bump as per bug #75190

12 files changed, 18 insertions, 449 deletions

diff --git a/net-analyzer/ipac-ng/files/digest-ipac-ng-1.27_p1-r1 b/net-analyzer/ipac-ng/files/digest-ipac-ng-1.27_p1-r1
deleted file mode 100644
index 6b0ba9181e50..000000000000
--- a/net-analyzer/ipac-ng/files/digest-ipac-ng-1.27_p1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9ac8ded2b1690605017d41da04a7d90f ipac-ng-1.27pl1.tar.bz2 194433
diff --git a/net-analyzer/ipac-ng/files/digest-ipac-ng-1.27_p1-r2 b/net-analyzer/ipac-ng/files/digest-ipac-ng-1.27_p1-r2
deleted file mode 100644
index 6b0ba9181e50..000000000000
--- a/net-analyzer/ipac-ng/files/digest-ipac-ng-1.27_p1-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9ac8ded2b1690605017d41da04a7d90f ipac-ng-1.27pl1.tar.bz2 194433
diff --git a/net-analyzer/ipac-ng/files/digest-ipac-ng-1.31 b/net-analyzer/ipac-ng/files/digest-ipac-ng-1.31
new file mode 100644
index 000000000000..b1c81b970e22
--- /dev/null
+++ b/net-analyzer/ipac-ng/files/digest-ipac-ng-1.31
@@ -0,0 +1 @@
+MD5 f9ed8a729145ae613b3cdc518f1750e3 ipac-ng-1.31.tar.bz2 162843
diff --git a/net-analyzer/ipac-ng/files/ipac-ng-1.31-iptables.patch b/net-analyzer/ipac-ng/files/ipac-ng-1.31-iptables.patch
new file mode 100644
index 000000000000..23618cbcf3ef
--- /dev/null
+++ b/net-analyzer/ipac-ng/files/ipac-ng-1.31-iptables.patch
@@ -0,0 +1,17 @@
+--- agents/iptables/libiptc.c.orig	2005-01-09 16:40:43.944772856 +0930
++++ agents/iptables/libiptc.c	2005-01-09 16:41:02.042021656 +0930
+@@ -15,14 +15,6 @@
+ #define IPT_LIB_DIR "/lib/iptables"
+ #endif
+ 
+-#ifndef __OPTIMIZE__
+-STRUCT_ENTRY_TARGET *
+-GET_TARGET(STRUCT_ENTRY *e)
+-{
+-	return (void *)e + e->target_offset;
+-}
+-#endif
+-
+ static int sockfd = -1;
+ static void *iptc_fn = NULL;
+ 
diff --git a/net-analyzer/ipac-ng/files/ipac-ng.cron b/net-analyzer/ipac-ng/files/ipac-ng.cron
deleted file mode 100644
index 0070261ae7d0..000000000000
--- a/net-analyzer/ipac-ng/files/ipac-ng.cron
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipac-ng/files/ipac-ng.cron,v 1.2 2004/07/18 03:47:05 dragonheart Exp $
-
-FI=/usr/sbin/fetchipac
-
-if [ -x ${FI} ] && [ -f /var/run/ipac.rules ]; then 
-	${FI}
-fi
diff --git a/net-analyzer/ipac-ng/files/ipac-ng.cron.1.27_p1-r2 b/net-analyzer/ipac-ng/files/ipac-ng.cron.1.27_p1-r2
deleted file mode 100644
index 6ee55d392c89..000000000000
--- a/net-analyzer/ipac-ng/files/ipac-ng.cron.1.27_p1-r2
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipac-ng/files/ipac-ng.cron.1.27_p1-r2,v 1.2 2004/07/18 03:47:05 dragonheart Exp $
-
-FI=/usr/sbin/fetchipac
-
-if [ -x ${FI} ] && [ -f /var/run/ipac.rules ]; then 
-	${FI}
-fi
diff --git a/net-analyzer/ipac-ng/files/ipac-ng.rc b/net-analyzer/ipac-ng/files/ipac-ng.rc
deleted file mode 100644
index 2bb6453abe8f..000000000000
--- a/net-analyzer/ipac-ng/files/ipac-ng.rc
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipac-ng/files/ipac-ng.rc,v 1.3 2004/07/14 23:02:05 agriffis Exp $
-
-depend() {
-	need net logger
-}
-
-start() {
-	ebegin "Setting up ipac-ng iptables chains"
-	/usr/sbin/fetchipac -S
-	/usr/sbin/fetchipac
-	eend $?
-}
-
-stop() {
-	## fetch so we dont loose data
-	/usr/sbin/fetchipac
-
-	IPT=/sbin/iptables
-	ebegin "Removing ipac-ng iptables settings"
-
-	${IPT} -D INPUT -s 0/0 -d 0/0 -j ipac_in
-	${IPT} -D OUTPUT -s 0/0 -d 0/0 -j ipac_out
-	${IPT} -D FORWARD -s 0/0 -d 0/0 -j ipac_in
-	${IPT} -D FORWARD -s 0/0 -d 0/0 -j ipac_out
-	${IPT} -F ipac_in
-	${IPT} -F ipac_out
-	${IPT} -X ipac_in
-	${IPT} -X ipac_out
-
-	rm -f /var/run/ipac.rules /var/run/ipac.status
-
-	eend $?
-}
diff --git a/net-analyzer/ipac-ng/files/ipac-ng.rc.1.27_p1-r2 b/net-analyzer/ipac-ng/files/ipac-ng.rc.1.27_p1-r2
deleted file mode 100644
index 79f2a3773439..000000000000
--- a/net-analyzer/ipac-ng/files/ipac-ng.rc.1.27_p1-r2
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipac-ng/files/ipac-ng.rc.1.27_p1-r2,v 1.4 2004/07/27 08:50:13 eldad Exp $
-
-depend() {
-	need net logger
-}
-
-start() {
-	ebegin "Setting up ipac-ng iptables chains"
-	/usr/sbin/fetchipac -S
-	/usr/sbin/fetchipac
-	eend $?
-}
-
-stop() {
-	## fetch so we dont lose data
-	/usr/sbin/fetchipac
-
-	IPT=/sbin/iptables
-	ebegin "Removing ipac-ng iptables settings"
-
-	${IPT} -D INPUT -s 0/0 -d 0/0 -j ipac~o
-	${IPT} -D OUTPUT -s 0/0 -d 0/0 -j ipac~i
-	${IPT} -D FORWARD -s 0/0 -d 0/0 -j ipac~fi
-	${IPT} -D FORWARD -s 0/0 -d 0/0 -j ipac~fo
-	
-	${IPT} -F ipac~i
-	${IPT} -F ipac~o
-	${IPT} -F ipac~fi
-	${IPT} -F ipac~fo
-	
-	${IPT} -X ipac~i
-	${IPT} -X ipac~o
-	${IPT} -X ipac~fi
-	${IPT} -X ipac~fo
-
-	rm -f /var/run/ipac.rules /var/run/ipac.status
-
-	eend $?
-}
diff --git a/net-analyzer/ipac-ng/files/ipac.conf b/net-analyzer/ipac-ng/files/ipac.conf
deleted file mode 100644
index e7d7c591a7a0..000000000000
--- a/net-analyzer/ipac-ng/files/ipac.conf
+++ /dev/null
@@ -1,51 +0,0 @@
-# This is the main ipac-ng configuration file.  It contains the
-# configuration directives that give the ipac-ng its instructions.
-
-## mode of operations: operate only like old ipac or not
-## please note: you *should* specify YES, unless you are kaiser13 :)
-## note2: you are trying to use 'ugly flawed experimental dangerous mode' 
-##                             if you are using 'no', don't set it to no.
-classic mode = yes
-
-## specify access agent. supported are: files, postgre. files works with classic mode only
-# did you specify 'no' above? ok, here should be 'files' for you.
-access agent = files
-
-## accouting agent. iptables and ipchains available now. 
-#   (ipchains is not supported in nonclassic mode). does anybody still uses them?
-account agent = iptables
-
-## storage. gdbm, postgre and files supported. (files is not recommended)
-# postgre is the best & fastest method now.
-storage = gdbm
-
-
-# set the hostname, used to store\fetch\another work with database
-# get from hostname() if not specified here
-hostname = sibinet
-
-
-## rules file for classic mode
-rules file = /etc/ipac-ng/rules.conf
-
-## login all users at startup (specific only for nonclassic mode) (only those who has enough cash)
-# note: forget about this.
-#login at start = no
-
-## support for traffic passing to\from auth host (specific only for nonclassic mode)
-## name or ip of the auth host
-## disable support if not specified,
-# forget about this, too
-#auth host = sibinet.com
-
-# dont store lines contains only zeroes to speedup processing and to save space
-drop zero lines = yes
-
-# This parameters controls database location
-# left blank 'db host', 'db port' for local database
-# as now, both databasess (access and storage) configured by these parameters
-db host = localhost
-db name = ipac
-db user = root
-db port = 5432
-db pass = ""
diff --git a/net-analyzer/ipac-ng/files/ipac.conf.1.27_p1-r2 b/net-analyzer/ipac-ng/files/ipac.conf.1.27_p1-r2
deleted file mode 100644
index e7d7c591a7a0..000000000000
--- a/net-analyzer/ipac-ng/files/ipac.conf.1.27_p1-r2
+++ /dev/null
@@ -1,51 +0,0 @@
-# This is the main ipac-ng configuration file.  It contains the
-# configuration directives that give the ipac-ng its instructions.
-
-## mode of operations: operate only like old ipac or not
-## please note: you *should* specify YES, unless you are kaiser13 :)
-## note2: you are trying to use 'ugly flawed experimental dangerous mode' 
-##                             if you are using 'no', don't set it to no.
-classic mode = yes
-
-## specify access agent. supported are: files, postgre. files works with classic mode only
-# did you specify 'no' above? ok, here should be 'files' for you.
-access agent = files
-
-## accouting agent. iptables and ipchains available now. 
-#   (ipchains is not supported in nonclassic mode). does anybody still uses them?
-account agent = iptables
-
-## storage. gdbm, postgre and files supported. (files is not recommended)
-# postgre is the best & fastest method now.
-storage = gdbm
-
-
-# set the hostname, used to store\fetch\another work with database
-# get from hostname() if not specified here
-hostname = sibinet
-
-
-## rules file for classic mode
-rules file = /etc/ipac-ng/rules.conf
-
-## login all users at startup (specific only for nonclassic mode) (only those who has enough cash)
-# note: forget about this.
-#login at start = no
-
-## support for traffic passing to\from auth host (specific only for nonclassic mode)
-## name or ip of the auth host
-## disable support if not specified,
-# forget about this, too
-#auth host = sibinet.com
-
-# dont store lines contains only zeroes to speedup processing and to save space
-drop zero lines = yes
-
-# This parameters controls database location
-# left blank 'db host', 'db port' for local database
-# as now, both databasess (access and storage) configured by these parameters
-db host = localhost
-db name = ipac
-db user = root
-db port = 5432
-db pass = ""
diff --git a/net-analyzer/ipac-ng/files/rules.conf b/net-analyzer/ipac-ng/files/rules.conf
deleted file mode 100644
index 2ad55e680912..000000000000
--- a/net-analyzer/ipac-ng/files/rules.conf
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: rules.conf,v 1.2 2004/07/18 03:47:05 dragonheart Exp $
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipac-ng/files/rules.conf,v 1.2 2004/07/18 03:47:05 dragonheart Exp $
-
-# Example config file with accounting rules
-# Install as /etc/ipac-ng/ipac.conf
-#
-# Format:
-# Name of rule|direction|interface|protocol|source|destination
-#
-# where
-# Name of rule		Any string to identify this rule
-# direction		in | out
-# interface		ip number or interface name, '+' means all interfaces
-# protocol		tcp | udp | icmp | all
-# source		\
-# destination		both as described in ipfwadm(8), or empty
-
-# target                accept, deny, reject or none of that
-#
-# incoming:
-
-incoming all |in|eth+|all||
-incoming TCP |in|eth+|tcp||
-incoming UDP |in|eth+|udp||
-incoming ICMP |in|eth+|icmp||
-incoming local SSH |in|eth+|tcp||0/0 ssh
-
-#incoming smtp|in||tcp|0/0 smtp|
-#incoming nntp|in||tcp|0/0 nntp|
-#incoming samba|in|eth+|tcp||0/0 137 138 139
-#incoming samba|in|eth+|udp||0/0 137 138 139
-#incoming samba|in|eth+|tcp|0/0 137 138 139|
-#incoming samba|in|eth+|udp|0/0 137 138 139|
-#incoming http|in||tcp|0/0 http https 81 82 83 8080|
-#incoming ftp |in||tcp|0/0 ftp ftp-data|
-#incoming dns |in||udp|0/0 domain|
-
-#
-# Outgoing:
-outgoing all |out|eth+|all||
-outgoing TCP |out|eth+|tcp||
-outgoing UDP |out|eth+|udp||
-outgoing ICMP |out|eth+|icmp||
-outgoing local Webserver |out|eth+|tcp|0/0 http https|
-outgoing local SSH |out|eth+|tcp|0/0 ssh|
-
-#outgoing smtp|out||tcp||0/0 smtp
-#outgoing nntp|out||tcp||0/0 nntp
-#outgoing samba|out|eth+|tcp|0/0 137 138 139|
-#outgoing samba|out|eth+|udp|0/0 137 138 139|
-#outgoing samba|out|eth+|tcp||0/0 137 138 139
-#outgoing samba|out|eth+|udp||0/0 137 138 139
-#outgoing http|out||tcp||0/0 http https 81 82 83 8080
-#outgoing ftp |out||tcp||0/0 ftp ftp-data
-#outgoing dns |out||udp||0/0 domain
-#
diff --git a/net-analyzer/ipac-ng/files/rules.conf.1.27_p1-r2 b/net-analyzer/ipac-ng/files/rules.conf.1.27_p1-r2
deleted file mode 100644
index 7c4da7de00ac..000000000000
--- a/net-analyzer/ipac-ng/files/rules.conf.1.27_p1-r2
+++ /dev/null
@@ -1,195 +0,0 @@
-# Example config file with accounting rules
-# Install as /etc/ipac-ng/rules.conf.iptables
-#
-# Format:
-# Name of rule|direction|interface|protocol|source|destination
-# WARNING!!!! spaces are not allowed before and after '|'.
-#
-# where
-# Name of rule		Any string to identify this rule
-# direction		ipac~fi  - forward in
-#			ipac~fo  - forward out
-#			ipac~i   - outgoing from machine with ipac-ng to other host(/net)
-#					(or incoming to otherhost)
-#			ipac~o   - incoming to machine with ipac-ng
-#					(or outgoing from otherhost)
-#
-# interface		interface name, '+' means all interfaces (dont try to use ip numbers here!)
-# protocol		tcp | udp | icmp | all
-# source		\
-# destination		both as described in ipfwadm(8), or empty
-#
-# incoming:
-
-
-###
-###    W A R N I N G ! ! !
-###
-### Don't use symbols other than '0-9A-z[space]' in rules names. You may encounter 
-### some strange troubles.
-
-# lets demonstrate this by following rules.
-# Example 1:
-# there are some hosts in our net 192.168.0.0/24
-# our ipac-ng host has two interfaces - eth0 connected to local net
-#				    and eth1 to internet
-
-
-# lets count all traffic incoming to our net
-
-# forwarded from inet (0/0) to localnet (192.168.0.0/24)
-#incoming all to my net|ipac~fi||all||192.168.0.0/24
-
-# incoming to localnet from ipac-ng host (specify ipac-ng ip's here, to avoid
-#					doubling forwarded traffic when using NAT)
-#incoming all to my net|ipac~i||all|192.168.0.1|192.168.0.0/24
-
-
-# same for outgoing:
-#outgoing all from my net|ipac~fo||all|192.168.0.0/24|
-#outgoing all from my net|ipac~o||all|192.168.0.0/24|192.168.0.1
-
-
-
-# and now we want to know, how much there is traffic to our ipac host from inet
-#incoming inet to ipac host|ipac~o|eth1|all||
-
-# same for outgoing for this host
-#outgoing inet from ipac host|ipac~i|eth1|all||
-
-# please note, that chains 'ipac~i' and 'ipac~o' are reversed for the host with ipac
-
-# wanna count traffic to squid that resides on the host with ipac-ng? here you are :)
-#incoming to squid|ipac~o|eth1|all|0/0 80 81 82 83 8080|
-# sure, this rule is only valid in the case when you don't eat traffic from these ports
-# by hopping on the web from ipac-ng host (maybe you like to use links :)
-
-# our net is using squid heavily, let's count them all together:
-#outgoing from squid to mynet|ipac~i||all|192.168.0.1 squid|192.168.0.0/24
-
-
-# now lets count traffic for hosts mary (192.168.0.12) and fred (192.168.0.13)
-
-# incoming:
-#incoming all to mary|ipac~fi||all||192.168.0.12
-#incoming all to mary|ipac~i||all|192.168.0.1|192.168.0.12
-
-# and outgoing:
-#outgoing all from mary|ipac~fo||all|192.168.0.12|
-#outgoing all from mary|ipac~o||all|192.168.0.12|192.168.0.1
-
-
-# same for fred
-# incoming:
-#incoming all to mary|ipac~fi||all||192.168.0.13
-#incoming all to mary|ipac~i||all|192.168.0.1|192.168.0.13
-
-# and outgoing:
-#outgoing all from fred|ipac~fo||all|192.168.0.13|
-#outgoing all from fred|ipac~o||all|192.168.0.13|192.168.0.1
-
-
-# we also wants http and ssh traffic statistics
-
-# http incoming
-#incoming http to my net|ipac~fi||all|0/0 http squid 8080|192.168.0.0/24
-#incoming http to my net|ipac~i||all|192.168.0.1 http squid|192.168.0.0/24
-# please note, that the last rule includes rule 'outgoing from squid to mynet'
-
-
-# outgoing:
-#outgoing http from my net|ipac~fo||all|192.168.0.0/24|0/0 http squid 8080
-#outgoing http from my net|ipac~o||all|192.168.0.0/24|192.168.0.1 http squid
-
-
-# ssh incoming
-#incoming ssh to my net|ipac~fi||all|0/0 ssh|192.168.0.0/24
-#incoming ssh to my net|ipac~i||all|192.168.0.1 ssh|192.168.0.0/24
-
-# outgoing:
-#outgoing ssh from my net|ipac~fo||all|192.168.0.0/24|0/0 ssh
-#outgoing ssh from my net|ipac~o||all|192.168.0.0/24|192.168.0.1 ssh
-
-
-# there is somenet of our friend. we wanna know how much traffic it generates
-# note: that net cidrs is contained in CONFIGDIR (/etc/ipac-ng by default) 
-#						'friendnet' file
-
-#incoming from somenet to mynet|ipac~fi||all||@/friendnet@in_some_to_my~fi
-# first field here ('incoming from somenet to mynet') contains rule name.
-# you'll see all statistics under this name 
-# other fields are same as above but now we are interested in the last one -
-#						@/frendnet@in_some_to_my~fi
-# 'friendnet' represents file with cidr's of that net, one in a line
-# 'in_some_to_my' represents chains name that will be created. there is no sense
-#	for ipac-ng of that name. but it may be usefull for you to give 
-#					"speaking" name to that chain
-
-# same for outgoing
-#outgoing to somenet from mynet|ipac~fo||all|@/friendnet@out_some_to_my~fo|
-
-# denote absense of rules targetted to 'ipac~i' and 'ipac~o'
-# we just don't want to count traffic from\to our ipac-ng host to\from friendnet
-
-# and now we want to count traffic to our other net 192.168.1.0/24 for every host
-# lets separate /24 subnet to some smaller ones to lower latence. /26 for e.g.
-#%chain% incoming to othernet0~fi|ipac~fi||all||192.168.1.0/26
-#%chain% incoming to othernet1~fi|ipac~fi||all||192.168.1.64/26
-#%chain% incoming to othernet2~fi|ipac~fi||all||192.168.1.128/26
-#%chain% incoming to othernet3~fi|ipac~fi||all||192.168.1.192/26
-
-#%chain% outgoing from othernet0~fo|ipac~fo||all|192.168.1.0/26|
-#%chain% outgoing from othernet1~fo|ipac~fo||all|192.168.1.64/26|
-#%chain% outgoing from othernet2~fo|ipac~fo||all|192.168.1.128/26|
-#%chain% outgoing from othernet3~fo|ipac~fo||all|192.168.1.192/26|
-
-# and every single host follows
-#incoming to 192.168.1.2|incoming to othernet0~fi||all||192.168.1.2
-#incoming to 192.168.1.3|incoming to othernet0~fi||all||192.168.1.3
-#incoming to 192.168.1.4|incoming to othernet0~fi||all||192.168.1.4
-#
-# and so on :)
-#incoming to 192.168.1.63|incoming to othernet0~fi||all||192.168.1.63
-
-# same for outgoing 
-#outgoing from 192.168.1.2|outgoing from othernet0~fo||all|192.168.1.2|
-#outgoing from 192.168.1.3|outgoing from othernet0~fo||all|192.168.1.3|
-#outgoing from 192.168.1.4|outgoing from othernet0~fo||all|192.168.1.4|
-
-# and the last
-#outgoing from 192.168.1.63|outgoing from othernet0~fo||all|192.168.1.63|
-
-# repeat for other chains and hosts
-
-#incoming to 192.168.1.64|incoming to othernet1~fi||all||192.168.1.64
-#incoming to 192.168.1.65|incoming to othernet1~fi||all||192.168.1.65
-#incoming to 192.168.1.66|incoming to othernet1~fi||all||192.168.1.66
-
-# and so on :)
-#incoming to 192.168.1.127|incoming to othernet1~fi||all||192.168.1.127
-
-# same for outgoing 
-#outgoing from 192.168.1.64|outgoing from othernet1~fo||all|192.168.1.64|
-#outgoing from 192.168.1.65|outgoing from othernet1~fo||all|192.168.1.65|
-#outgoing from 192.168.1.66|outgoing from othernet1~fo||all|192.168.1.66|
-
-# and the last
-#outgoing from 192.168.1.127|outgoing from othernet1~fo||all|192.168.1.127|
-
-# and so on :)
-
-# please note that chain names must ends with one of: '~i', '~o', '~fi' or '~fo'
-# which one is necessary is defined by the parent chain.
-
-
-##############################
-#just a simple example
-#note that outgoing from this host is ipac~i
-#and incoming is ipac~o
-
-outgoing eth0|ipac~i|eth0|all||
-incoming eth0|ipac~o|eth0|all||
-traffic eth0|ipac~i|eth0|all||
-traffic eth0|ipac~o|eth0|all||
-
-