From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BBEA4138336 for ; Tue, 30 Apr 2019 14:02:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A61F1E0993; Tue, 30 Apr 2019 14:02:12 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1F2CAE0998 for ; Tue, 30 Apr 2019 14:02:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 423D7342F71 for ; Tue, 30 Apr 2019 14:02:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A9C075CD for ; Tue, 30 Apr 2019 14:02:08 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1556632923.d7d5091e957eef385af8236032cf6ab0a4ef1170.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/vnstat/files/, net-analyzer/vnstat/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/vnstat/Manifest net-analyzer/vnstat/files/vnstat-2.2-conf.patch net-analyzer/vnstat/files/vnstat-2.2-drop-root.patch net-analyzer/vnstat/files/vnstat-2.2-run.patch net-analyzer/vnstat/vnstat-2.2.ebuild net-analyzer/vnstat/vnstat-9999.ebuild X-VCS-Directories: net-analyzer/vnstat/files/ net-analyzer/vnstat/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: d7d5091e957eef385af8236032cf6ab0a4ef1170 X-VCS-Branch: master Date: Tue, 30 Apr 2019 14:02:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 34498f0d-2d2b-437a-88fe-07bc1053c85f X-Archives-Hash: d5ed041b95fe31ef54c7e49e2ad9c685 commit: d7d5091e957eef385af8236032cf6ab0a4ef1170 Author: Jeroen Roovers gentoo org> AuthorDate: Tue Apr 30 13:56:17 2019 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Tue Apr 30 14:02:03 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7d5091e net-analyzer/vnstat: Version 2.2 Package-Manager: Portage-2.3.65, Repoman-2.3.12 Signed-off-by: Jeroen Roovers gentoo.org> net-analyzer/vnstat/Manifest | 1 + net-analyzer/vnstat/files/vnstat-2.2-conf.patch | 11 +++++++++++ net-analyzer/vnstat/files/vnstat-2.2-drop-root.patch | 15 +++++++++++++++ net-analyzer/vnstat/files/vnstat-2.2-run.patch | 11 +++++++++++ .../vnstat/{vnstat-9999.ebuild => vnstat-2.2.ebuild} | 16 ++++++++-------- net-analyzer/vnstat/vnstat-9999.ebuild | 14 +++++++------- 6 files changed, 53 insertions(+), 15 deletions(-) diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest index 8fc1998d237..2b4f0f02c40 100644 --- 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 index 00000000000..7bea5d8ffe9 --- /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 index 00000000000..2ed3ec1404a --- /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 index 00000000000..bb9222b5fe2 --- /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-9999.ebuild b/net-analyzer/vnstat/vnstat-2.2.ebuild similarity index 81% copy from net-analyzer/vnstat/vnstat-9999.ebuild copy to net-analyzer/vnstat/vnstat-2.2.ebuild index 5e41cb65356..c5e123218ab 100644 --- a/net-analyzer/vnstat/vnstat-9999.ebuild +++ b/net-analyzer/vnstat/vnstat-2.2.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit git-r3 systemd user +EAPI=7 +inherit systemd user DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage" HOMEPAGE="https://humdi.net/vnstat/" -EGIT_REPO_URI="https://github.com/vergoh/vnstat" +SRC_URI="https://humdi.net/vnstat/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="" +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" IUSE="gd selinux test" COMMON_DEPEND=" @@ -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() { diff --git a/net-analyzer/vnstat/vnstat-9999.ebuild b/net-analyzer/vnstat/vnstat-9999.ebuild index 5e41cb65356..0b1d3019112 100644 --- 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 }