Update to 1.2.8, provided by Andrey Simonenko in PR 18537.

Changes:
- Locale names have been renamed ru_SU* -> ru_RU*, ru_SU* now are symlinks
- Fixed some minor bugs
- Now a new record is added to each accounting file after reconfiguration
- Now ipa(8) and ipastat(8) do not use database locking feature by default
- All manual pages were updated to reflect changes in IPA
- The -u switch was removed from and the -L switch was added to ipastat(8)
- All code of ipa(8) was revised, now ipa(8) tests directories and
  files in the database more carefully
- Several bugs and memory leak with the "db_dir" parameter were fixed
- Added new parameter "db_group"
- Parameters "acl", "db_owner", "db_perm" have been removed

Package changes:
- added some HTTP and FTP mirrors;
- removed installation of ${DSTEXAMPLEDIR} directory, because it is
  installed from the port's Makefile;
- updated DESCR to reflect current state of IPA.

4 files changed, 26 insertions, 42 deletions

diff --git a/net/ipa/DESCR b/net/ipa/DESCR
index 0bb2cda2102..2b927b172f4 100644
--- a/net/ipa/DESCR
+++ b/net/ipa/DESCR
@@ -1,13 +1,12 @@
-IPA allows to make IP accounting (network accounting) based on
-IPv4/v6 Firewall (FreeBSD only) and/or IP Filter accounting rules
-on NetBSD, OpenBSD and FreeBSD.
+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.
 
 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.
 
-There is special viewer for accounting database and access control lists,
-which allow or disallow one to view accounting information for rules.
+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 832d1b4e774..bad613b1f69 100644
--- a/net/ipa/Makefile
+++ b/net/ipa/Makefile
@@ -1,9 +1,12 @@
-# $NetBSD: Makefile,v 1.4 2002/09/19 08:46:09 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/10/22 13:20:08 wiz Exp $
 
-DISTNAME=	ipa-1.2.7
+DISTNAME=	ipa-1.2.8
 CATEGORIES=	net sysutils
 MASTER_SITES=	http://www.simon.org.ua/ipa/ \
-		http://www.mirrors.wiretapped.net/security/network-monitoring/ipa/
+		http://www.mirrors.wiretapped.net/security/network-monitoring/ipa/ \
+		ftp://ftp.mirrors.wiretapped.net/pub/security/network-monitoring/ipa/ \
+		http://www.outloud.org/ipa/ \
+		http://ipa.it-ss.be/
 
 MAINTAINER=	simon@simon.org.ua
 HOMEPAGE=	http://www.simon.org.ua/ipa/
diff --git a/net/ipa/distinfo b/net/ipa/distinfo
index 230d259149c..10279c4bcaf 100644
--- a/net/ipa/distinfo
+++ b/net/ipa/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.5 2002/06/30 13:13:48 dmcmahill Exp $
+$NetBSD: distinfo,v 1.6 2002/10/22 13:20:08 wiz Exp $
 
-SHA1 (ipa-1.2.7.tar.gz) = 73799bf16be637b4d683ec86b9943177856349dc
-Size (ipa-1.2.7.tar.gz) = 137825 bytes
-SHA1 (patch-aa) = 6b7a63768c673eebb76b2a9c4cfe2eaf40287c8f
+SHA1 (ipa-1.2.8.tar.gz) = aa83f3e2d23c70073748d28b11bf487f806756e5
+Size (ipa-1.2.8.tar.gz) = 132234 bytes
+SHA1 (patch-aa) = 5e70679bf65eff6354a829a72f446fe6400dff25
 SHA1 (patch-ab) = edce3d9d03ee7456c440ce4179e1e8c39bb516f2
-SHA1 (patch-ac) = 8b7fd122923082a4916f3b46bbfb8475a19f5dd6
diff --git a/net/ipa/patches/patch-aa b/net/ipa/patches/patch-aa
index de2b0e2e758..156ab6b2e43 100644
--- a/net/ipa/patches/patch-aa
+++ b/net/ipa/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2002/06/30 03:47:54 jlam Exp $
+$NetBSD: patch-aa,v 1.5 2002/10/22 13:20:09 wiz Exp $
 
---- Makefile.orig	Sat Jun 29 21:14:15 2002
+--- Makefile.orig	Sat Sep 28 01:24:32 2002
 +++ Makefile
-@@ -38,7 +38,7 @@
+@@ -38,7 +38,7 @@ CC?=		/usr/bin/cc
  #	-Ox   - optimize;
  #	-g    - produce debugging information.
  #
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.4 2002/06/30 03:47:54 jlam Exp $
  
  #
  # PREFIX - prefix for all below listed paths
