Using patch from Ubuntu, attempting to fix problem with iptables-1.3.x. This should fix bug 93915. 1.31-r2 is in package.mask at the moment.

(Portage version: 2.1_pre1)

4 files changed, 110 insertions, 5 deletions

diff --git a/net-analyzer/ipac-ng/ChangeLog b/net-analyzer/ipac-ng/ChangeLog
index a4c7aa8f2599..05752a7eb85c 100644
--- a/net-analyzer/ipac-ng/ChangeLog
+++ b/net-analyzer/ipac-ng/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/ipac-ng
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipac-ng/ChangeLog,v 1.19 2005/10/01 19:12:50 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipac-ng/ChangeLog,v 1.20 2005/12/25 21:44:43 vanquirius Exp $
+
+*ipac-ng-1.31-r2 (25 Dec 2005)
+
+  25 Dec 2005; Marcelo Goes <vanquirius@gentoo.org> +ipac-ng-1.31-r2.ebuild:
+  Using patch from Ubuntu, attempting to fix problem with iptables-1.3.x. This
+  should fix bug 93915. 1.31-r2 is in package.mask at the moment.
 
   01 Oct 2005; Simon Stelling <blubb@gentoo.org> ipac-ng-1.31-r1.ebuild:
   added ~amd64 keyword
diff --git a/net-analyzer/ipac-ng/Manifest b/net-analyzer/ipac-ng/Manifest
index f54ff31e1cc1..3ae9286a3538 100644
--- a/net-analyzer/ipac-ng/Manifest
+++ b/net-analyzer/ipac-ng/Manifest
@@ -1,13 +1,15 @@
 MD5 a66a3b7b0398ab8748473d8526b14416 ChangeLog 3439
-MD5 0440d5d1752a968fc89ee147931e6823 ipac-ng-1.30.ebuild 2443
-MD5 daf7b00d8959920e213edca1042396d3 ipac-ng-1.31-r1.ebuild 2682
-MD5 e5d20765be7eafab113f6e916faad3c3 ipac-ng-1.31.ebuild 2573
-MD5 d21717f5748c9774708f37fd538eca26 metadata.xml 286
 MD5 c6fde5842858e98a063e78223644e191 files/digest-ipac-ng-1.30 65
 MD5 39c34f5fc4e8f1edc81459ec0895f59d files/digest-ipac-ng-1.31 65
 MD5 39c34f5fc4e8f1edc81459ec0895f59d files/digest-ipac-ng-1.31-r1 65
+MD5 6fcb315a587477e8122a5e72e72a9772 files/digest-ipac-ng-1.31-r2 147
 MD5 b2016c3272e9dd9c2b48238bb07efa3a files/ipac-ng-1.31-iptables.patch 389
 MD5 72162ed7957cc82168b4870d26cf66fe files/ipac-ng.cron.1.30 216
 MD5 983ee78164ba492b7bc558418adb0739 files/ipac-ng.rc.1.30 897
 MD5 aff4fe032f6693f676350c45e7e78261 files/ipac.conf.1.30 1820
 MD5 dba879e7b8ccdcae27d64ceb4ba54f9b files/rules.conf.1.30 1046
+MD5 0440d5d1752a968fc89ee147931e6823 ipac-ng-1.30.ebuild 2443
+MD5 daf7b00d8959920e213edca1042396d3 ipac-ng-1.31-r1.ebuild 2682
+MD5 a63daa0b8a2c4564ab28a9fb27c2c8d6 ipac-ng-1.31-r2.ebuild 2770
+MD5 e5d20765be7eafab113f6e916faad3c3 ipac-ng-1.31.ebuild 2573
+MD5 d21717f5748c9774708f37fd538eca26 metadata.xml 286
diff --git a/net-analyzer/ipac-ng/files/digest-ipac-ng-1.31-r2 b/net-analyzer/ipac-ng/files/digest-ipac-ng-1.31-r2
new file mode 100644
index 000000000000..050cc8077f1e
--- /dev/null
+++ b/net-analyzer/ipac-ng/files/digest-ipac-ng-1.31-r2
@@ -0,0 +1,2 @@
+MD5 07b3d4bfb6d2780e2c480ce1385e2e9a ipac-ng-1.31-iptables-1.3.1.dpatch.bz2 35279
+MD5 f9ed8a729145ae613b3cdc518f1750e3 ipac-ng-1.31.tar.bz2 162843
diff --git a/net-analyzer/ipac-ng/ipac-ng-1.31-r2.ebuild b/net-analyzer/ipac-ng/ipac-ng-1.31-r2.ebuild
new file mode 100644
index 000000000000..9d3277ba5e45
--- /dev/null
+++ b/net-analyzer/ipac-ng/ipac-ng-1.31-r2.ebuild
@@ -0,0 +1,95 @@
+# 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.31-r2.ebuild,v 1.1 2005/12/25 21:44:43 vanquirius 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}.tar.bz2
+	http://dev.gentoo.org/~vanquirius/files/${P}-iptables-1.3.1.dpatch.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gd sqlite postgres"
+
+RDEPEND="virtual/libc
+	sqlite? ( =dev-db/sqlite-2* )
+	!sqlite? ( !postgres? ( sys-libs/gdbm ) )
+	postgres? ( dev-db/postgresql )
+	!postgres? ( !sqlite? ( sys-libs/gdbm ) )"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex"
+RDEPEND="${RDEPEND}
+	net-firewall/iptables
+	virtual/cron
+	dev-lang/perl
+	gd? ( dev-perl/GD )"
+
+pkg_setup() {
+	if use sqlite && use postgres ; then
+		die "You have both sqlite and postgres in USE. Please choose one or the other."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch "${WORKDIR}"/${P}-iptables-1.3.1.dpatch
+}
+
+src_compile() {
+	local db="gdbm"
+	use sqlite && db="sqlite"
+	use postgres && db="postgres"
+
+	econf \
+		--enable-default-storage=${db} \
+		--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.1.30 ipac.conf
+	newins "${FILESDIR}"/rules.conf.1.30 rules.conf
+
+	newinitd "${FILESDIR}"/ipac-ng.rc.1.30 ipac-ng
+
+	exeinto /etc/cron.hourly
+	newexe "${FILESDIR}"/ipac-ng.cron.1.30 ipac-ng
+
+	dodoc README TODO doc/* CHANGELOG
+}
+
+pkg_postinst() {
+	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"
+	einfo "fetchipac is run by cron every hour by /etc/cron.hourly/ipac-ng"
+	einfo "after you changed rules.conf you have to run \"fetchipac -S\" or"
+	einfo "stop/start the service so your iptables gets updated"
+	einfo "if ipac is not working with the default configuration make"
+	einfo "rm /etc/ipac-ng/* and rm /var/lib/ipac/* and emerge again"
+}