Old version cleanout and version bump as per bug #75190

17 files changed, 86 insertions, 558 deletions

diff --git a/net-analyzer/ipac-ng/ChangeLog b/net-analyzer/ipac-ng/ChangeLog
index 95f369723dce..d3f81b62256e 100644
--- a/net-analyzer/ipac-ng/ChangeLog
+++ b/net-analyzer/ipac-ng/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-analyzer/ipac-ng
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipac-ng/ChangeLog,v 1.12 2004/10/11 23:44:03 eldad Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipac-ng/ChangeLog,v 1.13 2005/01/09 07:24:00 dragonheart Exp $
+
+*ipac-ng-1.31 (09 Jan 2005)
+
+  09 Jan 2005; Daniel Black <dragonheart@gentoo.org> -files/ipac-ng.cron,
+  -files/ipac-ng.cron.1.27_p1-r2, -files/ipac-ng.rc,
+  -files/ipac-ng.rc.1.27_p1-r2, -files/ipac.conf, -files/ipac.conf.1.27_p1-r2,
+  -files/rules.conf, -files/rules.conf.1.27_p1-r2, -ipac-ng-1.27_p1-r1.ebuild,
+  -ipac-ng-1.27_p1-r2.ebuild, +ipac-ng-1.31.ebuild, +
+  /files/ipac-ng-1.31-iptables.patch:
+  Old version cleanout and version bump as per bug #75190. Thanks to Vanquirius
+  <marcelogoes@gmail.com> for the bug report.
 
   12 Oct 2004; Eldad Zack <eldad@gentoo.org> files/rules.conf.1.30,
   ipac-ng-1.30.ebuild:
diff --git a/net-analyzer/ipac-ng/Manifest b/net-analyzer/ipac-ng/Manifest
index 5badc1a5c676..4626ce117216 100644
--- a/net-analyzer/ipac-ng/Manifest
+++ b/net-analyzer/ipac-ng/Manifest
@@ -1,30 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 fdb9f48256d3c23cb85c9ecc714313ef ipac-ng-1.27_p1-r1.ebuild 1858
-MD5 27044a703afba49611b520883bfae77b ipac-ng-1.30.ebuild 2446
-MD5 1464b4d70477fe8b0e77a41beb31470e ipac-ng-1.27_p1-r2.ebuild 2235
-MD5 79ffeb97263460e9cfeaf85e4439c553 ChangeLog 2181
+MD5 bff3eda54cc832b0d649cc926cfe631b ChangeLog 2720
 MD5 d21717f5748c9774708f37fd538eca26 metadata.xml 286
-MD5 6cf010319bfd4122f663973e2cfa7d12 files/ipac-ng.cron 217
-MD5 6329656330d06c7467a8d624b6b251ed files/ipac.conf.1.27_p1-r2 1817
-MD5 6329656330d06c7467a8d624b6b251ed files/ipac.conf 1817
-MD5 aff4fe032f6693f676350c45e7e78261 files/ipac.conf.1.30 1820
-MD5 ac210e9fd37f1a10dc14dd5e32df8170 files/digest-ipac-ng-1.27_p1-r1 68
-MD5 ac210e9fd37f1a10dc14dd5e32df8170 files/digest-ipac-ng-1.27_p1-r2 68
-MD5 86c93e1db547d4504d6dd3557c776d97 files/rules.conf 1812
-MD5 7162c7dc1c32393afef0e407b670497f files/ipac-ng.rc 826
-MD5 30eede3787938f83e39fde04bc1f1e68 files/ipac-ng.cron.1.27_p1-r2 228
+MD5 aee1a48f97b4806719b17d15a98c1d16 ipac-ng-1.30.ebuild 2452
+MD5 e6b7ee619949c4a6a68686be7ea3e6ab ipac-ng-1.31.ebuild 2602
+MD5 39c34f5fc4e8f1edc81459ec0895f59d files/digest-ipac-ng-1.31 65
+MD5 b2016c3272e9dd9c2b48238bb07efa3a files/ipac-ng-1.31-iptables.patch 389
 MD5 c6fde5842858e98a063e78223644e191 files/digest-ipac-ng-1.30 65
-MD5 ab5c80151c9f64ea83835a906ead314d files/ipac-ng.rc.1.27_p1-r2 903
 MD5 72162ed7957cc82168b4870d26cf66fe files/ipac-ng.cron.1.30 216
-MD5 dba879e7b8ccdcae27d64ceb4ba54f9b files/rules.conf.1.30 1046
 MD5 983ee78164ba492b7bc558418adb0739 files/ipac-ng.rc.1.30 897
