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 4091B13835A for ; Mon, 26 Apr 2021 15:37:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 86602E086F; Mon, 26 Apr 2021 15:37:39 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 59BFFE086F for ; Mon, 26 Apr 2021 15:37:39 +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 53B6034146C for ; Mon, 26 Apr 2021 15:37:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9A351733 for ; Mon, 26 Apr 2021 15:37:35 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1619451442.0b0163a009b3269f74b3584f3700c577e9df3aa3.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/vnstat/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/vnstat/Manifest net-analyzer/vnstat/vnstat-1.17.ebuild net-analyzer/vnstat/vnstat-2.6.ebuild net-analyzer/vnstat/vnstat-9999.ebuild X-VCS-Directories: net-analyzer/vnstat/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 0b0163a009b3269f74b3584f3700c577e9df3aa3 X-VCS-Branch: master Date: Mon, 26 Apr 2021 15:37:35 +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: 38808519-85db-49c8-ad44-fc3fb01a00fc X-Archives-Hash: 44b70021f6cb27673a35b5d9393166d6 commit: 0b0163a009b3269f74b3584f3700c577e9df3aa3 Author: Sam James gentoo org> AuthorDate: Mon Apr 26 15:16:58 2021 +0000 Commit: Sam James gentoo org> CommitDate: Mon Apr 26 15:37:22 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b0163a0 net-analyzer/vnstat: use live template, add verify-sig support Signed-off-by: Sam James gentoo.org> net-analyzer/vnstat/Manifest | 2 ++ net-analyzer/vnstat/vnstat-1.17.ebuild | 5 ++++- net-analyzer/vnstat/vnstat-2.6.ebuild | 18 ++++++++++++++++-- net-analyzer/vnstat/vnstat-9999.ebuild | 19 +++++++++++++++++-- 4 files changed, 39 insertions(+), 5 deletions(-) diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest index d1ad555e13f..5d92ab13417 100644 --- a/net-analyzer/vnstat/Manifest +++ b/net-analyzer/vnstat/Manifest @@ -1,2 +1,4 @@ DIST vnstat-1.17.tar.gz 238397 BLAKE2B 73aaffda3c91a1146b1d6a21f637272be227a15a7964aad90fb76c407c5f7fb0085e6f9f54408e8ebc667475c15f260d701c5924737f20921ebc0a35affd52be SHA512 c9c119a89054dacdc15026c766a20d88336d7689dd4264530d0347fcc58f3cbfc806b271e0f83e76c3b4a31ab793a628ee7d7b696943da919ee4cd2fdb481cc3 +DIST vnstat-1.17.tar.gz.asc 819 BLAKE2B 3186e28dc29edb37eb0bbef9b29f1ea682e4a9de208b69b83a8bc99c81f272eb6865176aaa30e415bf8423d94f385e0725e1256eeb822c3152638eaace23b749 SHA512 c26af29daefe6431c1769812d04ba5bff92ac1241a6a49df11e28f0e51b21d4eb84ff1f1fb133a388fd8ac59967162bc5d60d5f02c409d34be5414acd34f7818 DIST vnstat-2.6.tar.gz 275751 BLAKE2B 7351b265d66e42d1e5450dae6f5eaa973a9cdc171b865689540b5838ddeb2629da968bc2ba655cb6ff909227a859f0334900a1597c78b772124a993343a4cf23 SHA512 1a62fc9c2379b050208945e85bad04f602a0f2c71e6bd069d241c1df77c76ec6258948fc3fdf633b15c52665782cae4f995a916103d330bfb46cab0291d3a1ea +DIST vnstat-2.6.tar.gz.asc 833 BLAKE2B 5e79d1b622dd4d37603a209b78018a3e88f2c404c700e1f439e4b98e2c2dd5bdf26e8ecd3b1b1242e14a725d7839c5a8b3b5448dc27e1f917cbeaf6012546656 SHA512 c643152bec14b70317465f8adc2256b41b8686e106b35ce492ad5030c2d5b32162441ac5fb2f309071da855efdf444076288cf075d8073bad0c0907067366e7f diff --git a/net-analyzer/vnstat/vnstat-1.17.ebuild b/net-analyzer/vnstat/vnstat-1.17.ebuild index 9207b1560e1..5a1f12b3e07 100644 --- a/net-analyzer/vnstat/vnstat-1.17.ebuild +++ b/net-analyzer/vnstat/vnstat-1.17.ebuild @@ -3,11 +3,13 @@ EAPI=7 -inherit toolchain-funcs user +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/teemutoivola.asc +inherit toolchain-funcs user verify-sig 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" +SRC_URI+=" verify-sig? ( https://humdi.net/vnstat/${P}.tar.gz.asc )" LICENSE="GPL-2" SLOT="0" @@ -21,6 +23,7 @@ DEPEND=" test? ( dev-libs/check ) " RDEPEND+=" selinux? ( sec-policy/selinux-vnstatd )" +BDEPEND="verify-sig? ( app-crypt/openpgp-keys-teemutoivola )" pkg_setup() { enewgroup vnstat diff --git a/net-analyzer/vnstat/vnstat-2.6.ebuild b/net-analyzer/vnstat/vnstat-2.6.ebuild index bf03bc30dc4..ca6c778234e 100644 --- a/net-analyzer/vnstat/vnstat-2.6.ebuild +++ b/net-analyzer/vnstat/vnstat-2.6.ebuild @@ -7,11 +7,24 @@ inherit systemd user tmpfiles 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" + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/vergoh/vnstat" + inherit git-r3 +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/teemutoivola.asc + inherit verify-sig + + SRC_URI="https://humdi.net/vnstat/${P}.tar.gz" + SRC_URI+=" verify-sig? ( https://humdi.net/vnstat/${P}.tar.gz.asc )" + + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86" + + BDEPEND="verify-sig? ( app-crypt/openpgp-keys-teemutoivola )" +fi LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86" IUSE="gd selinux test" RESTRICT="!test? ( test )" @@ -61,6 +74,7 @@ src_install() { newtmpfiles "${FILESDIR}"/vnstatd.tmpfile vnstatd.conf use gd && doman man/vnstati.1 + doman man/vnstat.1 man/vnstatd.8 newdoc INSTALL README.setup diff --git a/net-analyzer/vnstat/vnstat-9999.ebuild b/net-analyzer/vnstat/vnstat-9999.ebuild index ff0d5392bc3..ef79532e70f 100644 --- a/net-analyzer/vnstat/vnstat-9999.ebuild +++ b/net-analyzer/vnstat/vnstat-9999.ebuild @@ -3,11 +3,25 @@ EAPI=7 -inherit git-r3 systemd user tmpfiles +inherit systemd user tmpfiles 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" + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/vergoh/vnstat" + inherit git-r3 +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/teemutoivola.asc + inherit verify-sig + + SRC_URI="https://humdi.net/vnstat/${P}.tar.gz" + SRC_URI+=" verify-sig? ( https://humdi.net/vnstat/${P}.tar.gz.asc )" + + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86" + + BDEPEND="verify-sig? ( app-crypt/openpgp-keys-teemutoivola )" +fi LICENSE="GPL-2" SLOT="0" @@ -60,6 +74,7 @@ src_install() { newtmpfiles "${FILESDIR}"/vnstatd.tmpfile vnstatd.conf use gd && doman man/vnstati.1 + doman man/vnstat.1 man/vnstatd.1 newdoc INSTALL.md README.setup