Import of pkgsrc-2015Q1

sysutils/collectd/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2014/02/17 11:21:54 fhajny Exp $
-#
+# $NetBSD: Makefile,v 1.3 2014/07/30 12:28:18 fhajny Exp $
 
 .include "../../sysutils/collectd/Makefile.common"
 
+PKGREVISION=	2
 COMMENT=	Statistics collection daemon base
 
 RCD_SCRIPTS=	collectd

sysutils/collectd/Makefile.common

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2014/02/17 11:21:54 fhajny Exp $
+# $NetBSD: Makefile.common,v 1.5 2015/02/24 13:14:05 fhajny Exp $
 #
 # used by sysutils/collectd/Makefile
 # used by sysutils/collectd-amqp/Makefile
@@ -24,7 +24,7 @@ LICENSE=	gnu-gpl-v2
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 USE_TOOLS+=		pkg-config
-USE_LANGUAGES=		c c++
+USE_LANGUAGES=		c c99 c++
 
 DISTINFO_FILE=		${.CURDIR}/../../sysutils/collectd/distinfo
 PATCHDIR=		${.CURDIR}/../../sysutils/collectd/patches
@@ -32,7 +32,7 @@ PATCHDIR=		${.CURDIR}/../../sysutils/collectd/patches
 .if !empty(COLLECTD_PACKAGE)
 PKGNAME?=		${DISTNAME:S/collectd/collectd-${COLLECTD_PACKAGE}/}
 
-DEPENDS+=		${DISTNAME}:../../sysutils/collectd
+DEPENDS+=		collectd>=${PKGVERSION_NOREV}:../../sysutils/collectd
 
 COLLECTD_PLUGINS?=	${COLLECTD_PACKAGE:S/-/_/}
 
@@ -66,7 +66,13 @@ CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
 CONFIGURE_ARGS+=	--with-ltdl-lib=${BUILDLINK_PREFIX.libltdl}/lib
 CONFIGURE_ARGS+=	--with-ltdl-include=${BUILDLINK_PREFIX.libltdl}/include
 
-CPPFLAGS.SunOS+=	-D__EXTENSIONS__ -DSOLARIS2=11
+CPPFLAGS.SunOS+=	-DSOLARIS2=${OS_VERSION:C/5.//}
+
+.include "../../mk/compiler.mk"
+.if !empty(PKGSRC_COMPILER:Mclang)
+CFLAGS+=	-Wno-error=tautological-pointer-compare
+
+.endif
 
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"

sysutils/collectd/distinfo

@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2014/02/23 16:34:27 mspo Exp $
+$NetBSD: distinfo,v 1.5 2015/03/19 13:50:30 jperkin Exp $
 
 SHA1 (collectd-5.4.1.tar.gz) = faaccac4daf48449bcefc9d6f9236f98a5dd5b4b
 RMD160 (collectd-5.4.1.tar.gz) = a98ff2d845238d4792f732aa7518effdc95e24f9
@@ -6,9 +6,10 @@ Size (collectd-5.4.1.tar.gz) = 1894132 bytes
 SHA1 (patch-Makefile.in) = 197307399312fa26c71ca168b92bbe41d31d556d
 SHA1 (patch-configure) = 34bb022fbe3b3b072a6ea5d86de0711a37ebfa0f
 SHA1 (patch-src_Makefile.in) = 3d227fa1c483944f44b11e49cabb6390ab3b8338
+SHA1 (patch-src_collectd-tg.c) = f9f41dfb0b1b55a62202128a165d5c9943faf5bc
 SHA1 (patch-src_collectd.c) = 31106ca27dd4911c40285fece48f76a1c36e2407
 SHA1 (patch-src_collectd.conf.in) = 97400dbc16a31a440750beed0bc16927afdcb570
 SHA1 (patch-src_df.c) = 19cca888b183a90759b359702e4d65c8afa6e58d
 SHA1 (patch-src_libcollectclient_network__buffer.c) = e07d403d299613fa0885a0e7285849eb85510253
-SHA1 (patch-src_network.c) = 03ed5169903bb579470e77228400dec077ff16cb
-SHA1 (patch-src_tcpconns.c) = 7aa5fa63e0d3b60a298f9db6392698c6e456a786
+SHA1 (patch-src_network.c) = b07c206406642b37788dd8d0aefe437158473b97
+SHA1 (patch-src_tcpconns.c) = a1ad8fa2eb9e899375b7b99d12becb4e98ac4e10

sysutils/collectd/files/smf/manifest.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
+<service_bundle type='manifest' name='collectd'>
+  <service name='@SMF_PREFIX@/@SMF_NAME@' type='service' version='1'>
+    <create_default_instance enabled='false' />
+    <single_instance />
+    <dependency name='network' grouping='require_all' restart_on='none' type='service'>
+      <service_fmri value='svc:/milestone/network:default' />
+    </dependency>
+    <dependency name='filesystem-local' grouping='require_all' restart_on='none' type='service'>
+      <service_fmri value='svc:/system/filesystem/local:default' />
+    </dependency>
+    <exec_method type='method' name='start' exec='@PREFIX@/sbin/collectd' timeout_seconds='60'>
+      <method_context>
+        <method_credential user='root' group='root' />
+      </method_context>
+    </exec_method>
+    <exec_method type='method' name='stop' exec=':kill' timeout_seconds='60'>
+      <method_context>
+        <method_credential user='root' group='root' />
+      </method_context>
+    </exec_method>
+    <property_group name='startd' type='framework'>
+      <propval name="duration" type="astring" value="contract" />
+      <!-- sub-process core dumps shouldn't restart session -->
+      <propval name='ignore_error' type='astring' value='core,signal' />
+    </property_group>
+    <stability value='Evolving' />
+  </service>
+</service_bundle>

sysutils/collectd/patches/patch-src_collectd-tg.c

@@ -0,0 +1,19 @@
+$NetBSD: patch-src_collectd-tg.c,v 1.1 2015/03/19 13:50:30 jperkin Exp $
+
+Don't go past _XOPEN_SOURCE=600 on SunOS.
+
+--- src/collectd-tg.c.orig	2014-01-26 08:09:14.836391498 +0000
++++ src/collectd-tg.c
+@@ -32,8 +32,12 @@
+ #endif
+ 
+ #ifndef _XOPEN_SOURCE
++#ifdef __sun
++# define _XOPEN_SOURCE 600
++#else
+ # define _XOPEN_SOURCE 700
+ #endif
++#endif
+ 
+ #if !__GNUC__
+ # define __attribute__(x) /**/

sysutils/collectd/patches/patch-src_network.c

@@ -1,23 +1,50 @@
-$NetBSD: patch-src_network.c,v 1.1 2014/02/17 11:21:55 fhajny Exp $
+$NetBSD: patch-src_network.c,v 1.2 2014/06/14 12:21:02 fhajny Exp $
 
-Need the workaround on at least SunOS too.
---- src/network.c.orig	2014-01-26 08:09:23.532559941 +0000
+Remove libgcrypt deprecation logic. Patch by joerg.
+--- src/network.c.orig	2014-01-26 08:09:23.000000000 +0000
 +++ src/network.c
-@@ -59,7 +59,7 @@
+@@ -58,25 +58,7 @@
+ #endif
  
  #if HAVE_LIBGCRYPT
- # include <pthread.h>
+-# include <pthread.h>
 -# if defined __APPLE__
-+# if defined(__APPLE__) || defined(__sun)
- /* 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
-@@ -72,7 +72,7 @@
-  */
- # define GCRYPT_NO_DEPRECATED
+-/* 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__
-+# if defined(__APPLE__) || defined(__sun)
- /* Re enable deprecation warnings */
- #  pragma GCC diagnostic warning "-Wdeprecated-declarations"
- # endif
+-/* 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, /* {{{ */

sysutils/collectd/patches/patch-src_tcpconns.c

@@ -1,4 +1,4 @@
-$NetBSD: patch-src_tcpconns.c,v 1.1 2014/02/23 16:34:27 mspo Exp $
+$NetBSD: patch-src_tcpconns.c,v 1.3 2014/06/29 18:01:06 dholland Exp $
 
 --- src/tcpconns.c.orig	2014-01-26 08:09:14.000000000 +0000
 +++ src/tcpconns.c
@@ -14,7 +14,7 @@ $NetBSD: patch-src_tcpconns.c,v 1.1 2014/02/23 16:34:27 mspo Exp $
    /* Get the `head' pcb */
    head = (struct inpcb *) &(inpcbtable_ptr->inpt_queue);
    /* Get the first pcb */
-+#if __NetBSD_Version__ > 600000000
++#if __NetBSD_Version__ > 699002700
 +  next = (struct inpcb *)TAILQ_FIRST (&table.inpt_queue);
 +#else
    next = (struct inpcb *)CIRCLEQ_FIRST (&table.inpt_queue);
@@ -26,7 +26,7 @@ $NetBSD: patch-src_tcpconns.c,v 1.1 2014/02/23 16:34:27 mspo Exp $
      kread ((u_long) next, &inpcb, sizeof (inpcb));
  
      /* Advance `next' */
-+#if __NetBSD_Version__ > 600000000
++#if __NetBSD_Version__ > 699002700
 +    next = (struct inpcb *)TAILQ_NEXT (&inpcb, inp_queue);
 +#else
      next = (struct inpcb *)CIRCLEQ_NEXT (&inpcb, inp_queue);