-MD5 3b1a7de81326927d709b5691ec799683 files/rules.conf.1.27_p1-r2 7074
+MD5 aff4fe032f6693f676350c45e7e78261 files/ipac.conf.1.30 1820
+MD5 dba879e7b8ccdcae27d64ceb4ba54f9b files/rules.conf.1.30 1046
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFBaxqnT+MN7JbqCpMRAhxPAJwL0BU4OspZaIhpdgYSp9i3otDyQgCfVoW6
-Z7og5VhAvTvxdsnTeG399cs=
-=bxpN
+iD8DBQFB4NwWmdTrptrqvGERAr7ZAJ4unDzYdq4b9OEN/tnsx39fo3LuzACfVg7W
+m96kptY5MCVMtKKyS11PeGk=
+=aiy1
 -----END PGP SIGNATURE-----
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||
-
-
diff --git a/net-analyzer/ipac-ng/ipac-ng-1.27_p1-r1.ebuild b/net-analyzer/ipac-ng/ipac-ng-1.27_p1-r1.ebuild
deleted file mode 100644
index bcfc8ea9aa3f..000000000000
--- a/net-analyzer/ipac-ng/ipac-ng-1.27_p1-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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/ipac-ng-1.27_p1-r1.ebuild,v 1.3 2004/07/01 19:52:45 squinky86 Exp $
-
-DESCRIPTION="ip accounting suite for 2.4 series kernels with PNG image output like mrtg"
-HOMEPAGE="http://sourceforge.net/projects/ipac-ng/"
-SRC_URI="mirror://sourceforge/ipac-ng/${P/_p/pl}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="gd"
-
-DEPEND="sys-devel/bison
-	sys-devel/flex
-	dev-lang/perl
-	sys-libs/gdbm
-	gd? ( dev-perl/GD )
-	sys-devel/flex
-	virtual/libc"
-RDEPEND="net-firewall/iptables
-	virtual/cron
-	dev-lang/perl
-	sys-libs/gdbm
-	gd? ( dev-perl/GD )
-	virtual/libc"
-
-S=${WORKDIR}/${P/_p*}
-
-src_compile() {
-	econf \
-		--enable-default-storage=gdbm \
-		--enable-default-agent=iptables \
-		|| die "./configure failed"
-	emake -j1 || die "make failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-
-	dodir /var/lib/ipac
-
-	insinto /etc/ipac-ng
-	doins ${FILESDIR}/{ipac,rules}.conf
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/ipac-ng.rc ipac-ng
-
-	exeinto /etc/cron.hourly
-	newexe ${FILESDIR}/ipac-ng.cron ipac-ng
-
-	dodoc  COPYING README* TODO UPDATE* CHANGES
-}
-
-pkg_postinst() {
-	einfo "W A R N I N G !"
-	einfo "do not use \"/etc/init.d/iptables save\" when ipac-ng is running!"
-	einfo "this WILL cause problems!"
-	einfo "ipac-ng should be started AFTER iptables and shut down BEFORE iptables"
-	einfo "the accounting database is at /var/lib/ipac"
-	einfo "use /usr/sbin/ipacsum to get your ip acounting data"
-	einfo "use /usr/sbin/fetchipac to update the accounting at any time"
-	einfo "fetchipac is run by cron every hour by /etc/cron.daily/ipac-ng"
-	einfo "after you changed ipac.conf you have to run \"fetchipac -S\" or"
-	einfo "stop/start the service so your iptables gets updated"
-}
diff --git a/net-analyzer/ipac-ng/ipac-ng-1.30.ebuild b/net-analyzer/ipac-ng/ipac-ng-1.30.ebuild
index 036857638853..d74419748eba 100644
--- a/net-analyzer/ipac-ng/ipac-ng-1.30.ebuild
+++ b/net-analyzer/ipac-ng/ipac-ng-1.30.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipac-ng/ipac-ng-1.30.ebuild,v 1.4 2004/08/24 10:56:49 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipac-ng/ipac-ng-1.30.ebuild,v 1.5 2005/01/09 07:24:00 dragonheart Exp $
 
 DESCRIPTION="ip accounting suite for 2.4 and 2.6 series kernels with text and PNG image output like mrtg"
 HOMEPAGE="http://sourceforge.net/projects/ipac-ng/"
