From a5332b59346f7cbf0fdbd148b54aa8a84aaf8190 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 10 Nov 2017 00:43:02 +0000 Subject: gentoo resync : 10.11.2017 --- sys-apps/smartmontools/Manifest | 5 +- sys-apps/smartmontools/smartmontools-6.5.ebuild | 103 ---------------- sys-apps/smartmontools/smartmontools-6.6.ebuild | 150 +++++++++++++++++++++++ sys-apps/smartmontools/smartmontools-9999.ebuild | 4 +- 4 files changed, 156 insertions(+), 106 deletions(-) delete mode 100644 sys-apps/smartmontools/smartmontools-6.5.ebuild create mode 100644 sys-apps/smartmontools/smartmontools-6.6.ebuild (limited to 'sys-apps/smartmontools') diff --git a/sys-apps/smartmontools/Manifest b/sys-apps/smartmontools/Manifest index aacf334322b0..6eb65c730660 100644 --- a/sys-apps/smartmontools/Manifest +++ b/sys-apps/smartmontools/Manifest @@ -4,11 +4,12 @@ AUX smartd.systemd 258 SHA256 72ef7a3ad0e56a144a19aa2b05a0adb147c76cc95e19ac5eb2 AUX smartmontools-update-drivedb 42 SHA256 53a766a094ef63b925e2c3f8c08322b67c2ab40b1f2b84d414e5de4f6747aca8 SHA512 8ad70fc85ab67b7c32eda95dd37517382c2447862df08b810a54dcdedb1eb8148f3a0e29f402a54adff31d1e88d80d09a258ed9e1e13b597ab2a358ebeda0ce8 WHIRLPOOL 3dd62cd6e26a18c9fe5555a1d3feb2597eea6773c857a2cf559331486fc0ef2ef67a0bcb7d1e03b14631d0c8809daae7688d6e1f83f02e8867b0dc23dfcafb55 DIST smartmontools-6.4.tar.gz 822539 SHA256 eab75600c1eda9c34b13097db71138ab376f3dad8a6a4667fb4d1d081feb7a85 SHA512 366cd55ec668da1ca8a3d9ba79d5bee6e0c59032936b7f2f161f8fbb1c9f869c505d715cc10562b6241f808bb8b534feaf9d9fd752f6cb1593ee893611742adc WHIRLPOOL 72af8a0a4754bd75da9e98a008c64c083579fe27bdbd0655da81c8fe7a258dbc305cafd05f2f21d1954918ab8ff040cf1d54b916a1ce82fb8da64ba2e49b4de0 DIST smartmontools-6.5.tar.gz 855642 SHA256 89e8bb080130bc6ce148573ba5bb91bfe30236b64b1b5bbca26515d4b5c945bc SHA512 dca7a6363ab7280ee4197155025f624c978886dcc94fc47b524f6f849138b62c471e966c0d4bf59c7bba50519dc122264618e5ded80a406863ddd10b43d928d3 WHIRLPOOL 639bb5c847c4e0e0f7156b764140f4382f650826eb3d59db6a712468e944a40788c87bbbe0149b9a4d1480947492b007b5875969e611213409f247ff4383fbd6 +DIST smartmontools-6.6.tar.gz 903847 SHA256 51f43d0fb064fccaf823bbe68cf0d317d0895ff895aa353b3339a3b316a53054 SHA512 64bb533dac29f62ddd662a16a12c97df1af9cbac9ac526ce7af0b3bff9da49cf265a2030d91a7160452b56a67e80d7f34c9b4e45bbb320114f55695e2cb5cfaf WHIRLPOOL 7a34444977ae069ecf52f9de67077cf67d56a5888bec159ef7e2b19977f821fed8d8b5bca872c6df17cf12a9cb21c0df37dd9bbb44f295774ef93e93f9552bb3 EBUILD smartmontools-6.4-r1.ebuild 2534 SHA256 bfe58954437b13cc6fbf2a41cd1955dc67142ad5d86cf047f05ab2103c0c9e39 SHA512 1b0d02e5d4a493cd7926a93c92b3b78951f3580228ca19864113dbb09f12ce936866d50d528bdfb66f94b88b8f99660fa5d7181a81008b4badfaa7ef362a187c WHIRLPOOL 11a73a52a10bf7dedb37d3ff95fe6d69038f67ee25ee561c4fba2b2d44bd6fb958e814a6267a3dd2c709b37a53147a59bbe3e62a6b9129e79e44f61aa7fef9d0 EBUILD smartmontools-6.4.ebuild 1639 SHA256 8a750c037710240049acaf6759199fa9bcc8e2521c8eec155871854c410120c8 SHA512 c9b07c80d4e4355bc2c4ebce895efe35ed70d5a31eab3eb8298c1cc947a42cb1c4bb81d57cb46816619580067aeec246f49bc581a788abb7c912d0ef898f8448 WHIRLPOOL f74cbde502853bffc5c88d8ef14202c908a772bd1e9a6a779f3958282655e5ec049666a75d339647d6f5cd9e3697ca4eaa616bc5462f90588e33ecccb2cc9ecb EBUILD smartmontools-6.5-r1.ebuild 4043 SHA256 1d843bfd187ad2f8a0c004faa6f91dc7f5c0709e65dc41a42a6420c3c7037f1a SHA512 7bc661356535cf00b2783f4a4bf323eae05c688d3db0ef81e7ccccb8d8aeeff24b2bbfca50b233d96b0f22d2aecf2d39f5bcd53d90b9076424b3c744f48341a5 WHIRLPOOL 7a1733fee7150b8850904ddb7fa0bda3a6905e09f084e5acdff4b0c84072e8bc1811f79c9fcc0a752ac2b84070fa9336475cfde87ef308672aefc8f76755d51e -EBUILD smartmontools-6.5.ebuild 2726 SHA256 2a194cd89589b0a1be1be3ffe2ecce9c5740ff0069cb2cd209ccd92da895ee3c SHA512 15871d06fa4d9038ecdbb5d6e669526fd035e09cb43dee4fc9688fa3e9d1e5775ba46eb12c720d638ab5f7c0d808495f66c1fa7e404247f933c5c450411462cf WHIRLPOOL aa0fde02f7f195fddaf74a7a63a45c199b05d94a0c41a51d9d644f7ce7864527b5173e321f9fe0048ed3755716ae82dcca66279832bf8a4eb9c83f8488b7618a -EBUILD smartmontools-9999.ebuild 4043 SHA256 1d843bfd187ad2f8a0c004faa6f91dc7f5c0709e65dc41a42a6420c3c7037f1a SHA512 7bc661356535cf00b2783f4a4bf323eae05c688d3db0ef81e7ccccb8d8aeeff24b2bbfca50b233d96b0f22d2aecf2d39f5bcd53d90b9076424b3c744f48341a5 WHIRLPOOL 7a1733fee7150b8850904ddb7fa0bda3a6905e09f084e5acdff4b0c84072e8bc1811f79c9fcc0a752ac2b84070fa9336475cfde87ef308672aefc8f76755d51e +EBUILD smartmontools-6.6.ebuild 4094 SHA256 3829d523fe27d2fd5ffe702bf38f80546d2677a59ac61b3339ed2df6420c569f SHA512 3b284a9deccd3b3e9e02d38565bc2a844f3e9478f20811742c35e5bd57cec653471f742921f37a0a48f1d5a533e51eeda11455e6bfb5fbf93eaba478d3174f2a WHIRLPOOL 1ee4f564c93171335e562ee2aaf5cf9a71a1532efe7fb60c00bdabc1a446c6c25fa3914f08bd79b84f27242e7ec6f6223664fc09d842832a04b2bfb345081c6b +EBUILD smartmontools-9999.ebuild 4094 SHA256 3829d523fe27d2fd5ffe702bf38f80546d2677a59ac61b3339ed2df6420c569f SHA512 3b284a9deccd3b3e9e02d38565bc2a844f3e9478f20811742c35e5bd57cec653471f742921f37a0a48f1d5a533e51eeda11455e6bfb5fbf93eaba478d3174f2a WHIRLPOOL 1ee4f564c93171335e562ee2aaf5cf9a71a1532efe7fb60c00bdabc1a446c6c25fa3914f08bd79b84f27242e7ec6f6223664fc09d842832a04b2bfb345081c6b MISC ChangeLog 5978 SHA256 ddb411f5922e15aa38c9850ff7b341b4b285fe0052dde1710e85a026d1170a5c SHA512 1a482b6059ce1f49f2d1c468389b520963942e4d8b02e0e883452a024a9b1557ce0d33cdb365f170568ea69a9050f61482656579a5179be3ff0d61c84a039d7f WHIRLPOOL 8113cae9710da5e3a758cca8b8760c4c30aef3ae7f2881a1b9028f1ce15539389f1d50a72c97839fb9ffba15d7df94ab904080e8f47c0412491bacc30001c815 MISC ChangeLog-2015 20152 SHA256 f3ec99b8e802612e8f3dccf301c1f8ce46066fa26b1bf58c1eb34ec4e606fb3e SHA512 3969af254861ddb1bef5c129fc691732356ee56fd5ed29f3a76273593182c90d21239050c7d449560334976ae7d315d06fb25d3f815fe6c98b4ce93771b68d6c WHIRLPOOL 2c7d3763680d2572c2ee8f8f3c5a2da0bf6f602c06deb57d842ceea07f0a695d36ed92829166b4d29c10eb21090e65cc064d297d8f2a537c3a4aab93d0bcff8b MISC metadata.xml 718 SHA256 774df2c60538f51bdb39e35b0fddeaed32fa18b0d11efe6a4eb52187d84b57c4 SHA512 a6a07e57bd09402839295ee859481d784445afadb12ffd644c6de3af41a4a763225f63d098c328193123d72cdad3b98e278256bb3e67b104015399def014ee54 WHIRLPOOL e0c7fcd97abb35522e21de6436f621f00f4ae8bbc6137c65f543e25bcda702a89329b6419d954ae59965b3d5dfb048f175746a43cfe6c23af8a95c2733518481 diff --git a/sys-apps/smartmontools/smartmontools-6.5.ebuild b/sys-apps/smartmontools/smartmontools-6.5.ebuild deleted file mode 100644 index dfe72e1dfdd6..000000000000 --- a/sys-apps/smartmontools/smartmontools-6.5.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit flag-o-matic systemd -if [[ ${PV} == "9999" ]] ; then - ESVN_REPO_URI="https://svn.code.sf.net/p/smartmontools/code/trunk/smartmontools" - ESVN_PROJECT="smartmontools" - inherit subversion autotools -else - SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos" -fi - -DESCRIPTION="Tools to monitor storage systems to provide advanced warning of disk degradation" -HOMEPAGE="https://www.smartmontools.org" - -LICENSE="GPL-2" -SLOT="0" -IUSE="caps minimal selinux static update_drivedb" - -DEPEND=" - caps? ( - static? ( sys-libs/libcap-ng[static-libs] ) - !static? ( sys-libs/libcap-ng ) - ) - selinux? ( - sys-libs/libselinux - )" -RDEPEND="${DEPEND} - !minimal? ( virtual/mailx ) - selinux? ( sec-policy/selinux-smartmon ) -" - -src_prepare() { - if [[ ${PV} == "9999" ]] ; then - eautoreconf - fi -} - -src_configure() { - use minimal && einfo "Skipping the monitoring daemon for minimal build." - use static && append-ldflags -static - # The build installs /etc/init.d/smartd, but we clobber it - # in our src_install, so no need to manually delete it. - myeconfargs=( - --docdir="${EPREFIX}/usr/share/doc/${PF}" - --with-drivedbdir="${EPREFIX}/var/db/${PN}" #575292 - --with-initscriptdir="${EPREFIX}/etc/init.d" - $(use_with caps libcap-ng) - $(use_with selinux) - $(systemd_with_unitdir) - $(use_with update_drivedb update-smart-drivedb) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - local db_path="/var/db/${PN}" - - if use minimal ; then - dosbin smartctl - doman smartctl.8 - else - default - newinitd "${FILESDIR}"/smartd-r1.rc smartd - newconfd "${FILESDIR}"/smartd.confd smartd - - keepdir "${db_path}" - if use update_drivedb ; then - # Move drivedb.h file out of PM's sight (bug #575292) - mv "${ED}${db_path}/drivedb.h" "${T}" || die - - exeinto /etc/cron.monthly - doexe "${FILESDIR}/${PN}-update-drivedb" - fi - fi -} - -pkg_postinst() { - if ! use minimal ; then - local db_path="/var/db/${PN}" - - if [[ -f "${db_path}/drivedb.h" ]] ; then - ewarn "WARNING! The existing copy of the drive database has been replaced with the version that" - ewarn "was shipped with this release of ${PN}. You may want to update the" - ewarn "database by: " - - if ! use update_drivedb ; then - ewarn "re-merging ${PN} with USE='update_drivedb', then" - fi - ewarn "running the following command as root:" - ewarn "" - ewarn "/usr/sbin/update-smart-drivedb" - fi - - if use update_drivedb ; then - # Move drivedb.h to /var/db/${PN} (bug #575292) - mv "${T}"/drivedb.h "${db_path}" || die - fi - fi -} diff --git a/sys-apps/smartmontools/smartmontools-6.6.ebuild b/sys-apps/smartmontools/smartmontools-6.6.ebuild new file mode 100644 index 000000000000..4b26ca97c630 --- /dev/null +++ b/sys-apps/smartmontools/smartmontools-6.6.ebuild @@ -0,0 +1,150 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools flag-o-matic systemd +if [[ ${PV} == "9999" ]] ; then + ESVN_REPO_URI="https://svn.code.sf.net/p/smartmontools/code/trunk/smartmontools" + ESVN_PROJECT="smartmontools" + inherit subversion +else + SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos" +fi + +DESCRIPTION="Tools to monitor storage systems to provide advanced warning of disk degradation" +HOMEPAGE="https://www.smartmontools.org" + +LICENSE="GPL-2" +SLOT="0" +IUSE="caps +daemon selinux static update_drivedb" + +DEPEND=" + caps? ( + static? ( sys-libs/libcap-ng[static-libs] ) + !static? ( sys-libs/libcap-ng ) + ) + kernel_FreeBSD? ( + sys-freebsd/freebsd-lib[usb] + ) + selinux? ( + sys-libs/libselinux + )" +RDEPEND="${DEPEND} + daemon? ( virtual/mailx ) + selinux? ( sec-policy/selinux-smartmon ) + update_drivedb? ( + app-crypt/gnupg + || ( + net-misc/curl + net-misc/wget + www-client/lynx + dev-vcs/subversion + ) + ) +" + +REQUIRED_USE="( caps? ( daemon ) )" + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + use static && append-ldflags -static + # The build installs /etc/init.d/smartd, but we clobber it + # in our src_install, so no need to manually delete it. + myeconfargs=( + --docdir="${EPREFIX}/usr/share/doc/${PF}" + --with-drivedbdir="${EPREFIX}/var/db/${PN}" #575292 + --with-initscriptdir="${EPREFIX}/etc/init.d" + $(use_with caps libcap-ng) + $(use_with selinux) + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" + $(use_with update_drivedb gnupg) + $(use_with update_drivedb update-smart-drivedb) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + local db_path="/var/db/${PN}" + + if use daemon; then + default + + newinitd "${FILESDIR}"/smartd-r1.rc smartd + newconfd "${FILESDIR}"/smartd.confd smartd + systemd_newunit "${FILESDIR}"/smartd.systemd smartd.service + else + dosbin smartctl + doman smartctl.8 + + local DOCS=( AUTHORS ChangeL* COPYING INSTALL NEWS README TODO ) + einstalldocs + fi + + if use update_drivedb ; then + if ! use daemon; then + dosbin "${S}"/update-smart-drivedb + fi + + exeinto /etc/cron.monthly + doexe "${FILESDIR}/${PN}-update-drivedb" + fi + + if use daemon || use update_drivedb; then + keepdir "${db_path}" + + # Install a copy of the initial drivedb.h to /usr/share/${PN} + # so that we can access that file later in pkg_postinst + # even when dealing with binary packages (bug #575292) + insinto /usr/share/${PN} + doins "${S}"/drivedb.h + fi + + # Make sure we never install drivedb.h into the db location + # of the acutal image so we don't record hashes because user + # can modify that file + rm -f "${ED%/}${db_path}/drivedb.h" || die + + # Bug #622072 + find "${ED%/}"/usr/share/doc -type f -exec chmod a-x '{}' \; || die +} + +pkg_postinst() { + if use daemon || use update_drivedb; then + local initial_db_file="${EPREFIX%/}/usr/share/${PN}/drivedb.h" + local db_path="${EPREFIX%/}/var/db/${PN}" + + if [[ ! -f "${db_path}/drivedb.h" ]] ; then + # No initial database found + cp "${initial_db_file}" "${db_path}" || die + einfo "Default drive database which was shipped with this release of ${PN}" + einfo "has been installed to '${db_path}'." + else + ewarn "WARNING: There's already a drive database in '${db_path}'!" + ewarn "Because we cannot determine if this database is untouched" + ewarn "or was modified by the user you have to manually update the" + ewarn "drive database:" + ewarn "" + ewarn "a) Replace '${db_path}/drivedb.h' by the database shipped with this" + ewarn " release which can be found in '${initial_db_file}', i.e." + ewarn "" + ewarn " cp \"${initial_db_file}\" \"${db_path}\"" + ewarn "" + ewarn "b) Run the following command as root:" + ewarn "" + ewarn " /usr/sbin/update-smart-drivedb" + + if ! use update_drivedb ; then + ewarn "" + ewarn "However, 'update-smart-drivedb' requires that you re-emerge ${PN}" + ewarn "with USE='update_drivedb'." + fi + fi + fi +} diff --git a/sys-apps/smartmontools/smartmontools-9999.ebuild b/sys-apps/smartmontools/smartmontools-9999.ebuild index 499584db4c39..4b26ca97c630 100644 --- a/sys-apps/smartmontools/smartmontools-9999.ebuild +++ b/sys-apps/smartmontools/smartmontools-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=6 inherit autotools flag-o-matic systemd if [[ ${PV} == "9999" ]] ; then @@ -35,6 +35,7 @@ RDEPEND="${DEPEND} daemon? ( virtual/mailx ) selinux? ( sec-policy/selinux-smartmon ) update_drivedb? ( + app-crypt/gnupg || ( net-misc/curl net-misc/wget @@ -63,6 +64,7 @@ src_configure() { $(use_with caps libcap-ng) $(use_with selinux) --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" + $(use_with update_drivedb gnupg) $(use_with update_drivedb update-smart-drivedb) ) econf "${myeconfargs[@]}" -- cgit v1.2.3