From 96bf66753dc181a9ada43c5828ccd2cc7215762f Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Sat, 2 Jan 2010 12:14:14 +0000 Subject: [PATCH] [package] fix zabbix dependencies, remove whitespaces SVN-Revision: 18993 --- admin/zabbix/Makefile | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/admin/zabbix/Makefile b/admin/zabbix/Makefile index b48052591d..782c908e3e 100644 --- a/admin/zabbix/Makefile +++ b/admin/zabbix/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 2006 OpenWrt.org +# +# Copyright (C) 2006-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=zabbix PKG_VERSION:=1.6 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MD5SUM:=39d4c871439b1b4f0429964b4abbfc45 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz @@ -25,7 +25,7 @@ define Package/zabbix/Default TITLE:=Zabbix URL:=http://www.zabbix.com/ SUBMENU:=zabbix - DEPENDS:=libcurl + DEPENDS:=+libcurl endef define Package/zabbix-agent @@ -41,7 +41,7 @@ endef define Package/zabbix-server $(call Package/zabbix/Default) TITLE+= server - DEPENDS:=+libsqlite3 + DEPENDS += +libsqlite3 endef @@ -86,10 +86,10 @@ endef define Package/zabbix-agent/postinst #!/bin/sh - + name=zabbix id=53 - + # do not change below # check if we are on real system if [ -z "$${IPKG_INSTROOT}" ]; then @@ -108,16 +108,18 @@ if [ -z "$${IPKG_INSTROOT}" ]; then fi echo "" -if [ -z "$$(grep ^\\$${name}: $${IPKG_INSTROOT}/etc/group)" ]; then +if [ -z "$$(grep ^\\$${name}: $${IPKG_INSTROOT}/etc/group)" ]; then echo "adding group $$name to /etc/group" - echo "$${name}:x:$${id}:" >> $${IPKG_INSTROOT}/etc/group + echo "$${name}:x:$${id}:" >> $${IPKG_INSTROOT}/etc/group fi -if [ -z "$$(grep ^\\$${name}: $${IPKG_INSTROOT}/etc/passwd)" ]; then +if [ -z "$$(grep ^\\$${name}: $${IPKG_INSTROOT}/etc/passwd)" ]; then echo "adding user $$name to /etc/passwd" echo "$${name}:x:$${id}:$${id}:$${name}:/tmp/.$${name}:/bin/false" >> $${IPKG_INSTROOT}/etc/passwd fi +chown $${name} $${IPKG_INSTROOT}/etc/zabbix/zabbix_agentd.conf + endef define Package/zabbix-sender/install -- 2.30.2