From 61587d487846d28d7842ac10155eaf0742ada62c Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Tue, 1 Jun 2021 17:27:45 +0100 Subject: tmpfiles.d for /tmp/portage as well as /var/tmp/portage --- virtual/miller-base/Manifest | 4 +- virtual/miller-base/files/tmpfiles-d-portage.conf | 1 + virtual/miller-base/miller-base-10.10.3.ebuild | 129 ---------------------- virtual/miller-base/miller-base-10.10.4.ebuild | 129 ++++++++++++++++++++++ 4 files changed, 132 insertions(+), 131 deletions(-) delete mode 100644 virtual/miller-base/miller-base-10.10.3.ebuild create mode 100644 virtual/miller-base/miller-base-10.10.4.ebuild diff --git a/virtual/miller-base/Manifest b/virtual/miller-base/Manifest index 2db46ac..2596444 100644 --- a/virtual/miller-base/Manifest +++ b/virtual/miller-base/Manifest @@ -6,10 +6,10 @@ AUX newkernel 505 BLAKE2B a33a649045d2f0b1ea28902bde704d7ff586d8b187a8ff5070f9b3 AUX service-check.systemd 57 BLAKE2B 2cda658accd9ec3cce11a742f7ded6c26a676cba10c09830b22c933bbcfa31311ccdf1ba7e4cac31dc6779ce5c5441cfc53aa7b63965998876b85f3791dc8a7a SHA512 58d52a5623f478d2e104047c75fb89656e1cda6a7552e56f552bc075f488577dd856ec60d0e8842a07dadb700205a1dbf27baa9e8889692598d661ae26fdc114 AUX sync-distclean-exec.cron 60 BLAKE2B 986476d7cb8a59a554ef07cebabc1d29aa99662c75d2833ae527a4fdf083166b4e5e1970b00027146dd660c439c68d1f53b7d1e4f60f4989a6d9a27dca2d833e SHA512 e8075f330b879f3888f47086e5fdd0144be7decbe264a105e5071f851065bd6eb55a22be6fb4eb90a4e3bca00e76fee79f372adc5c3a8f25660c61bd9379ab0f AUX systemd-reload 38 BLAKE2B 274ffadc1921939d49ca130847a1d4edfcb6b1c6a50085da1489df01e932599e44015accc1278868a3810c8fab2e26f6a9f102bc80fe0bf70054ea36d0fb2e9d SHA512 ffbf5b57643b30fff86ec16c5d25c50337255ba44f930beba614a4600a4bed61e7ca9ecf9c85ddd7555df4e44c2cd77c2aa0ef321575b712f0d66e21a86c9999 -AUX tmpfiles-d-portage.conf 43 BLAKE2B 0dfdac6e38b9a1ace92e5468c83481b6bd76f1eb61b2fa74b71e3ae603609bcfd7f88c182eea0cf63a6bcb304f4bc9ce1ba499825a3db286bce7a0171d1242d1 SHA512 e329444f9b38df6cd5a3075ee799827438555e7b6fc53bbb820485ec0ad7c5ca8cad00b1679f0baae7dc484bd185955b8a9fcf66527d5bd7a55c443b4999fb42 +AUX tmpfiles-d-portage.conf 82 BLAKE2B b6c6186e5d4eaa5510d9c072a1d4f54f928bbe621252358ab494c4a697fb054eb21a4ee13e12974353baab924c3aac1039d6771778420273f330b9aefb76b2de SHA512 daa245dbab8d99c00349a0bd47cf8312b6e1a81df87ca77cac9c195b0d33c1698c094fb30cda3977f7d663f0374ab2611513cacc03dd5f4916a7bf072c42c281 AUX update-autoshutdown 93 BLAKE2B 399eb628b98f8f5846dd1611226de158c5003d9184047c15d50f823702039e4cc803b2f82711899b6d3c80fcd4d5e631acde8eb09ec5115d2428d93713087064 SHA512 4a08701deb2f6ff98225b49bfd498a81f73bc1c7956cfdf6239cd7aadca5cbef0086bc0d8834f861640b0d4ab0ab4d90777abe1da3b116e4e84d69a3dc8a2a46 AUX update-install2 683 BLAKE2B 22d9b0ee5bf4af8f0ababf8228d1d0b72f52d63eb9c513fa8108429ec833d48064c6a74f4c393cc8008b7d3d4f9ac7ba5c2ad22e2d623d4e3e3ed319e681bde3 SHA512 64895037bb13f59a255c75f852249ff1d23088e9b4faf7e908f9f112a1ce30ce9efe9fc568836da43cddc3c3f906f6c92c62642fd17bc19b74689632c03403b1 AUX update.portage.cron-2 48 BLAKE2B 3dfc6ccfc76500300af4c08eab46f309817fe1b50d0aceaad14e05f73fec23146eb9dcedb53c3db78b222f80530fde7533052253fad80eca0f9c6831ad939955 SHA512 431d8ed50c2fc6d4b0e9e3550e4ba5d8320595961c6dab14820ae7b5abd39bf63cb6afb99724f2b4aebb2c0cf14b46927d2abecb6d9509db158000b8ea6a97b8 AUX weekly-av-scan.cron 1682 BLAKE2B a981abccc76a0a4c67cf68698c5aeda7843fab549fee343f8fcde5576fb0c2c726410ed90094e4fc651f74095a20263dbd44e936bf90981bbd5d5b718db4a670 SHA512 4f1416c2aa40757cf622e54c6b89ecb90cd80eb294d62ff06dc1262540a28d62f0df230b83b4e8e70c688628d537ffa8e2198a5e9e58f738d75ac039dbc3719f AUX write-new-updates 479 BLAKE2B f5ae0a84219a9d60ba3af43000c0ed1489d26868c51893a40fe0a40da80fcf721bdc540d07c17021cc06a216908b7ddac7736dfab9783853de7a75315705cf62 SHA512 b84f0bc0259c0986f136282475462165eb69c6bb766640089f64027233f9bb4faf4ae91b2aa0227791e0df542b75a5c50ab9a3bc33d8162a3ed53273cb24e182 -EBUILD miller-base-10.10.3.ebuild 3751 BLAKE2B 60a4bc95aff4a002b2977f6a370fe3c0153da46c23f9cde5fdacfbb78ec0f5c30b27de0e3bb06baf2cbc8c696278c6f7588c58a4fff87910064110f5183cef15 SHA512 f860023fc265cee6df3f4b4ecf5075f1c973425816957bba56f4b4c99a7d53c27d05b4e85df473bceda41cd3ea3967e83d7174a4f34a4245983bfb6191edfeba +EBUILD miller-base-10.10.4.ebuild 3751 BLAKE2B 60a4bc95aff4a002b2977f6a370fe3c0153da46c23f9cde5fdacfbb78ec0f5c30b27de0e3bb06baf2cbc8c696278c6f7588c58a4fff87910064110f5183cef15 SHA512 f860023fc265cee6df3f4b4ecf5075f1c973425816957bba56f4b4c99a7d53c27d05b4e85df473bceda41cd3ea3967e83d7174a4f34a4245983bfb6191edfeba diff --git a/virtual/miller-base/files/tmpfiles-d-portage.conf b/virtual/miller-base/files/tmpfiles-d-portage.conf index e837403..4ef7648 100644 --- a/virtual/miller-base/files/tmpfiles-d-portage.conf +++ b/virtual/miller-base/files/tmpfiles-d-portage.conf @@ -1 +1,2 @@ d /var/tmp/portage 0775 portage portage 1d +d /tmp/portage 0775 portage portage 1d diff --git a/virtual/miller-base/miller-base-10.10.3.ebuild b/virtual/miller-base/miller-base-10.10.3.ebuild deleted file mode 100644 index 2cd3fd2..0000000 --- a/virtual/miller-base/miller-base-10.10.3.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -EAPI="7" -inherit systemd -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 -video_cards_nvidia video_cards_nouveau firmware ischroot" - -RDEPEND=" - app-misc/simplify - app-arch/hardlink - sys-process/htop - sys-process/iotop - sys-apps/less - fuse? ( net-fs/sshfs ) - !ischroot? ( - 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-2 - sys-apps/busybox - sys-apps/pciutils - sys-apps/usbutils - samba? ( || ( net-fs/cifs-utils net-fs/samba[client] ) ) - firmware? ( sys-kernel/linux-firmware ) - app-admin/logrotate - video_cards_nouveau? ( sys-firmware/nvidia-firmware ) - app-antivirus/clamav - sys-kernel/gentoo-kernel - ) - sys-process/cronie - >=app-portage/gentoolkit-0.2.1 - app-admin/sudo - mail-client/mailx - !minimal? ( - app-shells/thefuck - app-shells/hstr - x11-apps/xauth - sys-apps/moreutils - dev-util/strace - net-analyzer/netcat - net-ftp/ncftp - app-text/dos2unix - net-dns/bind-tools - ) - sys-process/lsof - app-portage/layman[git] - !hardened? ( - sys-devel/prelink - ) - app-misc/screen - app-vim/gentoo-syntax - sys-auth/pam_ldap - sys-auth/nss_ldap - app-editors/vim - 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 - systemd_newtmpfilesd "${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 -} diff --git a/virtual/miller-base/miller-base-10.10.4.ebuild b/virtual/miller-base/miller-base-10.10.4.ebuild new file mode 100644 index 0000000..2cd3fd2 --- /dev/null +++ b/virtual/miller-base/miller-base-10.10.4.ebuild @@ -0,0 +1,129 @@ +EAPI="7" +inherit systemd +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 +video_cards_nvidia video_cards_nouveau firmware ischroot" + +RDEPEND=" + app-misc/simplify + app-arch/hardlink + sys-process/htop + sys-process/iotop + sys-apps/less + fuse? ( net-fs/sshfs ) + !ischroot? ( + 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-2 + sys-apps/busybox + sys-apps/pciutils + sys-apps/usbutils + samba? ( || ( net-fs/cifs-utils net-fs/samba[client] ) ) + firmware? ( sys-kernel/linux-firmware ) + app-admin/logrotate + video_cards_nouveau? ( sys-firmware/nvidia-firmware ) + app-antivirus/clamav + sys-kernel/gentoo-kernel + ) + sys-process/cronie + >=app-portage/gentoolkit-0.2.1 + app-admin/sudo + mail-client/mailx + !minimal? ( + app-shells/thefuck + app-shells/hstr + x11-apps/xauth + sys-apps/moreutils + dev-util/strace + net-analyzer/netcat + net-ftp/ncftp + app-text/dos2unix + net-dns/bind-tools + ) + sys-process/lsof + app-portage/layman[git] + !hardened? ( + sys-devel/prelink + ) + app-misc/screen + app-vim/gentoo-syntax + sys-auth/pam_ldap + sys-auth/nss_ldap + app-editors/vim + 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 + systemd_newtmpfilesd "${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 +} -- cgit v1.2.3