1 |
commit: d7d5091e957eef385af8236032cf6ab0a4ef1170 |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Apr 30 13:56:17 2019 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Apr 30 14:02:03 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7d5091e |
7 |
|
8 |
net-analyzer/vnstat: Version 2.2 |
9 |
|
10 |
Package-Manager: Portage-2.3.65, Repoman-2.3.12 |
11 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
12 |
|
13 |
net-analyzer/vnstat/Manifest | 1 + |
14 |
net-analyzer/vnstat/files/vnstat-2.2-conf.patch | 11 +++++++++++ |
15 |
net-analyzer/vnstat/files/vnstat-2.2-drop-root.patch | 15 +++++++++++++++ |
16 |
net-analyzer/vnstat/files/vnstat-2.2-run.patch | 11 +++++++++++ |
17 |
.../vnstat/{vnstat-9999.ebuild => vnstat-2.2.ebuild} | 16 ++++++++-------- |
18 |
net-analyzer/vnstat/vnstat-9999.ebuild | 14 +++++++------- |
19 |
6 files changed, 53 insertions(+), 15 deletions(-) |
20 |
|
21 |
diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest |
22 |
index 8fc1998d237..2b4f0f02c40 100644 |
23 |
--- a/net-analyzer/vnstat/Manifest |
24 |
+++ b/net-analyzer/vnstat/Manifest |
25 |
@@ -2,3 +2,4 @@ DIST vnstat-1.17.tar.gz 238397 BLAKE2B 73aaffda3c91a1146b1d6a21f637272be227a15a7 |
26 |
DIST vnstat-1.18.tar.gz 242502 BLAKE2B 2190c33ddf1c0a573e638234a94a86eb44fcc39e106ce8ece1f5ee5314dcc1efee237376ec109eb0873b9cf27ac3fe663526512f98a130114d417380bcb82a31 SHA512 4f9f08a57586bc57ede3d66802ee977c69b5f76ab42aa36e942e8d827dfce806dfc04916646fac01f57b026742a639fc5f7395b141a1c03ad11a1f977d02aa68 |
27 |
DIST vnstat-2.0.tar.gz 259439 BLAKE2B f28f10962ae2acf04fc6669268bf5cf911ca2a5c77422b773f82a1ae25a0f90c2022aa5981c701bfa0246340113e24e0c3854174f6b3bee17d5474b9ba0916f0 SHA512 d5c9012b692adc9032ca1abde8619bd6a5de53c7c03b0fcae5b4b901c9769285a9de0b3a4f1bc21cfd74b96cfb10130a95e90cf179126ea676a777e1a9579a62 |
28 |
DIST vnstat-2.1.tar.gz 259622 BLAKE2B 703e1260d0ea81a016ed89dbfa830f97ff6e38ca2dd4c96ea08ca8293e71cde8cf0048e6a68b9cb6f2f94aaec66764bbfc718173897d40fd6e8166c07d7e627c SHA512 4c88795ee254cb550873e7db72a5f7b795553ef944c3f4df4c351e83376ea02ae6f3376b01edf727072fe2ba178372705a73483c24269acc4c173ee0e03f8930 |
29 |
+DIST vnstat-2.2.tar.gz 264037 BLAKE2B dc82798a0c619d2aea3d3cbdd42bb10f73769b0e64443407daabc8838e5af5b0ef718c0769321116269f1bc6f50e99133a1d38ccb730f658f3215a83180589b7 SHA512 47bd544ed071268774bf55a8269f50694d2af0b14fe3eb50b707c4f09c9a0c0653360ac892136275355b2a647a0fed731f007d135edf4bc9b04dc537bf248acc |
30 |
|
31 |
diff --git a/net-analyzer/vnstat/files/vnstat-2.2-conf.patch b/net-analyzer/vnstat/files/vnstat-2.2-conf.patch |
32 |
new file mode 100644 |
33 |
index 00000000000..7bea5d8ffe9 |
34 |
--- /dev/null |
35 |
+++ b/net-analyzer/vnstat/files/vnstat-2.2-conf.patch |
36 |
@@ -0,0 +1,11 @@ |
37 |
+--- a/cfg/vnstat.conf |
38 |
++++ b/cfg/vnstat.conf |
39 |
+@@ -143,7 +143,7 @@ |
40 |
+ LogFile "/var/log/vnstat/vnstat.log" |
41 |
+ |
42 |
+ # file used as daemon pid / lock file |
43 |
+-PidFile "/var/run/vnstat/vnstat.pid" |
44 |
++PidFile "/run/vnstat/vnstat.pid" |
45 |
+ |
46 |
+ # 1 = 64-bit, 0 = 32-bit, -1 = old style logic, -2 = automatic detection |
47 |
+ 64bitInterfaceCounters -2 |
48 |
|
49 |
diff --git a/net-analyzer/vnstat/files/vnstat-2.2-drop-root.patch b/net-analyzer/vnstat/files/vnstat-2.2-drop-root.patch |
50 |
new file mode 100644 |
51 |
index 00000000000..2ed3ec1404a |
52 |
--- /dev/null |
53 |
+++ b/net-analyzer/vnstat/files/vnstat-2.2-drop-root.patch |
54 |
@@ -0,0 +1,15 @@ |
55 |
+--- a/cfg/vnstat.conf |
56 |
++++ b/cfg/vnstat.conf |
57 |
+@@ -69,10 +69,10 @@ |
58 |
+ ## |
59 |
+ |
60 |
+ # switch to given user when started as root (leave empty to disable) |
61 |
+-DaemonUser "" |
62 |
++DaemonUser "vnstat" |
63 |
+ |
64 |
+ # switch to given group when started as root (leave empty to disable) |
65 |
+-DaemonGroup "" |
66 |
++DaemonGroup "vnstat" |
67 |
+ |
68 |
+ # try to detect interface maximum bandwidth, 0 = disable feature |
69 |
+ # MaxBandwidth will be used as fallback value when enabled |
70 |
|
71 |
diff --git a/net-analyzer/vnstat/files/vnstat-2.2-run.patch b/net-analyzer/vnstat/files/vnstat-2.2-run.patch |
72 |
new file mode 100644 |
73 |
index 00000000000..bb9222b5fe2 |
74 |
--- /dev/null |
75 |
+++ b/net-analyzer/vnstat/files/vnstat-2.2-run.patch |
76 |
@@ -0,0 +1,11 @@ |
77 |
+--- a/src/common.h |
78 |
++++ b/src/common.h |
79 |
+@@ -229,7 +229,7 @@ |
80 |
+ #define CREATEDIRS 1 |
81 |
+ #define UPDATEFILEOWNER 1 |
82 |
+ #define LOGFILE "/var/log/vnstat/vnstat.log" |
83 |
+-#define PIDFILE "/var/run/vnstat/vnstat.pid" |
84 |
++#define PIDFILE "/run/vnstat/vnstat.pid" |
85 |
+ #define IS64BIT -2 |
86 |
+ |
87 |
+ /* no transparency by default */ |
88 |
|
89 |
diff --git a/net-analyzer/vnstat/vnstat-9999.ebuild b/net-analyzer/vnstat/vnstat-2.2.ebuild |
90 |
similarity index 81% |
91 |
copy from net-analyzer/vnstat/vnstat-9999.ebuild |
92 |
copy to net-analyzer/vnstat/vnstat-2.2.ebuild |
93 |
index 5e41cb65356..c5e123218ab 100644 |
94 |
--- a/net-analyzer/vnstat/vnstat-9999.ebuild |
95 |
+++ b/net-analyzer/vnstat/vnstat-2.2.ebuild |
96 |
@@ -1,16 +1,16 @@ |
97 |
-# Copyright 1999-2018 Gentoo Foundation |
98 |
+# Copyright 1999-2019 Gentoo Authors |
99 |
# Distributed under the terms of the GNU General Public License v2 |
100 |
|
101 |
-EAPI=6 |
102 |
-inherit git-r3 systemd user |
103 |
+EAPI=7 |
104 |
+inherit systemd user |
105 |
|
106 |
DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage" |
107 |
HOMEPAGE="https://humdi.net/vnstat/" |
108 |
-EGIT_REPO_URI="https://github.com/vergoh/vnstat" |
109 |
+SRC_URI="https://humdi.net/vnstat/${P}.tar.gz" |
110 |
|
111 |
LICENSE="GPL-2" |
112 |
SLOT="0" |
113 |
-KEYWORDS="" |
114 |
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" |
115 |
IUSE="gd selinux test" |
116 |
|
117 |
COMMON_DEPEND=" |
118 |
@@ -26,9 +26,9 @@ RDEPEND=" |
119 |
selinux? ( sec-policy/selinux-vnstatd ) |
120 |
" |
121 |
PATCHES=( |
122 |
- "${FILESDIR}"/${PN}-1.17-conf.patch |
123 |
- "${FILESDIR}"/${PN}-1.17-drop-root.patch |
124 |
- "${FILESDIR}"/${PN}-1.17-run.patch |
125 |
+ "${FILESDIR}"/${PN}-2.2-conf.patch |
126 |
+ "${FILESDIR}"/${PN}-2.2-drop-root.patch |
127 |
+ "${FILESDIR}"/${PN}-2.2-run.patch |
128 |
) |
129 |
|
130 |
pkg_setup() { |
131 |
|
132 |
diff --git a/net-analyzer/vnstat/vnstat-9999.ebuild b/net-analyzer/vnstat/vnstat-9999.ebuild |
133 |
index 5e41cb65356..0b1d3019112 100644 |
134 |
--- a/net-analyzer/vnstat/vnstat-9999.ebuild |
135 |
+++ b/net-analyzer/vnstat/vnstat-9999.ebuild |
136 |
@@ -1,7 +1,7 @@ |
137 |
-# Copyright 1999-2018 Gentoo Foundation |
138 |
+# Copyright 1999-2019 Gentoo Authors |
139 |
# Distributed under the terms of the GNU General Public License v2 |
140 |
|
141 |
-EAPI=6 |
142 |
+EAPI=7 |
143 |
inherit git-r3 systemd user |
144 |
|
145 |
DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage" |
146 |
@@ -26,9 +26,9 @@ RDEPEND=" |
147 |
selinux? ( sec-policy/selinux-vnstatd ) |
148 |
" |
149 |
PATCHES=( |
150 |
- "${FILESDIR}"/${PN}-1.17-conf.patch |
151 |
- "${FILESDIR}"/${PN}-1.17-drop-root.patch |
152 |
- "${FILESDIR}"/${PN}-1.17-run.patch |
153 |
+ "${FILESDIR}"/${PN}-2.2-conf.patch |
154 |
+ "${FILESDIR}"/${PN}-2.2-drop-root.patch |
155 |
+ "${FILESDIR}"/${PN}-2.2-run.patch |
156 |
) |
157 |
|
158 |
pkg_setup() { |
159 |
@@ -63,6 +63,6 @@ src_install() { |
160 |
use gd && doman man/vnstati.1 |
161 |
doman man/vnstat.1 man/vnstatd.1 |
162 |
|
163 |
- newdoc INSTALL README.setup |
164 |
- dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi |
165 |
+ newdoc INSTALL.md README.setup |
166 |
+ dodoc CHANGES README.md UPGRADE.md FAQ examples/vnstat.cgi |
167 |
} |