public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/vnstat/, net-analyzer/vnstat/files/
@ 2022-05-04 23:28 Sam James
  0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2022-05-04 23:28 UTC (permalink / raw
  To: gentoo-commits

commit:     0c4aec370693915e3b08e735e033955b4e7f86ff
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May  4 05:43:26 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May  4 23:28:37 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c4aec37

net-analyzer/vnstat: drop 2.8, 1.7

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/vnstat/Manifest                       |  4 -
 net-analyzer/vnstat/files/vnstat-2.2-conf.patch    | 11 ---
 .../vnstat/files/vnstat-2.2-drop-root.patch        | 15 ----
 net-analyzer/vnstat/files/vnstat.cron              |  9 ---
 net-analyzer/vnstat/files/vnstatd.confd            |  7 --
 net-analyzer/vnstat/files/vnstatd.initd-r1         | 37 ----------
 net-analyzer/vnstat/vnstat-1.17-r1.ebuild          | 78 --------------------
 net-analyzer/vnstat/vnstat-2.8.ebuild              | 86 ----------------------
 8 files changed, 247 deletions(-)

diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest
index 522f2f8774e3..5a8ce57dfe4c 100644
--- a/net-analyzer/vnstat/Manifest
+++ b/net-analyzer/vnstat/Manifest
@@ -1,6 +1,2 @@
-DIST vnstat-1.17.tar.gz 238397 BLAKE2B 73aaffda3c91a1146b1d6a21f637272be227a15a7964aad90fb76c407c5f7fb0085e6f9f54408e8ebc667475c15f260d701c5924737f20921ebc0a35affd52be SHA512 c9c119a89054dacdc15026c766a20d88336d7689dd4264530d0347fcc58f3cbfc806b271e0f83e76c3b4a31ab793a628ee7d7b696943da919ee4cd2fdb481cc3
-DIST vnstat-1.17.tar.gz.asc 819 BLAKE2B 3186e28dc29edb37eb0bbef9b29f1ea682e4a9de208b69b83a8bc99c81f272eb6865176aaa30e415bf8423d94f385e0725e1256eeb822c3152638eaace23b749 SHA512 c26af29daefe6431c1769812d04ba5bff92ac1241a6a49df11e28f0e51b21d4eb84ff1f1fb133a388fd8ac59967162bc5d60d5f02c409d34be5414acd34f7818
-DIST vnstat-2.8.tar.gz 290644 BLAKE2B 21ff801ce6abb135c26eb937eadb447bea9fd3dcb2af123051edb9861e088d8fc217f84ef2d924fe8b480388cfc761d0259f8abb2312ae49c2840643787d49bd SHA512 207aa1699df298ce3008153701782634a96a239599d17a5b2f1fbb298a9cf8edb35298e2de1f4f93415ddf34e0bdb831f95984b47fdd7f89ecc6aeb4821a0afd
-DIST vnstat-2.8.tar.gz.asc 833 BLAKE2B 097d37e1916924901f10d09bba882357c0eb81cf71fca921dbc642735ec8c0bde97f7ab63cd3953718c21687e6f39099cf2446210f41f3698b39b74116c4c025 SHA512 d5448d68da92d434cc6a34e007002c81ed8d97e533bf99364d3f65b4125bd6f21fe2f6f6efb97775ecc4ba4afd09e12add71ae2299a2d990a7a9d0a591c32811
 DIST vnstat-2.9.tar.gz 300796 BLAKE2B 1671fe49f3add0087431b57aaa69d4c6280066a299e6899c00cd5bf6ec21380d1457295f884f683ebfb89959eea08a9d900e898a865e3f6ff2a82ecf354d974a SHA512 883f273c02f6d91478991d95deffba9d90457a1bb0b9dd818c01398365df97ffb72dda88299231d9076756192b05524b6f8820470c9caf6ee6a12e5914a82176
 DIST vnstat-2.9.tar.gz.asc 833 BLAKE2B 4dd17e02e6c0c5232354ea8c4dea1d86ac43015ac66c60dc227b143aa5352e5a1eb0870932662778b2350928b124e2bbc56dfa13cfe7c2fd74538d84c00f9b4c SHA512 bf57974afb028fef7ec311a15bb1dcf275f10b845c5512efe73711b622b5912c4de0ff0553db4152389d2421a468c888191eab8fca08212e164f997ad1e04778

diff --git a/net-analyzer/vnstat/files/vnstat-2.2-conf.patch b/net-analyzer/vnstat/files/vnstat-2.2-conf.patch
deleted file mode 100644
index 7bea5d8ffe97..000000000000
--- a/net-analyzer/vnstat/files/vnstat-2.2-conf.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/cfg/vnstat.conf
-+++ b/cfg/vnstat.conf
-@@ -143,7 +143,7 @@
- LogFile "/var/log/vnstat/vnstat.log"
- 
- # file used as daemon pid / lock file
--PidFile "/var/run/vnstat/vnstat.pid"
-+PidFile "/run/vnstat/vnstat.pid"
- 
- # 1 = 64-bit, 0 = 32-bit, -1 = old style logic, -2 = automatic detection
- 64bitInterfaceCounters -2

diff --git a/net-analyzer/vnstat/files/vnstat-2.2-drop-root.patch b/net-analyzer/vnstat/files/vnstat-2.2-drop-root.patch
deleted file mode 100644
index 2ed3ec1404a4..000000000000
--- a/net-analyzer/vnstat/files/vnstat-2.2-drop-root.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/cfg/vnstat.conf
-+++ b/cfg/vnstat.conf
-@@ -69,10 +69,10 @@
- ##
- 
- # switch to given user when started as root (leave empty to disable)
--DaemonUser ""
-+DaemonUser "vnstat"
- 
- # switch to given group when started as root (leave empty to disable)
--DaemonGroup ""
-+DaemonGroup "vnstat"
- 
- # try to detect interface maximum bandwidth, 0 = disable feature
- # MaxBandwidth will be used as fallback value when enabled

diff --git a/net-analyzer/vnstat/files/vnstat.cron b/net-analyzer/vnstat/files/vnstat.cron
deleted file mode 100644
index 690681327688..000000000000
--- a/net-analyzer/vnstat/files/vnstat.cron
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-# run vnstat if installed and at least one database exists
-
-# Uncomment the following to enable
-
-#if [ -x /usr/bin/vnstat ] && [ `ls /var/lib/vnstat/ | wc -l` -ge 1 ] ; then
-#    exec /usr/bin/vnstat -u
-#fi

diff --git a/net-analyzer/vnstat/files/vnstatd.confd b/net-analyzer/vnstat/files/vnstatd.confd
deleted file mode 100644
index 17901419aacb..000000000000
--- a/net-analyzer/vnstat/files/vnstatd.confd
+++ /dev/null
@@ -1,7 +0,0 @@
-# /etc/conf.d/vnstatd: config file for /etc/init.d/vnstatd
-
-# Adjust scheduling priority on vnstatd (default: 0)
-#VNSTATD_NICELEVEL="0"
-
-# Pass extra options to vnstatd
-#VNSTATD_EXTRAOPTS="--config /etc/vnstat.conf"

diff --git a/net-analyzer/vnstat/files/vnstatd.initd-r1 b/net-analyzer/vnstat/files/vnstatd.initd-r1
deleted file mode 100644
index a8d61efe0f2a..000000000000
--- a/net-analyzer/vnstat/files/vnstatd.initd-r1
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_started_commands="reload"
-
-depend() {
-	use net
-}
-
-VNSTATD_PIDFILE="${VNSTATD_PIDFILE:-/run/vnstatd/vnstatd.pid}"
-
-start() {
-	ebegin "Starting vnstatd"
-	checkpath -q -d -m 755 -o vnstat:vnstat /run/vnstatd
-	checkpath -q -d -m 755 -o vnstat:vnstat /var/lib/vnstat
-	start-stop-daemon --start --quiet \
-		--pidfile "${VNSTATD_PIDFILE}" \
-		--user vnstat --group vnstat \
-		--nicelevel ${VNSTATD_NICELEVEL:-0} \
-		--exec /usr/bin/vnstatd -- \
-		-d ${VNSTATD_EXTRAOPTS} -p ${VNSTATD_PIDFILE}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping vnstatd"
-	start-stop-daemon --stop --quiet \
-		--pidfile "${VNSTATD_PIDFILE}"
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading vnstatd configuration"
-	kill -HUP $(cat "${VNSTATD_PIDFILE}") 2>&1 >/dev/null
-	eend $?
-}

diff --git a/net-analyzer/vnstat/vnstat-1.17-r1.ebuild b/net-analyzer/vnstat/vnstat-1.17-r1.ebuild
deleted file mode 100644
index d02d852bedfd..000000000000
--- a/net-analyzer/vnstat/vnstat-1.17-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/teemutoivola.asc
-inherit flag-o-matic toolchain-funcs verify-sig
-
-DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage"
-HOMEPAGE="https://humdi.net/vnstat/"
-SRC_URI="https://humdi.net/vnstat/${P}.tar.gz"
-SRC_URI+=" verify-sig? ( https://humdi.net/vnstat/${P}.tar.gz.asc )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~hppa ppc ppc64 sparc x86"
-IUSE="gd selinux test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="gd? ( media-libs/gd[png] )"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-libs/check )
-"
-RDEPEND+=" acct-group/vnstat
-	acct-user/vnstat
-	selinux? ( sec-policy/selinux-vnstatd )"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-teemutoivola )"
-
-src_prepare() {
-	default
-
-	tc-export CC
-
-	sed -i \
-		-e 's|vnstat[.]log|vnstatd.log|' \
-		-e 's|vnstat[.]pid|vnstatd/vnstatd.pid|' \
-		-e 's|/var/run|/run|' \
-		cfg/${PN}.conf || die
-
-	sed -i \
-		-e '/PIDFILE/s|/var/run|/run|' \
-		src/common.h || die
-}
-
-src_configure() {
-	tc-export CC
-
-	# Fails to build with GCC 10
-	append-flags -fcommon
-
-	default
-}
-
-src_compile() {
-	emake ${PN} ${PN}d $(usex gd ${PN}i '')
-}
-
-src_install() {
-	use gd && dobin vnstati
-	dobin vnstat vnstatd
-
-	exeinto /etc/cron.hourly
-	newexe "${FILESDIR}"/vnstat.cron vnstat
-
-	insinto /etc
-	doins cfg/vnstat.conf
-	fowners root:vnstat /etc/vnstat.conf
-
-	newconfd "${FILESDIR}"/vnstatd.confd vnstatd
-	newinitd "${FILESDIR}"/vnstatd.initd-r1 vnstatd
-
-	use gd && doman man/vnstati.1
-	doman man/vnstat.1 man/vnstatd.1
-
-	newdoc INSTALL README.setup
-	dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi
-}

diff --git a/net-analyzer/vnstat/vnstat-2.8.ebuild b/net-analyzer/vnstat/vnstat-2.8.ebuild
deleted file mode 100644
index 3abe8761ff15..000000000000
--- a/net-analyzer/vnstat/vnstat-2.8.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd tmpfiles
-
-DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage"
-HOMEPAGE="https://humdi.net/vnstat/"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/vergoh/vnstat"
-	inherit git-r3
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/teemutoivola.asc
-	inherit verify-sig
-
-	SRC_URI="https://humdi.net/vnstat/${P}.tar.gz"
-	SRC_URI+=" verify-sig? ( https://humdi.net/vnstat/${P}.tar.gz.asc )"
-
-	KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 sparc x86"
-
-	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-teemutoivola )"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="gd selinux test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-group/vnstat
-	acct-user/vnstat
-	dev-db/sqlite
-	gd? ( media-libs/gd[png] )
-"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-libs/check )
-"
-RDEPEND+=" selinux? ( sec-policy/selinux-vnstatd )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2-conf.patch
-	"${FILESDIR}"/${PN}-2.2-drop-root.patch
-	"${FILESDIR}"/${PN}-2.2-run.patch
-)
-
-src_compile() {
-	emake \
-		${PN} \
-		${PN}d \
-		$(usex gd ${PN}i '')
-}
-
-src_install() {
-	use gd && dobin vnstati
-	dobin vnstat vnstatd
-
-	exeinto /usr/share/${PN}
-	newexe "${FILESDIR}"/vnstat.cron-r1 vnstat.cron
-
-	insinto /etc
-	doins cfg/vnstat.conf
-	fowners root:vnstat /etc/vnstat.conf
-
-	keepdir /var/lib/vnstat
-	fowners vnstat:vnstat /var/lib/vnstat
-
-	newconfd "${FILESDIR}"/vnstatd.confd-r1 vnstatd
-	newinitd "${FILESDIR}"/vnstatd.initd-r2 vnstatd
-
-	systemd_newunit "${FILESDIR}"/vnstatd.systemd vnstatd.service
-	newtmpfiles "${FILESDIR}"/vnstatd.tmpfile vnstatd.conf
-
-	use gd && doman man/vnstati.1
-
-	doman man/vnstat.1 man/vnstatd.8
-
-	newdoc INSTALL README.setup
-	dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi
-}
-
-pkg_postinst() {
-	tmpfiles_process vnstatd.conf
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/vnstat/, net-analyzer/vnstat/files/
@ 2019-07-13  9:52 Jeroen Roovers
  0 siblings, 0 replies; 5+ messages in thread
From: Jeroen Roovers @ 2019-07-13  9:52 UTC (permalink / raw
  To: gentoo-commits

commit:     ac8bc5f2b24a57810bfd9740e0694ffab2b43c11
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 13 09:51:45 2019 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Jul 13 09:52:28 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac8bc5f2

net-analyzer/vnstat: Old

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 net-analyzer/vnstat/Manifest                       |  1 -
 net-analyzer/vnstat/files/vnstat-1.17-conf.patch   | 15 -----
 .../vnstat/files/vnstat-1.17-drop-root.patch       | 15 -----
 net-analyzer/vnstat/files/vnstat-1.17-run.patch    | 11 ----
 net-analyzer/vnstat/vnstat-2.1.ebuild              | 68 ----------------------
 5 files changed, 110 deletions(-)

diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest
index 986b1960229..7c1993ad9cc 100644
--- a/net-analyzer/vnstat/Manifest
+++ b/net-analyzer/vnstat/Manifest
@@ -1,4 +1,3 @@
 DIST vnstat-1.17.tar.gz 238397 BLAKE2B 73aaffda3c91a1146b1d6a21f637272be227a15a7964aad90fb76c407c5f7fb0085e6f9f54408e8ebc667475c15f260d701c5924737f20921ebc0a35affd52be SHA512 c9c119a89054dacdc15026c766a20d88336d7689dd4264530d0347fcc58f3cbfc806b271e0f83e76c3b4a31ab793a628ee7d7b696943da919ee4cd2fdb481cc3
-DIST vnstat-2.1.tar.gz 259622 BLAKE2B 703e1260d0ea81a016ed89dbfa830f97ff6e38ca2dd4c96ea08ca8293e71cde8cf0048e6a68b9cb6f2f94aaec66764bbfc718173897d40fd6e8166c07d7e627c SHA512 4c88795ee254cb550873e7db72a5f7b795553ef944c3f4df4c351e83376ea02ae6f3376b01edf727072fe2ba178372705a73483c24269acc4c173ee0e03f8930
 DIST vnstat-2.2.tar.gz 264037 BLAKE2B dc82798a0c619d2aea3d3cbdd42bb10f73769b0e64443407daabc8838e5af5b0ef718c0769321116269f1bc6f50e99133a1d38ccb730f658f3215a83180589b7 SHA512 47bd544ed071268774bf55a8269f50694d2af0b14fe3eb50b707c4f09c9a0c0653360ac892136275355b2a647a0fed731f007d135edf4bc9b04dc537bf248acc
 DIST vnstat-2.3.tar.gz 269907 BLAKE2B b935c7baec34f15213b3fe320add4e3ecf0d3cd43d5934231eb9b96f3bc8171aa056e1a08d42cafdc2d06b9e6108d04392a1452a3d24bdbaf748722c53f64f23 SHA512 244aae8a127fb93407918e90efefe09d901410abbfda715272f1d754692661f2036ea98cc7f75ebc53ec27249ba676f84463af24ed7e19a9a130d6ce29b32677

diff --git a/net-analyzer/vnstat/files/vnstat-1.17-conf.patch b/net-analyzer/vnstat/files/vnstat-1.17-conf.patch
deleted file mode 100644
index 5bcbdafb2a7..00000000000
--- a/net-analyzer/vnstat/files/vnstat-1.17-conf.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/cfg/vnstat.conf
-+++ b/cfg/vnstat.conf
-@@ -115,10 +115,10 @@
- UpdateFileOwner 1
- 
- # file used for logging if UseLogging is set to 1
--LogFile "/var/log/vnstat/vnstat.log"
-+LogFile "/var/log/vnstat/vnstatd.log"
- 
- # file used as daemon pid / lock file
--PidFile "/var/run/vnstat/vnstat.pid"
-+PidFile "/run/vnstat/vnstatd/vnstatd.pid"
- 
- 
- # vnstati

diff --git a/net-analyzer/vnstat/files/vnstat-1.17-drop-root.patch b/net-analyzer/vnstat/files/vnstat-1.17-drop-root.patch
deleted file mode 100644
index c0446c3b341..00000000000
--- a/net-analyzer/vnstat/files/vnstat-1.17-drop-root.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/cfg/vnstat.conf
-+++ b/cfg/vnstat.conf
-@@ -81,10 +81,10 @@
- ##
- 
- # switch to given user when started as root (leave empty to disable)
--DaemonUser ""
-+DaemonUser "vnstat"
- 
- # switch to given user when started as root (leave empty to disable)
--DaemonGroup ""
-+DaemonGroup "vnstat"
- 
- # how often (in seconds) interface data is updated
- UpdateInterval 30

diff --git a/net-analyzer/vnstat/files/vnstat-1.17-run.patch b/net-analyzer/vnstat/files/vnstat-1.17-run.patch
deleted file mode 100644
index 4afe449ceed..00000000000
--- a/net-analyzer/vnstat/files/vnstat-1.17-run.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/common.h
-+++ b/src/common.h
-@@ -198,7 +198,7 @@
- #define CREATEDIRS 1
- #define UPDATEFILEOWNER 1
- #define LOGFILE "/var/log/vnstat/vnstat.log"
--#define PIDFILE "/var/run/vnstat/vnstat.pid"
-+#define PIDFILE "/run/vnstat/vnstat.pid"
- 
- /* no transparency by default */
- #define TRANSBG 0

diff --git a/net-analyzer/vnstat/vnstat-2.1.ebuild b/net-analyzer/vnstat/vnstat-2.1.ebuild
deleted file mode 100644
index b28272d8b5d..00000000000
--- a/net-analyzer/vnstat/vnstat-2.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit systemd user
-
-DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage"
-HOMEPAGE="https://humdi.net/vnstat/"
-SRC_URI="https://humdi.net/vnstat/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gd selinux test"
-
-COMMON_DEPEND="
-	dev-db/sqlite
-	gd? ( media-libs/gd[png] )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	test? ( dev-libs/check )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	selinux? ( sec-policy/selinux-vnstatd )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.17-conf.patch
-	"${FILESDIR}"/${PN}-1.17-drop-root.patch
-	"${FILESDIR}"/${PN}-1.17-run.patch
-)
-
-pkg_setup() {
-	enewgroup vnstat
-	enewuser vnstat -1 -1 /var/lib/vnstat vnstat
-}
-
-src_compile() {
-	emake ${PN} ${PN}d $(usex gd ${PN}i '')
-}
-
-src_install() {
-	use gd && dobin vnstati
-	dobin vnstat vnstatd
-
-	exeinto /usr/share/${PN}
-	newexe "${FILESDIR}"/vnstat.cron-r1 vnstat.cron
-
-	insinto /etc
-	doins cfg/vnstat.conf
-	fowners root:vnstat /etc/vnstat.conf
-
-	keepdir /var/lib/vnstat
-	fowners vnstat:vnstat /var/lib/vnstat
-
-	newconfd "${FILESDIR}"/vnstatd.confd-r1 vnstatd
-	newinitd "${FILESDIR}"/vnstatd.initd-r2 vnstatd
-
-	systemd_newunit "${FILESDIR}"/vnstatd.systemd vnstatd.service
-	systemd_newtmpfilesd "${FILESDIR}"/vnstatd.tmpfile vnstatd.conf
-
-	use gd && doman man/vnstati.1
-	doman man/vnstat.1 man/vnstatd.1
-
-	newdoc INSTALL README.setup
-	dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/vnstat/, net-analyzer/vnstat/files/
@ 2017-10-14 13:25 Jeroen Roovers
  0 siblings, 0 replies; 5+ messages in thread
From: Jeroen Roovers @ 2017-10-14 13:25 UTC (permalink / raw
  To: gentoo-commits

commit:     fa49bd03d6ed83cf14b30542dc1e57f9549d1154
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 14 13:24:35 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Oct 14 13:24:35 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa49bd03

net-analyzer/vnstat: Drop privileges by default.

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 net-analyzer/vnstat/files/vnstat-1.17-drop-root.patch     | 15 +++++++++++++++
 .../{vnstat-1.17-r2.ebuild => vnstat-1.17-r3.ebuild}      |  1 +
 2 files changed, 16 insertions(+)

diff --git a/net-analyzer/vnstat/files/vnstat-1.17-drop-root.patch b/net-analyzer/vnstat/files/vnstat-1.17-drop-root.patch
new file mode 100644
index 00000000000..c0446c3b341
--- /dev/null
+++ b/net-analyzer/vnstat/files/vnstat-1.17-drop-root.patch
@@ -0,0 +1,15 @@
+--- a/cfg/vnstat.conf
++++ b/cfg/vnstat.conf
+@@ -81,10 +81,10 @@
+ ##
+ 
+ # switch to given user when started as root (leave empty to disable)
+-DaemonUser ""
++DaemonUser "vnstat"
+ 
+ # switch to given user when started as root (leave empty to disable)
+-DaemonGroup ""
++DaemonGroup "vnstat"
+ 
+ # how often (in seconds) interface data is updated
+ UpdateInterval 30

diff --git a/net-analyzer/vnstat/vnstat-1.17-r2.ebuild b/net-analyzer/vnstat/vnstat-1.17-r3.ebuild
similarity index 97%
rename from net-analyzer/vnstat/vnstat-1.17-r2.ebuild
rename to net-analyzer/vnstat/vnstat-1.17-r3.ebuild
index 88ba28fdb0e..6e0d7ba752b 100644
--- a/net-analyzer/vnstat/vnstat-1.17-r2.ebuild
+++ b/net-analyzer/vnstat/vnstat-1.17-r3.ebuild
@@ -26,6 +26,7 @@ RDEPEND="
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.17-conf.patch
+	"${FILESDIR}"/${PN}-1.17-drop-root.patch
 	"${FILESDIR}"/${PN}-1.17-run.patch
 )
 


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/vnstat/, net-analyzer/vnstat/files/
@ 2017-10-13 13:35 Jeroen Roovers
  0 siblings, 0 replies; 5+ messages in thread
From: Jeroen Roovers @ 2017-10-13 13:35 UTC (permalink / raw
  To: gentoo-commits

commit:     d7020024ba12df55773ebdd034a800aafe0a7124
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 13 13:34:55 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Oct 13 13:35:26 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7020024

net-analyzer/vnstat: Fix test, remove 26 volume elog epic.

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 net-analyzer/vnstat/files/vnstat-1.17-limit.patch | 11 ++++++
 net-analyzer/vnstat/vnstat-1.17-r1.ebuild         | 47 ++---------------------
 2 files changed, 14 insertions(+), 44 deletions(-)

diff --git a/net-analyzer/vnstat/files/vnstat-1.17-limit.patch b/net-analyzer/vnstat/files/vnstat-1.17-limit.patch
new file mode 100644
index 00000000000..e1706977e52
--- /dev/null
+++ b/net-analyzer/vnstat/files/vnstat-1.17-limit.patch
@@ -0,0 +1,11 @@
+--- a/tests/config_tests.c
++++ b/tests/config_tests.c
+@@ -99,7 +99,7 @@
+ 	cfg.maxbw = 10;
+ 	ret  = ibwget("ethnone", &limit);
+ 	ck_assert_int_eq(ret, 1);
+-	ck_assert_int_eq(limit, 8);
++	ck_assert_int_eq(limit, 10);
+ }
+ END_TEST
+ 

diff --git a/net-analyzer/vnstat/vnstat-1.17-r1.ebuild b/net-analyzer/vnstat/vnstat-1.17-r1.ebuild
index 0c24c6dc601..2805e1d0d1c 100644
--- a/net-analyzer/vnstat/vnstat-1.17-r1.ebuild
+++ b/net-analyzer/vnstat/vnstat-1.17-r1.ebuild
@@ -24,6 +24,9 @@ RDEPEND="
 	${COMMON_DEPEND}
 	selinux? ( sec-policy/selinux-vnstatd )
 "
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.17-limit.patch
+)
 
 pkg_setup() {
 	enewgroup vnstat
@@ -77,47 +80,3 @@ src_install() {
 	newdoc INSTALL README.setup
 	dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi
 }
-
-pkg_postinst() {
-	local _v
-	for _v in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 1.17-r1 ${_v}; then
-			# This is an upgrade
-			elog ""
-			elog "Beginning with ${PN}-1.17-r1, we no longer install and use the cron job"
-			elog "per default to update vnStat databases because you will lose some traffic"
-			elog "if your interface transfers more than ~4GB in the time between two cron"
-			elog "runs".
-			elog ""
-			elog "Please make sure that the vnstatd service is enabled if you want to"
-			elog "continue monitoring your traffic."
-
-			# Show this elog only once
-			break
-		fi
-	done
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		elog
-		elog "Repeat the following command for every interface you"
-		elog "wish to monitor (replace eth0):"
-		elog "   vnstat -u -i eth0"
-		elog "and set correct permissions after that, e.g."
-		elog "   chown -R vnstat:vnstat /var/lib/vnstat"
-		elog
-		elog "It is highly recommended to use the included vnstatd to update your"
-		elog "vnStat databases."
-		elog
-		elog "If you want to use the old cron way to update your vnStat databases,"
-		elog "you have to install the cron job manually:"
-		elog ""
-		elog "   cp /usr/share/${PN}/vnstat.cron /etc/cron.hourly/vnstat"
-		elog ""
-		elog "Note: if an interface transfers more than ~4GB in"
-		elog "the time between cron runs, you may miss traffic."
-		elog "That's why using vnstatd instead of the cronjob is"
-		elog "the recommended way to update your vnStat databases."
-	fi
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/vnstat/, net-analyzer/vnstat/files/
@ 2017-04-27 19:15 Jeroen Roovers
  0 siblings, 0 replies; 5+ messages in thread
From: Jeroen Roovers @ 2017-04-27 19:15 UTC (permalink / raw
  To: gentoo-commits

commit:     ebb9cc9bd067bed38f51ae61b39c5feb4a132a93
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 27 19:12:31 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Apr 27 19:15:08 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebb9cc9b

net-analyzer/vnstat: Old.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-analyzer/vnstat/Manifest            |  2 -
 net-analyzer/vnstat/files/vnstatd.initd | 36 -----------------
 net-analyzer/vnstat/vnstat-1.15.ebuild  | 69 --------------------------------
 net-analyzer/vnstat/vnstat-1.16.ebuild  | 71 ---------------------------------
 4 files changed, 178 deletions(-)

diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest
index 19e53d5148e..b22b3eca81e 100644
--- a/net-analyzer/vnstat/Manifest
+++ b/net-analyzer/vnstat/Manifest
@@ -1,3 +1 @@
-DIST vnstat-1.15.tar.gz 207712 SHA256 c3814b5baa8b627198a8debfe1dce4b4346a342523818cc8668a5497971dbc39 SHA512 e6cf714c2c95ae7f82ec7852d23067da28f4fab83cf33726e4268a31f982ddf13c3bc30f17251a80f7c65d25f394cd05379a30e677687ce70f8c7b229ac0cb4e WHIRLPOOL 7cb68f5c054c96697e415f4d3c23074f36ba1b8fdd012abf732cb6e50eff0a4a862267ac252aace1d5d7fea38cd5f525113a9cdb7e27d9cd58fce373a68896c6
-DIST vnstat-1.16.tar.gz 211844 SHA256 420fec6c89229a100697f3189e824a1b81f7148dd651558f2ff03cc298308e8b SHA512 8906acebead4aef7ec7e96c4f9f17a2b9483f69cf530eb21d2ddc60de71b7690453bf533acfac298cf7e5184c23c7e6a886a757fdbfac3006cc09653c9a2cf6b WHIRLPOOL 1898fdefdbe4bbb75f7864b910786a42b6e6d462a6b35e9f55b26a3496086eb4b77cfa14908a9e0db0846fa85ae50c7c8eef652048445c461d06f866d2d32140
 DIST vnstat-1.17.tar.gz 238397 SHA256 18e4c53576ca9e1ef2f0e063a6d83b0c44e3b1cf008560d658745df5c9aa7971 SHA512 c9c119a89054dacdc15026c766a20d88336d7689dd4264530d0347fcc58f3cbfc806b271e0f83e76c3b4a31ab793a628ee7d7b696943da919ee4cd2fdb481cc3 WHIRLPOOL 38f64c6eadf7bbfcc1cd6cc3d8f8ea3da4846dd64caf242628ce9d0e6f9b8f565dff9d31ecd1633b3a0a8b5e7dcd4545f1adeafeb4f42547ad87be77317622e3

diff --git a/net-analyzer/vnstat/files/vnstatd.initd b/net-analyzer/vnstat/files/vnstatd.initd
deleted file mode 100644
index 1993b6414f8..00000000000
--- a/net-analyzer/vnstat/files/vnstatd.initd
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_started_commands="reload"
-
-depend() {
-	use net
-}
-
-VNSTATD_PIDFILE="${VNSTATD_PIDFILE:-/var/run/vnstatd/vnstatd.pid}"
-
-start() {
-	ebegin "Starting vnstatd"
-	checkpath -q -d -m 755 -o vnstat:vnstat /var/run/vnstatd
-	start-stop-daemon --start --quiet \
-		--pidfile "${VNSTATD_PIDFILE}" \
-		--user vnstat --group vnstat \
-		--nicelevel ${VNSTATD_NICELEVEL:-0} \
-		--exec /usr/bin/vnstatd -- \
-		-d ${VNSTATD_EXTRAOPTS} -p ${VNSTATD_PIDFILE}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping vnstatd"
-	start-stop-daemon --stop --quiet \
-		--pidfile "${VNSTATD_PIDFILE}"
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading vnstatd configuration"
-	kill -HUP $(< "${VNSTATD_PIDFILE}") &>/dev/null
-	eend $?
-}

diff --git a/net-analyzer/vnstat/vnstat-1.15.ebuild b/net-analyzer/vnstat/vnstat-1.15.ebuild
deleted file mode 100644
index 3210f90bdf7..00000000000
--- a/net-analyzer/vnstat/vnstat-1.15.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit toolchain-funcs user
-
-DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage"
-HOMEPAGE="http://humdi.net/vnstat/"
-SRC_URI="http://humdi.net/vnstat/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 sparc x86"
-IUSE="gd selinux test"
-
-COMMON_DEPEND="
-	gd? ( media-libs/gd[png] )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	test? ( dev-libs/check )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	selinux? ( sec-policy/selinux-vnstatd )
-"
-
-pkg_setup() {
-	enewgroup vnstat
-	enewuser vnstat -1 -1 /dev/null vnstat
-}
-
-src_prepare() {
-	tc-export CC
-
-	sed -i \
-		-e 's|vnstat[.]log|vnstatd.log|' \
-		-e 's|vnstat[.]pid|vnstatd/vnstatd.pid|' \
-		-e 's|/var/run|/run|' \
-		cfg/${PN}.conf || die
-	sed -i \
-		-e '/PIDFILE/s|/var/run|/run|' \
-		src/common.h || die
-}
-
-src_compile() {
-	emake ${PN} ${PN}d $(usex gd ${PN}i '')
-}
-
-src_install() {
-	use gd && dobin vnstati
-	dobin vnstat vnstatd
-
-	exeinto /etc/cron.hourly
-	newexe "${FILESDIR}"/vnstat.cron vnstat
-
-	insinto /etc
-	doins cfg/vnstat.conf
-	fowners root:vnstat /etc/vnstat.conf
-
-	newconfd "${FILESDIR}"/vnstatd.confd vnstatd
-	newinitd "${FILESDIR}"/vnstatd.initd-r1 vnstatd
-
-	use gd && doman man/vnstati.1
-	doman man/vnstat.1 man/vnstatd.1
-
-	newdoc INSTALL README.setup
-	dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi
-}

diff --git a/net-analyzer/vnstat/vnstat-1.16.ebuild b/net-analyzer/vnstat/vnstat-1.16.ebuild
deleted file mode 100644
index 1c810d09039..00000000000
--- a/net-analyzer/vnstat/vnstat-1.16.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs user
-
-DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage"
-HOMEPAGE="http://humdi.net/vnstat/"
-SRC_URI="http://humdi.net/vnstat/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gd selinux test"
-
-COMMON_DEPEND="
-	gd? ( media-libs/gd[png] )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	test? ( dev-libs/check )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	selinux? ( sec-policy/selinux-vnstatd )
-"
-
-pkg_setup() {
-	enewgroup vnstat
-	enewuser vnstat -1 -1 /dev/null vnstat
-}
-
-src_prepare() {
-	default
-
-	tc-export CC
-
-	sed -i \
-		-e 's|vnstat[.]log|vnstatd.log|' \
-		-e 's|vnstat[.]pid|vnstatd/vnstatd.pid|' \
-		-e 's|/var/run|/run|' \
-		cfg/${PN}.conf || die
-	sed -i \
-		-e '/PIDFILE/s|/var/run|/run|' \
-		src/common.h || die
-}
-
-src_compile() {
-	emake ${PN} ${PN}d $(usex gd ${PN}i '')
-}
-
-src_install() {
-	use gd && dobin vnstati
-	dobin vnstat vnstatd
-
-	exeinto /etc/cron.hourly
-	newexe "${FILESDIR}"/vnstat.cron vnstat
-
-	insinto /etc
-	doins cfg/vnstat.conf
-	fowners root:vnstat /etc/vnstat.conf
-
-	newconfd "${FILESDIR}"/vnstatd.confd vnstatd
-	newinitd "${FILESDIR}"/vnstatd.initd-r1 vnstatd
-
-	use gd && doman man/vnstati.1
-	doman man/vnstat.1 man/vnstatd.1
-
-	newdoc INSTALL README.setup
-	dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-05-04 23:29 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-05-04 23:28 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/vnstat/, net-analyzer/vnstat/files/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2019-07-13  9:52 Jeroen Roovers
2017-10-14 13:25 Jeroen Roovers
2017-10-13 13:35 Jeroen Roovers
2017-04-27 19:15 Jeroen Roovers

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox