SF.net SVN: gar:[25810] csw/mgar/pkg

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Thu Jul 7 21:06:28 CEST 2016


Revision: 25810
          http://sourceforge.net/p/gar/code/25810
Author:   dmichelsen
Date:     2016-07-07 19:06:26 +0000 (Thu, 07 Jul 2016)
Log Message:
-----------
riemann-c-client-algernon/trunk: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/riemann-c-client-algernon/
    csw/mgar/pkg/riemann-c-client-algernon/Makefile
    csw/mgar/pkg/riemann-c-client-algernon/branches/
    csw/mgar/pkg/riemann-c-client-algernon/tags/
    csw/mgar/pkg/riemann-c-client-algernon/trunk/
    csw/mgar/pkg/riemann-c-client-algernon/trunk/Makefile
    csw/mgar/pkg/riemann-c-client-algernon/trunk/checksums
    csw/mgar/pkg/riemann-c-client-algernon/trunk/files/
    csw/mgar/pkg/riemann-c-client-algernon/trunk/files/0001-Fix-conditional.patch
    csw/mgar/pkg/riemann-c-client-algernon/trunk/files/0001-Make-sure-stdin-is-not-defined.patch

Added: csw/mgar/pkg/riemann-c-client-algernon/Makefile
===================================================================
--- csw/mgar/pkg/riemann-c-client-algernon/Makefile	                        (rev 0)
+++ csw/mgar/pkg/riemann-c-client-algernon/Makefile	2016-07-07 19:06:26 UTC (rev 25810)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*

Index: csw/mgar/pkg/riemann-c-client-algernon/trunk
===================================================================
--- csw/mgar/pkg/riemann-c-client-algernon/trunk	2016-07-07 07:42:54 UTC (rev 25809)
+++ csw/mgar/pkg/riemann-c-client-algernon/trunk	2016-07-07 19:06:26 UTC (rev 25810)

Property changes on: csw/mgar/pkg/riemann-c-client-algernon/trunk
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+work
Added: csw/mgar/pkg/riemann-c-client-algernon/trunk/Makefile
===================================================================
--- csw/mgar/pkg/riemann-c-client-algernon/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/riemann-c-client-algernon/trunk/Makefile	2016-07-07 19:06:26 UTC (rev 25810)
@@ -0,0 +1,39 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = riemann-c-client
+VERSION = 1.9.0
+GARTYPE = v2
+
+DESCRIPTION = A C client library for the Riemann monitoring system
+
+MASTER_SITES = https://github.com/algernon/riemann-c-client/releases/download/riemann-c-client-1.9.0/
+DISTFILES  = $(DISTNAME).tar.xz
+
+PATCHFILES += 0001-Make-sure-stdin-is-not-defined.patch
+PATCHFILES += 0001-Fix-conditional.patch
+
+BUILD_DEP_PKGS += CSWlibjson-c-dev
+BUILD_DEP_PKGS += CSWlibcheck-dev
+BUILD_DEP_PKGS += CSWlibgnutls-dev
+
+PACKAGES += CSWlibriemann-client0
+SPKG_DESC_CSWlibriemann-client0 = A C client library for the Riemann monitoring system, libriemann-client.so.0
+PKGFILES_CSWlibriemann-client0 += $(call pkgfiles_lib,libriemann-client.so.0)
+PKGFILES_CSWlibriemann-client0 += $(bindir)/.*
+RUNTIME_DEP_PKGS_CSWlibriemann-client0 += CSWlibjson-c3
+RUNTIME_DEP_PKGS_CSWlibriemann-client0 += CSWlibgnutls28
+
+PACKAGES += CSWlibriemann-client-dev
+SPKG_DESC_CSWlibriemann-client-dev = Development files for libriemann-client.so.0
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWlibriemann-client-dev += CSWlibriemann-client0
+
+# For connect, getaddrinfo, freeaddrinfo
+EXTRA_LINKER_FLAGS += -lsocket -lnsl
+
+BUILD64 = 1
+CONFIGURE_ARGS = $(DIRPATHS)
+
+include gar/category.mk
+


Property changes on: csw/mgar/pkg/riemann-c-client-algernon/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: csw/mgar/pkg/riemann-c-client-algernon/trunk/checksums
===================================================================
--- csw/mgar/pkg/riemann-c-client-algernon/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/riemann-c-client-algernon/trunk/checksums	2016-07-07 19:06:26 UTC (rev 25810)
@@ -0,0 +1 @@
+5f6c7f99d772fac016efff35bac24dfb  riemann-c-client-1.9.0.tar.xz

Added: csw/mgar/pkg/riemann-c-client-algernon/trunk/files/0001-Fix-conditional.patch
===================================================================
--- csw/mgar/pkg/riemann-c-client-algernon/trunk/files/0001-Fix-conditional.patch	                        (rev 0)
+++ csw/mgar/pkg/riemann-c-client-algernon/trunk/files/0001-Fix-conditional.patch	2016-07-07 19:06:26 UTC (rev 25810)
@@ -0,0 +1,34 @@
+From df026fd83bf8220302bc885063d1f8fb2fbb4a81 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 7 Jul 2016 20:44:16 +0200
+Subject: [PATCH] Fix conditional
+
+---
+ lib/riemann/client.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/riemann/client.c b/lib/riemann/client.c
+index 61f9f80..ce8c019 100644
+--- a/lib/riemann/client.c
++++ b/lib/riemann/client.c
+@@ -224,7 +224,7 @@ riemann_client_connect_1_0 (riemann_client_t *client,
+   return riemann_client_connect (client, type, hostname, port);
+ }
+ 
+-#ifdef HAVE_VERSIONING
++#if HAVE_VERSIONING
+ __asm__(".symver riemann_client_connect_1_0,riemann_client_connect at RIEMANN_C_1.0");
+ #endif
+ 
+@@ -259,7 +259,7 @@ riemann_client_create_1_0 (riemann_client_type_t type,
+   return riemann_client_create (type, hostname, port);
+ }
+ 
+-#ifdef HAVE_VERSIONING
++#if HAVE_VERSIONING
+ __asm__(".symver riemann_client_create_1_0,riemann_client_create at RIEMANN_C_1.0");
+ #endif
+ 
+-- 
+2.4.0
+

Added: csw/mgar/pkg/riemann-c-client-algernon/trunk/files/0001-Make-sure-stdin-is-not-defined.patch
===================================================================
--- csw/mgar/pkg/riemann-c-client-algernon/trunk/files/0001-Make-sure-stdin-is-not-defined.patch	                        (rev 0)
+++ csw/mgar/pkg/riemann-c-client-algernon/trunk/files/0001-Make-sure-stdin-is-not-defined.patch	2016-07-07 19:06:26 UTC (rev 25810)
@@ -0,0 +1,26 @@
+From 695e5436da98a16d485c096ee7ba73e054485575 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 7 Jul 2016 20:41:29 +0200
+Subject: [PATCH] Make sure stdin is not defined
+
+---
+ src/cmd-send.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/cmd-send.c b/src/cmd-send.c
+index 8d61237..5df4292 100644
+--- a/src/cmd-send.c
++++ b/src/cmd-send.c
+@@ -138,6 +138,9 @@ client_send (int argc, char *argv[])
+     char *keyfn;
+     char *priorities;
+   } tls = {NULL, NULL, NULL, NULL};
++
++  /* Solaris has stdin defined somewhere */
++#undef stdin
+   int stdin = 0;
+ 
+   event = riemann_event_new ();
+-- 
+2.4.0
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list