From b6268b322f070fffa97a19f883b2cfea23984f50 Mon Sep 17 00:00:00 2001
From: Sertonix <sertonix@posteo.net>
Date: Tue, 29 Oct 2024 16:47:53 +0100
Subject: [PATCH] main/nagios: fix ownership of installed files/directories
The ownership of most files/directories was set to the nagios user/group
which meant that they had write access to a lot more files that they
should have.
Upstream disables the ownership change in the makefiles[0] and does them
manually which I have ported to the APKBUILD.
[0]: https://github.com/NagiosEnterprises/nagioscore/blob/f6f417eff033f70301d4b19f3e424695b8017734/nagios.spec#L156
---
main/nagios/APKBUILD | 11 +++++++----
main/nagios/permissions.patch | 16 ++++++++++++++++
2 files changed, 23 insertions(+), 4 deletions(-)
create mode 100644 main/nagios/permissions.patch
diff --git a/main/nagios/APKBUILD b/main/nagios/APKBUILD
index 3423b0ef4331..b6e582b8c02a 100644
--- a/main/nagios/APKBUILD
+++ b/main/nagios/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
pkgname=nagios
pkgver=4.5.7
-pkgrel=0
+pkgrel=1
pkgdesc="Popular monitoring tool"
url="https://www.nagios.org/"
arch="all"
@@ -12,6 +12,7 @@ depends="perl"
install="$pkgname.pre-install"
makedepends="gd-dev perl-dev libpng-dev libjpeg perl-net-snmp unzip openssl-dev>3"
source="https://downloads.sourceforge.net/nagios/nagios-$pkgver.tar.gz
+ permissions.patch
nagios.confd
nagios.initd
lighttpd-nagios.conf
@@ -47,9 +48,10 @@ build() {
}
package() {
- make DESTDIR="$pkgdir" install
- make DESTDIR="$pkgdir" install-config
- make DESTDIR="$pkgdir" install-commandmode
+ make DESTDIR="$pkgdir" INSTALL_OPTS="" COMMAND_OPTS="" \
+ install-unstripped install-config install-commandmode
+
+ chown -R nagios:nagios "$pkgdir"/etc/nagios "$pkgdir"/var/nagios
install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
@@ -69,6 +71,7 @@ apache() {
sha512sums="
c9e55ee65290f72ce3727df18f3416b3a9808c38f6c72120616812ea898ba5d626ce411a39ae97d85aad7fcfecf2435990e07cab5483cbba2ef9dfb1f4736b8b nagios-4.5.7.tar.gz
+b60e21572eef53f84bba312ef3289a4c85a6521f5c1e253cf32518685b7bbbe2d399bb5f136b2edf72ca36c67229ffd7a3cef627b52117ae759e6d8a968cadfd permissions.patch
8575902dcb7252f195847f9997b424c1ef9bee7dfacdd124c922fc119f583923c34847ce77c505783662d91f7290b1a85dc5e382ac50d177406bfb3876d4e40a nagios.confd
a004ed1cf8e7d9faeb849cd714095dbe5157c707618d2cce92c98c78604b896bb806b55aa69b2db8ca3e954bd629f9e3db5d2676015f87d6be5da32fa9ec5664 nagios.initd
6f1448db1964e378dbc7460a6d321638f4d0f7a08bc078824edca12fb6653fb0200b3be365fa519e7b2ff566802701878975bb97e65d65dc54d3da34dae21588 lighttpd-nagios.conf
diff --git a/main/nagios/permissions.patch b/main/nagios/permissions.patch
new file mode 100644
index 000000000000..173d019abea5
--- /dev/null
+++ b/main/nagios/permissions.patch
@@ -0,0 +1,16 @@
+Use standard permissions for binries
+
+--- a/base/Makefile.in
++++ b/base/Makefile.in
+@@ -189,8 +189,8 @@ install:
+ $(INSTALL) -s -m 774 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR)
+
+ install-unstripped:
+- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
+- $(INSTALL) -m 774 $(INSTALL_OPTS) nagios $(DESTDIR)$(BINDIR)
+- $(INSTALL) -m 774 $(INSTALL_OPTS) nagiostats $(DESTDIR)$(BINDIR)
++ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
++ $(INSTALL) -m 755 $(INSTALL_OPTS) nagios $(DESTDIR)$(BINDIR)
++ $(INSTALL) -m 755 $(INSTALL_OPTS) nagiostats $(DESTDIR)$(BINDIR)
+
+ .PHONY: libnagios
--
GitLab