Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2015Q3

Browse Source
This commit is contained in:
Lionel Sambuc
2015-10-03 03:37:01 -07:00
committed by Lionel Sambuc
parent f641581404
commit 9d819b6d54
7578 changed files with 228314 additions and 80018 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sysutils/Makefile
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.635 2015/06/11 12:22:56 abs Exp $
# $NetBSD: Makefile,v 1.643 2015/09/12 22:55:39 joerg Exp $
#
COMMENT= System utilities
@@ -6,6 +6,7 @@ COMMENT= System utilities
SUBDIR+= 855resolution
SUBDIR+= 915resolution
SUBDIR+= 9base
SUBDIR+= WCMCommander
SUBDIR+= acpica-utils
SUBDIR+= acpidump
SUBDIR+= adtool
@@ -47,6 +48,7 @@ SUBDIR+= btpin-qt
SUBDIR+= bubblemon
SUBDIR+= bup
SUBDIR+= burn
SUBDIR+= burp
SUBDIR+= capistrano
SUBDIR+= ccd2iso
SUBDIR+= ccze
@@ -252,6 +254,7 @@ SUBDIR+= heirloom-yes
SUBDIR+= hfsutils
SUBDIR+= hs-temporary
SUBDIR+= htop
SUBDIR+= hytctl
SUBDIR+= i2ocfg
SUBDIR+= i810switch
SUBDIR+= iat
@@ -296,6 +299,7 @@ SUBDIR+= liboobs
SUBDIR+= libpciaccess
SUBDIR+= libvirt
SUBDIR+= lilo
SUBDIR+= lnav
SUBDIR+= lockf
SUBDIR+= logfinder
SUBDIR+= logrider
@@ -327,6 +331,7 @@ SUBDIR+= mrsync
SUBDIR+= mtools
SUBDIR+= mtoolsfm
SUBDIR+= mtscan
SUBDIR+= mtx
SUBDIR+= munin-doc
SUBDIR+= munin-node
SUBDIR+= munin-server
@@ -402,6 +407,7 @@ SUBDIR+= pv
SUBDIR+= pwgen
SUBDIR+= py-attic
SUBDIR+= py-augeas
SUBDIR+= py-borg
SUBDIR+= py-collectd
SUBDIR+= py-dbus
SUBDIR+= py-gnome-menus
@@ -428,6 +434,7 @@ SUBDIR+= rox
SUBDIR+= rsnapshot
SUBDIR+= rsyslog
SUBDIR+= rsyslog-dbi
SUBDIR+= rsyslog-elasticsearch
SUBDIR+= rsyslog-gnutls
SUBDIR+= rsyslog-gssapi
SUBDIR+= rsyslog-libgcrypt
@@ -605,6 +612,7 @@ SUBDIR+= xfce4-cpugraph-plugin
SUBDIR+= xfce4-diskperf-plugin
SUBDIR+= xfce4-fsguard-plugin
SUBDIR+= xfce4-genmon-plugin
SUBDIR+= xfce4-gvfs-mount-plugin
SUBDIR+= xfce4-mount-plugin
SUBDIR+= xfce4-netload-plugin
SUBDIR+= xfce4-quicklauncher-plugin

2
sysutils/WCMCommander/DESCR Normal file
View File

@@ -0,0 +1,2 @@
Two-panel file manager similar to Far Manager, based on the
code of Wal Commander.

24
sysutils/WCMCommander/Makefile Normal file
View File

@@ -0,0 +1,24 @@
# $NetBSD: Makefile,v 1.1 2015/09/08 13:13:19 wiz Exp $
DISTNAME= WCMCommander-0.20.0
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_GITHUB:=corporateshark/}
GITHUB_PROJECT= WCMCommander
GITHUB_TAG= release-${PKGVERSION_NOREV}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://wcm.linderdaum.com/
COMMENT= Two-panel file manager
#LICENSE= mit # includes fonts with perhaps other licenses
WRKSRC= ${WRKDIR}/${DISTNAME:S/-/-release-/}
USE_CMAKE= yes
USE_LANGUAGES= c c++
USE_TOOLS+= gmake
CMAKE_ARGS+= -DWITH_SMBCLIENT:BOOL=OFF
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../security/libssh2/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

45
sysutils/WCMCommander/PLIST Normal file
View File

@@ -0,0 +1,45 @@
@comment $NetBSD: PLIST,v 1.1 2015/09/08 13:13:19 wiz Exp $
bin/wcm
share/applications/wcm.desktop
share/pixmaps/wcm.png
share/wcm/config.default
share/wcm/fonts/DejaVuSans-Bold.ttf
share/wcm/fonts/DejaVuSans.ttf
share/wcm/fonts/DejaVuSansMono-Bold.ttf
share/wcm/fonts/DejaVuSansMono.ttf
share/wcm/fonts/DejaVuSerif-Bold.ttf
share/wcm/fonts/DejaVuSerif.ttf
share/wcm/fonts/DejaVuSerifCondensed-Bold.ttf
share/wcm/fonts/DejaVuSerifCondensed.ttf
share/wcm/fonts/LiberationMono-Regular.ttf
share/wcm/lang/help.ru
share/wcm/lang/list
share/wcm/lang/ltext.ru
share/wcm/shl/c.shl
share/wcm/shl/config.cfg
share/wcm/shl/config.shl
share/wcm/shl/cpp.shl
share/wcm/shl/glsl.shl
share/wcm/shl/java.shl
share/wcm/shl/latex.shl
share/wcm/shl/pas.shl
share/wcm/shl/perl.shl
share/wcm/shl/php.shl
share/wcm/shl/python.shl
share/wcm/shl/sh.shl
share/wcm/shl/shl.shl
share/wcm/shl/shlconfig.shl
share/wcm/shl/shlconfig_v2.shl
share/wcm/shl/sql.shl
share/wcm/shl/undef.shl
share/wcm/shl/xml.shl
share/wcm/styles/Black.style
share/wcm/styles/Default.style
share/wcm/styles/README
share/wcm/styles/README.solarized
share/wcm/styles/Solarized-light.style
share/wcm/styles/Solarized.style
share/wcm/styles/Solarized.style.src
share/wcm/styles/White.style
share/wcm/styles/solarize.sh
share/wcm/styles/solarized-gen.py

8
sysutils/WCMCommander/distinfo Normal file
View File

@@ -0,0 +1,8 @@
$NetBSD: distinfo,v 1.2 2015/09/08 13:21:46 wiz Exp $
SHA1 (WCMCommander-0.20.0.tar.gz) = 77f034f0da7f13b362b742b965ad9fb444892802
RMD160 (WCMCommander-0.20.0.tar.gz) = 3f1f93d484846404542f3d4955abdb01f9d5417b
Size (WCMCommander-0.20.0.tar.gz) = 5005688 bytes
SHA1 (patch-src_tcp__sock.cpp) = 5d0758a7f0e53255de1ea9a47ad12b7a7e3b4809
SHA1 (patch-src_vfs_vfs.cpp) = 47270fe6ee671370635fb880a998630bc2011143
SHA1 (patch-src_wal_wal__sys__api.cpp) = 435a3a5ff4f6f55310f7aa22bbd8b76045302263

16
sysutils/WCMCommander/patches/patch-src_tcp__sock.cpp Normal file
View File

