[prev in list] [next in list] [prev in thread] [next in thread]
List: openbsd-ports
Subject: net/ipcad update
From: "Kirill Bychkov" <yason () linklevel ! net>
Date: 2011-05-30 12:46:47
Message-ID: 3321590de6f4a30b476408b82df67c61.squirrel () mail ! linklevel ! net
[Download RAW message or body]
Hi!
This patch updates ipcad to the latest version and adds rc script.
Tested on i386 in production for about a month. OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/ipcad/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile 19 Nov 2010 22:31:33 -0000 1.17
+++ Makefile 30 May 2011 12:02:27 -0000
@@ -3,8 +3,7 @@
COMMENT= IP accounting daemon simulating Cisco ip accounting
-DISTNAME= ipcad-3.4.4
-REVISION= 0
+DISTNAME= ipcad-3.7.3
CATEGORIES= net
HOMEPAGE= http://sourceforge.net/projects/ipcad/
@@ -29,8 +28,8 @@ do-install:
perl -pi -e 's:%%SYSCONFDIR%%:${SYSCONFDIR}:' \
${PREFIX}/man/man5/ipcad.conf.5
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ipcad
- ${INSTALL_DATA} ${WRKDIST}/ipcad.conf \
- ${PREFIX}/share/examples/ipcad/ipcad.conf.sample
+ ${INSTALL_DATA} ${WRKDIST}/ipcad.conf.default \
+ ${PREFIX}/share/examples/ipcad/ipcad.conf.default
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ipcad
.for f in AUTHORS BUGS COPYING README
${INSTALL_DATA} ${WRKDIST}/${f} ${PREFIX}/share/doc/ipcad
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/ipcad/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 5 Apr 2007 16:20:10 -0000 1.4
+++ distinfo 30 May 2011 12:02:27 -0000
@@ -1,5 +1,5 @@
-MD5 (ipcad-3.4.4.tar.gz) = Q1/ObFeFF6ddqgoqye2+9g==
-RMD160 (ipcad-3.4.4.tar.gz) = i0AxdBDzDXtbmXkzQD7x1mwPxCo=
-SHA1 (ipcad-3.4.4.tar.gz) = B0lP1HSvBtMxOdxfjL0PVcdkJps=
-SHA256 (ipcad-3.4.4.tar.gz) = yhUC6HtH6yiew8jEGzwVePXYsZHVhP79i5HMZOiLMKk=
-SIZE (ipcad-3.4.4.tar.gz) = 151558
+MD5 (ipcad-3.7.3.tar.gz) = ElYFJJlYiUFI7CbTyIGJ9Q==
+RMD160 (ipcad-3.7.3.tar.gz) = 7sJ97n8MppuFXh4qQir78Vb8aF0=
+SHA1 (ipcad-3.7.3.tar.gz) = e4iLZOryjLvDdRc80Ix/Zt3GP7Q=
+SHA256 (ipcad-3.7.3.tar.gz) = cjctRq415NfMdNlvuvi7CuGJqp7P2JAmSHrKeQwvBxY=
+SIZE (ipcad-3.7.3.tar.gz) = 172457
Index: patches/patch-ipcad_conf
===================================================================
RCS file: patches/patch-ipcad_conf
diff -N patches/patch-ipcad_conf
--- patches/patch-ipcad_conf 31 Mar 2004 07:53:08 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,37 +0,0 @@
-$OpenBSD: patch-ipcad_conf,v 1.3 2004/03/31 07:53:08 grange Exp $
---- ipcad.conf.orig 2004-03-11 13:33:16.000000000 +0600
-+++ ipcad.conf 2004-03-20 20:50:10.000000000 +0600
-@@ -130,11 +130,11 @@ rsh enable at 127.0.0.1;
- #
-
- rsh root@127.0.0.1 admin; /* Can shutdown ipcad */
--rsh staff@127.0.0.1 backup; /* Can dump/restore/import accounting table */
--rsh vlm@127.0.0.1; /* Can view and modify accounting tables */
-+#rsh staff@127.0.0.1 backup; /* Can dump/restore/import accounting table */
-+#rsh vlm@127.0.0.1; /* Can view and modify accounting tables */
- /* Note the order! */
--rsh luser@127.0.0.1 deny; /* Deny this user from even viewing tables */
--rsh 127.0.0.1 view-only; /* Other users can view current tables */
-+#rsh luser@127.0.0.1 deny; /* Deny this user from even viewing tables */
-+#rsh 127.0.0.1 view-only; /* Other users can view current tables */
-
-
- ##########################
-@@ -167,7 +167,7 @@ netflow timeout inactive 15; # Flow inac
- # to encourage you to change it.
- #
-
--chroot = /adm/tmp;
-+chroot = /var/ipcad;
-
- #
- # File to keep getpid() in it. ipcad will also hold a lock.
-@@ -177,7 +177,7 @@ chroot = /adm/tmp;
- # exists inside chrooted environment.
- #
-
--pidfile = /var/run/ipcad.pid;
-+pidfile = /ipcad.pid;
-
- #
- # UID/GID privileges dropping
Index: patches/patch-ipcad_conf_default
===================================================================
RCS file: patches/patch-ipcad_conf_default
diff -N patches/patch-ipcad_conf_default
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-ipcad_conf_default 30 May 2011 12:02:27 -0000
@@ -0,0 +1,28 @@
+$OpenBSD$
+--- ipcad.conf.default.orig Sun Apr 17 13:18:07 2011
++++ ipcad.conf.default Sun Apr 17 13:20:21 2011
+@@ -191,11 +191,11 @@ rsh enable at 127.0.0.1;
+ #
+
+ rsh root@127.0.0.1 admin; /* Can shutdown ipcad */
+-rsh staff@127.0.0.1 backup; /* Can dump/restore/import accounting table */
+-rsh yourself@127.0.0.1; /* Can view and modify accounting tables */
++#rsh staff@127.0.0.1 backup; /* Can dump/restore/import accounting table */
++#rsh yourself@127.0.0.1; /* Can view and modify accounting tables */
+ /* Note the order! */
+-rsh luser@127.0.0.1 deny; /* Deny this user from even viewing tables */
+-rsh 127.0.0.1 view-only; /* Other users can view current tables */
++#rsh luser@127.0.0.1 deny; /* Deny this user from even viewing tables */
++#rsh 127.0.0.1 view-only; /* Other users can view current tables */
+
+ # Keep IP packet time to live reasonably low to avoid remote attacks.
+ # (The rsh client must reside no more than three hops away from the
+@@ -226,7 +226,7 @@ dumpfile = ipcad.dump; # The file is inside chroot(),
+ # to encourage you to change it.
+ #
+
+-chroot = /adm/tmp;
++chroot = /var/ipcad;
+
+ #
+ # File to keep getpid() in it. ipcad will also hold a lock.
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/ipcad/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST 15 Sep 2004 18:17:41 -0000 1.5
+++ pkg/PLIST 30 May 2011 12:02:27 -0000
@@ -1,13 +1,14 @@
@comment $OpenBSD: PLIST,v 1.5 2004/09/15 18:17:41 espie Exp $
@man man/man5/ipcad.conf.5
@man man/man8/ipcad.8
-sbin/ipcad
+@bin sbin/ipcad
share/doc/ipcad/
share/doc/ipcad/AUTHORS
share/doc/ipcad/BUGS
share/doc/ipcad/COPYING
share/doc/ipcad/README
share/examples/ipcad/
-share/examples/ipcad/ipcad.conf.sample
+share/examples/ipcad/ipcad.conf.default
@sample ${SYSCONFDIR}/ipcad.conf
@extraunexec rm -rf /var/ipcad
+@rcscript ${RCDIR}/ipcad
Index: pkg/ipcad.rc
===================================================================
RCS file: pkg/ipcad.rc
diff -N pkg/ipcad.rc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/ipcad.rc 30 May 2011 12:02:27 -0000
@@ -0,0 +1,10 @@
+#!/bin/sh
+#
+# $OpenBSD$
+
+daemon="${TRUEPREFIX}/sbin/ipcad"
+daemon_flags="-d"
+
+. /etc/rc.d/rc.subr
+
+rc_cmd $1
["ipcad.diff" (application/octet-stream)]
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/ipcad/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile 19 Nov 2010 22:31:33 -0000 1.17
+++ Makefile 30 May 2011 12:02:27 -0000
@@ -3,8 +3,7 @@
COMMENT= IP accounting daemon simulating Cisco ip accounting
-DISTNAME= ipcad-3.4.4
-REVISION= 0
+DISTNAME= ipcad-3.7.3
CATEGORIES= net
HOMEPAGE= http://sourceforge.net/projects/ipcad/
@@ -29,8 +28,8 @@ do-install:
perl -pi -e 's:%%SYSCONFDIR%%:${SYSCONFDIR}:' \
${PREFIX}/man/man5/ipcad.conf.5
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ipcad
- ${INSTALL_DATA} ${WRKDIST}/ipcad.conf \
- ${PREFIX}/share/examples/ipcad/ipcad.conf.sample
+ ${INSTALL_DATA} ${WRKDIST}/ipcad.conf.default \
+ ${PREFIX}/share/examples/ipcad/ipcad.conf.default
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ipcad
.for f in AUTHORS BUGS COPYING README
${INSTALL_DATA} ${WRKDIST}/${f} ${PREFIX}/share/doc/ipcad
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/ipcad/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 5 Apr 2007 16:20:10 -0000 1.4
+++ distinfo 30 May 2011 12:02:27 -0000
@@ -1,5 +1,5 @@
-MD5 (ipcad-3.4.4.tar.gz) = Q1/ObFeFF6ddqgoqye2+9g==
-RMD160 (ipcad-3.4.4.tar.gz) = i0AxdBDzDXtbmXkzQD7x1mwPxCo=
-SHA1 (ipcad-3.4.4.tar.gz) = B0lP1HSvBtMxOdxfjL0PVcdkJps=
-SHA256 (ipcad-3.4.4.tar.gz) = yhUC6HtH6yiew8jEGzwVePXYsZHVhP79i5HMZOiLMKk=
-SIZE (ipcad-3.4.4.tar.gz) = 151558
+MD5 (ipcad-3.7.3.tar.gz) = ElYFJJlYiUFI7CbTyIGJ9Q==
+RMD160 (ipcad-3.7.3.tar.gz) = 7sJ97n8MppuFXh4qQir78Vb8aF0=
+SHA1 (ipcad-3.7.3.tar.gz) = e4iLZOryjLvDdRc80Ix/Zt3GP7Q=
+SHA256 (ipcad-3.7.3.tar.gz) = cjctRq415NfMdNlvuvi7CuGJqp7P2JAmSHrKeQwvBxY=
+SIZE (ipcad-3.7.3.tar.gz) = 172457
Index: patches/patch-ipcad_conf
===================================================================
RCS file: patches/patch-ipcad_conf
diff -N patches/patch-ipcad_conf
--- patches/patch-ipcad_conf 31 Mar 2004 07:53:08 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,37 +0,0 @@
-$OpenBSD: patch-ipcad_conf,v 1.3 2004/03/31 07:53:08 grange Exp $
---- ipcad.conf.orig 2004-03-11 13:33:16.000000000 +0600
-+++ ipcad.conf 2004-03-20 20:50:10.000000000 +0600
-@@ -130,11 +130,11 @@ rsh enable at 127.0.0.1;
- #
-
- rsh root@127.0.0.1 admin; /* Can shutdown ipcad */
--rsh staff@127.0.0.1 backup; /* Can dump/restore/import accounting table */
--rsh vlm@127.0.0.1; /* Can view and modify accounting tables */
-+#rsh staff@127.0.0.1 backup; /* Can dump/restore/import accounting table */
-+#rsh vlm@127.0.0.1; /* Can view and modify accounting tables */
- /* Note the order! */
--rsh luser@127.0.0.1 deny; /* Deny this user from even viewing tables */
--rsh 127.0.0.1 view-only; /* Other users can view current tables */
-+#rsh luser@127.0.0.1 deny; /* Deny this user from even viewing tables */
-+#rsh 127.0.0.1 view-only; /* Other users can view current tables */
-
-
- ##########################
-@@ -167,7 +167,7 @@ netflow timeout inactive 15; # Flow inac
- # to encourage you to change it.
- #
-
--chroot = /adm/tmp;
-+chroot = /var/ipcad;
-
- #
- # File to keep getpid() in it. ipcad will also hold a lock.
-@@ -177,7 +177,7 @@ chroot = /adm/tmp;
- # exists inside chrooted environment.
- #
-
--pidfile = /var/run/ipcad.pid;
-+pidfile = /ipcad.pid;
-
- #
- # UID/GID privileges dropping
Index: patches/patch-ipcad_conf_default
===================================================================
RCS file: patches/patch-ipcad_conf_default
diff -N patches/patch-ipcad_conf_default
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-ipcad_conf_default 30 May 2011 12:02:27 -0000
@@ -0,0 +1,28 @@
+$OpenBSD$
+--- ipcad.conf.default.orig Sun Apr 17 13:18:07 2011
++++ ipcad.conf.default Sun Apr 17 13:20:21 2011
+@@ -191,11 +191,11 @@ rsh enable at 127.0.0.1;
+ #
+
+ rsh root@127.0.0.1 admin; /* Can shutdown ipcad */
+-rsh staff@127.0.0.1 backup; /* Can dump/restore/import accounting table */
+-rsh yourself@127.0.0.1; /* Can view and modify accounting tables */
++#rsh staff@127.0.0.1 backup; /* Can dump/restore/import accounting table */
++#rsh yourself@127.0.0.1; /* Can view and modify accounting tables */
+ /* Note the order! */
+-rsh luser@127.0.0.1 deny; /* Deny this user from even viewing tables */
+-rsh 127.0.0.1 view-only; /* Other users can view current tables */
++#rsh luser@127.0.0.1 deny; /* Deny this user from even viewing tables */
++#rsh 127.0.0.1 view-only; /* Other users can view current tables */
+
+ # Keep IP packet time to live reasonably low to avoid remote attacks.
+ # (The rsh client must reside no more than three hops away from the
+@@ -226,7 +226,7 @@ dumpfile = ipcad.dump; # The file is inside chroot(),
+ # to encourage you to change it.
+ #
+
+-chroot = /adm/tmp;
++chroot = /var/ipcad;
+
+ #
+ # File to keep getpid() in it. ipcad will also hold a lock.
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/ipcad/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST 15 Sep 2004 18:17:41 -0000 1.5
+++ pkg/PLIST 30 May 2011 12:02:27 -0000
@@ -1,13 +1,14 @@
@comment $OpenBSD: PLIST,v 1.5 2004/09/15 18:17:41 espie Exp $
@man man/man5/ipcad.conf.5
@man man/man8/ipcad.8
-sbin/ipcad
+@bin sbin/ipcad
share/doc/ipcad/
share/doc/ipcad/AUTHORS
share/doc/ipcad/BUGS
share/doc/ipcad/COPYING
share/doc/ipcad/README
share/examples/ipcad/
-share/examples/ipcad/ipcad.conf.sample
+share/examples/ipcad/ipcad.conf.default
@sample ${SYSCONFDIR}/ipcad.conf
@extraunexec rm -rf /var/ipcad
+@rcscript ${RCDIR}/ipcad
Index: pkg/ipcad.rc
===================================================================
RCS file: pkg/ipcad.rc
diff -N pkg/ipcad.rc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/ipcad.rc 30 May 2011 12:02:27 -0000
@@ -0,0 +1,10 @@
+#!/bin/sh
+#
+# $OpenBSD$
+
+daemon="${TRUEPREFIX}/sbin/ipcad"
+daemon_flags="-d"
+
+. /etc/rc.d/rc.subr
+
+rc_cmd $1
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic