Merge branch 'master' of git+ssh://openadk.org/git/openadk

3 files changed, 54 insertions, 7 deletions

diff --git a/package/collectd/Makefile b/package/collectd/Makefile
index d37bb30ea..4203aace3 100644
--- a/package/collectd/Makefile
+++ b/package/collectd/Makefile
@@ -4,10 +4,10 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		collectd
-PKG_VERSION:=		5.4.0
+PKG_VERSION:=		5.4.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		d4176b3066f3b85d85343d3648ea43f6
-PKG_DESCR:=		System statistics collection daemon
+PKG_MD5SUM:=		6514ab3f7fd2135d2713f1ab25068841
+PKG_DESCR:=		system statistics collection daemon
 PKG_SECTION:=		misc
 PKG_BUILDDEP:=		libtool
 PKG_DEPENDS:=		libpthread libltdl
@@ -15,7 +15,7 @@ PKG_URL:=		http://collectd.org/
 PKG_SITES:=		http://collectd.org/files/
 
 PKG_FLAVOURS_COLLECTD:=	WITH_CPU WITH_LOAD WITH_MEMORY WITH_PING
-PKG_FLAVOURS_COLLECTD+=	WITH_RRD
+PKG_FLAVOURS_COLLECTD+=	WITH_RRD WITH_NETWORK WITH_UPTIME
 PKGFD_WITH_RRD:=	enable RRD output
 PKGFB_WITH_RRD:=	rrdtool
 PKGFS_WITH_RRD:=	librrd
@@ -23,6 +23,8 @@ PKGFD_WITH_CPU:=	collect CPU statistics
 PKGFD_WITH_LOAD:=	collect system load statistics
 PKGFD_WITH_MEMORY:=	collect memory usage statistics
 PKGFD_WITH_PING:=	enable ping statistic plugin
+PKGFD_WITH_NETWORK:=	enable network statistic plugin
+PKGFD_WITH_UPTIME:=	enable uptime statistic plugin
 
 include ${TOPDIR}/mk/package.mk
 
@@ -40,6 +42,12 @@ endif
 ifneq (${ADK_PACKAGE_COLLECTD_WITH_PING},y)
 DISABLE_PING:=--disable-ping
 endif
+ifneq (${ADK_PACKAGE_COLLECTD_WITH_NETWORK},y)
+DISABLE_NETWORK:=--disable-network
+endif
+ifneq (${ADK_PACKAGE_COLLECTD_WITH_UPTIME},y)
+DISABLE_UPTIME:=--disable-uptime
+endif
 
 CONFIGURE_ARGS+=	--disable-aggregation \
 			--disable-apache \
@@ -75,7 +83,7 @@ CONFIGURE_ARGS+=	--disable-aggregation \
 			${DISABLE_MEMORY} \
 			--disable-multimeter \
 			--disable-mysql \
-			--disable-network \
+			${DISABLE_NETWORK} \
 			--disable-nginx \
 			--disable-nfs \
 			--disable-ntpd \
@@ -106,7 +114,7 @@ CONFIGURE_ARGS+=	--disable-aggregation \
 			--disable-thermal \
 			--disable-unixsock \
 			--disable-users \
-			--disable-uptime \
+			${DISABLE_UPTIME} \
 			--disable-uuid \
 			--disable-vserver \
 			--disable-wireless \
@@ -118,7 +126,6 @@ CONFIGURE_ARGS+=	--disable-aggregation \
 			--without-libiptc \
 			--with-nan-emulation
 
-TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 XAKE_FLAGS+=		LIBS='-lm -lltdl'
 
 collectd-install:
diff --git a/package/collectd/patches/patch-configure b/package/collectd/patches/patch-configure
new file mode 100644
index 000000000..41e8e65c7
--- /dev/null
+++ b/package/collectd/patches/patch-configure
@@ -0,0 +1,29 @@
+--- collectd-5.4.1.orig/configure	2014-01-26 09:10:00.000000000 +0100
++++ collectd-5.4.1/configure	2014-04-10 16:56:47.000000000 +0200
+@@ -16812,7 +16812,7 @@ SAVE_CFLAGS="$CFLAGS"
+ # Emulate behavior of src/Makefile.am
+ if test "x$GCC" = "xyes"
+ then
+-	CFLAGS="$CFLAGS -Wall -Werror"
++	CFLAGS="$CFLAGS -Wall"
+ fi
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strtok_r" >&5
+@@ -17388,7 +17388,7 @@ done
+ if test "x$GCC" = "xyes"
+ then
+ 	SAVE_CFLAGS="$CFLAGS"
+-	CFLAGS="$CFLAGS -Wall -Wextra -Werror"
++	CFLAGS="$CFLAGS -Wall -Wextra"
+ fi
+ 
+ for ac_func in strptime
+@@ -23057,7 +23057,7 @@ then
+ 	SAVE_LDFLAGS="$LDFLAGS"
+ 	# trigger an error if Perl_load_module*() uses __attribute__nonnull__(3)
+ 	# (see issues #41 and #42)
+-	CFLAGS="$CFLAGS $PERL_CFLAGS -Wall -Werror"
++	CFLAGS="$CFLAGS $PERL_CFLAGS -Wall"
+ 	LDFLAGS="$LDFLAGS $PERL_LDFLAGS"
+ 
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken Perl_load_module()" >&5
diff --git a/package/collectd/patches/patch-src_Makefile_in b/package/collectd/patches/patch-src_Makefile_in
new file mode 100644
index 000000000..e35859cfb
--- /dev/null
+++ b/package/collectd/patches/patch-src_Makefile_in
@@ -0,0 +1,11 @@
+--- collectd-5.4.1.orig/src/Makefile.in	2014-01-26 09:09:56.000000000 +0100
++++ collectd-5.4.1/src/Makefile.in	2014-04-10 19:13:47.000000000 +0200
+@@ -2235,7 +2235,7 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = libcollectdclient $(am__append_1)
+-@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall -Werror
++@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall
+ AM_CPPFLAGS = -DPREFIX='"${prefix}"' \
+ 	-DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \
+ 	-DLOCALSTATEDIR='"${localstatedir}"' \