From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- sys-apps/cciss_vol_status/Manifest | 7 ++- .../cciss_vol_status/cciss_vol_status-1.12.ebuild | 21 --------- .../cciss_vol_status/cciss_vol_status-1.12a.ebuild | 21 +++++++++ .../files/cciss_vol_status-r2.cron | 52 ++++++++++++++++++++++ .../cciss_vol_status/files/cciss_vol_status.cron | 21 --------- .../cciss_vol_status/files/cciss_vol_status.cron2 | 52 ---------------------- 6 files changed, 76 insertions(+), 98 deletions(-) delete mode 100644 sys-apps/cciss_vol_status/cciss_vol_status-1.12.ebuild create mode 100644 sys-apps/cciss_vol_status/cciss_vol_status-1.12a.ebuild create mode 100644 sys-apps/cciss_vol_status/files/cciss_vol_status-r2.cron delete mode 100644 sys-apps/cciss_vol_status/files/cciss_vol_status.cron delete mode 100644 sys-apps/cciss_vol_status/files/cciss_vol_status.cron2 (limited to 'sys-apps/cciss_vol_status') diff --git a/sys-apps/cciss_vol_status/Manifest b/sys-apps/cciss_vol_status/Manifest index 83a801bc7799..c239cf4524f2 100644 --- a/sys-apps/cciss_vol_status/Manifest +++ b/sys-apps/cciss_vol_status/Manifest @@ -1,5 +1,4 @@ -AUX cciss_vol_status.cron 646 BLAKE2B a35f73a527e21c62e9b1214d2b962f115f64cb0f385fec04eab60aaef6ccb16cd5d8dcdef32d8a93c11f35a45b8e2891c3946da40b406645e757763db90f5d5f SHA512 658004668f6d1914c1526e07113eaee9a24e8d1945ab378a27537e9fd421e5b39eeb5f56610d59bebcbc6d7b2addfce65fee697b6877d164775b696930591a56 -AUX cciss_vol_status.cron2 1611 BLAKE2B db62a46e933357537132405e862b96fe0d3a8fe9f078982e797be8897d09f2c6310abbd6de1472d8401ebeb33b7ec9cd3f13a060933539816d051115df52df42 SHA512 b0ca78c96dad516abe49be96a1ca0956a5dcc5f721bd5088422da9327a783e5483798f96d2f4eb9bd8484fd07c94e86305be7a88ba0b503f5771634b31a7ac68 -DIST cciss_vol_status-1.12.tar.gz 120346 BLAKE2B 8094f7b421c8c3f003f38cef380eb14c6778b750a62a5b8b94df955f87c0a77b1b7dfa9df16d6bb10f4955b6961b022b871fc39d143717b8024ec40fdb3b819f SHA512 f9fa8b98bd42810932f03f514b4b8c6cea690378f065a6c9788ddb78612c7ca2aa9a7fefa8a40634cfe247600fb6d3f11f0b687fba77d1423087a2b319773d69 -EBUILD cciss_vol_status-1.12.ebuild 556 BLAKE2B 8e7ba5a01040520ff8a22be5a8f12df84817fd00099976cd81de3ab3adc632f570a17d7ee0960d64876e0c706a842e630240ba03385bb03ba6ec4347ba558154 SHA512 f619ff586271493d57aae42c28874ae1dc7ad8262c18429ce42cb1966aaaa1f188706d6883b3c5d299a6ff7aa631826b356dfe6f53b21b64d61bde7dc2b391c8 +AUX cciss_vol_status-r2.cron 1611 BLAKE2B db62a46e933357537132405e862b96fe0d3a8fe9f078982e797be8897d09f2c6310abbd6de1472d8401ebeb33b7ec9cd3f13a060933539816d051115df52df42 SHA512 b0ca78c96dad516abe49be96a1ca0956a5dcc5f721bd5088422da9327a783e5483798f96d2f4eb9bd8484fd07c94e86305be7a88ba0b503f5771634b31a7ac68 +DIST cciss_vol_status-1.12a.tar.gz 120748 BLAKE2B 855712328e53165f6b7cf5858a1f73fe71a55570a104ad401cb8359ae9bccb3f2abc01d0e92f0001b8d69c732fadfe26c54a73e52af50cc544a76d13e72c6023 SHA512 c6aeae0d1fd66aabcd4a82f69b12433770fab2dde726bca67d97a09636e39f2eb596a0695afdb7e3e1a35c3d6882a9804a8263caa9b0dad97da8256afea778be +EBUILD cciss_vol_status-1.12a.ebuild 555 BLAKE2B 4c494dca28c62940ca5c298854039504916ba44ccb0277a4d8d18115757c18e03b28260a381096964a42b3cf3fc8d3262e34e628ea60c7023ba9d5a9c9412f5f SHA512 40657360f2419dd5662800746cdc4e5acce41e26823aad15e3b5fbc1be5b95b16dcf517b88adec13727e15428dcdf2f39405991a0fc60feeedd1e430e27ca4ba MISC metadata.xml 402 BLAKE2B e69409b303a34d9e6ac1f7ddf96eb9cda2a9d233adf718ec546f723714d78a0960ad4b43eb1945a56aba6af12b5934f0a45693b23a8914c491a67fb2f2c2eb00 SHA512 346a18ccc25fd45f14252b81a275cc1d3b18568d9a2b8404a7b80c53f05a36d8af0926ef50fca2b92b693d38deec31419f1a1d284a8f4b8506ea8f8cc149062d diff --git a/sys-apps/cciss_vol_status/cciss_vol_status-1.12.ebuild b/sys-apps/cciss_vol_status/cciss_vol_status-1.12.ebuild deleted file mode 100644 index 8c5f27b95379..000000000000 --- a/sys-apps/cciss_vol_status/cciss_vol_status-1.12.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -IUSE="" -DESCRIPTION="Shows status of logical drives attached to HP SmartArray controllers" -HOMEPAGE="http://cciss.sourceforge.net/#cciss_utils" -LICENSE="GPL-2" -SRC_URI="mirror://sourceforge/cciss/${P}.tar.gz" -KEYWORDS="amd64 ~ia64 x86" -SLOT="0" -RDEPEND="" -DEPEND="" - -src_install() { - emake DESTDIR="${D}" install - dodoc AUTHORS ChangeLog NEWS README - exeinto /etc/cron.hourly - newexe "${FILESDIR}/cciss_vol_status.cron2" cciss_vol_status -} diff --git a/sys-apps/cciss_vol_status/cciss_vol_status-1.12a.ebuild b/sys-apps/cciss_vol_status/cciss_vol_status-1.12a.ebuild new file mode 100644 index 000000000000..94fedd2679d0 --- /dev/null +++ b/sys-apps/cciss_vol_status/cciss_vol_status-1.12a.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +IUSE="" +DESCRIPTION="Shows status of logical drives attached to HP SmartArray controllers" +HOMEPAGE="http://cciss.sourceforge.net/#cciss_utils" +LICENSE="GPL-2" +SRC_URI="mirror://sourceforge/cciss/${P}.tar.gz" +KEYWORDS="amd64 ~ia64 x86" +SLOT="0" +RDEPEND="" +DEPEND="" + +src_install() { + emake DESTDIR="${D}" install + dodoc AUTHORS ChangeLog NEWS README + exeinto /etc/cron.hourly + newexe "${FILESDIR}/cciss_vol_status-r2.cron" cciss_vol_status +} diff --git a/sys-apps/cciss_vol_status/files/cciss_vol_status-r2.cron b/sys-apps/cciss_vol_status/files/cciss_vol_status-r2.cron new file mode 100644 index 000000000000..43731b48e0ca --- /dev/null +++ b/sys-apps/cciss_vol_status/files/cciss_vol_status-r2.cron @@ -0,0 +1,52 @@ +#!/bin/sh + +test -x /usr/bin/cciss_vol_status || exit 0 + +# WARNING: For the hpsa driver, we only support /dev/sda through +# /dev/sdz and /dev/sg0 through /dev/sg9. +DEVICES=$(find /dev -type b \( -path '/dev/cciss/c*d0' \ + -or \ + -path '/dev/sd[a-z]' \ + -or \ + -path '/dev/sg[0-9]' \)) + +if [ -n "${DEVICES}" ]; then + # + # Unsupported devices will generate an error (to stderr) of the form, + # + # cciss_vol_status: /dev/sda: Unknown SCSI device. + # + # We want to ignore these, and fortunately, an exit code of zero + # is returned in this case. So we need only hide the output by + # redirecting stderr elsewhere. But, that also hides errors of the + # form, + # + # cciss_vol_status: open /dev/sda: Permission denied + # + # which we DO want to present to the user. So instead of sending + # stderr to stdout, we redirect it to a temporary file. We then + # show the content of the temporary file to the user if it + # contains errors other than "Unknown SCSI device." + # + TMPFILE=$( mktemp ) + if [ $? -ne 0 ] || [ ! -f "${TMPFILE}" ]; then + echo "${0}: error creating temporary file." >&2 + exit 2 + fi + + OUTPUT=$( /usr/bin/cciss_vol_status ${DEVICES} 2> "${TMPFILE}" ) + if [ $? -ne 0 ]; then + printf "%s\n" "$OUTPUT" + rm -f "${TMPFILE}" + exit 1 + fi + + ERRORS=$( GREP_OPTIONS="" grep -v "Unknown SCSI device" "${TMPFILE}" ) + rm -f "${TMPFILE}" + if [ -n "${ERRORS}" ]; then + echo "${ERRORS}" >&2 + exit 3 + fi +fi + +exit 0 diff --git a/sys-apps/cciss_vol_status/files/cciss_vol_status.cron b/sys-apps/cciss_vol_status/files/cciss_vol_status.cron deleted file mode 100644 index 8d1175b45678..000000000000 --- a/sys-apps/cciss_vol_status/files/cciss_vol_status.cron +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -test -x /usr/bin/cciss_vol_status || exit 0 - -STATUS=0 - -if [ -d /proc/driver/cciss ]; then - DEVS=`awk -F: '/^cciss\/c.*d0/{print "/dev/" $1}' /proc/driver/cciss/cciss*` - OUTPUT=`/usr/bin/cciss_vol_status $DEVS` - if [ $? -ne 0 ]; then - printf "%s\n" "$OUTPUT" - exit 1 - fi -fi -# FIXME: This cronjob should also look at the scsi generic nodes -# (/dev/sg*?) to cover the hpsa driver, fibre-attached MSA1000 family -# devices, orthehpahcisr software RAID driver (see cciss_vol_status(8) -# about how to choose the correct nodes -- i don't use these other -# devices, so i cannot verify how to check them cleanly) -# -exit 0 diff --git a/sys-apps/cciss_vol_status/files/cciss_vol_status.cron2 b/sys-apps/cciss_vol_status/files/cciss_vol_status.cron2 deleted file mode 100644 index 43731b48e0ca..000000000000 --- a/sys-apps/cciss_vol_status/files/cciss_vol_status.cron2 +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh - -test -x /usr/bin/cciss_vol_status || exit 0 - -# WARNING: For the hpsa driver, we only support /dev/sda through -# /dev/sdz and /dev/sg0 through /dev/sg9. -DEVICES=$(find /dev -type b \( -path '/dev/cciss/c*d0' \ - -or \ - -path '/dev/sd[a-z]' \ - -or \ - -path '/dev/sg[0-9]' \)) - -if [ -n "${DEVICES}" ]; then - # - # Unsupported devices will generate an error (to stderr) of the form, - # - # cciss_vol_status: /dev/sda: Unknown SCSI device. - # - # We want to ignore these, and fortunately, an exit code of zero - # is returned in this case. So we need only hide the output by - # redirecting stderr elsewhere. But, that also hides errors of the - # form, - # - # cciss_vol_status: open /dev/sda: Permission denied - # - # which we DO want to present to the user. So instead of sending - # stderr to stdout, we redirect it to a temporary file. We then - # show the content of the temporary file to the user if it - # contains errors other than "Unknown SCSI device." - # - TMPFILE=$( mktemp ) - if [ $? -ne 0 ] || [ ! -f "${TMPFILE}" ]; then - echo "${0}: error creating temporary file." >&2 - exit 2 - fi - - OUTPUT=$( /usr/bin/cciss_vol_status ${DEVICES} 2> "${TMPFILE}" ) - if [ $? -ne 0 ]; then - printf "%s\n" "$OUTPUT" - rm -f "${TMPFILE}" - exit 1 - fi - - ERRORS=$( GREP_OPTIONS="" grep -v "Unknown SCSI device" "${TMPFILE}" ) - rm -f "${TMPFILE}" - if [ -n "${ERRORS}" ]; then - echo "${ERRORS}" >&2 - exit 3 - fi -fi - -exit 0 -- cgit v1.2.3