From 76b5c1982bbdc64acd7708fbf89cf0a65c39b852 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Sat, 24 Sep 2016 14:52:37 +0100 Subject: Apply env clear out fix --- virtual/miller-base/Manifest | 8 +- virtual/miller-base/files/auto-update-overlays | 0 virtual/miller-base/files/daily-av-update.cron | 0 virtual/miller-base/files/service-check.systemd | 0 virtual/miller-base/files/tmpfiles-d-portage.conf | 1 - virtual/miller-base/files/update-install2 | 2 +- virtual/miller-base/files/write-new-updates | 2 +- virtual/miller-base/miller-base-10.3-r1.ebuild | 124 ---------------------- virtual/miller-base/miller-base-10.3-r3.ebuild | 124 ++++++++++++++++++++++ 9 files changed, 130 insertions(+), 131 deletions(-) mode change 100644 => 100755 virtual/miller-base/files/auto-update-overlays mode change 100644 => 100755 virtual/miller-base/files/daily-av-update.cron mode change 100644 => 100755 virtual/miller-base/files/service-check.systemd delete mode 100644 virtual/miller-base/miller-base-10.3-r1.ebuild create mode 100644 virtual/miller-base/miller-base-10.3-r3.ebuild diff --git a/virtual/miller-base/Manifest b/virtual/miller-base/Manifest index 5b809c1..88360e8 100644 --- a/virtual/miller-base/Manifest +++ b/virtual/miller-base/Manifest @@ -4,10 +4,10 @@ AUX daily-av-update.cron 31 SHA256 1b83ac59e56ffbc3ec1c0f42c3c43de2b0cf948569029 AUX service-check.openrc 28 SHA256 c15c00ba79267a7b47c73a361226f263c852f94ba3096582bb3879f82f4fcdef SHA512 486e527013f694dd543d4ac877058a3f4c45a2879c2fb82519223a4aef52446e5c370892aae2d7a75766a77e47024086ec15573d1aee131b91437ad2acf4433f WHIRLPOOL c1b4806deb1ad4963089b5fb7bc14a202e206616b9eac645f1603813f60e745cfeb2370128dbd7904f75f821262f215eae61adc729d9014c979768429e15c289 AUX service-check.systemd 54 SHA256 0b30767a9ae16c85275ce88861c8528f11f65ad52bdbb50c87e52adc41a4a888 SHA512 89bd6a5acbc99c4a6fa958dcdbd0dda09128d1ac0e50b5e312283b3dc396154fe1b5a18092994817153b80fd4a7df9ab4e86d5f958aa5ad5f2fab26303c44dc6 WHIRLPOOL 332e6780cf2b7daf2c524574c389131c7f5a889950315703da093d226a1fbec70112e70895c207c5c8f8dfe1797334dc3b129e8391a6741e464dcbb5c23a1569 AUX sync-distclean-exec.cron 60 SHA256 043df18d533148d33abe2f2cf588953b0193c4a47ea0a428e5e2d531ee4d5d0e SHA512 e8075f330b879f3888f47086e5fdd0144be7decbe264a105e5071f851065bd6eb55a22be6fb4eb90a4e3bca00e76fee79f372adc5c3a8f25660c61bd9379ab0f WHIRLPOOL f1afae03bdf094cb08d3389cf329d10debd89c73f360c0e16f686cc267eb49c1e5780bbfe78fdd8518c9cdba1cefe6849b598c9f8d5da667516d705bd650c966 -AUX tmpfiles-d-portage.conf 78 SHA256 6b6f63b38702a86782d1048e0cf54a097a6850ab74567385d4be46f04a2f9f44 SHA512 c27a474228d2aa89194ea9d9b80ec239ff45ea343e608d06d67834f853e561f1ad643a54515f8ffd70d14f27a06a94706af464a09891e0e51a7c8386107d77eb WHIRLPOOL d3b12cf9ac91c945927547ccf2addc3ff54e52630f1eae6b017c0ca88f88ebb1d79146577ea73b8580de79821cbd4895982cc1aa03c729ea327e0a4d999fac0d +AUX tmpfiles-d-portage.conf 43 SHA256 dc88c8cb76df1ca82861b5b9430785d0c1f5bdec19ed5fc2f0296c75692ce099 SHA512 e329444f9b38df6cd5a3075ee799827438555e7b6fc53bbb820485ec0ad7c5ca8cad00b1679f0baae7dc484bd185955b8a9fcf66527d5bd7a55c443b4999fb42 WHIRLPOOL 84ad446bec2b45b70767b4b57a47ebb609659b30a7e84a704d317a970e62caebc2e275156667be61673fef94b64b3fc43693f320ef3eeb12ef3c62bce2c666d2 AUX update-autoshutdown 94 SHA256 bd42a7125c4cf5cfb013178f9562f21e8827a9879be85f3fd5445b6c50579023 SHA512 8d131120646ff1aef8403c2decb92bb9150aef9d57cb36438a42438f4573a4d52fe390d2644c423a76997fdbcdb94a7b72c1a56ecebc81937a71d7181ac71ddf WHIRLPOOL a11b2e8c0eaaea890f3aa2ecf4efc61b16e53848ffd67c9e502c4b6516c20f257e685b299b880dc0ee449ca72e26f4cf08aea75ca9da6b75c3cc0e74024403d9 -AUX update-install2 646 SHA256 b5a177ec080b8ae0290b9568b4a9b2b075569f0444acfbb654fcac82a480a374 SHA512 f7adacdbb76e90bf39e1896ce6c87494a8a964cc2f74081cf573fe61edbbc70c884b19fd0c4250e406af37503f43a8f47325a77e94fbda3327326c9b22a14501 WHIRLPOOL 1ab958af5b2d3daaa4791cb144c7d417f48be0ddb961ffe1e252ec5f0519716ff00821e2d96ee7e506541655e2d28d2aab6450207e60d52f5caafd167f3767f2 +AUX update-install2 683 SHA256 632be90dea05414607e7be7be72f4546b831b719deedb2068ad14575bc0ac70e SHA512 64895037bb13f59a255c75f852249ff1d23088e9b4faf7e908f9f112a1ce30ce9efe9fc568836da43cddc3c3f906f6c92c62642fd17bc19b74689632c03403b1 WHIRLPOOL 766182bcb66204078ffe36c5e6d9784493c506dd83481cd7e8bb132c1355ef6fce5e507b63391e18e6b67b0dd0fbd1df05b3be77185276af49c8041a54accf04 AUX update.portage.cron-2 48 SHA256 db1c43c1d9aa7b906e39dd397499a1a33fc36103a1bc06c21eea36156be895a9 SHA512 431d8ed50c2fc6d4b0e9e3550e4ba5d8320595961c6dab14820ae7b5abd39bf63cb6afb99724f2b4aebb2c0cf14b46927d2abecb6d9509db158000b8ea6a97b8 WHIRLPOOL 8cd7b3a90dbaa55f7dacb22f9408a75a121abea37392328f749cf27c3f82ba81379c4de7a1e0db3352de0cfd1697fe89f866eeb002a5c159c481e22e5243b244 AUX weekly-av-scan.cron 664 SHA256 f87746d7ad3b2bce8ec880b28023d095edc7f9d19d3963f93f306ce937f71533 SHA512 c546533627a2317bb3e0c8ed635b220113e499f90eea0c450a9e6d5b32ffcf24d2bed1dd96161d7ccf4299e7cee4fac3ae69152c2db18b8ce6ef8603e0e031dd WHIRLPOOL b41c635775b7b8e17e41521558a79493ce91597a1399814ef510283c989aab8c8d2681692e3d871796df5066e2305f91b391533fa9513be6323a502682184066 -AUX write-new-updates 372 SHA256 e51930ac3522700b78d89769d5f77fa634e08b96cfd617f618c4dc66f8e4c63e SHA512 ca30def763d3321215dfaca97ba1322f9f806cdbcab3778b135c77d9086094f7d1c52fcd1f9f9ef22965e0f94de8c87a0f0c2f8cc261bb33f4584cd59a8a69ee WHIRLPOOL 2132bf5760f48689bb51b21773f327f059df3b73cdc73cb793b7537fb9df410da05f5bc10cdcc81e6f214a25ee89b753824c38da2933999d6e0ac0ae23c6f2e1 -EBUILD miller-base-10.3-r1.ebuild 3363 SHA256 b93d9afa24356e40bef3de1aae6a5312e75be826bbc7e5c06b1eecc9c049e5df SHA512 1d755142a1071a818ab8ae9044d675093aa81905cd029abc898abebce04f31dd1215f019755734dd5fdbaea19d7204f26235174246bdc9499f614109aacc1f14 WHIRLPOOL 91d49fddd9b8db0df58e6ccd5bd2a3f8264f229ac3b54ad1c14c8031ff818a91f27073a5992691fa21e911d037181e810f5634c0590959ffcf5db9220eee4c6c +AUX write-new-updates 409 SHA256 e4c05e38082914bd9d367c69a7d1fe44fb459d8526c9e407f0b73784878640cc SHA512 5f6b852ec563f764617d747c3024a89044e409345b599e5476963573f4ef639fcf67c7eadc0cc12857c7e3c0be59a2b912d1d06a10c647c5af61cefd182ff1a5 WHIRLPOOL a42d0115ad685f28a3da51e2593ee9ae90a4021797655aef7e6083ee59572507f2a105ed32fbc019fe535783b73ce14739478cda9c707840b7c0cca3b667542a +EBUILD miller-base-10.3-r3.ebuild 3363 SHA256 b93d9afa24356e40bef3de1aae6a5312e75be826bbc7e5c06b1eecc9c049e5df SHA512 1d755142a1071a818ab8ae9044d675093aa81905cd029abc898abebce04f31dd1215f019755734dd5fdbaea19d7204f26235174246bdc9499f614109aacc1f14 WHIRLPOOL 91d49fddd9b8db0df58e6ccd5bd2a3f8264f229ac3b54ad1c14c8031ff818a91f27073a5992691fa21e911d037181e810f5634c0590959ffcf5db9220eee4c6c diff --git a/virtual/miller-base/files/auto-update-overlays b/virtual/miller-base/files/auto-update-overlays old mode 100644 new mode 100755 diff --git a/virtual/miller-base/files/daily-av-update.cron b/virtual/miller-base/files/daily-av-update.cron old mode 100644 new mode 100755 diff --git a/virtual/miller-base/files/service-check.systemd b/virtual/miller-base/files/service-check.systemd old mode 100644 new mode 100755 diff --git a/virtual/miller-base/files/tmpfiles-d-portage.conf b/virtual/miller-base/files/tmpfiles-d-portage.conf index e7464b4..e837403 100644 --- a/virtual/miller-base/files/tmpfiles-d-portage.conf +++ b/virtual/miller-base/files/tmpfiles-d-portage.conf @@ -1,2 +1 @@ d /var/tmp/portage 0775 portage portage 1d -d /var/tmp 0775 portage portage 3d diff --git a/virtual/miller-base/files/update-install2 b/virtual/miller-base/files/update-install2 index e5cf5d9..1dfdcaa 100755 --- a/virtual/miller-base/files/update-install2 +++ b/virtual/miller-base/files/update-install2 @@ -1,6 +1,6 @@ #!/bin/bash -unset ABI ABI_X86 +[ -s "$PORTAGE_TMPDIR" ] && exec -c /bin/bash -l -c $0 EMERGEEXTRAOPTS=$(portageq envvar EMERGEEXTRAOPTS) UPDATESTATEDIR=$(portageq envvar UPDATESTATEDIR) updates="${UPDATESTATEDIR:-/tmp}/`hostname`_updates.txt" diff --git a/virtual/miller-base/files/write-new-updates b/virtual/miller-base/files/write-new-updates index e5da8d7..c9e4c2f 100755 --- a/virtual/miller-base/files/write-new-updates +++ b/virtual/miller-base/files/write-new-updates @@ -1,6 +1,6 @@ #!/bin/bash -unset ABI ABI_X86 +[ -s "$PORTAGE_TMPDIR" ] && exec -c /bin/bash -l -c $0 UPDATESTATEDIR=$(portageq envvar UPDATESTATEDIR) updates="${UPDATESTATEDIR:-/tmp}/`hostname`_updates.txt" errors="${UPDATESTATEDIR:-/tmp}/`hostname`_update_errors.txt" diff --git a/virtual/miller-base/miller-base-10.3-r1.ebuild b/virtual/miller-base/miller-base-10.3-r1.ebuild deleted file mode 100644 index 6ad49d4..0000000 --- a/virtual/miller-base/miller-base-10.3-r1.ebuild +++ /dev/null @@ -1,124 +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 bash-completion git fbsplash samba -minimal autoupdate autoshutdown autoservicerestart sw-suspend raid -video_cards_nvidia firmware ischroot systemd" - -RDEPEND=" - app-arch/hardlink - sys-process/htop - sys-apps/less - fuse? ( net-fs/sshfs ) - !ischroot? ( - sys-apps/systemd-readahead - sys-apps/ethtool - sys-cluster/netfs - sys-apps/kexec-tools - app-admin/eclean-kernel - raid? ( sys-fs/mdadm ) - app-admin/ide-smart - cdr? ( app-cdr/k3b ) - sys-apps/hdparm - xfs? ( sys-fs/xfsdump ) - 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 - hardened? ( sys-kernel/hardened-sources sys-apps/gradm ) - sys-boot/grub - net-misc/wakeonlan - video_cards_nvidia? ( sys-apps/v86d ) - ) - >=app-portage/gentoolkit-0.2.1 - app-admin/sudo - mail-client/mailx - !minimal? ( - app-shells/thefuck - 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 - - 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 - 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.3-r3.ebuild b/virtual/miller-base/miller-base-10.3-r3.ebuild new file mode 100644 index 0000000..6ad49d4 --- /dev/null +++ b/virtual/miller-base/miller-base-10.3-r3.ebuild @@ -0,0 +1,124 @@ +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 bash-completion git fbsplash samba +minimal autoupdate autoshutdown autoservicerestart sw-suspend raid +video_cards_nvidia firmware ischroot systemd" + +RDEPEND=" + app-arch/hardlink + sys-process/htop + sys-apps/less + fuse? ( net-fs/sshfs ) + !ischroot? ( + sys-apps/systemd-readahead + sys-apps/ethtool + sys-cluster/netfs + sys-apps/kexec-tools + app-admin/eclean-kernel + raid? ( sys-fs/mdadm ) + app-admin/ide-smart + cdr? ( app-cdr/k3b ) + sys-apps/hdparm + xfs? ( sys-fs/xfsdump ) + 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 + hardened? ( sys-kernel/hardened-sources sys-apps/gradm ) + sys-boot/grub + net-misc/wakeonlan + video_cards_nvidia? ( sys-apps/v86d ) + ) + >=app-portage/gentoolkit-0.2.1 + app-admin/sudo + mail-client/mailx + !minimal? ( + app-shells/thefuck + 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 + + 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 + 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