@@ -0,0 +1,16 @@
$NetBSD: patch-src_tcp__sock.cpp,v 1.2 2015/09/08 13:21:46 wiz Exp $
NetBSD does not have gethostbyname_r() either.
https://github.com/corporateshark/WCMCommander/pull/509
--- src/tcp_sock.cpp.orig 2015-04-24 21:50:22.000000000 +0000
+++ src/tcp_sock.cpp
@@ -64,7 +64,7 @@ bool GetHostIp( const char* utf8, unsign
struct hostent* ret;
-#if defined( __APPLE__ ) || defined(__OpenBSD__)
+#if defined( __APPLE__ ) || defined(__OpenBSD__) || defined(__NetBSD__)
ret = gethostbyname( utf8 );
if ( !ret )

21
sysutils/WCMCommander/patches/patch-src_vfs_vfs.cpp Normal file
View File

@@ -0,0 +1,21 @@
$NetBSD: patch-src_vfs_vfs.cpp,v 1.2 2015/09/08 13:21:46 wiz Exp $
Use BSD headers on NetBSD, and use statvfs (statfs was removed).
https://github.com/corporateshark/WCMCommander/pull/509
--- src/vfs/vfs.cpp.orig 2015-04-24 21:50:22.000000000 +0000
+++ src/vfs/vfs.cpp
@@ -1113,9 +1113,12 @@ FSWin32Net::~FSWin32Net()
// for statfs()
#ifdef __linux__
# include <sys/statfs.h>
-#elif defined(__FreeBSD__) || defined(__OpenBSD__)
+#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
# include <sys/param.h>
# include <sys/mount.h>
+# if defined(__NetBSD__)
+# define statfs statvfs
+# endif
#endif
#ifdef __linux__

15
sysutils/WCMCommander/patches/patch-src_wal_wal__sys__api.cpp Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-src_wal_wal__sys__api.cpp,v 1.2 2015/09/08 13:21:46 wiz Exp $
Handle NetBSD like the other BSDs.
https://github.com/corporateshark/WCMCommander/pull/509
--- src/wal/wal_sys_api.cpp.orig 2015-04-24 21:50:22.000000000 +0000
+++ src/wal/wal_sys_api.cpp
@@ -394,6 +394,7 @@ namespace wal
#if defined(__APPLE__) || \
defined(__FreeBSD__) || \
+ defined(__NetBSD__) || \
defined(__OpenBSD__) || \
defined(_POSIX_C_SOURCE) && defined(_XOPEN_SOURCE) && defined(_GNU_SOURCE) && (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && ! _GNU_SOURCE
strerror_r( err, buf, size );

4
sysutils/amanda-common/Makefile
View File

@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.71 2015/06/12 10:51:11 wiz Exp $
# $NetBSD: Makefile,v 1.72 2015/08/09 22:50:09 dholland Exp $
PKGNAME= amanda-common-${AMANDA_VERSION}
PKGREVISION= 8
PKGREVISION= 9
COMMENT= Common libraries and binaries for Amanda

7
sysutils/amanda-common/distinfo
View File

@@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.17 2015/03/30 01:14:22 gdt Exp $
$NetBSD: distinfo,v 1.18 2015/08/09 22:50:09 dholland Exp $
SHA1 (amanda-3.3.1.tar.gz) = 22273381f61319e46e1da9d7029ca2b3991eee98
RMD160 (amanda-3.3.1.tar.gz) = 0d66ad25fd905901a1afd3651bd6c1e00db9af8d
@@ -10,6 +10,7 @@ SHA1 (patch-client-src_Makefile.am) = 641ef76fd1ea413b416704e1e52e25a93a596442
SHA1 (patch-client-src_sendbackup-dump.c) = aea1aca0bbcdab0c393b012a592cbc5ca458acec
SHA1 (patch-client-src_sendsize.c) = 32a1627c250b6413e4695a610bba59796c6e7ed6
SHA1 (patch-common-src_Makefile.in) = 422e4d519d8797e686d62cfeca8cda2e8a4a8bb3
SHA1 (patch-common-src_conffile.c) = b25e6a7e7f7c6841e28aa93587996b017bfefc2c
SHA1 (patch-common-src_glib-util.c) = 8b62499f6730843fbf9e872adc80978b77b5573f
SHA1 (patch-common-src_glib-util.h) = 6d5b14acd7a44b17a52ebc697f5354db2a4b04f9
SHA1 (patch-common-src_security-util.h) = c628cc19a624da2cfabdb7d488bc2cd2d4b955a4
@@ -20,6 +21,10 @@ SHA1 (patch-config_macro-archive_xsltproc.m4) = 20324db1ce3db016fa89fe39df5a8133
SHA1 (patch-device-src_Makefile.am) = 29fd554033ff0ff7b1d98a08306f157ced7324c5
SHA1 (patch-device-src_device.c) = 31cb823dcce0f7f3d9de8f9def1a0f025ab10876
SHA1 (patch-example_Makefile.am) = 8d2dac1abdc473fbf94489bcb620a42a665fd27a
SHA1 (patch-example_amanda.conf.in) = 4be9bd71f9965d9dd351ae2666ee1cb99e8aea94
SHA1 (patch-example_chg-multi-conf) = 2a586e02e5766d89c71061a5b344dc13d98ed56a
SHA1 (patch-example_template.d_advanced.conf.in) = 654d896c321b81f5db15fddd8a1c08a528921d8a
SHA1 (patch-man_xml-source_amanda.conf.5.xml) = a5a40433fc011c43524076f6c4164e51b2639836
SHA1 (patch-ndmp-src_ndmp2__xdr.c) = 9ae6d78c2192ece83a1aa141cb04c9761969ca5b
SHA1 (patch-ndmp-src_ndmp3__xdr.c) = a080c7337ede4fe75f9735fb3355d0aa16b0af6c
SHA1 (patch-ndmp-src_ndmp4__xdr.c) = 339b0d539754127446acf6456fb385f00b1fbcc3

29
sysutils/amanda-common/patches/patch-common-src_conffile.c Normal file
View File

@@ -0,0 +1,29 @@
$NetBSD: patch-common-src_conffile.c,v 1.1 2015/08/09 22:50:10 dholland Exp $
Update the defaults for a few things to use LOCALSTATEDIR (which will
be $VARBASE/amanda) instead of compiling in /usr/adm, which no system
has shipped in the last twenty years or so. PR 38958.
--- common-src/conffile.c.orig 2012-02-21 11:36:51.000000000 +0000
+++ common-src/conffile.c
@@ -35,6 +35,7 @@
#include "util.h"
#include "conffile.h"
#include "clock.h"
+#include "configmake.h"
#include <glib.h>
/*
@@ -5330,9 +5331,9 @@ init_defaults(
conf_init_str (&conf_data[CNF_LABELSTR] , ".*");
conf_init_str (&conf_data[CNF_TAPELIST] , "tapelist");
conf_init_str (&conf_data[CNF_DISKFILE] , "disklist");
- conf_init_str (&conf_data[CNF_INFOFILE] , "/usr/adm/amanda/curinfo");
- conf_init_str (&conf_data[CNF_LOGDIR] , "/usr/adm/amanda");
- conf_init_str (&conf_data[CNF_INDEXDIR] , "/usr/adm/amanda/index");
+ conf_init_str (&conf_data[CNF_INFOFILE] , LOCALSTATEDIR "/curinfo");
+ conf_init_str (&conf_data[CNF_LOGDIR] , LOCALSTATEDIR);
+ conf_init_str (&conf_data[CNF_INDEXDIR] , LOCALSTATEDIR "/index");
conf_init_ident (&conf_data[CNF_TAPETYPE] , "DEFAULT_TAPE");
conf_init_identlist(&conf_data[CNF_HOLDINGDISK] , NULL);
conf_init_int (&conf_data[CNF_DUMPCYCLE] , 10);

17
sysutils/amanda-common/patches/patch-example_amanda.conf.in Normal file
View File

@@ -0,0 +1,17 @@
$NetBSD: patch-example_amanda.conf.in,v 1.1 2015/08/09 22:50:10 dholland Exp $
Remove references to /usr/adm as no system has shipped with such a
directory in probably a good twenty years. Say /var or /var/local
instead. PR 38958.
--- example/amanda.conf.in~ 2012-02-21 11:36:41.000000000 +0000
+++ example/amanda.conf.in
@@ -217,7 +217,7 @@ holdingdisk hd1 {
# Amanda needs a few Mb of diskspace for the log and debug files,
# as well as a database. This stuff can grow large, so the conf directory
-# isn't usually appropriate. Some sites use /usr/local/var and some /usr/adm.
+# isn't usually appropriate. A typical place is /var or /var/local.
# Create an amanda directory under there. You need a separate infofile and
# logdir for each configuration, so create subdirectories for each conf and
# put the files there. Specify the locations below.

17
sysutils/amanda-common/patches/patch-example_chg-multi-conf Normal file
View File

@@ -0,0 +1,17 @@
$NetBSD: patch-example_chg-multi-conf,v 1.1 2015/08/09 22:50:10 dholland Exp $
Remove references to /usr/adm as no system has shipped with such a
directory in probably a good twenty years. Use /var instead.
PR 38958.
--- example/chg-multi.conf~ 2012-02-21 11:36:41.000000000 +0000
+++ example/chg-multi.conf
@@ -51,7 +51,7 @@ needeject 0
ejectdelay 0
# Names a status file where the current ``changer'' state is stored.
-statefile /usr/adm/amanda/csd/changer-status
+statefile /var/amanda/csd/changer-status
# What are the slot numbers used in the tape rack?
firstslot 1

17
sysutils/amanda-common/patches/patch-example_template.d_advanced.conf.in Normal file
View File

@@ -0,0 +1,17 @@
$NetBSD: patch-example_template.d_advanced.conf.in,v 1.1 2015/08/09 22:50:10 dholland Exp $
Remove references to /usr/adm as no system has shipped with such a
directory in probably a good twenty years. Say /var or /var/local
instead. PR 38958.
--- example/template.d/advanced.conf.in~ 2012-02-21 11:36:41.000000000 +0000
+++ example/template.d/advanced.conf.in
@@ -84,7 +84,7 @@ autoflush no
# Amanda needs a few Mb of diskspace for the log and debug files,
# as well as a database. This stuff can grow large, so the conf directory
-# isn't usually appropriate. Some sites use /usr/local/var and some /usr/adm.
+# isn't usually appropriate. A typical place is /var or /var/local.
# Create an amanda directory under there. You need a separate infofile and
# logdir for each configuration, so create subdirectories for each conf and
# put the files there. Specify the locations below.

44
sysutils/amanda-common/patches/patch-man_xml-source_amanda.conf.5.xml Normal file
View File

@@ -0,0 +1,44 @@
$NetBSD: patch-man_xml-source_amanda.conf.5.xml,v 1.1 2015/08/09 22:50:10 dholland Exp $
Remove references to /usr/adm as no system has shipped with such a
directory in probably a good twenty years. Use /var instead.
PR 38958.
--- man/xml-source/amanda.conf.5.xml~ 2012-02-21 11:36:43.000000000 +0000
+++ man/xml-source/amanda.conf.5.xml
@@ -666,7 +666,7 @@ option.</para>
<term><amkeyword>changerfile</amkeyword> <amtype>string</amtype></term>
<listitem>
<para>Default:
-<amdefault>&quot;/usr/adm/amanda/log/changer-status&quot;</amdefault>.
+<amdefault>&quot;/var/amanda/log/changer-status&quot;</amdefault>.
A tape changer configuration parameter.
Usage depends on the particular changer defined with the
<amkeyword>tpchanger</amkeyword>
@@ -1039,7 +1039,7 @@ file holding client hosts, disks and oth
<term><amkeyword>infofile</amkeyword> <amtype>string</amtype></term>
<listitem>
<para>Default:
-<amdefault>&quot;/usr/adm/amanda/curinfo&quot;</amdefault>.
+<amdefault>&quot;/var/amanda/curinfo&quot;</amdefault>.
The file or directory name for the historical information database.
If Amanda was configured to use DBM databases, this is the base file
name for them.
@@ -1052,7 +1052,7 @@ client, then a directory per disk, then
<term><amkeyword>logdir</amkeyword> <amtype>string</amtype></term>
<listitem>
<para>Default:
-<amdefault>&quot;/usr/adm/amanda&quot;</amdefault>.
+<amdefault>&quot;/var/amanda&quot;</amdefault>.
The directory for the
<command>amdump</command>
and
@@ -1064,7 +1064,7 @@ files.</para>
<term><amkeyword>indexdir</amkeyword> <amtype>string</amtype></term>
<listitem>
<para>Default
-<amdefault>&quot;/usr/adm/amanda/index&quot;</amdefault>.
+<amdefault>&quot;/var/amanda/index&quot;</amdefault>.
The directory where index files (backup image catalogues) are stored.
Index files are
only generated for filesystems whose

7
sysutils/amanda-server/Makefile
View File

@@ -1,13 +1,14 @@
# $NetBSD: Makefile,v 1.58 2015/03/27 23:45:29 gdt Exp $
# $NetBSD: Makefile,v 1.59 2015/07/09 10:31:28 bouyer Exp $
PKGNAME= amanda-server-${AMANDA_VERSION}
PKGREVISION= 3
PKGREVISION= 4
COMMENT= Server part of Amanda, a network backup system
DEPENDS+= mtx-[0-9]*:../../sysutils/mtx
USE_TOOLS+= awk:run mail:run
CONFIGURE_ENV+= MAILER=${TOOLS_PATH.mail}
CONFIGURE_ENV+= MAILER=${TOOLS_PATH.mail} MTX=${PREFIX}/sbin/mtx
CONFIGURE_ARGS+= --without-client --without-gnuplot
BUILD_DIRS= device-src server-src changer-src

4
sysutils/apcupsd/Makefile
View File

@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.76 2013/12/11 11:55:17 jperkin Exp $
# $NetBSD: Makefile,v 1.78 2015/08/18 07:31:17 wiz Exp $
DISTNAME= apcupsd-3.14.9
PKGREVISION= 9
PKGREVISION= 11
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=apcupsd/}

3
sysutils/bbsload/Makefile
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.15 2012/10/23 19:50:52 asau Exp $
# $NetBSD: Makefile,v 1.16 2015/07/04 16:18:39 joerg Exp $
#
DISTNAME= bbsload-0.2.6
@@ -12,7 +12,6 @@ COMMENT= Small (in dimensions) tool to display the average load
GNU_CONFIGURE= YES
USE_LANGUAGES= c c++
USE_X11BASE= YES
INSTALLATION_DIRS= ${PKGMANDIR}/man1

4
sysutils/burp/DESCR Normal file
View File

@@ -0,0 +1,4 @@
Burp is a backup and restore program. It uses librsync in order to
save on the amount of space that is used by each backup. It also uses VSS
(Volume Shadow Copy Service) to make snapshots when backing up Windows
computers.

47
sysutils/burp/Makefile Normal file
View File

@@ -0,0 +1,47 @@
# $NetBSD: Makefile,v 1.2 2015/09/23 12:03:48 joerg Exp $
#
DISTNAME= burp-1.4.40
CATEGORIES= sysutils archivers
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=burp/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://burp.grke.net
COMMENT= Networked backup and restore program
LICENSE= gnu-agpl-v3
USE_LANGUAGES= c c++
GNU_CONFIGURE= yes
PKG_SYSCONFSUBDIR= burp
SUBST_CLASSES+= dirs
SUBST_STAGE.dirs= pre-install
SUBST_MESSAGE.dirs= Fixing directories
SUBST_FILES.dirs= configs/server/burp.conf \
configs/server/summary_script \
configs/client/burp.conf \
configs/CA/CA.cnf \
configs/CA/burp_ca \
manpages/*.8
SUBST_SED.dirs= -e 's,@LIBEXECDIR@,${PREFIX}/libexec/burp,' \
-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR:Q},' \
-e 's,@SBINDIR@,${PREFIX}/sbin,'
REPLACE_SH+= configs/certs/CA/burp_ca \
configs/server/notify_script \
configs/server/timer_script
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} \
--mandir=${PREFIX}/${PKGMANDIR} \
--sbindir=${PREFIX}/sbin
INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples/burp \
libexecdir=${PREFIX}/libexec/burp
.include "../../devel/popt/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../net/librsync/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

20
sysutils/burp/PLIST Normal file
View File

@@ -0,0 +1,20 @@
@comment $NetBSD: PLIST,v 1.1 2015/09/12 22:55:18 joerg Exp $
libexec/burp/notify_script
libexec/burp/ssl_extra_checks_script
libexec/burp/summary_script
libexec/burp/timer_script
man/man8/bedup.8
man/man8/burp.8
man/man8/burp_ca.8
man/man8/vss_strip.8
sbin/bedup
sbin/burp
sbin/burp_ca
sbin/vss_strip
share/examples/burp/autoupgrade/server/win32/script
share/examples/burp/autoupgrade/server/win64/script
share/examples/burp/burp.conf
share/examples/burp/burp-server.conf
share/examples/burp/CA.cnf
share/examples/burp/clientconfdir/incexc/example
share/examples/burp/clientconfdir/testclient

16
sysutils/burp/distinfo Normal file
View File

@@ -0,0 +1,16 @@
$NetBSD: distinfo,v 1.2 2015/09/23 12:03:48 joerg Exp $
SHA1 (burp-1.4.40.tar.bz2) = b06dbe9d1440b9e7915d35ad0c23b9d120fec10e
RMD160 (burp-1.4.40.tar.bz2) = 3ba2a60605562bbff7bacc600ee511c3ce020995
Size (burp-1.4.40.tar.bz2) = 712937 bytes
SHA1 (patch-Makefile.in) = 3df0458b1fc50cc03d8f69a864830ab52e9d0f8d
SHA1 (patch-configs_certs_CA_CA.cnf) = e58da075d16ecd16454b8b08dd6070101fa24475
SHA1 (patch-configs_certs_CA_burp__ca) = cdcb697e0a40c612ef3881a0abdcbce89aa78980
SHA1 (patch-configs_client_burp.conf) = b61837e0a4c358a12060ebb6b4a42e26a9667d0d
SHA1 (patch-configs_server_burp.conf) = bf5a41c09117519b3b198ca1a13951a552a100c1
SHA1 (patch-configs_server_summary__script) = 068cec66b0634f0746f94891e1390097ec0ef96c
SHA1 (patch-manpages_Makefile.in) = 710bf51bd43c0ecbe8987a843b27fd0e460342f5
SHA1 (patch-manpages_bedup.8) = 5e1a2e3c42118d98c9b66a0bc5cafb2eb9c09f11
SHA1 (patch-manpages_burp.8) = 81879e11cf917c36467513aeb440d0ab2dbad142
SHA1 (patch-manpages_burp__ca.8) = f9ac9ffe1f67df040c939bb1afcf614869695034
SHA1 (patch-src-xattr.c) = 105aa2c67fde7007b525d6ff93e0d9ce67ee2f4f

22
sysutils/burp/patches/patch-Makefile.in Normal file
View File

@@ -0,0 +1,22 @@
$NetBSD: patch-Makefile.in,v 1.1 2015/09/12 22:55:18 joerg Exp $
--- Makefile.in.orig 2015-07-01 11:45:08.000000000 +0000
+++ Makefile.in
@@ -112,12 +112,13 @@ installation: install
install: installdirs
@for I in $(all_subdirs); do (cd $$I && $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1); done
+ ${BSD_INSTALL_SCRIPT_DIR} ${DESTDIR}${libexecdir}
+ ${BSD_INSTALL_SCRIPT} configs/server/notify_script $(DESTDIR)${libexecdir}
+ ${BSD_INSTALL_SCRIPT} configs/server/ssl_extra_checks_script $(DESTDIR)${libexecdir}
+ ${BSD_INSTALL_SCRIPT} configs/server/summary_script $(DESTDIR)${libexecdir}
+ ${BSD_INSTALL_SCRIPT} configs/server/timer_script $(DESTDIR)${libexecdir}
@if [ ! -f $(DESTDIR)$(sysconfdir)/burp-server.conf ] ; then cp configs/server/burp.conf $(DESTDIR)$(sysconfdir)/burp-server.conf ; fi
@if [ ! -f $(DESTDIR)$(sysconfdir)/burp.conf ] ; then cp configs/client/burp.conf $(DESTDIR)$(sysconfdir)/burp.conf ; fi
- @if [ ! -f $(DESTDIR)$(sysconfdir)/notify_script ] ; then cp configs/server/notify_script $(DESTDIR)$(sysconfdir)/notify_script && chmod 755 $(DESTDIR)$(sysconfdir)/notify_script ; fi
- @if [ ! -f $(DESTDIR)$(sysconfdir)/ssl_extra_checks_script ] ; then cp configs/server/ssl_extra_checks_script $(DESTDIR)$(sysconfdir)/ssl_extra_checks_script && chmod 755 $(DESTDIR)$(sysconfdir)/ssl_extra_checks_script ; fi
- @if [ ! -f $(DESTDIR)$(sysconfdir)/summary_script ] ; then cp configs/server/summary_script $(DESTDIR)$(sysconfdir)/summary_script && chmod 755 $(DESTDIR)$(sysconfdir)/summary_script ; fi
- @if [ ! -f $(DESTDIR)$(sysconfdir)/timer_script ] ; then cp configs/server/timer_script $(DESTDIR)$(sysconfdir)/timer_script && chmod 755 $(DESTDIR)$(sysconfdir)/timer_script ; fi
@if [ ! -f $(DESTDIR)$(sysconfdir)/autoupgrade/server/win32/script ] ; then cp configs/server/autoupgrade/windows.script $(DESTDIR)$(sysconfdir)/autoupgrade/server/win32/script ; fi
@if [ ! -f $(DESTDIR)$(sysconfdir)/autoupgrade/server/win64/script ] ; then cp configs/server/autoupgrade/windows.script $(DESTDIR)$(sysconfdir)/autoupgrade/server/win64/script ; fi
@if [ ! -f $(DESTDIR)$(sysconfdir)/CA.cnf ] ; then cp configs/certs/CA/CA.cnf $(DESTDIR)$(sysconfdir)/CA.cnf ; fi

13
sysutils/burp/patches/patch-configs_certs_CA_CA.cnf Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-configs_certs_CA_CA.cnf,v 1.1 2015/09/12 22:55:18 joerg Exp $
--- configs/certs/CA/CA.cnf.orig 2015-07-01 11:45:08.000000000 +0000
+++ configs/certs/CA/CA.cnf
@@ -1,7 +1,7 @@
# simple config for burp_ca
RANDFILE = /dev/urandom
-CA_DIR = /etc/burp/CA
+CA_DIR = @PKG_SYSCONFDIR@/CA
[ ca ]

13
sysutils/burp/patches/patch-configs_certs_CA_burp__ca Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-configs_certs_CA_burp__ca,v 1.1 2015/09/12 22:55:18 joerg Exp $
--- configs/certs/CA/burp_ca.orig 2015-05-29 23:33:04.000000000 +0000
+++ configs/certs/CA/burp_ca
@@ -7,7 +7,7 @@
set -e
-etc=/etc/burp
+etc=@PKG_SYSCONFDIR@
dir=${etc}/CA
conf=${etc}/CA.cnf

36
sysutils/burp/patches/patch-configs_client_burp.conf Normal file
View File

@@ -0,0 +1,36 @@
$NetBSD: patch-configs_client_burp.conf,v 1.1 2015/09/12 22:55:18 joerg Exp $
--- configs/client/burp.conf.orig 2015-07-01 11:45:08.000000000 +0000
+++ configs/client/burp.conf
@@ -15,7 +15,7 @@ progress_counter = 1
# network_timeout = 7200
# The directory to which autoupgrade files will be downloaded.
# To never autoupgrade, leave it commented out.
-# autoupgrade_dir=/etc/burp/autoupgrade/client
+# autoupgrade_dir=@PKG_SYSCONFDIR@/autoupgrade/client
# OS path component for the autoupgrade directory on the server.
# autoupgrade_os=test_os
@@ -41,17 +41,17 @@ cross_all_filesystems=0
# Uncomment the following lines to automatically generate a certificate signing
# request and send it to the server.
-ca_burp_ca = /usr/sbin/burp_ca
-ca_csr_dir = /etc/burp/CA-client
+ca_burp_ca = /opt/pkgsrc/sbin/burp_ca
+ca_csr_dir = @PKG_SYSCONFDIR@/CA-client
# SSL certificate authority - same file on both server and client
-ssl_cert_ca = /etc/burp/ssl_cert_ca.pem
+ssl_cert_ca = @PKG_SYSCONFDIR@/ssl_cert_ca.pem
# Client SSL certificate
-ssl_cert = /etc/burp/ssl_cert-client.pem
+ssl_cert = @PKG_SYSCONFDIR@/ssl_cert-client.pem
# Client SSL key
-ssl_key = /etc/burp/ssl_cert-client.key
+ssl_key = @PKG_SYSCONFDIR@/ssl_cert-client.key
# Client SSL ciphers
#ssl_ciphers =

92
sysutils/burp/patches/patch-configs_server_burp.conf Normal file
View File

@@ -0,0 +1,92 @@
$NetBSD: patch-configs_server_burp.conf,v 1.1 2015/09/12 22:55:18 joerg Exp $
--- configs/server/burp.conf.orig 2015-07-01 11:45:08.000000000 +0000
+++ configs/server/burp.conf
@@ -4,7 +4,7 @@ mode = server
port = 4971
status_port = 4972
directory = /var/spool/burp
-clientconfdir = /etc/burp/clientconfdir
+clientconfdir = @PKG_SYSCONFDIR@/clientconfdir
pidfile = /var/run/burp.server.pid
hardlinked_archive = 0
working_dir_recovery_method = delete
@@ -39,7 +39,7 @@ version_warn = 1
# Location of autoupgrade files to serve to clients. Leave it commented out
# to not autoupgrade clients.
-# autoupgrade_dir = /etc/burp/autoupgrade/server
+# autoupgrade_dir = @PKG_SYSCONFDIR@/autoupgrade/server
# You can have as many 'keep' lines as you like.
# For example, if running backups daily, setting 7, 4, 6 will keep
@@ -58,19 +58,19 @@ keep = 7
# ca_conf does not exist, the server will create, populate it, and the paths
# indicated by ssl_cert_ca, ssl_cert, ssl_key and ssl_dhfile below will be
# overwritten. See docs/burp_ca.txt for more information.
-ca_conf = /etc/burp/CA.cnf
+ca_conf = @PKG_SYSCONFDIR@/CA.cnf
ca_name = burpCA
ca_server_name = burpserver
-ca_burp_ca = /usr/sbin/burp_ca
+ca_burp_ca = @SBINDIR@/burp_ca
# SSL certificate authority - same file on both server and client
-ssl_cert_ca = /etc/burp/ssl_cert_ca.pem
+ssl_cert_ca = @PKG_SYSCONFDIR@/ssl_cert_ca.pem
# Server SSL certificate
-ssl_cert = /etc/burp/ssl_cert-server.pem
+ssl_cert = @PKG_SYSCONFDIR@/ssl_cert-server.pem
# Server SSL key
-ssl_key = /etc/burp/ssl_cert-server.key
+ssl_key = @PKG_SYSCONFDIR@/ssl_cert-server.key
# Server SSL ciphers
#ssl_ciphers =
@@ -79,9 +79,9 @@ ssl_key = /etc/burp/ssl_cert-server.key
ssl_key_password = password
# Server DH file.
-ssl_dhfile = /etc/burp/dhfile.pem
+ssl_dhfile = @PKG_SYSCONFDIR@/dhfile.pem
-timer_script = /etc/burp/timer_script
+timer_script = @LIBEXECDIR@/burp/timer_script
# Ensure that 20 hours elapse between backups
# Available units:
# s (seconds), m (minutes), h (hours), d (days), w (weeks), n (months)
@@ -99,7 +99,7 @@ timer_arg = Sat,Sun,00,01,02,03,04,05,06
# %b - "backup"/"restore"/"verify"
# %c - client name
# %w - number of warnings, if any
-#notify_success_script = /etc/burp/notify_script
+#notify_success_script = @LIBEXECDIR@/notify_script
#notify_success_arg = sendmail -t
#notify_success_arg = To: youremail@example.com
#notify_success_arg = From: burp
@@ -112,7 +112,7 @@ timer_arg = Sat,Sun,00,01,02,03,04,05,06
#notify_success_changes_only = 1
# Uncomment the following for email notifications of backups that failed.
-#notify_failure_script = /etc/burp/notify_script
+#notify_failure_script = @LIBEXECDIR@/notify_script
#notify_failure_arg = sendmail -t
#notify_failure_arg = To: youremail@example.com
#notify_failure_arg = From: burp
@@ -120,10 +120,10 @@ timer_arg = Sat,Sun,00,01,02,03,04,05,06
# The server can run scripts on each connection after authentication and before
# disconnecting.
-#server_script_pre = /etc/burp/ssl_extra_checks_script
-#server_script_pre_arg = /etc/burp/crl
-#server_script_pre_arg = /etc/burp/burp-server.conf
-#server_script_pre_arg = /etc/burp/server-pre-script.local
+#server_script_pre = @LIBEXECDIR@/ssl_extra_checks_script
+#server_script_pre_arg = @PKG_SYSCONFDIR@/crl
+#server_script_pre_arg = @PKG_SYSCONFDIR@/burp-server.conf
+#server_script_pre_arg = @PKG_SYSCONFDIR@/server-pre-script.local
# Set server_script_pre_notify to 1 to have notifications on server_script_pre
# returning non-zero. Most people will want to leave this off - it could
# result in a lot of emails because clients normally connect once every 20

11
sysutils/burp/patches/patch-configs_server_summary__script Normal file
View File

@@ -0,0 +1,11 @@
$NetBSD: patch-configs_server_summary__script,v 1.1 2015/09/12 22:55:18 joerg Exp $
--- configs/server/summary_script.orig 2015-05-12 10:52:36.000000000 +0000
+++ configs/server/summary_script
@@ -8,5 +8,5 @@ fi
(echo "To: $2"
echo "From: burp"
echo "Subject: $3"
- /usr/sbin/burp -c "$1" -a S
+ @SBINDIR@/burp -c "$1" -a S
echo) | /usr/sbin/sendmail -t

15
sysutils/burp/patches/patch-manpages_Makefile.in Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-manpages_Makefile.in,v 1.1 2015/09/12 22:55:18 joerg Exp $
--- manpages/Makefile.in.orig 2015-07-01 11:45:08.000000000 +0000
+++ manpages/Makefile.in
@@ -17,9 +17,7 @@ depend:
install:
$(MKDIR) $(DESTDIR)/$(mandir)/man8
for I in ${MAN8}; \
- do ($(RMF) $$I.gz; gzip -c $$I >$$I.gz; \
- $(INSTALL_DATA) $$I.gz $(DESTDIR)$(mandir)/man8/$$I.gz; \
- rm -f $$I.gz); \
+ do $(INSTALL_DATA) $$I $(DESTDIR)$(mandir)/man8/$$I; \
done
uninstall:

22
sysutils/burp/patches/patch-manpages_bedup.8 Normal file
View File

@@ -0,0 +1,22 @@
$NetBSD: patch-manpages_bedup.8,v 1.1 2015/09/12 22:55:18 joerg Exp $
--- manpages/bedup.8.orig 2015-09-12 22:49:17.926333040 +0000
+++ manpages/bedup.8
@@ -16,7 +16,7 @@ A file deduplication program with additi
.SH OPTIONS
.TP
\fB\-c\fR \fBpath\fR
-Path to config file (default: /etc/burp/burp.conf).
+Path to config file (default: @PKG_SYSCONFDIR@/burp.conf).
.TP
\fB\-g\fR \fB<list of group names>\fR
Only run on the directories of clients that are in one of the groups specified. The list is comma-separated. To put a client in a group, use the 'dedup_group' option in the client configuration file on the server.
@@ -42,7 +42,7 @@ Print duplicate paths. Useful if you wan
\fB\-V\fR \fB\fR
Print version and exit.\fR
.TP
-By default, bedup will read /etc/burp/burp.conf and deduplicate client storage directories using special knowledge of the structure.\fR
+By default, bedup will read @PKG_SYSCONFDIR@/burp.conf and deduplicate client storage directories using special knowledge of the structure.\fR
.TP
With '\-n', this knowledge is turned off and you have to specify the directories to deduplicate on the command line. Running with '\-n' is therefore dangerous if you are deduplicating burp storage directories.

31
sysutils/burp/patches/patch-manpages_burp.8 Normal file
View File

@@ -0,0 +1,31 @@
$NetBSD: patch-manpages_burp.8,v 1.1 2015/09/12 22:55:18 joerg Exp $
--- manpages/burp.8.orig 2015-09-12 22:49:19.966332952 +0000
+++ manpages/burp.8
@@ -17,7 +17,7 @@ BackUp and Restore Program.
.TP
\fB\-c\fR \fB[path]\fR
Short for 'config file'. The argument is a path to the config file. The default
-is /etc/burp/burp.conf.
+is @PKG_SYSCONFDIR@/burp.conf.
.TP
\fB\-n\fR \fB\fR
No forking mode. The program will accept a single query, deal with it, and then
@@ -66,7 +66,7 @@ backups.
.TP
\fB\-c\fR \fB[path]\fR
Short for 'config file'. The argument is a path to the config file. The default
-is /etc/burp/burp.conf, or %PROGRAMFILES%\\Burp\\burp.conf on Windows.
+is @PKG_SYSCONFDIR@/burp.conf, or %PROGRAMFILES%\\Burp\\burp.conf on Windows.
.TP
\fB\-C\fR \fB[client]\fR
Allows you to specify an alternative client to list or restore from. Requires that the server configuration of the alternative client permits your client to do this. See the 'restore_client' option.
@@ -373,7 +373,7 @@ If this is set to 1, server_script_post
Path to autoupgrade directory from which upgrades are downloaded. The option can be left unset in order not to autoupgrade clients. Please see docs/autoupgrade.txt in the source package for more help with this option.
.TP
\fBca_conf=[path]\fR
-Path to certificate authority configuration file. The CA configuration file will usually be /etc/burp/CA.cnf. The CA directory indicated by CA.cnf will usually be /etc/burp/CA. If ca_conf is set and the CA directory does not exist, the server will create, populate it, and the paths indicated by ssl_cert_ca, ssl_cert, ssl_key and ssl_dhfile will be overwritten. For more detailed information on this and the other ca_* options, please see docs/burp_ca.txt.
+Path to certificate authority configuration file. The CA configuration file will usually be @PKG_SYSCONFDIR@/CA.cnf. The CA directory indicated by CA.cnf will usually be @PKG_SYSCONFDIR@/CA. If ca_conf is set and the CA directory does not exist, the server will create, populate it, and the paths indicated by ssl_cert_ca, ssl_cert, ssl_key and ssl_dhfile will be overwritten. For more detailed information on this and the other ca_* options, please see docs/burp_ca.txt.
.TP
\fBca_name=[name]\fR
Name of the CA that the server will generate when using the ca_conf option.

17
sysutils/burp/patches/patch-manpages_burp__ca.8 Normal file
View File

@@ -0,0 +1,17 @@
$NetBSD: patch-manpages_burp__ca.8,v 1.1 2015/09/12 22:55:18 joerg Exp $
--- manpages/burp_ca.8.orig 2015-09-12 22:49:27.626332624 +0000
+++ manpages/burp_ca.8
@@ -38,10 +38,10 @@ revoke certificate with serial number
generate certificate revoke list
.TP
\fB\-d|\-\-dir\fR \fB<dir>\fR
-ca output dir (default: /etc/burp/CA)
+ca output dir (default: @PKG_SYSCONFDIR@/CA)
.TP
\fB\-c|\-\-config\fR \fB\fR
-config file (default: /etc/burp/CA.cnf)
+config file (default: @PKG_SYSCONFDIR@/CA.cnf)
.TP
\fB\-n|\-\-name\fR \fB\fR
name (default: builder)

24
sysutils/burp/patches/patch-src-xattr.c Normal file
View File

@@ -0,0 +1,24 @@
$NetBSD: patch-src-xattr.c,v 1.1 2015/09/23 12:03:48 joerg Exp $
--- src/xattr.c.orig 2015-07-01 11:45:08.000000000 +0000
+++ src/xattr.c
@@ -265,12 +265,19 @@ int set_xattr(const char *path, struct s
|| defined(HAVE_OPENBSD_OS)
#include <sys/extattr.h>
+#if defined(HAVE_FREEBSD_OS)
#include <libutil.h>
+#else
+#include <util.h>
+#endif
static int namespaces[2] = { EXTATTR_NAMESPACE_USER, EXTATTR_NAMESPACE_SYSTEM };
#if defined(HAVE_FREEBSD_OS)
static const char *acl_skiplist[2] = { "system.posix1e.acl_access", NULL };
+#else
+static const char *acl_skiplist[] = { NULL };
+
#endif
int has_xattr(const char *path, char cmd)

6
sysutils/ccze/Makefile
View File

@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.13 2014/10/09 14:06:57 wiz Exp $
# $NetBSD: Makefile,v 1.16 2015/09/08 11:57:50 jperkin Exp $
DISTNAME= ccze-0.2.1
PKGREVISION= 2
PKGREVISION= 4
CATEGORIES= sysutils
MASTER_SITES= ftp://bonehunter.rulez.org/pub/ccze/stable/
@@ -9,8 +9,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://bonehunter.rulez.org/software/ccze/
COMMENT= Log coloriser, fast and light on resources
INCOMPAT_CURSES= NetBSD-1.5*-* NetBSD-1.6*-*
GNU_CONFIGURE= yes
USE_TOOLS+= gmake
BUILDLINK_TRANSFORM+= rm:-Wmulticharacter

4
sysutils/cdrtools/Makefile
View File

@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.111 2015/04/27 09:05:11 wiz Exp $
# $NetBSD: Makefile,v 1.113 2015/09/03 14:43:34 wiz Exp $
DISTNAME= cdrtools-3.01a28
DISTNAME= cdrtools-3.01
PKGNAME= ${DISTNAME:S/a/alpha/:S/-pre/pre/}
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cdrtools/}

8
sysutils/cdrtools/distinfo
View File

@@ -1,5 +1,5 @@
$NetBSD: distinfo,v 1.85 2015/04/27 09:05:11 wiz Exp $
$NetBSD: distinfo,v 1.87 2015/09/03 14:43:34 wiz Exp $
SHA1 (cdrtools-3.01a28.tar.bz2) = 081b1daa9c86f33483213a8d8d0fd75caec51ead
RMD160 (cdrtools-3.01a28.tar.bz2) = 84ad3ddbaea67a59a057d5338f3a683bffb49c1f
Size (cdrtools-3.01a28.tar.bz2) = 2081108 bytes
SHA1 (cdrtools-3.01.tar.bz2) = 62766aa9bfeec91b3c78da7c59b5c96bfbec84d9
RMD160 (cdrtools-3.01.tar.bz2) = 3696b1bc502905cbe7c06e492b42d2ffe2dba982
Size (cdrtools-3.01.tar.bz2) = 2087416 bytes

3
sysutils/clex/Makefile
View File

@@ -1,7 +1,8 @@
# $NetBSD: Makefile,v 1.6 2012/10/23 19:50:55 asau Exp $
# $NetBSD: Makefile,v 1.7 2015/08/17 17:11:29 wiz Exp $
#
DISTNAME= clex-4.6.4
PKGREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://www.clex.sk/download/

6
sysutils/collectd/Makefile
View File

@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.6 2015/06/12 10:51:12 wiz Exp $
# $NetBSD: Makefile,v 1.13 2015/09/12 19:04:56 he Exp $
PKGREVISION= 1
PKGREVISION= 8
.include "../../sysutils/collectd/Makefile.common"
COMMENT= Statistics collection daemon base
@@ -30,6 +30,8 @@ MAKE_JOBS_SAFE= no
CONF_FILES+= share/examples/collectd/collectd.conf \
${PKG_SYSCONFDIR}/collectd.conf
BUILD_DEFS+= VARBASE
OWN_DIRS+= ${VARBASE}/db/collectd
COLLECTD_USER?= collectd

5
sysutils/collectd/Makefile.common
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.9 2015/06/10 20:05:26 fhajny Exp $
# $NetBSD: Makefile.common,v 1.10 2015/09/07 12:57:29 jperkin Exp $
#
# used by sysutils/collectd/Makefile
# used by sysutils/collectd-amqp/Makefile
@@ -71,7 +71,8 @@ CONFIGURE_ARGS+= --with-ltdl-include=${BUILDLINK_PREFIX.libltdl}/include
CPPFLAGS.SunOS+= -DSOLARIS2=${OS_VERSION:C/5.//}
.include "../../mk/compiler.mk"
.if !empty(PKGSRC_COMPILER:Mclang)
# XXX: proper clang version check when we have support for it.
.if !empty(PKGSRC_COMPILER:Mclang) && ${OPSYS} != "Darwin"
CFLAGS+= -Wno-error=tautological-pointer-compare \
-Wno-error=pointer-bool-conversion
.endif

5
sysutils/collectd/PLIST
View File

@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.3 2015/04/14 11:27:30 fhajny Exp $
@comment $NetBSD: PLIST,v 1.6 2015/09/12 19:04:56 he Exp $
bin/collectd-nagios
bin/collectd-tg
bin/collectdctl
@@ -13,6 +13,7 @@ ${PLIST.battery}lib/collectd/battery.la
${PLIST.contextswitch}lib/collectd/contextswitch.la
${PLIST.cpu}lib/collectd/cpu.la
lib/collectd/csv.la
${PLIST.entropy}lib/collectd/entropy.la
${PLIST.df}lib/collectd/df.la
${PLIST.disk}lib/collectd/disk.la
lib/collectd/email.la
@@ -20,6 +21,7 @@ lib/collectd/exec.la
lib/collectd/filecount.la
lib/collectd/hddtemp.la
${PLIST.interface}lib/collectd/interface.la
${PLIST.irq}lib/collectd/irq.la
${PLIST.load}lib/collectd/load.la
lib/collectd/logfile.la
lib/collectd/match_empty_counter.la
@@ -29,6 +31,7 @@ lib/collectd/match_timediff.la
lib/collectd/match_value.la
lib/collectd/mbmon.la
${PLIST.memory}lib/collectd/memory.la
${PLIST.netstat_udp}lib/collectd/netstat_udp.la
${PLIST.nfs}lib/collectd/nfs.la
lib/collectd/ntpd.la
lib/collectd/olsrd.la

24
sysutils/collectd/distinfo
View File

@@ -1,13 +1,27 @@
$NetBSD: distinfo,v 1.8 2015/06/10 20:05:26 fhajny Exp $
$NetBSD: distinfo,v 1.22 2015/09/17 11:24:11 he Exp $
SHA1 (collectd-5.5.0.tar.gz) = d24e284c1eae20c5e75b846c8b2612ab65bd5565
RMD160 (collectd-5.5.0.tar.gz) = 2197758942a5fe56e4eabda3786f09d4138e943a
Size (collectd-5.5.0.tar.gz) = 2244454 bytes
SHA1 (patch-Makefile.in) = 197307399312fa26c71ca168b92bbe41d31d556d
SHA1 (patch-src_Makefile.in) = f94d046ee323fdb9251ad49cf383b3a61df5dcaa
SHA1 (patch-Makefile.am) = ed45b75293a4ea2dd577d04eeb3b9017b8f47319
SHA1 (patch-Makefile.in) = a7cf69ca29c526be643af0ef85544e3a2dc80a77
SHA1 (patch-configure) = ca4c1e3429ac6ca35f0973f91c84eaf70b04bc1f
SHA1 (patch-configure.ac) = f23be9bb5179cbfc8ca5b3414e62d220b10f8540
SHA1 (patch-src_Makefile.am) = 45930ca400c6c67927020c9a264d3d5adc30ca46
SHA1 (patch-src_Makefile.in) = 46bea4aa9a045e56478ff96730245134ddb0b362
SHA1 (patch-src_collectd-tg.c) = f9f41dfb0b1b55a62202128a165d5c9943faf5bc
SHA1 (patch-src_collectd.conf.in) = f0b35085cf0ddfd766e140b145177ab1f1326f5f
SHA1 (patch-src_df.c) = 19cca888b183a90759b359702e4d65c8afa6e58d
SHA1 (patch-src_config.h.in) = be17db23b6ee7a90ba57e73f073ed5be11c369c5
SHA1 (patch-src_cpu.c) = 55b5cfc69bf0df279d1a12003eb6a8e681155e18
SHA1 (patch-src_df.c) = 7e75dfbc72ecad48eb0eb7427a19329daf6b9a60
SHA1 (patch-src_disk.c) = 159862e8ca1e841e3c4013c03ba03f059fdbbab5
SHA1 (patch-src_entropy.c) = 46d5357d8407584943e9259325989e64a8710cc0
SHA1 (patch-src_irq.c) = 6b621474de35a5879105025d1a2848e4896b8479
SHA1 (patch-src_libcollectclient_network__buffer.c) = e07d403d299613fa0885a0e7285849eb85510253
SHA1 (patch-src_tcpconns.c) = fdc160087231a4aee2c405b8ed07791e90b20fd0
SHA1 (patch-src_memory.c) = f48d50245176426e26af7fa1b1f4ff6fbf0b1d95
SHA1 (patch-src_netstat__udp.c) = 30cb12d25f56c60959658dbd181783212e00cc61
SHA1 (patch-src_processes.c) = e00d2edf6b4e6bfe3663e34fffb05f40652affe5
SHA1 (patch-src_swap.c) = e7602eb83eed6b90752b8293b9666b94bdd42493
SHA1 (patch-src_tcpconns.c) = 712af1b821d62217283df884dd283d5b1218ab7c
SHA1 (patch-src_utils__dns.c) = c3782dc9127f42da30e3142b853aa2cb2259af94
SHA1 (patch-version-gen.sh) = 07d830019e22ac651514b75acf299b1f50c4632d

15
sysutils/collectd/options.mk
View File

@@ -1,12 +1,15 @@
# $NetBSD: options.mk,v 1.2 2015/04/14 11:27:30 fhajny Exp $
# $NetBSD: options.mk,v 1.6 2015/09/12 19:04:56 he Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.collectd
PKG_SUPPORTED_OPTIONS= cpu df interface load memory syslog uptime
PKG_SUGGESTED_OPTIONS+= cpu df interface load memory syslog uptime
.if ${OPSYS} == "NetBSD"
PKG_SUPPORTED_OPTIONS+= contextswitch pf tcpconns users
PKG_SUGGESTED_OPTIONS+= contextswitch pf tcpconns users
PKG_SUPPORTED_OPTIONS+= contextswitch disk entropy irq pf netstat_udp
PKG_SUPPORTED_OPTIONS+= processes swap tcpconns users
PKG_SUGGESTED_OPTIONS+= contextswitch disk entropy irq pf netstat_udp
PKG_SUGGESTED_OPTIONS+= processes swap tcpconns users
.endif
.if ${OPSYS} == "FreeBSD"
@@ -28,8 +31,10 @@ PKG_SUGGESTED_OPTIONS+= disk nfs swap users zfs-arc
.include "../../mk/bsd.options.mk"
PLIST_VARS+= apple-sensors battery contextswitch cpu df disk \
interface load memory nfs pf processes swap \
PLIST_VARS+= apple-sensors battery contextswitch cpu entropy \
df disk \
interface irq load netstat_udp \
memory nfs pf processes swap \
syslog tcpconns uptime users zfs-arc
.for option in ${PLIST_VARS}

15
sysutils/collectd/patches/patch-Makefile.am Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-Makefile.am,v 1.1 2015/08/18 07:47:46 he Exp $
Use other data directory.
--- Makefile.am.orig 2015-03-09 09:38:22.000000000 +0000
+++ Makefile.am
@@ -8,7 +8,7 @@ EXTRA_DIST = contrib version-gen.sh
install-exec-hook:
$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run
- $(mkinstalldirs) $(DESTDIR)$(localstatedir)/lib/$(PACKAGE_NAME)
+ $(mkinstalldirs) $(DESTDIR)$(localstatedir)/db/$(PACKAGE_NAME)
$(mkinstalldirs) $(DESTDIR)$(localstatedir)/log
maintainer-clean-local:

151
sysutils/collectd/patches/patch-Makefile.in
View File

@@ -1,9 +1,154 @@
$NetBSD: patch-Makefile.in,v 1.1 2014/02/17 11:21:55 fhajny Exp $
$NetBSD: patch-Makefile.in,v 1.2 2015/08/18 07:47:46 he Exp $
Regenerate.
Use a reasonable db dir.
--- Makefile.in.orig 2014-01-26 08:09:57.577219038 +0000
+++ Makefile.in
@@ -882,7 +882,7 @@ uninstall-am:
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -78,25 +88,12 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = .
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/configure $(am__configure_deps) \
- $(top_srcdir)/src/libcollectdclient/collectd/lcc_features.h.in \
- AUTHORS COPYING ChangeLog INSTALL NEWS README TODO compile \
- libltdl/config/compile config.guess \
- libltdl/config/config.guess config.sub \
- libltdl/config/config.sub depcomp libltdl/config/depcomp \
- install-sh libltdl/config/install-sh missing \
- libltdl/config/missing ylwrap libltdl/config/ylwrap ltmain.sh \
- libltdl/config/ltmain.sh $(top_srcdir)/libltdl/config/compile \
- $(top_srcdir)/libltdl/config/config.guess \
- $(top_srcdir)/libltdl/config/config.sub \
- $(top_srcdir)/libltdl/config/install-sh \
- $(top_srcdir)/libltdl/config/ltmain.sh \
- $(top_srcdir)/libltdl/config/missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+ $(am__configure_deps) $(am__DIST_COMMON)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
@@ -159,6 +156,21 @@ ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/libltdl/config/compile \
+ $(top_srcdir)/libltdl/config/config.guess \
+ $(top_srcdir)/libltdl/config/config.sub \
+ $(top_srcdir)/libltdl/config/install-sh \
+ $(top_srcdir)/libltdl/config/ltmain.sh \
+ $(top_srcdir)/libltdl/config/missing \
+ $(top_srcdir)/src/libcollectdclient/collectd/lcc_features.h.in \
+ AUTHORS COPYING ChangeLog INSTALL NEWS README TODO compile \
+ config.guess config.sub depcomp install-sh \
+ libltdl/config/compile libltdl/config/config.guess \
+ libltdl/config/config.sub libltdl/config/depcomp \
+ libltdl/config/install-sh libltdl/config/ltmain.sh \
+ libltdl/config/missing libltdl/config/ylwrap ltmain.sh missing \
+ ylwrap
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -353,9 +365,6 @@ LIBADD_DL = @LIBADD_DL@
LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
LIBADD_DLOPEN = @LIBADD_DLOPEN@
LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
-LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
-LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
-LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
LIBLTDL = @LIBLTDL@
LIBNETAPP_CPPFLAGS = @LIBNETAPP_CPPFLAGS@
LIBNETAPP_LDFLAGS = @LIBNETAPP_LDFLAGS@
@@ -493,7 +502,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -710,15 +718,15 @@ dist-xz: distdir
$(am__post_remove_distdir)
dist-tarZ: distdir
- @echo WARNING: "Support for shar distribution archives is" \
- "deprecated." >&2
+ @echo WARNING: "Support for distribution archives compressed with" \
+ "legacy program 'compress' is deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__post_remove_distdir)
dist-shar: distdir
- @echo WARNING: "Support for distribution archives compressed with" \
- "legacy program 'compress' is deprecated." >&2
+ @echo WARNING: "Support for shar distribution archives is" \
+ "deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__post_remove_distdir)
@@ -754,17 +762,17 @@ distcheck: dist
esac
chmod -R a-w $(distdir)
chmod u+w $(distdir)
- mkdir $(distdir)/_build $(distdir)/_inst
+ mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
- && $(am__cd) $(distdir)/_build \
- && ../configure \
+ && $(am__cd) $(distdir)/_build/sub \
+ && ../../configure \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
- --srcdir=.. --prefix="$$dc_install_base" \
+ --srcdir=../.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
@@ -944,10 +952,12 @@ uninstall-am:
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags tags-am uninstall uninstall-am
+.PRECIOUS: Makefile
+
install-exec-hook:
$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run

324
sysutils/collectd/patches/patch-configure Normal file
View File

@@ -0,0 +1,324 @@
$NetBSD: patch-configure,v 1.10 2015/09/17 11:24:11 he Exp $
Regen from configure.ac.
--- configure.orig 2015-09-10 18:56:19.000000000 +0000
+++ configure
@@ -797,6 +797,8 @@ BUILD_PLUGIN_NFS_FALSE
BUILD_PLUGIN_NFS_TRUE
BUILD_PLUGIN_NETWORK_FALSE
BUILD_PLUGIN_NETWORK_TRUE
+BUILD_PLUGIN_NETSTAT_UDP_FALSE
+BUILD_PLUGIN_NETSTAT_UDP_TRUE
BUILD_PLUGIN_NETLINK_FALSE
BUILD_PLUGIN_NETLINK_TRUE
BUILD_PLUGIN_NETAPP_FALSE
@@ -1431,6 +1433,7 @@ enable_multimeter
enable_mysql
enable_netapp
enable_netlink
+enable_netstat_udp
enable_network
enable_nfs
enable_nginx
@@ -2230,6 +2233,7 @@ collectd plugins:
--enable-mysql MySQL statistics
--enable-netapp NetApp plugin
--enable-netlink Enhanced Linux network statistics
+ --enable-netstat_udp UDP network statistics
--enable-network Network communication plugin
--enable-nfs NFS statistics
--enable-nginx nginx statistics
@@ -13908,7 +13912,7 @@ else
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
@@ -13954,7 +13958,7 @@ else
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
@@ -13978,7 +13982,7 @@ rm -f core conftest.err conftest.$ac_obj
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
@@ -14023,7 +14027,7 @@ else
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
@@ -14047,7 +14051,7 @@ rm -f core conftest.err conftest.$ac_obj
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
@@ -15319,6 +15323,12 @@ $as_echo "#define KERNEL_OPENBSD 1" >>co
ac_system="OpenBSD"
;;
+ *netbsd*)
+
+$as_echo "#define KERNEL_NETBSD 1" >>confdefs.h
+
+ ac_system="NetBSD"
+ ;;
*aix*)
$as_echo "#define KERNEL_AIX 1" >>confdefs.h
@@ -15876,6 +15886,29 @@ fi
done
+# For entropy plugin on newer NetBSD
+for ac_header in sys/rndio.h
+do :
+ ac_fn_c_check_header_compile "$LINENO" "sys/rndio.h" "ac_cv_header_sys_rndio_h" "#if HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#if HAVE_SYS_IOCTL_H
+# include <sys/ioctl.h>
+#endif
+#if HAVE_SYS_PARAM_H
+# include <sys/param.h>
+#endif
+
+"
+if test "x$ac_cv_header_sys_rndio_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_SYS_RNDIO_H 1
+_ACEOF
+
+fi
+
+done
+
# For ping library
for ac_header in netinet/in_systm.h
do :
@@ -16215,6 +16248,27 @@ else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysctl kern.cp_time" >&5
+$as_echo_n "checking for sysctl kern.cp_time... " >&6; }
+if test -x /sbin/sysctl
+then
+ /sbin/sysctl kern.cp_times 2>/dev/null
+ if test $? -eq 0
+ then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_SYSCTL_KERN_CP_TIME 1" >>confdefs.h
+
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ fi
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
# For hddtemp module
for ac_header in linux/major.h
@@ -19171,6 +19225,54 @@ else
fi
+ac_fn_c_check_member "$LINENO" "struct kinfo_proc2" "p_pid" "ac_cv_member_struct_kinfo_proc2_p_pid" "
+#include <sys/param.h>
+#include <sys/sysctl.h>
+#include <kvm.h>
+
+"
+if test "x$ac_cv_member_struct_kinfo_proc2_p_pid" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_KINFO_PROC2_P_PID 1
+_ACEOF
+
+
+
+$as_echo "#define HAVE_STRUCT_KINFO_PROC2_NETBSD 1" >>confdefs.h
+
+ have_struct_kinfo_proc2_netbsd="yes"
+
+else
+
+ have_struct_kinfo_proc2_netbsd="no"
+
+fi
+ac_fn_c_check_member "$LINENO" "struct kinfo_proc2" "p_uru_maxrss" "ac_cv_member_struct_kinfo_proc2_p_uru_maxrss" "
+#include <sys/param.h>
+#include <sys/sysctl.h>
+#include <kvm.h>
+
+"
+if test "x$ac_cv_member_struct_kinfo_proc2_p_uru_maxrss" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_KINFO_PROC2_P_URU_MAXRSS 1
+_ACEOF
+
+
+
+$as_echo "#define HAVE_STRUCT_KINFO_PROC2_NETBSD 1" >>confdefs.h
+
+ have_struct_kinfo_proc2_netbsd="yes"
+
+else
+
+ have_struct_kinfo_proc2_netbsd="no"
+
+fi
+
+
ac_fn_c_check_member "$LINENO" "struct udphdr" "uh_dport" "ac_cv_member_struct_udphdr_uh_dport" "#define _BSD_SOURCE
#define _DEFAULT_SOURCE
#if HAVE_STDINT_H
@@ -27579,6 +27681,7 @@ plugin_load="no"
plugin_log_logstash="no"
plugin_memory="no"
plugin_multimeter="no"
+plugin_netstat_udp="no"
plugin_nfs="no"
plugin_numa="no"
plugin_perl="no"
@@ -27648,6 +27751,15 @@ then
plugin_tcpconns="yes"
fi
+if test "x$ac_system" = "xNetBSD"
+then
+ plugin_entropy="yes"
+ plugin_irq="yes"
+ plugin_processes="yes"
+ plugin_disk="yes"
+ plugin_netstat_udp="yes"
+fi
+
# Mac OS X devices
if test "x$with_libiokit" = "xyes"
then
@@ -27890,6 +28002,11 @@ then
plugin_swap="yes"
fi
+if test "x$have_swapctl" = "xyes" && test "x$c_cv_have_swapctl_three_args" = "xyes"
+then
+ plugin_swap="yes"
+fi
+
if test "x$with_kvm_openfiles$with_kvm_nlist" = "xyesyes"
then
plugin_tcpconns="yes"
@@ -31715,6 +31832,66 @@ fi
enable_plugin="no"
force="no"
+ # Check whether --enable-netstat_udp was given.
+if test "${enable_netstat_udp+set}" = set; then :
+ enableval=$enable_netstat_udp;
+ if test "x$enableval" = "xyes"
+ then
+ enable_plugin="yes"
+ else if test "x$enableval" = "xforce"
+ then
+ enable_plugin="yes"
+ force="yes"
+ else
+ enable_plugin="no (disabled on command line)"
+ fi; fi
+
+else
+
+ if test "x$enable_all_plugins" = "xauto"
+ then
+ if test "x$plugin_netstat_udp" = "xyes"
+ then
+ enable_plugin="yes"
+ else
+ enable_plugin="no"
+ fi
+ else
+ enable_plugin="$enable_all_plugins"
+ fi
+
+fi
+
+ if test "x$enable_plugin" = "xyes"
+ then
+ if test "x$plugin_netstat_udp" = "xyes" || test "x$force" = "xyes"
+ then
+
+$as_echo "#define HAVE_PLUGIN_NETSTAT_UDP 1" >>confdefs.h
+
+ if test "x$plugin_netstat_udp" != "xyes"
+ then
+ dependency_warning="yes"
+ fi
+ else # User passed "yes" but dependency checking yielded "no" => Dependency problem.
+ dependency_error="yes"
+ enable_plugin="no (dependency error)"
+ fi
+ fi
+ if test "x$enable_plugin" = "xyes"; then
+ BUILD_PLUGIN_NETSTAT_UDP_TRUE=
+ BUILD_PLUGIN_NETSTAT_UDP_FALSE='#'
+else
+ BUILD_PLUGIN_NETSTAT_UDP_TRUE='#'
+ BUILD_PLUGIN_NETSTAT_UDP_FALSE=
+fi
+
+ enable_netstat_udp="$enable_plugin"
+
+
+
+ enable_plugin="no"
+ force="no"
# Check whether --enable-network was given.
if test "${enable_network+set}" = set; then :
enableval=$enable_network;
@@ -36781,6 +36958,10 @@ if test -z "${BUILD_PLUGIN_NETLINK_TRUE}
as_fn_error $? "conditional \"BUILD_PLUGIN_NETLINK\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${BUILD_PLUGIN_NETSTAT_UDP_TRUE}" && test -z "${BUILD_PLUGIN_NETSTAT_UDP_FALSE}"; then
+ as_fn_error $? "conditional \"BUILD_PLUGIN_NETSTAT_UDP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${BUILD_PLUGIN_NETWORK_TRUE}" && test -z "${BUILD_PLUGIN_NETWORK_FALSE}"; then
as_fn_error $? "conditional \"BUILD_PLUGIN_NETWORK\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -39602,6 +39783,7 @@ Configuration:
mysql . . . . . . . . $enable_mysql
netapp . . . . . . . $enable_netapp
netlink . . . . . . . $enable_netlink
+ netstat_udp . . . . . $enable_netstat_udp
network . . . . . . . $enable_network
nfs . . . . . . . . . $enable_nfs
nginx . . . . . . . . $enable_nginx

135
sysutils/collectd/patches/patch-configure.ac Normal file
View File

@@ -0,0 +1,135 @@
$NetBSD: patch-configure.ac,v 1.8 2015/09/17 11:24:11 he Exp $
Add KERNEL_NETBSD, add entry and disk plugins for NetBSD,
and also do swap for "have_swapctl_three_args" (as for NetBSD).
Also, the start of process support, but that's not yet finished.
--- configure.ac.orig 2015-05-27 07:51:35.000000000 +0000
+++ configure.ac
@@ -77,6 +77,10 @@ case $host_os in
AC_DEFINE([KERNEL_OPENBSD], 1, [True if program is to be compiled for an OpenBSD kernel])
ac_system="OpenBSD"
;;
+ *netbsd*)
+ AC_DEFINE([KERNEL_NETBSD], 1, [True if program is to be compiled for a NetBSD kernel])
+ ac_system="NetBSD"
+ ;;
*aix*)
AC_DEFINE([KERNEL_AIX], 1, [True if program is to be compiled for a AIX kernel])
ac_system="AIX"
@@ -151,6 +155,18 @@ AC_HEADER_STDBOOL
AC_CHECK_HEADERS(stdio.h errno.h math.h stdarg.h syslog.h fcntl.h signal.h assert.h sys/types.h sys/socket.h sys/select.h poll.h netdb.h arpa/inet.h sys/resource.h sys/param.h kstat.h regex.h sys/ioctl.h endian.h sys/isa_defs.h fnmatch.h libgen.h)
+# For entropy plugin on newer NetBSD
+AC_CHECK_HEADERS(sys/rndio.h, [], [],
+[#if HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#if HAVE_SYS_IOCTL_H
+# include <sys/ioctl.h>
+#endif
+#if HAVE_SYS_PARAM_H
+# include <sys/param.h>
+#endif
+])
# For ping library
AC_CHECK_HEADERS(netinet/in_systm.h, [], [],
[#if HAVE_STDINT_H
@@ -329,6 +345,22 @@ then
else
AC_MSG_RESULT([no])
fi
+AC_MSG_CHECKING([for sysctl kern.cp_time])
+if test -x /sbin/sysctl
+then
+ /sbin/sysctl kern.cp_times 2>/dev/null
+ if test $? -eq 0
+ then
+ AC_MSG_RESULT([yes])
+ AC_DEFINE(HAVE_SYSCTL_KERN_CP_TIME, 1,
+ [Define if sysctl supports kern.cp_time])
+ else
+ AC_MSG_RESULT([no])
+ fi
+else
+ AC_MSG_RESULT([no])
+fi
+
# For hddtemp module
AC_CHECK_HEADERS(linux/major.h)
@@ -1363,6 +1395,21 @@ AC_CHECK_MEMBERS([struct kinfo_proc.p_pi
#include <kvm.h>
])
+AC_CHECK_MEMBERS([struct kinfo_proc2.p_pid, struct kinfo_proc2.p_uru_maxrss],
+ [
+ AC_DEFINE(HAVE_STRUCT_KINFO_PROC2_NETBSD, 1,
+ [Define if struct kinfo_proc2 exists in the NetBSD variant.])
+ have_struct_kinfo_proc2_netbsd="yes"
+ ],
+ [
+ have_struct_kinfo_proc2_netbsd="no"
+ ],
+ [
+#include <sys/param.h>
+#include <sys/sysctl.h>
+#include <kvm.h>
+ ])
+
AC_CHECK_MEMBERS([struct udphdr.uh_dport, struct udphdr.uh_sport], [], [],
[#define _BSD_SOURCE
#define _DEFAULT_SOURCE
@@ -5175,6 +5222,7 @@ plugin_load="no"
plugin_log_logstash="no"
plugin_memory="no"
plugin_multimeter="no"
+plugin_netstat_udp="no"
plugin_nfs="no"
plugin_numa="no"
plugin_perl="no"
@@ -5244,6 +5292,15 @@ then
plugin_tcpconns="yes"
fi
+if test "x$ac_system" = "xNetBSD"
+then
+ plugin_entropy="yes"
+ plugin_irq="yes"
+ plugin_processes="yes"
+ plugin_disk="yes"
+ plugin_netstat_udp="yes"
+fi
+
# Mac OS X devices
if test "x$with_libiokit" = "xyes"
then
@@ -5482,6 +5539,11 @@ then
plugin_swap="yes"
fi
+if test "x$have_swapctl" = "xyes" && test "x$c_cv_have_swapctl_three_args" = "xyes"
+then
+ plugin_swap="yes"
+fi
+
if test "x$with_kvm_openfiles$with_kvm_nlist" = "xyesyes"
then
plugin_tcpconns="yes"
@@ -5585,6 +5647,7 @@ AC_PLUGIN([multimeter], [$plugin_multim
AC_PLUGIN([mysql], [$with_libmysql], [MySQL statistics])
AC_PLUGIN([netapp], [$with_libnetapp], [NetApp plugin])
AC_PLUGIN([netlink], [$with_libmnl], [Enhanced Linux network statistics])
+AC_PLUGIN([netstat_udp], [$plugin_netstat_udp], [UDP network statistics])
AC_PLUGIN([network], [yes], [Network communication plugin])
AC_PLUGIN([nfs], [$plugin_nfs], [NFS statistics])
AC_PLUGIN([nginx], [$with_libcurl], [nginx statistics])
@@ -5963,6 +6026,7 @@ Configuration:
mysql . . . . . . . . $enable_mysql
netapp . . . . . . . $enable_netapp
netlink . . . . . . . $enable_netlink
+ netstat_udp . . . . . $enable_netstat_udp
network . . . . . . . $enable_network
nfs . . . . . . . . . $enable_nfs
nginx . . . . . . . . $enable_nginx

61
sysutils/collectd/patches/patch-src_Makefile.am Normal file
View File

@@ -0,0 +1,61 @@
$NetBSD: patch-src_Makefile.am,v 1.2 2015/09/12 19:04:56 he Exp $
Install config file in example directory.
--- src/Makefile.am.orig 2015-05-26 19:38:14.000000000 +0000
+++ src/Makefile.am
@@ -14,13 +14,15 @@ AM_CPPFLAGS = -I$(srcdir)/daemon
AM_CPPFLAGS += -DPREFIX='"${prefix}"'
AM_CPPFLAGS += -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"'
AM_CPPFLAGS += -DLOCALSTATEDIR='"${localstatedir}"'
-AM_CPPFLAGS += -DPKGLOCALSTATEDIR='"${localstatedir}/lib/${PACKAGE_NAME}"'
+AM_CPPFLAGS += -DPKGLOCALSTATEDIR='"${localstatedir}/db/${PACKAGE_NAME}"'
if BUILD_FEATURE_DAEMON
AM_CPPFLAGS += -DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"'
endif
AM_CPPFLAGS += -DPLUGINDIR='"${pkglibdir}"'
AM_CPPFLAGS += -DPKGDATADIR='"${pkgdatadir}"'
+egdir = @exec_prefix@/share/examples/@PACKAGE@
+
AUTOMAKE_OPTIONS = subdir-objects
noinst_LTLIBRARIES = libmount.la liblookup.la
@@ -657,6 +659,12 @@ netlink_la_CFLAGS = $(AM_CFLAGS) $(BUILD
netlink_la_LIBADD = $(BUILD_WITH_LIBMNL_LIBS)
endif
+if BUILD_PLUGIN_NETSTAT_UDP
+pkglib_LTLIBRARIES += netstat_udp.la
+netstat_udp_la_SOURCES = netstat_udp.c
+netstat_udp_la_LDFLAGS = $(PLUGIN_LDFLAGS)
+endif
+
if BUILD_PLUGIN_NETWORK
pkglib_LTLIBRARIES += network.la
network_la_SOURCES = network.c network.h \
@@ -1363,13 +1371,8 @@ riemann.pb-c.c riemann.pb-c.h: riemann.p
endif
install-exec-hook:
- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
- if test -e $(DESTDIR)$(sysconfdir)/collectd.conf; \
- then \
- $(INSTALL) -m 0640 collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf.pkg-orig; \
- else \
- $(INSTALL) -m 0640 collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf; \
- fi; \
+ $(mkinstalldirs) $(DESTDIR)$(egdir)
+ $(INSTALL) -m 0640 collectd.conf $(DESTDIR)$(egdir)/collectd.conf
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
$(INSTALL) -m 0644 $(srcdir)/types.db $(DESTDIR)$(pkgdatadir)/types.db;
$(INSTALL) -m 0644 $(srcdir)/postgresql_default.conf \
@@ -1377,7 +1380,7 @@ install-exec-hook:
uninstall-hook:
rm -f $(DESTDIR)$(pkgdatadir)/types.db;
- rm -f $(DESTDIR)$(sysconfdir)/collectd.conf
+ rm -f $(DESTDIR)$(egdir)/collectd.conf
rm -f $(DESTDIR)$(pkgdatadir)/postgresql_default.conf;
check_PROGRAMS = test_utils_mount test_utils_vl_lookup

594
sysutils/collectd/patches/patch-src_Makefile.in
View File

@@ -1,18 +1,339 @@
$NetBSD: patch-src_Makefile.in,v 1.2 2015/06/10 20:05:26 fhajny Exp $
$NetBSD: patch-src_Makefile.in,v 1.5 2015/09/17 11:24:11 he Exp $
Use a reasonable db dir.
Install config file into examples.
--- src/Makefile.in.orig 2015-05-27 07:51:49.001922959 +0000
+++ src/Makefile.in
@@ -2424,6 +2424,7 @@ srcdir = @srcdir@
subdirs = @subdirs@
sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
+egdir = @exec_prefix@/share/examples/@PACKAGE@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
@@ -2434,7 +2435,7 @@ PLUGIN_LDFLAGS = -module -avoid-version
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -16,7 +16,17 @@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -193,124 +203,122 @@ bin_PROGRAMS = collectd-nagios$(EXEEXT)
@BUILD_PLUGIN_MYSQL_TRUE@@BUILD_WITH_LIBMYSQL_TRUE@am__append_109 = $(BUILD_WITH_LIBMYSQL_LIBS)
@BUILD_PLUGIN_NETAPP_TRUE@am__append_110 = netapp.la
@BUILD_PLUGIN_NETLINK_TRUE@am__append_111 = netlink.la
-@BUILD_PLUGIN_NETWORK_TRUE@am__append_112 = network.la
-@BUILD_PLUGIN_NETWORK_TRUE@@BUILD_WITH_LIBSOCKET_TRUE@am__append_113 = -lsocket
-@BUILD_PLUGIN_NETWORK_TRUE@@BUILD_WITH_LIBGCRYPT_TRUE@am__append_114 = $(GCRYPT_CPPFLAGS)
-@BUILD_PLUGIN_NETWORK_TRUE@@BUILD_WITH_LIBGCRYPT_TRUE@am__append_115 = $(GCRYPT_LDFLAGS)
-@BUILD_PLUGIN_NETWORK_TRUE@@BUILD_WITH_LIBGCRYPT_TRUE@am__append_116 = $(GCRYPT_LIBS)
-@BUILD_PLUGIN_NFS_TRUE@am__append_117 = nfs.la
-@BUILD_PLUGIN_FSCACHE_TRUE@am__append_118 = fscache.la
-@BUILD_PLUGIN_NGINX_TRUE@am__append_119 = nginx.la
-@BUILD_PLUGIN_NGINX_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__append_120 = $(BUILD_WITH_LIBCURL_CFLAGS)
-@BUILD_PLUGIN_NGINX_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__append_121 = $(BUILD_WITH_LIBCURL_LIBS)
-@BUILD_PLUGIN_NOTIFY_DESKTOP_TRUE@am__append_122 = notify_desktop.la
-@BUILD_PLUGIN_NOTIFY_EMAIL_TRUE@am__append_123 = notify_email.la
-@BUILD_PLUGIN_NTPD_TRUE@am__append_124 = ntpd.la
-@BUILD_PLUGIN_NTPD_TRUE@@BUILD_WITH_LIBSOCKET_TRUE@am__append_125 = -lsocket
-@BUILD_PLUGIN_NUMA_TRUE@am__append_126 = numa.la
-@BUILD_PLUGIN_NUT_TRUE@am__append_127 = nut.la
-@BUILD_PLUGIN_OLSRD_TRUE@am__append_128 = olsrd.la
-@BUILD_PLUGIN_OLSRD_TRUE@@BUILD_WITH_LIBSOCKET_TRUE@am__append_129 = -lsocket
-@BUILD_PLUGIN_ONEWIRE_TRUE@am__append_130 = onewire.la
-@BUILD_PLUGIN_OPENLDAP_TRUE@am__append_131 = openldap.la
-@BUILD_PLUGIN_OPENVPN_TRUE@am__append_132 = openvpn.la
-@BUILD_PLUGIN_ORACLE_TRUE@am__append_133 = oracle.la
-@BUILD_PLUGIN_PERL_TRUE@am__append_134 = perl.la
+@BUILD_PLUGIN_NETSTAT_UDP_TRUE@am__append_112 = netstat_udp.la
+@BUILD_PLUGIN_NETWORK_TRUE@am__append_113 = network.la
+@BUILD_PLUGIN_NETWORK_TRUE@@BUILD_WITH_LIBSOCKET_TRUE@am__append_114 = -lsocket
+@BUILD_PLUGIN_NETWORK_TRUE@@BUILD_WITH_LIBGCRYPT_TRUE@am__append_115 = $(GCRYPT_CPPFLAGS)
+@BUILD_PLUGIN_NETWORK_TRUE@@BUILD_WITH_LIBGCRYPT_TRUE@am__append_116 = $(GCRYPT_LDFLAGS)
+@BUILD_PLUGIN_NETWORK_TRUE@@BUILD_WITH_LIBGCRYPT_TRUE@am__append_117 = $(GCRYPT_LIBS)
+@BUILD_PLUGIN_NFS_TRUE@am__append_118 = nfs.la
+@BUILD_PLUGIN_FSCACHE_TRUE@am__append_119 = fscache.la
+@BUILD_PLUGIN_NGINX_TRUE@am__append_120 = nginx.la
+@BUILD_PLUGIN_NGINX_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__append_121 = $(BUILD_WITH_LIBCURL_CFLAGS)
+@BUILD_PLUGIN_NGINX_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__append_122 = $(BUILD_WITH_LIBCURL_LIBS)
+@BUILD_PLUGIN_NOTIFY_DESKTOP_TRUE@am__append_123 = notify_desktop.la
+@BUILD_PLUGIN_NOTIFY_EMAIL_TRUE@am__append_124 = notify_email.la
+@BUILD_PLUGIN_NTPD_TRUE@am__append_125 = ntpd.la
+@BUILD_PLUGIN_NTPD_TRUE@@BUILD_WITH_LIBSOCKET_TRUE@am__append_126 = -lsocket
+@BUILD_PLUGIN_NUMA_TRUE@am__append_127 = numa.la
+@BUILD_PLUGIN_NUT_TRUE@am__append_128 = nut.la
+@BUILD_PLUGIN_OLSRD_TRUE@am__append_129 = olsrd.la
+@BUILD_PLUGIN_OLSRD_TRUE@@BUILD_WITH_LIBSOCKET_TRUE@am__append_130 = -lsocket
+@BUILD_PLUGIN_ONEWIRE_TRUE@am__append_131 = onewire.la
+@BUILD_PLUGIN_OPENLDAP_TRUE@am__append_132 = openldap.la
+@BUILD_PLUGIN_OPENVPN_TRUE@am__append_133 = openvpn.la
+@BUILD_PLUGIN_ORACLE_TRUE@am__append_134 = oracle.la
+@BUILD_PLUGIN_PERL_TRUE@am__append_135 = perl.la
# Work-around for issues #41 and #42 - Perl 5.10 incorrectly introduced
# __attribute__nonnull__(3) for Perl_load_module().
-@BUILD_PLUGIN_PERL_TRUE@@HAVE_BROKEN_PERL_LOAD_MODULE_TRUE@am__append_135 = -Wno-nonnull
-@BUILD_PLUGIN_PF_TRUE@am__append_136 = pf.la
-@BUILD_PLUGIN_PINBA_TRUE@am__append_137 = pinba.la
-@BUILD_PLUGIN_PING_TRUE@am__append_138 = ping.la
-@BUILD_PLUGIN_POSTGRESQL_TRUE@am__append_139 = postgresql.la
-@BUILD_PLUGIN_POWERDNS_TRUE@am__append_140 = powerdns.la
-@BUILD_PLUGIN_PYTHON_TRUE@am__append_141 = python.la
-@BUILD_PLUGIN_PYTHON_TRUE@@COMPILER_IS_GCC_TRUE@am__append_142 = -fno-strict-aliasing -Wno-strict-aliasing
-@BUILD_PLUGIN_PROCESSES_TRUE@am__append_143 = processes.la
-@BUILD_PLUGIN_PROCESSES_TRUE@@BUILD_WITH_LIBKVM_GETPROCS_TRUE@am__append_144 = -lkvm
-@BUILD_PLUGIN_PROTOCOLS_TRUE@am__append_145 = protocols.la
-@BUILD_PLUGIN_REDIS_TRUE@am__append_146 = redis.la
-@BUILD_PLUGIN_ROUTEROS_TRUE@am__append_147 = routeros.la
-@BUILD_PLUGIN_RRDCACHED_TRUE@am__append_148 = rrdcached.la
-@BUILD_PLUGIN_RRDTOOL_TRUE@am__append_149 = rrdtool.la
-@BUILD_PLUGIN_SENSORS_TRUE@am__append_150 = sensors.la
-@BUILD_PLUGIN_SERIAL_TRUE@am__append_151 = serial.la
-@BUILD_PLUGIN_SIGROK_TRUE@am__append_152 = sigrok.la
-@BUILD_PLUGIN_SMART_TRUE@@BUILD_WITH_LIBUDEV_TRUE@am__append_153 = smart.la
-@BUILD_PLUGIN_SNMP_TRUE@am__append_154 = snmp.la
-@BUILD_PLUGIN_SNMP_TRUE@@BUILD_WITH_LIBNETSNMP_TRUE@am__append_155 = $(BUILD_WITH_LIBSNMP_CFLAGS)
-@BUILD_PLUGIN_SNMP_TRUE@@BUILD_WITH_LIBNETSNMP_TRUE@am__append_156 = $(BUILD_WITH_LIBSNMP_LIBS)
-@BUILD_PLUGIN_SNMP_TRUE@@BUILD_WITH_LIBPTHREAD_TRUE@am__append_157 = -lpthread
-@BUILD_PLUGIN_STATSD_TRUE@am__append_158 = statsd.la
-@BUILD_PLUGIN_SWAP_TRUE@am__append_159 = swap.la
-@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBKSTAT_TRUE@am__append_160 = -lkstat
-@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBDEVINFO_TRUE@am__append_161 = -ldevinfo
-@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBKVM_GETSWAPINFO_TRUE@am__append_162 = -lkvm
-@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_163 = $(BUILD_WITH_LIBSTATGRAB_CFLAGS)
-@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_164 = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
-@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_PERFSTAT_TRUE@am__append_165 = -lperfstat
-@BUILD_PLUGIN_SYSLOG_TRUE@am__append_166 = syslog.la
-@BUILD_PLUGIN_TABLE_TRUE@am__append_167 = table.la
-@BUILD_PLUGIN_TAIL_TRUE@am__append_168 = tail.la
-@BUILD_PLUGIN_TAIL_CSV_TRUE@am__append_169 = tail_csv.la
-@BUILD_PLUGIN_TAPE_TRUE@am__append_170 = tape.la
-@BUILD_PLUGIN_TARGET_NOTIFICATION_TRUE@am__append_171 = target_notification.la
-@BUILD_PLUGIN_TARGET_REPLACE_TRUE@am__append_172 = target_replace.la
-@BUILD_PLUGIN_TARGET_SCALE_TRUE@am__append_173 = target_scale.la
-@BUILD_PLUGIN_TARGET_SET_TRUE@am__append_174 = target_set.la
-@BUILD_PLUGIN_TARGET_V5UPGRADE_TRUE@am__append_175 = target_v5upgrade.la
-@BUILD_PLUGIN_TCPCONNS_TRUE@am__append_176 = tcpconns.la
-@BUILD_PLUGIN_TCPCONNS_TRUE@@BUILD_WITH_LIBKVM_NLIST_TRUE@am__append_177 = -lkvm
-@BUILD_PLUGIN_TEAMSPEAK2_TRUE@am__append_178 = teamspeak2.la
-@BUILD_PLUGIN_TED_TRUE@am__append_179 = ted.la
-@BUILD_PLUGIN_THERMAL_TRUE@am__append_180 = thermal.la
-@BUILD_PLUGIN_THRESHOLD_TRUE@am__append_181 = threshold.la
-@BUILD_PLUGIN_TOKYOTYRANT_TRUE@am__append_182 = tokyotyrant.la
-@BUILD_PLUGIN_TOKYOTYRANT_TRUE@@BUILD_WITH_LIBSOCKET_TRUE@am__append_183 = -lsocket
-@BUILD_PLUGIN_TURBOSTAT_TRUE@am__append_184 = turbostat.la
-@BUILD_PLUGIN_UNIXSOCK_TRUE@am__append_185 = unixsock.la
-@BUILD_PLUGIN_UPTIME_TRUE@am__append_186 = uptime.la
-@BUILD_PLUGIN_UPTIME_TRUE@@BUILD_WITH_LIBKSTAT_TRUE@am__append_187 = -lkstat
-@BUILD_PLUGIN_UPTIME_TRUE@@BUILD_WITH_PERFSTAT_TRUE@am__append_188 = -lperfstat
-@BUILD_PLUGIN_USERS_TRUE@am__append_189 = users.la
-@BUILD_PLUGIN_USERS_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_190 = $(BUILD_WITH_LIBSTATGRAB_CFLAGS)
-@BUILD_PLUGIN_USERS_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_191 = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
-@BUILD_PLUGIN_UUID_TRUE@am__append_192 = uuid.la
-@BUILD_PLUGIN_VARNISH_TRUE@am__append_193 = varnish.la
-@BUILD_PLUGIN_VIRT_TRUE@am__append_194 = virt.la
-@BUILD_PLUGIN_VMEM_TRUE@am__append_195 = vmem.la
-@BUILD_PLUGIN_VSERVER_TRUE@am__append_196 = vserver.la
-@BUILD_PLUGIN_WIRELESS_TRUE@am__append_197 = wireless.la
-@BUILD_PLUGIN_WRITE_GRAPHITE_TRUE@am__append_198 = write_graphite.la
-@BUILD_PLUGIN_WRITE_HTTP_TRUE@am__append_199 = write_http.la
-@BUILD_PLUGIN_WRITE_HTTP_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__append_200 = $(BUILD_WITH_LIBCURL_CFLAGS)
-@BUILD_PLUGIN_WRITE_HTTP_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__append_201 = $(BUILD_WITH_LIBCURL_LIBS)
-@BUILD_PLUGIN_WRITE_KAFKA_TRUE@am__append_202 = write_kafka.la
-@BUILD_PLUGIN_WRITE_LOG_TRUE@am__append_203 = write_log.la
-@BUILD_PLUGIN_WRITE_MONGODB_TRUE@am__append_204 = write_mongodb.la
-@BUILD_PLUGIN_WRITE_REDIS_TRUE@am__append_205 = write_redis.la
-@BUILD_PLUGIN_WRITE_RIEMANN_TRUE@am__append_206 = write_riemann.la
-@BUILD_PLUGIN_WRITE_SENSU_TRUE@am__append_207 = write_sensu.la
-@BUILD_PLUGIN_WRITE_TSDB_TRUE@am__append_208 = write_tsdb.la
-@BUILD_PLUGIN_XMMS_TRUE@am__append_209 = xmms.la
-@BUILD_PLUGIN_ZFS_ARC_TRUE@am__append_210 = zfs_arc.la
-@BUILD_PLUGIN_ZOOKEEPER_TRUE@am__append_211 = zookeeper.la
-@HAVE_PROTOC_C_TRUE@am__append_212 = pinba.pb-c.c pinba.pb-c.h \
-@HAVE_PROTOC_C_TRUE@ riemann.pb-c.c riemann.pb-c.h
+@BUILD_PLUGIN_PERL_TRUE@@HAVE_BROKEN_PERL_LOAD_MODULE_TRUE@am__append_136 = -Wno-nonnull
+@BUILD_PLUGIN_PF_TRUE@am__append_137 = pf.la
+@BUILD_PLUGIN_PINBA_TRUE@am__append_138 = pinba.la
+@BUILD_PLUGIN_PING_TRUE@am__append_139 = ping.la
+@BUILD_PLUGIN_POSTGRESQL_TRUE@am__append_140 = postgresql.la
+@BUILD_PLUGIN_POWERDNS_TRUE@am__append_141 = powerdns.la
+@BUILD_PLUGIN_PYTHON_TRUE@am__append_142 = python.la
+@BUILD_PLUGIN_PYTHON_TRUE@@COMPILER_IS_GCC_TRUE@am__append_143 = -fno-strict-aliasing -Wno-strict-aliasing
+@BUILD_PLUGIN_PROCESSES_TRUE@am__append_144 = processes.la
+@BUILD_PLUGIN_PROCESSES_TRUE@@BUILD_WITH_LIBKVM_GETPROCS_TRUE@am__append_145 = -lkvm
+@BUILD_PLUGIN_PROTOCOLS_TRUE@am__append_146 = protocols.la
+@BUILD_PLUGIN_REDIS_TRUE@am__append_147 = redis.la
+@BUILD_PLUGIN_ROUTEROS_TRUE@am__append_148 = routeros.la
+@BUILD_PLUGIN_RRDCACHED_TRUE@am__append_149 = rrdcached.la
+@BUILD_PLUGIN_RRDTOOL_TRUE@am__append_150 = rrdtool.la
+@BUILD_PLUGIN_SENSORS_TRUE@am__append_151 = sensors.la
+@BUILD_PLUGIN_SERIAL_TRUE@am__append_152 = serial.la
+@BUILD_PLUGIN_SIGROK_TRUE@am__append_153 = sigrok.la
+@BUILD_PLUGIN_SMART_TRUE@@BUILD_WITH_LIBUDEV_TRUE@am__append_154 = smart.la
+@BUILD_PLUGIN_SNMP_TRUE@am__append_155 = snmp.la
+@BUILD_PLUGIN_SNMP_TRUE@@BUILD_WITH_LIBNETSNMP_TRUE@am__append_156 = $(BUILD_WITH_LIBSNMP_CFLAGS)
+@BUILD_PLUGIN_SNMP_TRUE@@BUILD_WITH_LIBNETSNMP_TRUE@am__append_157 = $(BUILD_WITH_LIBSNMP_LIBS)
+@BUILD_PLUGIN_SNMP_TRUE@@BUILD_WITH_LIBPTHREAD_TRUE@am__append_158 = -lpthread
+@BUILD_PLUGIN_STATSD_TRUE@am__append_159 = statsd.la
+@BUILD_PLUGIN_SWAP_TRUE@am__append_160 = swap.la
+@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBKSTAT_TRUE@am__append_161 = -lkstat
+@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBDEVINFO_TRUE@am__append_162 = -ldevinfo
+@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBKVM_GETSWAPINFO_TRUE@am__append_163 = -lkvm
+@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_164 = $(BUILD_WITH_LIBSTATGRAB_CFLAGS)
+@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_165 = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
+@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_PERFSTAT_TRUE@am__append_166 = -lperfstat
+@BUILD_PLUGIN_SYSLOG_TRUE@am__append_167 = syslog.la
+@BUILD_PLUGIN_TABLE_TRUE@am__append_168 = table.la
+@BUILD_PLUGIN_TAIL_TRUE@am__append_169 = tail.la
+@BUILD_PLUGIN_TAIL_CSV_TRUE@am__append_170 = tail_csv.la
+@BUILD_PLUGIN_TAPE_TRUE@am__append_171 = tape.la
+@BUILD_PLUGIN_TARGET_NOTIFICATION_TRUE@am__append_172 = target_notification.la
+@BUILD_PLUGIN_TARGET_REPLACE_TRUE@am__append_173 = target_replace.la
+@BUILD_PLUGIN_TARGET_SCALE_TRUE@am__append_174 = target_scale.la
+@BUILD_PLUGIN_TARGET_SET_TRUE@am__append_175 = target_set.la
+@BUILD_PLUGIN_TARGET_V5UPGRADE_TRUE@am__append_176 = target_v5upgrade.la
+@BUILD_PLUGIN_TCPCONNS_TRUE@am__append_177 = tcpconns.la
+@BUILD_PLUGIN_TCPCONNS_TRUE@@BUILD_WITH_LIBKVM_NLIST_TRUE@am__append_178 = -lkvm
+@BUILD_PLUGIN_TEAMSPEAK2_TRUE@am__append_179 = teamspeak2.la
+@BUILD_PLUGIN_TED_TRUE@am__append_180 = ted.la
+@BUILD_PLUGIN_THERMAL_TRUE@am__append_181 = thermal.la
+@BUILD_PLUGIN_THRESHOLD_TRUE@am__append_182 = threshold.la
+@BUILD_PLUGIN_TOKYOTYRANT_TRUE@am__append_183 = tokyotyrant.la
+@BUILD_PLUGIN_TOKYOTYRANT_TRUE@@BUILD_WITH_LIBSOCKET_TRUE@am__append_184 = -lsocket
+@BUILD_PLUGIN_TURBOSTAT_TRUE@am__append_185 = turbostat.la
+@BUILD_PLUGIN_UNIXSOCK_TRUE@am__append_186 = unixsock.la
+@BUILD_PLUGIN_UPTIME_TRUE@am__append_187 = uptime.la
+@BUILD_PLUGIN_UPTIME_TRUE@@BUILD_WITH_LIBKSTAT_TRUE@am__append_188 = -lkstat
+@BUILD_PLUGIN_UPTIME_TRUE@@BUILD_WITH_PERFSTAT_TRUE@am__append_189 = -lperfstat
+@BUILD_PLUGIN_USERS_TRUE@am__append_190 = users.la
+@BUILD_PLUGIN_USERS_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_191 = $(BUILD_WITH_LIBSTATGRAB_CFLAGS)
+@BUILD_PLUGIN_USERS_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_192 = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
+@BUILD_PLUGIN_UUID_TRUE@am__append_193 = uuid.la
+@BUILD_PLUGIN_VARNISH_TRUE@am__append_194 = varnish.la
+@BUILD_PLUGIN_VIRT_TRUE@am__append_195 = virt.la
+@BUILD_PLUGIN_VMEM_TRUE@am__append_196 = vmem.la
+@BUILD_PLUGIN_VSERVER_TRUE@am__append_197 = vserver.la
+@BUILD_PLUGIN_WIRELESS_TRUE@am__append_198 = wireless.la
+@BUILD_PLUGIN_WRITE_GRAPHITE_TRUE@am__append_199 = write_graphite.la
+@BUILD_PLUGIN_WRITE_HTTP_TRUE@am__append_200 = write_http.la
+@BUILD_PLUGIN_WRITE_HTTP_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__append_201 = $(BUILD_WITH_LIBCURL_CFLAGS)
+@BUILD_PLUGIN_WRITE_HTTP_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__append_202 = $(BUILD_WITH_LIBCURL_LIBS)
+@BUILD_PLUGIN_WRITE_KAFKA_TRUE@am__append_203 = write_kafka.la
+@BUILD_PLUGIN_WRITE_LOG_TRUE@am__append_204 = write_log.la
+@BUILD_PLUGIN_WRITE_MONGODB_TRUE@am__append_205 = write_mongodb.la
+@BUILD_PLUGIN_WRITE_REDIS_TRUE@am__append_206 = write_redis.la
+@BUILD_PLUGIN_WRITE_RIEMANN_TRUE@am__append_207 = write_riemann.la
+@BUILD_PLUGIN_WRITE_SENSU_TRUE@am__append_208 = write_sensu.la
+@BUILD_PLUGIN_WRITE_TSDB_TRUE@am__append_209 = write_tsdb.la
+@BUILD_PLUGIN_XMMS_TRUE@am__append_210 = xmms.la
+@BUILD_PLUGIN_ZFS_ARC_TRUE@am__append_211 = zfs_arc.la
+@BUILD_PLUGIN_ZOOKEEPER_TRUE@am__append_212 = zookeeper.la
@HAVE_PROTOC_C_TRUE@am__append_213 = pinba.pb-c.c pinba.pb-c.h \
@HAVE_PROTOC_C_TRUE@ riemann.pb-c.c riemann.pb-c.h
+@HAVE_PROTOC_C_TRUE@am__append_214 = pinba.pb-c.c pinba.pb-c.h \
+@HAVE_PROTOC_C_TRUE@ riemann.pb-c.c riemann.pb-c.h
check_PROGRAMS = test_utils_mount$(EXEEXT) \
test_utils_vl_lookup$(EXEEXT)
TESTS = test_utils_mount$(EXEEXT) test_utils_vl_lookup$(EXEEXT)
subdir = src
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(srcdir)/config.h.in $(srcdir)/collectd.conf.in \
- $(top_srcdir)/libltdl/config/depcomp $(dist_man_MANS) \
- $(top_srcdir)/libltdl/config/test-driver
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES = collectd.conf
@@ -977,6 +985,17 @@ netlink_la_LINK = $(LIBTOOL) $(AM_V_lt)
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(netlink_la_CFLAGS) \
$(CFLAGS) $(netlink_la_LDFLAGS) $(LDFLAGS) -o $@
@BUILD_PLUGIN_NETLINK_TRUE@am_netlink_la_rpath = -rpath $(pkglibdir)
+netstat_udp_la_LIBADD =
+am__netstat_udp_la_SOURCES_DIST = netstat_udp.c
+@BUILD_PLUGIN_NETSTAT_UDP_TRUE@am_netstat_udp_la_OBJECTS = \
+@BUILD_PLUGIN_NETSTAT_UDP_TRUE@ netstat_udp.lo
+netstat_udp_la_OBJECTS = $(am_netstat_udp_la_OBJECTS)
+netstat_udp_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ $(AM_CFLAGS) $(CFLAGS) $(netstat_udp_la_LDFLAGS) $(LDFLAGS) -o \
+ $@
+@BUILD_PLUGIN_NETSTAT_UDP_TRUE@am_netstat_udp_la_rpath = -rpath \
+@BUILD_PLUGIN_NETSTAT_UDP_TRUE@ $(pkglibdir)
@BUILD_PLUGIN_NETWORK_TRUE@@BUILD_WITH_LIBGCRYPT_TRUE@am__DEPENDENCIES_11 = $(am__DEPENDENCIES_1)
@BUILD_PLUGIN_NETWORK_TRUE@network_la_DEPENDENCIES = \
@BUILD_PLUGIN_NETWORK_TRUE@ $(am__DEPENDENCIES_1) \
@@ -1780,7 +1799,8 @@ SOURCES = $(aggregation_la_SOURCES) $(am
$(memcached_la_SOURCES) $(memory_la_SOURCES) $(mic_la_SOURCES) \
$(modbus_la_SOURCES) $(multimeter_la_SOURCES) \
$(mysql_la_SOURCES) $(netapp_la_SOURCES) $(netlink_la_SOURCES) \
- $(network_la_SOURCES) $(nfs_la_SOURCES) $(nginx_la_SOURCES) \
+ $(netstat_udp_la_SOURCES) $(network_la_SOURCES) \
+ $(nfs_la_SOURCES) $(nginx_la_SOURCES) \
$(notify_desktop_la_SOURCES) $(notify_email_la_SOURCES) \
$(ntpd_la_SOURCES) $(numa_la_SOURCES) $(nut_la_SOURCES) \
$(olsrd_la_SOURCES) $(onewire_la_SOURCES) \
@@ -1857,6 +1877,7 @@ DIST_SOURCES = $(am__aggregation_la_SOUR
$(am__mic_la_SOURCES_DIST) $(am__modbus_la_SOURCES_DIST) \
$(am__multimeter_la_SOURCES_DIST) $(am__mysql_la_SOURCES_DIST) \
$(am__netapp_la_SOURCES_DIST) $(am__netlink_la_SOURCES_DIST) \
+ $(am__netstat_udp_la_SOURCES_DIST) \
$(am__network_la_SOURCES_DIST) $(am__nfs_la_SOURCES_DIST) \
$(am__nginx_la_SOURCES_DIST) \
$(am__notify_desktop_la_SOURCES_DIST) \
@@ -2132,6 +2153,10 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)
TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
$(TEST_LOG_FLAGS)
DIST_SUBDIRS = libcollectdclient liboconfig daemon
+am__DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.in \
+ $(srcdir)/collectd.conf.in $(srcdir)/config.h.in \
+ $(top_srcdir)/libltdl/config/depcomp \
+ $(top_srcdir)/libltdl/config/test-driver
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
am__relativize = \
dir0=`pwd`; \
@@ -2275,12 +2300,6 @@ GANGLIA_LIBS = @GANGLIA_LIBS@
GCRYPT_CPPFLAGS = @GCRYPT_CPPFLAGS@
GCRYPT_LDFLAGS = @GCRYPT_LDFLAGS@
GCRYPT_LIBS = @GCRYPT_LIBS@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GLIB_LIBS = @GLIB_LIBS@
-GLIB_MKENUMS = @GLIB_MKENUMS@
-GOBJECT_QUERY = @GOBJECT_QUERY@
GREP = @GREP@
INCLTDL = @INCLTDL@
INSTALL = @INSTALL@
@@ -2310,9 +2329,6 @@ LIBADD_DL = @LIBADD_DL@
LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
LIBADD_DLOPEN = @LIBADD_DLOPEN@
LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
-LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
-LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
-LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
LIBLTDL = @LIBLTDL@
LIBNETAPP_CPPFLAGS = @LIBNETAPP_CPPFLAGS@
LIBNETAPP_LDFLAGS = @LIBNETAPP_LDFLAGS@
@@ -2434,9 +2450,10 @@ PLUGIN_LDFLAGS = -module -avoid-version
AM_CPPFLAGS = -I$(srcdir)/daemon -DPREFIX='"${prefix}"' \
-DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \
-DLOCALSTATEDIR='"${localstatedir}"' \
@@ -20,8 +341,255 @@ Install config file into examples.
+ -DPKGLOCALSTATEDIR='"${localstatedir}/db/${PACKAGE_NAME}"' \
$(am__append_2) -DPLUGINDIR='"${pkglibdir}"' \
-DPKGDATADIR='"${pkgdatadir}"'
+egdir = @exec_prefix@/share/examples/@PACKAGE@
AUTOMAKE_OPTIONS = subdir-objects
@@ -5190,13 +5191,8 @@ uninstall-man: uninstall-man1 uninstall-
noinst_LTLIBRARIES = libmount.la liblookup.la
libmount_la_SOURCES = utils_mount.c utils_mount.h
@@ -2482,32 +2499,33 @@ pkglib_LTLIBRARIES = $(am__append_11) $(
$(am__append_95) $(am__append_96) $(am__append_98) \
$(am__append_104) $(am__append_105) $(am__append_106) \
$(am__append_107) $(am__append_110) $(am__append_111) \
- $(am__append_112) $(am__append_117) $(am__append_118) \
- $(am__append_119) $(am__append_122) $(am__append_123) \
- $(am__append_124) $(am__append_126) $(am__append_127) \
- $(am__append_128) $(am__append_130) $(am__append_131) \
+ $(am__append_112) $(am__append_113) $(am__append_118) \
+ $(am__append_119) $(am__append_120) $(am__append_123) \
+ $(am__append_124) $(am__append_125) $(am__append_127) \
+ $(am__append_128) $(am__append_129) $(am__append_131) \
$(am__append_132) $(am__append_133) $(am__append_134) \
- $(am__append_136) $(am__append_137) $(am__append_138) \
+ $(am__append_135) $(am__append_137) $(am__append_138) \
$(am__append_139) $(am__append_140) $(am__append_141) \
- $(am__append_143) $(am__append_145) $(am__append_146) \
+ $(am__append_142) $(am__append_144) $(am__append_146) \
$(am__append_147) $(am__append_148) $(am__append_149) \
$(am__append_150) $(am__append_151) $(am__append_152) \
- $(am__append_153) $(am__append_154) $(am__append_158) \
- $(am__append_159) $(am__append_166) $(am__append_167) \
+ $(am__append_153) $(am__append_154) $(am__append_155) \
+ $(am__append_159) $(am__append_160) $(am__append_167) \
$(am__append_168) $(am__append_169) $(am__append_170) \
$(am__append_171) $(am__append_172) $(am__append_173) \
$(am__append_174) $(am__append_175) $(am__append_176) \
- $(am__append_178) $(am__append_179) $(am__append_180) \
- $(am__append_181) $(am__append_182) $(am__append_184) \
- $(am__append_185) $(am__append_186) $(am__append_189) \
- $(am__append_192) $(am__append_193) $(am__append_194) \
+ $(am__append_177) $(am__append_179) $(am__append_180) \
+ $(am__append_181) $(am__append_182) $(am__append_183) \
+ $(am__append_185) $(am__append_186) $(am__append_187) \
+ $(am__append_190) $(am__append_193) $(am__append_194) \
$(am__append_195) $(am__append_196) $(am__append_197) \
- $(am__append_198) $(am__append_199) $(am__append_202) \
+ $(am__append_198) $(am__append_199) $(am__append_200) \
$(am__append_203) $(am__append_204) $(am__append_205) \
$(am__append_206) $(am__append_207) $(am__append_208) \
- $(am__append_209) $(am__append_210) $(am__append_211)
-BUILT_SOURCES = $(dist_man_MANS) $(am__append_213)
-CLEANFILES = $(am__append_212)
+ $(am__append_209) $(am__append_210) $(am__append_211) \
+ $(am__append_212)
+BUILT_SOURCES = $(dist_man_MANS) $(am__append_214)
+CLEANFILES = $(am__append_213)
@BUILD_PLUGIN_AGGREGATION_TRUE@aggregation_la_SOURCES = aggregation.c \
@BUILD_PLUGIN_AGGREGATION_TRUE@ utils_vl_lookup.c utils_vl_lookup.h
@@ -2765,23 +2783,25 @@ CLEANFILES = $(am__append_212)
@BUILD_PLUGIN_NETLINK_TRUE@netlink_la_LDFLAGS = $(PLUGIN_LDFLAGS)
@BUILD_PLUGIN_NETLINK_TRUE@netlink_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBMNL_CFLAGS)
@BUILD_PLUGIN_NETLINK_TRUE@netlink_la_LIBADD = $(BUILD_WITH_LIBMNL_LIBS)
+@BUILD_PLUGIN_NETSTAT_UDP_TRUE@netstat_udp_la_SOURCES = netstat_udp.c
+@BUILD_PLUGIN_NETSTAT_UDP_TRUE@netstat_udp_la_LDFLAGS = $(PLUGIN_LDFLAGS)
@BUILD_PLUGIN_NETWORK_TRUE@network_la_SOURCES = network.c network.h \
@BUILD_PLUGIN_NETWORK_TRUE@ utils_fbhash.c utils_fbhash.h
@BUILD_PLUGIN_NETWORK_TRUE@network_la_CPPFLAGS = $(AM_CPPFLAGS) \
-@BUILD_PLUGIN_NETWORK_TRUE@ $(am__append_114)
-@BUILD_PLUGIN_NETWORK_TRUE@network_la_LDFLAGS = $(PLUGIN_LDFLAGS) \
@BUILD_PLUGIN_NETWORK_TRUE@ $(am__append_115)
+@BUILD_PLUGIN_NETWORK_TRUE@network_la_LDFLAGS = $(PLUGIN_LDFLAGS) \
+@BUILD_PLUGIN_NETWORK_TRUE@ $(am__append_116)
@BUILD_PLUGIN_NETWORK_TRUE@network_la_LIBADD = -lpthread \
-@BUILD_PLUGIN_NETWORK_TRUE@ $(am__append_113) $(am__append_116)
+@BUILD_PLUGIN_NETWORK_TRUE@ $(am__append_114) $(am__append_117)
@BUILD_PLUGIN_NFS_TRUE@nfs_la_SOURCES = nfs.c
@BUILD_PLUGIN_NFS_TRUE@nfs_la_LDFLAGS = $(PLUGIN_LDFLAGS)
@BUILD_PLUGIN_FSCACHE_TRUE@fscache_la_SOURCES = fscache.c
@BUILD_PLUGIN_FSCACHE_TRUE@fscache_la_LDFLAGS = $(PLUGIN_LDFLAGS)
@BUILD_PLUGIN_NGINX_TRUE@nginx_la_SOURCES = nginx.c
@BUILD_PLUGIN_NGINX_TRUE@nginx_la_CFLAGS = $(AM_CFLAGS) \
-@BUILD_PLUGIN_NGINX_TRUE@ $(am__append_120)
-@BUILD_PLUGIN_NGINX_TRUE@nginx_la_LIBADD = $(am__append_121)
+@BUILD_PLUGIN_NGINX_TRUE@ $(am__append_121)
+@BUILD_PLUGIN_NGINX_TRUE@nginx_la_LIBADD = $(am__append_122)
@BUILD_PLUGIN_NGINX_TRUE@nginx_la_LDFLAGS = $(PLUGIN_LDFLAGS)
@BUILD_PLUGIN_NOTIFY_DESKTOP_TRUE@notify_desktop_la_SOURCES = notify_desktop.c
@BUILD_PLUGIN_NOTIFY_DESKTOP_TRUE@notify_desktop_la_CFLAGS = $(AM_CFLAGS) $(LIBNOTIFY_CFLAGS)
@@ -2792,7 +2812,7 @@ CLEANFILES = $(am__append_212)
@BUILD_PLUGIN_NOTIFY_EMAIL_TRUE@notify_email_la_LIBADD = -lesmtp -lssl -lcrypto -lpthread
@BUILD_PLUGIN_NTPD_TRUE@ntpd_la_SOURCES = ntpd.c
@BUILD_PLUGIN_NTPD_TRUE@ntpd_la_LDFLAGS = $(PLUGIN_LDFLAGS)
-@BUILD_PLUGIN_NTPD_TRUE@ntpd_la_LIBADD = $(am__append_125)
+@BUILD_PLUGIN_NTPD_TRUE@ntpd_la_LIBADD = $(am__append_126)
@BUILD_PLUGIN_NUMA_TRUE@numa_la_SOURCES = numa.c
@BUILD_PLUGIN_NUMA_TRUE@numa_la_LDFLAGS = $(PLUGIN_LDFLAGS)
@BUILD_PLUGIN_NUT_TRUE@nut_la_SOURCES = nut.c
@@ -2801,7 +2821,7 @@ CLEANFILES = $(am__append_212)
@BUILD_PLUGIN_NUT_TRUE@nut_la_LIBADD = -lpthread $(BUILD_WITH_LIBUPSCLIENT_LIBS)
@BUILD_PLUGIN_OLSRD_TRUE@olsrd_la_SOURCES = olsrd.c
@BUILD_PLUGIN_OLSRD_TRUE@olsrd_la_LDFLAGS = $(PLUGIN_LDFLAGS)
-@BUILD_PLUGIN_OLSRD_TRUE@olsrd_la_LIBADD = $(am__append_129)
+@BUILD_PLUGIN_OLSRD_TRUE@olsrd_la_LIBADD = $(am__append_130)
@BUILD_PLUGIN_ONEWIRE_TRUE@onewire_la_SOURCES = onewire.c \
@BUILD_PLUGIN_ONEWIRE_TRUE@ utils_ignorelist.c utils_ignorelist.h
@@ -2830,7 +2850,7 @@ CLEANFILES = $(am__append_212)
@BUILD_PLUGIN_PERL_TRUE@perl_la_CFLAGS = $(AM_CFLAGS) $(PERL_CFLAGS) \
@BUILD_PLUGIN_PERL_TRUE@ -DXS_VERSION=\"$(VERSION)\" \
@BUILD_PLUGIN_PERL_TRUE@ -DVERSION=\"$(VERSION)\" \
-@BUILD_PLUGIN_PERL_TRUE@ $(am__append_135)
+@BUILD_PLUGIN_PERL_TRUE@ $(am__append_136)
@BUILD_PLUGIN_PERL_TRUE@perl_la_LDFLAGS = $(PLUGIN_LDFLAGS) \
@BUILD_PLUGIN_PERL_TRUE@ $(PERL_LDFLAGS)
@@ -2858,12 +2878,12 @@ CLEANFILES = $(am__append_212)
@BUILD_PLUGIN_PYTHON_TRUE@python_la_SOURCES = python.c pyconfig.c pyvalues.c cpython.h
@BUILD_PLUGIN_PYTHON_TRUE@python_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_PYTHON_CPPFLAGS)
@BUILD_PLUGIN_PYTHON_TRUE@python_la_CFLAGS = $(AM_CFLAGS) \
-@BUILD_PLUGIN_PYTHON_TRUE@ $(am__append_142)
+@BUILD_PLUGIN_PYTHON_TRUE@ $(am__append_143)
@BUILD_PLUGIN_PYTHON_TRUE@python_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_PYTHON_LDFLAGS)
@BUILD_PLUGIN_PYTHON_TRUE@python_la_LIBADD = $(BUILD_WITH_PYTHON_LIBS)
@BUILD_PLUGIN_PROCESSES_TRUE@processes_la_SOURCES = processes.c
@BUILD_PLUGIN_PROCESSES_TRUE@processes_la_LDFLAGS = $(PLUGIN_LDFLAGS)
-@BUILD_PLUGIN_PROCESSES_TRUE@processes_la_LIBADD = $(am__append_144)
+@BUILD_PLUGIN_PROCESSES_TRUE@processes_la_LIBADD = $(am__append_145)
@BUILD_PLUGIN_PROTOCOLS_TRUE@protocols_la_SOURCES = protocols.c \
@BUILD_PLUGIN_PROTOCOLS_TRUE@ utils_ignorelist.c utils_ignorelist.h
@@ -2905,9 +2925,9 @@ CLEANFILES = $(am__append_212)
@BUILD_PLUGIN_SNMP_TRUE@snmp_la_SOURCES = snmp.c
@BUILD_PLUGIN_SNMP_TRUE@snmp_la_LDFLAGS = $(PLUGIN_LDFLAGS)
@BUILD_PLUGIN_SNMP_TRUE@snmp_la_CFLAGS = $(AM_CFLAGS) \
-@BUILD_PLUGIN_SNMP_TRUE@ $(am__append_155)
-@BUILD_PLUGIN_SNMP_TRUE@snmp_la_LIBADD = $(am__append_156) \
-@BUILD_PLUGIN_SNMP_TRUE@ $(am__append_157)
+@BUILD_PLUGIN_SNMP_TRUE@ $(am__append_156)
+@BUILD_PLUGIN_SNMP_TRUE@snmp_la_LIBADD = $(am__append_157) \
+@BUILD_PLUGIN_SNMP_TRUE@ $(am__append_158)
@BUILD_PLUGIN_STATSD_TRUE@statsd_la_SOURCES = statsd.c \
@BUILD_PLUGIN_STATSD_TRUE@ utils_latency.h utils_latency.c
@@ -2915,11 +2935,11 @@ CLEANFILES = $(am__append_212)
@BUILD_PLUGIN_STATSD_TRUE@statsd_la_LIBADD = -lpthread
@BUILD_PLUGIN_SWAP_TRUE@swap_la_SOURCES = swap.c
@BUILD_PLUGIN_SWAP_TRUE@swap_la_CFLAGS = $(AM_CFLAGS) \
-@BUILD_PLUGIN_SWAP_TRUE@ $(am__append_163)
+@BUILD_PLUGIN_SWAP_TRUE@ $(am__append_164)
@BUILD_PLUGIN_SWAP_TRUE@swap_la_LDFLAGS = $(PLUGIN_LDFLAGS)
-@BUILD_PLUGIN_SWAP_TRUE@swap_la_LIBADD = $(am__append_160) \
-@BUILD_PLUGIN_SWAP_TRUE@ $(am__append_161) $(am__append_162) \
-@BUILD_PLUGIN_SWAP_TRUE@ $(am__append_164) $(am__append_165)
+@BUILD_PLUGIN_SWAP_TRUE@swap_la_LIBADD = $(am__append_161) \
+@BUILD_PLUGIN_SWAP_TRUE@ $(am__append_162) $(am__append_163) \
+@BUILD_PLUGIN_SWAP_TRUE@ $(am__append_165) $(am__append_166)
@BUILD_PLUGIN_SYSLOG_TRUE@syslog_la_SOURCES = syslog.c
@BUILD_PLUGIN_SYSLOG_TRUE@syslog_la_LDFLAGS = $(PLUGIN_LDFLAGS)
@BUILD_PLUGIN_TABLE_TRUE@table_la_SOURCES = table.c
@@ -2943,7 +2963,7 @@ CLEANFILES = $(am__append_212)
@BUILD_PLUGIN_TARGET_V5UPGRADE_TRUE@target_v5upgrade_la_LDFLAGS = $(PLUGIN_LDFLAGS)
@BUILD_PLUGIN_TCPCONNS_TRUE@tcpconns_la_SOURCES = tcpconns.c
@BUILD_PLUGIN_TCPCONNS_TRUE@tcpconns_la_LDFLAGS = $(PLUGIN_LDFLAGS)
-@BUILD_PLUGIN_TCPCONNS_TRUE@tcpconns_la_LIBADD = $(am__append_177)
+@BUILD_PLUGIN_TCPCONNS_TRUE@tcpconns_la_LIBADD = $(am__append_178)
@BUILD_PLUGIN_TEAMSPEAK2_TRUE@teamspeak2_la_SOURCES = teamspeak2.c
@BUILD_PLUGIN_TEAMSPEAK2_TRUE@teamspeak2_la_LDFLAGS = $(PLUGIN_LDFLAGS)
@BUILD_PLUGIN_TED_TRUE@ted_la_SOURCES = ted.c
@@ -2958,7 +2978,7 @@ CLEANFILES = $(am__append_212)
@BUILD_PLUGIN_TOKYOTYRANT_TRUE@tokyotyrant_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBTOKYOTYRANT_CPPFLAGS)
@BUILD_PLUGIN_TOKYOTYRANT_TRUE@tokyotyrant_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBTOKYOTYRANT_LDFLAGS)
@BUILD_PLUGIN_TOKYOTYRANT_TRUE@tokyotyrant_la_LIBADD = $(BUILD_WITH_LIBTOKYOTYRANT_LIBS) \
-@BUILD_PLUGIN_TOKYOTYRANT_TRUE@ $(am__append_183)
+@BUILD_PLUGIN_TOKYOTYRANT_TRUE@ $(am__append_184)
@BUILD_PLUGIN_TURBOSTAT_TRUE@turbostat_la_SOURCES = turbostat.c
@BUILD_PLUGIN_TURBOSTAT_TRUE@turbostat_la_LDFLAGS = $(PLUGIN_LDFLAGS)
@BUILD_PLUGIN_UNIXSOCK_TRUE@unixsock_la_SOURCES = unixsock.c \
@@ -2975,13 +2995,13 @@ CLEANFILES = $(am__append_212)
@BUILD_PLUGIN_UPTIME_TRUE@uptime_la_SOURCES = uptime.c
@BUILD_PLUGIN_UPTIME_TRUE@uptime_la_CFLAGS = $(AM_CFLAGS)
@BUILD_PLUGIN_UPTIME_TRUE@uptime_la_LDFLAGS = $(PLUGIN_LDFLAGS)
-@BUILD_PLUGIN_UPTIME_TRUE@uptime_la_LIBADD = $(am__append_187) \
-@BUILD_PLUGIN_UPTIME_TRUE@ $(am__append_188)
+@BUILD_PLUGIN_UPTIME_TRUE@uptime_la_LIBADD = $(am__append_188) \
+@BUILD_PLUGIN_UPTIME_TRUE@ $(am__append_189)
@BUILD_PLUGIN_USERS_TRUE@users_la_SOURCES = users.c
@BUILD_PLUGIN_USERS_TRUE@users_la_CFLAGS = $(AM_CFLAGS) \
-@BUILD_PLUGIN_USERS_TRUE@ $(am__append_190)
+@BUILD_PLUGIN_USERS_TRUE@ $(am__append_191)
@BUILD_PLUGIN_USERS_TRUE@users_la_LDFLAGS = $(PLUGIN_LDFLAGS)
-@BUILD_PLUGIN_USERS_TRUE@users_la_LIBADD = $(am__append_191)
+@BUILD_PLUGIN_USERS_TRUE@users_la_LIBADD = $(am__append_192)
@BUILD_PLUGIN_UUID_TRUE@uuid_la_SOURCES = uuid.c
@BUILD_PLUGIN_UUID_TRUE@uuid_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBHAL_CFLAGS)
@BUILD_PLUGIN_UUID_TRUE@uuid_la_LIBADD = $(BUILD_WITH_LIBHAL_LIBS)
@@ -3014,9 +3034,9 @@ CLEANFILES = $(am__append_212)
@BUILD_PLUGIN_WRITE_HTTP_TRUE@write_http_la_LDFLAGS = $(PLUGIN_LDFLAGS)
@BUILD_PLUGIN_WRITE_HTTP_TRUE@write_http_la_CFLAGS = $(AM_CFLAGS) \
-@BUILD_PLUGIN_WRITE_HTTP_TRUE@ $(am__append_200)
-@BUILD_PLUGIN_WRITE_HTTP_TRUE@write_http_la_LIBADD = \
@BUILD_PLUGIN_WRITE_HTTP_TRUE@ $(am__append_201)
+@BUILD_PLUGIN_WRITE_HTTP_TRUE@write_http_la_LIBADD = \
+@BUILD_PLUGIN_WRITE_HTTP_TRUE@ $(am__append_202)
@BUILD_PLUGIN_WRITE_KAFKA_TRUE@write_kafka_la_SOURCES = write_kafka.c \
@BUILD_PLUGIN_WRITE_KAFKA_TRUE@ utils_format_graphite.c utils_format_graphite.h \
@BUILD_PLUGIN_WRITE_KAFKA_TRUE@ utils_format_json.c utils_format_json.h \
@@ -3108,7 +3128,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign src/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -3385,6 +3404,9 @@ netapp.la: $(netapp_la_OBJECTS) $(netapp
netlink.la: $(netlink_la_OBJECTS) $(netlink_la_DEPENDENCIES) $(EXTRA_netlink_la_DEPENDENCIES)
$(AM_V_CCLD)$(netlink_la_LINK) $(am_netlink_la_rpath) $(netlink_la_OBJECTS) $(netlink_la_LIBADD) $(LIBS)
+netstat_udp.la: $(netstat_udp_la_OBJECTS) $(netstat_udp_la_DEPENDENCIES) $(EXTRA_netstat_udp_la_DEPENDENCIES)
+ $(AM_V_CCLD)$(netstat_udp_la_LINK) $(am_netstat_udp_la_rpath) $(netstat_udp_la_OBJECTS) $(netstat_udp_la_LIBADD) $(LIBS)
+
network.la: $(network_la_OBJECTS) $(network_la_DEPENDENCIES) $(EXTRA_network_la_DEPENDENCIES)
$(AM_V_CCLD)$(network_la_LINK) $(am_network_la_rpath) $(network_la_OBJECTS) $(network_la_LIBADD) $(LIBS)
@@ -3811,6 +3833,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netapp_la-netapp.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netapp_la-utils_ignorelist.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netlink_la-netlink.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netstat_udp.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network_la-network.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network_la-utils_fbhash.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nfs.Plo@am__quote@
@@ -4821,7 +4844,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
if test -n "$$am__remaking_logs"; then \
echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
"recursion detected" >&2; \
- else \
+ elif test -n "$$redo_logs"; then \
am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
fi; \
if $(am__make_dryrun); then :; else \
@@ -5166,6 +5189,8 @@ uninstall-man: uninstall-man1 uninstall-
uninstall-man1 uninstall-man5 uninstall-pkglibLTLIBRARIES \
uninstall-sbinPROGRAMS
+.PRECIOUS: Makefile
+
.pod.1:
pod2man --release=$(VERSION) --center=$(PACKAGE) $< \
@@ -5190,13 +5215,8 @@ uninstall-man: uninstall-man1 uninstall-
@HAVE_PROTOC_C_TRUE@ protoc-c -I$(srcdir) --c_out . $(srcdir)/riemann.proto
install-exec-hook:
@@ -33,11 +601,11 @@ Install config file into examples.
- $(INSTALL) -m 0640 collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf; \
- fi; \
+ $(mkinstalldirs) $(DESTDIR)$(egdir)
+ $(INSTALL) -m 0640 collectd.conf $(DESTDIR)$(egdir)/collectd.conf; \
+ $(INSTALL) -m 0640 collectd.conf $(DESTDIR)$(egdir)/collectd.conf
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
$(INSTALL) -m 0644 $(srcdir)/types.db $(DESTDIR)$(pkgdatadir)/types.db;
$(INSTALL) -m 0644 $(srcdir)/postgresql_default.conf \
@@ -5204,7 +5200,7 @@ install-exec-hook:
@@ -5204,7 +5224,7 @@ install-exec-hook:
uninstall-hook:
rm -f $(DESTDIR)$(pkgdatadir)/types.db;

52
sysutils/collectd/patches/patch-src_config.h.in Normal file
View File

@@ -0,0 +1,52 @@
$NetBSD: patch-src_config.h.in,v 1.4 2015/09/01 09:00:04 he Exp $
Optionally define a few vars for NetBSD.
--- src/config.h.in.orig 2015-05-27 07:53:03.000000000 +0000
+++ src/config.h.in
@@ -1246,6 +1246,15 @@
/* Define to 1 if `imr_ifindex' is a member of `struct ip_mreqn'. */
#undef HAVE_STRUCT_IP_MREQN_IMR_IFINDEX
+/* Define if struct kinfo_proc2 exists in the NetBSD variant. */
+#undef HAVE_STRUCT_KINFO_PROC2_NETBSD
+
+/* Define to 1 if `p_pid' is a member of `struct kinfo_proc2'. */
+#undef HAVE_STRUCT_KINFO_PROC2_P_PID
+
+/* Define to 1 if `p_uru_maxrss' is a member of `struct kinfo_proc2'. */
+#undef HAVE_STRUCT_KINFO_PROC2_P_URU_MAXRSS
+
/* Define if struct kinfo_proc exists in the FreeBSD variant. */
#undef HAVE_STRUCT_KINFO_PROC_FREEBSD
@@ -1319,6 +1328,9 @@
/* Define to 1 if you have the `sysctlbyname' function. */
#undef HAVE_SYSCTLBYNAME
+/* Define if sysctl supports kern.cp_time */
+#undef HAVE_SYSCTL_KERN_CP_TIME
+
/* Define if sysctl supports kern.cp_times */
#undef HAVE_SYSCTL_KERN_CP_TIMES
@@ -1375,6 +1387,9 @@
/* Define to 1 if you have the <sys/resource.h> header file. */
#undef HAVE_SYS_RESOURCE_H
+/* Define to 1 if you have the <sys/rndio.h> header file. */
+#undef HAVE_SYS_RNDIO_H
+
/* Define to 1 if you have the <sys/select.h> header file. */
#undef HAVE_SYS_SELECT_H
@@ -1507,6 +1522,9 @@
/* True if program is to be compiled for a Linux kernel */
#undef KERNEL_LINUX
+/* True if program is to be compiled for a NetBSD kernel */
+#undef KERNEL_NETBSD
+
/* True if program is to be compiled for an OpenBSD kernel */
#undef KERNEL_OPENBSD

50
sysutils/collectd/patches/patch-src_cpu.c Normal file
View File

@@ -0,0 +1,50 @@
$NetBSD: patch-src_cpu.c,v 1.1 2015/08/26 12:19:27 he Exp $
Port this too to NetBSD.
--- src/cpu.c.orig 2015-03-10 14:14:45.000000000 +0000
+++ src/cpu.c
@@ -79,7 +79,9 @@
#if HAVE_SYSCTL
# if defined(CTL_HW) && defined(HW_NCPU) \
- && defined(CTL_KERN) && defined(KERN_CPTIME) && defined(CPUSTATES)
+ && defined(CTL_KERN) \
+ && (defined(KERN_CPTIME) || defined(KERN_CP_TIME)) \
+ && defined(CPUSTATES)
# define CAN_USE_SYSCTL 1
# else
# define CAN_USE_SYSCTL 0
@@ -676,6 +678,24 @@ static int cpu_read (void)
memset (cpuinfo, 0, sizeof (cpuinfo));
+#if defined(KERN_CP_TIME) && defined(KERNEL_NETBSD)
+ {
+ int mib[] = {CTL_KERN, KERN_CP_TIME};
+
+ cpuinfo_size = sizeof(cpuinfo[0]) * numcpu * CPUSTATES;
+ status = sysctl(mib, 2, cpuinfo, &cpuinfo_size, NULL, 0);
+ if (status == -1) {
+ char errbuf[1024];
+
+ ERROR ("cpu plugin: sysctl failed: %s.",
+ sstrerror (errno, errbuf, sizeof (errbuf)));
+ return -1;
+ }
+ if (cpuinfo_size == (sizeof(cpuinfo[0]) * CPUSTATES)) {
+ numcpu = 1;
+ }
+ }
+#else /* defined(KERN_CP_TIME) && defined(KERNEL_NETBSD) */
#if defined(KERN_CPTIME2)
if (numcpu > 1) {
for (i = 0; i < numcpu; i++) {
@@ -715,6 +735,7 @@ static int cpu_read (void)
cpuinfo[0][i] = cpuinfo_tmp[i];
}
}
+#endif /* defined(KERN_CP_TIME) && defined(KERNEL_NETBSD) */
for (i = 0; i < numcpu; i++) {
cpu_stage (i, COLLECTD_CPU_STATE_USER, (derive_t) cpuinfo[i][CP_USER], now);

13
sysutils/collectd/patches/patch-src_df.c
View File

@@ -1,15 +1,20 @@
$NetBSD: patch-src_df.c,v 1.1 2014/02/17 11:21:55 fhajny Exp $
$NetBSD: patch-src_df.c,v 1.4 2015/08/18 07:52:20 he Exp $
NetBSD doesn't have float_t.
--- src/df.c.orig 2014-01-26 08:09:14.856391886 +0000
Older NetBSD doesn't have float_t.
--- src/df.c.orig 2015-03-10 14:14:45.000000000 +0000
+++ src/df.c
@@ -28,6 +28,10 @@
@@ -28,6 +28,14 @@
#include "utils_mount.h"
#include "utils_ignorelist.h"
+#if defined(__NetBSD__)
+#include <sys/param.h>
+#include <math.h>
+#if __NetBSD_Version__ < 699001900
+typedef float float_t;
+#endif
+#endif
+
#if HAVE_STATVFS
# if HAVE_SYS_STATVFS_H

209
sysutils/collectd/patches/patch-src_disk.c Normal file
View File

@@ -0,0 +1,209 @@
$NetBSD: patch-src_disk.c,v 1.1 2015/08/11 13:19:21 he Exp $
Provide a port to NetBSD.
--- src/disk.c.orig 2015-03-10 14:14:45.000000000 +0000
+++ src/disk.c
@@ -124,6 +124,35 @@ static int numdisk;
static int pnumdisk;
/* #endif HAVE_PERFSTAT */
+#elif HAVE_SYSCTL && KERNEL_NETBSD
+
+#include <sys/sysctl.h>
+#include <sys/iostat.h>
+
+typedef struct diskstats {
+ char *name;
+
+ u_int poll_count;
+
+ derive_t read_ops;
+ derive_t write_ops;
+
+ derive_t read_bytes;
+ derive_t write_bytes;
+
+ derive_t avg_io_time;
+
+ struct io_sysctl stats;
+
+ struct diskstats *next;
+} diskstats_t;
+
+static diskstats_t *disklist;
+static struct io_sysctl *drives = NULL;
+static size_t ndrive = 0;
+
+/* #endif HAVE_SYSCTL && KERNEL_NETBSD */
+
#else
# error "No applicable input method."
#endif
@@ -241,7 +270,34 @@ static int disk_init (void)
continue;
ksp[numdisk++] = ksp_chain;
}
-#endif /* HAVE_LIBKSTAT */
+/* #endif HAVE_LIBKSTAT */
+
+#elif HAVE_SYSCTL && KERNEL_NETBSD
+ int mib[3];
+ size_t size;
+
+ /* figure out number of drives */
+ mib[0] = CTL_HW;
+ mib[1] = HW_IOSTATS;
+ mib[2] = sizeof(struct io_sysctl);
+ if (sysctl(mib, 3, NULL, &size, NULL, 0) == -1) {
+ ERROR ("disk plugin: sysctl for ndrives failed");
+ return -1;
+ }
+ ndrive = size / sizeof(struct io_sysctl);
+
+ if (size == 0 ) {
+ ERROR ("disk plugin: no drives found");
+ return -1;
+ }
+ drives = (struct io_sysctl *)malloc(size);
+ if (drives == NULL) {
+ ERROR ("disk plugin: memory allocation failure");
+ return -1;
+ }
+
+#endif /* HAVE_SYSCTL && KERNEL_NETBSD */
+
return (0);
} /* int disk_init */
@@ -929,7 +985,129 @@ static int disk_read (void)
write_time *= ((double)(_system_configuration.Xint)/(double)(_system_configuration.Xfrac)) / 1000000.0;
disk_submit (stat_disk[i].name, "disk_time", read_time, write_time);
}
-#endif /* defined(HAVE_PERFSTAT) */
+/* #endif defined(HAVE_PERFSTAT) */
+
+#elif HAVE_SYSCTL && KERNEL_NETBSD
+ int mib[3];
+ size_t size, i, nndrive;
+ diskstats_t *ds, *pre_ds;
+ char *output_name;
+
+ u_int64_t ops;
+ u_int64_t delta_t;
+
+ /* figure out number of drives */
+ mib[0] = CTL_HW;
+ mib[1] = HW_IOSTATS;
+ mib[2] = sizeof(struct io_sysctl);
+ if (sysctl(mib, 3, NULL, &size, NULL, 0) == -1) {
+ ERROR ("disk plugin: sysctl for ndrives failed");
+ return -1;
+ }
+ nndrive = size / sizeof(struct io_sysctl);
+
+ if (size == 0 ) {
+ ERROR ("disk plugin: no drives found");
+ return -1;
+ }
+ /* number of drives changed, reallocate buffer */
+ if (nndrive != ndrive) {
+ drives = (struct io_sysctl *)realloc(drives, size);
+ if (drives == NULL) {
+ ERROR ("disk plugin: memory allocation failure");
+ return -1;
+ }
+ ndrive = nndrive;
+ }
+
+ /* get stats for all drives */
+ mib[0] = CTL_HW;
+ mib[1] = HW_IOSTATS;
+ mib[2] = sizeof(struct io_sysctl);
+ if (sysctl(mib, 3, drives, &size, NULL, 0) == -1) {
+ ERROR ("disk plugin: sysctl for drive stats failed");
+ return -1;
+ }
+
+ for (i = 0; i < ndrive; i++) {
+
+ if (drives[i].type != IOSTAT_DISK)
+ continue;
+
+ /* find drive stats, if present */
+ for (ds = disklist, pre_ds = disklist;
+ ds != NULL;
+ pre_ds = ds, ds = ds->next) {
+ if (strcmp (drives[i].name, ds->name) == 0)
+ break;
+ }
+ if (ds == NULL) { /* not found; allocate & link in */
+ if ((ds = calloc(1, sizeof(diskstats_t))) == NULL)
+ continue;
+ if ((ds->name = strdup(drives[i].name)) == NULL) {
+ free(ds);
+ continue;
+ }
+ if (pre_ds == NULL)
+ disklist = ds;
+ else
+ pre_ds->next = ds;
+ }
+
+ ds->poll_count++;
+ if (ds->poll_count <= 2)
+ {
+ DEBUG ("disk plugin: (ds->poll_count = %i) <= "
+ "(min_poll_count = 2); => Not writing.",
+ ds->poll_count);
+ ds->stats = drives[i]; /* but save base values */
+ continue;
+ }
+ ds->read_ops = drives[i].rxfer - ds->stats.rxfer;
+ ds->write_ops = drives[i].wxfer - ds->stats.wxfer;
+ ds->read_bytes = drives[i].rbytes - ds->stats.rbytes;
+ ds->write_bytes = drives[i].wbytes - ds->stats.wbytes;
+
+ /* Need this dance because of unsigned values... */
+ if (drives[i].time_usec < ds->stats.time_usec) {
+ delta_t = ((drives[i].time_sec - 1 -
+ ds->stats.time_sec) * 1000) +
+ ((drives[i].time_usec + 1000000 -
+ ds->stats.time_usec) / 1000);
+ } else {
+ delta_t = ((drives[i].time_sec -
+ ds->stats.time_sec) * 1000) +
+ ((drives[i].time_usec -
+ ds->stats.time_usec) / 1000);
+ }
+
+ ops = ds->read_ops + ds->write_ops;
+ if (ops == 0) {
+ DEBUG ("disk plugin: read + write ops == 0, "
+ "not writing");
+ continue;
+ }
+
+ ds->avg_io_time = delta_t / ops;
+
+ output_name = drives[i].name;
+
+ if ((ds->read_bytes != 0) || (ds->write_bytes != 0))
+ disk_submit (output_name, "disk_octets",
+ ds->read_bytes, ds->write_bytes);
+
+ if ((ds->read_ops != 0) || (ds->write_ops != 0))
+ disk_submit (output_name, "disk_ops",
+ ds->read_ops, ds->write_ops);
+
+ if (ds->avg_io_time != 0)
+ disk_submit (output_name, "disk_time",
+ ds->avg_io_time, ds->avg_io_time);
+
+ ds->stats = drives[i];
+ }
+
+#endif /* HAVE_SYSCTL && KERNEL_NETBSD */
return (0);
} /* int disk_read */

