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

Import of pkgsrc-2015Q2

Browse Source
This commit is contained in:
Lionel Sambuc
2015-08-30 02:56:09 -07:00
committed by Lionel Sambuc
parent 4af1cdf7a9
commit f641581404
15409 changed files with 267784 additions and 121624 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sysutils/collectd/Makefile
View File

@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.3 2014/07/30 12:28:18 fhajny Exp $
# $NetBSD: Makefile,v 1.6 2015/06/12 10:51:12 wiz Exp $
PKGREVISION= 1
.include "../../sysutils/collectd/Makefile.common"
PKGREVISION= 2
COMMENT= Statistics collection daemon base
RCD_SCRIPTS= collectd
@@ -22,6 +22,9 @@ DEFAULT_PLUGINS+= aggregation apcups csv email exec filecount \
CONFIGURE_ARGS+= --enable-${option}
.endfor
# Several libs not generated in time for linking collectd
MAKE_JOBS_SAFE= no
.include "options.mk"
CONF_FILES+= share/examples/collectd/collectd.conf \

10
sysutils/collectd/Makefile.common
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.5 2015/02/24 13:14:05 fhajny Exp $
# $NetBSD: Makefile.common,v 1.9 2015/06/10 20:05:26 fhajny Exp $
#
# used by sysutils/collectd/Makefile
# used by sysutils/collectd-amqp/Makefile
@@ -12,8 +12,10 @@
# used by sysutils/collectd-postgresql/Makefile
# used by sysutils/collectd-rrdtool/Makefile
# used by sysutils/collectd-snmp/Makefile
# used by sysutils/p5-collectd/Makefile
# used by sysutils/py-collectd/Makefile
DISTNAME= collectd-5.4.1
DISTNAME= collectd-5.5.0
MASTER_SITES= http://collectd.org/files/
CATEGORIES= sysutils
@@ -70,8 +72,8 @@ CPPFLAGS.SunOS+= -DSOLARIS2=${OS_VERSION:C/5.//}
.include "../../mk/compiler.mk"
.if !empty(PKGSRC_COMPILER:Mclang)
CFLAGS+= -Wno-error=tautological-pointer-compare
CFLAGS+= -Wno-error=tautological-pointer-compare \
-Wno-error=pointer-bool-conversion
.endif
.include "../../devel/libltdl/buildlink3.mk"

4
sysutils/collectd/PLIST
View File

@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.2 2014/03/11 14:05:15 jperkin Exp $
@comment $NetBSD: PLIST,v 1.3 2015/04/14 11:27:30 fhajny Exp $
bin/collectd-nagios
bin/collectd-tg
bin/collectdctl
@@ -33,11 +33,9 @@ ${PLIST.nfs}lib/collectd/nfs.la
lib/collectd/ntpd.la
lib/collectd/olsrd.la
lib/collectd/openvpn.la
${PLIST.perl}lib/collectd/perl.la
${PLIST.pf}lib/collectd/pf.la
lib/collectd/powerdns.la
${PLIST.processes}lib/collectd/processes.la
${PLIST.python}lib/collectd/python.la
lib/collectd/statsd.la
${PLIST.swap}lib/collectd/swap.la
${PLIST.syslog}lib/collectd/syslog.la

18
sysutils/collectd/distinfo
View File

@@ -1,15 +1,13 @@
$NetBSD: distinfo,v 1.5 2015/03/19 13:50:30 jperkin Exp $
$NetBSD: distinfo,v 1.8 2015/06/10 20:05:26 fhajny Exp $
SHA1 (collectd-5.4.1.tar.gz) = faaccac4daf48449bcefc9d6f9236f98a5dd5b4b
RMD160 (collectd-5.4.1.tar.gz) = a98ff2d845238d4792f732aa7518effdc95e24f9
Size (collectd-5.4.1.tar.gz) = 1894132 bytes
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-configure) = 34bb022fbe3b3b072a6ea5d86de0711a37ebfa0f
SHA1 (patch-src_Makefile.in) = 3d227fa1c483944f44b11e49cabb6390ab3b8338
SHA1 (patch-src_Makefile.in) = f94d046ee323fdb9251ad49cf383b3a61df5dcaa
SHA1 (patch-src_collectd-tg.c) = f9f41dfb0b1b55a62202128a165d5c9943faf5bc
SHA1 (patch-src_collectd.c) = 31106ca27dd4911c40285fece48f76a1c36e2407
SHA1 (patch-src_collectd.conf.in) = 97400dbc16a31a440750beed0bc16927afdcb570
SHA1 (patch-src_collectd.conf.in) = f0b35085cf0ddfd766e140b145177ab1f1326f5f
SHA1 (patch-src_df.c) = 19cca888b183a90759b359702e4d65c8afa6e58d
SHA1 (patch-src_libcollectclient_network__buffer.c) = e07d403d299613fa0885a0e7285849eb85510253
SHA1 (patch-src_network.c) = b07c206406642b37788dd8d0aefe437158473b97
SHA1 (patch-src_tcpconns.c) = a1ad8fa2eb9e899375b7b99d12becb4e98ac4e10
SHA1 (patch-src_tcpconns.c) = fdc160087231a4aee2c405b8ed07791e90b20fd0
SHA1 (patch-src_utils__dns.c) = c3782dc9127f42da30e3142b853aa2cb2259af94

