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
