From 693cc9b6e847a01c1bb692153021aaf9fb0fab25 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 25 Jan 2019 08:09:37 +0000 Subject: gentoo resync : 25.01.2019 --- net-analyzer/Manifest.gz | Bin 49491 -> 49661 bytes net-analyzer/graphite-web/Manifest | 3 + .../files/graphite-web-1.1.5-fhs-paths.patch | 63 +++++++++++++ .../graphite-web/graphite-web-1.1.5.ebuild | 100 +++++++++++++++++++++ .../nagios-plugin-check_lm_sensors/Manifest | 3 + .../nagios-plugin-check_lm_sensors/metadata.xml | 12 +++ ...-plugin-check_lm_sensors-4.1.1_p20170912.ebuild | 36 ++++++++ net-analyzer/nagios-plugins/Manifest | 2 +- .../nagios-plugins/nagios-plugins-2.2.1-r3.ebuild | 4 +- 9 files changed, 220 insertions(+), 3 deletions(-) create mode 100644 net-analyzer/graphite-web/files/graphite-web-1.1.5-fhs-paths.patch create mode 100644 net-analyzer/graphite-web/graphite-web-1.1.5.ebuild create mode 100644 net-analyzer/nagios-plugin-check_lm_sensors/Manifest create mode 100644 net-analyzer/nagios-plugin-check_lm_sensors/metadata.xml create mode 100644 net-analyzer/nagios-plugin-check_lm_sensors/nagios-plugin-check_lm_sensors-4.1.1_p20170912.ebuild (limited to 'net-analyzer') diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz index 4259608bcbc5..2b32979ad3f1 100644 Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ diff --git a/net-analyzer/graphite-web/Manifest b/net-analyzer/graphite-web/Manifest index 63456f47d1a7..4186038aa533 100644 --- a/net-analyzer/graphite-web/Manifest +++ b/net-analyzer/graphite-web/Manifest @@ -1,4 +1,7 @@ AUX graphite-web-1.1.3-fhs-paths.patch 2714 BLAKE2B 3c2e4a73e32626ba28ee1c3f5697e95f52e3cdcb88f137ff1e42581b9daf75521dd1d3d452e1be7157658914a50116b58b35c39551260be54b385bd50c0e1ef0 SHA512 1f3ca2def8e757a2f86acc58636fccda55ae81977d6b435e4cb44eecdbb613b1791eb286ca46b97a832ce80cce3bedd52dd8ba74a9566ce3b71b998b5e6ca438 +AUX graphite-web-1.1.5-fhs-paths.patch 2712 BLAKE2B f3a05cd9a732ee69d52a62ac5164b3e8bdc5e1d29d3474167c2873f4322a882509f60908731a081f971c01681094f2b6a772a4fcf159ade85ac651f7b0d90c1c SHA512 b383da7aebf0c38b557ac07b0ba4ecd22c41bb9f3318a9f491b37f495a8d2ad5cd8d677076c15958d6326aa1a46574c01a8f5a9cd64fb77ac30fc4d630e8f532 DIST graphite-web-1.1.3.tar.gz 1171342 BLAKE2B f18c84d707f93d897553ec05d7b910a3dba97c6068498d1b216f178ea8a1f64baf59bb572b433a56f5e417a2873c018a38a19c3b8c765f667d7c3fbb38b9ed0a SHA512 3f9de216bd55e4e8de7391087e9b876a16e4f137fd60932a6d5855804c3d9868422645177776258e74486b97ec7a853b63a6d89b1de9b325bcb50ad694208436 +DIST graphite-web-1.1.5.tar.gz 1173809 BLAKE2B 94a1b4deab3159d3bde2d3c8b6f9664f39942cb1b815ce042b196be3c0e769ee1acac4b619135e9471360849308b90e02e1df4f7d6b7d0ef31e46d38ee2425e5 SHA512 b2097609ca77a40e6e7d83a3141335e2208d69e7f4edbac8ce3505ed9dd654589836a3b3498bfb7f7585332bceeb8e367f0c10f3cf6afdb5ad6b96377338a7bb EBUILD graphite-web-1.1.3-r1.ebuild 3095 BLAKE2B 52399189a048fa49d0634a336ee57342723ac47f3a1728026bc7904e1193a328196c9120d57dd2a0d89977bce99145bd1df8230d71e38bdd3d8240b01e8407f1 SHA512 ab54778c65259528bd5bee7db7036152d1e0c6d8182b24933f92b1de91d12d1b2c31e860f688096c28fa87c36d981c897f2a924c8af34bc0789de477e0bd722f +EBUILD graphite-web-1.1.5.ebuild 3122 BLAKE2B a9757685dfd3b91e1d753728cc5dd3b822d8aefdbeda4b86997ec9a78de6f42075f258b3885301608ad76228ef4fe29764a38a3b6f5e3680eb268642a357b4d1 SHA512 440e0a20ffd1ef6277b5c54e437f1eec0ebf64a9513a1f4a2df0234ec37a85afa600e2f2cc8d73da4cdec36fd1d0b5ec0fe1bfc835be6771aba784e235ac9a3d MISC metadata.xml 592 BLAKE2B 1c284eea68c1db410d55439c14dbf245651157c8f3cb2c77357e50ad8d4426e1c2faf8bd767095f49e9a711e84bbe8b5223aa26529d6dd9cd8dd08c3d8c7c75a SHA512 e9be9344db6989ed9d1d649fff05c4d05c72528097c6d921b5d0d31f9be65d1cfb02071356101f46ffddfa5b7a91785995ad59e15ba0fd78b75d785959051a98 diff --git a/net-analyzer/graphite-web/files/graphite-web-1.1.5-fhs-paths.patch b/net-analyzer/graphite-web/files/graphite-web-1.1.5-fhs-paths.patch new file mode 100644 index 000000000000..4cbbe7213b35 --- /dev/null +++ b/net-analyzer/graphite-web/files/graphite-web-1.1.5-fhs-paths.patch @@ -0,0 +1,63 @@ +Install FHS-style paths + +--- a/conf/graphite.wsgi.example ++++ b/conf/graphite.wsgi.example +@@ -1,4 +1,4 @@ + import sys +-sys.path.append('/opt/graphite/webapp') ++sys.path.append('@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web/webapp') + + from graphite.wsgi import application +--- a/setup.py ++++ b/setup.py +@@ -107,8 +107,8 @@ + ], + package_data={'graphite' : + ['templates/*', 'local_settings.py.example']}, +- scripts=glob('bin/*'), +- data_files=list(webapp_content.items()) + storage_dirs + conf_files + examples, ++ scripts=['bin/graphite-web-build-index'], ++ data_files=list(webapp_content.items()), + install_requires=['Django>=1.8,<2.1', 'django-tagging==0.4.3', 'pytz', 'pyparsing', 'cairocffi', 'urllib3', 'scandir', 'six'], + classifiers=[ + 'Intended Audience :: Developers', +--- a/webapp/graphite/local_settings.py.example ++++ b/webapp/graphite/local_settings.py.example +@@ -101,6 +101,7 @@ + # Change only GRAPHITE_ROOT if your install is merely shifted from /opt/graphite + # to somewhere else + #GRAPHITE_ROOT = '/opt/graphite' ++GRAPHITE_ROOT = '@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web' + + # Most installs done outside of a separate tree such as /opt/graphite will + # need to change these settings. Note that the default settings for each +@@ -110,6 +111,11 @@ + #STATIC_ROOT = '/opt/graphite/static' + #LOG_DIR = '/opt/graphite/storage/log/webapp' + #INDEX_FILE = '/opt/graphite/storage/index' # Search index file ++CONF_DIR = '@GENTOO_PORTAGE_EPREFIX@/etc/graphite-web' ++STORAGE_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon' ++STATIC_ROOT = '@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web/webapp/content' ++LOG_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/log/graphite-web' ++INDEX_FILE = '@GENTOO_PORTAGE_EPREFIX@/var/lib/graphite-web/index' # Search index file + + # To further or fully customize the paths, modify the following. Note that the + # default settings for each of these are relative to CONF_DIR and STORAGE_DIR +@@ -127,6 +133,8 @@ + #CERES_DIR = '/opt/graphite/storage/ceres' + #WHISPER_DIR = '/opt/graphite/storage/whisper' + #RRD_DIR = '/opt/graphite/storage/rrd' ++WHISPER_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon/whisper' ++RRD_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon/rrd' + # + # Data directories using the "Standard" metrics finder (i.e. not Ceres) + #STANDARD_DIRS = [WHISPER_DIR, RRD_DIR] # Default: set from the above variables +@@ -244,7 +244,7 @@ + # + #DATABASES = { + # 'default': { +-# 'NAME': '/opt/graphite/storage/graphite.db', ++# 'NAME': '@GENTOO_PORTAGE_EPREFIX@/var/lib/graphite-web/graphite.db', + # 'ENGINE': 'django.db.backends.sqlite3', + # 'USER': '', + # 'PASSWORD': '', diff --git a/net-analyzer/graphite-web/graphite-web-1.1.5.ebuild b/net-analyzer/graphite-web/graphite-web-1.1.5.ebuild new file mode 100644 index 000000000000..b0cada7cd870 --- /dev/null +++ b/net-analyzer/graphite-web/graphite-web-1.1.5.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python{2_7,3_{4,5,6}} ) # 3.7 dropped due to dep-hell + +inherit distutils-r1 python-utils-r1 prefix + +DESCRIPTION="Enterprise scalable realtime graphing" +HOMEPAGE="https://graphiteapp.org/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+carbon ldap mysql memcached postgres +sqlite" + +DEPEND="" +RDEPEND=" + carbon? ( dev-python/carbon[${PYTHON_USEDEP}] ) + ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) + memcached? ( dev-python/python-memcached[${PYTHON_USEDEP}] ) + mysql? ( + || ( + dev-python/mysql-python[${PYTHON_USEDEP}] + dev-python/mysqlclient[${PYTHON_USEDEP}] + ) + ) + postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) + >=dev-python/django-1.8[sqlite?,${PYTHON_USEDEP}] + =dev-python/django-tagging-0.4.6[${PYTHON_USEDEP}] + dev-python/cairocffi[${PYTHON_USEDEP}] + dev-python/pyparsing[${PYTHON_USEDEP}] + dev-python/pytz[${PYTHON_USEDEP}] + dev-python/scandir[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + dev-python/urllib3[${PYTHON_USEDEP}] + media-libs/fontconfig +" + +PATCHES=( + # Do not install the configuration and data files. We install them + # somewhere sensible by hand. + "${FILESDIR}"/${PN}-1.1.5-fhs-paths.patch +) + +python_prepare_all() { + # Use a less common name + mv bin/build-index bin/${PN}-build-index || die + # use FHS-style paths + export GRAPHITE_NO_PREFIX=yes + distutils-r1_python_prepare_all + eprefixify \ + conf/graphite.wsgi.example \ + webapp/graphite/local_settings.py.example +} + +python_install_all() { + distutils-r1_python_install_all + keepdir /var/{lib,log}/${PN} + docinto examples + docompress -x "/usr/share/doc/${PF}/examples" + dodoc \ + examples/example-graphite-vhost.conf \ + conf/dashboard.conf.example \ + conf/graphite.wsgi.example +} + +python_install() { + distutils-r1_python_install \ + --install-data="${EPREFIX}"/usr/share/${PN} + + insinto /etc/${PN} + newins webapp/graphite/local_settings.py.example local_settings.py + pushd "${D}/$(python_get_sitedir)"/graphite > /dev/null || die + ln -s ../../../../../etc/${PN}/local_settings.py local_settings.py || die + popd > /dev/null || die +} + +pkg_config() { + "${EROOT}"/usr/bin/django-admin.py migrate \ + --settings=graphite.settings --run-syncdb + "${EROOT}"/usr/bin/${PN}-build-index +} + +pkg_postinst() { + # Only display this for new installs + if [[ -z ${REPLACING_VERSIONS} ]]; then + elog "You need to configure ${PN} to run with a WSGI server of your choice." + elog "For example using Apache, you can use www-apache/mod_wsgi," + elog " using Nginx, you can use www-servers/uwsgi." + elog "Don't forget to edit local_settings.py in ${EPREFIX}/etc/${PN}" + elog "See https://graphite.readthedocs.org/en/latest/config-local-settings.html" + elog "Run emerge --config =${PN}-${PVR} if this is a fresh install." + elog "" + elog "If you want to update the search index regularily, you should consider running" + elog "the '${PN}-build-index' script in a crontab." + fi +} diff --git a/net-analyzer/nagios-plugin-check_lm_sensors/Manifest b/net-analyzer/nagios-plugin-check_lm_sensors/Manifest new file mode 100644 index 000000000000..f208510dfec1 --- /dev/null +++ b/net-analyzer/nagios-plugin-check_lm_sensors/Manifest @@ -0,0 +1,3 @@ +DIST nagios-plugin-check_lm_sensors-4.1.1_p20170912.tar.gz 21681 BLAKE2B 7144c9b9fc4a2b2ccd964ce356809e8ea393b05f86015e5efe5b0ef70fccb585d520fdbba486fd1637c0ef9d2853d270cfb069f6bed22a105b5d80977a8481d7 SHA512 7870e29f58179bd71c917c2bcfe7ff0ee9f28be8b41b19b8f4f3e623fc3ca12395d6dbd55eef3f4084b3fedf2b1c4dc745357d045d19e1f00a3fe2e24a236e77 +EBUILD nagios-plugin-check_lm_sensors-4.1.1_p20170912.ebuild 883 BLAKE2B c1876996714bdbe8a4fc33f3710ab2d568d4ee4a524ffae3edf060913785f66d8dca206523dc633c139aef44fcc9f2930ed9cddbc5509211bb54c4c206fae290 SHA512 e975d6de793952394ba6515fc53a9771cfc84adbbbf3aaa0482903b2768fd4d103b97295e23bac99f31145152962c292a597dee85a661c7f961cf59c4d7f817e +MISC metadata.xml 414 BLAKE2B 659964f7e7ae50282899996b0341b6a2c4fbd7efca82612f48799900fa58c9d505ec61720e2f42c0efdcf9d23dd07353aa000628ae2cd0533fff1b8871d72474 SHA512 5fc065f5f51b539c6c73a2eac069cf6455a93fe0c2b33c4877c7cd8986c325502c825e4cf22bd0e64fccbd473f00932b53277f2634457837256a1b7229f699e7 diff --git a/net-analyzer/nagios-plugin-check_lm_sensors/metadata.xml b/net-analyzer/nagios-plugin-check_lm_sensors/metadata.xml new file mode 100644 index 000000000000..3ded77e652ff --- /dev/null +++ b/net-analyzer/nagios-plugin-check_lm_sensors/metadata.xml @@ -0,0 +1,12 @@ + + + + + sbraz@gentoo.org + Louis Sautier + + + matteocorti/check_lm_sensors + https://github.com/matteocorti/check_lm_sensors/issues + + diff --git a/net-analyzer/nagios-plugin-check_lm_sensors/nagios-plugin-check_lm_sensors-4.1.1_p20170912.ebuild b/net-analyzer/nagios-plugin-check_lm_sensors/nagios-plugin-check_lm_sensors-4.1.1_p20170912.ebuild new file mode 100644 index 000000000000..4587bb043e42 --- /dev/null +++ b/net-analyzer/nagios-plugin-check_lm_sensors/nagios-plugin-check_lm_sensors-4.1.1_p20170912.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit perl-module vcs-snapshot + +MY_PN="${PN/nagios-plugin-/}" +MY_COMMIT="36e453f791f0c8e32c2ead204f68511fd2ad4529" + +DESCRIPTION="Nagios plugin to monitor the values of onboard sensors and disk temperatures" +HOMEPAGE="https://github.com/matteocorti/check_lm_sensors" +SRC_URI="https://github.com/matteocorti/${MY_PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64" + +DEPEND="dev-perl/Module-Install" +RDEPEND=" + dev-perl/Monitoring-Plugin + virtual/perl-Getopt-Long +" + +src_compile() { + default + pod2man ${MY_PN}.pod > ${MY_PN}.1 || die +} + +src_install() { + perl-module_src_install + doman ${MY_PN}.1 + local plugindir="/usr/$(get_libdir)/nagios/plugins" + dodir "${plugindir}" + mv "${ED}/usr/bin/${MY_PN}" "${ED}/${plugindir}" || die +} diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest index 374495ec126f..222354e2460b 100644 --- a/net-analyzer/nagios-plugins/Manifest +++ b/net-analyzer/nagios-plugins/Manifest @@ -3,5 +3,5 @@ DIST nagios-plugins-2.0.3.tar.gz 2659772 BLAKE2B d4deccf04458daccde5fbe7e6c65928 DIST nagios-plugins-2.2.1.tar.gz 2728818 BLAKE2B ea89862935491d9c31403a36712d39557fa8e90dc2306e027531e974933cd13cc6b55ebfdd7dfc7541d6458741aaf57714df57fdddc92049001a59f0ffb6413a SHA512 6ffe313a56a305b382f62abc0f0958d7078f9050e1340f30721d6e6f71944b57b1650e90e6835c35dd7c9f3f4b4cee9f235b8382b0811db30b3729daaafc9bc3 EBUILD nagios-plugins-2.0.3-r2.ebuild 2828 BLAKE2B 2581655bd322f74c6253811b6a10de420c5f1c90677d87d5f344f4939d45b00d394fe8b026b44ed9bf76024d18ef67d4f7ab222e6fa75e72d88e7c4f44eae94a SHA512 cabe19f142006c4d104721361c2c58fc7a103717041050a21bc21b47adb6702bf05c77f1ed8b063f74b11a59a2dd1120d8478e5b1d803636aeb9f1ae92c2ae91 EBUILD nagios-plugins-2.2.1-r2.ebuild 3109 BLAKE2B fb9958b01df2993cf3f2f95c50996f94b30e9238a39e116dd857255c60bb4d516781171041d8070a50ffc7526766d24b0331c4f93302d875e17775043b4f84ab SHA512 a7080b7c27013958a97a9125ba11bfa93be6402dbe8a8667b80f236bf3364e994b44815bb6ace6e24e08a0f9c0f90f96f47ca2d71403152c444b4b5afd064249 -EBUILD nagios-plugins-2.2.1-r3.ebuild 3126 BLAKE2B 21e3131fb9dcdeaffd3779dd8d247e15c88228956abfeb33ac39b9d8a9d42d1d734d8a9a7b7a08a91f622975c799fbe29045aaef69cfac24d59ce60a5f9b3109 SHA512 d60932357aca2aa80533314ef6db485b634aa1a1fb8419a8d4c68a1ed518ceb663b90a875eb9b1c8e51ec5bda585108bdf7f31c9f8f67a9381710e2dd2dab50f +EBUILD nagios-plugins-2.2.1-r3.ebuild 3118 BLAKE2B e8559ab89bf0391a3b49ccccb5289053cec7aaa212ae4efe9215bac0a1ba3aee75cbf387de50826500511696fb4a47112cadaa7764aeea57a23702f014835324 SHA512 1a831d6868998d0a065e4a91e180116655b52db08ea21a04c5b443fe45f5ab7f1b7f23a6f6eeed22cea3ceeffc8be3fde32282733ce991a485f05a7ca7289576 MISC metadata.xml 1430 BLAKE2B 63a889dc51085a41a5dec4b6c32e6262ff59fdb1413699736d6332a75406749551b1c82d62a2662f4d7935c46a4bc3b51e0ca7e3b070656163fb0b6fc69c742e SHA512 d6cbc6820de52e1ed471b97a6c592af72474db492204594314eebb656b8abe89a01667a7bbb621418fd393aeacb28e9a10c5749de7ace67dd15119f701019e72 diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r3.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r3.ebuild index 6c36a0214b5b..b67ad27f6923 100644 --- a/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r3.ebuild +++ b/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ SRC_URI="http://nagios-plugins.org/download/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86" IUSE="ipv6 ldap libressl mysql nagios-dns nagios-ping nagios-game postgres radius samba selinux snmp ssh +ssl" # Most of the plugins use automagic dependencies, i.e. the plugin will -- cgit v1.2.3