Date: Wed, 9 Feb 2011 17:00:26 +0200 From: Andrey Simonenko <simon@comsys.ntu-kpi.kiev.ua> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/154615: Update sysutils/ipa to version 2.1, update related ports as well Message-ID: <20110209150026.GA67365@pm513-1.comsys.ntu-kpi.kiev.ua> Resent-Message-ID: <201102091510.p19FABpL045695@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 154615
>Category: ports
>Synopsis: Update sysutils/ipa to version 2.1, update related ports as well
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed Feb 09 15:10:10 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Andrey Simonenko
>Release: FreeBSD 8.2-PRERELEASE amd64
>Organization:
>Environment:
>Description:
Please update sysutils/ipa to version 2.1, and update related ports
(misc/ipa_conv, net/ipa_ipfw, net/ipa_ip6fw, database/ipa_sdb).
>How-To-Repeat:
>Fix:
diff -ruNp ports.orig/databases/ipa_sdb/Makefile ports/databases/ipa_sdb/Makefile
--- ports.orig/databases/ipa_sdb/Makefile 2010-12-05 01:05:31.000000000 +0200
+++ ports/databases/ipa_sdb/Makefile 2011-02-09 16:42:50.000000000 +0200
@@ -6,7 +6,7 @@
#
PORTNAME= ipa_sdb
-PORTVERSION= 1.0.2
+PORTVERSION= 1.1
CATEGORIES= databases
MASTER_SITES= SF/ipa-system/modules/ipa_sdb
@@ -24,11 +24,7 @@ OPTIONS= AUTORULES "Enable dynamic rules
LIMITS "Enable limits support" on \
THRESHOLDS "Enable thresholds support" on
-.include <bsd.port.pre.mk>
-
-PLIST_FILES= bin/ipa_sdb_dump include/ipa_sdb.h include/ipa_sdb_config.h \
- lib/ipa_db_sdb.so lib/ipa_st_sdb.so \
- lib/ipa_db_sdb.la lib/ipa_st_sdb.la
+.include <bsd.port.options.mk>
.if defined(WITHOUT_AUTORULES)
CONFIGURE_ARGS+= --disable-autorules
@@ -46,13 +42,14 @@ CONFIGURE_ARGS+= --disable-limits
CONFIGURE_ARGS+= --disable-thresholds
.endif
+.include <bsd.port.pre.mk>
+
+PLIST_FILES= bin/ipa_sdb_dump include/ipa_sdb.h include/ipa_sdb_config.h \
+ lib/ipa_db_sdb.so lib/ipa_st_sdb.so \
+ lib/ipa_db_sdb.la lib/ipa_st_sdb.la
+
MAN5= ipa_sdb.5
MAN8= ipa_db_sdb.8 ipa_st_sdb.8 ipa_sdb_dump.8
MANLANG= "" ru.KOI8-R
-do-install:
- cd ${WRKSRC}/src && make install
- cd ${WRKSRC}/man && make install-am
- cd ${WRKSRC}/man/ru.KOI8-R && make install
-
.include <bsd.port.post.mk>
diff -ruNp ports.orig/databases/ipa_sdb/distinfo ports/databases/ipa_sdb/distinfo
--- ports.orig/databases/ipa_sdb/distinfo 2010-12-05 01:05:31.000000000 +0200
+++ ports/databases/ipa_sdb/distinfo 2011-02-09 16:19:15.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (ipa_sdb-1.0.2.tar.bz2) = e2de9d46bc68d149cf942bd75012e8a65fbf3d3be2a20325f31141876439c324
-SIZE (ipa_sdb-1.0.2.tar.bz2) = 255710
+SHA256 (ipa_sdb-1.1.tar.bz2) = 9b7d6088fff3ac04ad30dde7da8a5a03a17b8ab1ba3d470a263d9b2b3ea42e7b
+SIZE (ipa_sdb-1.1.tar.bz2) = 256054
diff -ruNp ports.orig/databases/ipa_sdb/pkg-descr ports/databases/ipa_sdb/pkg-descr
--- ports.orig/databases/ipa_sdb/pkg-descr 2005-12-28 23:51:57.000000000 +0200
+++ ports/databases/ipa_sdb/pkg-descr 2011-02-09 16:00:59.000000000 +0200
@@ -2,16 +2,16 @@ IPA_SDB -- IPA simple database module
Main features:
-- Distribution consists of database ipa_db_sdb(8) and statistics
- ipa_st_mod(8) modules;
+- Distribution consists of database ipa_db_sdb(8) module, statistics
+ ipa_st_mod(8) module and ipa_sdb_dump(8) utility;
- Modules completely support dynamic and static rules, limits and
thresholds;
- All database files are stored in own record based database formats;
- Formats of database files are machine architecture independent;
- Sizes of database records are relatively small (binary data formats);
- Access to statistics can be granted accordingly to the user group;
-- There is the ipa_sdb_dump(8) utility for dumping database files to
- text format and back.
+- The ipa_sdb_dump(8) utility converts ipa_sdb(5) database files to text
+ representation and back.
WWW: http://ipa-system.sourceforge.net/modules/ipa_sdb/
diff -ruNp ports.orig/misc/ipa_conv/Makefile ports/misc/ipa_conv/Makefile
--- ports.orig/misc/ipa_conv/Makefile 2009-09-12 07:20:05.000000000 +0300
+++ ports/misc/ipa_conv/Makefile 2011-02-09 16:21:30.000000000 +0200
@@ -6,10 +6,9 @@
#
PORTNAME= ipa_conv
-PORTVERSION= 1.0
+PORTVERSION= 1.1
CATEGORIES= misc
-MASTER_SITES= http://ipa-system.sourceforge.net/modules/ipa_conv/ \
- LOCAL/avl
+MASTER_SITES= SF/ipa-system/modules/ipa_conv
MAINTAINER= simon@comsys.ntu-kpi.kiev.ua
COMMENT= IPA accounting/database module for converting statistics
@@ -17,8 +16,8 @@ COMMENT= IPA accounting/database module
BUILD_DEPENDS= ${LOCALBASE}/include/ipa_mod.h:${PORTSDIR}/sysutils/ipa
USE_BZIP2= yes
-GNU_CONFIGURE= yes
USE_LDCONFIG= yes
+GNU_CONFIGURE= yes
PLIST_FILES= lib/ipa_conv.la lib/ipa_conv.so
diff -ruNp ports.orig/misc/ipa_conv/distinfo ports/misc/ipa_conv/distinfo
--- ports.orig/misc/ipa_conv/distinfo 2009-09-12 07:20:05.000000000 +0300
+++ ports/misc/ipa_conv/distinfo 2011-02-09 16:20:16.000000000 +0200
@@ -1,3 +1,2 @@
-MD5 (ipa_conv-1.0.tar.bz2) = 207de6a7c168f9d8dcadc736af1be7eb
-SHA256 (ipa_conv-1.0.tar.bz2) = 7d14cfc7ed03ec9dbcbc4d5357db16ea3cc7dd5b89900e0c68917e979b29b9b3
-SIZE (ipa_conv-1.0.tar.bz2) = 228651
+SHA256 (ipa_conv-1.1.tar.bz2) = 2d972abe93ce6ca7a20ccc97de987579ae7417b74a8a323a2076bfea364bc327
+SIZE (ipa_conv-1.1.tar.bz2) = 236925
diff -ruNp ports.orig/net/ipa_ip6fw/Makefile ports/net/ipa_ip6fw/Makefile
--- ports.orig/net/ipa_ip6fw/Makefile 2010-11-01 15:13:53.000000000 +0200
+++ ports/net/ipa_ip6fw/Makefile 2011-02-09 16:02:39.000000000 +0200
@@ -6,7 +6,7 @@
#
PORTNAME= ipa_ip6fw
-PORTVERSION= 1.0.2
+PORTVERSION= 1.1
CATEGORIES= net
MASTER_SITES= SF/ipa-system/modules/ipa_ip6fw
diff -ruNp ports.orig/net/ipa_ip6fw/distinfo ports/net/ipa_ip6fw/distinfo
--- ports.orig/net/ipa_ip6fw/distinfo 2010-11-01 15:13:53.000000000 +0200
+++ ports/net/ipa_ip6fw/distinfo 2011-02-09 16:02:20.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (ipa_ip6fw-1.0.2.tar.bz2) = 836b15fceb78b418ad3b30dfb9419cc7523d576cc9d854eee73333fb85d2c33a
-SIZE (ipa_ip6fw-1.0.2.tar.bz2) = 16737
+SHA256 (ipa_ip6fw-1.1.tar.bz2) = 082e2a1dec5c9fc6c0fca5bdef4458dcd994917dcc041fd267b279261178b1b0
+SIZE (ipa_ip6fw-1.1.tar.bz2) = 16828
diff -ruNp ports.orig/net/ipa_ip6fw/pkg-descr ports/net/ipa_ip6fw/pkg-descr
--- ports.orig/net/ipa_ip6fw/pkg-descr 2006-04-28 06:08:55.000000000 +0300
+++ ports/net/ipa_ip6fw/pkg-descr 2011-02-09 16:16:21.000000000 +0200
@@ -2,13 +2,12 @@ IPA_IP6FW -- IPA accounting module for F
Main features:
-- The module is designed for traffic accounting from FreeBSD IPv6
- Firewall rules byte counters;
+- The module is designed for traffic accounting from IPv6 Firewall
+ rules byte counters;
- The module understands IPv6 Firewall rules byte counters overflow;
-- It is possible to summarize and subtract statistics from IPv6
- Firewall rules byte counters;
-- It is possible to distinguish IPv6 Firewall rules with the same
- numbers;
+- It is possible to summarize and subtract statistics of IPv6 Firewall
+ rules byte counters;
+- It is possible to distinguish IPv6 Firewall rules with the same numbers;
- IPv6 Firewall rules can be dynamically added to and deleted from
the system, the module correctly works in such situations.
diff -ruNp ports.orig/net/ipa_ipfw/Makefile ports/net/ipa_ipfw/Makefile
--- ports.orig/net/ipa_ipfw/Makefile 2010-08-09 12:38:32.000000000 +0300
+++ ports/net/ipa_ipfw/Makefile 2011-02-09 16:11:08.000000000 +0200
@@ -6,7 +6,7 @@
#
PORTNAME= ipa_ipfw
-PORTVERSION= 1.0.2
+PORTVERSION= 1.1
CATEGORIES= net
MASTER_SITES= SF/ipa-system/modules/ipa_ipfw
@@ -20,14 +20,10 @@ NO_PACKAGE= Needs to be built uniquely f
USE_BZIP2= yes
USE_LDCONFIG= yes
-OPTIONS= DEBUG_INFO "Produce debugging info" off \
- MAN_KOI8_R "Install Russian manual pages" off
-
.include <bsd.port.pre.mk>
-.if !defined(WITH_DEBUG_INFO)
-MAKE_ENV+= DEBUG_FLAGS=""
-.endif
+LOCALINCLUDE?= ${LOCALBASE}/include
+MAKE_ENV+= DEBUG_FLAGS="" PREFIX=${PREFIX} LOCALINCLUDE=${LOCALINCLUDE}
BUILD_DEPENDS+= ${LOCALBASE}/include/ipa_mod.h:${PORTSDIR}/sysutils/ipa
@@ -35,15 +31,10 @@ PLIST_FILES= lib/ipa_ipfw.so
MANCOMPRESSED= yes
MAN8= ipa_ipfw.8
-MANLANG= ""
-.if defined(WITH_MAN_KOI8_R)
-MANLANG+= ru.KOI8-R
-.endif
+MANLANG= "" ru.KOI8-R
do-install:
cd ${WRKSRC} && ${MAKE} install
-.if defined(WITH_MAN_KOI8_R)
cd ${WRKSRC}/man && ${MAKE} LANG_DIR_SRC=ru.KOI8-R clean all install
-.endif
.include <bsd.port.post.mk>
diff -ruNp ports.orig/net/ipa_ipfw/distinfo ports/net/ipa_ipfw/distinfo
--- ports.orig/net/ipa_ipfw/distinfo 2010-08-09 12:38:32.000000000 +0300
+++ ports/net/ipa_ipfw/distinfo 2011-02-09 16:24:34.000000000 +0200
@@ -1,3 +1,2 @@
-MD5 (ipa_ipfw-1.0.2.tar.bz2) = 5571cd76f663eefdbc2c419dc0d06ce7
-SHA256 (ipa_ipfw-1.0.2.tar.bz2) = dbdb9a72abd3a4bc9cce2e343f7bc7b688c32ab39ed4d3dc0de47ecbe58d0793
-SIZE (ipa_ipfw-1.0.2.tar.bz2) = 16498
+SHA256 (ipa_ipfw-1.1.tar.bz2) = 50fd880b9b832fa305773c59fa040afb34e30d7960126f98d382acda9f5f2b16
+SIZE (ipa_ipfw-1.1.tar.bz2) = 16540
diff -ruNp ports.orig/net/ipa_ipfw/pkg-descr ports/net/ipa_ipfw/pkg-descr
--- ports.orig/net/ipa_ipfw/pkg-descr 2006-04-28 07:21:46.000000000 +0300
+++ ports/net/ipa_ipfw/pkg-descr 2011-02-09 16:16:40.000000000 +0200
@@ -2,13 +2,12 @@ IPA_IPFW -- IPA accounting module for Fr
Main features:
-- The module is designed for traffic accounting from FreeBSD IP
- Firewall (including IPFW2) rules byte counters;
+- The module is designed for traffic accounting from IP Firewall
+ (including IPFW2) rules byte counters;
- The module understands IP Firewall rules byte counters overflow;
-- It is possible to summarize and subtract statistics from IP Firewall
+- It is possible to summarize and subtract statistics of IP Firewall
rules byte counters;
-- It is possible to distinguish IP Firewall rules with the same
- numbers;
+- It is possible to distinguish IP Firewall rules with the same numbers;
- IP Firewall rules can be dynamically added to and deleted from
the system, the module correctly works in such situations.
diff -ruNp ports.orig/sysutils/ipa/Makefile ports/sysutils/ipa/Makefile
--- ports.orig/sysutils/ipa/Makefile 2011-01-06 12:25:36.000000000 +0200
+++ ports/sysutils/ipa/Makefile 2011-02-09 16:52:21.000000000 +0200
@@ -6,7 +6,7 @@
#
PORTNAME= ipa
-PORTVERSION= 2.0.9
+PORTVERSION= 2.1
CATEGORIES= sysutils
MASTER_SITES= SF/ipa-system
@@ -50,14 +50,13 @@ CONFIGURE_ARGS+= --disable-thresholds
CONFIGURE_ARGS+= --enable-ctl-creds
.endif
+.include <bsd.port.pre.mk>
+
+PLIST_FILES= bin/ipa bin/ipactl bin/ipastat include/ipa_mod.h
+
MAN3= ipa_mod.3
MAN5= ipa.conf.5 ipastat.conf.5
MAN8= ipa.8 ipactl.8 ipastat.8
MANLANG= "" ru.KOI8-R
-do-install:
- cd ${WRKSRC}/src && ${MAKE} install
- cd ${WRKSRC}/man && ${MAKE} install-am
- cd ${WRKSRC}/man/ru.KOI8-R && ${MAKE} install
-
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruNp ports.orig/sysutils/ipa/distinfo ports/sysutils/ipa/distinfo
--- ports.orig/sysutils/ipa/distinfo 2011-01-06 12:25:36.000000000 +0200
+++ ports/sysutils/ipa/distinfo 2011-02-09 15:58:01.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (ipa-2.0.9.tar.bz2) = ac468027a0214e015239f3b70f174fc01d90b9c7dea984796e123aaa1ba20ae2
-SIZE (ipa-2.0.9.tar.bz2) = 298851
+SHA256 (ipa-2.1.tar.bz2) = 1426bfb9c9545fcea329dde456df434a9fcae1158d1e85b17cfa62177f89cb75
+SIZE (ipa-2.1.tar.bz2) = 312653
diff -ruNp ports.orig/sysutils/ipa/pkg-plist ports/sysutils/ipa/pkg-plist
--- ports.orig/sysutils/ipa/pkg-plist 2006-04-12 21:11:36.000000000 +0300
+++ ports/sysutils/ipa/pkg-plist 1970-01-01 03:00:00.000000000 +0300
@@ -1,4 +0,0 @@
-bin/ipa
-bin/ipactl
-bin/ipastat
-include/ipa_mod.h
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110209150026.GA67365>