From 666126f3c7febf3ca3fe80db4bb4d66aa1a51458 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 May 2025 07:12:32 +0000 Subject: [PATCH] sys-apps/smartmontools: Sync with Gentoo It's from Gentoo commit 36ec5fa92617620060e8ace928cceb77ff207e87. --- .../sys-apps/smartmontools/Manifest | 2 +- .../smartmontools/smartmontools-7.4.ebuild | 156 ------------------ ...ls-7.3.ebuild => smartmontools-7.5.ebuild} | 9 +- 3 files changed, 6 insertions(+), 161 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/smartmontools/smartmontools-7.4.ebuild rename sdk_container/src/third_party/portage-stable/sys-apps/smartmontools/{smartmontools-7.3.ebuild => smartmontools-7.5.ebuild} (93%) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/smartmontools/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/smartmontools/Manifest index 729a30cb14..f43b6986d0 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/smartmontools/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-apps/smartmontools/Manifest @@ -1,2 +1,2 @@ -DIST smartmontools-7.3.tar.gz 1043932 BLAKE2B 119fd4aded487796ffd38050ddf8c7dd69cc6f3950650cb0315846292fd4a6594d949d87c51ed46717d6aaadb332c68f655514d1fde89600d51f3fe36f8df1ca SHA512 08afe8b0a6a39e742160cd4e4c03fc7aff7b1ae8681b906360f0932277dc99e361b7606b2373bdf42425cf9453480a5f4344bc040ebc2fa26a03bd52f02a6ac0 DIST smartmontools-7.4.tar.gz 1094955 BLAKE2B fbf7888b92b6be4892a206e1c0fae1cb7c45fe0d62270c5fe713a540616e3599c67dd3297ad8c1cd344987e1fe95ae7c5e92db8e13ef622b3316b3780fbb4052 SHA512 439fbf8d0e77fbe1d5a9fb100e655a7e47a82382ce8e1a4e942541a4dfbdff3391caa635e8d354d0e87c10ae79cb97aa6d24915f9f193620d763b384baf2e753 +DIST smartmontools-7.5.tar.gz 1122317 BLAKE2B c6dfbdec8c25490925d8afdfd6eb3ce631f7a70447c8a3b54a4a16faafbf69da7bf4638eba7398265b952ed0dc2ef71dfe2c5188026a5c0542b4f7fd6d116cf7 SHA512 2e4a6d712f33f3efff34184686b893f0205728d4a267fb88a833de7159170a6072b94744c1ae8c6694c99940d9ecaec164e3bd713e49476930dc2144c04b3f8c diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/smartmontools/smartmontools-7.4.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/smartmontools/smartmontools-7.4.ebuild deleted file mode 100644 index c446b3e95e..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/smartmontools/smartmontools-7.4.ebuild +++ /dev/null @@ -1,156 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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 autotools subversion -else - SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-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 systemd +update-drivedb" - -DEPEND=" - caps? ( - static? ( sys-libs/libcap-ng:=[static-libs] ) - !static? ( sys-libs/libcap-ng:= ) - ) - selinux? ( - sys-libs/libselinux:= - ) -" -RDEPEND=" - ${DEPEND} - daemon? ( virtual/mailx ) - selinux? ( sec-policy/selinux-smartmon ) - systemd? ( sys-apps/systemd ) - update-drivedb? ( - app-crypt/gnupg - || ( - net-misc/curl - net-misc/wget - www-client/lynx - dev-vcs/subversion - ) - ) -" - -REQUIRED_USE="( - caps? ( daemon ) - static? ( !systemd ) -)" - -src_prepare() { - default - - if [[ ${PV} == 9999 ]] ; then - eautoreconf - fi -} - -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=( - --with-drivedbdir="${EPREFIX}/var/db/${PN}" #575292 - --with-initscriptdir="${EPREFIX}/etc/init.d" - #--with-smartdscriptdir="${EPREFIX}/usr/share/${PN}" - $(use_with caps libcap-ng) - $(use_with selinux) - $(use_with systemd libsystemd) - $(use_with update-drivedb gnupg) - $(use_with update-drivedb update-smart-drivedb) - $(usex systemd "--with-systemdsystemunitdir=$(systemd_get_systemunitdir)" '') - ) - econf "${myeconfargs[@]}" -} - -src_install() { - local db_path="/var/db/${PN}" - insopts -m0644 -p # preserve timestamps - - if use daemon; then - default - - newinitd "${FILESDIR}"/smartd-r1.rc smartd - newconfd "${FILESDIR}"/smartd.confd smartd - 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="${EROOT}/usr/share/${PN}/drivedb.h" - local db_path="${EROOT}/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/sdk_container/src/third_party/portage-stable/sys-apps/smartmontools/smartmontools-7.3.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/smartmontools/smartmontools-7.5.ebuild similarity index 93% rename from sdk_container/src/third_party/portage-stable/sys-apps/smartmontools/smartmontools-7.3.ebuild rename to sdk_container/src/third_party/portage-stable/sys-apps/smartmontools/smartmontools-7.5.ebuild index c446b3e95e..97147f10cb 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/smartmontools/smartmontools-7.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/smartmontools/smartmontools-7.5.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit flag-o-matic systemd if [[ ${PV} == 9999 ]] ; then @@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then inherit autotools subversion else SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" fi DESCRIPTION="Tools to monitor storage systems to provide advanced warning of disk degradation" @@ -66,6 +66,7 @@ src_configure() { --with-drivedbdir="${EPREFIX}/var/db/${PN}" #575292 --with-initscriptdir="${EPREFIX}/etc/init.d" #--with-smartdscriptdir="${EPREFIX}/usr/share/${PN}" + --with-systemdenvfile=no $(use_with caps libcap-ng) $(use_with selinux) $(use_with systemd libsystemd) @@ -113,7 +114,7 @@ src_install() { fi # Make sure we never install drivedb.h into the db location - # of the acutal image so we don't record hashes because user + # of the actual image so we don't record hashes because user # can modify that file rm -f "${ED}${db_path}/drivedb.h" || die