cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to symon 2.87

Browse Source 
- N.B. Packages are re-arranged. Previously we had symon-mon (client only),
symon-mux (mux only), and symon (both client + mux - i.e. the combination of
the two other packages). Now we just have two non-overlapping packages
symon+symux, as is normal for multi-packages in the tree.

pkg_add -u will handle renaming but not splitting, so if you used the
"combined" package you will need to "pkg_add symux" after this update.
This commit is contained in:
sthen 2014-10-30 17:04:22 +00:00
parent 20ba6a326d
commit 040e33107c
12 changed files with 35 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/quirks/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.186 2014/10/30 11:09:11 sthen Exp $
# $OpenBSD: Makefile,v 1.187 2014/10/30 17:04:22 sthen Exp $
COMMENT = exceptions to pkg_add rules
CATEGORIES = devel databases
DISTFILES =
# API.rev
PKGNAME = quirks-2.32
PKGNAME = quirks-2.33
PKG_ARCH = *
MAINTAINER = Marc Espie <espie@openbsd.org>

4
devel/quirks/files/Quirks.pm
View File

@ -1,7 +1,7 @@
#! /usr/bin/perl
# ex:ts=8 sw=4:
# $OpenBSD: Quirks.pm,v 1.191 2014/10/30 11:09:11 sthen Exp $
# $OpenBSD: Quirks.pm,v 1.192 2014/10/30 17:04:22 sthen Exp $
#
# Copyright (c) 2009 Marc Espie <espie@openbsd.org>
#
@ -354,6 +354,8 @@ my $stem_extensions = {
'mysql-server' => 'mariadb-server',
'mysql-tests' => 'mariadb-tests',
'py3-distribute' => 'py3-setuptools',
'symon-mon' => 'symon',
'symon-mux' => 'symux',
};
# reasons for obsolete packages

33
sysutils/symon/Makefile
View File

@ -1,14 +1,13 @@
# $OpenBSD: Makefile,v 1.62 2014/07/04 22:23:01 sthen Exp $
# $OpenBSD: Makefile,v 1.63 2014/10/30 17:04:22 sthen Exp $
COMMENT-main= active monitoring tool
COMMENT-main= active host monitoring tool
COMMENT-mux= symon data gatherer
V= 2.86
REVISION= 5
DISTNAME= symon-$V
WRKDIST= ${WRKDIR}/symon
PKGNAME-main= ${DISTNAME}
FULLPKGNAME-mon= symon-mon-$V
FULLPKGNAME-mux= symon-mux-$V
V= 2.87
DISTNAME= symon-$V
WRKDIST= ${WRKDIR}/symon
PKGNAME-main= ${DISTNAME}
FULLPKGNAME-mux= symux-$V
CATEGORIES= sysutils net
@ -19,21 +18,15 @@ MAINTAINER= Stuart Henderson <sthen@openbsd.org>
# BSD
PERMIT_PACKAGE_CDROM= Yes
WANTLIB= c fontconfig rrd
LIB_DEPENDS= net/rrdtool
WANTLIB-main= c
WANTLIB-mux= c fontconfig rrd
MASTER_SITES= ${HOMEPAGE}/philes/
MULTI_PACKAGES= -main -mon -mux
MULTI_PACKAGES= -main -mux
MODULES= perl
# client only package
COMMENT-mon= active host monitor
WANTLIB-mon= c
LIB_DEPENDS-mon=
# gatherer only package
COMMENT-mux= symon data gatherer
LIB_DEPENDS-mux= net/rrdtool
NO_TEST= Yes
@ -44,7 +37,7 @@ MAKE_ENV= CLIENTDIR="${P5SITE}" \
.ifdef DEBUG
# avoid stripping the binaries
MAKE_ENV+= DEBUG=1
MAKE_ENV+= DEBUG=1
.endif
# XXX disable pf queue support until it can be updated for new PF queues

4
sysutils/symon/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (symon-2.86.tar.gz) = w2RX5T6Ry7R4y1fZa/QMcYqFguCxm9TLokcAK3pgaLM=
SIZE (symon-2.86.tar.gz) = 106791
SHA256 (symon-2.87.tar.gz) = PA+hqgBz9mxFaX/8EruNpmnrZ66sIgQdISNbvFFahgI=
SIZE (symon-2.87.tar.gz) = 107607

20
sysutils/symon/patches/patch-client_SymuxClient_pm
View File