20
sysutils/collectd/options.mk
View File

@@ -1,7 +1,7 @@
# $NetBSD: options.mk,v 1.1 2014/02/17 11:21:54 fhajny Exp $
# $NetBSD: options.mk,v 1.2 2015/04/14 11:27:30 fhajny Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.collectd
PKG_SUPPORTED_OPTIONS= cpu df interface load memory perl python syslog uptime
PKG_SUPPORTED_OPTIONS= cpu df interface load memory syslog uptime
PKG_SUGGESTED_OPTIONS+= cpu df interface load memory syslog uptime
.if ${OPSYS} == "NetBSD"
@@ -29,7 +29,7 @@ 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 perl pf processes python swap \
interface load memory nfs pf processes swap \
syslog tcpconns uptime users zfs-arc
.for option in ${PLIST_VARS}
@@ -38,17 +38,3 @@ CONFIGURE_ARGS+= --enable-${option:S/-/_/}
PLIST.${option}= yes
. endif
.endfor
.if !empty(PKG_OPTIONS:Mperl)
USE_TOOLS+= perl
PERL5_CONFIGURE= no
PERL5_PACKLIST+= auto/Collectd/.packlist
CONFIGURE_ARGS+= --with-libperl=${BUILDLINK_PREFIX.perl}
CONFIGURE_ARGS+= --with-perl-bindings=${MAKE_PARAMS:Q}
. include "../../lang/perl5/module.mk"
.endif
.if !empty(PKG_OPTIONS:Mpython)
CONFIGURE_ARGS+= --with-python=${PYTHONBIN}
. include "../../lang/python/application.mk"
.endif

29
sysutils/collectd/patches/patch-configure
View File

