1 |
commit: 3901be72186d7e9cd269179eb915145d33e1e805 |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Oct 13 18:00:18 2017 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Oct 13 18:00:18 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3901be72 |
7 |
|
8 |
net-analyzer/vnstat: Revert patching the test, drop sed script instead (bug #623906). |
9 |
|
10 |
Package-Manager: Portage-2.3.11, Repoman-2.3.3 |
11 |
|
12 |
net-analyzer/vnstat/files/vnstat-1.17-conf.patch | 15 ++++++++++++++ |
13 |
net-analyzer/vnstat/files/vnstat-1.17-limit.patch | 11 ---------- |
14 |
net-analyzer/vnstat/files/vnstat-1.17-run.patch | 11 ++++++++++ |
15 |
...vnstat-1.17-r1.ebuild => vnstat-1.17-r2.ebuild} | 24 ++++------------------ |
16 |
4 files changed, 30 insertions(+), 31 deletions(-) |
17 |
|
18 |
diff --git a/net-analyzer/vnstat/files/vnstat-1.17-conf.patch b/net-analyzer/vnstat/files/vnstat-1.17-conf.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..b939e7c0435 |
21 |
--- /dev/null |
22 |
+++ b/net-analyzer/vnstat/files/vnstat-1.17-conf.patch |
23 |
@@ -0,0 +1,15 @@ |
24 |
+--- a/cfg/vnstat.conf.JeR |
25 |
++++ b/cfg/vnstat.conf |
26 |
+@@ -115,10 +115,10 @@ |
27 |
+ UpdateFileOwner 1 |
28 |
+ |
29 |
+ # file used for logging if UseLogging is set to 1 |
30 |
+-LogFile "/var/log/vnstat/vnstat.log" |
31 |
++LogFile "/var/log/vnstat/vnstatd.log" |
32 |
+ |
33 |
+ # file used as daemon pid / lock file |
34 |
+-PidFile "/var/run/vnstat/vnstat.pid" |
35 |
++PidFile "/run/vnstat/vnstatd/vnstatd.pid" |
36 |
+ |
37 |
+ |
38 |
+ # vnstati |
39 |
|
40 |
diff --git a/net-analyzer/vnstat/files/vnstat-1.17-limit.patch b/net-analyzer/vnstat/files/vnstat-1.17-limit.patch |
41 |
deleted file mode 100644 |
42 |
index e1706977e52..00000000000 |
43 |
--- a/net-analyzer/vnstat/files/vnstat-1.17-limit.patch |
44 |
+++ /dev/null |
45 |
@@ -1,11 +0,0 @@ |
46 |
---- a/tests/config_tests.c |
47 |
-+++ b/tests/config_tests.c |
48 |
-@@ -99,7 +99,7 @@ |
49 |
- cfg.maxbw = 10; |
50 |
- ret = ibwget("ethnone", &limit); |
51 |
- ck_assert_int_eq(ret, 1); |
52 |
-- ck_assert_int_eq(limit, 8); |
53 |
-+ ck_assert_int_eq(limit, 10); |
54 |
- } |
55 |
- END_TEST |
56 |
- |
57 |
|
58 |
diff --git a/net-analyzer/vnstat/files/vnstat-1.17-run.patch b/net-analyzer/vnstat/files/vnstat-1.17-run.patch |
59 |
new file mode 100644 |
60 |
index 00000000000..e3b514d0c6b |
61 |
--- /dev/null |
62 |
+++ b/net-analyzer/vnstat/files/vnstat-1.17-run.patch |
63 |
@@ -0,0 +1,11 @@ |
64 |
+--- a/src/common.h.JeR |
65 |
++++ b/src/common.h |
66 |
+@@ -198,7 +198,7 @@ |
67 |
+ #define CREATEDIRS 1 |
68 |
+ #define UPDATEFILEOWNER 1 |
69 |
+ #define LOGFILE "/var/log/vnstat/vnstat.log" |
70 |
+-#define PIDFILE "/var/run/vnstat/vnstat.pid" |
71 |
++#define PIDFILE "/run/vnstat/vnstat.pid" |
72 |
+ |
73 |
+ /* no transparency by default */ |
74 |
+ #define TRANSBG 0 |
75 |
|
76 |
diff --git a/net-analyzer/vnstat/vnstat-1.17-r1.ebuild b/net-analyzer/vnstat/vnstat-1.17-r2.ebuild |
77 |
similarity index 76% |
78 |
rename from net-analyzer/vnstat/vnstat-1.17-r1.ebuild |
79 |
rename to net-analyzer/vnstat/vnstat-1.17-r2.ebuild |
80 |
index c3c76c43018..88ba28fdb0e 100644 |
81 |
--- a/net-analyzer/vnstat/vnstat-1.17-r1.ebuild |
82 |
+++ b/net-analyzer/vnstat/vnstat-1.17-r2.ebuild |
83 |
@@ -1,8 +1,8 @@ |
84 |
# Copyright 1999-2017 Gentoo Foundation |
85 |
# Distributed under the terms of the GNU General Public License v2 |
86 |
|
87 |
-EAPI="6" |
88 |
-inherit systemd toolchain-funcs user |
89 |
+EAPI=6 |
90 |
+inherit systemd user |
91 |
|
92 |
DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage" |
93 |
HOMEPAGE="http://humdi.net/vnstat/" |
94 |
@@ -25,7 +25,8 @@ RDEPEND=" |
95 |
selinux? ( sec-policy/selinux-vnstatd ) |
96 |
" |
97 |
PATCHES=( |
98 |
- "${FILESDIR}"/${PN}-1.17-limit.patch |
99 |
+ "${FILESDIR}"/${PN}-1.17-conf.patch |
100 |
+ "${FILESDIR}"/${PN}-1.17-run.patch |
101 |
) |
102 |
|
103 |
pkg_setup() { |
104 |
@@ -33,23 +34,6 @@ pkg_setup() { |
105 |
enewuser vnstat -1 -1 /var/lib/vnstat vnstat |
106 |
} |
107 |
|
108 |
-src_prepare() { |
109 |
- default |
110 |
- |
111 |
- tc-export CC |
112 |
- |
113 |
- sed -i \ |
114 |
- -e 's|^\(MaxBWethnone.*\)$|#\1|' \ |
115 |
- -e 's|^Daemon\(.*\) ""$|Daemon\1 "vnstat"|' \ |
116 |
- -e 's|vnstat[.]log|vnstatd.log|' \ |
117 |
- -e 's|vnstat[.]pid|vnstatd.pid|' \ |
118 |
- -e 's|/var/run|/run|' \ |
119 |
- cfg/${PN}.conf || die |
120 |
- sed -i \ |
121 |
- -e '/PIDFILE/s|/var/run|/run|' \ |
122 |
- src/common.h || die |
123 |
-} |
124 |
- |
125 |
src_compile() { |
126 |
emake ${PN} ${PN}d $(usex gd ${PN}i '') |
127 |
} |