* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/darkstat/
@ 2017-02-21 23:55 Jeroen Roovers
0 siblings, 0 replies; 18+ messages in thread
From: Jeroen Roovers @ 2017-02-21 23:55 UTC (permalink / raw
To: gentoo-commits
commit: ece1b9226f2ac72ce032c9a8f2bb15f9954eb06e
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 21 23:53:08 2017 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Feb 21 23:53:08 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ece1b922
net-analyzer/darkstat: Fix dependencies.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
net-analyzer/darkstat/darkstat-3.0.718.ebuild | 11 ++++++++---
net-analyzer/darkstat/darkstat-3.0.719.ebuild | 20 ++++++++++++++------
2 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/net-analyzer/darkstat/darkstat-3.0.718.ebuild b/net-analyzer/darkstat/darkstat-3.0.718.ebuild
index d70afed591..fa96b8bfaa 100644
--- a/net-analyzer/darkstat/darkstat-3.0.718.ebuild
+++ b/net-analyzer/darkstat/darkstat-3.0.718.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -13,8 +13,13 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc x86"
-DEPEND="net-libs/libpcap"
-RDEPEND="${DEPEND}"
+DEPEND="
+ net-libs/libpcap
+ sys-libs/zlib
+"
+RDEPEND="
+ ${DEPEND}
+"
DARKSTAT_CHROOT_DIR=${DARKSTAT_CHROOT_DIR:-/var/lib/darkstat}
diff --git a/net-analyzer/darkstat/darkstat-3.0.719.ebuild b/net-analyzer/darkstat/darkstat-3.0.719.ebuild
index ddfcbaaeb0..00f91e77dc 100644
--- a/net-analyzer/darkstat/darkstat-3.0.719.ebuild
+++ b/net-analyzer/darkstat/darkstat-3.0.719.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
-inherit autotools eutils user
+EAPI=6
+inherit autotools user
DESCRIPTION="Network traffic analyzer with cute web interface"
HOMEPAGE="http://unix4lyfe.org/darkstat/"
@@ -13,16 +13,24 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
-DEPEND="net-libs/libpcap"
-RDEPEND="${DEPEND}"
+DEPEND="
+ 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 )
src_prepare() {
+ default
+
sed -i -e 's|-flto||g' configure.ac || die
- epatch_user
+
eautoreconf
}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/darkstat/
@ 2017-02-22 15:06 Agostino Sarubbo
0 siblings, 0 replies; 18+ messages in thread
From: Agostino Sarubbo @ 2017-02-22 15:06 UTC (permalink / raw
To: gentoo-commits
commit: c56fcc679f8336b4c794de9cf0233b2fe082bf6f
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 22 15:05:30 2017 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Feb 22 15:05:30 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c56fcc67
net-analyzer/darkstat: amd64 stable wrt bug #610426
Package-Manager: portage-2.3.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
net-analyzer/darkstat/darkstat-3.0.719.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/darkstat/darkstat-3.0.719.ebuild b/net-analyzer/darkstat/darkstat-3.0.719.ebuild
index 00f91e77dc..93b5852fb3 100644
--- a/net-analyzer/darkstat/darkstat-3.0.719.ebuild
+++ b/net-analyzer/darkstat/darkstat-3.0.719.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://unix4lyfe.org/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
DEPEND="
dev-libs/libbsd
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/darkstat/
@ 2017-02-22 16:08 Agostino Sarubbo
0 siblings, 0 replies; 18+ messages in thread
From: Agostino Sarubbo @ 2017-02-22 16:08 UTC (permalink / raw
To: gentoo-commits
commit: 667c45876f1d5d2dd47efae5b2d7bd6da6fc6794
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 22 16:07:36 2017 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Feb 22 16:07:36 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=667c4587
net-analyzer/darkstat: x86 stable wrt bug #610426
Package-Manager: portage-2.3.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
net-analyzer/darkstat/darkstat-3.0.719.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/darkstat/darkstat-3.0.719.ebuild b/net-analyzer/darkstat/darkstat-3.0.719.ebuild
index 93b5852fb3..4578de9fbd 100644
--- a/net-analyzer/darkstat/darkstat-3.0.719.ebuild
+++ b/net-analyzer/darkstat/darkstat-3.0.719.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://unix4lyfe.org/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
DEPEND="
dev-libs/libbsd
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/darkstat/
@ 2017-02-24 14:07 Agostino Sarubbo
0 siblings, 0 replies; 18+ messages in thread
From: Agostino Sarubbo @ 2017-02-24 14:07 UTC (permalink / raw
To: gentoo-commits
commit: 31e6834e837fc5712fe8cec15edc5b1c9a48dc7c
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 24 14:07:29 2017 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Feb 24 14:07:29 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31e6834e
net-analyzer/darkstat: ppc stable wrt bug #610426
Package-Manager: portage-2.3.3
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
net-analyzer/darkstat/darkstat-3.0.719.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/darkstat/darkstat-3.0.719.ebuild b/net-analyzer/darkstat/darkstat-3.0.719.ebuild
index 4578de9fbd..00f43b0840 100644
--- a/net-analyzer/darkstat/darkstat-3.0.719.ebuild
+++ b/net-analyzer/darkstat/darkstat-3.0.719.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://unix4lyfe.org/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
DEPEND="
dev-libs/libbsd
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/darkstat/
@ 2017-03-08 5:03 Jeroen Roovers
0 siblings, 0 replies; 18+ messages in thread
From: Jeroen Roovers @ 2017-03-08 5:03 UTC (permalink / raw
To: gentoo-commits
commit: 372182234c5d7b81bb884969e7ed2d690d5efdb9
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 8 05:02:58 2017 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Mar 8 05:02:58 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37218223
net-analyzer/darkstat: Old.
Package-Manager: Portage-2.3.4, Repoman-2.3.2
net-analyzer/darkstat/Manifest | 1 -
net-analyzer/darkstat/darkstat-3.0.718.ebuild | 66 ---------------------------
2 files changed, 67 deletions(-)
diff --git a/net-analyzer/darkstat/Manifest b/net-analyzer/darkstat/Manifest
index 55050ea72d0..a82e1a60ef9 100644
--- a/net-analyzer/darkstat/Manifest
+++ b/net-analyzer/darkstat/Manifest
@@ -1,2 +1 @@
-DIST darkstat-3.0.718.tar.bz2 116044 SHA256 682f3e53f4e89ea6ad08236b4225a5e0859428299765d8d995374cd7fa22adff SHA512 73ed670a9c684b2f0b087da3f238c2828407c82201d1bff945a3d711bbaa231b9d87ddc9e21aa855abcd7d63c27f8f529f5a2c6fb48f52a3f0b6e88c49d33969 WHIRLPOOL 9e91c4508dc43ea5c59b10c51b1b345a4bcf31befa532a94ba435b10f8b63a2fd3e2e8775b67a40e48dcf0e91f71c7ccc191a78d337990990761671f8aa4377f
DIST darkstat-3.0.719.tar.bz2 117695 SHA256 aeaf909585f7f43dc032a75328fdb62114e58405b06a92a13c0d3653236dedd7 SHA512 264f6c5f862745fbfb5d125aae5a319369f028fd7be96cfb12775147f528a36b7f5a42bcd6434f2d376933292364641f2ec9cd9bdb1fe105f5a905e331181f98 WHIRLPOOL 95fc7c383bd814bbf6ff022d97df839eeaeafffb75b2c9bdb5b833d9bc7abfabaded5a1c5d145f5f1c5a4f45566e442f060a91ee4366a20ac096ad6fb4e09520
diff --git a/net-analyzer/darkstat/darkstat-3.0.718.ebuild b/net-analyzer/darkstat/darkstat-3.0.718.ebuild
deleted file mode 100644
index 7da5caa4b23..00000000000
--- a/net-analyzer/darkstat/darkstat-3.0.718.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils user
-
-DESCRIPTION="Network traffic analyzer with cute web interface"
-HOMEPAGE="http://unix4lyfe.org/darkstat/"
-SRC_URI="http://unix4lyfe.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-DEPEND="
- net-libs/libpcap
- sys-libs/zlib
-"
-RDEPEND="
- ${DEPEND}
-"
-
-DARKSTAT_CHROOT_DIR=${DARKSTAT_CHROOT_DIR:-/var/lib/darkstat}
-
-DOCS=( AUTHORS ChangeLog README NEWS )
-
-src_prepare() {
- sed -i -e 's|-flto||g' configure.ac || die
- epatch_user
- eautoreconf
-}
-
-src_configure() {
- econf --disable-debug --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}"
- chown darkstat:0 "${D}${DARKSTAT_CHROOT_DIR}"
-}
-
-pkg_preinst() {
- enewuser darkstat
-}
-
-pkg_postinst() {
- # Workaround bug #141619
- DARKSTAT_CHROOT_DIR=`sed -n 's/^#CHROOT=\(.*\)/\1/p' "${ROOT}"etc/conf.d/darkstat`
- chown darkstat:0 "${ROOT}${DARKSTAT_CHROOT_DIR}"
-
- 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 "darkstat script where 'if' is the name of the interface."
- elog "Also in /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}\""
-}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/darkstat/
@ 2020-07-03 9:55 Jeroen Roovers
0 siblings, 0 replies; 18+ messages in thread
From: Jeroen Roovers @ 2020-07-03 9:55 UTC (permalink / raw
To: gentoo-commits
commit: 77ef284cc14f41f8cf32cb1122822d2c8cad7716
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 3 09:17:32 2020 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Jul 3 09:55:02 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77ef284c
net-analyzer/darkstat: Add live ebuild
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
net-analyzer/darkstat/darkstat-9999999.ebuild | 73 +++++++++++++++++++++++++++
1 file changed, 73 insertions(+)
diff --git a/net-analyzer/darkstat/darkstat-9999999.ebuild b/net-analyzer/darkstat/darkstat-9999999.ebuild
new file mode 100644
index 00000000000..a22c4018efb
--- /dev/null
+++ b/net-analyzer/darkstat/darkstat-9999999.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools git-r3 user
+
+DESCRIPTION="Network traffic analyzer with cute web interface"
+HOMEPAGE="https://unix4lyfe.org/darkstat/"
+EGIT_REPO_URI="https://www.unix4lyfe.org/git/darkstat"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+
+DEPEND="
+ 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}"
+ chown darkstat:0 "${D}${DARKSTAT_CHROOT_DIR}"
+}
+
+pkg_preinst() {
+ enewuser darkstat
+}
+
+pkg_postinst() {
+ # Workaround bug #141619
+ DARKSTAT_CHROOT_DIR=`sed -n 's/^#CHROOT=\(.*\)/\1/p' "${ROOT}"etc/conf.d/darkstat`
+ chown darkstat:0 "${ROOT}${DARKSTAT_CHROOT_DIR}"
+
+ 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 "darkstat script where 'if' is the name of the interface."
+ elog "Also in /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}\""
+}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/darkstat/
@ 2020-07-03 9:55 Jeroen Roovers
0 siblings, 0 replies; 18+ messages in thread
From: Jeroen Roovers @ 2020-07-03 9:55 UTC (permalink / raw
To: gentoo-commits
commit: 8de80582707cc4fc79c6b0b028acbd5aa6e136a7
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 3 09:53:09 2020 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Jul 3 09:55:03 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8de80582
net-analyzer/darkstat: Update ROOT mangling for EAPI=7
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
net-analyzer/darkstat/darkstat-3.0.719-r1.ebuild | 4 +++-
net-analyzer/darkstat/darkstat-9999999.ebuild | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/net-analyzer/darkstat/darkstat-3.0.719-r1.ebuild b/net-analyzer/darkstat/darkstat-3.0.719-r1.ebuild
index 8075830d412..dd21a625d20 100644
--- a/net-analyzer/darkstat/darkstat-3.0.719-r1.ebuild
+++ b/net-analyzer/darkstat/darkstat-3.0.719-r1.ebuild
@@ -60,7 +60,9 @@ pkg_preinst() {
pkg_postinst() {
# Workaround bug #141619
- DARKSTAT_CHROOT_DIR=`sed -n 's/^#CHROOT=\(.*\)/\1/p' "${ROOT}"etc/conf.d/darkstat`
+ DARKSTAT_CHROOT_DIR=$(
+ sed -n 's/^#CHROOT=\(.*\)/\1/p' "${ROOT}"/etc/conf.d/darkstat
+ )
chown darkstat:0 "${ROOT}${DARKSTAT_CHROOT_DIR}"
elog "To start different darkstat instances which will listen on a different"
diff --git a/net-analyzer/darkstat/darkstat-9999999.ebuild b/net-analyzer/darkstat/darkstat-9999999.ebuild
index a22c4018efb..c9d630ebf3f 100644
--- a/net-analyzer/darkstat/darkstat-9999999.ebuild
+++ b/net-analyzer/darkstat/darkstat-9999999.ebuild
@@ -60,7 +60,9 @@ pkg_preinst() {
pkg_postinst() {
# Workaround bug #141619
- DARKSTAT_CHROOT_DIR=`sed -n 's/^#CHROOT=\(.*\)/\1/p' "${ROOT}"etc/conf.d/darkstat`
+ DARKSTAT_CHROOT_DIR=$(
+ sed -n 's/^#CHROOT=\(.*\)/\1/p' "${ROOT}"/etc/conf.d/darkstat
+ )
chown darkstat:0 "${ROOT}${DARKSTAT_CHROOT_DIR}"
elog "To start different darkstat instances which will listen on a different"
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/darkstat/
@ 2020-07-03 11:07 Jeroen Roovers
0 siblings, 0 replies; 18+ messages in thread
From: Jeroen Roovers @ 2020-07-03 11:07 UTC (permalink / raw
To: gentoo-commits
commit: 4dbe8ac984a72421f8ed63a95c80adfd3881b966
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 3 11:06:04 2020 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Jul 3 11:06:59 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dbe8ac9
net-analyzer/darkstat: BDEPEND on app-editors/vim-core
The live ebuild requires xxd to generate favicon.h.
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
net-analyzer/darkstat/darkstat-9999999.ebuild | 3 +++
1 file changed, 3 insertions(+)
diff --git a/net-analyzer/darkstat/darkstat-9999999.ebuild b/net-analyzer/darkstat/darkstat-9999999.ebuild
index c9d630ebf3f..294f80c7140 100644
--- a/net-analyzer/darkstat/darkstat-9999999.ebuild
+++ b/net-analyzer/darkstat/darkstat-9999999.ebuild
@@ -12,6 +12,9 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
+BDEPEND="
+ app-editors/vim-core
+"
DEPEND="
dev-libs/libbsd
net-libs/libpcap
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/darkstat/
@ 2020-10-03 15:30 David Seifert
0 siblings, 0 replies; 18+ messages in thread
From: David Seifert @ 2020-10-03 15:30 UTC (permalink / raw
To: gentoo-commits
commit: 9debbf90feae5dde7a8bbb7e14af0eadeffc3042
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 3 15:29:50 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Oct 3 15:29:50 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9debbf90
net-analyzer/darkstat: [QA] Port to GLEP 81
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../{darkstat-3.0.719.ebuild => darkstat-3.0.719-r2.ebuild} | 10 ++++------
.../{darkstat-3.0.719-r1.ebuild => darkstat-3.0.719-r3.ebuild} | 8 +++-----
net-analyzer/darkstat/darkstat-9999999.ebuild | 8 +++-----
3 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/net-analyzer/darkstat/darkstat-3.0.719.ebuild b/net-analyzer/darkstat/darkstat-3.0.719-r2.ebuild
similarity index 94%
rename from net-analyzer/darkstat/darkstat-3.0.719.ebuild
rename to net-analyzer/darkstat/darkstat-3.0.719-r2.ebuild
index eb3e78e31c6..041df6e159d 100644
--- a/net-analyzer/darkstat/darkstat-3.0.719.ebuild
+++ b/net-analyzer/darkstat/darkstat-3.0.719-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit autotools user
+
+inherit autotools
DESCRIPTION="Network traffic analyzer with cute web interface"
HOMEPAGE="https://unix4lyfe.org/darkstat/"
@@ -13,6 +14,7 @@ SLOT="0"
KEYWORDS="amd64 ppc x86"
DEPEND="
+ acct-user/darkstat
dev-libs/libbsd
net-libs/libpcap
sys-libs/zlib
@@ -50,10 +52,6 @@ src_install() {
chown darkstat:0 "${D}${DARKSTAT_CHROOT_DIR}"
}
-pkg_preinst() {
- enewuser darkstat
-}
-
pkg_postinst() {
# Workaround bug #141619
DARKSTAT_CHROOT_DIR=`sed -n 's/^#CHROOT=\(.*\)/\1/p' "${ROOT}"etc/conf.d/darkstat`
diff --git a/net-analyzer/darkstat/darkstat-3.0.719-r1.ebuild b/net-analyzer/darkstat/darkstat-3.0.719-r3.ebuild
similarity index 96%
rename from net-analyzer/darkstat/darkstat-3.0.719-r1.ebuild
rename to net-analyzer/darkstat/darkstat-3.0.719-r3.ebuild
index dd21a625d20..d67ebb1e93f 100644
--- a/net-analyzer/darkstat/darkstat-3.0.719-r1.ebuild
+++ b/net-analyzer/darkstat/darkstat-3.0.719-r3.ebuild
@@ -2,7 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit autotools user
+
+inherit autotools
DESCRIPTION="Network traffic analyzer with cute web interface"
HOMEPAGE="https://unix4lyfe.org/darkstat/"
@@ -13,6 +14,7 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
DEPEND="
+ acct-user/darkstat
dev-libs/libbsd
net-libs/libpcap
sys-libs/zlib
@@ -54,10 +56,6 @@ src_install() {
chown darkstat:0 "${D}${DARKSTAT_CHROOT_DIR}"
}
-pkg_preinst() {
- enewuser darkstat
-}
-
pkg_postinst() {
# Workaround bug #141619
DARKSTAT_CHROOT_DIR=$(
diff --git a/net-analyzer/darkstat/darkstat-9999999.ebuild b/net-analyzer/darkstat/darkstat-9999999.ebuild
index 294f80c7140..4ca39eb748e 100644
--- a/net-analyzer/darkstat/darkstat-9999999.ebuild
+++ b/net-analyzer/darkstat/darkstat-9999999.ebuild
@@ -2,7 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit autotools git-r3 user
+
+inherit autotools git-r3
DESCRIPTION="Network traffic analyzer with cute web interface"
HOMEPAGE="https://unix4lyfe.org/darkstat/"
@@ -16,6 +17,7 @@ BDEPEND="
app-editors/vim-core
"
DEPEND="
+ acct-user/darkstat
dev-libs/libbsd
net-libs/libpcap
sys-libs/zlib
@@ -57,10 +59,6 @@ src_install() {
chown darkstat:0 "${D}${DARKSTAT_CHROOT_DIR}"
}
-pkg_preinst() {
- enewuser darkstat
-}
-
pkg_postinst() {
# Workaround bug #141619
DARKSTAT_CHROOT_DIR=$(
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/darkstat/
@ 2021-03-15 21:25 Sam James
0 siblings, 0 replies; 18+ messages in thread
From: Sam James @ 2021-03-15 21:25 UTC (permalink / raw
To: gentoo-commits
commit: d186c45dc608985ceba8e02ec83a4ebe26bb234c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 15 21:24:32 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 15 21:24:32 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d186c45d
net-analyzer/darkstat: Stabilize 3.0.719-r3 ppc, #776520
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-analyzer/darkstat/darkstat-3.0.719-r3.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-analyzer/darkstat/darkstat-3.0.719-r3.ebuild b/net-analyzer/darkstat/darkstat-3.0.719-r3.ebuild
index d67ebb1e93f..02b79383074 100644
--- a/net-analyzer/darkstat/darkstat-3.0.719-r3.ebuild
+++ b/net-analyzer/darkstat/darkstat-3.0.719-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://unix4lyfe.org/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc ~x86"
DEPEND="
acct-user/darkstat
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/darkstat/
@ 2021-03-15 21:25 Sam James
0 siblings, 0 replies; 18+ messages in thread
From: Sam James @ 2021-03-15 21:25 UTC (permalink / raw
To: gentoo-commits
commit: 3bc7354f3032f6d2047c19c71373d4f0d30de8a6
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 15 21:24:55 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 15 21:24:55 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bc7354f
net-analyzer/darkstat: Stabilize 3.0.719-r3 amd64, #776520
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-analyzer/darkstat/darkstat-3.0.719-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/darkstat/darkstat-3.0.719-r3.ebuild b/net-analyzer/darkstat/darkstat-3.0.719-r3.ebuild
index 02b79383074..a741a6ceb34 100644
--- a/net-analyzer/darkstat/darkstat-3.0.719-r3.ebuild
+++ b/net-analyzer/darkstat/darkstat-3.0.719-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://unix4lyfe.org/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ppc ~x86"
+KEYWORDS="amd64 ppc ~x86"
DEPEND="
acct-user/darkstat
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/darkstat/
@ 2021-03-15 21:54 Sam James
0 siblings, 0 replies; 18+ messages in thread
From: Sam James @ 2021-03-15 21:54 UTC (permalink / raw
To: gentoo-commits
commit: f71cddf2f99b1986aee229fc05fd929bb44ebe4e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 15 21:54:17 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 15 21:54:17 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f71cddf2
net-analyzer/darkstat: Stabilize 3.0.719-r3 x86, #776520
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-analyzer/darkstat/darkstat-3.0.719-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/darkstat/darkstat-3.0.719-r3.ebuild b/net-analyzer/darkstat/darkstat-3.0.719-r3.ebuild
index a741a6ceb34..f14539d204e 100644
--- a/net-analyzer/darkstat/darkstat-3.0.719-r3.ebuild
+++ b/net-analyzer/darkstat/darkstat-3.0.719-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://unix4lyfe.org/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
DEPEND="
acct-user/darkstat
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/darkstat/
@ 2021-03-15 22:02 Sam James
0 siblings, 0 replies; 18+ messages in thread
From: Sam James @ 2021-03-15 22:02 UTC (permalink / raw
To: gentoo-commits
commit: 77ac9273f6ba60cf38df347977ddd61a61149d1e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 15 21:57:55 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 15 22:01:25 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77ac9273
net-analyzer/darkstat: drop 3.0.719-r2
Bug: https://bugs.gentoo.org/776520
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-analyzer/darkstat/darkstat-3.0.719-r2.ebuild | 67 ------------------------
1 file changed, 67 deletions(-)
diff --git a/net-analyzer/darkstat/darkstat-3.0.719-r2.ebuild b/net-analyzer/darkstat/darkstat-3.0.719-r2.ebuild
deleted file mode 100644
index 041df6e159d..00000000000
--- a/net-analyzer/darkstat/darkstat-3.0.719-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Network traffic analyzer with cute web interface"
-HOMEPAGE="https://unix4lyfe.org/darkstat/"
-SRC_URI="https://unix4lyfe.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-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 )
-
-src_prepare() {
- default
-
- sed -i -e 's|-flto||g' configure.ac || die
-
- eautoreconf
-}
-
-src_configure() {
- econf --disable-debug --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}"
- chown darkstat:0 "${D}${DARKSTAT_CHROOT_DIR}"
-}
-
-pkg_postinst() {
- # Workaround bug #141619
- DARKSTAT_CHROOT_DIR=`sed -n 's/^#CHROOT=\(.*\)/\1/p' "${ROOT}"etc/conf.d/darkstat`
- chown darkstat:0 "${ROOT}${DARKSTAT_CHROOT_DIR}"
-
- 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 "darkstat script where 'if' is the name of the interface."
- elog "Also in /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}\""
-}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/darkstat/
@ 2022-05-04 4:23 Sam James
0 siblings, 0 replies; 18+ messages in thread
From: Sam James @ 2022-05-04 4:23 UTC (permalink / raw
To: gentoo-commits
commit: d0f45a093c6e8d77c24125fd5c8a3089930e76be
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May 4 04:18:32 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May 4 04:19:19 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0f45a09
net-analyzer/darkstat: add github upstream metadata
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-analyzer/darkstat/metadata.xml | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
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>
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/darkstat/
@ 2022-05-04 4:23 Sam James
0 siblings, 0 replies; 18+ messages in thread
From: Sam James @ 2022-05-04 4:23 UTC (permalink / raw
To: gentoo-commits
commit: 210c3f977cf72db1948716e4b7d85c7a5a984b5f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May 4 04:10:31 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May 4 04:19:18 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=210c3f97
net-analyzer/darkstat: add error handling; EAPI 8; live template
- EAPI 8
- Add error handling for if chroot directory is empty (don't try to chown /;
thankfully no -R option was there)
- Use fowners instead of chown to notice missing user earlier (although shouldn't
happen)
- Use live ebuild template
Reported-by: Corvus
Signed-off-by: Sam James <sam <AT> gentoo.org>
...t-9999999.ebuild => darkstat-3.0.719-r4.ebuild} | 46 +++++++++++----------
net-analyzer/darkstat/darkstat-9999999.ebuild | 48 ++++++++++++----------
2 files changed, 52 insertions(+), 42 deletions(-)
diff --git a/net-analyzer/darkstat/darkstat-9999999.ebuild b/net-analyzer/darkstat/darkstat-3.0.719-r4.ebuild
similarity index 58%
copy from net-analyzer/darkstat/darkstat-9999999.ebuild
copy to net-analyzer/darkstat/darkstat-3.0.719-r4.ebuild
index 4ca39eb748e3..1f62dd3d13c0 100644
--- a/net-analyzer/darkstat/darkstat-9999999.ebuild
+++ b/net-analyzer/darkstat/darkstat-3.0.719-r4.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://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"
-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 )
+
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/darkstat-9999999.ebuild b/net-analyzer/darkstat/darkstat-9999999.ebuild
index 4ca39eb748e3..1274c0c32950 100644
--- a/net-analyzer/darkstat/darkstat-9999999.ebuild
+++ b/net-analyzer/darkstat/darkstat-9999999.ebuild
@@ -1,32 +1,35 @@
-# 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://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"
-KEYWORDS=""
-BDEPEND="
- app-editors/vim-core
-"
-DEPEND="
- acct-user/darkstat
+# The live ebuild requires xxd to generate favicon.h.
+BDEPEND="app-editors/vim-core"
+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 )
+
PATCHES=(
"${FILESDIR}"/${PN}-3.0.719-strncpy-off-by-one.patch
)
@@ -56,21 +59,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#/}"
}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/darkstat/
@ 2022-05-04 4:23 Sam James
0 siblings, 0 replies; 18+ messages in thread
From: Sam James @ 2022-05-04 4:23 UTC (permalink / raw
To: gentoo-commits
commit: e62359063839dad95ddbf367340f1782b7a8298b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May 4 04:22:46 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May 4 04:22:46 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6235906
net-analyzer/darkstat: add 3.0.721
xxd no longer needed for live ebuilds either.
Reported-by: Corvus
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-analyzer/darkstat/Manifest | 1 +
.../darkstat/{darkstat-9999999.ebuild => darkstat-3.0.721.ebuild} | 8 +++-----
net-analyzer/darkstat/darkstat-9999999.ebuild | 8 +++-----
3 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/net-analyzer/darkstat/Manifest b/net-analyzer/darkstat/Manifest
index 0614aa5c743d..72513312afdc 100644
--- a/net-analyzer/darkstat/Manifest
+++ b/net-analyzer/darkstat/Manifest
@@ -1 +1,2 @@
DIST darkstat-3.0.719.tar.bz2 117695 BLAKE2B b2aef3073aafaa42d006fd9ade652ea3542a5f238e347b219ee30e995915fa38b005161d26dff6a9a3e01e98b426ec14c32e1390592128d5816278e5f895f178 SHA512 264f6c5f862745fbfb5d125aae5a319369f028fd7be96cfb12775147f528a36b7f5a42bcd6434f2d376933292364641f2ec9cd9bdb1fe105f5a905e331181f98
+DIST darkstat-3.0.721.tar.gz 104050 BLAKE2B 1005bd3e40be59ad214c95908b34e70eb8b60e33a9b85ee3f6b7fa7f8f6691fad73234ef228ec529aaad0e8ad9eb07f0bdb9d08a560103af3cb377fd11765436 SHA512 077eec3cc69b021966d4545f408a7444136cedb8be1dbae96fb1ce94d9bcd3a1db3bf4ea1bed8999088b24f7e2ed333d1166fe39bf974f32772b8c8f6fde707c
diff --git a/net-analyzer/darkstat/darkstat-9999999.ebuild b/net-analyzer/darkstat/darkstat-3.0.721.ebuild
similarity index 88%
copy from net-analyzer/darkstat/darkstat-9999999.ebuild
copy to net-analyzer/darkstat/darkstat-3.0.721.ebuild
index 1274c0c32950..dcd53be61eb1 100644
--- a/net-analyzer/darkstat/darkstat-9999999.ebuild
+++ b/net-analyzer/darkstat/darkstat-3.0.721.ebuild
@@ -8,18 +8,16 @@ 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"
+ EGIT_REPO_URI="https://github.com/emikulic/darkstat"
inherit git-r3
else
- SRC_URI="https://unix4lyfe.org/${PN}/${P}.tar.bz2"
+ 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"
-# The live ebuild requires xxd to generate favicon.h.
-BDEPEND="app-editors/vim-core"
DEPEND="acct-user/darkstat
dev-libs/libbsd
net-libs/libpcap
@@ -28,7 +26,7 @@ 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
diff --git a/net-analyzer/darkstat/darkstat-9999999.ebuild b/net-analyzer/darkstat/darkstat-9999999.ebuild
index 1274c0c32950..dcd53be61eb1 100644
--- a/net-analyzer/darkstat/darkstat-9999999.ebuild
+++ b/net-analyzer/darkstat/darkstat-9999999.ebuild
@@ -8,18 +8,16 @@ 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"
+ EGIT_REPO_URI="https://github.com/emikulic/darkstat"
inherit git-r3
else
- SRC_URI="https://unix4lyfe.org/${PN}/${P}.tar.bz2"
+ 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"
-# The live ebuild requires xxd to generate favicon.h.
-BDEPEND="app-editors/vim-core"
DEPEND="acct-user/darkstat
dev-libs/libbsd
net-libs/libpcap
@@ -28,7 +26,7 @@ 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
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/darkstat/
@ 2022-05-05 1:35 Sam James
0 siblings, 0 replies; 18+ messages in thread
From: Sam James @ 2022-05-05 1:35 UTC (permalink / raw
To: gentoo-commits
commit: 4ab9acecb1933be12a68032aa6d1fba06c4c642e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu May 5 01:35:00 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May 5 01:35:00 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ab9acec
net-analyzer/darkstat: simplify chroot logic
It's easier to just print the default value and let the user handle the rest.
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../{darkstat-3.0.721.ebuild => darkstat-3.0.721-r1.ebuild} | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/net-analyzer/darkstat/darkstat-3.0.721.ebuild b/net-analyzer/darkstat/darkstat-3.0.721-r1.ebuild
similarity index 82%
rename from net-analyzer/darkstat/darkstat-3.0.721.ebuild
rename to net-analyzer/darkstat/darkstat-3.0.721-r1.ebuild
index dcd53be61eb1..3f38088b33e0 100644
--- a/net-analyzer/darkstat/darkstat-3.0.721.ebuild
+++ b/net-analyzer/darkstat/darkstat-3.0.721-r1.ebuild
@@ -61,20 +61,12 @@ src_install() {
}
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#/}"
+ 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)."
}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/darkstat/
@ 2022-12-18 19:36 Arthur Zamarin
0 siblings, 0 replies; 18+ messages in thread
From: Arthur Zamarin @ 2022-12-18 19:36 UTC (permalink / raw
To: gentoo-commits
commit: 4cfd779c6cef0e5ed9d6d0f0cc5b184f1b31054b
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 18 19:36:28 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 18 19:36:28 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cfd779c
net-analyzer/darkstat: Stabilize 3.0.721-r1 amd64, #886933
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
net-analyzer/darkstat/darkstat-3.0.721-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/darkstat/darkstat-3.0.721-r1.ebuild b/net-analyzer/darkstat/darkstat-3.0.721-r1.ebuild
index cb88de810c76..3e6de7f9ed76 100644
--- a/net-analyzer/darkstat/darkstat-3.0.721-r1.ebuild
+++ b/net-analyzer/darkstat/darkstat-3.0.721-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/emikulic/darkstat/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ppc x86"
+ KEYWORDS="amd64 ppc x86"
fi
LICENSE="GPL-2"
^ permalink raw reply related [flat|nested] 18+ messages in thread
end of thread, other threads:[~2022-12-18 19:36 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-07-03 11:07 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/darkstat/ Jeroen Roovers
-- strict thread matches above, loose matches on Subject: below --
2022-12-18 19:36 Arthur Zamarin
2022-05-05 1:35 Sam James
2022-05-04 4:23 Sam James
2022-05-04 4:23 Sam James
2022-05-04 4:23 Sam James
2021-03-15 22:02 Sam James
2021-03-15 21:54 Sam James
2021-03-15 21:25 Sam James
2021-03-15 21:25 Sam James
2020-10-03 15:30 David Seifert
2020-07-03 9:55 Jeroen Roovers
2020-07-03 9:55 Jeroen Roovers
2017-03-08 5:03 Jeroen Roovers
2017-02-24 14:07 Agostino Sarubbo
2017-02-22 16:08 Agostino Sarubbo
2017-02-22 15:06 Agostino Sarubbo
2017-02-21 23:55 Jeroen Roovers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox