gentoo resync : 12.05.2022

5 files changed, 187 insertions, 25 deletions

diff --git a/net-analyzer/darkstat/Manifest b/net-analyzer/darkstat/Manifest
index 931463ae9ee9..e7e268dc748e 100644
--- a/net-analyzer/darkstat/Manifest
+++ b/net-analyzer/darkstat/Manifest
@@ -2,6 +2,9 @@ AUX darkstat-3.0.719-strncpy-off-by-one.patch 471 BLAKE2B 45e738a9a777173924df26
 AUX darkstat-confd 911 BLAKE2B 35cb512c3727176218a16508d3b61ddf003081997d8f52918c5b9b7e762c882f878bd3317c737931d29cbf3aba1a7c375ebf067a394da41d15b95b3d97768437 SHA512 cf5b222a45a406d4e6b03860a9053a9c25c88d793e86525ebe38dbf292a69f00dc073b12179818e7e7b669f4a706d70eebe9bfeda363c7c5003c035639f41bbc
 AUX darkstat-initd 1461 BLAKE2B 4f0aca1bb12661de4ea1c2d5ea7dd9733833aafbe012ea0019d536ee1d45fa0cffc5a7a210783e9bbd3c5c5b236dc6f505ee0807b8ad2bd6ef78e48fa676a386 SHA512 2441b9c7dfa0c3ddb8a5ab6fd396d42a1ae4cb84ac15477c932f719ccfae53179ae5bd3ac947f6a98ee14728c7f31bbc176887c144ed4f5053632aad262d8226
 DIST darkstat-3.0.719.tar.bz2 117695 BLAKE2B b2aef3073aafaa42d006fd9ade652ea3542a5f238e347b219ee30e995915fa38b005161d26dff6a9a3e01e98b426ec14c32e1390592128d5816278e5f895f178 SHA512 264f6c5f862745fbfb5d125aae5a319369f028fd7be96cfb12775147f528a36b7f5a42bcd6434f2d376933292364641f2ec9cd9bdb1fe105f5a905e331181f98
+DIST darkstat-3.0.721.tar.gz 104050 BLAKE2B 1005bd3e40be59ad214c95908b34e70eb8b60e33a9b85ee3f6b7fa7f8f6691fad73234ef228ec529aaad0e8ad9eb07f0bdb9d08a560103af3cb377fd11765436 SHA512 077eec3cc69b021966d4545f408a7444136cedb8be1dbae96fb1ce94d9bcd3a1db3bf4ea1bed8999088b24f7e2ed333d1166fe39bf974f32772b8c8f6fde707c
 EBUILD darkstat-3.0.719-r3.ebuild 1777 BLAKE2B 0d6445bd2e0dbd6400e45448998d1f1c667bcbcb4875330a59f20fe89eb02085b0f7d1108e06bdc95396d39a3b01a915857e8527bd79ae401ff8e74b4707cfc1 SHA512 e26b44fbb230eacbd38ad1e9acd381b43c61f488493a81c4e8389f1b4d08d056a20e36b3de50b95819b67eb5c0e08e04ce03192f8b49570c69b45ef095a7986d
