bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[pacakges] collectd: Update to v4.10.7

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@31308 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
acinonyx 2012-04-16 12:35:17 +00:00
parent 5ab6c8ccb6
commit 3d692c88c1
4 changed files with 7 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
utils/collectd/Makefile
View File

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=collectd PKG_NAME:=collectd
PKG_VERSION:=4.10.6 PKG_VERSION:=4.10.7
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://collectd.org/files/ PKG_SOURCE_URL:=http://collectd.org/files/
PKG_MD5SUM:=d446c399d839a32f2f581111d7256f8b PKG_MD5SUM:=f4193fdb5002ddac8159c88032a726bc
PKG_FIXUP:=autoreconf PKG_FIXUP:=autoreconf
PKG_REMOVE_FILES:=aclocal.m4 libltdl/aclocal.m4 PKG_REMOVE_FILES:=aclocal.m4 libltdl/aclocal.m4

22
utils/collectd/patches/002-fix-ltdl-linking.patch
View File

@ -1,22 +0,0 @@
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -85,7 +85,7 @@ endif
if BUILD_WITH_OWN_LIBOCONFIG
collectd_LDADD += $(LIBLTDL) liboconfig/liboconfig.la
-collectd_DEPENDENCIES += $(LIBLTDL) liboconfig/liboconfig.la
+collectd_DEPENDENCIES += liboconfig/liboconfig.la
else
collectd_LDADD += -loconfig
endif
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -57,7 +57,7 @@ bin_PROGRAMS = collectd-nagios$(EXEEXT)
@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_13 = $(BUILD_WITH_LIBSTATGRAB_CFLAGS)
@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_14 = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
@BUILD_WITH_OWN_LIBOCONFIG_TRUE@am__append_15 = $(LIBLTDL) liboconfig/liboconfig.la
-@BUILD_WITH_OWN_LIBOCONFIG_TRUE@am__append_16 = $(LIBLTDL) liboconfig/liboconfig.la
+@BUILD_WITH_OWN_LIBOCONFIG_TRUE@am__append_16 = liboconfig/liboconfig.la
@BUILD_WITH_OWN_LIBOCONFIG_FALSE@am__append_17 = -loconfig
@BUILD_WITH_LIBSOCKET_TRUE@am__append_18 = -lsocket
@BUILD_AIX_TRUE@am__append_19 = -lm

2
utils/collectd/patches/200-fix-git-describe-error.patch
View File

@ -2,7 +2,7 @@
+++ b/version-gen.sh +++ b/version-gen.sh
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
DEFAULT_VERSION="4.10.6.git" DEFAULT_VERSION="4.10.7.git"
-VERSION="`git describe 2> /dev/null | sed -e 's/^collectd-//'`" -VERSION="`git describe 2> /dev/null | sed -e 's/^collectd-//'`"
+#VERSION="`git describe 2> /dev/null | sed -e 's/^collectd-//'`" +#VERSION="`git describe 2> /dev/null | sed -e 's/^collectd-//'`"

8
utils/collectd/patches/900-add-iwinfo-plugin.patch
View File

@ -10,7 +10,7 @@
# #
# Checks for typedefs, structures, and compiler characteristics. # Checks for typedefs, structures, and compiler characteristics.
# #
@@ -4006,6 +4009,7 @@ plugin_interface="no" @@ -4008,6 +4011,7 @@ plugin_interface="no"
plugin_ipmi="no" plugin_ipmi="no"
plugin_ipvs="no" plugin_ipvs="no"
plugin_irq="no" plugin_irq="no"
@ -18,7 +18,7 @@
plugin_libvirt="no" plugin_libvirt="no"
plugin_load="no" plugin_load="no"
plugin_memory="no" plugin_memory="no"
@@ -4313,6 +4317,7 @@ AC_PLUGIN([ipmi], [$plugin_ipmi], @@ -4315,6 +4319,7 @@ AC_PLUGIN([ipmi], [$plugin_ipmi],
AC_PLUGIN([iptables], [$with_libiptc], [IPTables rule counters]) AC_PLUGIN([iptables], [$with_libiptc], [IPTables rule counters])
AC_PLUGIN([ipvs], [$plugin_ipvs], [IPVS connection statistics]) AC_PLUGIN([ipvs], [$plugin_ipvs], [IPVS connection statistics])
AC_PLUGIN([irq], [$plugin_irq], [IRQ statistics]) AC_PLUGIN([irq], [$plugin_irq], [IRQ statistics])
@ -26,7 +26,7 @@
AC_PLUGIN([java], [$with_java], [Embed the Java Virtual Machine]) AC_PLUGIN([java], [$with_java], [Embed the Java Virtual Machine])
AC_PLUGIN([libvirt], [$plugin_libvirt], [Virtual machine statistics]) AC_PLUGIN([libvirt], [$plugin_libvirt], [Virtual machine statistics])
AC_PLUGIN([load], [$plugin_load], [System load]) AC_PLUGIN([load], [$plugin_load], [System load])
@@ -4591,6 +4596,7 @@ Configuration: @@ -4593,6 +4598,7 @@ Configuration:
protobuf-c . . . . . $have_protoc_c protobuf-c . . . . . $have_protoc_c
oracle . . . . . . . $with_oracle oracle . . . . . . . $with_oracle
python . . . . . . . $with_python python . . . . . . . $with_python
@ -34,7 +34,7 @@
Features: Features:
daemon mode . . . . . $enable_daemon daemon mode . . . . . $enable_daemon
@@ -4630,6 +4636,7 @@ Configuration: @@ -4632,6 +4638,7 @@ Configuration:
iptables . . . . . . $enable_iptables iptables . . . . . . $enable_iptables
ipvs . . . . . . . . $enable_ipvs ipvs . . . . . . . . $enable_ipvs
irq . . . . . . . . . $enable_irq irq . . . . . . . . . $enable_irq