98
sysutils/collectd/patches/patch-src_entropy.c Normal file
View File

@@ -0,0 +1,98 @@
$NetBSD: patch-src_entropy.c,v 1.4 2015/09/01 09:31:46 he Exp $
Provide a NetBSD implementation for graphing available entropy.
--- src/entropy.c.orig 2015-03-10 14:14:45.000000000 +0000
+++ src/entropy.c
@@ -28,27 +28,16 @@
#include "common.h"
#include "plugin.h"
-#if !KERNEL_LINUX
-# error "No applicable input method."
-#endif
-
-#define ENTROPY_FILE "/proc/sys/kernel/random/entropy_avail"
+static void entropy_submit (double);
+static int entropy_read (void);
-static void entropy_submit (double entropy)
-{
- value_t values[1];
- value_list_t vl = VALUE_LIST_INIT;
+#if !KERNEL_LINUX && !KERNEL_NETBSD
+# error "No applicable input method."
+#endif
- values[0].gauge = entropy;
+#if KERNEL_LINUX
- vl.values = values;
- vl.values_len = 1;
- sstrncpy (vl.host, hostname_g, sizeof (vl.host));
- sstrncpy (vl.plugin, "entropy", sizeof (vl.plugin));
- sstrncpy (vl.type, "entropy", sizeof (vl.type));
-
- plugin_dispatch_values (&vl);
-}
+#define ENTROPY_FILE "/proc/sys/kernel/random/entropy_avail"
static int entropy_read (void)
{
@@ -74,6 +63,56 @@ static int entropy_read (void)
return (0);
}
+#endif /* KERNEL_LINUX */
+
+#if KERNEL_NETBSD
+/* Provide a NetBSD implementation, partial from rndctl.c */
+
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/param.h>
+#include <sys/rnd.h>
+#if HAVE_SYS_RNDIO_H
+# include <sys/rndio.h>
+#endif
+#include <paths.h>
+
+static int
+entropy_read (void)
+{
+ rndpoolstat_t rs;
+ int fd;
+
+ fd = open(_PATH_URANDOM, O_RDONLY, 0644);
+ if (fd < 0)
+ return -1;
+
+ if (ioctl(fd, RNDGETPOOLSTAT, &rs) < 0)
+ return -1;
+
+ entropy_submit (rs.curentropy);
+
+ close(fd);
+ return 0;
+}
+
+#endif /* KERNEL_NETBSD */
+
+static void entropy_submit (double entropy)
+{
+ value_t values[1];
+ value_list_t vl = VALUE_LIST_INIT;
+
+ values[0].gauge = entropy;
+
+ vl.values = values;
+ vl.values_len = 1;
+ sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+ sstrncpy (vl.plugin, "entropy", sizeof (vl.plugin));
+ sstrncpy (vl.type, "entropy", sizeof (vl.type));
+
+ plugin_dispatch_values (&vl);
+}
void module_register (void)
{

102
sysutils/collectd/patches/patch-src_irq.c Normal file
View File

@@ -0,0 +1,102 @@
$NetBSD: patch-src_irq.c,v 1.1 2015/08/18 07:47:46 he Exp $
Provide a port to NetBSD.
--- src/irq.c.orig 2014-09-05 08:57:01.000000000 +0000
+++ src/irq.c
@@ -27,10 +27,22 @@
#include "configfile.h"
#include "utils_ignorelist.h"
-#if !KERNEL_LINUX
+#if !KERNEL_LINUX && !KERNEL_NETBSD
# error "No applicable input method."
#endif
+#if KERNEL_NETBSD
+
+#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#include <sys/evcnt.h>
+#include <malloc.h>
+
+#endif /* KERNEL_NETBSD */
+
+
+
/*
* (Module-)Global variables
*/
@@ -90,6 +102,7 @@ static void irq_submit (const char *irq_
plugin_dispatch_values (&vl);
} /* void irq_submit */
+#if KERNEL_LINUX
static int irq_read (void)
{
FILE *fh;
@@ -183,6 +196,63 @@ static int irq_read (void)
return (0);
} /* int irq_read */
+#endif /* KERNEL_LINUX */
+
+#if KERNEL_NETBSD
+static int
+irq_read (void)
+{
+ const int mib[4] = {
+ CTL_KERN,
+ KERN_EVCNT,
+ EVCNT_TYPE_INTR,
+ KERN_EVCNT_COUNT_NONZERO
+ };
+ size_t buflen = 0;
+ void *buf = NULL;
+ const struct evcnt_sysctl *evs, *last_evs;
+
+ for (;;) {
+ size_t newlen;
+ int error;
+
+ if (buflen)
+ buf = malloc(buflen);
+ error = sysctl(mib, __arraycount(mib),
+ buf, &newlen, NULL, 0);
+ if (error) {
+ ERROR("irq plugin: failed to get event count");
+ return -1;
+ }
+ if (newlen <= buflen) {
+ buflen = newlen;
+ break;
+ }
+ if (buf)
+ free(buf);
+ buflen = newlen;
+ }
+ evs = buf;
+ last_evs = (void*)((char *)buf + buflen);
+ buflen /= sizeof(uint64_t);
+ while(evs < last_evs
+ && buflen > sizeof(*evs) / sizeof(uint64_t)
+ && buflen >= evs->ev_len)
+ {
+ char irqname[80];
+
+ snprintf(irqname, 80, "%s-%s", evs->ev_strings,
+ evs->ev_strings + evs->ev_grouplen + 1);
+
+ irq_submit(irqname, evs->ev_count);
+
+ buflen -= evs->ev_len;
+ evs =(const void*)((const uint64_t *)evs + evs->ev_len);
+ }
+
+ return 0;
+}
+#endif /* KERNEL_NETBSD */
void module_register (void)
{

128
sysutils/collectd/patches/patch-src_memory.c Normal file
View File

@@ -0,0 +1,128 @@
$NetBSD: patch-src_memory.c,v 1.2 2015/08/16 08:01:58 he Exp $
Add a port for NetBSD using VM_UVMEXP2, and preferring
sysctl over sysctlbyname.
--- src/memory.c.orig 2015-03-10 14:14:45.000000000 +0000
+++ src/memory.c
@@ -65,6 +65,10 @@ static mach_port_t port_host;
static vm_size_t pagesize;
/* #endif HAVE_HOST_STATISTICS */
+#elif HAVE_SYSCTL
+static int pagesize;
+/* #endif HAVE_SYSCTL */
+
#elif HAVE_SYSCTLBYNAME
/* no global variables */
/* #endif HAVE_SYSCTLBYNAME */
@@ -78,10 +82,6 @@ static int pagesize;
static kstat_t *ksp;
/* #endif HAVE_LIBKSTAT */
-#elif HAVE_SYSCTL
-static int pagesize;
-/* #endif HAVE_SYSCTL */
-
#elif HAVE_LIBSTATGRAB
/* no global variables */
/* endif HAVE_LIBSTATGRAB */
@@ -92,6 +92,10 @@ static int pagesize;
# error "No applicable input method."
#endif
+#if KERNEL_NETBSD
+# include <uvm/uvm_extern.h>
+#endif
+
static _Bool values_absolute = 1;
static _Bool values_percentage = 0;
@@ -121,6 +125,15 @@ static int memory_init (void)
host_page_size (port_host, &pagesize);
/* #endif HAVE_HOST_STATISTICS */
+#elif HAVE_SYSCTL
+ pagesize = getpagesize ();
+ if (pagesize <= 0)
+ {
+ ERROR ("memory plugin: Invalid pagesize: %i", pagesize);
+ return (-1);
+ }
+/* #endif HAVE_SYSCTL */
+
#elif HAVE_SYSCTLBYNAME
/* no init stuff */
/* #endif HAVE_SYSCTLBYNAME */
@@ -139,15 +152,6 @@ static int memory_init (void)
}
/* #endif HAVE_LIBKSTAT */
-#elif HAVE_SYSCTL
- pagesize = getpagesize ();
- if (pagesize <= 0)
- {
- ERROR ("memory plugin: Invalid pagesize: %i", pagesize);
- return (-1);
- }
-/* #endif HAVE_SYSCTL */
-
#elif HAVE_LIBSTATGRAB
/* no init stuff */
/* #endif HAVE_LIBSTATGRAB */
@@ -221,6 +225,46 @@ static int memory_read_internal (value_l
/* #endif HAVE_HOST_STATISTICS */
#elif HAVE_SYSCTLBYNAME
+
+#if HAVE_SYSCTL && defined(KERNEL_NETBSD)
+ int mib[] = {CTL_VM, VM_UVMEXP2};
+ struct uvmexp_sysctl uvmexp;
+ gauge_t mem_active;
+ gauge_t mem_inactive;
+ gauge_t mem_free;
+ gauge_t mem_wired;
+ gauge_t mem_kernel;
+ size_t size;
+
+ memset (&uvmexp, 0, sizeof (uvmexp));
+ size = sizeof (uvmexp);
+
+ if (sysctl (mib, 2, &uvmexp, &size, NULL, 0) < 0) {
+ char errbuf[1024];
+ WARNING ("memory plugin: sysctl failed: %s",
+ sstrerror (errno, errbuf, sizeof (errbuf)));
+ return (-1);
+ }
+
+ assert (pagesize > 0);
+ mem_active = (gauge_t) (uvmexp.active * pagesize);
+ mem_inactive = (gauge_t) (uvmexp.inactive * pagesize);
+ mem_free = (gauge_t) (uvmexp.free * pagesize);
+ mem_wired = (gauge_t) (uvmexp.wired * pagesize);
+ mem_kernel = (gauge_t) ((uvmexp.npages - (
+ uvmexp.active + uvmexp.inactive +
+ uvmexp.free + uvmexp.wired
+ )) * pagesize);
+
+ MEMORY_SUBMIT ("active", mem_active,
+ "inactive", mem_inactive,
+ "free", mem_free,
+ "wired", mem_wired,
+ "kernel", mem_kernel);
+/* #endif HAVE_SYSCTL && defined(KERNEL_NETBSD) */
+
+#else /* Other HAVE_SYSCTLBYNAME providers */
+
/*
* vm.stats.vm.v_page_size: 4096
* vm.stats.vm.v_page_count: 246178
@@ -272,6 +316,8 @@ static int memory_read_internal (value_l
"active", (gauge_t) sysctl_vals[4],
"inactive", (gauge_t) sysctl_vals[5],
"cache", (gauge_t) sysctl_vals[6]);
+
+#endif /* HAVE_SYSCTL && KERNEL_NETBSD */
/* #endif HAVE_SYSCTLBYNAME */
#elif KERNEL_LINUX

165
sysutils/collectd/patches/patch-src_netstat__udp.c Normal file
View File

@@ -0,0 +1,165 @@
$NetBSD: patch-src_netstat__udp.c,v 1.1 2015/09/12 19:04:56 he Exp $
Add a plugin which reports the UDP summary statistics.
Useful for busyish DNS name servers.
--- src/netstat_udp.c.orig 2015-09-11 16:55:05.000000000 +0000
+++ src/netstat_udp.c
@@ -0,0 +1,157 @@
+/**
+ * collectd - src/netstat-udp.c
+ * Copyright (C) 2015 Håvard Eidnes
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; only version 2 of the License is applicable.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * Authors:
+ * Håvard Eidnes <he at NetBSD.org>
+ **/
+
+#include "collectd.h"
+#include "common.h"
+#include "plugin.h"
+
+#if !defined(KERNEL_NETBSD)
+# error "No applicable input method."
+#endif
+
+#include <sys/cdefs.h>
+#include <sys/types.h>
+#include <sys/sysctl.h>
+
+#include <netinet/in.h>
+#include <netinet/ip_var.h>
+#include <netinet/udp.h>
+#include <netinet/udp_var.h>
+#include <netinet6/udp6_var.h>
+
+static int
+netstat_udp_init (void)
+{
+ return (0);
+} /* int netstat_udp_init */
+
+#define SUBMIT_VARS(...) \
+ plugin_dispatch_multivalue (vl, 0, DS_TYPE_DERIVE, __VA_ARGS__, NULL)
+
+static int
+netstat_udp_internal (value_list_t *vl)
+{
+ uint64_t udpstat[UDP_NSTATS];
+ uint64_t udp6stat[UDP6_NSTATS];
+ size_t size;
+ uint64_t delivered, delivered6;
+ int err;
+
+ size = sizeof(udpstat);
+ if (sysctlbyname("net.inet.udp.stats", udpstat, &size, NULL, 0) == -1) {
+ ERROR("netstat-udp plugin: could not get udp stats");
+ return -1;
+ }
+
+ delivered = udpstat[UDP_STAT_IPACKETS] -
+ udpstat[UDP_STAT_HDROPS] -
+ udpstat[UDP_STAT_BADLEN] -
+ udpstat[UDP_STAT_BADSUM] -
+ udpstat[UDP_STAT_NOPORT] -
+ udpstat[UDP_STAT_NOPORTBCAST] -
+ udpstat[UDP_STAT_FULLSOCK];
+
+ err = SUBMIT_VARS ("udp-received",
+ (derive_t) udpstat[UDP_STAT_IPACKETS],
+ "udp-bad-header",
+ (derive_t) udpstat[UDP_STAT_HDROPS],
+ "udp-bad-length",
+ (derive_t) udpstat[UDP_STAT_BADLEN],
+ "udp-bad-checksum",
+ (derive_t) udpstat[UDP_STAT_BADSUM],
+ "udp-no-port",
+ (derive_t) udpstat[UDP_STAT_NOPORT],
+ "udp-no-port-broadcast",
+ (derive_t) udpstat[UDP_STAT_NOPORTBCAST],
+ "udp-full-socket",
+ (derive_t) udpstat[UDP_STAT_FULLSOCK],
+ "udp-delivered",
+ (derive_t) delivered
+ );
+ if (err != 0) {
+ ERROR("netstat-udp plugin: could not submit, err=%d\n", err);
+ }
+
+ size = sizeof(udp6stat);
+ if (sysctlbyname("net.inet6.udp6.stats", udp6stat, &size,
+ NULL, 0) == -1) {
+ ERROR("netstat-udp plugin: could not get udp6 stats");
+ return -1;
+ }
+
+ delivered6 = udp6stat[UDP6_STAT_IPACKETS] -
+ udp6stat[UDP6_STAT_HDROPS] -
+ udp6stat[UDP6_STAT_BADLEN] -
+ udp6stat[UDP6_STAT_BADSUM] -
+ udp6stat[UDP6_STAT_NOSUM] -
+ udp6stat[UDP6_STAT_NOPORT] -
+ udp6stat[UDP6_STAT_NOPORTMCAST] -
+ udp6stat[UDP6_STAT_FULLSOCK];
+
+ err = SUBMIT_VARS ("udp6-received",
+ (derive_t) udp6stat[UDP6_STAT_IPACKETS],
+ "udp6-bad-header",
+ (derive_t) udp6stat[UDP6_STAT_HDROPS],
+ "udp6-bad-length",
+ (derive_t) udp6stat[UDP6_STAT_BADLEN],
+ "udp6-bad-checksum",
+ (derive_t) udp6stat[UDP6_STAT_BADSUM],
+ "udp6-no-checksum",
+ (derive_t) udp6stat[UDP6_STAT_NOSUM],
+ "udp6-no-port",
+ (derive_t) udp6stat[UDP6_STAT_NOPORT],
+ "udp6-no-port-multicast",
+ (derive_t) udp6stat[UDP6_STAT_NOPORTMCAST],
+ "udp6-full-socket",
+ (derive_t) udp6stat[UDP6_STAT_FULLSOCK],
+ "udp6-delivered",
+ (derive_t) delivered6
+ );
+ if (err != 0) {
+ ERROR("netstat-udp plugin ipv6: could not submit, err=%d\n",
+ err);
+ }
+
+ return (0);
+} /* }}} int netstat_udp_internal */
+
+static int
+netstat_udp_read (void) /* {{{ */
+{
+ value_t v[1];
+ value_list_t vl = VALUE_LIST_INIT;
+
+ vl.values = v;
+ vl.values_len = STATIC_ARRAY_SIZE (v);
+ sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+ sstrncpy (vl.plugin, "netstat_udp", sizeof (vl.plugin));
+ sstrncpy (vl.type, "packets", sizeof (vl.type));
+ vl.time = cdtime ();
+
+ return (netstat_udp_internal (&vl));
+} /* }}} int netstat_udp_read */
+
+void
+module_register (void)
+{
+ plugin_register_init ("netstat_udp", netstat_udp_init);
+ plugin_register_read ("netstat_udp", netstat_udp_read);
+} /* void module_register */

249
sysutils/collectd/patches/patch-src_processes.c Normal file
View File

@@ -0,0 +1,249 @@
$NetBSD: patch-src_processes.c,v 1.3 2015/09/01 09:00:04 he Exp $
Add a port to NetBSD.
--- src/processes.c.orig 2015-05-20 12:04:47.000000000 +0000
+++ src/processes.c
@@ -94,13 +94,13 @@
# endif
/* #endif KERNEL_LINUX */
-#elif HAVE_LIBKVM_GETPROCS && (HAVE_STRUCT_KINFO_PROC_FREEBSD || HAVE_STRUCT_KINFO_PROC_OPENBSD)
+#elif HAVE_LIBKVM_GETPROCS && (HAVE_STRUCT_KINFO_PROC_FREEBSD || HAVE_STRUCT_KINFO_PROC_OPENBSD || HAVE_STRUCT_KINFO_PROC2_NETBSD)
# include <kvm.h>
# include <sys/param.h>
# include <sys/sysctl.h>
# include <sys/user.h>
# include <sys/proc.h>
-/* #endif HAVE_LIBKVM_GETPROCS && (HAVE_STRUCT_KINFO_PROC_FREEBSD || HAVE_STRUCT_KINFO_PROC_OPENBSD) */
+/* #endif HAVE_LIBKVM_GETPROCS && (HAVE_STRUCT_KINFO_PROC_FREEBSD || HAVE_STRUCT_KINFO_PROC_OPENBSD || HAVE_STRUCT_KINFO_PROC2_NETBSD) */
#elif HAVE_PROCINFO_H
# include <procinfo.h>
@@ -229,9 +229,14 @@ static mach_msg_type_number_t pset_l
static long pagesize_g;
/* #endif KERNEL_LINUX */
-#elif HAVE_LIBKVM_GETPROCS && (HAVE_STRUCT_KINFO_PROC_FREEBSD || HAVE_STRUCT_KINFO_PROC_OPENBSD)
+#elif HAVE_LIBKVM_GETPROCS && (HAVE_STRUCT_KINFO_PROC_FREEBSD || HAVE_STRUCT_KINFO_PROC_OPENBSD || HAVE_STRUCT_KINFO_PROC2_NETBSD)
static int pagesize;
-/* #endif HAVE_LIBKVM_GETPROCS && (HAVE_STRUCT_KINFO_PROC_FREEBSD || HAVE_STRUCT_KINFO_PROC_OPENBSD) */
+
+#if KERNEL_NETBSD
+int maxslp;
+#endif
+
+/* #endif HAVE_LIBKVM_GETPROCS && (HAVE_STRUCT_KINFO_PROC_FREEBSD || HAVE_STRUCT_KINFO_PROC_OPENBSD || HAVE_STRUCT_KINFO_PROC2_NETBSD) */
#elif HAVE_PROCINFO_H
static struct procentry64 procentry[MAXPROCENTRY];
@@ -638,9 +643,20 @@ static int ps_init (void)
pagesize_g, CONFIG_HZ);
/* #endif KERNEL_LINUX */
-#elif HAVE_LIBKVM_GETPROCS && (HAVE_STRUCT_KINFO_PROC_FREEBSD || HAVE_STRUCT_KINFO_PROC_OPENBSD)
+#elif HAVE_LIBKVM_GETPROCS && (HAVE_STRUCT_KINFO_PROC_FREEBSD || HAVE_STRUCT_KINFO_PROC_OPENBSD || HAVE_STRUCT_KINFO_PROC2_NETBSD)
+#if KERNEL_NETBSD
+ int mib[2];
+ size_t size;
+
+ mib[0] = CTL_VM;
+ mib[1] = VM_MAXSLP;
+ size = sizeof(maxslp);
+ if (sysctl(mib, 2, &maxslp, &size, NULL, 0) == -1)
+ maxslp = 20; /* reasonable default? */
+#endif
+
pagesize = getpagesize();
-/* #endif HAVE_LIBKVM_GETPROCS && (HAVE_STRUCT_KINFO_PROC_FREEBSD || HAVE_STRUCT_KINFO_PROC_OPENBSD) */
+/* #endif HAVE_LIBKVM_GETPROCS && (HAVE_STRUCT_KINFO_PROC_FREEBSD || HAVE_STRUCT_KINFO_PROC_OPENBSD || HAVE_STRUCT_KINFO_PROC2_NETBSD) */
#elif HAVE_PROCINFO_H
pagesize = getpagesize();
@@ -1940,6 +1956,186 @@ static int ps_read (void)
ps_submit_proc_list (ps_ptr);
/* #endif HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC_FREEBSD */
+#elif HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC2_NETBSD
+ int running = 0;
+ int sleeping = 0;
+ int zombies = 0;
+ int stopped = 0;
+ int blocked = 0;
+ int idle = 0;
+ int wait = 0;
+
+ kvm_t *kd;
+ char errbuf[_POSIX2_LINE_MAX];
+ struct kinfo_proc2 *procs; /* array of processes */
+ struct kinfo_proc2 *proc_ptr = NULL;
+ struct kinfo_proc2 *p;
+ int count; /* returns number of processes */
+ int i;
+ int l, nlwps;
+ struct kinfo_lwp *kl;
+
+ procstat_t *ps_ptr;
+ procstat_entry_t pse;
+
+ ps_list_reset ();
+
+ /* Open the kvm interface, get a descriptor */
+ kd = kvm_openfiles (NULL, NULL, NULL, KVM_NO_FILES, errbuf);
+ if (kd == NULL)
+ {
+ ERROR ("processes plugin: Cannot open kvm interface: %s",
+ errbuf);
+ return (0);
+ }
+
+ /* Get the list of processes. */
+ procs = kvm_getproc2(kd, KERN_PROC_ALL, 0,
+ sizeof(struct kinfo_proc2), &count);
+ if (procs == NULL)
+ {
+ ERROR ("processes plugin: Cannot get kvm processes list: %s",
+ kvm_geterr(kd));
+ kvm_close (kd);
+ return (0);
+ }
+
+ /* Iterate through the processes in kinfo_proc */
+ for (i = 0; i < count; i++)
+ {
+ /* Create only one process list entry per _process_, i.e.
+ * filter out threads (duplicate PID entries). */
+ if ((proc_ptr == NULL) || (proc_ptr->p_pid != procs[i].p_pid))
+ {
+ char cmdline[CMDLINE_BUFFER_SIZE] = "";
+ _Bool have_cmdline = 0;
+
+ proc_ptr = &(procs[i]);
+ /* Don't probe system processes and processes without arguments */
+ if (((procs[i].p_flag & P_SYSTEM) == 0)
+ && (procs[i].p_comm[0] != 0))
+ {
+ char **argv;
+ int argc;
+ int status;
+
+ /* retrieve the arguments */
+ argv = kvm_getargv2 (kd, proc_ptr, 0);
+ argc = 0;
+ if ((argv != NULL) && (argv[0] != NULL))
+ {
+ while (argv[argc] != NULL)
+ argc++;
+
+ status = strjoin (cmdline, sizeof (cmdline), argv, argc, " ");
+ if (status < 0)
+ WARNING ("processes plugin: Command line did not fit into buffer.");
+ else
+ have_cmdline = 1;
+ }
+ } /* if (process has argument list) */
+
+ pse.id = procs[i].p_pid;
+ pse.age = 0;
+
+ pse.num_proc = 1;
+ pse.num_lwp = procs[i].p_nlwps;
+
+ pse.vmem_size = procs[i].p_uru_maxrss * pagesize;
+ pse.vmem_rss = procs[i].p_vm_rssize * pagesize;
+ pse.vmem_data = procs[i].p_vm_dsize * pagesize;
+ pse.vmem_code = procs[i].p_vm_tsize * pagesize;
+ pse.stack_size = procs[i].p_vm_ssize * pagesize;
+ pse.vmem_minflt = 0;
+ pse.vmem_minflt_counter = procs[i].p_uru_minflt;
+ pse.vmem_majflt = 0;
+ pse.vmem_majflt_counter = procs[i].p_uru_majflt;
+
+ pse.cpu_user = 0;
+ pse.cpu_system = 0;
+ pse.cpu_user_counter = 0;
+ pse.cpu_system_counter = 0;
+ /*
+ * The u-area might be swapped out, and we can't get
+ * at it because we have a crashdump and no swap.
+ * If it's here fill in these fields, otherwise, just
+ * leave them 0.
+ */
+ if (procs[i].p_flag & P_INMEM)
+ {
+ pse.cpu_user_counter = procs[i].p_uutime_usec
+ + (1000000lu * procs[i].p_uutime_sec);
+ pse.cpu_system_counter = procs[i].p_ustime_usec
+ + (1000000lu * procs[i].p_ustime_sec);
+ }
+
+ /* no I/O data */
+ pse.io_rchar = -1;
+ pse.io_wchar = -1;
+ pse.io_syscr = procs[i].p_uru_inblock;
+ pse.io_syscw = procs[i].p_uru_oublock;
+
+ ps_list_add (procs[i].p_comm, have_cmdline ? cmdline : NULL, &pse);
+ } /* if ((proc_ptr == NULL) || (proc_ptr->ki_pid != procs[i].ki_pid)) */
+
+ /* system processes' LWPs end up in "running" state */
+ if ((procs[i].p_flag & P_SYSTEM) != 0)
+ continue;
+
+ switch (procs[i].p_realstat)
+ {
+ case SSTOP:
+ case SACTIVE:
+ case SIDL:
+ p = &(procs[i]);
+ /* get info about LWPs */
+ kl = kvm_getlwps(kd, p->p_pid, (u_long)p->p_paddr,
+ sizeof(struct kinfo_lwp), &nlwps);
+
+ for (l = 0; kl && l < nlwps; l++) {
+ switch (kl[l].l_stat) {
+ case LSONPROC:
+ case LSRUN:
+ running++;
+ break;
+ case LSSLEEP:
+ if (kl[l].l_flag & L_SINTR) {
+ if (kl[l].l_slptime > maxslp)
+ idle++;
+ else
+ sleeping++;
+ } else
+ blocked++;
+ break;
+ case LSSTOP:
+ stopped++; break;
+ case LSIDL:
+ idle++; break;
+ }
+ }
+ break;
+ case SZOMB:
+ case SDYING:
+ case SDEAD:
+ zombies++; break;
+
+ }
+ }
+
+ kvm_close(kd);
+
+ ps_submit_state ("running", running);
+ ps_submit_state ("sleeping", sleeping);
+ ps_submit_state ("zombies", zombies);
+ ps_submit_state ("stopped", stopped);
+ ps_submit_state ("blocked", blocked);
+ ps_submit_state ("idle", idle);
+ ps_submit_state ("wait", wait);
+
+ for (ps_ptr = list_head_g; ps_ptr != NULL; ps_ptr = ps_ptr->next)
+ ps_submit_proc_list (ps_ptr);
+/* #endif HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC2_NETBSD */
+
#elif HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC_OPENBSD
int running = 0;
int sleeping = 0;

150
sysutils/collectd/patches/patch-src_swap.c Normal file
View File

@@ -0,0 +1,150 @@
$NetBSD: patch-src_swap.c,v 1.2 2015/08/11 14:15:00 he Exp $
Extend support for NetBSD, and add per-swap-device
reporting for HAVE_SWAPCTL_THREE_ARGS.
--- src/swap.c.orig 2015-05-20 12:04:47.000000000 +0000
+++ src/swap.c
@@ -76,9 +76,12 @@ static _Bool report_bytes = 0;
static _Bool report_by_device = 0;
/* #endif KERNEL_LINUX */
-#elif HAVE_SWAPCTL && HAVE_SWAPCTL_TWO_ARGS
+#elif HAVE_SWAPCTL && (HAVE_SWAPCTL_TWO_ARGS || HAVE_SWAPCTL_THREE_ARGS)
# define SWAP_HAVE_REPORT_BY_DEVICE 1
static derive_t pagesize;
+#if KERNEL_NETBSD
+static _Bool report_bytes = 0;
+#endif
static _Bool report_by_device = 0;
/* #endif HAVE_SWAPCTL && HAVE_SWAPCTL_TWO_ARGS */
@@ -114,7 +117,7 @@ static int swap_config (oconfig_item_t *
{
oconfig_item_t *child = ci->children + i;
if (strcasecmp ("ReportBytes", child->key) == 0)
-#if KERNEL_LINUX
+#if KERNEL_LINUX || KERNEL_NETBSD
cf_util_get_boolean (child, &report_bytes);
#else
WARNING ("swap plugin: The \"ReportBytes\" option "
@@ -147,7 +150,7 @@ static int swap_init (void) /* {{{ */
pagesize = (derive_t) sysconf (_SC_PAGESIZE);
/* #endif KERNEL_LINUX */
-#elif HAVE_SWAPCTL && HAVE_SWAPCTL_TWO_ARGS
+#elif HAVE_SWAPCTL && (HAVE_SWAPCTL_TWO_ARGS || HAVE_SWAPCTL_THREE_ARGS)
/* getpagesize(3C) tells me this does not fail.. */
pagesize = (derive_t) getpagesize ();
/* #endif HAVE_SWAPCTL */
@@ -213,7 +216,7 @@ static void swap_submit_usage (char cons
other_name, other_value, NULL);
} /* }}} void swap_submit_usage */
-#if KERNEL_LINUX || HAVE_PERFSTAT
+#if KERNEL_LINUX || HAVE_PERFSTAT || KERNEL_NETBSD
__attribute__((nonnull(1)))
static void swap_submit_derive (char const *type_instance, /* {{{ */
derive_t value)
@@ -614,6 +617,43 @@ static int swap_read (void) /* {{{ */
/* #endif HAVE_SWAPCTL && HAVE_SWAPCTL_TWO_ARGS */
#elif HAVE_SWAPCTL && HAVE_SWAPCTL_THREE_ARGS
+#if KERNEL_NETBSD
+#include <uvm/uvm_extern.h>
+
+static int
+swap_read_io (void) /* {{{ */
+{
+ static int uvmexp_mib[] = { CTL_VM, VM_UVMEXP2 };
+ struct uvmexp_sysctl uvmexp;
+ size_t ssize;
+ derive_t swap_in, swap_out;
+
+ ssize = sizeof(uvmexp);
+ memset(&uvmexp, 0, ssize);
+ if (sysctl(uvmexp_mib, __arraycount(uvmexp_mib), &uvmexp,
+ &ssize, NULL, 0) == -1) {
+ char errbuf[1024];
+ WARNING ("swap: sysctl for uvmexp failed: %s",
+ sstrerror (errno, errbuf, sizeof (errbuf)));
+ return (-1);
+ }
+
+ swap_in = uvmexp.pgswapin;
+ swap_out = uvmexp.pgswapout;
+
+ if (report_bytes)
+ {
+ swap_in = swap_in * pagesize;
+ swap_out = swap_out * pagesize;
+ }
+
+ swap_submit_derive ("in", swap_in);
+ swap_submit_derive ("out", swap_out);
+
+ return (0);
+} /* }}} */
+#endif
+
static int swap_read (void) /* {{{ */
{
struct swapent *swap_entries;
@@ -660,23 +700,53 @@ static int swap_read (void) /* {{{ */
* swap_entries[i].se_path */
for (i = 0; i < swap_num; i++)
{
+ char path[PATH_MAX];
+ gauge_t this_used;
+ gauge_t this_total;
+
if ((swap_entries[i].se_flags & SWF_ENABLE) == 0)
continue;
- used += ((gauge_t) swap_entries[i].se_inuse) * C_SWAP_BLOCK_SIZE;
- total += ((gauge_t) swap_entries[i].se_nblks) * C_SWAP_BLOCK_SIZE;
- }
+ this_used = ((gauge_t) swap_entries[i].se_inuse)
+ * C_SWAP_BLOCK_SIZE;
+ this_total = ((gauge_t) swap_entries[i].se_nblks)
+ * C_SWAP_BLOCK_SIZE;
+
+
+ /* Shortcut for the "combined" setting (default) */
+ if (!report_by_device)
+ {
+ used += this_used;
+ total += this_total;
+ continue;
+ }
+
+ sstrncpy (path, swap_entries[i].se_path, sizeof (path));
+ escape_slashes (path, sizeof (path));
+
+ swap_submit_usage (path, this_used, this_total - this_used,
+ NULL, NAN);
+ } /* for (swap_num) */
+
if (total < used)
{
ERROR ("swap plugin: Total swap space (%g) is less than used swap space (%g).",
total, used);
+ sfree (swap_entries);
return (-1);
}
- swap_submit_usage (NULL, used, total - used, NULL, NAN);
+ /* If the "separate" option was specified (report_by_device == 1), all
+ * values have already been dispatched from within the loop. */
+ if (!report_by_device)
+ swap_submit_usage (NULL, used, total - used, NULL, NAN);
sfree (swap_entries);
+
+#if KERNEL_NETBSD
+ swap_read_io ();
+#endif
return (0);
} /* }}} int swap_read */
/* #endif HAVE_SWAPCTL && HAVE_SWAPCTL_THREE_ARGS */

4
sysutils/collectd/patches/patch-src_tcpconns.c
View File

@@ -1,4 +1,6 @@
$NetBSD: patch-src_tcpconns.c,v 1.4 2015/06/10 20:05:26 fhajny Exp $
$NetBSD: patch-src_tcpconns.c,v 1.5 2015/08/11 13:19:21 he Exp $
Include <sys/param.h>
--- src/tcpconns.c.orig 2015-05-20 12:04:47.191035542 +0000
+++ src/tcpconns.c

14
sysutils/collectd/patches/patch-version-gen.sh Normal file
View File

@@ -0,0 +1,14 @@
$NetBSD: patch-version-gen.sh,v 1.1 2015/08/11 13:19:21 he Exp $
For work in pkgsrc, also strip '.git' suffix.
--- version-gen.sh.orig 2015-05-26 20:23:28.000000000 +0000
+++ version-gen.sh
@@ -8,6 +8,6 @@ if test -z "$VERSION"; then
VERSION="$DEFAULT_VERSION"
fi
-VERSION="`echo \"$VERSION\" | sed -e 's/-/./g'`"
+VERSION="`echo \"$VERSION\" | sed -e 's/-/./g' | sed -e 's/.git//'`"
printf "%s" "$VERSION"

4
sysutils/conky/Makefile
View File

@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.22 2015/04/25 14:24:51 tnn Exp $
# $NetBSD: Makefile,v 1.24 2015/08/18 07:31:17 wiz Exp $
#
DISTNAME= conky-1.9.0
PKGREVISION= 18
PKGREVISION= 20
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=conky/}
EXTRACT_SUFX= .tar.bz2

13
sysutils/coreutils/Makefile
View File

@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.67 2015/06/16 22:28:13 jperkin Exp $
# $NetBSD: Makefile,v 1.68 2015/07/24 17:02:44 jperkin Exp $
PKGREVISION= 1
PKGREVISION= 2
.include "../../sysutils/coreutils/Makefile.common"
CONFIGURE_ARGS+= --without-gmp
@@ -34,6 +34,15 @@ USE_GCC_RUNTIME= yes
PLIST.stdbuf= yes
.endif
# Ensure libstdbuf.so has a valid library name otherwise REQUIRES will
# record the relative path of the object output file.
.if ${OPSYS} == "Darwin"
SUBST_CLASSES+= libname
SUBST_STAGE.libname= pre-configure
SUBST_FILES.libname= Makefile.in
SUBST_SED.libname= -e '/^src_libstdbuf_so_LDFLAGS/s,$$, -install_name ${PREFIX}/libexec/coreutils/glibstdbuf.so,'
.endif
PROGS= [ base64 basename cat chcon chgrp chmod chown chroot cksum comm \
cp csplit cut date dd df dir dircolors dirname du hostid echo env \
expand expr factor false fmt fold groups head id install join kill \

3
sysutils/cpmtools/Makefile
View File

@@ -1,7 +1,8 @@
# $NetBSD: Makefile,v 1.5 2012/10/23 19:50:56 asau Exp $
# $NetBSD: Makefile,v 1.7 2015/08/18 07:31:17 wiz Exp $
#
DISTNAME= cpmtools-2.13
PKGREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= http://www.moria.de/~michael/cpmtools/

4
sysutils/dbus-sharp-glib/Makefile
View File

@@ -1,10 +1,10 @@
# $NetBSD: Makefile,v 1.7 2015/05/23 06:44:58 kefren Exp $
# $NetBSD: Makefile,v 1.8 2015/09/12 20:03:01 tnn Exp $
#
DISTNAME= dbus-sharp-glib-0.5.0
PKGREVISION= 5
CATEGORIES= sysutils
MASTER_SITES= http://cloud.github.com/downloads/mono/dbus-sharp/
MASTER_SITES= https://cloud.github.com/downloads/mono/dbus-sharp/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= https://github.com/mono/dbus-sharp-glib

4
sysutils/dbus-sharp/Makefile
View File

@@ -1,10 +1,10 @@
# $NetBSD: Makefile,v 1.9 2015/05/23 06:44:58 kefren Exp $
# $NetBSD: Makefile,v 1.10 2015/09/12 20:03:01 tnn Exp $
#
DISTNAME= dbus-sharp-0.7.0
PKGREVISION= 7
CATEGORIES= sysutils
MASTER_SITES= http://cloud.github.com/downloads/mono/dbus-sharp/
MASTER_SITES= https://cloud.github.com/downloads/mono/dbus-sharp/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://mono.github.com/dbus-sharp/

56
sysutils/dbus/Makefile
View File

@@ -1,6 +1,7 @@
# $NetBSD: Makefile,v 1.83 2015/05/14 17:21:06 wiz Exp $
# $NetBSD: Makefile,v 1.88 2015/09/23 06:56:57 ryoon Exp $
DISTNAME= dbus-1.8.18
DISTNAME= dbus-1.10.0
PKGREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/
@@ -31,24 +32,22 @@ MESSAGE_SRC+= MESSAGE
.include "../../mk/bsd.prefs.mk"
CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q}
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
CONFIGURE_ARGS_GROUPS= enable disable with without
.if ${OPSYS} == "Darwin"
# Prevent the configure script from picking up a per-user tmp
# directory. See the commit message on revision 1.35
CONFIGURE_ARGS.with+= session-socket-dir=/tmp
CONFIGURE_ARGS+= --with-session-socket-dir=/tmp
.endif
CONFIGURE_ARGS.Linux= abstract-sockets selinux
CONFIGURE_ARGS.docs= doxygen-docs xml-docs
CONFIGURE_ARGS+= --without-init-scripts
CONFIGURE_ARGS+= --disable-ansi
CONFIGURE_ARGS+= --disable-console-owner-file
CONFIGURE_ARGS+= --disable-doxygen-docs
CONFIGURE_ARGS+= --enable-checks
CONFIGURE_ARGS+= --enable-static
CONFIGURE_ARGS.without+= init-scripts
CONFIGURE_ARGS.disable+= ansi
CONFIGURE_ARGS.disable+= console-owner-file
CONFIGURE_ARGS.disable+= ${CONFIGURE_ARGS.docs}
CONFIGURE_ARGS.enable+= checks static
###
### XXX the spawn test hangs, and some of these tests may be bogus
###
@@ -57,34 +56,25 @@ CONFIGURE_ARGS.enable+= checks static
#TEST_TARGET= check
#.endif
CONFIGURE_ARGS.with+= dbus-user=${DBUS_USER}
CONFIGURE_ARGS.with+= test-socket-dir=${WRKDIR:Q}
CONFIGURE_ARGS+= --with-dbus-user=${DBUS_USER}
CONFIGURE_ARGS+= --with-test-socket-dir=${WRKDIR:Q}
PTHREAD_AUTO_VARS= yes
.if ${OPSYS} == "Linux"
PLIST.linux= yes
.else
CONFIGURE_ARGS.disable+=\
${CONFIGURE_ARGS.Linux}
CONFIGURE_ARGS+= --disable-abstract-sockets
CONFIGURE_ARGS+= --disable-selinux
.endif
PLIST_VARS+= linux launchd
CONFIGURE_ARGS+=\
${CONFIGURE_ARGS_GROUPS:@.g.@ \
${CONFIGURE_ARGS.${.g.}:@.a.@ \
--${.g.}-${.a.} \
@} \
@:M*}
MAKE_DIRS= ${PKG_SYSCONFDIR}/dbus-1/event.d
MAKE_DIRS+= ${PKG_SYSCONFDIR}/dbus-1/system.d
MAKE_DIRS+= ${PKG_SYSCONFDIR}/dbus-1/session.d
EGDIR= ${PREFIX}/share/examples/dbus
CONF_FILES= ${EGDIR}/session.conf ${PKG_SYSCONFDIR}/dbus-1/session.conf
CONF_FILES+= ${EGDIR}/system.conf ${PKG_SYSCONFDIR}/dbus-1/system.conf
DBUS_CONF_DIR+= ${PKG_SYSCONFBASE}/dbus-1
OWN_DIRS+= ${DBUS_CONF_DIR}/services
OWN_DIRS+= ${DBUS_CONF_DIR}/system-services
OWN_DIRS+= ${DBUS_CONF_DIR}/session.d
OWN_DIRS+= ${DBUS_CONF_DIR}/system.d
RCD_SCRIPTS= dbus
@@ -111,6 +101,14 @@ BUILDLINK_TRANSFORM+= rm:-lrt
.include "options.mk"
BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto
post-install:
${INSTALL_DATA} ${WRKSRC}/doc/introspect.* \
${DESTDIR}${PREFIX}/share/doc/dbus/
${RM} ${DESTDIR}${PREFIX}/etc/dbus-1/s*.conf
${RMDIR} ${DESTDIR}${PREFIX}/etc/dbus-1
.include "../../mk/pthread.buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../textproc/expat/buildlink3.mk"

37
sysutils/dbus/PLIST
View File

@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.18 2015/01/21 13:45:18 pho Exp $
@comment $NetBSD: PLIST,v 1.20 2015/08/30 15:08:00 wiz Exp $
${PLIST.launchd}Library/LaunchAgents/org.freedesktop.dbus-session.plist
bin/dbus-cleanup-sockets
bin/dbus-daemon
@@ -6,6 +6,8 @@ bin/dbus-launch
bin/dbus-monitor
bin/dbus-run-session
bin/dbus-send
bin/dbus-test-tool
bin/dbus-update-activation-environment
bin/dbus-uuidgen
include/dbus-1.0/dbus/dbus-address.h
include/dbus-1.0/dbus/dbus-bus.h
@@ -28,10 +30,35 @@ lib/dbus-1.0/include/dbus/dbus-arch-deps.h
lib/libdbus-1.la
lib/pkgconfig/dbus-1.pc
libexec/dbus-daemon-launch-helper
man/man1/dbus-cleanup-sockets.1
man/man1/dbus-daemon.1
man/man1/dbus-launch.1
man/man1/dbus-monitor.1
man/man1/dbus-run-session.1
man/man1/dbus-send.1
man/man1/dbus-test-tool.1
man/man1/dbus-update-activation-environment.1
man/man1/dbus-uuidgen.1
share/dbus-1/session.conf
share/dbus-1/system.conf
share/doc/dbus/dbus-cleanup-sockets.1.html
share/doc/dbus/dbus-daemon.1.html
share/doc/dbus/dbus-faq.html
share/doc/dbus/dbus-launch.1.html
share/doc/dbus/dbus-monitor.1.html
share/doc/dbus/dbus-run-session.1.html
share/doc/dbus/dbus-send.1.html
share/doc/dbus/dbus-specification.html
share/doc/dbus/dbus-test-plan.html
share/doc/dbus/dbus-test-tool.1.html
share/doc/dbus/dbus-tutorial.html
share/doc/dbus/dbus-update-activation-environment.1.html
share/doc/dbus/dbus-uuidgen.1.html
share/doc/dbus/diagram.png
share/doc/dbus/diagram.svg
share/doc/dbus/examples/GetAllMatchRules.py
share/doc/dbus/examples/example-session-disable-stats.conf
share/doc/dbus/examples/example-system-enable-stats.conf
share/doc/dbus/introspect.dtd
share/doc/dbus/introspect.xsl
share/doc/dbus/system-activation.txt
share/examples/dbus/session.conf
share/examples/dbus/system.conf
@pkgdir share/dbus-1/system-services
@pkgdir share/dbus-1/services

17
sysutils/dbus/distinfo
View File

@@ -1,14 +1,9 @@
$NetBSD: distinfo,v 1.64 2015/05/14 17:21:06 wiz Exp $
$NetBSD: distinfo,v 1.66 2015/08/30 15:08:00 wiz Exp $
SHA1 (dbus-1.8.18.tar.gz) = a30be4a6efe3fe570d2a2cc4265f0ef9be9367aa
RMD160 (dbus-1.8.18.tar.gz) = 96215bbd9d2ba322d8ddfe7b2fde74e37ed44671
Size (dbus-1.8.18.tar.gz) = 1868625 bytes
SHA1 (patch-aa) = 0c3d145979e3b2358261c9f7f34701d02eb6ecd4
SHA1 (patch-ak) = 6d05ebde29acb3f6cb6f577dd2f2b734f590e8dd
SHA1 (patch-al) = 57d08196e9daf49eb6bda2b30f019ce2cad77c6f
SHA1 (dbus-1.10.0.tar.gz) = eec3c798633f623e960eb1d9f93b47648f389443
RMD160 (dbus-1.10.0.tar.gz) = 2a70f98a1af157bea71daac5402b85f9b1770cde
Size (dbus-1.10.0.tar.gz) = 2018754 bytes
SHA1 (patch-ak) = 9f84b015ae706ebfe8230fe315a92c6960a84a60
SHA1 (patch-al) = 08d49257c3eea7b6ae0a3fe2682dba977ba06951
SHA1 (patch-am) = 8c794ff8b0981e90243ee20c26ae1ecc72e68de8
SHA1 (patch-ba) = f9126faf18cd19e897865748ebea1011fe516225
SHA1 (patch-bus_dir-watch-kqueue.c) = 86a1f0f78b4d16d8ab29d351057885d8001dd39c
SHA1 (patch-configure) = 08fb6cc6e9bc9f23825a6a0f2b8b241169d1cda7
SHA1 (patch-dbus_dbus-sysdeps-unix.c) = 043e7bf03686f51faf763f87f43e00308b29571e
SHA1 (patch-dbus_dbus-sysdeps-util-unix.c) = 9c967cdac585220a3e65443dc9642e7d4478567c

11
sysutils/dbus/files/smf/dbus.sh
View File

@@ -13,11 +13,16 @@ fi
if [ ! -f @VARBASE@/db/dbus/machine-id ]; then
@PREFIX@/bin/dbus-uuidgen --ensure
fi
pidfile="@VARBASE@/run/dbus/pid"
case "$1" in
'start')
if [ -f @VARBASE@/run/dbus/pid ]; then
rm -f @VARBASE@/run/dbus/pid
dir="@VARBASE@/run/dbus"
if ! [ -d $dir ]; then
@MKDIR@ $dir
@CHMOD@ 0755 $dir
@CHOWN@ @DBUS_USER@:@DBUS_GROUP@ $dir
elif [ -f $pidfile ]; then
rm -f $pidfile
fi
@PREFIX@/bin/dbus-daemon --system
err=$?

