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 -}
