[zabbix/f14] Update for 1.8.8 Drop the ZBX-4099 patch, that's now obsolete Remove two further htaccess files and
Dan Horák
sharkcz at fedoraproject.org
Wed Oct 5 10:14:14 UTC 2011
commit 7882544d7b793613c8f75ba70a7d2f5e2ac5bd8e
Author: Dan Horák <dan at danny.cz>
Date: Wed Oct 5 12:13:36 2011 +0200
Update for 1.8.8
Drop the ZBX-4099 patch, that's now obsolete
Remove two further htaccess files and put the configuration in
the main configuration file
thanks to Volker Fröhlich for the changes above
move zabbix_get to the server and proxy subpackages (#734512)
remove prebuilt Windows binaries (#737341)
remove flash clock applet (#737337)
.gitignore | 1 +
sources | 2 +-
zabbix-1.8.7-zbx4099.patch | 37 -------------------------------------
zabbix-1.8.8-no-flash.patch | 11 +++++++++++
zabbix-web.conf | 18 ++++++++++++++++++
zabbix.spec | 40 +++++++++++++++++++++++++++++++++-------
6 files changed, 64 insertions(+), 45 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6a3a61a..d611ece 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ zabbix-1.8.2.tar.gz
/zabbix-1.8.5.tar.gz
/zabbix-1.8.6.tar.gz
/zabbix-1.8.7.tar.gz
+/zabbix-1.8.8.tar.gz
diff --git a/sources b/sources
index 60d6ca1..78e58c2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bfbc9a6aa8eaf5988b5dcd97ef5cbf39 zabbix-1.8.7.tar.gz
+8e38079640cf50c215f36dfd3125a6d3 zabbix-1.8.8.tar.gz
diff --git a/zabbix-1.8.8-no-flash.patch b/zabbix-1.8.8-no-flash.patch
new file mode 100644
index 0000000..b6796f8
--- /dev/null
+++ b/zabbix-1.8.8-no-flash.patch
@@ -0,0 +1,11 @@
+diff -up zabbix-1.8.8/frontends/php/include/screens.inc.php.no-flash zabbix-1.8.8/frontends/php/include/screens.inc.php
+--- zabbix-1.8.8/frontends/php/include/screens.inc.php.no-flash 2011-10-05 11:26:07.000000000 +0200
++++ zabbix-1.8.8/frontends/php/include/screens.inc.php 2011-10-05 11:26:30.000000000 +0200
+@@ -380,7 +380,6 @@ require_once('include/js.inc.php');
+ $form->addVar('screenid',$_REQUEST['screenid']);
+ // a-z order!!!
+ $cmbRes = new CCombobox('resourcetype',$resourcetype,'submit()');
+- $cmbRes->addItem(SCREEN_RESOURCE_CLOCK, S_CLOCK);
+ $cmbRes->addItem(SCREEN_RESOURCE_DATA_OVERVIEW, S_DATA_OVERVIEW);
+ $cmbRes->addItem(SCREEN_RESOURCE_GRAPH, S_GRAPH);
+ $cmbRes->addItem(SCREEN_RESOURCE_ACTIONS, S_HISTORY_OF_ACTIONS);
diff --git a/zabbix-web.conf b/zabbix-web.conf
index bf4f24a..f784ed8 100644
--- a/zabbix-web.conf
+++ b/zabbix-web.conf
@@ -11,6 +11,24 @@ Alias /zabbix /usr/share/zabbix
Allow from all
</Directory>
+<Directory "/usr/share/zabbix/conf">
+ Order deny,allow
+ Deny from all
+ <files *.php>
+ Order deny,allow
+ Deny from all
+ </files>
+</Directory>
+
+<Directory "/usr/share/zabbix/api">
+ Order deny,allow
+ Deny from all
+ <files *.php>
+ Order deny,allow
+ Deny from all
+ </files>
+</Directory>
+
<Directory "/usr/share/zabbix/include">
Order deny,allow
Deny from all
diff --git a/zabbix.spec b/zabbix.spec
index 8ee9a01..73517b9 100644
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -6,8 +6,8 @@
# various backup files (*.rpm{orig,new,save}, *~ etc) in that dir.
Name: zabbix
-Version: 1.8.7
-Release: 2%{?dist}
+Version: 1.8.8
+Release: 1%{?dist}
Summary: Open-source monitoring solution for your IT infrastructure
Group: Applications/Internet
@@ -27,8 +27,8 @@ Source8: zabbix_snmptrap.README
Patch0: zabbix-1.8.4-config.patch
# local rules for config files - fonts
Patch1: zabbix-1.8.4-fonts-config.patch
-# https://support.zabbix.com/browse/ZBX-4099
-Patch2: zabbix-1.8.7-zbx4099.patch
+# remove flash content (#737337)
+Patch2: zabbix-1.8.8-no-flash.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -252,7 +252,6 @@ Zabbix web frontend for SQLite
%prep
%setup0 -q
%patch0 -p1
-%patch2 -p0
# DejaVu fonts doesn't exist on EL <= 5
%if 0%{?fedora} || 0%{?rhel} >= 6
@@ -272,6 +271,8 @@ sed -i.orig -e 's|_LIBDIR=/usr/lib|_LIBDIR=%{_libdir}|g' \
# kill off .htaccess files, options set in SOURCE1
rm -f frontends/php/include/.htaccess
rm -f frontends/php/include/classes/.htaccess
+rm -f frontends/php/api/.htaccess
+rm -f frontends/php/conf/.htaccess
# set timestamp on modified config file and directories
touch -r frontends/php/css.css frontends/php/include/config.inc.php \
@@ -281,6 +282,19 @@ touch -r frontends/php/css.css frontends/php/include/config.inc.php \
cp -p %{SOURCE8} .
+# fix path to traceroute utility
+sed -i.orig -e 's|/usr/bin/traceroute|/bin/traceroute|' create/data/data.sql
+
+# FSF address is wrong
+# https://support.zabbix.com/browse/ZBX-4108
+
+# remove prebuild Windows binaries
+rm -rf bin
+
+# remove flash applet
+rm -f frontend/php/images/flash/zbxclock.swf
+%patch2 -p1
+
%build
@@ -537,6 +551,8 @@ fi
%attr(0755,zabbix,zabbix) %dir %{_sysconfdir}/zabbix/externalscripts
%config(noreplace) %{_sysconfdir}/logrotate.d/zabbix-server
%{_sysconfdir}/init.d/zabbix-server
+%{_bindir}/zabbix_get
+%{_mandir}/man1/zabbix_get.1*
%{_mandir}/man8/zabbix_server.8*
%files server-mysql
@@ -565,10 +581,8 @@ fi
%{_sbindir}/zabbix_agent
%{_sbindir}/zabbix_agentd
%{_bindir}/zabbix_sender
-%{_bindir}/zabbix_get
%{_bindir}/zabbix_snmptrap
%{_mandir}/man1/zabbix_sender.1*
-%{_mandir}/man1/zabbix_get.1*
%{_mandir}/man8/zabbix_agentd.8*
%files proxy
@@ -577,6 +591,8 @@ fi
%attr(0755,zabbix,zabbix) %dir %{_sysconfdir}/zabbix/externalscripts
%config(noreplace) %{_sysconfdir}/logrotate.d/zabbix-proxy
%{_sysconfdir}/init.d/zabbix-proxy
+%{_bindir}/zabbix_get
+%{_mandir}/man1/zabbix_get.1*
%{_mandir}/man8/zabbix_proxy.8*
%files proxy-mysql
@@ -612,6 +628,16 @@ fi
%changelog
+* Wed Oct 5 2011 Dan Horák <dan[at]danny.cz> - 1.8.8-1
+- Update for 1.8.8
+- Drop the ZBX-4099 patch, that's now obsolete
+- Remove two further htaccess files and put the configuration in
+ the main configuration file
+- thanks to Volker Fröhlich for the changes above
+- move zabbix_get to the server and proxy subpackages (#734512)
+- remove prebuilt Windows binaries (#737341)
+- remove flash clock applet (#737337)
+
* Fri Sep 9 2011 Dan Horák <dan[at]danny.cz> - 1.8.7-2
- fix server crash (ZBX-4099)
More information about the scm-commits
mailing list