Updated ipa to 1.2.9 (provided by Andrey Simonenko in pkg/18859)

- Fixed support for 32-bits IP Filter v3.4.x rule group numbers (previous
  incorrect implementation was introduced in IPA-1.1.3)
- Now it is possible to remove not needed accounting systems support
  with the help of -DWITHOUT_{IPFW|IP6FW|IPFIL|PF} options
- Now FreeBSD IPFW2 is supported
- "getsockopt(IPV6_FW_GET): Invalid argument" IPv6 Firewall bug was fixed
- Minor improvements for IPv4/v6 Firewall support

4 files changed, 17 insertions, 17 deletions

diff --git a/net/ipa/DESCR b/net/ipa/DESCR
index 2b927b172f4..b69fa31dfb6 100644
--- a/net/ipa/DESCR
+++ b/net/ipa/DESCR
@@ -1,12 +1,12 @@
-IPA(8) allows to make IP accounting (network accounting) based on
-FreeBSD IPv4/v6 Firewall, OpenBSD Packet Filter and IP Filter
-accounting rules on FreeBSD, NetBSD and OpenBSD.
+ipa(8) allows to make IP accounting (network accounting) based on
+FreeBSD IPv4/v6 Firewall (including IPFW2), OpenBSD Packet Filter and
+IP Filter accounting rules on FreeBSD, NetBSD and OpenBSD.
 
 It supports limits for accounting rules and limits events as "limit is
 reached", "reached limit is expired", etc. It understands time intervals
 like "end of day", "end of week", "end of month", etc.
 
-IPASTAT(8) is a viewer for IP accounting database made by IPA(8).
+ipastat(8) is a viewer for IP accounting database made by ipa(8).
 
 - Andrey Simonenko
 simon@simon.org.ua
diff --git a/net/ipa/Makefile b/net/ipa/Makefile
index bad613b1f69..d217756f1cb 100644
--- a/net/ipa/Makefile
+++ b/net/ipa/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2002/10/22 13:20:08 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2002/10/30 09:28:33 martti Exp $
 
-DISTNAME=	ipa-1.2.8
+DISTNAME=	ipa-1.2.9
 CATEGORIES=	net sysutils
 MASTER_SITES=	http://www.simon.org.ua/ipa/ \
 		http://www.mirrors.wiretapped.net/security/network-monitoring/ipa/ \
diff --git a/net/ipa/distinfo b/net/ipa/distinfo
index b31e4e39f0a..34b8e8ba3dd 100644
--- a/net/ipa/distinfo
+++ b/net/ipa/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2002/10/23 10:54:54 wiz Exp $
+$NetBSD: distinfo,v 1.8 2002/10/30 09:28:33 martti Exp $
 
-SHA1 (ipa-1.2.8.tar.gz) = aa83f3e2d23c70073748d28b11bf487f806756e5
-Size (ipa-1.2.8.tar.gz) = 132234 bytes
-SHA1 (patch-aa) = f4e62334dd1260050a38e6c5bd617320cda9b0f0
+SHA1 (ipa-1.2.9.tar.gz) = a83f8e3ac6b54f136d6bf08f968bb75bff4fa472
+Size (ipa-1.2.9.tar.gz) = 133303 bytes
+SHA1 (patch-aa) = 0164a4dd1934c38d46265dd2d41a46b31af8e9ac
 SHA1 (patch-ab) = edce3d9d03ee7456c440ce4179e1e8c39bb516f2
diff --git a/net/ipa/patches/patch-aa b/net/ipa/patches/patch-aa
index 16642277ef9..95b96f92212 100644
--- a/net/ipa/patches/patch-aa
+++ b/net/ipa/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2002/10/23 10:54:55 wiz Exp $
+$NetBSD: patch-aa,v 1.7 2002/10/30 09:28:34 martti Exp $
 
---- Makefile.orig	Sat Sep 28 01:24:32 2002
-+++ Makefile
-@@ -38,7 +38,7 @@ CC?=		/usr/bin/cc
+--- Makefile.orig	Mon Oct 28 21:40:37 2002
++++ Makefile	Tue Oct 29 22:31:42 2002
+@@ -38,7 +38,7 @@
  #	-Ox   - optimize;
  #	-g    - produce debugging information.
  #
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.6 2002/10/23 10:54:55 wiz Exp $
  
  #
  # PREFIX - prefix for all below listed paths
-@@ -58,7 +58,7 @@ DSTMANDIR=	${PREFIX}/man
+@@ -58,7 +58,7 @@
  #
  # DSTETCDIR - where to install template configuration
  #
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.6 2002/10/23 10:54:55 wiz Exp $
  
  #
  # DSTRCDIR - where to install sample rc-script
-@@ -96,10 +96,10 @@ MKDIR?=		/bin/mkdir
+@@ -81,10 +81,10 @@
  #
  # Some INSTALL_* variables
  #
@@ -35,7 +35,7 @@ $NetBSD: patch-aa,v 1.6 2002/10/23 10:54:55 wiz Exp $
  INSTALL_MAN_DIR=	${INSTALL} -d -m 0555 -g wheel -o root
  INSTALL_DATA_DIR=	${INSTALL} -d -m 0555 -g wheel -o root
  
-@@ -230,21 +230,9 @@ install:
+@@ -236,21 +236,9 @@
  	${INSTALL_PROGRAM} ipa ipastat ${DSTBINDIR}
  	${INSTALL_MAN} man/ipa.5 man/ipa.conf.5 ${DSTMANDIR}/man5
  	${INSTALL_MAN} man/ipa.8 man/ipastat.8 ${DSTMANDIR}/man8