[csw-devel] SF.net SVN: gar:[18508] csw/mgar/pkg/collectd/trunk
wahwah at users.sourceforge.net
wahwah at users.sourceforge.net
Sat Jun 23 01:16:34 CEST 2012
Revision: 18508
http://gar.svn.sourceforge.net/gar/?rev=18508&view=rev
Author: wahwah
Date: 2012-06-22 23:16:34 +0000 (Fri, 22 Jun 2012)
Log Message:
-----------
collectd/trunk: disable what fails, add overrides and deps
Modified Paths:
--------------
csw/mgar/pkg/collectd/trunk/Makefile
csw/mgar/pkg/collectd/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/collectd/trunk/files/0001-work-around-the-s_addr-macro.patch
Modified: csw/mgar/pkg/collectd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/collectd/trunk/Makefile 2012-06-22 20:47:01 UTC (rev 18507)
+++ csw/mgar/pkg/collectd/trunk/Makefile 2012-06-22 23:16:34 UTC (rev 18508)
@@ -1,31 +1,66 @@
# $Id$
-# TODO (release-critical prefixed with !, non release-critical with *)
#
NAME = collectd
-VERSION = 5.0.2
+VERSION = 5.1.0
GARTYPE = v2
CATEGORIES = server
-DESCRIPTION = Brief description
+DESCRIPTION = Collects sistema performance statistics periodically
define BLURB
- Long description
endef
MASTER_SITES = http://collectd.org/files/
DISTFILES = $(DISTNAME).tar.gz
PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+VENDOR_URL = http://collectd.org/
-# File name regex to get notifications about upstream software releases
-# NOTE: Use this only if the automatic regex creation
-# does not work for your package
-# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
+PATCHFILES += 0001-work-around-the-s_addr-macro.patch
-# If the url used to check for software update is different of MASTER_SITES, then
-# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES
-# UPSTREAM_MASTER_SITES =
+BUILD_DEP_PKGS += CSWlibgcrypt-dev
+EXTRA_CPPFLAGS = -DSOLARIS2=10 -D__EXTENSIONS__
-CONFIGURE_ARGS = $(DIRPATHS)
+GARCOMPILER = GNU
+CONFIGURE_ARGS += $(DIRPATHS)
+CONFIGURE_ARGS += --disable-dns
+CONFIGURE_ARGS += --disable-nfs
+CONFIGURE_ARGS += --disable-zfs_arc
+
+PACKAGES += CSWlibcollectdclient0
+PKGFILES_CSWlibcollectdclient0 += $(call baseisadirs,$(libdir),libcollectdclient\.so\.0(\.\d+)*)
+SPKG_DESC_CSWlibcollectdclient0 += $(DESCRIPTION), libcollectdclient.so.0
+RUNTIME_DEP_PKGS_CSWcollectd += CSWlibcollectdclient0
+RUNTIME_DEP_PKGS_CSWlibcollectdclient0 += CSWlibgcc-s1
+
+PACKAGES += CSWcollectd
+SPKG_DESC_CSWcollectd += $(DESCRIPTION)
+
+RUNTIME_DEP_PKGS_CSWcollectd += CSWlibltdl7
+RUNTIME_DEP_PKGS_CSWcollectd += CSWlibdbi1
+RUNTIME_DEP_PKGS_CSWcollectd += CSWlibssl1-0-0
+RUNTIME_DEP_PKGS_CSWcollectd += CSWlibz1
+RUNTIME_DEP_PKGS_CSWcollectd += CSWlibrrd-th4
+RUNTIME_DEP_PKGS_CSWcollectd += CSWlibgpg-error0
+RUNTIME_DEP_PKGS_CSWcollectd += CSWlibcurl4
+RUNTIME_DEP_PKGS_CSWcollectd += CSWlibgcrypt11
+RUNTIME_DEP_PKGS_CSWcollectd += CSWlibstatgrab6
+RUNTIME_DEP_PKGS_CSWcollectd += CSWlibpython2-6-1-0
+RUNTIME_DEP_PKGS_CSWcollectd += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWcollectd += CSWperl
+RUNTIME_DEP_PKGS_CSWcollectd += CSWlibganglia0
+RUNTIME_DEP_PKGS_CSWcollectd += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWcollectd += CSWlibidn11
+RUNTIME_DEP_PKGS_CSWcollectd += CSWlibpq5
+
+CHECKPKG_OVERRIDES_CSWcollectd += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/collectd.1
+CHECKPKG_OVERRIDES_CSWcollectd += file-with-bad-content|/usr/share|root/opt/csw/share/man/man5/collectd-unixsock.5
+
include gar/category.mk
+post-install-modulated:
+ ginstall -m 755 -d $(DESTDIR)/opt/csw/share/man/man3
+ cd $(DESTDIR); gmv -v opt/csw/man/man3/* opt/csw/share/man/man3
+ rmdir $(DESTDIR)/opt/csw/man/man3
+ grm -v $(DESTDIR)/opt/csw/lib/perl/*/perllocal.pod
+ $(MAKECOOKIE)
Modified: csw/mgar/pkg/collectd/trunk/checksums
===================================================================
--- csw/mgar/pkg/collectd/trunk/checksums 2012-06-22 20:47:01 UTC (rev 18507)
+++ csw/mgar/pkg/collectd/trunk/checksums 2012-06-22 23:16:34 UTC (rev 18508)
@@ -1 +1 @@
-6612c9722552a603667caede17703073 collectd-5.0.2.tar.gz
+adc58a0d448a359ecf737da9398898c6 collectd-5.1.0.tar.gz
Added: csw/mgar/pkg/collectd/trunk/files/0001-work-around-the-s_addr-macro.patch
===================================================================
--- csw/mgar/pkg/collectd/trunk/files/0001-work-around-the-s_addr-macro.patch (rev 0)
+++ csw/mgar/pkg/collectd/trunk/files/0001-work-around-the-s_addr-macro.patch 2012-06-22 23:16:34 UTC (rev 18508)
@@ -0,0 +1,57 @@
+From ccb4cb2d3a9b4ef7c8fbc4275f00acdc01abe02a Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Thu, 31 May 2012 16:21:57 +0200
+Subject: [PATCH] work around the s_addr macro
+
+---
+ src/utils_dns.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/utils_dns.c b/src/utils_dns.c
+index cfa4a5c..fcf7b43 100644
+--- a/src/utils_dns.c
++++ b/src/utils_dns.c
+@@ -449,7 +449,7 @@ handle_ipv6 (struct ip6_hdr *ipv6, int len)
+ unsigned int offset;
+ int nexthdr;
+
+- struct in6_addr s_addr;
++ struct in6_addr fluffy_kitten;
+ uint16_t payload_len;
+
+ if (0 > len)
+@@ -457,10 +457,10 @@ handle_ipv6 (struct ip6_hdr *ipv6, int len)
+
+ offset = sizeof (struct ip6_hdr);
+ nexthdr = ipv6->ip6_nxt;
+- s_addr = ipv6->ip6_src;
++ fluffy_kitten = ipv6->ip6_src;
+ payload_len = ntohs (ipv6->ip6_plen);
+
+- if (ignore_list_match (&s_addr))
++ if (ignore_list_match (&fluffy_kitten))
+ return (0);
+
+ /* Parse extension headers. This only handles the standard headers, as
+@@ -527,15 +527,15 @@ handle_ip(const struct ip *ip, int len)
+ {
+ char buf[PCAP_SNAPLEN];
+ int offset = ip->ip_hl << 2;
+- struct in6_addr s_addr;
++ struct in6_addr fluffy_kitten;
+ struct in6_addr d_addr;
+
+ if (ip->ip_v == 6)
+ return (handle_ipv6 ((void *) ip, len));
+
+- in6_addr_from_buffer (&s_addr, &ip->ip_src.s_addr, sizeof (ip->ip_src.s_addr), AF_INET);
++ in6_addr_from_buffer (&fluffy_kitten, &ip->ip_src.s_addr, sizeof (ip->ip_src.s_addr), AF_INET);
+ in6_addr_from_buffer (&d_addr, &ip->ip_dst.s_addr, sizeof (ip->ip_dst.s_addr), AF_INET);
+- if (ignore_list_match (&s_addr))
++ if (ignore_list_match (&fluffy_kitten))
+ return (0);
+ if (IPPROTO_UDP != ip->ip_p)
+ return 0;
+--
+1.7.10
+
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