CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

collectd: Upgrade to 5.4.1 and fix with glibc 2.20

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Khem Raj 2014-09-03 09:56:48 -07:00 committed by Martin Jansa
parent add0ba41de
commit 06e7054b9a
3 changed files with 111 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
meta-oe/recipes-extended/collectd/collectd/glibc-2.20-compatiblity.patch Normal file
View File

@ -0,0 +1,102 @@
This makes it forward compatible with glibc 2.20+ where _BSD_SOURCE
macro has been deprecated.
Fixes warnings like
usr/include/features.h:148:3: error: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Werror=cpp]
| # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Pending
Index: collectd-5.4.1/configure.ac
===================================================================
--- collectd-5.4.1.orig/configure.ac 2014-09-03 01:21:10.666084244 -0700
+++ collectd-5.4.1/configure.ac 2014-09-03 01:31:27.794084244 -0700
@@ -1288,6 +1288,7 @@
AC_CHECK_MEMBERS([struct udphdr.uh_dport, struct udphdr.uh_sport], [], [],
[#define _BSD_SOURCE
+#define _DEFAULT_SOURCE 1
#if HAVE_STDINT_H
# include <stdint.h>
#endif
@@ -1309,6 +1310,7 @@
])
AC_CHECK_MEMBERS([struct udphdr.dest, struct udphdr.source], [], [],
[#define _BSD_SOURCE
+#define _DEFAULT_SOURCE 1
#if HAVE_STDINT_H
# include <stdint.h>
#endif
Index: collectd-5.4.1/src/dns.c
===================================================================
--- collectd-5.4.1.orig/src/dns.c 2014-01-26 00:09:14.856391886 -0800
+++ collectd-5.4.1/src/dns.c 2014-09-03 01:32:37.666084244 -0700
@@ -22,6 +22,7 @@
**/
#define _BSD_SOURCE
+#define _DEFAULT_SOURCE 1
#include "collectd.h"
#include "common.h"
Index: collectd-5.4.1/src/exec.c
===================================================================
--- collectd-5.4.1.orig/src/exec.c 2014-01-26 00:09:14.860391963 -0800
+++ collectd-5.4.1/src/exec.c 2014-09-03 01:32:28.874084244 -0700
@@ -24,6 +24,7 @@
**/
#define _BSD_SOURCE /* For setgroups */
+#define _DEFAULT_SOURCE 1
#include "collectd.h"
#include "common.h"
Index: collectd-5.4.1/src/load.c
===================================================================
--- collectd-5.4.1.orig/src/load.c 2014-01-26 00:09:23.532559941 -0800
+++ collectd-5.4.1/src/load.c 2014-09-03 01:32:51.462084244 -0700
@@ -22,6 +22,7 @@
**/
#define _BSD_SOURCE
+#define _DEFAULT_SOURCE 1
#include "collectd.h"
#include "common.h"
Index: collectd-5.4.1/src/network.c
===================================================================
--- collectd-5.4.1.orig/src/network.c 2014-01-26 00:09:23.532559941 -0800
+++ collectd-5.4.1/src/network.c 2014-09-03 01:32:44.522084244 -0700
@@ -23,6 +23,7 @@
**/
#define _BSD_SOURCE /* For struct ip_mreq */
+#define _DEFAULT_SOURCE 1
#include "collectd.h"
#include "plugin.h"
Index: collectd-5.4.1/src/ntpd.c
===================================================================
--- collectd-5.4.1.orig/src/ntpd.c 2014-01-26 00:09:14.880392351 -0800
+++ collectd-5.4.1/src/ntpd.c 2014-09-03 01:32:20.350084244 -0700
@@ -20,6 +20,7 @@
**/
#define _BSD_SOURCE /* For NI_MAXHOST */
+#define _DEFAULT_SOURCE 1
#include "collectd.h"
#include "common.h"
Index: collectd-5.4.1/src/utils_dns.c
===================================================================
--- collectd-5.4.1.orig/src/utils_dns.c 2014-01-26 00:09:14.908392893 -0800
+++ collectd-5.4.1/src/utils_dns.c 2014-09-03 01:31:47.062084244 -0700
@@ -34,6 +34,7 @@
*/
#define _BSD_SOURCE
+#define _DEFAULT_SOURCE 1
#include "collectd.h"
#include "plugin.h"

10
meta-oe/recipes-extended/collectd/collectd/no-gcrypt-badpath.patch
View File

@ -7,11 +7,11 @@ Upstream-Status: Inappropriate [configuration]
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
diff --git a/configure.in b/configure.in
index 98395ed..81c3a2c 100644
--- a/configure.in
+++ b/configure.in
@@ -1777,11 +1777,11 @@ then
Index: collectd-5.4.1/configure.ac
===================================================================
--- collectd-5.4.1.orig/configure.ac 2014-09-03 01:20:22.062084244 -0700
+++ collectd-5.4.1/configure.ac 2014-09-03 01:20:22.058084244 -0700
@@ -1867,11 +1867,11 @@
GCRYPT_CPPFLAGS=`"$with_libgcrypt_config" --cflags 2>/dev/null`
fi

8
meta-oe/recipes-extended/collectd/collectd_5.2.2.bb → meta-oe/recipes-extended/collectd/collectd_5.4.1.bb
View File

@ -3,15 +3,15 @@ DESCRIPTION = "collectd is a daemon which collects system performance statistics
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
DEPENDS = "rrdtool curl mysql5 libpcap libxml2 yajl libgcrypt libtool"
DEPENDS = "rrdtool curl mysql5 libpcap libxml2 yajl libgcrypt libtool lvm2 libmnl"
SRC_URI = "http://collectd.org/files/collectd-${PV}.tar.bz2 \
file://no-gcrypt-badpath.patch \
file://collectd-version.patch \
file://glibc-2.20-compatiblity.patch \
file://collectd.init"
SRC_URI[md5sum] = "29e61411e51845d5ae71ab676078867e"
SRC_URI[sha256sum] = "7b8906d1c8866155b31820ef108be92abcee7fcd278d386bf0d449e704ba4696"
SRC_URI[md5sum] = "6f56c71c96573a7f4f7fb3bfab185974"
SRC_URI[sha256sum] = "75452129f271cb0aad28e57f12a49070618bbb7b6a9d64cf869e8766fa2f66e0"
inherit autotools pythonnative update-rc.d pkgconfig