From 69c5f58c466d486e424be9b53f57943860c3f3a9 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Mon, 13 Jan 2025 11:19:50 +0000 Subject: Add James' multiselect patch --- net-analyzer/nagiosgraph/Manifest | 3 +- net-analyzer/nagiosgraph/files/multiselect.patch | 19 ++++++++++ .../nagiosgraph/nagiosgraph-1.5.2-r1.ebuild | 40 --------------------- .../nagiosgraph/nagiosgraph-1.5.2-r2.ebuild | 41 ++++++++++++++++++++++ 4 files changed, 62 insertions(+), 41 deletions(-) create mode 100644 net-analyzer/nagiosgraph/files/multiselect.patch delete mode 100644 net-analyzer/nagiosgraph/nagiosgraph-1.5.2-r1.ebuild create mode 100644 net-analyzer/nagiosgraph/nagiosgraph-1.5.2-r2.ebuild (limited to 'net-analyzer') diff --git a/net-analyzer/nagiosgraph/Manifest b/net-analyzer/nagiosgraph/Manifest index f399714..4a1a0df 100644 --- a/net-analyzer/nagiosgraph/Manifest +++ b/net-analyzer/nagiosgraph/Manifest @@ -1,3 +1,4 @@ AUX multi_param.patch 767 BLAKE2B 9eb84fc9c433b7220135d2091c20602d2dbcb75a3f28ec3eb2a38ec9d8ffc8ae783c2c3d752da0fdb610dda83e45b470527de2c105cfee44423e0f8719fc8de5 SHA512 9b2775c6e934d943f1115d55979d149d1b375c71cccc82ccf80253607ddeeef4f631ad26cdaf06e0253a7860a39281ed551af39ad0dd18347df8ed7dc17e2599 +AUX multiselect.patch 2348 BLAKE2B 3495efeb6accc063bb0f558ef58976622885c945660906e2be803fbbc9841b3db04544547e9c7926a1986bf2a8d0a269d99e47247f638bcb4cd1d37ef0a6933c SHA512 dbd8d7a9041d29a9229a7dcf04810dca2cf37b27b7a3eceda7d1d3f537418cffedb65d3b813891dba911f540b4fcd5b18948b6086433141ab2c05426bd0514ad DIST nagiosgraph-1.5.2.tar.gz 329978 BLAKE2B 7a54a0db5b220d3e270d9df92d3e6b4e8096c3ba189654e0646071a0460e613b51816b299d1da4dd905c2967acb7cd291cfc1c9e4c224acdddcaab56dee7d0d5 SHA512 bde1c177b5a805d5a23024a5cc513d84b36c16d1e320143d95ec4d44d57a232adee786c37a95baea88877139eef47d7b1175a33b11948af0793a63c00391910f -EBUILD nagiosgraph-1.5.2-r1.ebuild 878 BLAKE2B 41808fff7493685478e702b4b3ee9ee3f9ad4ce9779ae3a8ad280ee8fbc486a4ae20d0803e9b6fd2036a2f659ca1b1e2ef93e680e3dfe8cffdc31fd655a54056 SHA512 992498fe6adc1925a9325d414179576465c3bc811ffab755804b6725ddf908df26a3ff7213bf67014eb0171ec4890251ef657f69ec6222773acc76b72d528dd3 +EBUILD nagiosgraph-1.5.2-r2.ebuild 916 BLAKE2B 9a7244bf24120198725642e543d38ba7b0078631ffc58b21ee990f48558c568657b328cb4bea074db103dc6afeb0005418957a49c2fdaad48f1eb4a42d321334 SHA512 5189a31b946e1dda3a69c7119f69ec0c79239bac48d5283f082ebdc39b48ffc5c65078dcc66fc7adfd208656caca4ff99c1b44a9dda3024ee900c08c86185cb5 diff --git a/net-analyzer/nagiosgraph/files/multiselect.patch b/net-analyzer/nagiosgraph/files/multiselect.patch new file mode 100644 index 0000000..6fd9974 --- /dev/null +++ b/net-analyzer/nagiosgraph/files/multiselect.patch @@ -0,0 +1,19 @@ +--- a/etc/ngshared.pm 2025-01-13 09:50:56.597104649 +0000 ++++ b/etc/ngshared.pm 2025-01-13 09:51:44.709518279 +0000 +@@ -2457,14 +2457,14 @@ + $cgi->td(($context eq 'both' || $context eq 'service') + ? $cgi->table($cgi->Tr({-valign => 'top', -id => 'db_controls' }, "\n", + $cgi->td({-class => 'control_label'}, _('Data Sets:')), "\n", +- $cgi->td($cgi->popup_menu(-name => 'db', -values => [], -size => DBLISTROWS, -multiple => 1)), "\n", ++ $cgi->td($cgi->scrolling_list(-name => 'db', -values => [], -size => DBLISTROWS, -multiple => 1)), "\n", + $cgi->td($cgi->button(-name => 'clear', -label => _('Clear'), -onClick => 'clearDBSelection()')), "\n", + ), "\n", + ) . "\n" + : q()), "\n", + $cgi->td($cgi->table($cgi->Tr({-valign => 'top'}, "\n", + $cgi->td({-class => 'control_label'}, _('Periods:')), "\n", +- $cgi->td($cgi->popup_menu(-name => 'period', -values => [@PERIOD_KEYS], -labels => \%period_labels, -size => PERIODLISTROWS, -multiple => 1)), "\n", ++ $cgi->td($cgi->scrolling_list(-name => 'period', -values => [@PERIOD_KEYS], -labels => \%period_labels, -size => PERIODLISTROWS, -multiple => 1)), "\n", + $cgi->td($cgi->button(-name => 'clear', -label => _('Clear'), -onClick => 'clearPeriodSelection()')), "\n", + ), "\n", + $cgi->Tr($cgi->td({-class => 'control_label'}, _('Size:')), "\n", diff --git a/net-analyzer/nagiosgraph/nagiosgraph-1.5.2-r1.ebuild b/net-analyzer/nagiosgraph/nagiosgraph-1.5.2-r1.ebuild deleted file mode 100644 index b52d20a..0000000 --- a/net-analyzer/nagiosgraph/nagiosgraph-1.5.2-r1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="nagiosgraph extracts info from the Nagios output and inserts it into RRD files" -HOMEPAGE="https://sourceforge.net/p/nagiosgraph" -SRC_URI="https://netix.dl.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.gz" - -LICENSE="Artistic" -SLOT="0" -KEYWORDS="~amd64" - -DEPEND="" -RDEPEND=" -dev-lang/perl -net-analyzer/rrdtool[perl,graph] -dev-perl/GD -" -BDEPEND="" - -src_prepare() { - eapply ${FILESDIR}/multi_param.patch - eapply_user -} - -src_configure() { - sed -i "s|/opt/nagiosgraph/etc|/etc/${PN}|g" ${S}/cgi/*.cgi ${S}/lib/*.pl -} - -src_install() { - insinto /etc/${PN} - doins ${S}/etc/* - exeinto /usr/$(get_libdir)/${PN}/bin - doexe ${S}/lib/*.pl - exeinto /usr/$(get_libdir)/${PN}/cgi-bin - doexe ${S}/cgi/*.cgi - insinto /usr/$(get_libdir)/${PN}/share - doins ${S}/share/* -} diff --git a/net-analyzer/nagiosgraph/nagiosgraph-1.5.2-r2.ebuild b/net-analyzer/nagiosgraph/nagiosgraph-1.5.2-r2.ebuild new file mode 100644 index 0000000..54d1cac --- /dev/null +++ b/net-analyzer/nagiosgraph/nagiosgraph-1.5.2-r2.ebuild @@ -0,0 +1,41 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="nagiosgraph extracts info from the Nagios output and inserts it into RRD files" +HOMEPAGE="https://sourceforge.net/p/nagiosgraph" +SRC_URI="https://netix.dl.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.gz" + +LICENSE="Artistic" +SLOT="0" +KEYWORDS="~amd64" + +DEPEND="" +RDEPEND=" +dev-lang/perl +net-analyzer/rrdtool[perl,graph] +dev-perl/GD +" +BDEPEND="" + +src_prepare() { + eapply ${FILESDIR}/multi_param.patch + eapply ${FILESDIR}/multiselect.patch + eapply_user +} + +src_configure() { + sed -i "s|/opt/nagiosgraph/etc|/etc/${PN}|g" ${S}/cgi/*.cgi ${S}/lib/*.pl +} + +src_install() { + insinto /etc/${PN} + doins ${S}/etc/* + exeinto /usr/$(get_libdir)/${PN}/bin + doexe ${S}/lib/*.pl + exeinto /usr/$(get_libdir)/${PN}/cgi-bin + doexe ${S}/cgi/*.cgi + insinto /usr/$(get_libdir)/${PN}/share + doins ${S}/share/* +} -- cgit v1.2.3