[gentoo-commits] repo/gentoo:master commit in: net-analyzer/munin/files/, net-analyzer/munin/
commit: 8e7e40556dc04e37a5787a12e65df13e1e9f4535
Author: Hans de Graaff gentoo org>
AuthorDate: Sun Sep 8 07:30:23 2024 +
Commit: Hans de Graaff gentoo org>
CommitDate: Sun Sep 8 07:31:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e7e4055
net-analyzer/munin: fix logrotate file
Closes: https://bugs.gentoo.org/939104
Signed-off-by: Hans de Graaff gentoo.org>
net-analyzer/munin/files/logrotate.d-munin.4 | 33 +++
net-analyzer/munin/munin-2.0.76-r2.ebuild| 418 +++
2 files changed, 451 insertions(+)
diff --git a/net-analyzer/munin/files/logrotate.d-munin.4
b/net-analyzer/munin/files/logrotate.d-munin.4
new file mode 100644
index ..8bbb6422620b
--- /dev/null
+++ b/net-analyzer/munin/files/logrotate.d-munin.4
@@ -0,0 +1,33 @@
+/var/log/munin/munin-node.log {
+ daily
+ missingok
+ rotate 7
+ compress
+ delaycompress
+ notifempty
+ create 640 root root
+ postrotate
+ test -e /run/openrc/softlevel && /etc/init.d/munin-node restart
1>/dev/null || true
+ test -e /run/systemd/system && systemctl restart munin-node
1>/dev/null || true
+ endscript
+}
+
+/var/log/munin/munin-update.log /var/log/munin/munin-graph.log
/var/log/munin/munin-html.log /var/log/munin/munin-limits.log {
+ daily
+ missingok
+ rotate 7
+ compress
+ delaycompress
+ notifempty
+ nocreate
+}
+
+/var/log/munin/munin-cgi-graph.log /var/log/munin/munin-cgi-html.log {
+ daily
+ missingok
+ rotate 7
+ compress
+ delaycompress
+ notifempty
+ create 640 @CGIUSER@ root
+}
diff --git a/net-analyzer/munin/munin-2.0.76-r2.ebuild
b/net-analyzer/munin/munin-2.0.76-r2.ebuild
new file mode 100644
index ..f6324e0b6c78
--- /dev/null
+++ b/net-analyzer/munin/munin-2.0.76-r2.ebuild
@@ -0,0 +1,418 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PATCHSET=1
+
+inherit java-pkg-opt-2 systemd tmpfiles
+
+MY_P=${P/_/-}
+
+DESCRIPTION="Munin Server Monitoring Tool"
+HOMEPAGE="https://munin-monitoring.org/";
+SRC_URI="
+ https://github.com/munin-monitoring/munin/archive/${PV}.tar.gz ->
${P}.tar.gz
+ "
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="asterisk irc java ldap memcached minimal mysql postgres selinux ssl test
cgi ipv6 syslog ipmi http dhcpd doc apache2"
+REQUIRED_USE="cgi? ( !minimal ) apache2? ( cgi )"
+RESTRICT="!test? ( test )"
+
+# Upstream's listing of required modules is NOT correct!
+# Some of the postgres plugins use DBD::Pg, while others call psql directly.
+# Some of the mysql plugins use DBD::mysql, while others call mysqladmin
directly.
+# We replace the original ipmi plugins with the freeipmi_ plugin which at
least works.
+DEPEND_COM="
+ acct-user/munin
+ acct-user/munin-async
+ acct-group/munin
+ dev-lang/perl:=[berkdb]
+ dev-perl/DBI
+ dev-perl/File-Copy-Recursive
+ dev-perl/List-MoreUtils
+ dev-perl/Log-Log4perl
+ dev-perl/Net-CIDR
+ dev-perl/Net-DNS
+ dev-perl/Net-Netmask
+ dev-perl/Net-SNMP
+ dev-perl/Net-Server[ipv6(-)?]
+ dev-perl/TimeDate
+ virtual/perl-Digest-MD5
+ virtual/perl-Getopt-Long
+ virtual/perl-MIME-Base64
+ virtual/perl-Storable
+ virtual/perl-Text-Balanced
+ virtual/perl-Time-HiRes
+ apache2? (
www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite]
)
+ asterisk? ( dev-perl/Net-Telnet )
+ cgi? (
+ dev-perl/FCGI
+ dev-perl/CGI-Fast
+ )
+ dhcpd? (
+ >=net-misc/dhcp-3[server]
+ dev-perl/Net-IP
+ dev-perl/HTTP-Date
+ )
+ doc? ( dev-python/sphinx )
+ http? ( dev-perl/libwww-perl )
+ irc? ( dev-perl/Net-IRC )
+ ldap? ( dev-perl/perl-ldap )
+ kernel_linux? ( sys-process/procps )
+ memcached? ( dev-perl/Cache-Memcached )
+ mysql? (
+ virtual/mysql
+ dev-perl/Cache-Cache
+ dev-perl/DBD-mysql
+ )
+ postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* )
+ ssl? ( dev-perl/Net-SSLeay )
+ syslog? ( virtual/perl-Sys-Syslog )
+ !minimal? (
+ dev-perl/HTML-Template
+ dev-perl/IO-Socket-INET6
+ dev-perl/URI
+ >=net-analyzer/rrdtool-1.3[graph,perl]
+ virtual/ssh
+ )
+ "
+
+# Keep this seperate, as previous versions have had other deps here
+DEPEND="${DEPEND_COM}
+ dev-perl/Module-Build
+ java? ( >=virtual/jdk-1.8 )
+ test? (
+ dev-perl/Test-Deep
+ dev-perl/Test-Exception
+ dev-perl/Test-LongString
+ dev
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/munin/files/, net-analyzer/munin/
commit: e3329ffa99c4506cf3bf67152d2171b996c4bc19
Author: Sam James gentoo org>
AuthorDate: Sat Jul 31 00:41:04 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Jul 31 00:42:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3329ffa
net-analyzer/munin: fix logrotate file (drop copytruncate)
hanno@ reported a potential security issue caused by copytruncate,
which we can avoid using because of the postrotate option.
Closes: https://bugs.gentoo.org/748948
Signed-off-by: Sam James gentoo.org>
net-analyzer/munin/files/logrotate.d-munin.3 | 1 -
net-analyzer/munin/{munin-2.0.66-r1.ebuild => munin-2.0.66-r2.ebuild} | 0
net-analyzer/munin/{munin-2.0.67-r2.ebuild => munin-2.0.67-r4.ebuild} | 0
net-analyzer/munin/{munin-2.0.67-r3.ebuild => munin-2.0.67-r5.ebuild} | 0
4 files changed, 1 deletion(-)
diff --git a/net-analyzer/munin/files/logrotate.d-munin.3
b/net-analyzer/munin/files/logrotate.d-munin.3
index 2d3b6829762..5133c47e8ba 100644
--- a/net-analyzer/munin/files/logrotate.d-munin.3
+++ b/net-analyzer/munin/files/logrotate.d-munin.3
@@ -4,7 +4,6 @@
rotate 7
compress
delaycompress
- copytruncate
notifempty
create 640 root root
postrotate
diff --git a/net-analyzer/munin/munin-2.0.66-r1.ebuild
b/net-analyzer/munin/munin-2.0.66-r2.ebuild
similarity index 100%
rename from net-analyzer/munin/munin-2.0.66-r1.ebuild
rename to net-analyzer/munin/munin-2.0.66-r2.ebuild
diff --git a/net-analyzer/munin/munin-2.0.67-r2.ebuild
b/net-analyzer/munin/munin-2.0.67-r4.ebuild
similarity index 100%
rename from net-analyzer/munin/munin-2.0.67-r2.ebuild
rename to net-analyzer/munin/munin-2.0.67-r4.ebuild
diff --git a/net-analyzer/munin/munin-2.0.67-r3.ebuild
b/net-analyzer/munin/munin-2.0.67-r5.ebuild
similarity index 100%
rename from net-analyzer/munin/munin-2.0.67-r3.ebuild
rename to net-analyzer/munin/munin-2.0.67-r5.ebuild
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/munin/files/, net-analyzer/munin/
commit: c838287b737b39c9428b35b70ae841fda891ba6a
Author: Sam James gentoo org>
AuthorDate: Wed Jun 16 19:06:48 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Jun 16 19:10:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c838287b
net-analyzer/munin: add 'delaycompress' to logrotate files
Closes: https://bugs.gentoo.org/530310
Signed-off-by: Sam James gentoo.org>
net-analyzer/munin/files/logrotate.d-munin.3 | 3 +++
net-analyzer/munin/{munin-2.0.66.ebuild => munin-2.0.66-r1.ebuild}| 0
net-analyzer/munin/{munin-2.0.67-r1.ebuild => munin-2.0.67-r2.ebuild} | 0
3 files changed, 3 insertions(+)
diff --git a/net-analyzer/munin/files/logrotate.d-munin.3
b/net-analyzer/munin/files/logrotate.d-munin.3
index e7e1dda3fc6..2d3b6829762 100644
--- a/net-analyzer/munin/files/logrotate.d-munin.3
+++ b/net-analyzer/munin/files/logrotate.d-munin.3
@@ -3,6 +3,7 @@
missingok
rotate 7
compress
+ delaycompress
copytruncate
notifempty
create 640 root root
@@ -17,6 +18,7 @@
missingok
rotate 7
compress
+ delaycompress
notifempty
nocreate
}
@@ -26,6 +28,7 @@
missingok
rotate 7
compress
+ delaycompress
notifempty
create 640 @CGIUSER@
}
diff --git a/net-analyzer/munin/munin-2.0.66.ebuild
b/net-analyzer/munin/munin-2.0.66-r1.ebuild
similarity index 100%
rename from net-analyzer/munin/munin-2.0.66.ebuild
rename to net-analyzer/munin/munin-2.0.66-r1.ebuild
diff --git a/net-analyzer/munin/munin-2.0.67-r1.ebuild
b/net-analyzer/munin/munin-2.0.67-r2.ebuild
similarity index 100%
rename from net-analyzer/munin/munin-2.0.67-r1.ebuild
rename to net-analyzer/munin/munin-2.0.67-r2.ebuild
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/munin/files/, net-analyzer/munin/
commit: d8fca7989594be6a65c47ea8afee3970abd7f3e5
Author: Hans de Graaff gentoo org>
AuthorDate: Sun Oct 15 06:40:11 2017 +
Commit: Hans de Graaff gentoo org>
CommitDate: Sun Oct 15 06:40:41 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8fca798
net-analyzer/munin: avoid git issues when determining version, bug 632320
Package-Manager: Portage-2.3.8, Repoman-2.3.3
net-analyzer/munin/files/munin-2.0.33-nogitversion.patch | 11 +++
net-analyzer/munin/munin-2.0.33-r1.ebuild| 1 +
2 files changed, 12 insertions(+)
diff --git a/net-analyzer/munin/files/munin-2.0.33-nogitversion.patch
b/net-analyzer/munin/files/munin-2.0.33-nogitversion.patch
new file mode 100644
index 000..6cf33538bde
--- /dev/null
+++ b/net-analyzer/munin/files/munin-2.0.33-nogitversion.patch
@@ -0,0 +1,11 @@
+--- munin-2.0.33/getversion
munin-2.0.33/getversion
+@@ -54,8 +54,6 @@
+
+ if [ -s "RELEASE" ]; then
+ cat RELEASE
+-elif [ "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ]; then
+-generate_version_string
+ elif [ ! -z "$(generate_version_string_from_dir)" ]; then
+ generate_version_string_from_dir
+ else
diff --git a/net-analyzer/munin/munin-2.0.33-r1.ebuild
b/net-analyzer/munin/munin-2.0.33-r1.ebuild
index 3c604180b37..afbdb4122d8 100644
--- a/net-analyzer/munin/munin-2.0.33-r1.ebuild
+++ b/net-analyzer/munin/munin-2.0.33-r1.ebuild
@@ -118,6 +118,7 @@ pkg_setup() {
src_prepare() {
epatch "${WORKDIR}"/patches/*.patch
eapply "${FILESDIR}/${P}"-perl526.patch
+ eapply "${FILESDIR}/${P}"-nogitversion.patch
eapply_user
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/munin/files/, net-analyzer/munin/
commit: fd9d97331d340a1b51a17916b73afa549b3b
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sat Aug 5 15:24:34 2017 +
Commit: Andreas Hüttel gentoo org>
CommitDate: Sat Aug 5 15:25:14 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd9d9733
net-analyzer/munin: Add build fix for Perl 5.26, bug 625318
Package-Manager: Portage-2.3.6, Repoman-2.3.3
.../munin/files/munin-2.0.33-perl526.patch | 26 ++
net-analyzer/munin/munin-2.0.33-r1.ebuild | 1 +
2 files changed, 27 insertions(+)
diff --git a/net-analyzer/munin/files/munin-2.0.33-perl526.patch
b/net-analyzer/munin/files/munin-2.0.33-perl526.patch
new file mode 100644
index 000..d3cabb9906c
--- /dev/null
+++ b/net-analyzer/munin/files/munin-2.0.33-perl526.patch
@@ -0,0 +1,26 @@
+
+
+diff -ruN munin-2.0.33.orig/master/Build.PL munin-2.0.33/master/Build.PL
+--- munin-2.0.33.orig/master/Build.PL 2017-03-03 00:02:39.0 -
munin-2.0.33/master/Build.PL 2017-08-05 15:06:55.799816839 -
+@@ -1,3 +1,4 @@
++use lib q[.];
+ use MasterBuilder;
+
+ use warnings;
+diff -ruN munin-2.0.33.orig/node/Build.PL munin-2.0.33/node/Build.PL
+--- munin-2.0.33.orig/node/Build.PL2017-03-03 00:02:39.0 -
munin-2.0.33/node/Build.PL 2017-08-05 15:11:07.689824612 -
+@@ -1,3 +1,4 @@
++use lib q[.];
+ use NodeBuilder;
+
+ use warnings;
+diff -ruN munin-2.0.33.orig/plugins/Build.PL munin-2.0.33/plugins/Build.PL
+--- munin-2.0.33.orig/plugins/Build.PL 2017-03-03 00:02:39.0 -
munin-2.0.33/plugins/Build.PL 2017-08-05 15:13:57.056168401 -
+@@ -1,3 +1,4 @@
++use lib q[.];
+ use PluginsBuilder;
+
+ use warnings;
diff --git a/net-analyzer/munin/munin-2.0.33-r1.ebuild
b/net-analyzer/munin/munin-2.0.33-r1.ebuild
index 0dcf612bd59..3c604180b37 100644
--- a/net-analyzer/munin/munin-2.0.33-r1.ebuild
+++ b/net-analyzer/munin/munin-2.0.33-r1.ebuild
@@ -117,6 +117,7 @@ pkg_setup() {
src_prepare() {
epatch "${WORKDIR}"/patches/*.patch
+ eapply "${FILESDIR}/${P}"-perl526.patch
eapply_user
