net-analyzer/vnstat: Version 2.2

Package-Manager: Portage-2.3.65, Repoman-2.3.12
Signed-off-by: Jeroen Roovers <jer@gentoo.org>

diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest
index 8fc1998d23739f83b56bdd69d7d911084fe0fc7a..2b4f0f02c4053ec1d7f131ca50fcb6fb6c474f5d 100644 (file)
--- a/net-analyzer/vnstat/Manifest
+++ b/net-analyzer/vnstat/Manifest
@@ -2,3 +2,4 @@ DIST vnstat-1.17.tar.gz 238397 BLAKE2B 73aaffda3c91a1146b1d6a21f637272be227a15a7
 DIST vnstat-1.18.tar.gz 242502 BLAKE2B 2190c33ddf1c0a573e638234a94a86eb44fcc39e106ce8ece1f5ee5314dcc1efee237376ec109eb0873b9cf27ac3fe663526512f98a130114d417380bcb82a31 SHA512 4f9f08a57586bc57ede3d66802ee977c69b5f76ab42aa36e942e8d827dfce806dfc04916646fac01f57b026742a639fc5f7395b141a1c03ad11a1f977d02aa68
 DIST vnstat-2.0.tar.gz 259439 BLAKE2B f28f10962ae2acf04fc6669268bf5cf911ca2a5c77422b773f82a1ae25a0f90c2022aa5981c701bfa0246340113e24e0c3854174f6b3bee17d5474b9ba0916f0 SHA512 d5c9012b692adc9032ca1abde8619bd6a5de53c7c03b0fcae5b4b901c9769285a9de0b3a4f1bc21cfd74b96cfb10130a95e90cf179126ea676a777e1a9579a62
 DIST vnstat-2.1.tar.gz 259622 BLAKE2B 703e1260d0ea81a016ed89dbfa830f97ff6e38ca2dd4c96ea08ca8293e71cde8cf0048e6a68b9cb6f2f94aaec66764bbfc718173897d40fd6e8166c07d7e627c SHA512 4c88795ee254cb550873e7db72a5f7b795553ef944c3f4df4c351e83376ea02ae6f3376b01edf727072fe2ba178372705a73483c24269acc4c173ee0e03f8930
+DIST vnstat-2.2.tar.gz 264037 BLAKE2B dc82798a0c619d2aea3d3cbdd42bb10f73769b0e64443407daabc8838e5af5b0ef718c0769321116269f1bc6f50e99133a1d38ccb730f658f3215a83180589b7 SHA512 47bd544ed071268774bf55a8269f50694d2af0b14fe3eb50b707c4f09c9a0c0653360ac892136275355b2a647a0fed731f007d135edf4bc9b04dc537bf248acc

diff --git a/net-analyzer/vnstat/files/vnstat-2.2-conf.patch b/net-analyzer/vnstat/files/vnstat-2.2-conf.patch
new file mode 100644 (file)
index 0000000..7bea5d8
--- /dev/null
+++ b/net-analyzer/vnstat/files/vnstat-2.2-conf.patch
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644 (file)
index 0000000..2ed3ec1
--- /dev/null
+++ b/net-analyzer/vnstat/files/vnstat-2.2-drop-root.patch
@@ -0,0 +1,15 @@
+--- 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-2.2-run.patch b/net-analyzer/vnstat/files/vnstat-2.2-run.patch
new file mode 100644 (file)
index 0000000..bb9222b
--- /dev/null
+++ b/net-analyzer/vnstat/files/vnstat-2.2-run.patch
@@ -0,0 +1,11 @@
+--- a/src/common.h
++++ b/src/common.h
+@@ -229,7 +229,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"
+ #define IS64BIT -2
+ 
+ /* no transparency by default */

diff --git a/net-analyzer/vnstat/vnstat-2.2.ebuild b/net-analyzer/vnstat/vnstat-2.2.ebuild
new file mode 100644 (file)
index 0000000..c5e1232
--- /dev/null
+++ b/net-analyzer/vnstat/vnstat-2.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 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}-2.2-conf.patch
+       "${FILESDIR}"/${PN}-2.2-drop-root.patch
+       "${FILESDIR}"/${PN}-2.2-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
+}

diff --git a/net-analyzer/vnstat/vnstat-9999.ebuild b/net-analyzer/vnstat/vnstat-9999.ebuild
index 5e41cb65356a7f4992d46fd98cb755e6631d8fd0..0b1d301911276595131619dd0a90d80e3fa29e19 100644 (file)
--- a/net-analyzer/vnstat/vnstat-9999.ebuild
+++ b/net-analyzer/vnstat/vnstat-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit git-r3 systemd user
 
 DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage"
@@ -26,9 +26,9 @@ RDEPEND="
        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
+       "${FILESDIR}"/${PN}-2.2-conf.patch
+       "${FILESDIR}"/${PN}-2.2-drop-root.patch
+       "${FILESDIR}"/${PN}-2.2-run.patch
 )
 
 pkg_setup() {
@@ -63,6 +63,6 @@ src_install() {
        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
+       newdoc INSTALL.md README.setup
+       dodoc CHANGES README.md UPGRADE.md FAQ examples/vnstat.cgi
 }