From fcc5224904648a8e6eb528d7603154160a20022f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 2 Feb 2022 01:39:05 +0000 Subject: gentoo resync : 02.02.2022 --- net-analyzer/vnstat/Manifest | 6 +- net-analyzer/vnstat/files/vnstat-2.9-conf.patch | 39 ++++++++++++ net-analyzer/vnstat/vnstat-2.9.ebuild | 84 +++++++++++++++++++++++++ net-analyzer/vnstat/vnstat-9999.ebuild | 8 +-- 4 files changed, 131 insertions(+), 6 deletions(-) create mode 100644 net-analyzer/vnstat/files/vnstat-2.9-conf.patch create mode 100644 net-analyzer/vnstat/vnstat-2.9.ebuild (limited to 'net-analyzer/vnstat') diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest index cdd65808e2d4..6b4a11a9ca28 100644 --- a/net-analyzer/vnstat/Manifest +++ b/net-analyzer/vnstat/Manifest @@ -1,6 +1,7 @@ AUX vnstat-2.2-conf.patch 318 BLAKE2B 23e9e546a860c5b708fe4d67e5f67e5274e269d5fe6377b8d7921124894a585b9de15c992ae91313940ddc83c79b44ca3d2c529fe2f827d749a70e7c1a4d9031 SHA512 1d28d47adbed2e51eb22b7ed4773aa9ae6a94f1f9ab9e06b5e2501ca59d7ffdbd83ba862194dd2148e4b897c3d28ad4f63b6eb79f8b6ad3e43b7eea931a685a6 AUX vnstat-2.2-drop-root.patch 415 BLAKE2B c027b6056ec7ae26c64165e170bae3d5823e5017f2d7d25d88b5f030b91d7d60cd1a898d352bc706436e1858e8f2b003e9f4325acddd858f707abf75a9f20d77 SHA512 95e7602f2bd3c7277e4cdabadf4c1379a8217125c72cb2d343d010f8bf877243d3ac02b539e39ce830e3c48e9cdca6c7f35a73d6852d3f66e87a071986a78231 AUX vnstat-2.2-run.patch 297 BLAKE2B 120045cff99c18d9be8e8a1655f8f043906c2c77563f139973f049c55d8b4c56558f2c47f973e036cb2c5071aafc24e6a6881dc1e13e196fd095ceb20677ff94 SHA512 c1e01bc7e71b56ac958c8071400f6f82c312a5f157333a3298596b85011dab5beb65b8dbc51a5f62aed68b56562266f7306e1cef82a69664b7486b148814db43 +AUX vnstat-2.9-conf.patch 1216 BLAKE2B 2d0ead56c02b4f28dc0f005f5b17276cd7ddc863ed55a0e8f19aba49cf3c3c5b55e226ebc764b8935a60e63dca75285eb74872966d9061e63c1d0731922e7faa SHA512 a99f5ab282054db944047022fd6239dc7043cbf00f19982b82d295b8f9d59efe4096815dc25271e3ecf582a5284587871a12b85b620201da2fdd5400395ae202 AUX vnstat.cron 220 BLAKE2B de51e83326485932b6112035ec9d25440685f9d110a854eaa7963a54b50ce078d6199d3e491a7e3bfc686af1866e250f0b30eeb2c246424b9805fe11717adf1f SHA512 c901385f97323d1a686cee63d015eaf9ad38ed195a1c0e25dae671dd7061ebc918498684c55b90b0674960891dfca4b83f458174892c1b9efb48cd362fdb8477 AUX vnstat.cron-r1 177 BLAKE2B 1f015b8db93decce2877ce3c431cbc14c9bb2dd798f0762e5a7fb98d1c42e59e9839ecb6feb25312320cc2fb6b1aecd9b97323a6318a10a4426146c07094f2ae SHA512 8074d65cf2f28bd5c02fe741dbe20f8404bc2e25b94b43d0bcc829ca088828227805caf9cb8cae020ae0a9370d68dc3c757fedf07d48c0fc71ba944f2da1cb94 AUX vnstatd.confd 216 BLAKE2B d8ffd76612a5a8ce6b62ba4056c3bc91385c1980683cb487cc5fe2432a8d2e363fbc7ebe1e21d553a3b8ea04dea735342fe6f681320c98e8b41d51a869721c4e SHA512 d645817913d5b52e928561b3d6a0e869d8ae5db81b97af91c1ebfc6a8cd2df666c1653e6dc5f91c0a890033a89692f77eaf081c1cae5590446c69a70ea263946 @@ -13,7 +14,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.8.tar.gz 290644 BLAKE2B 21ff801ce6abb135c26eb937eadb447bea9fd3dcb2af123051edb9861e088d8fc217f84ef2d924fe8b480388cfc761d0259f8abb2312ae49c2840643787d49bd SHA512 207aa1699df298ce3008153701782634a96a239599d17a5b2f1fbb298a9cf8edb35298e2de1f4f93415ddf34e0bdb831f95984b47fdd7f89ecc6aeb4821a0afd DIST vnstat-2.8.tar.gz.asc 833 BLAKE2B 097d37e1916924901f10d09bba882357c0eb81cf71fca921dbc642735ec8c0bde97f7ab63cd3953718c21687e6f39099cf2446210f41f3698b39b74116c4c025 SHA512 d5448d68da92d434cc6a34e007002c81ed8d97e533bf99364d3f65b4125bd6f21fe2f6f6efb97775ecc4ba4afd09e12add71ae2299a2d990a7a9d0a591c32811 +DIST vnstat-2.9.tar.gz 300796 BLAKE2B 1671fe49f3add0087431b57aaa69d4c6280066a299e6899c00cd5bf6ec21380d1457295f884f683ebfb89959eea08a9d900e898a865e3f6ff2a82ecf354d974a SHA512 883f273c02f6d91478991d95deffba9d90457a1bb0b9dd818c01398365df97ffb72dda88299231d9076756192b05524b6f8820470c9caf6ee6a12e5914a82176 +DIST vnstat-2.9.tar.gz.asc 833 BLAKE2B 4dd17e02e6c0c5232354ea8c4dea1d86ac43015ac66c60dc227b143aa5352e5a1eb0870932662778b2350928b124e2bbc56dfa13cfe7c2fd74538d84c00f9b4c SHA512 bf57974afb028fef7ec311a15bb1dcf275f10b845c5512efe73711b622b5912c4de0ff0553db4152389d2421a468c888191eab8fca08212e164f997ad1e04778 EBUILD vnstat-1.17-r1.ebuild 1712 BLAKE2B 012f0dbef26d826428b2ffb018307a0f8c9cbd1184e1593442fcea313c100240a536b01ea67be9f80b56b5e3824a6c6ce7b532f4b1580142d6fe3e312a94e024 SHA512 0f12a9c2e8176cbc602d19262441a8c5f4c5367bf0ce3ebb4812f8ba7796768acf676f414cf9d00fac2df8fd5105129e235be081669d6e13bb1026c38e233bce EBUILD vnstat-2.8.ebuild 1885 BLAKE2B 06fc6aa3980bab2cf4b99c21d975b71dfe2098989c8f11e269fccfb19430c686622fecbf51d293df867a426502817d64a5e6f4d6d875379792fafcfc8e87312f SHA512 96b4e42f6d52cadbdd5a8f7c18d80b34e6a355abd51ae4f3ebdf00c140120221a0afb26974c1a116f8539c15317925f2d61f6afa4739f9523c18b248ab0be8cc -EBUILD vnstat-9999.ebuild 1892 BLAKE2B 73fc53b8632521227cbdad344734b826edb3a81114db96ace07d9b143a4fe35360cfa4679104f152b3c4d44073cbb0f4d1f7f944a6e6694f05fe14d7805c0dec SHA512 9429a556b3c5d711dfb03924238399ad9c15ad8c7185c989452fd224f52118a5441d4a89cbfc790422eb524b30c38520e204729b6b2979576f5e082214c26a8d +EBUILD vnstat-2.9.ebuild 1816 BLAKE2B ea557611e19cf297123e5f8131eb78314a03bda208399be45d2659702657825724faa860ccebe9cdeff22b0f3a39254855b1fb9a91d96e3222bdfab165b3fffb SHA512 4386082d6bc0e960be897123629ebd2d0d3f9c43739692f91f2db1cbc5c4db494ebf9e55da568790f8a15ba15fa02732afddeb73d7ab4191d4990eaf784aba11 +EBUILD vnstat-9999.ebuild 1816 BLAKE2B ea557611e19cf297123e5f8131eb78314a03bda208399be45d2659702657825724faa860ccebe9cdeff22b0f3a39254855b1fb9a91d96e3222bdfab165b3fffb SHA512 4386082d6bc0e960be897123629ebd2d0d3f9c43739692f91f2db1cbc5c4db494ebf9e55da568790f8a15ba15fa02732afddeb73d7ab4191d4990eaf784aba11 MISC metadata.xml 836 BLAKE2B f87c7da72d6510825ef2a437e02a0b29febae258debbf922885923aac4032eda5f122f29d6f0d0cf4c9876fdba09b030246f851083ae424ec1859073273e0e30 SHA512 21e9f14e00563ea52ebe117d0b80739566d043956c16cc95ad7a67bf9df6360e96ad700d2c739ab20ae2dc2c321432f5c98b67c5cc59853b1fdced8ca70fce01 diff --git a/net-analyzer/vnstat/files/vnstat-2.9-conf.patch b/net-analyzer/vnstat/files/vnstat-2.9-conf.patch new file mode 100644 index 000000000000..d2cfa3977cfb --- /dev/null +++ b/net-analyzer/vnstat/files/vnstat-2.9-conf.patch @@ -0,0 +1,39 @@ +diff --git a/cfg/vnstat.conf b/cfg/vnstat.conf +index f404de5..d2bd928 100644 +--- a/cfg/vnstat.conf ++++ b/cfg/vnstat.conf +@@ -80,10 +80,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 +@@ -161,7 +161,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/src/common.h b/src/common.h +index bb2fb56..f148004 100644 +--- a/src/common.h ++++ b/src/common.h +@@ -241,7 +241,7 @@ and most can be changed later from the config file. + #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 + #define WALDB 0 + #define WALDBCHECKPOINTINTERVALMINS 240 diff --git a/net-analyzer/vnstat/vnstat-2.9.ebuild b/net-analyzer/vnstat/vnstat-2.9.ebuild new file mode 100644 index 000000000000..f9877e7f008d --- /dev/null +++ b/net-analyzer/vnstat/vnstat-2.9.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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=${BROOT}/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? ( sec-keys/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.9-conf.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 +} + +pkg_postinst() { + tmpfiles_process vnstatd.conf +} diff --git a/net-analyzer/vnstat/vnstat-9999.ebuild b/net-analyzer/vnstat/vnstat-9999.ebuild index 407176bb06b7..f9877e7f008d 100644 --- a/net-analyzer/vnstat/vnstat-9999.ebuild +++ b/net-analyzer/vnstat/vnstat-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit systemd tmpfiles @@ -41,9 +41,7 @@ DEPEND=" 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 + "${FILESDIR}"/${PN}-2.9-conf.patch ) src_compile() { -- cgit v1.2.3