2
sysutils/dbus/files/smf/manifest.xml
View File

@@ -19,7 +19,7 @@
exec='@PREFIX@/@SMF_METHOD_FILE.dbus@ start'
timeout_seconds='30'>
<method_context>
<method_credential user='@DBUS_USER@' group='@DBUS_GROUP@' />
<method_credential user='root' group='@DBUS_GROUP@' />
</method_context>
</exec_method>
<exec_method

22
sysutils/dbus/options.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: options.mk,v 1.8 2015/01/21 13:45:18 pho Exp $
# $NetBSD: options.mk,v 1.9 2015/09/07 23:24:46 gdt Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.dbus
PKG_SUPPORTED_OPTIONS+= debug x11
@@ -22,31 +22,33 @@ PKG_SUPPORTED_OPTIONS+= launchd
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mdebug)
CONFIGURE_ARGS.enable+= asserts verbose-mode
CONFIGURE_ARGS+= --enable-asserts
CONFIGURE_ARGS+= --enable-verbose-mode
.else
CONFIGURE_ARGS.disable+= asserts verbose-mode
CONFIGURE_ARGS+= --disable-asserts
CONFIGURE_ARGS+= --disable-verbose-mode
.endif
.if !empty(PKG_OPTIONS:Mkqueue)
CONFIGURE_ARGS.enable+= kqueue
CONFIGURE_ARGS+= --enable-kqueue
.else
CONFIGURE_ARGS.disable+= kqueue
CONFIGURE_ARGS+= --disable-kqueue
.endif
.if !empty(PKG_OPTIONS:Mx11)
CONFIGURE_ARGS.with+= x
CONFIGURE_ARGS+= --with-x
. include "../../x11/libX11/buildlink3.mk"
BUILDLINK_DEPMETHOD.libXt= build
. include "../../x11/libXt/buildlink3.mk"
.else
CONFIGURE_ARGS.without= x
CONFIGURE_ARGS= --without-x
.endif
.if !empty(PKG_OPTIONS:Mlaunchd)
MESSAGE_SRC+= MESSAGE.launchd
PLIST.launchd= yes
CONFIGURE_ARGS.enable+= launchd
CONFIGURE_ARGS.with+= launchd-agent-dir=${PREFIX}/Library/LaunchAgents
CONFIGURE_ARGS+= --enable-launchd
CONFIGURE_ARGS+= --with-launchd-agent-dir=${PREFIX}/Library/LaunchAgents
.else
CONFIGURE_ARGS.disable+= launchd
CONFIGURE_ARGS+= --disable-launchd
.endif

