Diff ntopng-5.2.1-r1 with a ntopng-5.6-r2

/usr/portage/net-analyzer/ntopng/ntopng-5.6-r2.ebuild 2023-10-09 14:52:33.332368447 +0300
1
# Copyright 1999-2022 Gentoo Authors
1
# Copyright 1999-2023 Gentoo Authors
2 2
# Distributed under the terms of the GNU General Public License v2
3 3

  
4 4
EAPI=8
5 5

  
6 6
inherit autotools toolchain-funcs
7 7

  
8
# Check this on bumps, get latest commit from the relevant branch (e.g. 5.6-stable)
9
# See bug #894152 and https://github.com/ntop/ntopng/issues/7203
10
NTOPNG_DIST_COMMIT="90d81ad0281eb6eb582a683ac321a3959abb1269"
8 11
DESCRIPTION="Network traffic analyzer with web interface"
9 12
HOMEPAGE="https://www.ntop.org/"
10
SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
13
SRC_URI="https://github.com/ntop/ntopng/archive/${PV}.tar.gz -> ${P}.tar.gz"
14
SRC_URI+=" https://github.com/ntop/ntopng-dist/archive/${NTOPNG_DIST_COMMIT}.tar.gz -> ${P}-web-${NTOPNG_DIST_COMMIT}.tar.gz"
11 15

  
12 16
LICENSE="GPL-3"
13 17
SLOT="0"
......
22 26
	dev-libs/openssl:=
23 27
	net-analyzer/rrdtool
24 28
	net-libs/libpcap
25
	>=net-libs/nDPI-4.2:=
26
	<net-libs/nDPI-4.4:=
29
	>=net-libs/nDPI-4.6:=
30
	<net-libs/nDPI-4.8:=
27 31
	>=net-libs/zeromq-3:=
28 32
	net-misc/curl
29 33
	sys-libs/libcap
......
36 40

  
37 41
PATCHES=(
38 42
	"${FILESDIR}"/${PN}-5.2.1-mysqltool.patch
39
	"${FILESDIR}"/${PN}-5.2.1-ndpi-linking.patch
40
	"${FILESDIR}"/${PN}-5.2.1-build-system.patch
43
	"${FILESDIR}"/${PN}-5.4-ndpi-linking.patch
41 44
)
42 45

  
43 46
src_prepare() {
......
62 65
	# in conversion to configure.ac (like [ -> nothing?) so just force
63 66
	# bash for now. It's still not quite right but at least upstream will be
64 67
	# testing with it. TODO: fix this!
65
	CONFIG_SHELL="${BROOT}/bin/bash" econf
68
	CONFIG_SHELL="${BROOT}/bin/bash" econf --with-ndpi-includes="${ESYSROOT}"/usr/include/ndpi
66 69
}
67 70

  
68 71
src_compile() {
......
78 81
	doins -r httpdocs
79 82
	doins -r scripts
80 83

  
84
	insinto "${SHARE_NTOPNG_DIR}"/httpdocs/dist
85
	doins -r "${WORKDIR}"/ntopng-dist-${NTOPNG_DIST_COMMIT}/.
86

  
81 87
	insinto "${SHARE_NTOPNG_DIR}/third-party"
82 88
	doins -r third-party/i18n.lua-master
83 89
	doins -r third-party/lua-resty-template-master
Thank you!