From e68d405c5d712af4387159df07e226217bdda049 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 6 Apr 2022 22:33:41 +0100 Subject: gentoo resync : 06.04.2022 --- net-analyzer/rrdtool/Manifest | 8 +- net-analyzer/rrdtool/files/rrdcached.confd-r1 | 13 ++ net-analyzer/rrdtool/files/rrdcached.init-r1 | 23 +++ net-analyzer/rrdtool/metadata.xml | 5 + net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild | 2 +- net-analyzer/rrdtool/rrdtool-1.8.0.ebuild | 247 +++++++++++++++++++++++++ 6 files changed, 295 insertions(+), 3 deletions(-) create mode 100644 net-analyzer/rrdtool/files/rrdcached.confd-r1 create mode 100644 net-analyzer/rrdtool/files/rrdcached.init-r1 create mode 100644 net-analyzer/rrdtool/rrdtool-1.8.0.ebuild (limited to 'net-analyzer/rrdtool') diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest index d2feedf97fa3..ffddf754f130 100644 --- a/net-analyzer/rrdtool/Manifest +++ b/net-analyzer/rrdtool/Manifest @@ -1,9 +1,13 @@ AUX rrdcached.confd 150 BLAKE2B 7e3e87c632bde99e2c460828157d281ace8a2f34f5310dc1ca5610625cde80170a8e2d973b1464ff5ee7447e28f4e26386140b80bd0d866acd8445733e1eb4e9 SHA512 93d95057e99c98c943060cfc607285e76ac4580e9955e65ceac69b09577dd6a78b1faa9e6213345a7f011beabebce21c9447b6bd39f4091762d9974cd1a358e0 +AUX rrdcached.confd-r1 425 BLAKE2B bd5bd8789f07803304d53aed0ed80685b7b42d9b7d9067d9980564a4b485c4ae474ca88298ea72154945941de00ba6ccea71ae5f3b4fe3be14583fe3e7d4da52 SHA512 d22503eebf3a89fc5e14124716058efef2b78409995a9814cb72e8ab9b9172a89bab5bc0c1f796a1d735d41f20c9c0b8009539da9f9bb96554d71984a64adb72 AUX rrdcached.init 331 BLAKE2B 835f60bd601591667556610f24002dc9cf7cba547d6cff7b5116c742577d97233a704f65dcc55bee26b8717da547a987a1f4b1511433ec559e86932fad9f52b0 SHA512 383cebcc9ad035660def2e465690f52104eac4ac621faeca3f31822f2f2bbd96f23c60fc5bc6382855e971563d7d545cc7abc31fe351c57a8ea716bcd7c95d88 +AUX rrdcached.init-r1 799 BLAKE2B 2b276a75e1d910fc7931758710507490f1d41398555426d160d0985fa326431018cfaa4ad1f0d54524e8b56e531f4867308fd078d499aa717011f6fe133a46c6 SHA512 789fd4d6e50169e34a1d4d04c9d36ce6a913a6ae0a633e07cbec3a7936ca6b47910b0e8002b8a346824ba5fff048f700e72f819f803b9aa1f18634e85127f66f AUX rrdtool-1.4.9-disable-rrd_graph-perl.patch 914 BLAKE2B 80b309cf59260a0f137f6550bf867845df25e6be0ac5677517d062aef8240f34db6f721700331d41d73f7aefbbd17f2c13df7ee1f774ff6bf33b6c1790183153 SHA512 6eb8d8a8193ce5bc22a4645e909dc7eb0a911b1f89f6403afc9cffec705929cf64086f415e53b748254a384b83ff8352be82f735ad403795c17a9058bc3e386c AUX rrdtool-1.5.5-rrdrados.pod 1419 BLAKE2B ef1a2438846a60b565c94088d7563480a97e9b77d5ef2173aed3b8f9cd8fba43ff9a553946ca4ee3092512b10dfce6de9a6436cac5aaa62a35c655f7c82520dc SHA512 fd3339862c51c8573dd93079ba70c9b538c4d73d031157fe845bcb59e7233cb5e9fa8cc451e760f8ae30014c975ec9ee04f66d42fc928c621a572b92e9348e4f AUX rrdtool-1.7.0-disable-rrd_graph-cgi.patch 1249 BLAKE2B 91dc764b7629ec517ff35362dc31605ab0428be4291afe5bd0a5c9c901bdd85a989cf1dcb33e247a7f79d8b155daf02d512691c38e72b8d2be3691d9733e5dc9 SHA512 5c2d192919e31a91cd600ed0e11346a4cbb1c66f93abbb583f20882d03705972eb4ed3156a9cae9a589aa5d26009037deb280569baf940966887483c6dbefb81 AUX rrdtool-1.7.1-configure.ac.patch 257 BLAKE2B 9aa11b7b0392cb2427d686b888c29b09d8e50b1b0fbedfe0e144eeb27ab6da5a7526633eb8655f1edb129e6a256b102ba095cd9c1aa501aed5e9492073c93b2b SHA512 7c3d175ce94bce24ab244ca899d62d2537392c360ed3ec211b5be2e41fcb6638343f7357db1d3c00fac15104398f83b236ead713e940385b04d61851a3275683 DIST rrdtool-1.7.2.tar.gz 2883737 BLAKE2B f3ff6cc4e325cdec42a6f9e67a1644f501c11edc47bc281df58c2e1d7be4c01767c35166f4301f68cf9c22dcd5c159bb51ee704a5e36776acdf166100122cebb SHA512 453230efc68aeb4a12842d20a9d246ba478a79c2f6bfd9693a91837c1c1136abe8af177be64fe29aa40bf84ccfce7f2f15296aefe095e89b8b62aef5a7623e29 -EBUILD rrdtool-1.7.2-r100.ebuild 5765 BLAKE2B afcc333f35a3fe82b41f34402e4c0b1e3e009c288c13bf8165ba968adbe071b494c36bee5064fd21375a188de095036395f7486c4d3ef855576cc4061beead2c SHA512 4b62ea64b088e2a7bced9801b06677fae325324eb5818bd814598e6c91206656b2c24ff28790aee7df75ecb59ddbc40802c040ce36d33fc283208e40564df008 -MISC metadata.xml 585 BLAKE2B a8db02c6cab8dc47a9d70c54f8ec6a769f4be639fc0116035215bcfad6e8841cc324dfaec655cbbadceccb92b83e83dbe6f0fac54820a881f6f1efa3c9425bb2 SHA512 6ad8ede67d5ee5365f31c4a8d402078b717d7f79719d49ee639fde7c3ea11e6c4172ac570a6ed6cdd1ccd90a067b2c1c1d4137de86efbbacc828f6020080e946 +DIST rrdtool-1.8.0.tar.gz 2955398 BLAKE2B d821d662af432c53760bc0e9636b84d9209933a810fa71091fc4c2b44518c89c7ad509bde7955d952279ee41464c3bfa4f631662dde61b6fff46699bb382653f SHA512 8ae6f94d119e8d0e1ba7f2d0738f1ba008a4880d1022f1c0c5436f662d961fceec5c42e01c241493ece3d6f55c60fd7d1d264f93e678f3cf1251201dcde027c1 +EBUILD rrdtool-1.7.2-r100.ebuild 5767 BLAKE2B 7568e91cfaa2295ab8ac44736185605626cfb3fd000a3a009f45e6fdfe9011d6c49080d33b4a69717f3d2244ffd53edd1bab6bf889b65d5b437aa4072a591fbc SHA512 817cfe3581b506eac6f4a62441a32d0b7a218cb258e004af2283b23318c43d60d2fa1bdef1aad7968ec51973494209389b436b52a6e3090e37ca3990bf3ef6c6 +EBUILD rrdtool-1.8.0.ebuild 5452 BLAKE2B 21e86f3f81b737cfed288cacfcc2be50d59163d315e69d0a36af1367667ee4c133302ed9e4b80e6b9c83b6aa1dd4cf85b3bdaf197ea3d237a80fa97d5b099fd7 SHA512 1d9c4999b2fee6b61e41e71c770b0fb3d234db30c45a7aba6010e7af869c6cef58626973dd6ac32686c654379fc6891e461fbbb6adb23636b9d4866764c8372d +MISC metadata.xml 767 BLAKE2B 12dd8f6fc7192dd214acb9b7ab3cb2bdfdd601ad768587ca0133ea132a2ffbc4aace5c7943c933b0b8e13d200ff5129882f9b47931421db9db2c017a398870ff SHA512 afca7f1c6ff9209ee1fe4977f5e9a063e37e3ee00a5a3ecd560e71fdf86df7daed526742bcd592d145df4b26ac206672135845fe67f8d2a64d5ae536113aa22f diff --git a/net-analyzer/rrdtool/files/rrdcached.confd-r1 b/net-analyzer/rrdtool/files/rrdcached.confd-r1 new file mode 100644 index 000000000000..99213acd1e1b --- /dev/null +++ b/net-analyzer/rrdtool/files/rrdcached.confd-r1 @@ -0,0 +1,13 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Default user and group for the rrdcached daemon +GROUP="rrdcached" +USER="root" + +# Default options for the rrdcached daemon +RRCACHE_ARGS="-B -F -m 770 -s rrdcached -l unix:/run/rrdcached.sock" + +# Default path for database and journal +RRCACHE_DATABASE="/var/lib/rrdcached/db" +RRCACHE_JOURNAL="/var/lib/rrdcached/journal" diff --git a/net-analyzer/rrdtool/files/rrdcached.init-r1 b/net-analyzer/rrdtool/files/rrdcached.init-r1 new file mode 100644 index 000000000000..44ee3c5f19df --- /dev/null +++ b/net-analyzer/rrdtool/files/rrdcached.init-r1 @@ -0,0 +1,23 @@ +#!/sbin/openrc-run +# Copyright 1999-2022 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +description="Data caching daemon for RRDTool" +rrdcached_database="${RRCACHE_DATABASE:-/var/lib/rrdcached/db}" +rrdcached_group="${GROUP:-rrdcached}" +rrdcached_journal="${RRCACHE_JOURNAL:-/var/lib/rrdcached/journal}" +rrdcached_user="${USER:-rrdcached}" +pidfile="/run/rrdcached.pid" + +command="/usr/bin/rrdcached" +command_args="${RRCACHE_ARGS} -b ${rrdcached_database} -G ${rrdcached_group} -j ${rrdcached_journal} -p ${pidfile} -U ${rrdcached_user}" + +depend() { + need localmount + use logger +} + +start_pre() { + checkpath -d -o "${rrdcached_user}:${rrdcached_group}" -q "${rrdcached_database}" + checkpath -d -o "${rrdcached_user}:${rrdcached_group}" -q "${rrdcached_journal}" +} diff --git a/net-analyzer/rrdtool/metadata.xml b/net-analyzer/rrdtool/metadata.xml index cdb31d558f75..7c83d2658e6f 100644 --- a/net-analyzer/rrdtool/metadata.xml +++ b/net-analyzer/rrdtool/metadata.xml @@ -1,6 +1,10 @@ + + conikost@gentoo.org + Conrad Kostecki + netmon@gentoo.org Gentoo network monitoring and analysis project @@ -8,6 +12,7 @@ Enable support for graphing functions Enable support for librados from sys-cluster/ceph + Build support for write-caching daemon Build rrdcgi support diff --git a/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild index 1c278a038792..0c1a88cad569 100644 --- a/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild +++ b/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild @@ -7,7 +7,7 @@ DISTUTILS_OPTIONAL=true DISTUTILS_SINGLE_IMPL=true GENTOO_DEPEND_ON_PERL=no LUA_COMPAT=( lua5-{1..4} luajit ) -PYTHON_COMPAT=( python3_{8,9} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit autotools lua perl-module distutils-r1 flag-o-matic diff --git a/net-analyzer/rrdtool/rrdtool-1.8.0.ebuild b/net-analyzer/rrdtool/rrdtool-1.8.0.ebuild new file mode 100644 index 000000000000..d50b50dc323b --- /dev/null +++ b/net-analyzer/rrdtool/rrdtool-1.8.0.ebuild @@ -0,0 +1,247 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) +PYTHON_COMPAT=( python3_{8..10} ) + +DISTUTILS_OPTIONAL="true" +DISTUTILS_SINGLE_IMPL="true" +GENTOO_DEPEND_ON_PERL="no" +MY_P="${P/_/-}" + +inherit autotools lua perl-module distutils-r1 flag-o-matic + +DESCRIPTION="A data logging and graphing system for time series data" +HOMEPAGE="https://oss.oetiker.ch/rrdtool/" +SRC_URI="https://github.com/oetiker/${PN}-1.x/releases/download/v${PV}/${P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-2" +SLOT="0/8.0.0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" +IUSE="dbi doc examples graph lua perl python rados rrdcached rrdcgi ruby static-libs tcl tcpd test" + +RESTRICT="!test? ( test )" +REQUIRED_USE=" + python? ( ${PYTHON_REQUIRED_USE} ) + lua? ( + ${LUA_REQUIRED_USE} + test? ( graph ) + ) + test? ( rrdcached ) +" + +PDEPEND="ruby? ( ~dev-ruby/rrdtool-bindings-${PV} )" + +RDEPEND=" + dev-libs/glib:2[static-libs(+)?] + dev-libs/libxml2:2[static-libs(+)?] + dbi? ( dev-db/libdbi[static-libs(+)?] ) + graph? ( + media-libs/libpng:0=[static-libs(+)?] + x11-libs/cairo[svg,static-libs(+)?] + x11-libs/pango + ) + lua? ( ${LUA_DEPS} ) + perl? ( dev-lang/perl:= ) + python? ( ${PYTHON_DEPS} ) + rados? ( sys-cluster/ceph ) + rrdcached? ( + acct-group/rrdcached + acct-user/rrdcached + ) + tcl? ( dev-lang/tcl:0= ) + tcpd? ( sys-apps/tcp-wrappers ) +" + +DEPEND="${RDEPEND}" + +BDEPEND=" + sys-apps/groff + virtual/pkgconfig + virtual/awk + python? ( $(python_gen_cond_dep 'dev-python/setuptools[${PYTHON_USEDEP}]') ) + test? ( + sys-devel/bc + lua? ( ${LUA_DEPS} ) + ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-perl.patch + "${FILESDIR}"/${PN}-1.7.0-disable-rrd_graph-cgi.patch + "${FILESDIR}"/${PN}-1.7.1-configure.ac.patch +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + default + + # Bug #456810 + local mysedargs=( + -e 's|$LUA_CFLAGS|IGNORE_THIS_BAD_TEST|g' + -e 's|^sleep 1$||g' + -e '/^dnl.*png/s|^dnl||g' + -i configure.ac + ) + + sed "${mysedargs[@]}" || die + + # Python bindings are built and installed manually + local mysedargs=( + -e '/^all-local:/s| @COMP_PYTHON@||' + -i bindings/Makefile.am + ) + + sed "${mysedargs[@]}" || die + + # Makefile needs to be adjusted for disabling 'graph' feature + if ! use graph ; then + local mysedargs=( + -e '2s:rpn1::; 2s:rpn2::; 6s:create-with-source-4::;' + -e '7s:xport1::; 7s:dcounter1::; 7s:vformatter1::' + -e 's|graph1||g' + -i tests/Makefile.am + ) + + sed "${mysedargs[@]}" || die + fi + + eautoreconf +} + +src_configure() { + export rd_cv_gcc_flag__Werror=no + export rd_cv_ms_async=ok + export RRDDOCDIR="${EPREFIX}/usr/share/doc/${PF}" + + # Bug #260380 + [[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__ + + # Enabling '-ffast-math' is known to cause problems. + filter-flags -ffast-math + + # We will handle Lua bindings ourselves, upstream is not multi-impl-ready + # and their Lua-detection logic depends on having the right version of the Lua + # interpreter available at build time. + local myeconfargs=( + --disable-lua + --disable-ruby + --disable-ruby-site-install + $(usex !dbi '--disable-libdbi' '') + $(usex !examples '--disable-examples' '') + $(use_enable graph rrd_graph) + $(use_enable perl perl-site-install) + $(use_enable perl) + $(use_enable python) + $(usex !rados '--disable-librados' '') + $(usex !rrdcached '--disable-rrdcached' '') + $(use_enable rrdcgi) + $(use_enable static-libs static) + $(usex !tcpd '--disable-libwrap' '') + $(use_enable tcl) + $(use_enable tcl tcl-site) + $(use_with tcl tcllib "${EPREFIX}"/usr/$(get_libdir)) + --with-perl-options="INSTALLDIRS=vendor" + ) + + econf "${myeconfargs[@]}" +} + +lua_src_compile() { + pushd "${BUILD_DIR}"/bindings/lua || die + + # We do need the CMOD-dir path here, otherwise libtool complains. + # Use the real one (i.e. not within ${ED}) just in case. + local myemakeargs=( + LUA_CFLAGS=$(lua_get_CFLAGS) + LUA_INSTALL_CMOD="$(lua_get_cmod_dir)" + ) + + emake "${myemakeargs[@]}" + + popd +} + +python_compile() { + cd bindings/python || die + distutils-r1_python_compile +} + +src_compile() { + default + + # Only copy sources now so that we do not + # trigger librrd compilation multiple times. + if use lua; then + lua_copy_sources + lua_foreach_impl lua_src_compile + fi + + use python && distutils-r1_src_compile +} + +lua_src_test() { + pushd "${BUILD_DIR}"/bindings/lua || die + LUA_CPATH="${PWD}/.libs/?.so" emake LUA="${LUA}" test + popd || die +} + +src_test() { + export LC_ALL=C + default + + if use lua; then + lua_foreach_impl lua_src_test + fi +} + +lua_src_install() { + pushd "${BUILD_DIR}"/bindings/lua || die + + # This time we must prefix the CMOD-dir path with ${ED}, + # so that make does not try to violate the sandbox. + local myemakeargs=( + LUA_INSTALL_CMOD="${ED}/$(lua_get_cmod_dir)" + ) + + emake "${myemakeargs[@]}" install + + popd || die +} + +python_install() { + cd bindings/python || die + distutils-r1_python_install +} + +src_install() { + default + + if ! use doc; then + rm -rf "${ED}"/usr/share/doc/"${PF}"/{html,txt} || die + fi + + if use lua; then + lua_foreach_impl lua_src_install + fi + + if use perl; then + perl_delete_localpod + perl_delete_packlist + fi + + use python && distutils-r1_src_install + + if use rrdcached; then + newconfd "${FILESDIR}"/rrdcached.confd-r1 rrdcached + newinitd "${FILESDIR}"/rrdcached.init-r1 rrdcached + fi + + find "${ED}" -name '*.la' -delete || die +} -- cgit v1.2.3