X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fcollectd;h=1573e3874d718918914567e6de04b10b8473a3a8;hp=90564fe43d39399d368361127a22d5d2b2b8f726;hb=abd93c424197b8e0bd3dbc57fcef43cdfc0141ab;hpb=0f97f04409d8701dd2c722651b471ee9a94da5e4 diff --git a/lfs/collectd b/lfs/collectd index 90564fe43d..1573e3874d 100644 --- a/lfs/collectd +++ b/lfs/collectd @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -25,7 +25,7 @@ include Config PKG_NAME = collectd -VER = 4.3.0 +VER = 4.10.9 THISAPP = collectd-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -36,6 +36,8 @@ PROG = collectd DEPS = "" +CFLAGS += -Wno-error=deprecated-declarations + ############################################################################### # Top-level Rules ############################################################################### @@ -44,7 +46,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = ace292ba502f09379741e79561cf2c89 +$(DL_FILE)_MD5 = 980dd3387508f9ad209df04a6f7a126c install : $(TARGET) @@ -77,18 +79,45 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0001-src-utils_mount.h-Add-stdio.h.patch + cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0002-Don-t-notify-continuously-when-MySQL-slave-SQL-threa.patch + cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0003-curl_xml.c-avoid-using-uninitalized-variable-in-erro.patch + cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0004-interface.c-FreeBSD-10-support.patch + cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0005-Revert-curl_xml.c-avoid-using-uninitalized-variable-.patch + cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0006-network-set_thread_cbs-so-we-initialize-the-right-th.patch + cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0007-apache-plugin-Call-curl_global_init-from-the-init-fu.patch + cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0008-network-comment-libgcrypt-initalization-process.patch + cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0009-Call-curl_global_init-in-_init-of-plugins-using-curl.patch + cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0010-indent-wh_init-to-be-consistent-with-the-rest-of-the.patch + cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0011-Configparser-when-we-alocate-an-empty-list-we-also-n.patch + cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0012-don-t-assume-pkg-config-is-in-PATH.patch + cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0013-add-missing-backticks-which-broke-the-build.patch + cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0014-snmp-free-snmp_pdu-struct-allocated-by-snmp_pdu_crea.patch + cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0015-curl_xml-plugin-Fixed-tautological-pointer-compariso.patch + cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0016-Add-support-for-OpenVPN-2.3.0-status-files.patch + cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0017-openvpn-plugin-Don-t-signal-an-error-when-no-clients.patch + cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0018-openvpn-Remove-boguous-file-handler-check.patch + cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0019-openvpn-Ignore-not-fully-established-connections.patch + cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0020-openvpn-Make-read-functions-robust-like-in-8516f9abb.patch + cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0021-openvpn-Fix-copy-and-paste-error.patch + cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0022-openvpn-Change-data-type-from-COUNTER-to-DERIVE.patch + cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/silence-openvpn-errors.patch cd $(DIR_APP) && ./configure --prefix=/usr --localstatedir=/var \ - --disable-{apache,apple_sensors,csv,ipvs,memcached,mysql,netlink,nginx,nut} \ - --disable-{perl,serial,sensors,snmp,tape,vserver,wireless,xmms} \ + --disable-{apple_sensors,csv,ipvs,mbmon,memcached,mysql} \ + --disable-{netlink,nginx,nut,perl,serial,snmp,tape,vserver,xmms} \ + --disable-{perl,serial,snmp,tape,vserver,xmms} \ --enable-{apcups,battery,cpu{,freq},df,disk,dns,email,entropy,exec,hddtemp} \ - --enable-{interface,iptables,irq,load,logfile,mbmon,memory,multimeter} \ - --enable-{network,nfs,ntpd,ping,processes,rrdtool,swap,syslog} \ - --enable-{tcpconns,unixsock,users} \ - --with-rrdtool=/usr/share/rrdtool-1.2.15 --enable-debug + --enable-{interface,iptables,irq,load,logfile,memory,multimeter} \ + --enable-{network,nfs,ntpd,ping,processes,rrdtool,sensors,swap,syslog} \ + --enable-{tcpconns,unixsock,users,wireless} \ + --with-librrd=/usr/share/rrdtool-1.2.30 cd $(DIR_APP) && make install - cp -vf $(DIR_SRC)/config/collectd/collectd.conf /etc/ + cp -vf $(DIR_SRC)/config/collectd/collectd.* /etc/ + mv /etc/collectd.vpn /var/ipfire/ovpn/collectd.vpn + chown nobody.nobody /var/ipfire/ovpn/collectd.vpn + ln -f -s ../var/ipfire/ovpn/collectd.vpn /etc/collectd.vpn ln -f -s ../init.d/collectd /etc/rc.d/rc0.d/K50collectd - ln -f -s ../init.d/collectd /etc/rc.d/rc3.d/S20collectd + ln -f -s ../init.d/collectd /etc/rc.d/rc3.d/S29collectd ln -f -s ../init.d/collectd /etc/rc.d/rc6.d/K50collectd @rm -rf $(DIR_APP) @$(POSTBUILD)