From 908778078736bd36f7a60a2d576d415cb8e000fa Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 22 May 2021 07:31:18 +0100 Subject: gentoo resync : 22.05.2021 --- net-analyzer/vnstat/Manifest | 9 ++-- net-analyzer/vnstat/vnstat-1.17-r1.ebuild | 78 +++++++++++++++++++++++++++++ net-analyzer/vnstat/vnstat-1.17.ebuild | 72 --------------------------- net-analyzer/vnstat/vnstat-2.6-r1.ebuild | 79 +++++++++++++++++++++++++++++ net-analyzer/vnstat/vnstat-2.6.ebuild | 82 ------------------------------- net-analyzer/vnstat/vnstat-2.7.ebuild | 82 +++++++++++++++++++++++++++++++ net-analyzer/vnstat/vnstat-9999.ebuild | 20 ++++---- 7 files changed, 255 insertions(+), 167 deletions(-) create mode 100644 net-analyzer/vnstat/vnstat-1.17-r1.ebuild delete mode 100644 net-analyzer/vnstat/vnstat-1.17.ebuild create mode 100644 net-analyzer/vnstat/vnstat-2.6-r1.ebuild delete mode 100644 net-analyzer/vnstat/vnstat-2.6.ebuild create mode 100644 net-analyzer/vnstat/vnstat-2.7.ebuild (limited to 'net-analyzer/vnstat') diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest index 2378c1053feb..df1100d59435 100644 --- a/net-analyzer/vnstat/Manifest +++ b/net-analyzer/vnstat/Manifest @@ -13,7 +13,10 @@ DIST vnstat-1.17.tar.gz 238397 BLAKE2B 73aaffda3c91a1146b1d6a21f637272be227a15a7 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 -EBUILD vnstat-1.17.ebuild 1636 BLAKE2B 105d76a84e9dbfa5faf872a040815fb48a1579a52d9c6e11b83575bd19005211d6cb607f194d243cad11924e1ec32d7d699b8b506a053e92ee7075941bdce8d0 SHA512 2158ca138388c4e26e2e91d32163cfd8fe4be3b1c42926725b7a74c364140e7b65ba6667669ec874df36b4ee19aeebcdf0470d2e8d93425b266ae2584471bb4e -EBUILD vnstat-2.6.ebuild 1864 BLAKE2B 1a39357dafe09afb2d7a9786adf30c8e1da186449853cb6d1ac0882c23ce206eca94955fb73c9be90ccd127f7ad6221d709a1742afe9e990af5c8907f95dd820 SHA512 ec17931121e4a52db571c2ca38a3d39ff51429e6e442f319b9b53e317f4c3c2586ba4402639fb3cc71126b724d9fadd7030ae7c7fd0ec447a3c7efcd14bc7e9d -EBUILD vnstat-9999.ebuild 1880 BLAKE2B a861f7251830efe7e2d6714bf8ed828f0b09d1d6167a0e9e7ba34aca2682ca42ae92c8c73c2bb8bb17ba3a604c3d1d767eb92da2a3b2f80e890c866b2e65c1ff SHA512 01304ab549cfb81fdbf5895bce42d62e609b5291e944a9a003b452be01156a32c53ba24f40b11ef02797f61be825e551f795570ec128cf30f003c30c1b599344 +DIST vnstat-2.7.tar.gz 287304 BLAKE2B f7b50cccfe4b62bce45751e6029650dc6d8ac7b7925cc4177fb1772c6d842b5201f6834d5e6374016b4c42374660b1c127d5b021adffe873de0a4c484171b6b3 SHA512 3d1674ddb5269d29d4d758551dc3e58fb1858a7dd790914c7d74047443b25d242c91f8ab20bdede9c1b061d6b682d73f3d6c1a8aa656a9676bc33c0ed9b1b2d4 +DIST vnstat-2.7.tar.gz.asc 833 BLAKE2B ae9bb28ccd9f10e7ac0c32e9895140cdd9d8498ef18d9b716ffbed3c6693ff08e5ddb08c377ec009df881f7fc1666f09da48cee75857566bdd4f1a2be30a97b9 SHA512 dd1ae2d94400aee9622c28385a103680ca87abfb66b5c92e8ce7240b97f28e81ac1a9cfc97fff7cd6d3934bfa639f46c835acbf855c7a4a29309946d7cbd80d4 +EBUILD vnstat-1.17-r1.ebuild 1705 BLAKE2B cc7ae0926a5cbd7eddbb7c086daf089923047e5e5e7f970d3f43b99f25a8c308a1a366082e0451976115b1f03b37e99db4a40e2a441f86af5cd204ca80988311 SHA512 ae1534aa8199948b44619b91aefa1bfd1d67b025bc3594ab14e3a963e9786dd5a27e98458bdc2fbe9c3d1ef7d6c302331f5c8e8568207ed7291f3209f7d007fe +EBUILD vnstat-2.6-r1.ebuild 1815 BLAKE2B 214e211c905fb49fcb9e86e878e996d80f9430eb21eb36a91e32860b6e15ba86794a46fb8a79692715f66cdaf006119fae19f4dec1eb6666a5d9fc740534047a SHA512 2fde65ada54835efdd756ed5ffc2f90aabdd4d28036dd1a195bb6669b61c1e054bab8762aa7f076fc009056989d6ec9db45c542bc8f155c8a04a196af0e16995 +EBUILD vnstat-2.7.ebuild 1834 BLAKE2B 62d54236a163b5cbff07c2fa631286cd27675f985677ab73138a278eab96bc6780e5be09fc1d3b3a3d9aa3ad89736de1b6fbc462cfbb734c8c956103d3ac0c72 SHA512 ab2ba9bb3a63f1c9b825a82f3914e2debc23907427f232888d21b3d5f6996b51f007f16f4e40559546e302663f0f61b56027eb865cff3cddf1e8c5bd87490f9d +EBUILD vnstat-9999.ebuild 1834 BLAKE2B 62d54236a163b5cbff07c2fa631286cd27675f985677ab73138a278eab96bc6780e5be09fc1d3b3a3d9aa3ad89736de1b6fbc462cfbb734c8c956103d3ac0c72 SHA512 ab2ba9bb3a63f1c9b825a82f3914e2debc23907427f232888d21b3d5f6996b51f007f16f4e40559546e302663f0f61b56027eb865cff3cddf1e8c5bd87490f9d MISC metadata.xml 835 BLAKE2B 4798aa86fd444665d135f7b2ede84889049113260c965b01999a2f9000c826fefa6877e8d3267a813421df97b2a0076f0718278ad3e0cf376bfc91babaaf87f3 SHA512 1c51f11ba3524329dec2101494c89d26859eab16e862e36e49df9240ee3fddf0380bfd929ec1719fc0e21808fc26f381b3be06f5fc89127f4c7e2fd188b3e886 diff --git a/net-analyzer/vnstat/vnstat-1.17-r1.ebuild b/net-analyzer/vnstat/vnstat-1.17-r1.ebuild new file mode 100644 index 000000000000..8aa25d8a3276 --- /dev/null +++ b/net-analyzer/vnstat/vnstat-1.17-r1.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/teemutoivola.asc +inherit flag-o-matic toolchain-funcs 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" +KEYWORDS="amd64 arm ~hppa ppc ppc64 sparc x86" +IUSE="gd selinux test" +RESTRICT="!test? ( test )" + +RDEPEND="gd? ( media-libs/gd[png] )" +DEPEND=" + ${RDEPEND} + test? ( dev-libs/check ) +" +RDEPEND+=" acct-group/vnstat + acct-user/vnstat + selinux? ( sec-policy/selinux-vnstatd )" +BDEPEND="verify-sig? ( app-crypt/openpgp-keys-teemutoivola )" + +src_prepare() { + default + + tc-export CC + + sed -i \ + -e 's|vnstat[.]log|vnstatd.log|' \ + -e 's|vnstat[.]pid|vnstatd/vnstatd.pid|' \ + -e 's|/var/run|/run|' \ + cfg/${PN}.conf || die + + sed -i \ + -e '/PIDFILE/s|/var/run|/run|' \ + src/common.h || die +} + +src_configure() { + tc-export CC + + # Fails to build with GCC 10 + append-flags -fcommon + + default +} + +src_compile() { + emake ${PN} ${PN}d $(usex gd ${PN}i '') +} + +src_install() { + use gd && dobin vnstati + dobin vnstat vnstatd + + exeinto /etc/cron.hourly + newexe "${FILESDIR}"/vnstat.cron vnstat + + insinto /etc + doins cfg/vnstat.conf + fowners root:vnstat /etc/vnstat.conf + + newconfd "${FILESDIR}"/vnstatd.confd vnstatd + newinitd "${FILESDIR}"/vnstatd.initd-r1 vnstatd + + 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-1.17.ebuild b/net-analyzer/vnstat/vnstat-1.17.ebuild deleted file mode 100644 index 5a1f12b3e07d..000000000000 --- a/net-analyzer/vnstat/vnstat-1.17.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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" -KEYWORDS="amd64 arm ~hppa ppc ppc64 sparc x86" -IUSE="gd selinux test" -RESTRICT="!test? ( test )" - -RDEPEND="gd? ( media-libs/gd[png] )" -DEPEND=" - ${RDEPEND} - test? ( dev-libs/check ) -" -RDEPEND+=" selinux? ( sec-policy/selinux-vnstatd )" -BDEPEND="verify-sig? ( app-crypt/openpgp-keys-teemutoivola )" - -pkg_setup() { - enewgroup vnstat - enewuser vnstat -1 -1 /dev/null vnstat -} - -src_prepare() { - default - - tc-export CC - - sed -i \ - -e 's|vnstat[.]log|vnstatd.log|' \ - -e 's|vnstat[.]pid|vnstatd/vnstatd.pid|' \ - -e 's|/var/run|/run|' \ - cfg/${PN}.conf || die - - sed -i \ - -e '/PIDFILE/s|/var/run|/run|' \ - src/common.h || die -} - -src_compile() { - emake ${PN} ${PN}d $(usex gd ${PN}i '') -} - -src_install() { - use gd && dobin vnstati - dobin vnstat vnstatd - - exeinto /etc/cron.hourly - newexe "${FILESDIR}"/vnstat.cron vnstat - - insinto /etc - doins cfg/vnstat.conf - fowners root:vnstat /etc/vnstat.conf - - newconfd "${FILESDIR}"/vnstatd.confd vnstatd - newinitd "${FILESDIR}"/vnstatd.initd-r1 vnstatd - - 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-2.6-r1.ebuild b/net-analyzer/vnstat/vnstat-2.6-r1.ebuild new file mode 100644 index 000000000000..3d37feff320b --- /dev/null +++ b/net-analyzer/vnstat/vnstat-2.6-r1.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit systemd tmpfiles + +DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage" +HOMEPAGE="https://humdi.net/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" +IUSE="gd selinux test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-db/sqlite + gd? ( media-libs/gd[png] ) +" +DEPEND=" + ${RDEPEND} + test? ( dev-libs/check ) +" +RDEPEND+=" acct-group/vnstat + acct-user/vnstat + 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 +) + +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 + newtmpfiles "${FILESDIR}"/vnstatd.tmpfile vnstatd.conf + + use gd && doman man/vnstati.1 + + doman man/vnstat.1 man/vnstatd.8 + + newdoc INSTALL README.setup + dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi +} diff --git a/net-analyzer/vnstat/vnstat-2.6.ebuild b/net-analyzer/vnstat/vnstat-2.6.ebuild deleted file mode 100644 index e1ce66f909cb..000000000000 --- a/net-analyzer/vnstat/vnstat-2.6.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit systemd user tmpfiles - -DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage" -HOMEPAGE="https://humdi.net/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" -IUSE="gd selinux test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-db/sqlite - gd? ( media-libs/gd[png] ) -" -DEPEND=" - ${RDEPEND} - test? ( dev-libs/check ) -" -RDEPEND+=" 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 - newtmpfiles "${FILESDIR}"/vnstatd.tmpfile vnstatd.conf - - use gd && doman man/vnstati.1 - - doman man/vnstat.1 man/vnstatd.8 - - newdoc INSTALL README.setup - dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi -} diff --git a/net-analyzer/vnstat/vnstat-2.7.ebuild b/net-analyzer/vnstat/vnstat-2.7.ebuild new file mode 100644 index 000000000000..189549001483 --- /dev/null +++ b/net-analyzer/vnstat/vnstat-2.7.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit systemd tmpfiles + +DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage" +HOMEPAGE="https://humdi.net/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" +IUSE="gd selinux test" +RESTRICT="!test? ( test )" + +RDEPEND=" + acct-group/vnstat + acct-user/vnstat + dev-db/sqlite + gd? ( media-libs/gd[png] ) +" +DEPEND=" + ${RDEPEND} + test? ( dev-libs/check ) +" +RDEPEND+=" 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 +) + +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 + newtmpfiles "${FILESDIR}"/vnstatd.tmpfile vnstatd.conf + + use gd && doman man/vnstati.1 + + doman man/vnstat.1 man/vnstatd.8 + + 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 ef79532e70ff..189549001483 100644 --- a/net-analyzer/vnstat/vnstat-9999.ebuild +++ b/net-analyzer/vnstat/vnstat-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit systemd user tmpfiles +inherit systemd tmpfiles DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage" HOMEPAGE="https://humdi.net/vnstat/" @@ -29,6 +29,8 @@ IUSE="gd selinux test" RESTRICT="!test? ( test )" RDEPEND=" + acct-group/vnstat + acct-user/vnstat dev-db/sqlite gd? ( media-libs/gd[png] ) " @@ -44,13 +46,11 @@ PATCHES=( "${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 '') + emake \ + ${PN} \ + ${PN}d \ + $(usex gd ${PN}i '') } src_install() { @@ -75,8 +75,8 @@ src_install() { use gd && doman man/vnstati.1 - doman man/vnstat.1 man/vnstatd.1 + doman man/vnstat.1 man/vnstatd.8 - newdoc INSTALL.md README.setup - dodoc CHANGES README.md UPGRADE.md FAQ examples/vnstat.cgi + newdoc INSTALL README.setup + dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi } -- cgit v1.2.3