[zabbix/f15] update to 1.8.12
Dan Horák
sharkcz at fedoraproject.org
Fri Apr 27 12:19:38 UTC 2012
commit fa1adee0488ebd8feb2e5380138c7615c8b8d22c
Author: Dan Horák <dan at danny.cz>
Date: Thu Apr 26 15:31:00 2012 +0200
update to 1.8.12
.gitignore | 1 +
sources | 2 +-
zabbix-1.8.12-fping3.patch | 39 +++++++++++++++++++++++++++++++++++++++
zabbix.spec | 8 +++++++-
4 files changed, 48 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d585d97..66ecccb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ zabbix-1.8.2.tar.gz
/zabbix-1.8.9.tar.gz
/zabbix-1.8.10.tar.gz
/zabbix-1.8.11.tar.gz
+/zabbix-1.8.12.tar.gz
diff --git a/sources b/sources
index 4c14273..11bcdfc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6b6ced84024f18f22ce5e0e902e91936 zabbix-1.8.11.tar.gz
+610b898e4a0560c924b9b5bf049e4254 zabbix-1.8.12.tar.gz
diff --git a/zabbix-1.8.12-fping3.patch b/zabbix-1.8.12-fping3.patch
new file mode 100644
index 0000000..db8c456
--- /dev/null
+++ b/zabbix-1.8.12-fping3.patch
@@ -0,0 +1,39 @@
+diff -up zabbix-1.8.12/src/libs/zbxicmpping/icmpping.c.fping3 zabbix-1.8.12/src/libs/zbxicmpping/icmpping.c
+--- zabbix-1.8.12/src/libs/zbxicmpping/icmpping.c.fping3 2012-04-24 16:31:36.000000000 +0200
++++ zabbix-1.8.12/src/libs/zbxicmpping/icmpping.c 2012-04-24 16:32:31.000000000 +0200
+@@ -42,34 +42,7 @@ static const char *source_ip6_option = N
+
+ static void get_source_ip_option(const char *fping, const char **option, unsigned char *checked)
+ {
+- FILE *f;
+- char *p, tmp[MAX_STRING_LEN];
+-
+- zbx_snprintf(tmp, sizeof(tmp), "%s -h 2>&1", fping);
+-
+- if (NULL == (f = popen(tmp, "r")))
+- return;
+-
+- while (NULL != fgets(tmp, sizeof(tmp), f))
+- {
+- for (p = tmp; isspace(*p); p++)
+- ;
+-
+- if ('-' == p[0] && 'I' == p[1] && isspace(p[2]))
+- {
+- *option = "-I";
+- break;
+- }
+-
+- if ('-' == p[0] && 'S' == p[1] && isspace(p[2]))
+- {
+- *option = "-S";
+- break;
+- }
+- }
+-
+- pclose(f);
+-
++ *option = "-S";
+ *checked = 1;
+ }
+
diff --git a/zabbix.spec b/zabbix.spec
index ce5c673..7328c33 100644
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -8,7 +8,7 @@
%global srcname zabbix
Name: zabbix
-Version: 1.8.11
+Version: 1.8.12
Release: 1%{?dist}
Summary: Open-source monitoring solution for your IT infrastructure
@@ -33,6 +33,8 @@ Patch0: zabbix-1.8.4-config.patch
Patch1: zabbix-1.8.4-fonts-config.patch
# remove flash content (#737337)
Patch2: zabbix-1.8.8-no-flash.patch
+# adapt for fping3 - https://support.zabbix.com/browse/ZBX-4894
+Patch3: zabbix-1.8.12-fping3.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -264,6 +266,7 @@ Zabbix web frontend for SQLite
# DejaVu fonts doesn't exist on EL <= 5
%if 0%{?fedora} || 0%{?rhel} >= 6
%patch1 -p1
+%patch3 -p1
# remove included fonts
rm -rf frontends/php/fonts
@@ -641,6 +644,9 @@ fi
%changelog
+* Tue Apr 24 2012 Dan Horák <dan[at]danny.cz> - 1.8.12-1
+- update to 1.8.12
+
* Wed Mar 21 2012 Dan Horák <dan[at]danny.cz> - 1.8.11-1
- update to 1.8.11
More information about the scm-commits
mailing list