From 1937183815e7a8f3c7d3707c2448c9c0e095fdef Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Mon, 28 Aug 2017 16:15:27 +0100 Subject: Automatically enable common services --- virtual/miller-base/Manifest | 3 +- virtual/miller-base/files/daily-av-update.cron | 3 - virtual/miller-base/miller-base-10.4-r1.ebuild | 127 ----------------------- virtual/miller-base/miller-base-10.5.ebuild | 136 +++++++++++++++++++++++++ 4 files changed, 137 insertions(+), 132 deletions(-) delete mode 100755 virtual/miller-base/files/daily-av-update.cron delete mode 100644 virtual/miller-base/miller-base-10.4-r1.ebuild create mode 100644 virtual/miller-base/miller-base-10.5.ebuild (limited to 'virtual/miller-base') diff --git a/virtual/miller-base/Manifest b/virtual/miller-base/Manifest index 7cde0e1..f5155a1 100644 --- a/virtual/miller-base/Manifest +++ b/virtual/miller-base/Manifest @@ -1,6 +1,5 @@ AUX auto-download-packages 81 SHA256 0ec31222dc2d7b7dac658faffed8b971d9ee6710811c6eefe0145e4ed4c95792 SHA512 ce5a4d320fa33cceaacd6f446340026d14da04a91b57cfe1bc78d026487748b6644d04d30a3d904af416e8914dd69f0dcfb89267011da59e7084f78f74f8a1b7 WHIRLPOOL 550f0108b061b0ca35a7513e5f85a969308b1eae7741282e8362542fb9eee0b3faa87b774e5b59a40fea10c99def8112b75a9cfb8b614fc1944887b2b7f35d3b AUX auto-update-overlays 25 SHA256 98ce8786c0fb1612bb1778a2ee0aea88728b7d74929650a5b249bc0e05d3abdd SHA512 70e69f299817b93debbffd0ea7d05cb8fe00be21d8103bf70024fd07443fb3abe3cebe32003128e9d241463b6eb954c98d335d8040a35a0035f05f93b99678d1 WHIRLPOOL 4140a9ffd1ff024260bded5ad5edc7bbb90a755be1b2b4703769d18e83000c8834deaa60aa10e8aebc5b5d03353bfb1a4065c830d481778c46314949ae60363f -AUX daily-av-update.cron 31 SHA256 1b83ac59e56ffbc3ec1c0f42c3c43de2b0cf9485690292a7dcb3440d529d0f78 SHA512 cf742cab1cf6129dffdd3c48003f54700227ff1a91458383d1afd73c93bcb981a284933ebf7997bf8cb6a26f9fc08ca3d40591a711c6cfbcb1fd830e8a022dff WHIRLPOOL 80ddba88db28f1c1235f81247815021dd7a4215bdcf0d3b9472843779ffa151d5f714a78ba20a683b8dec4c13df64c132f6380bc15a2f828dca3dd5f3c3d5beb AUX kernels-cleaner 155 SHA256 436ca198c1f0c9aa544adb527db2f304a2e7271667a5863c6a7af5d092dc3b56 SHA512 2ec348839d632ecffa7963bbd15d843f9e434b238a26ca4ab0cc3012c049343a0905c90750a55b3ee2bbe9b316f2abdcea774f36584915e81f257e4a22709645 WHIRLPOOL b5a4fc2f5c457ffca28f997180b67209e1b9697a901bdf7c2ac906fb595905e650243d1cb0f3e8b3eee972be611679f43eef1fe1919838255724acda6fc9646f AUX newkernel 301 SHA256 869ebc9260b81e07a57d3bc7a2997c9252fa3e8de830bc593f7b15b74c6db7a0 SHA512 d338d1604c6ff6ad963187da6bf63d2c25c3286f60bc61301d4f516bcdc4becae99234f663aab171c582804792133d7c4ece755db8967b70a2e85d23ba91bc48 WHIRLPOOL 43ff64d037114b2e60f789fd8444e33a130f78795f64516eabcdddda028b5a47b02617c8ada03f848b159141f5c4bcb226cfd84257d7b0b525c93a19112f0ca2 AUX service-check.openrc 28 SHA256 c15c00ba79267a7b47c73a361226f263c852f94ba3096582bb3879f82f4fcdef SHA512 486e527013f694dd543d4ac877058a3f4c45a2879c2fb82519223a4aef52446e5c370892aae2d7a75766a77e47024086ec15573d1aee131b91437ad2acf4433f WHIRLPOOL c1b4806deb1ad4963089b5fb7bc14a202e206616b9eac645f1603813f60e745cfeb2370128dbd7904f75f821262f215eae61adc729d9014c979768429e15c289 @@ -13,4 +12,4 @@ AUX update-install2 683 SHA256 632be90dea05414607e7be7be72f4546b831b719deedb2068 AUX update.portage.cron-2 48 SHA256 db1c43c1d9aa7b906e39dd397499a1a33fc36103a1bc06c21eea36156be895a9 SHA512 431d8ed50c2fc6d4b0e9e3550e4ba5d8320595961c6dab14820ae7b5abd39bf63cb6afb99724f2b4aebb2c0cf14b46927d2abecb6d9509db158000b8ea6a97b8 WHIRLPOOL 8cd7b3a90dbaa55f7dacb22f9408a75a121abea37392328f749cf27c3f82ba81379c4de7a1e0db3352de0cfd1697fe89f866eeb002a5c159c481e22e5243b244 AUX weekly-av-scan.cron 1215 SHA256 86cfd030137a08d82c3d678196db9b582e93a5ece138ac97939a0efb4a3be3b0 SHA512 3da4781490a1703c0a00884e0a3a053b4a65207a5cb1320418cce02a10fd2c8802d6516cd22080b32d2a36212adbf4b5e471623019997dfddfe6cc1c15bf64a6 WHIRLPOOL 77f02904e7aa53179fedffe849f0dd1a0f9e4b5ac9bd97e5b1b3543da3310d176c19b398ccd261b8d75f6873a1860a6434e2587d5ecd2cf5a904ec32790db5de AUX write-new-updates 409 SHA256 e4c05e38082914bd9d367c69a7d1fe44fb459d8526c9e407f0b73784878640cc SHA512 5f6b852ec563f764617d747c3024a89044e409345b599e5476963573f4ef639fcf67c7eadc0cc12857c7e3c0be59a2b912d1d06a10c647c5af61cefd182ff1a5 WHIRLPOOL a42d0115ad685f28a3da51e2593ee9ae90a4021797655aef7e6083ee59572507f2a105ed32fbc019fe535783b73ce14739478cda9c707840b7c0cca3b667542a -EBUILD miller-base-10.4-r1.ebuild 3480 SHA256 e8aac72d68c74ee939c1e2336d23371b83aabe16d6d6c5219d288ee7593da835 SHA512 f2a080de86cb15ac400fd2549f916b8be092a5ef08af9caf073f1e592268cf6fd0cb87cef3ec1a4612fbd6323dddde8b4429dfd53b0236f6afcff2aa72ffa4ab WHIRLPOOL d78411afe32451dd50963ddeb7b37d495444f3ded6c706f6dfa774792fb37c7a37c8f2fe3e14e3a32521394a093d419fb978d5cbc51431f768eb91ef749fbdb1 +EBUILD miller-base-10.5.ebuild 4110 SHA256 b69709978675a1950b8ccd52519ef10bbfcfed1dd7a7ebb36dbeee31bd3bde9a SHA512 b1488d2d3a34fb39f22d544e966c671682bca5e88f2d94b120c64ed781b4735e717c18718a3771530c2152b9653db34a51bfa59aad0daf803df58f8c91d1cdd6 WHIRLPOOL 1869af57598953bd7f02ad9cd0401176a08b8bbefeaf73ab08b5858af5880853d643268dc9b9cc063786f10faa837222ec74031ad9e87874e2fa7f4b9c76411f diff --git a/virtual/miller-base/files/daily-av-update.cron b/virtual/miller-base/files/daily-av-update.cron deleted file mode 100755 index 239e6eb..0000000 --- a/virtual/miller-base/files/daily-av-update.cron +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -freshclam --quiet diff --git a/virtual/miller-base/miller-base-10.4-r1.ebuild b/virtual/miller-base/miller-base-10.4-r1.ebuild deleted file mode 100644 index ad61791..0000000 --- a/virtual/miller-base/miller-base-10.4-r1.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -EAPI="2" -DESCRIPTION="Virtual for base systems" - -SLOT="0" -KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd" -IUSE="cdr hardened nohourlyupdate fuse xfs btrfs bash-completion git samba -minimal autoupdate autoshutdown autoservicerestart sw-suspend raid -video_cards_nvidia firmware ischroot systemd" - -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 - raid? ( sys-fs/mdadm ) - cdr? ( kde-apps/k3b ) - sys-apps/hdparm - xfs? ( sys-fs/xfsdump ) - btrfs? ( sys-fs/btrfs-progs ) - sys-fs/lvm2 - >=sys-boot/grub-2 - sys-apps/busybox - sys-kernel/genkernel-next - sys-process/vixie-cron - sys-apps/pciutils - sys-apps/usbutils - || ( net-misc/openntpd net-misc/ntp ) - samba? ( || ( net-fs/cifs-utils net-fs/samba[client] ) ) - firmware? ( sys-kernel/linux-firmware ) - app-admin/syslog-ng - app-admin/logrotate - video_cards_nvidia? ( sys-apps/v86d ) - ) - >=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 - !ischroot? ( - www-servers/apache - app-antivirus/clamav - ) - ) - sys-process/lsof - app-portage/layman[git] - !hardened? ( - sys-devel/prelink - ) - !ischroot? ( - !sw-suspend? ( sys-kernel/gentoo-sources ) - sw-suspend? ( sys-apps/tuxonice-userui - || ( sys-kernel/tuxonice-sources - sys-kernel/pf-sources ) ) ) - app-misc/screen - app-vim/gentoo-syntax - sys-auth/pam_ldap - sys-auth/nss_ldap - app-editors/gvim - git? ( dev-vcs/git ) - bash-completion? ( app-shells/bash-completion ) - autoservicerestart? ( - systemd? ( - sys-apps/autorestart - ) - ) - " - -src_install() { - exeinto /etc/cron.hourly - if use systemd ; then - newexe "${FILESDIR}"/service-check.systemd service-check - insinto /etc/tmpfiles.d - newins "${FILESDIR}/tmpfiles-d-portage.conf" "portage.conf" - else - newexe "${FILESDIR}"/service-check.openrc service-check - fi - - exeinto /etc/cron.weekly - use !minimal && newexe "${FILESDIR}"/weekly-av-scan.cron av-scan - use !minimal && newexe "${FILESDIR}"/kernels-cleaner kernels-cleaner - - exeinto /etc/cron.daily - use !minimal && newexe "${FILESDIR}"/daily-av-update.cron av-update - - if [ -n "${UPDATETIME}" ]; then - mkdir -p ${D}/etc/cron.d - echo "${UPDATETIME} root /sbin/gentoo-portage-update" > ${D}/etc/cron.d/gentoo-portage-update - exeinto /sbin - 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}"/auto-update-overlays 10-auto-update-overlays - newexe "${FILESDIR}"/write-new-updates 50-write-new-updates - newexe "${FILESDIR}"/newkernel 80-newkernel - newexe "${FILESDIR}"/systemd-reload 90-systemd-reload - 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.5.ebuild b/virtual/miller-base/miller-base-10.5.ebuild new file mode 100644 index 0000000..2f462f7 --- /dev/null +++ b/virtual/miller-base/miller-base-10.5.ebuild @@ -0,0 +1,136 @@ +EAPI="6" +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="cdr hardened nohourlyupdate fuse xfs btrfs bash-completion git samba +minimal autoupdate autoshutdown autoservicerestart sw-suspend raid +video_cards_nvidia firmware ischroot systemd" + +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 + raid? ( sys-fs/mdadm ) + cdr? ( kde-apps/k3b ) + sys-apps/hdparm + xfs? ( sys-fs/xfsdump ) + btrfs? ( sys-fs/btrfs-progs ) + sys-fs/lvm2 + >=sys-boot/grub-2 + sys-apps/busybox + sys-kernel/genkernel-next + sys-process/vixie-cron + sys-apps/pciutils + sys-apps/usbutils + || ( net-misc/openntpd net-misc/ntp ) + samba? ( || ( net-fs/cifs-utils net-fs/samba[client] ) ) + firmware? ( sys-kernel/linux-firmware ) + app-admin/syslog-ng + app-admin/logrotate + video_cards_nvidia? ( sys-apps/v86d ) + ) + >=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 + !ischroot? ( + www-servers/apache + app-antivirus/clamav + ) + ) + sys-process/lsof + app-portage/layman[git] + !hardened? ( + sys-devel/prelink + ) + !ischroot? ( + !sw-suspend? ( sys-kernel/gentoo-sources ) + sw-suspend? ( sys-apps/tuxonice-userui + || ( sys-kernel/tuxonice-sources + sys-kernel/pf-sources ) ) ) + app-misc/screen + app-vim/gentoo-syntax + sys-auth/pam_ldap + sys-auth/nss_ldap + app-editors/gvim + git? ( dev-vcs/git ) + bash-completion? ( app-shells/bash-completion ) + autoservicerestart? ( + systemd? ( + sys-apps/autorestart + ) + ) + " + +src_unpack() { + mkdir ${S} +} + +src_install() { + exeinto /etc/cron.hourly + if use systemd ; then + newexe "${FILESDIR}"/service-check.systemd service-check + systemd_newtmpfilesd "${FILESDIR}/tmpfiles-d-portage.conf" "portage.conf" + dodir /etc/systemd/system/multi-user.target.wants + dosym /usr/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 + dosym /lib/systemd/system/ntpd.service /etc/systemd/system/multi-user.target.wants/ntpd.service + dosym /usr/lib/systemd/system/sshd.service /etc/systemd/system/multi-user.target.wants/sshd.service + dosym /usr/lib/systemd/system/syslog-ng.service /etc/systemd/system/multi-user.target.wants/syslog-ng.service + dosym /usr/lib/systemd/system/vixie-cron.service /etc/systemd/system/multi-user.target.wants/vixie-cron.service + else + newexe "${FILESDIR}"/service-check.openrc service-check + fi + + exeinto /etc/cron.weekly + use !minimal && newexe "${FILESDIR}"/weekly-av-scan.cron av-scan + use !minimal && newexe "${FILESDIR}"/kernels-cleaner kernels-cleaner + + + if [ -n "${UPDATETIME}" ]; then + mkdir -p ${D}/etc/cron.d + echo "${UPDATETIME} root /sbin/gentoo-portage-update" > ${D}/etc/cron.d/gentoo-portage-update + exeinto /sbin + 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}"/auto-update-overlays 10-auto-update-overlays + newexe "${FILESDIR}"/write-new-updates 50-write-new-updates + newexe "${FILESDIR}"/newkernel 80-newkernel + newexe "${FILESDIR}"/systemd-reload 90-systemd-reload + 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