From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/
Date: Mon, 13 Mar 2023 23:27:18 +0000 (UTC) [thread overview]
Message-ID: <1678750021.6e9dc95ce5410b428cb837dcdd06410cad9d2214.sam@gentoo> (raw)
commit: 6e9dc95ce5410b428cb837dcdd06410cad9d2214
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 13 23:18:46 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 13 23:27:01 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e9dc95c
net-analyzer/ntopng: add HTML, CSS, JS assets
Closes: https://bugs.gentoo.org/894152
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-analyzer/ntopng/Manifest | 1 +
net-analyzer/ntopng/{ntopng-5.6.ebuild => ntopng-5.6-r1.ebuild} | 7 +++++++
2 files changed, 8 insertions(+)
diff --git a/net-analyzer/ntopng/Manifest b/net-analyzer/ntopng/Manifest
index 072a3fc81808..a6864f8140eb 100644
--- a/net-analyzer/ntopng/Manifest
+++ b/net-analyzer/ntopng/Manifest
@@ -1,3 +1,4 @@
DIST ntopng-5.2.1.tar.gz 60280025 BLAKE2B e7885a1ec9e5d37ee06def83a83c62f41acf87d939d18c33c8d114fe0bed0c973a6146f26fd92343aa7c7e7484970c3e95c33fe76468fe382809daddeed6541b SHA512 01cdf21deac61a3b11e7d0e6b662c911123241332e812bb676cb8c5c003fe1d50a4c61231f9c327d467e89dd1345fc1bdbab5d2599fe04b04a8fe12654c01bdd
DIST ntopng-5.4.tar.gz 42662921 BLAKE2B 67a44291671821a94ed0a849467e85030e57fff07b49e61c299f3c09efcad1a7dac5b835f4fc51a2554f7e7d7ae60ae0bd135adba7afa71e505a40d4e9243462 SHA512 3a7d84f64127779780c580c198dfc90bc0a4957e9fb68493babb5381d9127451c506a06d134a488d869840e2b10e7d87a09ec590fd3a5d782e426cab640632cb
+DIST ntopng-5.6-web-90d81ad0281eb6eb582a683ac321a3959abb1269.tar.gz 2525957 BLAKE2B 5ae068ab4c0bae7c6cde7071dd056d3d717d0ae50ce0fe0f9e71fcbf8ab8ee51cdb2d3b05f095ce96921378361ff013d893a40496f1ce50da8ba4c65dc166fc0 SHA512 cd3f8c660b632bffb2baac4d163b055a64b05f510a0744c8d27689cabb3959d15d5cfa763fcf583e57d23dbcd73857360bae7d25bd9aa66682858e7ca985c21e
DIST ntopng-5.6.tar.gz 46318113 BLAKE2B 48702b55c239edca46d6cdecb846ac358c9a829a261eee128444bd994b967c962577a419466f139a2aefdd3a51485d2bb17bf39b8f35a9a31322c40c07203a5d SHA512 c4ab79f98b2dc99218cd0c7ac0ed7275d23e7a161de742632f3ec7a538ea4948ba906d40e7fd2ba36fb4bd9be86ecc69f5df65e7f81607e6da489863947b2da5
diff --git a/net-analyzer/ntopng/ntopng-5.6.ebuild b/net-analyzer/ntopng/ntopng-5.6-r1.ebuild
similarity index 83%
rename from net-analyzer/ntopng/ntopng-5.6.ebuild
rename to net-analyzer/ntopng/ntopng-5.6-r1.ebuild
index 57a01e79f4ab..765764836c15 100644
--- a/net-analyzer/ntopng/ntopng-5.6.ebuild
+++ b/net-analyzer/ntopng/ntopng-5.6-r1.ebuild
@@ -5,9 +5,13 @@ EAPI=8
inherit autotools toolchain-funcs
+# Check this on bumps, get latest commit from the relevant branch (e.g. 5.6-stable)
+# See bug #894152 and https://github.com/ntop/ntopng/issues/7203
+NTOPNG_DIST_COMMIT="90d81ad0281eb6eb582a683ac321a3959abb1269"
DESCRIPTION="Network traffic analyzer with web interface"
HOMEPAGE="https://www.ntop.org/"
SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://github.com/ntop/ntopng-dist/archive/${NTOPNG_DIST_COMMIT}.tar.gz -> ${P}-web-${NTOPNG_DIST_COMMIT}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
@@ -77,6 +81,9 @@ src_install() {
doins -r httpdocs
doins -r scripts
+ insinto "${SHARE_NTOPNG_DIR}"/httpdocs
+ doins -r "${WORKDIR}"/ntopng-dist-${NTOPNG_DIST_COMMIT}/.
+
insinto "${SHARE_NTOPNG_DIR}/third-party"
doins -r third-party/i18n.lua-master
doins -r third-party/lua-resty-template-master
next reply other threads:[~2023-03-13 23:27 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-13 23:27 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-05-11 0:51 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/ Sam James
2024-06-09 16:13 Sam James
2023-05-31 3:26 Sam James
2023-05-31 3:26 Sam James
2023-05-01 13:19 Sam James
2023-04-23 6:43 Sam James
2023-02-03 16:53 Sam James
2022-08-18 0:30 Sam James
2022-01-03 11:23 Sam James
2021-06-22 18:19 Sam James
2020-12-27 0:50 Sam James
2020-03-23 12:45 Jeroen Roovers
2020-01-19 12:13 Jeroen Roovers
2019-12-30 9:23 Jeroen Roovers
2019-12-29 15:20 Jeroen Roovers
2019-12-28 13:10 Jeroen Roovers
2019-12-28 1:03 Jeroen Roovers
2019-08-28 19:41 Michał Górny
2019-08-28 11:17 Thomas Deutschmann
2019-08-28 11:11 Slawek Lis
2019-08-27 5:01 Slawek Lis
2019-08-24 10:30 Thomas Deutschmann
2018-06-09 10:34 Jeroen Roovers
2018-06-03 13:49 Aaron Bauman
2018-01-23 19:06 Slawek Lis
2018-01-22 21:03 Slawek Lis
2017-12-19 21:45 Thomas Deutschmann
2017-12-18 19:36 Richard Farina
2017-09-13 11:39 Slawek Lis
2017-06-22 6:51 Slawek Lis
2017-06-19 11:59 Slawek Lis
2016-11-21 19:48 Slawek Lis
2016-11-21 19:48 Slawek Lis
2016-11-21 19:48 Slawek Lis
2016-11-11 20:31 Slawek Lis
2015-09-02 5:36 Slawek Lis
2015-08-24 5:52 Slawek Lis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1678750021.6e9dc95ce5410b428cb837dcdd06410cad9d2214.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox