From 761fd00ad8078def7c48ff927146ae0416914229 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Tue, 15 Apr 2025 03:23:33 +0100 Subject: Swap autorestart for needrestart --- sys-apps/autorestart/Manifest | 2 - sys-apps/autorestart/autorestart-0.1.1.ebuild | 32 ----- virtual/miller-base/Manifest | 3 +- virtual/miller-base/files/auto-service-restart.sh | 3 + virtual/miller-base/miller-base-10.12.8.ebuild | 139 --------------------- virtual/miller-base/miller-base-10.13.0.ebuild | 142 ++++++++++++++++++++++ 6 files changed, 147 insertions(+), 174 deletions(-) delete mode 100644 sys-apps/autorestart/Manifest delete mode 100644 sys-apps/autorestart/autorestart-0.1.1.ebuild create mode 100755 virtual/miller-base/files/auto-service-restart.sh delete mode 100644 virtual/miller-base/miller-base-10.12.8.ebuild create mode 100644 virtual/miller-base/miller-base-10.13.0.ebuild diff --git a/sys-apps/autorestart/Manifest b/sys-apps/autorestart/Manifest deleted file mode 100644 index 86cc0ac..0000000 --- a/sys-apps/autorestart/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST autorestart-0.1.1.tar.xz 5288 BLAKE2B 8ad92d75585d67ff716cbd3343d79832fd6a03514ef30e97dd5a6365708210ce0536c920bb8235bd5b45ef31f8087d214c2119c52d6b3b0d94e185572dfb9df9 SHA512 ce585efd01cc50868e2c46136f098b38535aa3571da72fed6313726683fc3e01f30c8805dd8aa414ec7175d2b3e84ef1af383c38619cd8e854bf8db1b3314094 -EBUILD autorestart-0.1.1.ebuild 774 BLAKE2B 04e8f919f0b4d595c1b866838e50fd533ca0365fcf2482c11e30472234c93c86322ef8fd6842547a76e1b0d3295ecf921f60d05cf43312735b02926bde449d04 SHA512 df94a581f44d304c9bae98bda97d6e4384e24776d431553adeb7e69aa5506c4b127404583fb481c0a099eec76986408e560a70edb0c58eee9d1ca162c3ca1189 diff --git a/sys-apps/autorestart/autorestart-0.1.1.ebuild b/sys-apps/autorestart/autorestart-0.1.1.ebuild deleted file mode 100644 index f0cd5b6..0000000 --- a/sys-apps/autorestart/autorestart-0.1.1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="7" - -DESCRIPTION="Automatically restart systemd units as required." -HOMEPAGE="https://git.randomdan.homeip.net/cgit.cgi/util/tree/autorestart" -SRC_URI="https://git.randomdan.homeip.net/cgit.cgi/util/snapshot/${P}.tar.xz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="" -RDEPEND=" - mail-client/mailx - sys-apps/coreutils - sys-apps/findutils - sys-apps/systemd - sys-process/lsof - " - -src_install() { - exeinto /sbin - doexe ${S}/autorestart/scripts/systemd-restart-as-needed - dosym ../../../sbin/systemd-restart-as-needed /etc/portage/postsync.d/95-systemd-restart-as-needed - insinto /etc/autorestart - doins -r ${S}/autorestart/etc/ignore.d -} - diff --git a/virtual/miller-base/Manifest b/virtual/miller-base/Manifest index 83a9e85..841aa01 100644 --- a/virtual/miller-base/Manifest +++ b/virtual/miller-base/Manifest @@ -1,4 +1,5 @@ AUX auto-download-packages 81 BLAKE2B 18de205f954967907ee4e905ea7710483a69f06e958b3d70cab0daef1945f26d85ecdf1e77c5a1ab1e4b5168a5258b3af89453125d68e0ffa30f69dc4296be21 SHA512 ce5a4d320fa33cceaacd6f446340026d14da04a91b57cfe1bc78d026487748b6644d04d30a3d904af416e8914dd69f0dcfb89267011da59e7084f78f74f8a1b7 +AUX auto-service-restart.sh 34 BLAKE2B 452169c5f7134f932ff89b8a5d8a985e8de08fd7283b14ce24749bebcc8991c736f26f8500a06ae38314c81efb6889ee9965bf2e51346dbb9ffbe8f9a4da8b04 SHA512 eec82334359caaf62b190ec02671d97ee57cb05be2e4a42273b4964fc4869049dd79776329a65316e81c294a682bb874369383aa0051d2d66e7315e7bfda4643 AUX hardlink-ccache 315 BLAKE2B 7aee8a9a6e458df28936562395679130c54e0703e10b67157b34f77f351ea087458a7f8169fce14d404d8f43d4e1cf02d6eeb7ba984ba3ce7b0720f7fc83ec52 SHA512 1136f49359e42a53ad8d764da6fe44494cb724cb88065ad7c8f6f97b2f0a06df822af9ff485504c53a0fc946caa660353c108849951ed8c54c70dec286cdb099 AUX kernels-cleaner 173 BLAKE2B 8e7c6532396882014a3bd5be53ef13467f945f5c69fe75f53213cd4fa710bfbdea39fad59ea475e00c6251e3f3934653f4d85dc2d019d64f0f699e62b57c75ce SHA512 e10e75ede5ef307e0e259615901848f369768c548e0fc88755a9aa47a4407b20875d904028812a0815bc1fd902330828b9ad0dc7ee074ad21044772000886ab9 AUX linkfiles 427 BLAKE2B 17475db2066c91e6ae0e17b14f9f967cc65be693281c13424f1413aae644ce49aa8970ab9e781473212e9ed89745059a909f521e6d2eacc270c81ef1d2410924 SHA512 f321f700d4bd88bb60b3ddf59eb7ce28e314e33b52701e8695eef4538b69459c31c0ee9bf6d193c62b7846639871eb18581cff60c14ad54166a69e5f3a89850d @@ -12,4 +13,4 @@ AUX update-install2 683 BLAKE2B 22d9b0ee5bf4af8f0ababf8228d1d0b72f52d63eb9c513fa AUX update.portage.cron-2 48 BLAKE2B 3dfc6ccfc76500300af4c08eab46f309817fe1b50d0aceaad14e05f73fec23146eb9dcedb53c3db78b222f80530fde7533052253fad80eca0f9c6831ad939955 SHA512 431d8ed50c2fc6d4b0e9e3550e4ba5d8320595961c6dab14820ae7b5abd39bf63cb6afb99724f2b4aebb2c0cf14b46927d2abecb6d9509db158000b8ea6a97b8 AUX weekly-av-scan.cron 1788 BLAKE2B 2c5b9394f18e882971ea883639fdcfc24cda342a6e63f166fe737a3d09e32de42b5b960f80c676994e8f8471d76b21d61cf5bfe7148eb8284d84407da8ebd5aa SHA512 ef2168213d81ce0db8eed96adf48e362f0e620ba509728beb97a5809c1f82443be356c01b7c645a7baf5cee1939d3db1f42940824b4a1a9ad8fd451d899c9179 AUX write-new-updates 479 BLAKE2B f5ae0a84219a9d60ba3af43000c0ed1489d26868c51893a40fe0a40da80fcf721bdc540d07c17021cc06a216908b7ddac7736dfab9783853de7a75315705cf62 SHA512 b84f0bc0259c0986f136282475462165eb69c6bb766640089f64027233f9bb4faf4ae91b2aa0227791e0df542b75a5c50ab9a3bc33d8162a3ed53273cb24e182 -EBUILD miller-base-10.12.8.ebuild 3906 BLAKE2B def2e7f3a5788a63f3ece4ae2593e06eff1bde490c6703fc2c931f42d5370cda3b2c2e8b8a1ce37d13271d22850216cbed7c3e526fc8b68975f61d0851c88ecf SHA512 e65c4cc51d58c3110d53dda721df02ba2fd45346cc66be2021aec73851a298ab9f0b39b1bbc5eb8ad0dbbdde827ac93692ad24db6389dd0b99cdfc81f5699ad6 +EBUILD miller-base-10.13.0.ebuild 4016 BLAKE2B b273f6c3adfe0d7ce97d8f00fdcc1833a08a565e0b38c2481c41ef0c7569977e1a1ed5761c68198bc9bb618db5754bcf146987cc676b0ae175e56c77fbc5b984 SHA512 bc70240be575c157f07ba7f9964a0df8546f047a01c3af4181c78b0af019509068d4a57654ab8a596508039a31d3e8edad0c0c46921e0c3a4cad8b1dea2d5d22 diff --git a/virtual/miller-base/files/auto-service-restart.sh b/virtual/miller-base/files/auto-service-restart.sh new file mode 100755 index 0000000..5053552 --- /dev/null +++ b/virtual/miller-base/files/auto-service-restart.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +needrestart -ra -klw diff --git a/virtual/miller-base/miller-base-10.12.8.ebuild b/virtual/miller-base/miller-base-10.12.8.ebuild deleted file mode 100644 index 8ce0010..0000000 --- a/virtual/miller-base/miller-base-10.12.8.ebuild +++ /dev/null @@ -1,139 +0,0 @@ -EAPI="7" -inherit systemd tmpfiles -DESCRIPTION="Virtual for base systems" - -SLOT="0" -KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd" -IUSE="hardened nohourlyupdate fuse xfs btrfs bash-completion git samba -minimal autoupdate autoshutdown autoservicerestart mdadm ssd X -video_cards_nvidia video_cards_nouveau firmware ischroot ldap" - -RDEPEND=" - app-misc/simplify - || ( app-arch/hardlink sys-apps/util-linux[hardlink] ) - sys-process/htop - sys-process/time - sys-apps/less - fuse? ( net-fs/sshfs ) - !ischroot? ( - net-fs/autofs - sys-kernel/kergen - sys-apps/ethtool - sys-cluster/netfs - sys-apps/kexec-tools - >=app-admin/eclean-kernel-1.99 - mdadm? ( sys-fs/mdadm ) - !ssd? ( - sys-apps/systemd-readahead - ) - xfs? ( sys-fs/xfsdump ) - btrfs? ( - sys-fs/btrfs-progs - sys-fs/btrfsmaintenance - ) - sys-fs/lvm2 - sys-boot/grub - sys-apps/pciutils - sys-apps/usbutils - samba? ( || ( net-fs/cifs-utils net-fs/samba[client] ) ) - firmware? ( sys-kernel/linux-firmware sys-firmware/intel-microcode ) - app-admin/logrotate - video_cards_nouveau? ( sys-firmware/nvidia-firmware ) - app-antivirus/clamav - sys-kernel/gentoo-kernel - sys-apps/deswappify-auto - ) - sys-process/cronie - app-portage/gentoolkit - app-admin/sudo - app-admin/hddtemp - mail-client/mailx - !minimal? ( - app-shells/hstr - X? ( - x11-apps/xauth - ) - sys-apps/moreutils - dev-debug/strace - || ( - net-analyzer/netcat - net-analyzer/nmap[ncat,symlink] - ) - net-ftp/ncftp - app-text/dos2unix - net-dns/bind - ) - sys-process/lsof - app-eselect/eselect-repository - app-misc/screen - app-vim/gentoo-syntax - ldap? ( - sys-auth/nss-pam-ldapd - ) - app-editors/vim - X? ( - app-editors/gvim - ) - git? ( dev-vcs/git ) - bash-completion? ( app-shells/bash-completion ) - sys-apps/systemd - autoservicerestart? ( - sys-apps/autorestart - ) - app-portage/cpuid2cpuflags - app-text/ansifilter - " - -src_unpack() { - mkdir ${S} -} - -src_install() { - exeinto /etc/cron.hourly - newexe "${FILESDIR}"/service-check.systemd service-check - newtmpfiles "${FILESDIR}/tmpfiles-d-portage.conf" "portage.conf" - dodir /etc/systemd/system/multi-user.target.wants - use !ischroot && dosym /lib/systemd/system/freshclamd.service /etc/systemd/system/multi-user.target.wants/freshclamd.service - dosym /lib/systemd/system/nscd.service /etc/systemd/system/multi-user.target.wants/nscd.service - use !ischroot && dosym /lib/systemd/system/sshd.service /etc/systemd/system/multi-user.target.wants/sshd.service - dosym /lib/systemd/system/cronie.service /etc/systemd/system/multi-user.target.wants/cronie.service - - exeinto /etc/cron.weekly - use !ischroot && newexe "${FILESDIR}"/weekly-av-scan.cron av-scan - use !ischroot && newexe "${FILESDIR}"/kernels-cleaner kernels-cleaner - use !minimal && newexe "${FILESDIR}"/hardlink-ccache hardlink-ccache - - if [[ -n ${UPDATETIME} ]]; then - if [[ ${UPDATETIME} = @* ]]; then - exeinto /etc/cron.${UPDATETIME#"@"} - else - mkdir -p ${D}/etc/cron.d - echo "${UPDATETIME} root /sbin/gentoo-portage-update" > ${D}/etc/cron.d/gentoo-portage-update - exeinto /sbin - fi - else - use nohourlyupdate && exeinto /etc/cron.daily - use !nohourlyupdate && exeinto /etc/cron.hourly - fi - newexe "${FILESDIR}"/update.portage.cron-2 gentoo-portage-update - - exeinto /etc/portage/postsync.d/ - newexe "${FILESDIR}"/sync-distclean-exec.cron 60-portage-distclean-exec - use !autoupdate && newexe "${FILESDIR}"/auto-download-packages 70-auto-download-package - newexe "${FILESDIR}"/write-new-updates 50-write-new-updates - newexe "${FILESDIR}"/systemd-reload 90-systemd-reload - newexe "${FILESDIR}"/linkfiles 98-linkfiles - if use autoupdate ; then - dosym /sbin/update-install /etc/portage/postsync.d/75-update-install - if use autoshutdown ; then - newexe "${FILESDIR}"/update-autoshutdown 99-auto-shutdown - fi - fi - - exeinto /sbin - newexe "${FILESDIR}"/update-install2 update-install -} - -pkg_postinst() { - tmpfiles_process "portage.conf" -} diff --git a/virtual/miller-base/miller-base-10.13.0.ebuild b/virtual/miller-base/miller-base-10.13.0.ebuild new file mode 100644 index 0000000..6088a9d --- /dev/null +++ b/virtual/miller-base/miller-base-10.13.0.ebuild @@ -0,0 +1,142 @@ +EAPI="7" +inherit systemd tmpfiles +DESCRIPTION="Virtual for base systems" + +SLOT="0" +KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd" +IUSE="hardened nohourlyupdate fuse xfs btrfs bash-completion git samba +minimal autoupdate autoshutdown autoservicerestart mdadm ssd X +video_cards_nvidia video_cards_nouveau firmware ischroot ldap" + +RDEPEND=" + app-misc/simplify + || ( app-arch/hardlink sys-apps/util-linux[hardlink] ) + sys-process/htop + sys-process/time + sys-apps/less + fuse? ( net-fs/sshfs ) + !ischroot? ( + net-fs/autofs + sys-kernel/kergen + sys-apps/ethtool + sys-cluster/netfs + sys-apps/kexec-tools + >=app-admin/eclean-kernel-1.99 + mdadm? ( sys-fs/mdadm ) + !ssd? ( + sys-apps/systemd-readahead + ) + xfs? ( sys-fs/xfsdump ) + btrfs? ( + sys-fs/btrfs-progs + sys-fs/btrfsmaintenance + ) + sys-fs/lvm2 + sys-boot/grub + sys-apps/pciutils + sys-apps/usbutils + samba? ( || ( net-fs/cifs-utils net-fs/samba[client] ) ) + firmware? ( sys-kernel/linux-firmware sys-firmware/intel-microcode ) + app-admin/logrotate + video_cards_nouveau? ( sys-firmware/nvidia-firmware ) + app-antivirus/clamav + sys-kernel/gentoo-kernel + sys-apps/deswappify-auto + ) + sys-process/cronie + app-portage/gentoolkit + app-admin/sudo + app-admin/hddtemp + mail-client/mailx + !minimal? ( + app-shells/hstr + X? ( + x11-apps/xauth + ) + sys-apps/moreutils + dev-debug/strace + || ( + net-analyzer/netcat + net-analyzer/nmap[ncat,symlink] + ) + net-ftp/ncftp + app-text/dos2unix + net-dns/bind + ) + sys-process/lsof + app-eselect/eselect-repository + app-misc/screen + app-vim/gentoo-syntax + ldap? ( + sys-auth/nss-pam-ldapd + ) + app-editors/vim + X? ( + app-editors/gvim + ) + git? ( dev-vcs/git ) + bash-completion? ( app-shells/bash-completion ) + sys-apps/systemd + autoservicerestart? ( + app-admin/needrestart + ) + app-portage/cpuid2cpuflags + app-text/ansifilter + " + +src_unpack() { + mkdir ${S} +} + +src_install() { + exeinto /etc/cron.hourly + newexe "${FILESDIR}"/service-check.systemd service-check + newtmpfiles "${FILESDIR}/tmpfiles-d-portage.conf" "portage.conf" + dodir /etc/systemd/system/multi-user.target.wants + use !ischroot && dosym /lib/systemd/system/freshclamd.service /etc/systemd/system/multi-user.target.wants/freshclamd.service + dosym /lib/systemd/system/nscd.service /etc/systemd/system/multi-user.target.wants/nscd.service + use !ischroot && dosym /lib/systemd/system/sshd.service /etc/systemd/system/multi-user.target.wants/sshd.service + dosym /lib/systemd/system/cronie.service /etc/systemd/system/multi-user.target.wants/cronie.service + + exeinto /etc/cron.weekly + use !ischroot && newexe "${FILESDIR}"/weekly-av-scan.cron av-scan + use !ischroot && newexe "${FILESDIR}"/kernels-cleaner kernels-cleaner + use !minimal && newexe "${FILESDIR}"/hardlink-ccache hardlink-ccache + + if [[ -n ${UPDATETIME} ]]; then + if [[ ${UPDATETIME} = @* ]]; then + exeinto /etc/cron.${UPDATETIME#"@"} + else + mkdir -p ${D}/etc/cron.d + echo "${UPDATETIME} root /sbin/gentoo-portage-update" > ${D}/etc/cron.d/gentoo-portage-update + exeinto /sbin + fi + else + use nohourlyupdate && exeinto /etc/cron.daily + use !nohourlyupdate && exeinto /etc/cron.hourly + fi + newexe "${FILESDIR}"/update.portage.cron-2 gentoo-portage-update + + exeinto /etc/portage/postsync.d/ + newexe "${FILESDIR}"/sync-distclean-exec.cron 60-portage-distclean-exec + use !autoupdate && newexe "${FILESDIR}"/auto-download-packages 70-auto-download-package + newexe "${FILESDIR}"/write-new-updates 50-write-new-updates + newexe "${FILESDIR}"/systemd-reload 90-systemd-reload + if use autoservicerestart ; then + newexe "${FILESDIR}"/auto-service-restart.sh 95-auto-service-restart + fi + newexe "${FILESDIR}"/linkfiles 98-linkfiles + if use autoupdate ; then + dosym /sbin/update-install /etc/portage/postsync.d/75-update-install + if use autoshutdown ; then + newexe "${FILESDIR}"/update-autoshutdown 99-auto-shutdown + fi + fi + + exeinto /sbin + newexe "${FILESDIR}"/update-install2 update-install +} + +pkg_postinst() { + tmpfiles_process "portage.conf" +} -- cgit v1.2.3