Updated ipa to 1.2.5 (pkg/14560 by Andrey Simonenko)

* added NO_PACKAGE as this must be built for each host

Changes since 1.1.6:

- Added new switch to ipastat(8): -x, treat rule names as POSIX
  regular expressions
- Added new switch to ipastat(8): -p <time-back>
- Added new switch to ipastat(8): -k, assume that 1k is equal to 1000 bytes
- Now it is possible to use abbreviated month names in -i and -I options
  in ipastat(8)
- Now it is possible to run from the ipa(8)'s command line commands from
  "reach" and "expire" sections
- Added new section "include" and new parameter "debug_include" to
  the configuration file, also two switches "-tt" for ipa(8) have new sense
- bug fixes

4 files changed, 7 insertions, 164 deletions

diff --git a/net/ipa/Makefile b/net/ipa/Makefile
index ef6d98a0ac9..1e9eb4fabe2 100644
--- a/net/ipa/Makefile
+++ b/net/ipa/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/10/21 22:50:01 mjl Exp $
+# $NetBSD: Makefile,v 1.2 2002/04/15 10:51:53 martti Exp $
 
-DISTNAME=		ipa-1.1.6
+DISTNAME=		ipa-1.2.5
 CATEGORIES=		net sysutils
 MASTER_SITES=		http://www.simon.org.ua/ipa/
 
@@ -8,9 +8,10 @@ MAINTAINER=		simon@simon.org.ua
 HOMEPAGE=		http://www.simon.org.ua/ipa/
 COMMENT=		IP accounting software
 
-RESTRICTED=		"Needs to be built uniquely for each site"
+RESTRICTED=		"Needs to be built uniquely for each host"
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
+NO_PACKAGE=		${RESTRICTED}
 
 ALL_TARGET=		NetBSD
 
diff --git a/net/ipa/distinfo b/net/ipa/distinfo
index 676d662079f..8b86c090613 100644
--- a/net/ipa/distinfo
+++ b/net/ipa/distinfo
@@ -1,6 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/10/21 22:50:01 mjl Exp $
+$NetBSD: distinfo,v 1.2 2002/04/15 10:51:53 martti Exp $
 