-@@ -58,7 +58,7 @@
+@@ -58,7 +58,7 @@ DSTMANDIR=	${PREFIX}/man
  #
  # DSTETCDIR - where to install template configuration
  #
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.4 2002/06/30 03:47:54 jlam Exp $
  
  #
  # DSTRCDIR - where to install sample rc-script
-@@ -97,10 +97,10 @@
+@@ -96,10 +96,10 @@ MKDIR?=		/bin/mkdir
  #
  # Some INSTALL_* variables
  #
@@ -35,27 +35,18 @@ $NetBSD: patch-aa,v 1.4 2002/06/30 03:47:54 jlam Exp $
  INSTALL_MAN_DIR=	${INSTALL} -d -m 0555 -g wheel -o root
  INSTALL_DATA_DIR=	${INSTALL} -d -m 0555 -g wheel -o root
  
-@@ -219,7 +219,7 @@
- 	${RM} -r ${DSTEXAMPLEDIR}
- 	${RM} ${DSTMANDIR}/man5/ipa.conf.5 ${DSTMANDIR}/man5/ipa.5 ${DSTMANDIR}/man8/ipa.8 ${DSTMANDIR}/man8/ipastat.8
- 	${RM} ${DSTMANDIR}/ru_SU.KOI8-R/man5/ipa.conf.5 ${DSTMANDIR}/ru_SU.KOI8-R/man5/ipa.5 ${DSTMANDIR}/ru_SU.KOI8-R/man8/ipa.8 ${DSTMANDIR}/ru_SU.KOI8-R/man8/ipastat.8
--	${RM} ${DSTETCDIR}/ipa.conf.default ${DSTRCDIR}/ipa.sh.sample
-+	${RM} ${DSTETCDIR}/ipa.conf.default ${DSTRCDIR}/ipa
- 	
- install:
- .if !exists(./ipa) || !exists(./ipastat)
-@@ -231,21 +231,10 @@
+@@ -230,21 +230,10 @@ install:
  	${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
--.if !exists(${DSTMANDIR}/ru_SU.KOI8-R/man5)
--	${INSTALL_MAN_DIR} ${DSTMANDIR}/ru_SU.KOI8-R/man5
+-.if !exists(${DSTMANDIR}/ru_RU.KOI8-R/man5)
+-	${INSTALL_MAN_DIR} ${DSTMANDIR}/ru_RU.KOI8-R/man5
 -.endif
--.if !exists(${DSTMANDIR}/ru_SU.KOI8-R/man8)
--	${INSTALL_MAN_DIR} ${DSTMANDIR}/ru_SU.KOI8-R/man8
+-.if !exists(${DSTMANDIR}/ru_RU.KOI8-R/man8)
+-	${INSTALL_MAN_DIR} ${DSTMANDIR}/ru_RU.KOI8-R/man8
 -.endif
--.if !exists(${DSTMANDIR}/ru_RU.KOI8-R)
--	${LN} -s ${DSTMANDIR}/ru_SU.KOI8-R ${DSTMANDIR}/ru_RU.KOI8-R
+-.if !exists(${DSTMANDIR}/ru_SU.KOI8-R)
+-	${LN} -s ${DSTMANDIR}/ru_RU.KOI8-R ${DSTMANDIR}/ru_SU.KOI8-R
 -.endif
 -	${INSTALL_MAN} man/ru_RU.KOI8-R/ipa.5 man/ru_RU.KOI8-R/ipa.conf.5 ${DSTMANDIR}/ru_SU.KOI8-R/man5
 -	${INSTALL_MAN} man/ru_RU.KOI8-R/ipa.8 man/ru_RU.KOI8-R/ipastat.8 ${DSTMANDIR}/ru_SU.KOI8-R/man8
@@ -67,11 +58,3 @@ $NetBSD: patch-aa,v 1.4 2002/06/30 03:47:54 jlam Exp $
  .else
  	@${ECHO}
  	@${ECHO} ">> Can't find directory ${DSTRCDIR}, skip installing of ipa.sh.sample"
-@@ -254,7 +243,6 @@
- .endif
- .if exists(${DSTETCDIR})
- 	${INSTALL_DATA} etc/ipa.conf.default ${DSTETCDIR}
--	${CHMOD} 0400 ${DSTETCDIR}/ipa.conf.default
- .else
- 	@${ECHO}
- 	@${ECHO} ">> Can't find directory ${DSTETCDIR}, skip installing of ipa.conf.default"