From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 12 Apr 2015 20:44:50 +0000 (+0200)
Subject: collectd: Ignore errors from OpenVPN configuration file
X-Git-Tag: v2.17-core89~2^2
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=abd93c424197b8e0bd3dbc57fcef43cdfc0141ab;hp=79e7688b694a010246fae5b0bdb23eb92b3f19a0

collectd: Ignore errors from OpenVPN configuration file
---

diff --git a/lfs/collectd b/lfs/collectd
index 6f9c0e5153..1573e3874d 100644
--- a/lfs/collectd
+++ b/lfs/collectd
@@ -101,6 +101,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	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-{apple_sensors,csv,ipvs,mbmon,memcached,mysql} \
 		--disable-{netlink,nginx,nut,perl,serial,snmp,tape,vserver,xmms} \
diff --git a/src/patches/collectd/silence-openvpn-errors.patch b/src/patches/collectd/silence-openvpn-errors.patch
new file mode 100644
index 0000000000..c9097616c5
--- /dev/null
+++ b/src/patches/collectd/silence-openvpn-errors.patch
@@ -0,0 +1,13 @@
+diff --git a/src/openvpn.c b/src/openvpn.c
+index d446e9957b68..cc33eed61e25 100644
+--- a/src/openvpn.c
++++ b/src/openvpn.c
+@@ -567,7 +567,7 @@ static int openvpn_read (void)
+ 		read += vpn_read;
+ 	}
+ 
+-	return (read ? 0 : -1);
++	return 0;
+ } /* int openvpn_read */
+ 
+ static int version_detect (const char *filename)