commit: ca327875ba40a5d741c2dd1cf3e8e4d42d1102d5
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 16 11:31:32 2017 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Wed Aug 16 11:33:35 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca327875
net-analyzer/nagios-core: new version 4.3.3 using upstream's init script.
This new upstream version includes an OpenRC init script that makes
use of the build system for the nagios user and runtime paths. As a
result, we are able to drop the init/conf files that we've been using
in FILESDIR. The new version also writes its PID file before dropping
privileges, and combined with the new init script, that constitutes
a fix for CVE-2017-12847.
Gentoo-Bug: 621114
Package-Manager: Portage-2.3.6, Repoman-2.3.1
net-analyzer/nagios-core/Manifest | 2 +-
.../{nagios-core-4.3.2.ebuild => nagios-core-4.3.3.ebuild} | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/net-analyzer/nagios-core/Manifest
b/net-analyzer/nagios-core/Manifest
index 5e689a5128c..f1029f0cbd7 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,4 +1,4 @@
DIST nagios-3.5.1.tar.gz 1763584 SHA256
ca9dd68234fa090b3c35ecc8767b2c9eb743977eaf32612fa9b8341cc00a0f99 SHA512
48e2ecb91002b08203937b12a438c87c62cd3c5c401a0ed9e861cd6d79074c7017ed373e9379f013d87dea1fd7cb8e3d85112d55c87ac91aed96b256868c112d
WHIRLPOOL
2c02584702c64dbb0e353e34b758fab079eee0dc7a401e7b5947a21733758d3596401e5519e2dd7f05c89ee4835c21965d2718157fd9d6d3d20af9c853d688ca
DIST nagios-4.3.1.tar.gz 11095797 SHA256
dfc2f5f146eb508b2a28d28af7c338ef9eb604327efdc50142642026f7e79f82 SHA512
d5f1919e2b32b0b2f4c5766367f0992fcf9b1f6766f4d3386e15e318cc1f57cdae6bc07f09464fd8212bef1713948fcb25d233eab588438036f996b6c479c97e
WHIRLPOOL
72032e93802fd28db71bb5a10bba703a9508c587de69ff24ce302ad4fbbd93996b4800ceb7dd4f5648e2717377409cd7a66591f177e775da1c69444d528be1a2
-DIST nagios-4.3.2.tar.gz 11096863 SHA256
687814b40b03b40361377aeace057dddb23459ffb8c00434bc1a95b21ccdf796 SHA512
679e76f7a232b9b0dbbc2697f51b58d09ae3d3833e0e6922bb39d90768c81f2eb09b9ab36b7fdaeca893cebd93fc1edc1232f245498d4420980ba4659df60a31
WHIRLPOOL
27c1d479c6b8293e1a614721e891d7358f154d15f18c70ce9591ce1e16f459812fd37df65caf96d99aeaa19bb08cafe5b753f4754ec790795041030d3ff1e4d6
+DIST nagios-4.3.3.tar.gz 11101531 SHA256
1fc4c72f76c720884dd3b538dc423b44f3bdde24e014f4212e58046a1fc114b6 SHA512
588292a95342cb2d95d7b58f70442b82b99a23dd9fdc1390e9ae0743626a047e5127d77b1d7e6a1d8edd6f34a425e581bcd42459b673a0ddea14125bde4b7d9e
WHIRLPOOL
1452256a79190eae90076a9b50fdac3876557a6382d15d38a0c7930ec6d286c58e44220fee3243c9bcb1ae0ef337ddadd19e3552f02049959e69eaffd9fcd4a8
DIST nagios-core-gentoo-icons-20141125.tar 40960 SHA256
68b715f636eb291343cab3259862bbed8b6b898520b58df522438524de3d8761 SHA512
bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766
WHIRLPOOL
7ec3a944b2a659b456d3168818ca5b1af3a427436e6af2f3e5d6cba6fc7b1c7bad6f552301f064df31988865b3b32fd117d9e6f61c630d6d817a51cbbbcb331d
diff --git a/net-analyzer/nagios-core/nagios-core-4.3.2.ebuild
b/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
similarity index 98%
rename from net-analyzer/nagios-core/nagios-core-4.3.2.ebuild
rename to net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
index efcd6c2484c..650b8786d5d 100644
--- a/net-analyzer/nagios-core/nagios-core-4.3.2.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
@@ -114,7 +114,7 @@ src_compile() {
}
src_install() {
- dodoc Changelog INSTALLING LEGAL README.asciidoc UPGRADING
+ dodoc Changelog CONTRIBUTING.md README.asciidoc THANKS UPGRADING
emake DESTDIR="${D}" install-base
emake DESTDIR="${D}" install-basic
@@ -141,8 +141,7 @@ src_install() {
insopts --mode=0644 # Back to the default...
fi
- newinitd "${FILESDIR}"/nagios4-r1 nagios
- newconfd "${FILESDIR}"/conf.d nagios
+ newinitd openrc-init nagios
if use web ; then
if use apache2 ; then
