zabbix_agentd: updated to 1.6.8 (changed layout a bit: see README and git diff for details)

zabbix_agentd/.footprint

@@ -2,15 +2,15 @@ drwxr-xr-x	root/root	etc/
 drwxr-xr-x	root/root	etc/rc.d/
 -rwxr-xr-x	root/root	etc/rc.d/zabbix_agentd
 drwxr-xr-x	root/root	etc/zabbix/
--rw-r--r--	root/root	etc/zabbix/zabbix_agentd.conf
+-rw-r-----	daemon/daemon	etc/zabbix/zabbix_agentd.conf
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/zabbix_agentd
 drwxr-xr-x	root/root	var/
 drwxr-xr-x	root/root	var/log/
-drwxr-xr-x	root/root	var/log/zabbix/
--rw-------	daemon/daemon	var/log/zabbix/zabbix_agentd.log (EMPTY)
--rw-------	daemon/daemon	var/log/zabbix/zabbix_agentd.log.old (EMPTY)
+drwx------	daemon/daemon	var/log/zabbix_agentd/
+-rw-------	daemon/daemon	var/log/zabbix_agentd/zabbix_agentd.log (EMPTY)
+-rw-------	daemon/daemon	var/log/zabbix_agentd/zabbix_agentd.log.old (EMPTY)
 drwxr-xr-x	root/root	var/run/
 drwx------	daemon/daemon	var/run/zabbix_agentd/
--rw-r--r--	daemon/daemon	var/run/zabbix_agentd/zabbix_agentd.pid (EMPTY)
+-rw-------	daemon/daemon	var/run/zabbix_agentd/zabbix_agentd.pid (EMPTY)

zabbix_agentd/.md5sum

@@ -1,3 +1,3 @@
-e1e15f3ab9f2c0ec9e6fde145a5a3b6e  zabbix-1.6.4.tar.gz
+3255afd2d44454bae3ec5158920a824f  zabbix-1.6.8.tar.gz
 bc2e7ce7694d32379188c547acd0b04e  zabbix_agentd
-227c924011d0cb56cebbf2b09b2b7c05  zabbix_agentd.conf
+6263862541a35aa1037db545909074d6  zabbix_agentd.conf

zabbix_agentd/Pkgfile

@@ -4,30 +4,29 @@
 # Depends on:
 
 name=zabbix_agentd
-version=1.6.4
+version=1.6.8
 release=1
-source=(http://dl.sourceforge.net/sourceforge/zabbix/zabbix-$version.tar.gz \
-		zabbix_agentd.conf zabbix_agentd)
-		#zabbix-cpustats.patch)
+source=(http://dl.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/$version/zabbix-$version.tar.gz \
+		$name.conf $name)
 
 build() {
 	cd zabbix-$version
-	#patch -p1 -i $SRC/zabbix-cpustats.patch
 	./configure --prefix=/usr \
 				--enable-agent
 	make
+	mkdir -p $PKG/{var/log/$name,var/run/$name,usr/bin}
 	
-	mkdir -p $PKG/{var/log/zabbix,var/run/zabbix_agentd,usr/bin}
+	touch $PKG/var/log/$name/{zabbix_agentd.log,zabbix_agentd.log.old}
+	chown -R daemon:daemon $PKG/var/log/$name
+	find $PKG/var/log/$name -type f | xargs chmod 600
+	find $PKG/var/log/$name -type d | xargs chmod 700
 	
-	touch $PKG/var/log/zabbix/{zabbix_agentd.log,zabbix_agentd.log.old}
-	chmod 600 $PKG/var/log/zabbix/*
-	chown -R daemon:daemon $PKG/var/log/zabbix/*
-	
-	touch $PKG/var/run/zabbix_agentd/zabbix_agentd.pid
-	chmod 700 $PKG/var/run/zabbix_agentd
-	chown -R daemon:daemon $PKG/var/run/zabbix_agentd
-	
-	install -m 755 src/zabbix_agent/zabbix_agentd $PKG/usr/bin
-	install -D -m 644 $SRC/zabbix_agentd.conf $PKG/etc/zabbix/zabbix_agentd.conf
-	install -D -m 755 $SRC/zabbix_agentd $PKG/etc/rc.d/zabbix_agentd
+	touch $PKG/var/run/$name/$name.pid
+	chown -R daemon:daemon $PKG/var/run/$name
+	find $PKG/var/run/$name -type f | xargs chmod 600
+	find $PKG/var/run/$name -type d | xargs chmod 700
+
+	install -m 755 src/zabbix_agent/$name $PKG/usr/bin
+	install -D -m 640 -o daemon -g daemon $SRC/$name.conf $PKG/etc/zabbix/$name.conf
+	install -D -m 755 $SRC/$name $PKG/etc/rc.d/$name
 }

zabbix_agentd/README

@@ -18,6 +18,12 @@ something useful.
 
 PRECAUTION
 Starting from version 1.6.3 linux agent suppports 'iowait', 'interrupt',
-'softirq' and 'steal' for 'system.cpu.util' out of the box.
+'softirq' and 'steal' for 'system.cpu.util' out of the box. The patch is no
+longer provided.
+
+After upgrading from version 1.6.4 log default file location was change,
+adjust /etc/zabbix/zabbix_agentd.conf file:
+ LogFile=/var/log/zabbix_agentd/zabbix_agentd.log
+and change it's permissions, and possibly delete old log dir.
 
 RESOURCES

zabbix_agentd/post-install

@@ -41,8 +41,9 @@ if [ -z `getent passwd | gawk -F: '{ print $1 }' | grep ^$ADD_USER$` ]; then
 fi
 
 # additional
-chown $ADD_USER:$ADD_GROUP /var/log/zabbix/zabbix_agentd.*
+chown -R $ADD_USER:$ADD_GROUP /var/log/zabbix_agentd
 chown -R $ADD_USER:$ADD_GROUP /var/run/zabbix_agentd
+chown $ADD_USER:$ADD_GROUP /etc/zabbix/zabbix_agentd.conf
 sed -i "s|su daemon -c /usr/bin/zabbix_agentd|su $ADD_USER -c /usr/bin/zabbix_agentd|" /etc/rc.d/zabbix_agentd
 
 exit $ADD_STATUS

zabbix_agentd/zabbix_agentd.conf

@@ -62,7 +62,7 @@ PidFile=/var/run/zabbix_agentd/zabbix_agentd.pid
 # Name of log file.
 # If not set, syslog will be used
 
-LogFile=/var/log/zabbix/zabbix_agentd.log
+LogFile=/var/log/zabbix_agentd/zabbix_agentd.log
 
 # Maximum size of log file in MB. Set to 0 to disable automatic log rotation.
 LogFileSize=10