-EBUILD darkstat-9999999.ebuild 1809 BLAKE2B c4464879938ea296aa2f67b5d617587317bc199e947547dd5e2588603633536821f06608d2dca04ae2497b25d7905d7afb9d5f0affd08e025ea7c604c7c8d071 SHA512 061052f55525bb9f6247459e7f585224d05036fc6e444ac0635c57847fbeca9c9179e619169c1f401e1b01211e73922ee45c5e0f6f3f5e755ef920a84c2ae00e
-MISC metadata.xml 537 BLAKE2B ec19787980e1fb85dee64964cb140aee2742f7ec2d273d76842696c3cc4f0e826fcb28709e9e4c8d79df6d04887c5571edd6c1e4d6ccb3ead288fd7eb328a658 SHA512 1c2fd63c6c2f41bbaad65674df8a28610a7569a1cb429a9232446f7165f4329cab10064b9c1a3c2397ca40a20bdb5349c0073ee4b81246115dd1b29c033dabce
+EBUILD darkstat-3.0.719-r4.ebuild 2024 BLAKE2B 1f436c0b91fbd5ee0d14b786bb94af287027008c597358b2f33ef770507d07fb607c6b757c0d562417630bfd8fae353d0283c0a299f2da04d3dcc5c597fa0557 SHA512 2bde490e140321c03b7cc3d52b735804e06e19490142ad071cd2de5a7e0a331562ef6d64f21f7c286665a21addd04e857097a869f588b68fa518dbabd10388a6
+EBUILD darkstat-3.0.721-r1.ebuild 1867 BLAKE2B d316f8ef98e3b277123e9ce1bc5775fe4b167595a5f88bdfdf16466ce936666ece3d1477dae7cf8d96276e516ad6008eef05683f9958a3212e893d8928a971fb SHA512 bb7aa75f78b5e499fb6d84f2afe63d262397427ac6694f07b194367655f660ab444a7530bd5012d1c8d2750b71014854a568b2e94a0603eb03ded469e92ba115
+EBUILD darkstat-9999999.ebuild 2067 BLAKE2B b97719b3cc3a3ce2d67dd7b2aee41c7ea25f09cd5f46c1a17d0acab1fa4a47dd0232a8add55d21b7b90297d5098cd919fd4c2e7ceb639efe30b85057a80028d0 SHA512 2a55abb8b298f4c825afedb562f7113d7c12a9d28da20b6d7028a2c6bc78b0412b5ad4a2592b46e218d5983a253c76355810a384ff1fd4d5014f5244793f3d09
+MISC metadata.xml 620 BLAKE2B ff20991fe25a8e274b0eeeb1ca71bfb64e83843d902b58e39056d55847292b3d09fcfb373fba666b896cce68119538fee8f6581fc6d6dcea8e0c50c51c423f49 SHA512 8f720972b52cb50bb26f975f1c663a0bc83efca09e74a4ea068cca850838958efb218ba2f3fda0f22ef57f33053aa0b55c2370b136c1f0d2ab60d82ba3e63137
diff --git a/net-analyzer/darkstat/darkstat-3.0.719-r4.ebuild b/net-analyzer/darkstat/darkstat-3.0.719-r4.ebuild
new file mode 100644
index 000000000000..1f62dd3d13c0
--- /dev/null
+++ b/net-analyzer/darkstat/darkstat-3.0.719-r4.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Network traffic analyzer with cute web interface"
+HOMEPAGE="https://unix4lyfe.org/darkstat/"
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://www.unix4lyfe.org/git/darkstat"
+	inherit git-r3
+else
+	SRC_URI="https://unix4lyfe.org/${PN}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~ppc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND="acct-user/darkstat
+	dev-libs/libbsd
+	net-libs/libpcap
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+DARKSTAT_CHROOT_DIR=${DARKSTAT_CHROOT_DIR:-/var/lib/darkstat}
+
+DOCS=( AUTHORS ChangeLog README NEWS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.719-strncpy-off-by-one.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/-DNDEBUG/d' \
+		-e 's|-flto||g' \
+		configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --with-privdrop-user=darkstat
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/darkstat-initd darkstat
+	newconfd "${FILESDIR}"/darkstat-confd darkstat
+
+	sed -i -e "s:__CHROOT__:${DARKSTAT_CHROOT_DIR}:g" "${D}"/etc/conf.d/darkstat || die
+	sed -i -e "s:__CHROOT__:${DARKSTAT_CHROOT_DIR}:g" "${D}"/etc/init.d/darkstat || die
+
+	keepdir "${DARKSTAT_CHROOT_DIR}"
+	fowners darkstat:0 "${DARKSTAT_CHROOT_DIR}"
+}
+
+pkg_postinst() {
+	# Workaround bug #141619
+	DARKSTAT_CHROOT_DIR=$(
+		sed -n 's/^#CHROOT=\(.*\)/\1/p' "${EROOT}"/etc/conf.d/darkstat
+	)
+
+	if [[ -n "${DARKSTAT_CHROOT_DIR}" ]] && [[ "${DARKSTAT_CHROOT_DIR}" != "${EROOT:-/}" ]] ; then
+		chown darkstat:0 "${EROOT}/${DARKSTAT_CHROOT_DIR#/}/"
+	fi
+
+	elog "To start different darkstat instances which will listen on a different"
+	elog "interface, create within the ${EROOT}/etc/init.d directory a 'darkstat.if' symlink to"
+	elog "darkstat script where 'if' is the name of the interface."
+	elog "Also in the ${EROOT}/etc/conf.d directory, copy darkstat to darkstat.if"
+	elog "and edit it to change default values."
+	elog
+	elog "darkstat's default chroot directory is: ${EROOT}/${DARKSTAT_CHROOT_DIR#/}"
+}
diff --git a/net-analyzer/darkstat/darkstat-3.0.721-r1.ebuild b/net-analyzer/darkstat/darkstat-3.0.721-r1.ebuild
new file mode 100644
index 000000000000..3f38088b33e0
--- /dev/null
+++ b/net-analyzer/darkstat/darkstat-3.0.721-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Network traffic analyzer with cute web interface"
+HOMEPAGE="https://unix4lyfe.org/darkstat/"
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/emikulic/darkstat"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/emikulic/darkstat/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND="acct-user/darkstat
+	dev-libs/libbsd
+	net-libs/libpcap
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+DARKSTAT_CHROOT_DIR=${DARKSTAT_CHROOT_DIR:-/var/lib/darkstat}
+
+DOCS=( AUTHORS ChangeLog README.md NEWS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.719-strncpy-off-by-one.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/-DNDEBUG/d' \
+		-e 's|-flto||g' \
+		configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --with-privdrop-user=darkstat
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/darkstat-initd darkstat
+	newconfd "${FILESDIR}"/darkstat-confd darkstat
+
+	sed -i -e "s:__CHROOT__:${DARKSTAT_CHROOT_DIR}:g" "${D}"/etc/conf.d/darkstat || die
+	sed -i -e "s:__CHROOT__:${DARKSTAT_CHROOT_DIR}:g" "${D}"/etc/init.d/darkstat || die
+
+	keepdir "${DARKSTAT_CHROOT_DIR}"
+	fowners darkstat:0 "${DARKSTAT_CHROOT_DIR}"
+}
+
+pkg_postinst() {
+	elog "To start different darkstat instances which will listen on a different"
+	elog "interface, create within the ${EROOT}/etc/init.d directory a 'darkstat.if' symlink to"
+	elog "darkstat script where 'if' is the name of the interface."
+	elog "Also in the ${EROOT}/etc/conf.d directory, copy darkstat to darkstat.if"
+	elog "and edit it to change default values."
+	elog
+	elog "darkstat's default chroot directory is: ${EROOT}/var/lib/darkstat."
+	elog "Please chown it to darkstat:0 (or a different directory if you change it)."
+}
diff --git a/net-analyzer/darkstat/darkstat-9999999.ebuild b/net-analyzer/darkstat/darkstat-9999999.ebuild
index 4ca39eb748e3..dcd53be61eb1 100644
--- a/net-analyzer/darkstat/darkstat-9999999.ebuild
+++ b/net-analyzer/darkstat/darkstat-9999999.ebuild
@@ -1,32 +1,33 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit autotools git-r3
+inherit autotools
 
 DESCRIPTION="Network traffic analyzer with cute web interface"
 HOMEPAGE="https://unix4lyfe.org/darkstat/"
