This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, next has been updated via a32c219fa4642127a97050bf5af60a03e4e5c2f8 (commit) via 41b7369f8078d5dc4998483fa005b2f8e3b89624 (commit) via 854b63c42af8f82106b587dc43945ad848f8994e (commit) from a45bfbf1c5a8a7c10ad4bdcb5ed559ed38a796c5 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit a32c219fa4642127a97050bf5af60a03e4e5c2f8 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Apr 11 07:55:36 2019 +0100

zabbix_agentd: Bump package version

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 41b7369f8078d5dc4998483fa005b2f8e3b89624 Author: Alexander Koch ipfire@starkstromkonsument.de Date: Wed Apr 10 20:33:31 2019 +0200

zabbix_agentd: Bugfix for /etc/sudoers.d/zabbix.user

Files containing an '~' or '.' are ignored by sudo when placed in the includedir /etc/sudoers.d This makes the file useless. The file is renamed to "zabbix" instead of "zabbix.user" to fix this.

See: https://www.sudo.ws/man/1.8.13/sudoers.man.html#Including_other_files_from_w...

Signed-off-by: Alexander Koch ipfire@starkstromkonsument.de Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 854b63c42af8f82106b587dc43945ad848f8994e Author: Alexander Koch ipfire@starkstromkonsument.de Date: Wed Apr 10 20:33:30 2019 +0200

zabbix_agentd: update to 4.2.0

Relase Notes: https://www.zabbix.com/rn/rn4.2.0

Signed-off-by: Alexander Koch ipfire@starkstromkonsument.de Signed-off-by: Michael Tremer michael.tremer@ipfire.org

-----------------------------------------------------------------------

Summary of changes: config/backup/includes/zabbix_agentd | 2 +- config/rootfiles/packages/zabbix_agentd | 2 +- lfs/zabbix_agentd | 8 ++++---- src/paks/zabbix_agentd/update.sh | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-)

Difference in files: diff --git a/config/backup/includes/zabbix_agentd b/config/backup/includes/zabbix_agentd index b410dbe16..cba18d772 100644 --- a/config/backup/includes/zabbix_agentd +++ b/config/backup/includes/zabbix_agentd @@ -1,2 +1,2 @@ -/etc/sudoers.d/zabbix.user +/etc/sudoers.d/zabbix /etc/zabbix_agentd/* diff --git a/config/rootfiles/packages/zabbix_agentd b/config/rootfiles/packages/zabbix_agentd index db852381e..eaecf2644 100644 --- a/config/rootfiles/packages/zabbix_agentd +++ b/config/rootfiles/packages/zabbix_agentd @@ -1,6 +1,6 @@ etc/logrotate.d/zabbix_agentd etc/rc.d/init.d/zabbix_agentd -etc/sudoers.d/zabbix.user +etc/sudoers.d/zabbix etc/zabbix_agentd etc/zabbix_agentd/scripts etc/zabbix_agentd/zabbix_agentd.conf diff --git a/lfs/zabbix_agentd b/lfs/zabbix_agentd index b086d9f1a..23b77b930 100644 --- a/lfs/zabbix_agentd +++ b/lfs/zabbix_agentd @@ -24,7 +24,7 @@

include Config

-VER = 4.0.4 +VER = 4.2.0

THISAPP = zabbix-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = zabbix_agentd -PAK_VER = 1 +PAK_VER = 2 DEPS = ""

############################################################################### @@ -43,7 +43,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 46fdb83d4b24e13127a20a3e874b1d8f +$(DL_FILE)_MD5 = 20f261708f95787f3dbea3eab89f804d

install : $(TARGET)

@@ -108,7 +108,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))

# Install sudoers include file install -v -m 644 $(DIR_SRC)/config/zabbix_agentd/sudoers \ - /etc/sudoers.d/zabbix.user + /etc/sudoers.d/zabbix

# Install include file for backup install -v -m 644 $(DIR_SRC)/config/backup/includes/zabbix_agentd \ diff --git a/src/paks/zabbix_agentd/update.sh b/src/paks/zabbix_agentd/update.sh index 89c40d0d7..7fc1c96fb 100644 --- a/src/paks/zabbix_agentd/update.sh +++ b/src/paks/zabbix_agentd/update.sh @@ -24,3 +24,8 @@ . /opt/pakfire/lib/functions.sh ./uninstall.sh ./install.sh + +# Ensure /etc/sudoers.d/zabbix.user is renamed to /etc/sudoers.d/zabbix +if [ -e /etc/sudoers.d/zabbix.user ]; then + mv -v /etc/sudoers.d/zabbix.user /etc/sudoers.d/zabbix +fi

hooks/post-receive -- IPFire 2.x development tree