@@ -1,29 +0,0 @@
$NetBSD: patch-configure,v 1.1 2014/02/17 11:21:55 fhajny Exp $
Remove m4 cruft.
--- configure.orig 2014-01-26 08:10:00.249270750 +0000
+++ configure
@@ -18338,19 +18338,19 @@ $as_echo_n "checking if have htonll defi
have_htonll="no"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-[
+
#include <sys/types.h>
#include <netinet/in.h>
#if HAVE_INTTYPES_H
# include <inttypes.h>
#endif
-]
+
int
main ()
{
-[
+
return htonll(0);
-]
+
;
return 0;

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

@@ -1,10 +1,10 @@
$NetBSD: patch-src_Makefile.in,v 1.1 2014/02/17 11:21:55 fhajny Exp $
$NetBSD: patch-src_Makefile.in,v 1.2 2015/06/10 20:05:26 fhajny Exp $
Use a reasonable db dir.
Install config file into examples.
--- src/Makefile.in.orig 2014-01-26 08:09:56.685201776 +0000
--- src/Makefile.in.orig 2015-05-27 07:51:49.001922959 +0000
+++ src/Makefile.in
@@ -2230,6 +2230,7 @@ srcdir = @srcdir@
@@ -2424,6 +2424,7 @@ srcdir = @srcdir@
subdirs = @subdirs@
sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
@@ -12,16 +12,16 @@ Install config file into examples.
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
@@ -2239,7 +2240,7 @@ SUBDIRS = libcollectdclient $(am__append
AM_CPPFLAGS = -DPREFIX='"${prefix}"' \
@@ -2434,7 +2435,7 @@ PLUGIN_LDFLAGS = -module -avoid-version
AM_CPPFLAGS = -I$(srcdir)/daemon -DPREFIX='"${prefix}"' \
-DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \
-DLOCALSTATEDIR='"${localstatedir}"' \
- -DPKGLOCALSTATEDIR='"${localstatedir}/lib/${PACKAGE_NAME}"' \
+ -DPKGLOCALSTATEDIR='"${localstatedir}/db/${PACKAGE_NAME}"' \
$(am__append_2) -DPLUGINDIR='"${pkglibdir}"' \
-DPKGDATADIR='"${pkgdatadir}"'
collectd_SOURCES = collectd.c collectd.h \
@@ -4856,13 +4857,8 @@ uninstall-man: uninstall-man1 uninstall-
AUTOMAKE_OPTIONS = subdir-objects
@@ -5190,13 +5191,8 @@ uninstall-man: uninstall-man1 uninstall-
@HAVE_PROTOC_C_TRUE@ protoc-c -I$(srcdir) --c_out . $(srcdir)/riemann.proto
install-exec-hook:
@@ -37,7 +37,7 @@ Install config file into examples.
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
$(INSTALL) -m 0644 $(srcdir)/types.db $(DESTDIR)$(pkgdatadir)/types.db;
$(INSTALL) -m 0644 $(srcdir)/postgresql_default.conf \
@@ -4870,7 +4866,7 @@ install-exec-hook:
@@ -5204,7 +5200,7 @@ install-exec-hook:
uninstall-hook:
rm -f $(DESTDIR)$(pkgdatadir)/types.db;

14
sysutils/collectd/patches/patch-src_collectd.c
View File

@@ -1,14 +0,0 @@
$NetBSD: patch-src_collectd.c,v 1.1 2014/02/17 11:21:55 fhajny Exp $
sg_init() expects an arg.
--- src/collectd.c.orig 2014-01-26 08:09:14.840391576 +0000
+++ src/collectd.c
@@ -288,7 +288,7 @@ static int do_init (void)
#endif
#if HAVE_LIBSTATGRAB
- if (sg_init ())
+ if (sg_init (0))
{
ERROR ("sg_init: %s", sg_str_error (sg_get_error ()));
return (-1);

48
sysutils/collectd/patches/patch-src_collectd.conf.in
View File

@@ -1,7 +1,7 @@
$NetBSD: patch-src_collectd.conf.in,v 1.1 2014/02/17 11:21:55 fhajny Exp $
$NetBSD: patch-src_collectd.conf.in,v 1.2 2015/06/10 20:05:26 fhajny Exp $
Fix default dirs.
--- src/collectd.conf.in.orig 2014-01-26 08:09:23.516559631 +0000
--- src/collectd.conf.in.orig 2015-05-20 12:05:42.672060002 +0000
+++ src/collectd.conf.in
@@ -12,7 +12,7 @@
@@ -12,25 +12,46 @@ Fix default dirs.
#PIDFile "@localstatedir@/run/@PACKAGE_NAME@.pid"
#PluginDir "@libdir@/@PACKAGE_NAME@"
#TypesDB "@prefix@/share/@PACKAGE_NAME@/types.db"
@@ -278,7 +278,7 @@
@@ -315,16 +315,16 @@
# LongRunAvgLatency false
# ConvertSpecialMetricTypes true
# <Daemon "osd.0">
-# SocketPath "/var/run/ceph/ceph-osd.0.asok"
+# SocketPath "@localstatedir@/run/ceph/ceph-osd.0.asok"
# </Daemon>
# <Daemon "osd.1">
-# SocketPath "/var/run/ceph/ceph-osd.1.asok"
+# SocketPath "@localstatedir@/run/ceph/ceph-osd.1.asok"
# </Daemon>
# <Daemon "mon.a">
-# SocketPath "/var/run/ceph/ceph-mon.ceph1.asok"
+# SocketPath "@localstatedir@/run/ceph/ceph-mon.ceph1.asok"
# </Daemon>
# <Daemon "mds.a">
-# SocketPath "/var/run/ceph/ceph-mds.ceph1.asok"
+# SocketPath "@localstatedir@/run/ceph/ceph-mds.ceph1.asok"
# </Daemon>
#</Plugin>
@@ -340,7 +340,7 @@
#</Plugin>
#
#<Plugin csv>
-# DataDir "@localstatedir@/lib/@PACKAGE_NAME@/csv"
+# DataDir "@localstatedir@/db/@PACKAGE_NAME@/csv"
# StoreRates false
#</Plugin>
@@ -566,7 +566,7 @@
#
@@ -683,7 +683,7 @@
# <Database db_name2>
# Alias "squeeze"
# Host "localhost"
-# Socket "/var/run/mysql/mysqld.sock"
+# Socket "@localstatedir@/run/mysql/mysqld.sock"
# SlaveStats true
# SlaveNotifications true
# </Database>
@@ -827,14 +827,14 @@
@@ -956,14 +956,14 @@
# <Server "server_name">
# Collect "latency"
# Collect "udp-answers" "udp-queries"
@@ -48,7 +69,7 @@ Fix default dirs.
#</Plugin>
#<Plugin processes>
@@ -882,14 +882,14 @@
@@ -1011,14 +1011,14 @@
#<Plugin rrdcached>
# DaemonAddress "unix:/tmp/rrdcached.sock"
@@ -65,16 +86,7 @@ Fix default dirs.
# CreateFilesAsync false
# CacheTimeout 120
# CacheFlush 900
@@ -994,7 +994,7 @@
#</Plugin>
#<Plugin "tail">
-# <File "/var/log/exim4/mainlog">
+# <File "@localstatedir@/log/exim4/mainlog">
# Instance "exim"
# <Match>
# Regex "S=([1-9][0-9]*)"
@@ -1031,7 +1031,7 @@
@@ -1174,7 +1174,7 @@
# Type "kpackets_wire_per_sec.realtime"
# ValueFrom 4
# </Metric>
@@ -83,7 +95,7 @@ Fix default dirs.
# Instance "snort-eth0"
# Interval 600
# Collect "dropped" "mbps" "alerts" "kpps"
@@ -1068,7 +1068,7 @@
@@ -1231,7 +1231,7 @@
#</Plugin>
#<Plugin unixsock>

50
sysutils/collectd/patches/patch-src_network.c
View File

@@ -1,50 +0,0 @@
$NetBSD: patch-src_network.c,v 1.2 2014/06/14 12:21:02 fhajny Exp $
Remove libgcrypt deprecation logic. Patch by joerg.
--- src/network.c.orig 2014-01-26 08:09:23.000000000 +0000
+++ src/network.c
@@ -58,25 +58,7 @@
#endif
#if HAVE_LIBGCRYPT
-# include <pthread.h>
-# if defined __APPLE__
-/* default xcode compiler throws warnings even when deprecated functionality
- * is not used. -Werror breaks the build because of erroneous warnings.
- * http://stackoverflow.com/questions/10556299/compiler-warnings-with-libgcrypt-v1-5-0/12830209#12830209
- */
-# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-# endif
-/* FreeBSD's copy of libgcrypt extends the existing GCRYPT_NO_DEPRECATED
- * to properly hide all deprecated functionality.
- * http://svnweb.freebsd.org/ports/head/security/libgcrypt/files/patch-src__gcrypt.h.in
- */
-# define GCRYPT_NO_DEPRECATED
# include <gcrypt.h>
-# if defined __APPLE__
-/* Re enable deprecation warnings */
-# pragma GCC diagnostic warning "-Wdeprecated-declarations"
-# endif
-GCRY_THREAD_OPTION_PTHREAD_IMPL;
#endif
#ifndef IPV6_ADD_MEMBERSHIP
@@ -501,17 +483,9 @@ static void network_init_gcrypt (void) /
if (gcry_control (GCRYCTL_ANY_INITIALIZATION_P))
return;
- /* http://www.gnupg.org/documentation/manuals/gcrypt/Multi_002dThreading.html
- * To ensure thread-safety, it's important to set GCRYCTL_SET_THREAD_CBS
- * *before* initalizing Libgcrypt with gcry_check_version(), which itself must
- * be called before any other gcry_* function. GCRYCTL_ANY_INITIALIZATION_P
- * above doesn't count, as it doesn't implicitly initalize Libgcrypt.
- *
- * tl;dr: keep all these gry_* statements in this exact order please. */
- gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
gcry_check_version (NULL);
gcry_control (GCRYCTL_INIT_SECMEM, 32768);
- gcry_control (GCRYCTL_INITIALIZATION_FINISHED);
+ gcry_control (GCRYCTL_INITIALIZATION_FINISHED,NULL,0);
} /* }}} void network_init_gcrypt */
static gcry_cipher_hd_t network_get_aes256_cypher (sockent_t *se, /* {{{ */

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

@@ -1,8 +1,8 @@
$NetBSD: patch-src_tcpconns.c,v 1.3 2014/06/29 18:01:06 dholland Exp $
$NetBSD: patch-src_tcpconns.c,v 1.4 2015/06/10 20:05:26 fhajny Exp $
--- src/tcpconns.c.orig 2014-01-26 08:09:14.000000000 +0000
--- src/tcpconns.c.orig 2015-05-20 12:04:47.191035542 +0000
+++ src/tcpconns.c
@@ -893,6 +893,7 @@ static int conn_init (void)
@@ -948,6 +948,7 @@ static int conn_init (void)
return (0);
} /* int conn_init */
@@ -10,27 +10,3 @@ $NetBSD: patch-src_tcpconns.c,v 1.3 2014/06/29 18:01:06 dholland Exp $
static int conn_read (void)
{
struct inpcbtable table;
@@ -912,7 +913,11 @@ static int conn_read (void)
/* Get the `head' pcb */
head = (struct inpcb *) &(inpcbtable_ptr->inpt_queue);
/* Get the first pcb */
+#if __NetBSD_Version__ > 699002700
+ next = (struct inpcb *)TAILQ_FIRST (&table.inpt_queue);
+#else
next = (struct inpcb *)CIRCLEQ_FIRST (&table.inpt_queue);
+#endif
while (next != head)
{
@@ -920,7 +925,11 @@ static int conn_read (void)
kread ((u_long) next, &inpcb, sizeof (inpcb));
/* Advance `next' */
+#if __NetBSD_Version__ > 699002700
+ next = (struct inpcb *)TAILQ_NEXT (&inpcb, inp_queue);
+#else
next = (struct inpcb *)CIRCLEQ_NEXT (&inpcb, inp_queue);
+#endif
/* Ignore sockets, that are not connected. */
#ifdef __NetBSD__

15
sysutils/collectd/patches/patch-src_utils__dns.c Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-src_utils__dns.c,v 1.1 2015/04/07 13:20:41 fhajny Exp $
Resolve conflict with pkgsrc PCAP on NetBSD 7.
--- src/utils_dns.c.orig 2015-02-26 10:43:48.496180984 +0000
+++ src/utils_dns.c
@@ -96,6 +96,9 @@
#endif
#if HAVE_PCAP_H
+# if defined(DLT_MATCHING_MAX)
+# undef DLT_MATCHING_MAX
+# endif
# include <pcap.h>
#endif