@ -1,20 +0,0 @@
$OpenBSD: patch-client_SymuxClient_pm,v 1.5 2014/03/20 12:26:33 sthen Exp $
--- client/SymuxClient.pm.orig Thu Mar 20 12:09:54 2014
+++ client/SymuxClient.pm Thu Mar 20 12:10:05 2014
@@ -267,6 +267,8 @@ Example:
=head2 METHODS
+=over 4
+
=item getitem (host, stream, item)
Refresh the measured data and get an item from a stream for a particular
@@ -303,5 +305,7 @@ Example:
"packets_out");
# which hosts packets_out was that?
print $sc->getsource();
+
+=back
=cut

12
sysutils/symon/patches/patch-platform_OpenBSD_sm_pfq_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-platform_OpenBSD_sm_pfq_c,v 1.1 2013/10/12 13:09:30 sthen Exp $
--- platform/OpenBSD/sm_pfq.c.orig Sat Oct 12 14:04:36 2013
+++ platform/OpenBSD/sm_pfq.c Sat Oct 12 14:05:25 2013
@@ -131,7 +131,7 @@ void
gets_pfq()
{
struct pfioc_altq qs;
- struct pfioc_qstats stats;
+ struct pfioc_altqstats stats;
union class_stats q;
unsigned int nqs;
unsigned int i;

11
sysutils/symon/pkg/DESCR-main
View File

@ -1,8 +1,3 @@
symon is a lightweight system monitor that measures cpu, memory,
interface and disk statistics every 5 seconds. This information is
then spooled over "the network" to symux for further processing.
The port will yield 3 packages:
symon-mon: symon daemon and manual.
symon-mux: symux daemon, manual and rrd creation script.
symon: all of the above rolled into a single package.
symon is a lightweight system monitor that measures cpu, memory, interface
and disk statistics every 5 seconds. This information is then spooled over
the network to symux (packaged separately) for further processing.

3
sysutils/symon/pkg/DESCR-mon
View File

@ -1,3 +0,0 @@
symon is a lightweight system monitor that measures cpu, memory,
interface and disk statistics every 5 seconds. This information is
then spooled over "the network" to symux for further processing.

10
sysutils/symon/pkg/DESCR-mux
View File

@ -1,3 +1,7 @@
symux is a heavyweight data gatherer for the lightweight symon system
monitor. symon is a lightweight system monitor that measures cpu,
memory, interface and disk statistics every 5 seconds.
symux is a data gatherer for symon, a lightweight system monitor that
measures cpu, memory, interface and disk statistics every 5 seconds and
records the results in RRD files.
A very simple sample perl client is included; the results can also be
graphed via "syweb" (packaged separately) or by any other method that can
work with RRD files.

16
sysutils/symon/pkg/PLIST-main
View File

@ -1,22 +1,12 @@
@comment $OpenBSD: PLIST-main,v 1.4 2014/03/20 12:26:33 sthen Exp $
@conflict symon-mon-*
@conflict symon-mux-*
@pkgpath sysutils/symon
@comment $OpenBSD: PLIST-main,v 1.5 2014/10/30 17:04:22 sthen Exp $
@conflict symon-<2.87
@pkgpath sysutils/symon,-mon
@newgroup _symon:535
@newuser _symon:535:_symon:daemon:symon Account:/var/empty:/sbin/nologin
@bin libexec/symon
@bin libexec/symux
@man man/man3p/SymuxClient.3p
@man man/man8/symon.8
@man man/man8/symux.8
${P5SITE}/SymuxClient.pm
share/examples/symon/
share/examples/symon/c_config.sh
share/examples/symon/c_smrrds.sh
share/examples/symon/getsymonitem.pl
share/examples/symon/symon.conf
@sample ${SYSCONFDIR}/symon.conf
share/examples/symon/symux.conf
@sample ${SYSCONFDIR}/symux.conf
@rcscript ${RCDIR}/symon
@rcscript ${RCDIR}/symux

11
sysutils/symon/pkg/PLIST-mon
View File

@ -1,11 +0,0 @@
@comment $OpenBSD: PLIST-mon,v 1.14 2014/03/20 12:26:33 sthen Exp $
@conflict symon-*
@newgroup _symon:535
@newuser _symon:535:_symon:daemon:symon Account:/var/empty:/sbin/nologin
@bin libexec/symon
@man man/man8/symon.8
share/examples/symon/
share/examples/symon/c_config.sh
share/examples/symon/symon.conf
@sample ${SYSCONFDIR}/symon.conf
@rcscript ${RCDIR}/symon

4
sysutils/symon/pkg/PLIST-mux
View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST-mux,v 1.14 2014/03/20 12:31:22 sthen Exp $
@conflict symon-*
@comment $OpenBSD: PLIST-mux,v 1.15 2014/10/30 17:04:22 sthen Exp $
@conflict symon-<2.87
@bin libexec/symux
@man man/man8/symux.8
@man man/man3p/SymuxClient.3p