pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Maintainer update of ipa to 2.0.1 and move to sysutils.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/a6cb6e84eb16
branches:  trunk
changeset: 520267:a6cb6e84eb16
user:      markd <markd%pkgsrc.org@localhost>
date:      Wed Oct 18 11:45:22 2006 +0000

description:
Maintainer update of ipa to 2.0.1 and move to sysutils.
In PR pkg/32398 with some tweaks from me.

IPA is now a flexible general purpose accounting system;
- Supports static and dynamic rules;
- Support limits, sublimits and thresholds;
- Works with external accounting modules;
- Works with external database modules;
- Works with external statistics modules;
-Accounting per specified period of a week.

diffstat:

 net/Makefile              |   3 +-
 net/ipa/DESCR             |   9 ----
 net/ipa/Makefile          |  55 ------------------------------
 net/ipa/PLIST             |  13 -------
 net/ipa/distinfo          |  12 ------
 net/ipa/files/ipa.generic |  78 ------------------------------------------
 net/ipa/files/ipa.sh      |  43 -----------------------
 net/ipa/patches/patch-aa  |  86 -----------------------------------------------
 net/ipa/patches/patch-ab  |  14 -------
 net/ipa/patches/patch-ac  |  13 -------
 net/ipa/patches/patch-ad  |  38 --------------------
 net/ipa/patches/patch-ae  |  68 -------------------------------------
 net/ipa/patches/patch-af  |  13 -------
 net/ipa/patches/patch-ag  |  16 --------
 sysutils/Makefile         |   3 +-
 sysutils/ipa/DESCR        |  11 ++++++
 sysutils/ipa/Makefile     |  35 +++++++++++++++++++
 sysutils/ipa/PLIST        |  12 ++++++
 sysutils/ipa/distinfo     |   5 ++
 sysutils/ipa/files/ipa.sh |  23 ++++++++++++
 sysutils/ipa/options.mk   |  50 +++++++++++++++++++++++++++
 21 files changed, 139 insertions(+), 461 deletions(-)

diffs (truncated from 704 to 300 lines):

diff -r 3a9701224586 -r a6cb6e84eb16 net/Makefile
--- a/net/Makefile      Wed Oct 18 11:14:26 2006 +0000
+++ b/net/Makefile      Wed Oct 18 11:45:22 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.641 2006/10/15 14:05:46 bouyer Exp $
+# $NetBSD: Makefile,v 1.642 2006/10/18 11:45:22 markd Exp $
 #
 
 COMMENT=       Networking tools
@@ -143,7 +143,6 @@
 SUBDIR+=       httptunnel
 SUBDIR+=       icsi-finger
 SUBDIR+=       iftop
-SUBDIR+=       ipa
 SUBDIR+=       ipcalc
 SUBDIR+=       ipcheck
 SUBDIR+=       iperf
diff -r 3a9701224586 -r a6cb6e84eb16 net/ipa/DESCR
--- a/net/ipa/DESCR     Wed Oct 18 11:14:26 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-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).
diff -r 3a9701224586 -r a6cb6e84eb16 net/ipa/Makefile
--- a/net/ipa/Makefile  Wed Oct 18 11:14:26 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-# $NetBSD: Makefile,v 1.25 2006/06/04 22:21:27 joerg Exp $
-#
-
-DISTNAME=      ipa-1.3.6
-PKGREVISION=   1
-CATEGORIES=    net sysutils
-MASTER_SITES=  http://ipa-system.sourceforge.net/ \
-               http://www.mirrors.wiretapped.net/security/network-monitoring/ipa/ \
-               ftp://ftp.mirrors.wiretapped.net/pub/security/network-monitoring/ipa/ \
-               http://ipa.it-ss.be/
-
-MAINTAINER=    simon%comsys.ntu-kpi.kiev.ua@localhost
-HOMEPAGE=      http://ipa-system.sourceforge.net/
-COMMENT=       IP accounting software
-
-ONLY_FOR_PLATFORM=     FreeBSD-*-* NetBSD-1*-* OpenBSD-*-* DragonFly-*-*
-
-RESTRICTED=            Needs to be built uniquely for each host
-NO_BIN_ON_FTP=         ${RESTRICTED}
-NO_BIN_ON_CDROM=       ${RESTRICTED}
-NO_PACKAGE=            ${RESTRICTED}
-
-BUILD_TARGET=          # empty
-
-CFLAGS+=               -DCFGFILE="\"${PKG_SYSCONFDIR}/ipa.conf\""
-
-CONF_FILES_PERMS=      ${PREFIX}/share/examples/ipa/ipa.conf.default   \
-                       ${PKG_SYSCONFDIR}/ipa.conf                      \
-                       ${ROOT_USER} ${ROOT_GROUP} 0400
-OWN_DIRS_PERMS=                /var/ipa ${ROOT_USER} ${ROOT_GROUP} 0555
-
-.include "../../mk/bsd.prefs.mk"
-
-RCD_SCRIPTS=           ipa
-
-.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly"
-RCD_SCRIPT_SRC.ipa=    ${FILESDIR}/ipa.sh
-.else
-RCD_SCRIPT_SRC.ipa=    ${FILESDIR}/ipa.generic
-.endif
-
-.if ${OPSYS} == "DragonFly"
-MAKE_ENV+=     WITH_PF=1 WITHOUT_IP6FW=1 WITHOUT_IPFW=1
-.endif
-
-SUBST_CLASSES+=                paths
-SUBST_FILES.paths=     man/ipa.5 man/ipa.8 man/ipa.conf.5 man/ipastat.8
-SUBST_SED.paths+=      -e 's,@PREFIX@,${PREFIX},g'
-SUBST_SED.paths+=      -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
-SUBST_STAGE.paths=     post-patch
-
-pre-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ipa
-
-.include "../../mk/bsd.pkg.mk"
diff -r 3a9701224586 -r a6cb6e84eb16 net/ipa/PLIST
--- a/net/ipa/PLIST     Wed Oct 18 11:14:26 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2005/05/02 20:34:02 reed Exp $
-bin/ipa
-bin/ipastat
-man/man5/ipa.5
-man/man5/ipa.conf.5
-man/man8/ipa.8
-man/man8/ipastat.8
-share/examples/ipa/README
-share/examples/ipa/example-1
-share/examples/ipa/example-2
-share/examples/ipa/ipa.conf.default
-share/examples/rc.d/ipa
-@dirrm share/examples/ipa
diff -r 3a9701224586 -r a6cb6e84eb16 net/ipa/distinfo
--- a/net/ipa/distinfo  Wed Oct 18 11:14:26 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: distinfo,v 1.17 2006/06/04 22:21:27 joerg Exp $
-
-SHA1 (ipa-1.3.6.tar.gz) = dcf5ebbf14600da0afba6a735f16a8b8ac84185e
-RMD160 (ipa-1.3.6.tar.gz) = d122d2f8c1b8bbdabb89f1fd1ccf9aa7f2867133
-Size (ipa-1.3.6.tar.gz) = 137156 bytes
-SHA1 (patch-aa) = db61ec179fdeb8ce5ef9ca4f7d287acb24a7faf4
-SHA1 (patch-ab) = edce3d9d03ee7456c440ce4179e1e8c39bb516f2
-SHA1 (patch-ac) = 0baab6507d335479379e78582c727fad72259b61
-SHA1 (patch-ad) = fe03afb555f2a6817dfddd7ab4edb7e41f49c03a
-SHA1 (patch-ae) = 8ed23f771ba11ae357b141ac62c2d4db9c3957e9
-SHA1 (patch-af) = d604d1bab7d51feb7e5ebd75b816c691db229957
-SHA1 (patch-ag) = 886e3e3fe00f4b4b6cd6ad4ae5d9ac356fe3704c
diff -r 3a9701224586 -r a6cb6e84eb16 net/ipa/files/ipa.generic
--- a/net/ipa/files/ipa.generic Wed Oct 18 11:14:26 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: ipa.generic,v 1.1 2003/05/30 11:53:17 salo Exp $
-#
-
-name="ipa"
-required_files="@PKG_SYSCONFDIR@/${name}.conf"
-required_dirs="/var/ipa"
-pidfile="/var/run/${name}.pid"
-command="@PREFIX@/bin/ipa"
-
-ipa_start()
-{
-       if [ ! -r $required_files ]; then
-               echo "$0: WARNING: $required_files is not readable."
-               exit 1
-       fi
-       if [ ! -d $required_dirs ]; then
-               echo "$0: WARNING: $required_dirs is not a directory."
-               exit 1
-       fi
-
-       echo "Starting ${name}."
-       eval $command
-       return_code=$?
-       if [ $return_code != "0" ]; then
-               exit 1
-       fi
-}
-
-ipa_stop()
-{
-       echo "Stopping ${name}."
-
-       ${command} -k shutdown
-}
-
-ipa_reconfigure()
-{
-       echo "Reloading ${name} configuration."
-
-       ${command} -k reconfigure
-}
-
-ipa_dump()
-{
-       echo "Dumping ${name} stats."
-
-       ${command} -k dump
-}
-
-case $1 in
-
-'start')
-       ipa_start
-       ;;
-
-'stop')
-       ipa_stop
-       ;;
-
-'restart')
-       ipa_stop
-       ipa_start
-       ;;
-
-'reconfigure')
-       ipa_reconfigure
-       ;;
-
-'dump')
-       ipa_dump
-       ;;
-
-*)
-       echo "Usage: $0 (start|stop|restart|reconfigure|dump)"
-       ;;
-esac
diff -r 3a9701224586 -r a6cb6e84eb16 net/ipa/files/ipa.sh
--- a/net/ipa/files/ipa.sh      Wed Oct 18 11:14:26 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: ipa.sh,v 1.1 2003/05/30 11:53:17 salo Exp $
-#
-
-# PROVIDE: ipa
-# REQUIRE: ipfilter
-
-. /etc/rc.subr
-
-name="ipa"
-rcvar=$name
-command="@PREFIX@/bin/${name}"
-required_files="@PKG_SYSCONFDIR@/$name.conf"
-required_dir="/var/${name}"
-stop_cmd="ipa_stop"
-reconfigure_cmd="ipa_reconfigure"
-dump_cmd="ipa_dump"
-extra_commands="reconfigure dump"
-
-ipa_stop()
-{
-       echo "Stopping ${name}."
-
-       ${command} -k shutdown
-}
-
-ipa_reconfigure()
-{
-       echo "Reloading ${name} configuration."
-
-       ${command} -k reconfigure
-}
-
-ipa_dump()
-{
-       echo "Dumping ${name} stats."
-
-       ${command} -k dump
-}
-
-load_rc_config $name
-run_rc_command "$1"
diff -r 3a9701224586 -r a6cb6e84eb16 net/ipa/patches/patch-aa
--- a/net/ipa/patches/patch-aa  Wed Oct 18 11:14:26 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
-$NetBSD: patch-aa,v 1.10 2006/06/04 22:21:27 joerg Exp $
-
---- Makefile.orig      2003-11-11 10:24:34.000000000 +0000
-+++ Makefile
-@@ -38,7 +38,7 @@ CC?=         /usr/bin/cc
- #     -Ox   - optimize;
- #     -g    - produce debugging information.
- #
--CFLAGS=               -Wall -O1 -g
-+#CFLAGS=              -Wall -O1 -g
- 
- #
- # PREFIX - prefix for all below listed paths
-@@ -58,7 +58,7 @@ DST_MAN_DIR= ${PREFIX}/man
- #
- # DST_ETC_DIR - where to install template configuration
- #
--DST_ETC_DIR=  ${PREFIX}/etc
-+DST_ETC_DIR=  ${DST_EXAMPLE_DIR}
- 
- #
- # DST_RC_DIR - where to install sample rc-script
-@@ -81,10 +81,10 @@ MKDIR?=            /bin/mkdir
- #
- # INSTALL_* variables
- #
--INSTALL_MAN=          ${INSTALL} -c -g wheel -o root -m 0444
--INSTALL_DATA=         ${INSTALL} -c -g wheel -o root -m 0444
--INSTALL_PROGRAM=      ${INSTALL} -c -g wheel -o root -m 0555
--INSTALL_SCRIPT=               ${INSTALL} -c -g wheel -o root -m 0500 
-+INSTALL_MAN=          ${BSD_INSTALL_MAN}
-+INSTALL_DATA=         ${BSD_INSTALL_DATA}
-+INSTALL_PROGRAM=      ${BSD_INSTALL_PROGRAM}
-+INSTALL_SCRIPT=               ${BSD_INSTALL_SCRIPT}
- INSTALL_MAN_DIR=      ${INSTALL} -d -m 0555 -g wheel -o root
- INSTALL_DATA_DIR=     ${INSTALL} -d -m 0555 -g wheel -o root
- 
-@@ -98,7 +98,7 @@ IPASTAT=     ipastat.o common.o
- .MAIN: checkos ${OS}
- 
- checkos:
--.if ${OS} != "FreeBSD" && ${OS} != "NetBSD" && ${OS} != "OpenBSD"
-+.if ${OS} != "FreeBSD" && ${OS} != "NetBSD" && ${OS} != "OpenBSD" && ${OS} != "DragonFly"
-       @${ECHO}
-       @${ECHO} ">> IPA-`${CAT} Version` is designed for FreeBSD, NetBSD and OpenBSD."



Home | Main Index | Thread Index | Old Index