-EGIT_REPO_URI="https://www.unix4lyfe.org/git/darkstat"
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/emikulic/darkstat"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/emikulic/darkstat/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~x86"
+fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 
-BDEPEND="
-	app-editors/vim-core
-"
-DEPEND="
-	acct-user/darkstat
+DEPEND="acct-user/darkstat
 	dev-libs/libbsd
 	net-libs/libpcap
-	sys-libs/zlib
-"
-RDEPEND="
-	${DEPEND}
-"
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
 DARKSTAT_CHROOT_DIR=${DARKSTAT_CHROOT_DIR:-/var/lib/darkstat}
-DOCS=( AUTHORS ChangeLog README NEWS )
+
+DOCS=( AUTHORS ChangeLog README.md NEWS )
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.0.719-strncpy-off-by-one.patch
 )
@@ -56,21 +57,24 @@ src_install() {
 	sed -i -e "s:__CHROOT__:${DARKSTAT_CHROOT_DIR}:g" "${D}"/etc/init.d/darkstat || die
 
 	keepdir "${DARKSTAT_CHROOT_DIR}"
-	chown darkstat:0 "${D}${DARKSTAT_CHROOT_DIR}"
+	fowners darkstat:0 "${DARKSTAT_CHROOT_DIR}"
 }
 
 pkg_postinst() {
 	# Workaround bug #141619
 	DARKSTAT_CHROOT_DIR=$(
-		sed -n 's/^#CHROOT=\(.*\)/\1/p' "${ROOT}"/etc/conf.d/darkstat
+		sed -n 's/^#CHROOT=\(.*\)/\1/p' "${EROOT}"/etc/conf.d/darkstat
 	)
-	chown darkstat:0 "${ROOT}${DARKSTAT_CHROOT_DIR}"
+
+	if [[ -n "${DARKSTAT_CHROOT_DIR}" ]] && [[ "${DARKSTAT_CHROOT_DIR}" != "${EROOT:-/}" ]] ; then
+		chown darkstat:0 "${EROOT}/${DARKSTAT_CHROOT_DIR#/}/"
+	fi
 
 	elog "To start different darkstat instances which will listen on a different"
-	elog "interfaces create in /etc/init.d directory the 'darkstat.if' symlink to"
+	elog "interface, create within the ${EROOT}/etc/init.d directory a 'darkstat.if' symlink to"
 	elog "darkstat script where 'if' is the name of the interface."
-	elog "Also in /etc/conf.d directory copy darkstat to darkstat.if"
+	elog "Also in the ${EROOT}/etc/conf.d directory, copy darkstat to darkstat.if"
 	elog "and edit it to change default values."
 	elog
-	elog "darkstat's default chroot directory is: \"${ROOT}${DARKSTAT_CHROOT_DIR}\""
+	elog "darkstat's default chroot directory is: ${EROOT}/${DARKSTAT_CHROOT_DIR#/}"
 }
diff --git a/net-analyzer/darkstat/metadata.xml b/net-analyzer/darkstat/metadata.xml
index 8d234c1da50c..7903d33acaf1 100644
--- a/net-analyzer/darkstat/metadata.xml
+++ b/net-analyzer/darkstat/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
+	<maintainer type="project">
 		<email>netmon@gentoo.org</email>
 		<name>Gentoo network monitoring and analysis project</name>
 	</maintainer>
@@ -10,4 +10,7 @@
 		runs as a background process on a cable/DSL router, gathers all sorts of
 		statistics about network usage, and serves them over HTTP.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">emikulic/darkstat</remote-id>
+	</upstream>
 </pkgmetadata>