42
sysutils/dbus/patches/patch-aa
View File

@@ -1,42 +0,0 @@
$NetBSD: patch-aa,v 1.11 2012/08/01 17:52:22 drochner Exp $
--- bus/Makefile.in.orig 2012-07-26 16:39:09.000000000 +0000
+++ bus/Makefile.in
@@ -500,7 +500,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-configdir = $(sysconfdir)/dbus-1
+etcconfigdir = $(sysconfdir)/dbus-1
+configdir = $(datadir)/examples/@PACKAGE@
dbus_daemon_execdir = $(DBUS_DAEMONDIR)
DBUS_BUS_LIBS = \
$(XML_LIBS) \
@@ -519,7 +520,7 @@ DBUS_LAUNCHER_LIBS = \
AM_CPPFLAGS = \
-I$(top_srcdir) \
$(XML_CFLAGS) \
- -DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\" \
+ -DDBUS_SYSTEM_CONFIG_FILE=\""$(etcconfigdir)/system.conf"\" \
-DDBUS_COMPILATION \
-DDBUS_STATIC_BUILD \
$(NULL)
@@ -1510,9 +1511,6 @@ clean-local:
/bin/rm *.bb *.bbg *.da *.gcov || true
install-data-hook:
- $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus
- $(mkinstalldirs) $(DESTDIR)$(configdir)/system.d
- $(mkinstalldirs) $(DESTDIR)$(configdir)/session.d
$(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services
$(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/system-services
# Install dbus.socket as default implementation of a D-Bus stack.
@@ -1529,7 +1527,7 @@ install-data-hook:
@DBUS_UNIX_TRUE@install-exec-hook:
@DBUS_UNIX_TRUE@ if test `id -u` -eq 0; then \
@DBUS_UNIX_TRUE@ chown root:$(DBUS_USER) $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper$(EXEEXT); \
-@DBUS_UNIX_TRUE@ chmod 4750 $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper$(EXEEXT); \
+@DBUS_UNIX_TRUE@ chmod 4550 $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper$(EXEEXT); \
@DBUS_UNIX_TRUE@ else \
@DBUS_UNIX_TRUE@ echo "Not installing $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper binary setuid!"; \
@DBUS_UNIX_TRUE@ echo "You'll need to manually set permissions to root:$(DBUS_USER) and permissions 4750"; \

16
sysutils/dbus/patches/patch-ak
View File

@@ -1,13 +1,13 @@
$NetBSD: patch-ak,v 1.3 2014/04/03 09:09:06 wiz Exp $
$NetBSD: patch-ak,v 1.4 2015/08/30 15:08:00 wiz Exp $
--- dbus/Makefile.in.orig 2014-01-20 14:10:30.000000000 +0000
--- dbus/Makefile.in.orig 2015-08-25 15:52:09.000000000 +0000
+++ dbus/Makefile.in
@@ -673,7 +673,7 @@ configdir = $(sysconfdir)/dbus-1
# results in an otherwise unnecessary dependency on librt. Disable it.
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) $(SYSTEMD_CFLAGS) \
@@ -589,7 +589,7 @@ dbusdatadir = $(datadir)/dbus-1
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
$(DBUS_STATIC_BUILD_CPPFLAGS) $(SYSTEMD_CFLAGS) \
$(VALGRIND_CFLAGS) -DDBUS_COMPILATION \
- -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\" \
+ -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/db/dbus/machine-id"\" \
-DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\" \
-DDBUS_SESSION_CONFIG_FILE=\""$(configdir)/session.conf"\" \
$(NULL) -DSD_DAEMON_DISABLE_MQ
-DDBUS_SYSTEM_CONFIG_FILE=\""$(dbusdatadir)/system.conf"\" \
-DDBUS_SESSION_CONFIG_FILE=\""$(dbusdatadir)/session.conf"\" \
$(NULL) $(am__append_2)

10
sysutils/dbus/patches/patch-al
View File

@@ -1,8 +1,8 @@
$NetBSD: patch-al,v 1.3 2013/09/12 13:25:47 wiz Exp $
$NetBSD: patch-al,v 1.4 2015/07/26 22:51:23 wiz Exp $
--- tools/Makefile.in.orig 2013-09-05 15:37:16.000000000 +0000
--- tools/Makefile.in.orig 2015-07-21 16:32:32.000000000 +0000
+++ tools/Makefile.in
@@ -412,7 +412,7 @@ AM_CPPFLAGS = \
@@ -428,7 +428,7 @@ AM_CPPFLAGS = \
$(DBUS_STATIC_BUILD_CPPFLAGS) \
$(DBUS_X_CFLAGS) \
-DDBUS_COMPILATION \
@@ -11,8 +11,8 @@ $NetBSD: patch-al,v 1.3 2013/09/12 13:25:47 wiz Exp $
$(NULL)
@@ -818,9 +818,9 @@ uninstall-am: uninstall-binPROGRAMS
uninstall-am uninstall-binPROGRAMS
@@ -847,9 +847,9 @@ uninstall-am: uninstall-binPROGRAMS
.PRECIOUS: Makefile
-# create the /var/lib/dbus directory for dbus-uuidgen

31
sysutils/dbus/patches/patch-ba
View File

@@ -1,31 +0,0 @@
$NetBSD: patch-ba,v 1.3 2014/04/03 09:09:06 wiz Exp $
--- tools/dbus-monitor.c.orig 2013-10-09 10:22:07.000000000 +0000
+++ tools/dbus-monitor.c
@@ -110,7 +110,7 @@ monitor_filter_func (DBusConnection
#include <inttypes.h>
#define PROFILE_TIMED_FORMAT "%s\t%" PRId64 "\t%d"
#else
-#define PROFILE_TIMED_FORMAT "%s\t%lu\t%lu"
+#define PROFILE_TIMED_FORMAT "%s\t%llu\t%lu"
#endif
#define TRAP_NULL_STRING(str) ((str) ? (str) : "<none>")
@@ -130,7 +130,7 @@ static void
profile_print_with_attrs (const char *type, DBusMessage *message,
struct timeval *t, ProfileAttributeFlags attrs)
{
- printf (PROFILE_TIMED_FORMAT, type, t->tv_sec, t->tv_usec);
+ printf (PROFILE_TIMED_FORMAT, type, (unsigned long long)(t->tv_sec), (unsigned long)(t->tv_usec));
if (attrs & PROFILE_ATTRIBUTE_FLAG_SERIAL)
printf ("\t%u", dbus_message_get_serial (message));
@@ -200,7 +200,7 @@ print_message_profile (DBusMessage *mess
PROFILE_ATTRIBUTE_FLAG_MEMBER);
break;
default:
- printf (PROFILE_TIMED_FORMAT "\n", "tun", t.tv_sec, t.tv_usec);
+ printf (PROFILE_TIMED_FORMAT "\n", "tun", (unsigned long long)(t.tv_sec), (unsigned long)(t.tv_usec));
break;
}
}

46
sysutils/dbus/patches/patch-bus_dir-watch-kqueue.c
View File

@@ -1,46 +0,0 @@
$NetBSD: patch-bus_dir-watch-kqueue.c,v 1.2 2014/06/14 21:52:56 wiz Exp $
* For platforms missing O_CLOEXEC
https://bugs.freedesktop.org/show_bug.cgi?id=77032
--- bus/dir-watch-kqueue.c.orig 2014-01-25 12:39:24.000000000 +0000
+++ bus/dir-watch-kqueue.c
@@ -202,6 +202,9 @@ bus_set_watched_dirs (BusContext *contex
DBusList *link;
int i, j, fd;
struct kevent ev;
+#ifdef O_CLOEXEC
+ dbus_bool_t cloexec_done = 0;
+#endif
if (!_init_kqueue (context))
goto out;
@@ -259,7 +262,15 @@ bus_set_watched_dirs (BusContext *contex
/* FIXME - less lame error handling for failing to add a watch;
* we may need to sleep.
*/
+#ifdef O_CLOEXEC
fd = open (new_dirs[i], O_RDONLY | O_CLOEXEC);
+ cloexec_done = (fd >= 0);
+
+ if (fd < 0 && errno == EINVAL)
+#endif
+ {
+ fd = open (new_dirs[i], O_RDONLY);
+ }
if (fd < 0)
{
if (errno != ENOENT)
@@ -274,6 +285,12 @@ bus_set_watched_dirs (BusContext *contex
continue;
}
}
+#ifdef O_CLOEXEC
+ if (!cloexec_done)
+#endif
+ {
+ _dbus_fd_set_close_on_exec (fd);
+ }
EV_SET (&ev, fd, EVFILT_VNODE, EV_ADD | EV_ENABLE | EV_CLEAR,
NOTE_DELETE | NOTE_EXTEND | NOTE_WRITE | NOTE_RENAME, 0, 0);

81
sysutils/dbus/patches/patch-configure
View File

@@ -1,81 +0,0 @@
$NetBSD: patch-configure,v 1.3 2014/06/14 21:57:34 wiz Exp $
backtrace() may be in libexecinfo
From
https://bugs.freedesktop.org/attachment.cgi?id=100403
which is part of
https://bugs.freedesktop.org/show_bug.cgi?id=69702
--- configure.orig 2014-06-05 13:56:49.000000000 +0000
+++ configure
@@ -18860,16 +18860,63 @@ if test "x$ac_cv_header_execinfo_h" = xy
cat >>confdefs.h <<_ACEOF
#define HAVE_EXECINFO_H 1
_ACEOF
- for ac_func in backtrace
-do :
- ac_fn_c_check_func "$LINENO" "backtrace" "ac_cv_func_backtrace"
-if test "x$ac_cv_func_backtrace" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_BACKTRACE 1
-_ACEOF
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing backtrace" >&5
+$as_echo_n "checking for library containing backtrace... " >&6; }
+if ${ac_cv_search_backtrace+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char backtrace ();
+int
+main ()
+{
+return backtrace ();
+ ;
+ return 0;
+}
+_ACEOF
+for ac_lib in '' execinfo; do
+ if test -z "$ac_lib"; then
+ ac_res="none required"
+ else
+ ac_res=-l$ac_lib
+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+ fi
+ if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_search_backtrace=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext
+ if ${ac_cv_search_backtrace+:} false; then :
+ break
fi
done
+if ${ac_cv_search_backtrace+:} false; then :
+
+else
+ ac_cv_search_backtrace=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_backtrace" >&5
+$as_echo "$ac_cv_search_backtrace" >&6; }
+ac_res=$ac_cv_search_backtrace
+if test "$ac_res" != no; then :
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+$as_echo "#define HAVE_BACKTRACE 1" >>confdefs.h
+
+fi
fi

19
sysutils/dbus/patches/patch-dbus_dbus-sysdeps-unix.c
View File

@@ -1,19 +0,0 @@
$NetBSD: patch-dbus_dbus-sysdeps-unix.c,v 1.2 2014/06/14 21:48:34 wiz Exp $
On Linux, poll accepts any negative value as infinity.
On at least FreeBSD and NetBSD, only -1 is acceptable.
https://bugs.freedesktop.org/show_bug.cgi?id=78480
--- dbus/dbus-sysdeps-unix.c.orig 2014-01-17 16:59:48.000000000 +0000
+++ dbus/dbus-sysdeps-unix.c
@@ -2555,6 +2555,10 @@ _dbus_poll (DBusPollFD *fds,
_DBUS_STRUCT_OFFSET (DBusPollFD, revents) ==
_DBUS_STRUCT_OFFSET (struct pollfd, revents))
{
+ if (timeout_milliseconds < -1)
+ {
+ timeout_milliseconds = -1;
+ }
return poll ((struct pollfd*) fds,
n_fds,
timeout_milliseconds);

3
sysutils/deforaos-browser/Makefile
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.15 2015/04/25 14:24:51 tnn Exp $
# $NetBSD: Makefile,v 1.18 2015/08/25 22:52:25 khorben Exp $
#
DISTNAME= Browser-0.4.13
@@ -21,6 +21,7 @@ BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
MAKE_FLAGS+= DESTDIR=${DESTDIR}
MAKE_FLAGS+= PREFIX=${PREFIX}
MAKE_FLAGS+= CFLAGS=${CFLAGS:Q}
AUTO_MKDIRS= yes
.include "../../mk/bsd.prefs.mk"

3
sysutils/deforaos-browser/distinfo
View File

@@ -1,10 +1,11 @@
$NetBSD: distinfo,v 1.6 2014/03/21 14:19:31 jperkin Exp $
$NetBSD: distinfo,v 1.7 2015/08/25 22:52:25 khorben Exp $
SHA1 (Browser-0.4.13.tar.gz) = 2a7eec2032bc224864000a149ba0afc2b8562cbd
RMD160 (Browser-0.4.13.tar.gz) = 0cee3c24a8bc40a513aab6bd794bbd9865ac73f7
Size (Browser-0.4.13.tar.gz) = 129587 bytes
SHA1 (patch-data_pkgconfig.sh) = 4d331028b647bcd671fadeda613ecc29d56d3017
SHA1 (patch-src_callbacks.c) = 81cc77f99c58a1c0de61f4096808d77d99cce4fd
SHA1 (patch-src_plugins_Makefile) = 3a275dfcda3a8acc0e87daa8953ffd3ad3fb5181
SHA1 (patch-src_plugins_dirtree.c) = 9abeac0ad6947d19435276708aefe0c9235e9b92
SHA1 (patch-src_vfs.c) = e604b316be270e210c95b889d2c853aefd8bbc46
SHA1 (patch-tools_dirtree.c) = 1c404e749464d30773360a43485117010d1cbd15

17
sysutils/deforaos-browser/patches/patch-src_plugins_Makefile Normal file
View File

@@ -0,0 +1,17 @@
$NetBSD: patch-src_plugins_Makefile,v 1.1 2015/08/25 22:52:26 khorben Exp $
Fix build when setting CFLAGS
--- src/plugins/Makefile.orig 2013-10-06 13:34:26.000000000 +0000
+++ src/plugins/Makefile
@@ -5,8 +5,8 @@ LIBDIR = $(PREFIX)/lib
CC = cc
CPPFLAGSF= -I ../../include
CPPFLAGS=
-CFLAGSF = -W `pkg-config --cflags libDesktop`
-CFLAGS = -Wall -g -O2 -pedantic -fPIC
+CFLAGSF = `pkg-config --cflags libDesktop` -fPIC
+CFLAGS = -W -Wall -g -O2 -pedantic
LDFLAGSF= `pkg-config --libs libDesktop`
AR = ar
RANLIB = ranlib

3
sysutils/deforaos-terminal/Makefile
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.11 2015/04/25 14:24:51 tnn Exp $
# $NetBSD: Makefile,v 1.12 2015/08/09 15:24:15 khorben Exp $
#
DISTNAME= Terminal-0.0.0
@@ -21,6 +21,7 @@ BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
MAKE_FLAGS+= DESTDIR=${DESTDIR}
MAKE_FLAGS+= PREFIX=${PREFIX}
MAKE_FLAGS+= CFLAGS=${CFLAGS:Q}
AUTO_MKDIRS= yes
DEPENDS+= xterm-[0-9]*:../../x11/xterm

4
sysutils/dirvish/Makefile
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.11 2015/06/12 10:51:12 wiz Exp $
# $NetBSD: Makefile,v 1.12 2015/07/12 18:56:29 wiz Exp $
#
DISTNAME= dirvish-1.2.1
@@ -12,7 +12,7 @@ HOMEPAGE= http://www.dirvish.org/
COMMENT= Fast, disk based, rotating network backup system
DEPENDS+= rsync>=2.6.0:../../net/rsync
DEPENDS+= {perl>=5.8.8,p5-Getopt-Long>=2.35}:../../devel/p5-Getopt-Long
#DEPENDS+= {perl>=5.8.8,p5-Getopt-Long>=2.35}:../../devel/p5-Getopt-Long
DEPENDS+= p5-Time-modules>=2003.0:../../time/p5-Time-modules
DEPENDS+= p5-Time-Period>=1.0:../../time/p5-Time-Period

3
sysutils/dtpstree/Makefile
View File

@@ -1,7 +1,8 @@
# $NetBSD: Makefile,v 1.3 2015/03/14 14:55:35 tnn Exp $
# $NetBSD: Makefile,v 1.4 2015/08/18 07:31:17 wiz Exp $
#
DISTNAME= dtpstree-1.0.3
PKGREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://code.douglasthrift.net/files/dtpstree/ \
http://apt.douglasthrift.net/files/dtpstree/

6
sysutils/duplicity/Makefile
View File

@@ -1,6 +1,7 @@
# $NetBSD: Makefile,v 1.29 2015/04/09 10:16:35 hiramatsu Exp $
# $NetBSD: Makefile,v 1.30 2015/09/17 17:53:35 joerg Exp $
DISTNAME= duplicity-0.6.25
PKGREVISION= 1
CATEGORIES= sysutils net
MASTER_SITES= http://code.launchpad.net/duplicity/0.6-series/${PKGVERSION_NOREV}/+download/
@@ -42,8 +43,7 @@ SUBST_VARS.gpgpath= GPGPATH
post-extract:
cd ${WRKSRC} && ${CHMOD} go+r *
BUILDLINK_API_DEPENDS.librsync+= librsync>=0.9.6
.include "../../devel/librsync/buildlink3.mk"
.include "../../net/librsync/buildlink3.mk"
.include "../../lang/python/egg.mk"
.include "../../lang/python/application.mk"
.include "../../mk/bsd.pkg.mk"

3
sysutils/duplicity/distinfo
View File

@@ -1,6 +1,7 @@
$NetBSD: distinfo,v 1.17 2015/04/09 10:16:35 hiramatsu Exp $
$NetBSD: distinfo,v 1.18 2015/09/17 17:53:35 joerg Exp $
SHA1 (duplicity-0.6.25.tar.gz) = fe0b6b0b0dc7dbc02598d96567954b48c4308420
RMD160 (duplicity-0.6.25.tar.gz) = a7457b3be4ea73707a1ef7b9021014a82f917eaa
Size (duplicity-0.6.25.tar.gz) = 1269583 bytes
SHA1 (patch-aa) = f1210f703dccf759f234846a3139ce98063011cb
SHA1 (patch-duplicity___librsyncmodule.c) = 505d97e127051f6d7e4546e7343eea54a53083d2

14
sysutils/duplicity/patches/patch-duplicity___librsyncmodule.c Normal file
View File

@@ -0,0 +1,14 @@
$NetBSD: patch-duplicity___librsyncmodule.c,v 1.1 2015/09/17 17:53:35 joerg Exp $
--- duplicity/_librsyncmodule.c.orig 2014-10-20 19:09:10.000000000 +0000
+++ duplicity/_librsyncmodule.c
@@ -67,8 +67,7 @@ _librsync_new_sigmaker(PyObject* self, P
sm = PyObject_New(_librsync_SigMakerObject, &_librsync_SigMakerType);
if (sm == NULL) return NULL;
- sm->sig_job = rs_sig_begin((size_t)blocklen,
- (size_t)RS_DEFAULT_STRONG_LEN);
+ sm->sig_job = rs_sig_begin((size_t)blocklen, 8, RS_MD4_SIG_MAGIC);
return (PyObject*)sm;
}

6
sysutils/extipl/Makefile
View File

@@ -1,13 +1,13 @@
# $NetBSD: Makefile,v 1.12 2012/10/23 19:51:00 asau Exp $
# $NetBSD: Makefile,v 1.13 2015/06/29 11:06:49 ryoon Exp $
#
DISTNAME= extipl-5.04
PKGREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP:=extipl/2166/}
MASTER_SITES= ${MASTER_SITE_OSDN:=extipl/2166/}
MAINTAINER= hiramatu@boreas.dti.ne.jp
HOMEPAGE= http://sourceforge.jp/projects/extipl/
HOMEPAGE= http://osdn.jp/projects/extipl/
COMMENT= IPL compatible OS boot selector
INSTALL_MAKE_FLAGS+= PREFIX=${DESTDIR}${PREFIX} \

4
sysutils/fabric/Makefile
View File

@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.38 2014/08/13 20:05:14 gls Exp $
# $NetBSD: Makefile,v 1.39 2015/08/12 03:26:47 gls Exp $
VERSION= 1.9.1
VERSION= 1.10.2
DISTNAME= Fabric-${VERSION}
PKGNAME= ${DISTNAME:S/F/f/}
CATEGORIES= sysutils net

13
sysutils/fabric/PLIST
View File

@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.15 2014/06/12 00:53:05 gls Exp $
@comment $NetBSD: PLIST,v 1.16 2015/08/12 03:26:47 gls Exp $
bin/fab
${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
@@ -9,15 +9,12 @@ ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
${PYSITELIB}/fabfile/__init__.py
${PYSITELIB}/fabfile/__init__.pyc
${PYSITELIB}/fabfile/__init__.pyo
${PYSITELIB}/fabfile/tag.py
${PYSITELIB}/fabfile/tag.pyc
${PYSITELIB}/fabfile/tag.pyo
${PYSITELIB}/fabfile/utils.py
${PYSITELIB}/fabfile/utils.pyc
${PYSITELIB}/fabfile/utils.pyo
${PYSITELIB}/fabric/__init__.py
${PYSITELIB}/fabric/__init__.pyc
${PYSITELIB}/fabric/__init__.pyo
${PYSITELIB}/fabric/__main__.py
${PYSITELIB}/fabric/__main__.pyc
${PYSITELIB}/fabric/__main__.pyo
${PYSITELIB}/fabric/api.py
${PYSITELIB}/fabric/api.pyc
${PYSITELIB}/fabric/api.pyo
@@ -110,6 +107,7 @@ share/doc/fabric/faq.rst
share/doc/fabric/index.rst
share/doc/fabric/installing.rst
share/doc/fabric/roadmap.rst
share/doc/fabric/running_tests.rst
share/doc/fabric/troubleshooting.rst
share/doc/fabric/tutorial.rst
share/doc/fabric/usage/env.rst
@@ -122,4 +120,3 @@ share/doc/fabric/usage/output_controls.rst
share/doc/fabric/usage/parallel.rst
share/doc/fabric/usage/ssh.rst
share/doc/fabric/usage/tasks.rst
@pkgdir share/doc/fabric/changes

8
sysutils/fabric/distinfo
View File

@@ -1,5 +1,5 @@
$NetBSD: distinfo,v 1.26 2014/08/13 20:05:14 gls Exp $
$NetBSD: distinfo,v 1.27 2015/08/12 03:26:47 gls Exp $
SHA1 (Fabric-1.9.1.tar.gz) = d8da9d923081e68a8959b2614821b0802ce159f6
RMD160 (Fabric-1.9.1.tar.gz) = fd809ded10a847a44ca88b4ca1a57412f816cba3
Size (Fabric-1.9.1.tar.gz) = 219731 bytes
SHA1 (Fabric-1.10.2.tar.gz) = fbb13d5e082eb5b4505eaeca4343df209d1ba897
RMD160 (Fabric-1.10.2.tar.gz) = 6d18e82463d21384fae131d901daa7939f158554
Size (Fabric-1.10.2.tar.gz) = 212942 bytes

14
sysutils/findutils/Makefile
View File

@@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.33 2012/12/16 18:13:28 wiz Exp $
# $NetBSD: Makefile,v 1.34 2015/08/26 12:44:32 wiz Exp $
DISTNAME= findutils-4.2.33
PKGREVISION= 3
DISTNAME= findutils-4.4.2
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_GNU:=findutils/}
@@ -10,9 +9,10 @@ HOMEPAGE= http://www.gnu.org/software/findutils/findutils.html
COMMENT= The GNU find, locate, updatedb, and xargs utilities
LICENSE= gnu-gpl-v3 # or later
GNU_CONFIGURE= YES
INFO_FILES= YES
USE_PKGLOCALEDIR= YES
GNU_CONFIGURE= yes
INFO_FILES= yes
USE_PKGLOCALEDIR= yes
USE_TOOLS+= gmake
LDFLAGS.IRIX+= -lgen
@@ -23,7 +23,7 @@ AUTO_MKDIRS= yes
.include "../../mk/bsd.prefs.mk"
post-install:
.for f in find locate updatedb xargs
.for f in find locate oldfind updatedb xargs
${LN} -sf ${PREFIX}/bin/g${f} ${DESTDIR}${PREFIX}/${PKGGNUDIR}bin/${f}
${LN} -sf ${PREFIX}/${PKGMANDIR}/man1/g${f}.1 ${DESTDIR}${PREFIX}/${PKGGNUDIR}${PKGMANDIR}/man1/${f}.1
.endfor

8
sysutils/findutils/PLIST
View File

@@ -1,17 +1,21 @@
@comment $NetBSD: PLIST,v 1.11 2012/06/01 20:16:06 cheusov Exp $
@comment $NetBSD: PLIST,v 1.12 2015/08/26 12:44:32 wiz Exp $
bin/gfind
bin/glocate
bin/goldfind
bin/gupdatedb
bin/gxargs
gnu/bin/find
gnu/bin/locate
gnu/bin/oldfind
gnu/bin/updatedb
gnu/bin/xargs
gnu/man/man1/find.1
gnu/man/man1/locate.1
gnu/man/man1/oldfind.1
gnu/man/man1/updatedb.1
gnu/man/man1/xargs.1
gnu/man/man5/locatedb.5
info/find-maint.info
info/find.info
libexec/gbigram
libexec/gcode
@@ -24,6 +28,7 @@ man/man5/glocatedb.5
share/locale/be/LC_MESSAGES/findutils.mo
share/locale/bg/LC_MESSAGES/findutils.mo
share/locale/ca/LC_MESSAGES/findutils.mo
share/locale/cs/LC_MESSAGES/findutils.mo
share/locale/da/LC_MESSAGES/findutils.mo
share/locale/de/LC_MESSAGES/findutils.mo
share/locale/el/LC_MESSAGES/findutils.mo
@@ -41,6 +46,7 @@ share/locale/it/LC_MESSAGES/findutils.mo
share/locale/ja/LC_MESSAGES/findutils.mo
share/locale/ko/LC_MESSAGES/findutils.mo
share/locale/lg/LC_MESSAGES/findutils.mo
share/locale/lt/LC_MESSAGES/findutils.mo
share/locale/ms/LC_MESSAGES/findutils.mo
share/locale/nl/LC_MESSAGES/findutils.mo
share/locale/pl/LC_MESSAGES/findutils.mo

10
sysutils/findutils/distinfo
View File

@@ -1,9 +1,9 @@
$NetBSD: distinfo,v 1.15 2011/04/04 11:27:39 drochner Exp $
$NetBSD: distinfo,v 1.16 2015/08/26 12:44:32 wiz Exp $
SHA1 (findutils-4.2.33.tar.gz) = 930a77cd0cbf4ee05888947cc10809f0761c84b8
RMD160 (findutils-4.2.33.tar.gz) = 51c750025487434dd785a332050fff925633c8f9
Size (findutils-4.2.33.tar.gz) = 1455067 bytes
SHA1 (findutils-4.4.2.tar.gz) = e8dd88fa2cc58abffd0bfc1eddab9020231bb024
RMD160 (findutils-4.4.2.tar.gz) = d2954a31d59ca238e18b50be82f1eccf7ad69054
Size (findutils-4.4.2.tar.gz) = 2149838 bytes
SHA1 (patch-aa) = 162de59955ded4cf6d53d012511402a672a39b7c
SHA1 (patch-ab) = 782c5c642e8e6883686c36ddc470edc3d063f0f0
SHA1 (patch-ag) = def96d47ad09cf98b0caf9f44e94df1c0fd611a2
SHA1 (patch-ag) = 564ef15f6f9719ba33c54049a6e6780608afdf19
SHA1 (patch-ah) = 213f8984aba51d500cb0d0c8ba2362918e065741

10
sysutils/findutils/patches/patch-ag
View File

@@ -1,10 +1,10 @@
$NetBSD: patch-ag,v 1.4 2007/10/16 00:45:55 tnn Exp $
$NetBSD: patch-ag,v 1.5 2015/08/26 12:44:33 wiz Exp $
--- find/pred.c.orig 2007-04-22 17:43:17.000000000 +0200
--- find/pred.c.orig 2009-05-16 15:17:01.000000000 +0000
+++ find/pred.c
@@ -38,6 +38,10 @@
#include "buildcmd.h"
#include "yesno.h"
@@ -48,6 +48,10 @@
#include "error.h"
#include "verify.h"
+#ifdef __sgi
+#include <libgen.h>

4
sysutils/ftwin/Makefile
View File

@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.31 2015/01/23 10:11:47 wiz Exp $
# $NetBSD: Makefile,v 1.32 2015/06/30 09:57:42 ryoon Exp $
DISTNAME= ftwin-0.8.8
PKGREVISION= 3
PKGREVISION= 4
CATEGORIES= sysutils
MASTER_SITES= # http://download.meroware.org/ftwin/
EXTRACT_SUFX= .tar.bz2

4
sysutils/gkrellm/Makefile
View File

@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.83 2015/04/25 14:24:51 tnn Exp $
# $NetBSD: Makefile,v 1.84 2015/08/23 14:30:42 wiz Exp $
.include "Makefile.common"
PKGREVISION= 24
PKGREVISION= 25
GKRELLM_PKGBASE= gkrellm
WRKSRC= ${GKRELLM_SRCDIR}

4
sysutils/gnome-commander/Makefile
View File

@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.68 2015/06/12 10:51:13 wiz Exp $
# $NetBSD: Makefile,v 1.69 2015/07/15 15:09:40 wiz Exp $
DISTNAME= gnome-commander-1.2.8.15
PKGREVISION= 38
PKGREVISION= 39
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-commander/1.2/}
EXTRACT_SUFX= .tar.xz

4
sysutils/grub/Makefile
View File

@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.56 2012/10/23 19:51:05 asau Exp $
# $NetBSD: Makefile,v 1.57 2015/08/18 07:31:17 wiz Exp $
DISTNAME= grub-0.97
PKGREVISION= 9
PKGREVISION= 10
CATEGORIES= sysutils
MASTER_SITES= ftp://alpha.gnu.org/gnu/grub/

4
sysutils/gvfs/Makefile
View File

@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.72 2015/06/07 14:05:59 youri Exp $
# $NetBSD: Makefile,v 1.73 2015/08/13 08:57:08 martin Exp $
#
DISTNAME= gvfs-1.6.7
PKGREVISION= 16
PKGREVISION= 17
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gvfs/1.6/}
EXTRACT_SUFX= .tar.bz2

Some files were not shown because too many files have changed in this diff Show More