diff --git a/net-analyzer/ipac-ng/ipac-ng-1.27_p1-r2.ebuild b/net-analyzer/ipac-ng/ipac-ng-1.31.ebuild
index 133583bd2bbf..e949ab69cc5a 100644
--- a/net-analyzer/ipac-ng/ipac-ng-1.27_p1-r2.ebuild
+++ b/net-analyzer/ipac-ng/ipac-ng-1.31.ebuild
@@ -1,66 +1,88 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipac-ng/ipac-ng-1.27_p1-r2.ebuild,v 1.4 2004/07/11 10:15:48 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipac-ng/ipac-ng-1.31.ebuild,v 1.1 2005/01/09 07:24:00 dragonheart Exp $
+
+inherit eutils
 
 DESCRIPTION="ip accounting suite for 2.4 and 2.6 series kernels with text and PNG image output like mrtg"
 HOMEPAGE="http://sourceforge.net/projects/ipac-ng/"
-SRC_URI="mirror://sourceforge/ipac-ng/${P/_p/pl}.tar.bz2"
+SRC_URI="mirror://sourceforge/ipac-ng/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
-IUSE="gd"
+KEYWORDS="~x86"
+IUSE="gd sqlite"
 
 DEPEND="sys-devel/bison
 	sys-devel/flex
 	dev-lang/perl
-	sys-libs/gdbm
 	gd? ( dev-perl/GD )
+	sqlite? ( =dev-db/sqlite-2* )
+	!sqlite? ( sys-libs/gdbm )
 	sys-devel/flex
 	virtual/libc"
 RDEPEND="net-firewall/iptables
 	virtual/cron
 	dev-lang/perl
-	sys-libs/gdbm
 	gd? ( dev-perl/GD )
+	sqlite? ( =dev-db/sqlite-2* )
+	!sqlite? ( sys-libs/gdbm )
 	virtual/libc"
 
-S=${WORKDIR}/${P/_p*}
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-iptables.patch || die "patch failed"
+}
 
 src_compile() {
-	econf \
-		--enable-default-storage=gdbm \
+	local myconf
+
+	if use sqlite; then
+		myconf="--enable-default-storage=sqlite";
+	else
+		myconf="--enable-default-storage=gdbm";
+	fi
+
+	econf ${myconf} \
 		--enable-default-agent=iptables \
 		--enable-default-access=files \
 		--enable-classic=yes \
 		|| die "./configure failed"
+
 	emake -j1 || die "make failed"
 }
 
+src_test() {
+	einfo "self test is broken"
+}
+
 src_install() {
 	make DESTDIR=${D} install || die "make install failed"
 
 	dodir /var/lib/ipac
 
 	insinto /etc/ipac-ng
-	newins ${FILESDIR}/ipac.conf.${PVR} ipac.conf
-	newins ${FILESDIR}/rules.conf.${PVR} rules.conf
+	newins ${FILESDIR}/ipac.conf.1.30 ipac.conf
+	newins ${FILESDIR}/rules.conf.1.30 rules.conf
 
 	exeinto /etc/init.d
-	newexe ${FILESDIR}/ipac-ng.rc.${PVR} ipac-ng
+	newexe ${FILESDIR}/ipac-ng.rc.1.30 ipac-ng
 
 	exeinto /etc/cron.hourly
-	newexe ${FILESDIR}/ipac-ng.cron.${PVR} ipac-ng
+	newexe ${FILESDIR}/ipac-ng.cron.1.30 ipac-ng
 
-	dodoc  COPYING README* TODO UPDATE* CHANGES
+	dodoc README TODO doc/* CHANGELOG
 }
 
 pkg_postinst() {
-	einfo "W A R N I N G !"
-	einfo "do not use \"/etc/init.d/iptables save\" when ipac-ng is running!"
-	einfo "this WILL save ipac rules and can cause problems!"
-	einfo "ipac-ng should be started AFTER iptables and shut down BEFORE iptables"
-	einfo "use /etc/init.d/iptables save only when ipac rules are removed!"
+	ewarn ""
+	ewarn "                         W A R N I N G !"
+	ewarn "do not use \"/etc/init.d/iptables save\" when ipac-ng is running!"
+	ewarn "this WILL save ipac rules and can cause problems!"
+	ewarn "ipac-ng should be started AFTER iptables and shut down BEFORE iptables"
+	ewarn "use /etc/init.d/iptables save only when ipac rules are removed!"
+	ewarn ""
 	einfo "the accounting database is at /var/lib/ipac"
 	einfo "use /usr/sbin/ipacsum to get your ip acounting data"
 	einfo "use /usr/sbin/fetchipac to update the accounting at any time"