Merge remote-tracking branch 'origin/master' into next

2026-04-26 10:52:57 +02:00 · 2015-04-12 22:53:06 +02:00
parent 040ec360f9 abd93c4241
commit d4ee6f0813
4 changed files with 29 additions and 20 deletions
--- a/src/patches/collectd/silence-openvpn-errors.patch
+++ 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)