From 60234f86b6142c9b06c105fa9db5261a399ae7dc Mon Sep 17 00:00:00 2001
From: Ionen Wolkens <ionen@gentoo.org>
Date: Mon, 21 Jun 2021 18:12:31 -0400
Subject: net-analyzer/ntopng: use binding := for dev-libs/openssl

Needed for upcoming upgrade to OpenSSL 3.0.0 which has changed ABI.

Acked-by: David Seifert <soap@gentoo.org>
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Signed-off-by: Sam James <sam@gentoo.org>
---
 net-analyzer/ntopng/ntopng-4.2-r1.ebuild | 94 ++++++++++++++++++++++++++++++++
 net-analyzer/ntopng/ntopng-4.2.ebuild    | 94 --------------------------------
 2 files changed, 94 insertions(+), 94 deletions(-)
 create mode 100644 net-analyzer/ntopng/ntopng-4.2-r1.ebuild
 delete mode 100644 net-analyzer/ntopng/ntopng-4.2.ebuild

(limited to 'net-analyzer/ntopng')

diff --git a/net-analyzer/ntopng/ntopng-4.2-r1.ebuild b/net-analyzer/ntopng/ntopng-4.2-r1.ebuild
new file mode 100644
index 000000000000..539835c3e078
--- /dev/null
+++ b/net-analyzer/ntopng/ntopng-4.2-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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-3.0:=
+	>=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}-4.2-mysqltool.patch"
+	"${FILESDIR}/${PN}-4.2-parallel-make.patch"
+	"${FILESDIR}/${PN}-4.0-ndpi-includes.patch"
+	"${FILESDIR}/${PN}-4.2-PKG_CONFIG.patch"
+	"${FILESDIR}/${PN}-4.2-nogit.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.seed" \
+		> "${S}/configure.ac" || die
+
+	eautoreconf
+}
+
+src_configure() {
+	tc-export PKG_CONFIG
+	default
+}
+
+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'"
+}
diff --git a/net-analyzer/ntopng/ntopng-4.2.ebuild b/net-analyzer/ntopng/ntopng-4.2.ebuild
deleted file mode 100644
index de038c42e391..000000000000
--- a/net-analyzer/ntopng/ntopng-4.2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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-3.0:=
-	>=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}-4.2-mysqltool.patch"
-	"${FILESDIR}/${PN}-4.2-parallel-make.patch"
-	"${FILESDIR}/${PN}-4.0-ndpi-includes.patch"
-	"${FILESDIR}/${PN}-4.2-PKG_CONFIG.patch"
-	"${FILESDIR}/${PN}-4.2-nogit.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.seed" \
-		> "${S}/configure.ac" || die
-
-	eautoreconf
-}
-
-src_configure() {
-	tc-export PKG_CONFIG
-	default
-}
-
-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-65-gdbad