-SHA1 (ipa-1.1.6.tar.gz) = 4046dbbb38629cb5211ba55fecc263a37b0b18ef
-Size (ipa-1.1.6.tar.gz) = 122587 bytes
-SHA1 (patch-aa) = 26764c28ea43cf82fd71f64141d08f309b7902ec
-SHA1 (patch-ab) = 106201f2346edce3834539f7b7b2e39292aadb47
+SHA1 (ipa-1.2.5.tar.gz) = e2c203d3bb46aec3cd122f6ae26b471ca77b6cb7
+Size (ipa-1.2.5.tar.gz) = 137086 bytes
diff --git a/net/ipa/patches/patch-aa b/net/ipa/patches/patch-aa
deleted file mode 100644
index 49482b556b5..00000000000
--- a/net/ipa/patches/patch-aa
+++ /dev/null
@@ -1,84 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/10/21 22:50:01 mjl Exp $
-
---- Makefile.orig	Wed Oct  3 18:27:19 2001
-+++ Makefile	Wed Oct 10 20:09:57 2001
-@@ -38,32 +38,32 @@
- #	-Ox   - optimize (it seems that -O3 also help to find out some errors);
- #	-g    - produce debugging information.
- #
--CFLAGS=		-Wall -O -g
-+#CFLAGS=		-Wall -O -g
- 
- #
- # DSTBINDIR - where to install binaries
- #
--DSTBINDIR=	/usr/local/bin
-+DSTBINDIR=	${PREFIX}/bin
- 
- #
- # DSTMANDIR - where to install manuals
- #
--DSTMANDIR=	/usr/local/man
-+DSTMANDIR=	${PREFIX}/man
- 
- #
- # DSTETCDIR - where to install template configuration
- #
--DSTETCDIR=	/usr/local/etc
-+DSTETCDIR=	${PREFIX}/etc
- 
- #
- # DSTRCDIR - where to install sample rc-script
- #
--DSTRCDIR=	/usr/local/etc/rc.d
-+DSTRCDIR=	${PREFIX}/etc/rc.d
- 
- #
- # DSTSHAREDIR - where to install examples, etc.
- #
--DSTSHAREDIR=	/usr/local/share/ipa
-+DSTSHAREDIR=	${PREFIX}/share/examples/ipa
- 
- #
- # IP6FW (FreeBSD only)
-@@ -204,10 +204,10 @@
- 	@${ECHO}
- .else
- 	@${ECHO} ">> Installing binaries, manual pages and miscellaneous files"
--	${INSTALL} -c -g wheel -o root -m 0555 ipa ipastat ${DSTBINDIR}
-+	${BSD_INSTALL_PROGRAM} ipa ipastat ${DSTBINDIR}
- 	${CHMOD} u+s ${DSTBINDIR}/ipastat
--	${INSTALL} -c -g wheel -o root -m 0444 man/ipa.5 man/ipa.conf.5 ${DSTMANDIR}/man5
--	${INSTALL} -c -g wheel -o root -m 0444 man/ipa.8 man/ipastat.8 ${DSTMANDIR}/man8
-+	${BSD_INSTALL_MAN} man/ipa.5 man/ipa.conf.5 ${DSTMANDIR}/man5
-+	${BSD_INSTALL_MAN} man/ipa.8 man/ipastat.8 ${DSTMANDIR}/man8
- .if !exists(${DSTMANDIR}/ru_SU.KOI8-R/man5)
- 	${INSTALL} -d -m 0555 ${DSTMANDIR}/ru_SU.KOI8-R/man5
- .endif
-@@ -217,12 +217,12 @@
- .if !exists(${DSTMANDIR}/ru_RU.KOI8-R)
- 	${LN} -s ${DSTMANDIR}/ru_SU.KOI8-R ${DSTMANDIR}/ru_RU.KOI8-R
- .endif
--	${INSTALL} -c -g wheel -o root -m 0444 man/ru_RU.KOI8-R/ipa.5 man/ru_RU.KOI8-R/ipa.conf.5 ${DSTMANDIR}/ru_RU.KOI8-R/man5
--	${INSTALL} -c -g wheel -o root -m 0444 man/ru_RU.KOI8-R/ipa.8 man/ru_RU.KOI8-R/ipastat.8 ${DSTMANDIR}/ru_RU.KOI8-R/man8
--	${INSTALL} -d -m 0555 ${DSTSHAREDIR}/examples
--	${INSTALL} -c -g wheel -o root -m 0444 examples/* ${DSTSHAREDIR}/examples
-+	${BSD_INSTALL_MAN} man/ru_RU.KOI8-R/ipa.5 man/ru_RU.KOI8-R/ipa.conf.5 ${DSTMANDIR}/ru_RU.KOI8-R/man5
-+	${BSD_INSTALL_MAN} man/ru_RU.KOI8-R/ipa.8 man/ru_RU.KOI8-R/ipastat.8 ${DSTMANDIR}/ru_RU.KOI8-R/man8
-+	${INSTALL} -d -m 0555 ${DSTSHAREDIR}
-+	${BSD_INSTALL_DATA} examples/* ${DSTSHAREDIR}
- .if exists(${DSTRCDIR})
--	${INSTALL} -c -g wheel -o root -m 0500 etc/ipa.sh.sample ${DSTRCDIR}
-+	${BSD_INSTALL_SCRIPT} etc/ipa.sh.sample ${DSTRCDIR}
- .else
- 	@${ECHO}
- 	@${ECHO} ">> Can't find directory ${DSTRCDIR}, skip installing of ipa.sh.sample"
-@@ -230,7 +230,7 @@
- 	@${ECHO}
- .endif
- .if exists(${DSTETCDIR})
--	${INSTALL} -c -g wheel -o root -m 0400 etc/ipa.conf.default ${DSTETCDIR}
-+	${BSD_INSTALL_DATA} etc/ipa.conf.default ${DSTETCDIR}
- .else
- 	@${ECHO}
- 	@${ECHO} ">> Can't find directory ${DSTETCDIR}, skip installing of ipa.conf.default"
diff --git a/net/ipa/patches/patch-ab b/net/ipa/patches/patch-ab
deleted file mode 100644
index 8a06f4b654e..00000000000
--- a/net/ipa/patches/patch-ab
+++ /dev/null
@@ -1,72 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/10/21 22:50:01 mjl Exp $
-
---- gensysinfo.orig	Mon Jul 16 01:04:59 2001
-+++ gensysinfo	Mon Oct 22 00:41:55 2001
-@@ -2,5 +2,8 @@
- #
-+# Copyright (c) 2001 Andrey Simonenko
-+#
- # Generate information about system and generate IP Filter
- # version number by parsing /usr/include/netinet/ipl.h or
--# /usr/src/sys/netinet/ipl.h file.
-+# /usr/src/sys/netinet/ipl.h file, or output of
-+# the "/sbin/ipf -V" command.
- #
-@@ -14,2 +17,4 @@
- 
-+IPF=/sbin/ipf
-+
- IPL_H=/usr/include/netinet/ipl.h
-@@ -17,10 +22,2 @@
- 
--if [ ! -f ${IPL_H} -a ! -f ${IPL_H_SRC} ]; then
--	${ECHO}
--	${ECHO} ">> Can't find file ${IPL_H} or ${IPL_H_SRC}."
--	${ECHO} ">> Is IP Filter installed on this system?"
--	${ECHO}
--	exit 1
--fi
--
- if [ ! -f ${IPL_H} ]; then
-@@ -30,9 +27,26 @@
- ${ECHO} "** Generating information about system"
--SYSTEM="`${UNAME} -m`--`${UNAME} -s` `${UNAME} -r`"
-+SYSTEM="`${UNAME} -s`/`${UNAME} -m` `${UNAME} -r`"
- ${ECHO} "  -- Your system: ${SYSTEM}"
- 
--${ECHO} "** Parsing file ${IPL_H}"
--IPF_VERSION_ORIG=`${SED} -n '/^#[ 	]*define[	 ][	 ]*IPL_VERSION[	 ][	 ]*.*\".*v\([[:digit:]][[:digit:]]*\(\.[[:digit:]][[:digit:]]*\)*\).*\".*$/s//\1/p' ${IPL_H}`
-+# if [ ! -f ${IPL_H} -a ! -f ${IPL_H_SRC} ]; then
-+# 	${ECHO}
-+# 	${ECHO} ">> Can't find ${IPL_H}"
-+# 	${ECHO} ">> and ${IPL_H_SRC} file."
-+# 	${ECHO}
-+if [ ! -f ${IPF} -o ! -x ${IPF} ]; then
-+	${ECHO} ">> Can't find ${IPF}, or it is not executable."
-+	${ECHO} ">> Is IP Filter installed on this system?"
-+	${ECHO}
-+	exit 1
-+fi
-+	${ECHO} "** Parsing output of \"${IPF} -V\" command"
-+IPF_VERSION_ORIG=`${IPF} -V 2>&1 | ${SED} -n -e 's/^.*IP[ 	]*Filter.*v\([[:digit:]][[:digit:]]*\(\.[[:digit:]][[:digit:]]*\)*\).*$/\1/p' | ${SED} -e '1q'`
-+# else
-+# ${ECHO} "** Parsing file ${IPL_H}"
-+# IPF_VERSION_ORIG=`${SED} -n -e 's/^#[ 	]*define[	 ][	 ]*IPL_VERSION[	 ][	 ]*.*\".*v\([[:digit:]][[:digit:]]*\(\.[[:digit:]][[:digit:]]*\)*\).*\".*$/\1/p' ${IPL_H}`
-+# fi
-+
- IPF_VERSION_GEN=`${ECHO} ${IPF_VERSION_ORIG} | ${AWK} '
--	BEGIN { FS="." }
-+	BEGIN { FS="."
-+		err = 0 }
- 	NF == 0 { err = 2 }
-@@ -48,3 +62,3 @@
- 	${ECHO}
--	${ECHO} ">> Don't know how to convert IP Filter version ${IPF_VERSION_ORIG} to single decimal number"
-+	${ECHO} ">> Don't know how to convert IP Filter version ${IPF_VERSION_ORIG} to single decimal number."
- 	${ECHO}
-@@ -54,3 +68,4 @@
- 	${ECHO}
--	${ECHO} ">> Can't find IP Filter version number in ${IPL_H}"
-+	${ECHO} ">> Found IP Filter version number \"${IPF_VERSION_ORIG}\" doesn't look like version number."
-+	${ECHO} ">> Can't determine IP Filter version number."
- 	${ECHO}