From 55b20c97078ded20d0e7c6b3ef33d673c861d8b4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 14 Mar 2023 00:16:43 +0000 Subject: gentoo auto-resync : 14:03:2023 - 00:16:42 --- net-analyzer/Manifest.gz | Bin 43372 -> 43374 bytes net-analyzer/ntopng/Manifest | 3 +- net-analyzer/ntopng/ntopng-5.6-r1.ebuild | 104 +++++++++++++++++++++++++++++++ net-analyzer/ntopng/ntopng-5.6.ebuild | 97 ---------------------------- 4 files changed, 106 insertions(+), 98 deletions(-) create mode 100644 net-analyzer/ntopng/ntopng-5.6-r1.ebuild delete mode 100644 net-analyzer/ntopng/ntopng-5.6.ebuild (limited to 'net-analyzer') diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz index ce531d0a5f47..93bccd67f3f3 100644 Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ diff --git a/net-analyzer/ntopng/Manifest b/net-analyzer/ntopng/Manifest index 9f58e9688af5..a8773c751ec9 100644 --- a/net-analyzer/ntopng/Manifest +++ b/net-analyzer/ntopng/Manifest @@ -6,8 +6,9 @@ AUX ntopng.conf.d 117 BLAKE2B 67e2962fcb0303ab465b3d8def04192992e3e7306c5e76084a AUX ntopng.init.d 549 BLAKE2B de561950f001e35a26b522728affa5971d8a0fdd1d855746509c0e6861df7ed9c356abe6bc066df65524c340d05c072e7c4de0864c250164b8a1509b34d508c0 SHA512 1fbcc46fe10dcef82a1310d74c4351c72752cdd2a9b9908705c8c645698430e456f1ba14b77fd7c1f374a237a508c2d33324de61f5f1f8255ed75a384e874d84 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 EBUILD ntopng-5.2.1-r1.ebuild 2232 BLAKE2B b1a55a7eff04c3e6fcdabfff960846e10353bc7899c4221cad0f0c482b33eebcd59ab9b18f66c06bb654b4335fb90d6344545a15ccd8050631c6f8aed74f8c01 SHA512 f2badf2841ba9920b955c39c766bd7a7bad59bea7905befd2a5ab4dfe362669d1f18cdcc0138cf0bbd1538ed481e976dd95e79da100c9937360d9e2af7eec352 EBUILD ntopng-5.4.ebuild 2236 BLAKE2B dba0614126d673b4ee92662c80746bf2d4d971ad6b6c78f121dc8000556b17c7c8e9288e091d55ba907533efffa64d11924c342182a3b75987396af41e4296c6 SHA512 84aba7423e8ef582ae9251db3cc87f748b5372de146caa36e9953a1883c3d22d40e409acb880f27cc0638e87851eb9ef73d8e2c0138541117bd550417f8c880b -EBUILD ntopng-5.6.ebuild 2236 BLAKE2B dba0614126d673b4ee92662c80746bf2d4d971ad6b6c78f121dc8000556b17c7c8e9288e091d55ba907533efffa64d11924c342182a3b75987396af41e4296c6 SHA512 84aba7423e8ef582ae9251db3cc87f748b5372de146caa36e9953a1883c3d22d40e409acb880f27cc0638e87851eb9ef73d8e2c0138541117bd550417f8c880b +EBUILD ntopng-5.6-r1.ebuild 2673 BLAKE2B 86572d83f5558316a93b3d59e48365b37cfc565a5cd8e5ee563d52b68b647cf7e620476a479b1b565ef04465b10a6499a31d7f54a7a8194644a2b293821e608b SHA512 326d1ba1e05973c52955247444b76c15c2912af8b8b00df89b0ca3bf18cf5aa35779bf452fab4a423286c0e80dc462447b33806ab2d91972a79412b1e2cb4fb1 MISC metadata.xml 295 BLAKE2B 2b7f20f08d1cef4e5cfa80981f282a4907a8496b565a1a146f27a3d8736653d35c6b03e07299b0b4bbbb32100d01c873c683b90ca96bed98e85cfd71a6175ddf SHA512 4d5b0f4892ca44c672c5f9b1291a91fb3333b36830df22432df5cfed48e3c6c93ca88a0675a50fd33013d7f01805df99d474e8c98b9c94f3c878366b32d5bc6f diff --git a/net-analyzer/ntopng/ntopng-5.6-r1.ebuild b/net-analyzer/ntopng/ntopng-5.6-r1.ebuild new file mode 100644 index 000000000000..765764836c15 --- /dev/null +++ b/net-analyzer/ntopng/ntopng-5.6-r1.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +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" +KEYWORDS="~amd64 ~x86" + +DEPEND="dev-db/mysql-connector-c:= + dev-db/sqlite:3 + dev-libs/hiredis:= + dev-libs/json-c:= + dev-libs/libmaxminddb + dev-libs/libsodium:= + dev-libs/openssl:= + net-analyzer/rrdtool + net-libs/libpcap + >=net-libs/nDPI-4.6:= + =net-libs/zeromq-3:= + net-misc/curl + sys-libs/libcap + sys-libs/zlib" +RDEPEND="${DEPEND} + acct-user/ntopng + acct-group/ntopng + dev-db/redis" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-5.2.1-mysqltool.patch + "${FILESDIR}"/${PN}-5.4-ndpi-linking.patch +) + +src_prepare() { + default + + # Follows upstream's autogen.sh + sed \ + -e "s/@VERSION@/${PV}.$(date +%y%m%d)/g" \ + -e "s/@SHORT_VERSION@/${PV}/g" \ + -e "s/@GIT_DATE@/$(date)/g" \ + -e "s/@GIT_RELEASE@/${PV}.$(date +%y%m%d)/g" \ + -e "s/@GIT_BRANCH@//g" < "${S}/configure.ac.in" \ + > "${S}/configure.ac" || die + + eautoreconf +} + +src_configure() { + tc-export PKG_CONFIG + + # configure.ac.in at least has some bashisms(?) which get lost(?) + # in conversion to configure.ac (like [ -> nothing?) so just force + # bash for now. It's still not quite right but at least upstream will be + # testing with it. TODO: fix this! + CONFIG_SHELL="${BROOT}/bin/bash" econf --with-ndpi-includes="${ESYSROOT}"/usr/include/ndpi +} + +src_compile() { + emake \ + CC="$(tc-getCC)" \ + MYCFLAGS="${CFLAGS}" \ + MYLDFLAGS="${LDFLAGS}" +} + +src_install() { + SHARE_NTOPNG_DIR="${EPREFIX}/usr/share/${PN}" + insinto "${SHARE_NTOPNG_DIR}" + 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 + + exeinto /usr/bin + doexe "${PN}" + doman "${PN}.8" + + newinitd "${FILESDIR}"/ntopng.init.d ntopng + newconfd "${FILESDIR}"/ntopng.conf.d ntopng + + keepdir /var/lib/ntopng + fowners ntopng /var/lib/ntopng +} + +pkg_postinst() { + elog "ntopng default credentials are user='admin' password='admin'" +} diff --git a/net-analyzer/ntopng/ntopng-5.6.ebuild b/net-analyzer/ntopng/ntopng-5.6.ebuild deleted file mode 100644 index 57a01e79f4ab..000000000000 --- a/net-analyzer/ntopng/ntopng-5.6.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools toolchain-funcs - -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" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND="dev-db/mysql-connector-c:= - dev-db/sqlite:3 - dev-libs/hiredis:= - dev-libs/json-c:= - dev-libs/libmaxminddb - dev-libs/libsodium:= - dev-libs/openssl:= - net-analyzer/rrdtool - net-libs/libpcap - >=net-libs/nDPI-4.6:= - =net-libs/zeromq-3:= - net-misc/curl - sys-libs/libcap - sys-libs/zlib" -RDEPEND="${DEPEND} - acct-user/ntopng - acct-group/ntopng - dev-db/redis" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-5.2.1-mysqltool.patch - "${FILESDIR}"/${PN}-5.4-ndpi-linking.patch -) - -src_prepare() { - default - - # Follows upstream's autogen.sh - sed \ - -e "s/@VERSION@/${PV}.$(date +%y%m%d)/g" \ - -e "s/@SHORT_VERSION@/${PV}/g" \ - -e "s/@GIT_DATE@/$(date)/g" \ - -e "s/@GIT_RELEASE@/${PV}.$(date +%y%m%d)/g" \ - -e "s/@GIT_BRANCH@//g" < "${S}/configure.ac.in" \ - > "${S}/configure.ac" || die - - eautoreconf -} - -src_configure() { - tc-export PKG_CONFIG - - # configure.ac.in at least has some bashisms(?) which get lost(?) - # in conversion to configure.ac (like [ -> nothing?) so just force - # bash for now. It's still not quite right but at least upstream will be - # testing with it. TODO: fix this! - CONFIG_SHELL="${BROOT}/bin/bash" econf --with-ndpi-includes="${ESYSROOT}"/usr/include/ndpi -} - -src_compile() { - emake \ - CC="$(tc-getCC)" \ - MYCFLAGS="${CFLAGS}" \ - MYLDFLAGS="${LDFLAGS}" -} - -src_install() { - SHARE_NTOPNG_DIR="${EPREFIX}/usr/share/${PN}" - insinto "${SHARE_NTOPNG_DIR}" - doins -r httpdocs - doins -r scripts - - insinto "${SHARE_NTOPNG_DIR}/third-party" - doins -r third-party/i18n.lua-master - doins -r third-party/lua-resty-template-master - - exeinto /usr/bin - doexe "${PN}" - doman "${PN}.8" - - newinitd "${FILESDIR}"/ntopng.init.d ntopng - newconfd "${FILESDIR}"/ntopng.conf.d ntopng - - keepdir /var/lib/ntopng - fowners ntopng /var/lib/ntopng -} - -pkg_postinst() { - elog "ntopng default credentials are user='admin' password='admin'" -} -- cgit v1.2.3