From 3a0eea572f76df42cb4a2f0a7eb9942b595501bd Mon Sep 17 00:00:00 2001 From: randomdan Date: Thu, 21 Nov 2013 13:26:05 +0000 Subject: General updates --- virtual/miller-base/Manifest | 6 +- virtual/miller-base/files/update-install2 | 17 ++-- virtual/miller-base/files/write-new-updates | 6 +- virtual/miller-base/miller-base-9-r10.ebuild | 118 +++++++++++++++++++++++++++ virtual/miller-base/miller-base-9-r9.ebuild | 117 -------------------------- 5 files changed, 135 insertions(+), 129 deletions(-) create mode 100644 virtual/miller-base/miller-base-9-r10.ebuild delete mode 100644 virtual/miller-base/miller-base-9-r9.ebuild (limited to 'virtual/miller-base') diff --git a/virtual/miller-base/Manifest b/virtual/miller-base/Manifest index fe3c81e..d220421 100644 --- a/virtual/miller-base/Manifest +++ b/virtual/miller-base/Manifest @@ -44,9 +44,9 @@ AUX restart/vsftpd 27 SHA256 75ecac8ca02bf650883aecdc5e8d7d4c233ad1d96d4497f9913 AUX service-check 28 SHA256 c15c00ba79267a7b47c73a361226f263c852f94ba3096582bb3879f82f4fcdef SHA512 486e527013f694dd543d4ac877058a3f4c45a2879c2fb82519223a4aef52446e5c370892aae2d7a75766a77e47024086ec15573d1aee131b91437ad2acf4433f WHIRLPOOL c1b4806deb1ad4963089b5fb7bc14a202e206616b9eac645f1603813f60e745cfeb2370128dbd7904f75f821262f215eae61adc729d9014c979768429e15c289 AUX sync-distclean-exec.cron 60 SHA256 043df18d533148d33abe2f2cf588953b0193c4a47ea0a428e5e2d531ee4d5d0e SHA512 e8075f330b879f3888f47086e5fdd0144be7decbe264a105e5071f851065bd6eb55a22be6fb4eb90a4e3bca00e76fee79f372adc5c3a8f25660c61bd9379ab0f WHIRLPOOL f1afae03bdf094cb08d3389cf329d10debd89c73f360c0e16f686cc267eb49c1e5780bbfe78fdd8518c9cdba1cefe6849b598c9f8d5da667516d705bd650c966 AUX update-autoshutdown 88 SHA256 e90d95d158222c493d4fbf8ebcd9c2927535048d97ee743fe658d47e50aa6fb6 SHA512 0f2480fe16ae69279937cab620fa2a4764114659759654b63e844415ba937e1ede8aa3974979c7adec3b8dbb8bf2f68eb80f7da5c97daeccd69df28e8fbf0430 WHIRLPOOL f4619f0bf51faf9d1ab572f32c14b7fc9dec1b8b101f78e8c80e7fa3fb3832567dbeba462f4f27490a3398916aa6f08e1d7e66d69ed4b43c68451bbf15187e00 -AUX update-install2 457 SHA256 40fcd47ac532d65e0ea54712df2fc0e0ae1685cb2afd8827082d0ee5575815c7 SHA512 531b7e48c40b4b404c3b5e378ddad6d800a6d637708c0e3755de08e9693abe8785ba5281afcfc835aa391b4eba7345170523fc1f66f2192e5f17abf2d77ee98d WHIRLPOOL 5fa8d93af40819a210b976f8bcd3f1d5ea1ac38d47e208c81014beb0c3b5bdf3304d479eb37e4ca11fc7ea454b947f05bb22a525195f10ec131c571913a6f2ba +AUX update-install2 543 SHA256 704565fe0892746e420fcc964b3295a19b27ecc6c3a2be892e2afc416d9ebd4b SHA512 cbedbb508d5b455a04fca0efaad73882b1087e27278d698366737536af896d001350772d7125b8d106ec8099a327ecce8208ba08e501c7797ec0110a7602f545 WHIRLPOOL edf81d7cdff0674b3d38bfe2afc87eedc7c8e8cb41dd9237e4113998f24b87f8946ca3205579765a2dc0fa75ec5df943ec79f60f5b35cc9969597a4af27b0b43 AUX update-kernel 838 SHA256 5f751d3a567251f0e31134fe18fae7fd1386f73a750061e400a9e4851d1c5432 SHA512 666f0f2bbb4511a70e8b1d8722b8fdc397b46297bdea477ebc5e4c5b0d3f96ca498d90daee6de80302f96386efb7ba96fa6ffc797068fac87d653536e6528c71 WHIRLPOOL 4c9b0f04f77d0a8773358b49d09e2c602deca95a8c91eb2abdbbac9f14971acd1f3861a9d9ca55f7b594d642e08657070ce5095045276ea36310becb9a754e44 AUX update.portage.cron-2 142 SHA256 ba22d23d35399abf3ab502234fec7b5482a1c5efba8cf727d3885f1fc0d93ceb SHA512 bd4be9589028e1e8fb22abe01fe14b0178349ffbe7645f43531c8d57e67c2c78ce83b3a86e2689e44ee50f10ca1f7310f046486c8463256a4079d5434113e48e WHIRLPOOL c933adab65eb2c489c4f377a42e8fef7d162341106427d7111b8506ac8b7af1f28242d050cfdb98f36df0273d143b0c605fc6aa06a6d96f9c8cc0c6ac41664ba AUX weekly-av-scan.cron 203 SHA256 4b2b1d0b36a82868bf2dfa54f13a706acbe49bc9751c71b5bc9c5500036e58ed SHA512 b3740066982a2fec0bad1791fcdaf9fb81af8de019e768d72619d6b7498d1ec24189c7a0430ba01b2061eab76349579389a8a91311fe1063e831419ae15f3302 WHIRLPOOL fe462dd5207c54f049d4ffb757cefa587eff8174373c6ec15ee05e539781a7274b420282a7d8852855308fa10fc7528a48d0427ac6bd5e9bcb07312069caf601 -AUX write-new-updates 123 SHA256 98d35a82d75ed3e4a7b9857c57ab41f3cbf60a82dc255b7c62d372e0ed410d84 SHA512 02d696e3abffe919fdbea7f580efc4ee8988f1f10c815dfaf00b0bf7ba4b3386e935883f28821d5c064c8706769eed2e55ba7cc184d4355c74e75fdf1feba116 WHIRLPOOL 8a6b1a03e7552701d7053c7eefe092ac0473940eff419445f6c45e959a910c8920cdde8b512699210ed578ad7312657e638710ea3d66fd6ad9ead32299d2f3b8 -EBUILD miller-base-9-r9.ebuild 3366 SHA256 9516047cc735ed371790ab5229fc78405d9b07720bc4ffe23b27343cdefec4c0 SHA512 2583746d7ad1c05bef6b729d2b1deb081f8fe220462d3a65c1ba3b3245e456f70d36556b48f501c431c32312e72d48d7d8140969c622d63c11a6730f0e118c1b WHIRLPOOL 9905f1ac9985b67d966cab20eb665683d2ee3ba89caf8bc715452f46e979842977885b27511a9b3309d962a725639dfdcdf37e10f19a5b07ab5fcb5c20d6ce9c +AUX write-new-updates 163 SHA256 f17c696336b097fb2a888655af5fcce74c2e03e09462b2f25f9cff67a6bbefce SHA512 ba4a65a18a2bc48f54e1ff16136effc1d92b87474331d347e3af2b6e0bb6773dd2df40ddf11f0243d624c47836b21f06b6d5a1c655e53d5b0dbe2cb33fd87829 WHIRLPOOL 6e5eda1694bcb02e2ba37fc108f6df88b822f14629189f7344e5d89d874986ac2f7ae47ae4f46d5d12974d20fbf605970c3dedad74e17720132f2762068bf623 +EBUILD miller-base-9-r10.ebuild 3399 SHA256 24939f9d1b228ee9f62fffd177b8f59934bc846ffabef2a8d74d510c208f5901 SHA512 cb0bc520486cefa2e47694d05fdc95fa16c4c6968c9693763072ce15b1b8687eefb8484e32150ef90669bdcf6e731bebaf677070e8ab2d27adc2bcc72dcc103f WHIRLPOOL 98fcd4547f8796819657fd6c0cfad3091f38a5ff04ac40cdb8980092837ad45a60973e959055b9887a7e0ca5c3c4333f44e0619892c58aec10b722c05bf943ca diff --git a/virtual/miller-base/files/update-install2 b/virtual/miller-base/files/update-install2 index c4d2e4f..14649b3 100755 --- a/virtual/miller-base/files/update-install2 +++ b/virtual/miller-base/files/update-install2 @@ -1,19 +1,22 @@ #!/bin/bash -file="/var/www/files/localhost/`hostname`_updates.txt" -dpfile="/var/www/files/localhost/`hostname`_depclean.txt" +eval $(emerge --info | grep '="') +updates="${UPDATESTATEDIR:-/tmp}/`hostname`_updates.txt" +depcleans="${UPDATESTATEDIR:-/tmp}/`hostname`_depclean.txt" + tty -s TTYTEST=$? ( \ ( \ ( \ - emerge -uqDN @world @system --keep-going --with-bdeps=y && \ - rm -f $file ) || \ + emerge -uqDN @world @system --keep-going --with-bdeps=y ${EMERGEEXTRAOPTS} && \ + rm -f ${updates} ) || \ /etc/portage/postsync.d/50-write-new-updates ) && \ - emerge --depclean -q 2>&1 | tee $dpfile && \ - emerge -q --keep-going @preserved-rebuild \ + emerge --depclean -q 2>&1 | tee ${depcleans} && \ + emerge -q --keep-going @preserved-rebuild ${EMERGEEXTRAOPTS} \ ) -revdep-rebuild -q -i + +etc-update --preen if [ $TTYTEST -eq 0 ]; then etc-update fi diff --git a/virtual/miller-base/files/write-new-updates b/virtual/miller-base/files/write-new-updates index 501fece..05bc88b 100755 --- a/virtual/miller-base/files/write-new-updates +++ b/virtual/miller-base/files/write-new-updates @@ -1,4 +1,6 @@ #!/bin/bash -file="/var/www/files/localhost/`hostname`_updates.txt" -emerge -uDNpvq --with-bdeps=y @world @system > ${file} +eval $(emerge --info | grep '="') +updates="${UPDATESTATEDIR:-/tmp}/`hostname`_updates.txt" + +emerge -uDNpvq --with-bdeps=y @world @system > ${updates} diff --git a/virtual/miller-base/miller-base-9-r10.ebuild b/virtual/miller-base/miller-base-9-r10.ebuild new file mode 100644 index 0000000..34cf239 --- /dev/null +++ b/virtual/miller-base/miller-base-9-r10.ebuild @@ -0,0 +1,118 @@ +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 lvmboot lvmroot sw-suspend raid +video_cards_nvidia firmware" + +RDEPEND=" + sys-apps/kexec-tools + sys-process/htop + sys-apps/less + app-admin/eclean-kernel + raid? ( sys-fs/mdadm ) + app-admin/ide-smart + sys-cluster/glusterfs + sys-cluster/netfs + sys-apps/ethtool + cdr? ( app-cdr/k3b ) + sys-apps/hdparm + fuse? ( sys-fs/sshfs-fuse ) + xfs? ( sys-fs/xfsdump ) + sys-fs/lvm2 + lvmboot? ( >=sys-boot/grub-1.98 ) + lvmroot? ( + sys-apps/busybox + sys-kernel/dracut[dracut_modules_lvm] + ) + video_cards_nvidia? ( sys-apps/v86d ) + >=app-portage/gentoolkit-0.2.1 + sys-process/vixie-cron + app-admin/sudo + mail-client/mailx + sys-apps/pciutils + sys-apps/usbutils + net-misc/ntp + !minimal? ( + x11-apps/xauth + sys-apps/moreutils + dev-util/strace + net-analyzer/netcat + net-ftp/ncftp + app-text/dos2unix + net-dns/bind-tools + www-servers/apache + app-antivirus/clamav + ) + samba? ( || ( net-fs/cifs-utils net-fs/samba[client] ) ) + firmware? ( sys-kernel/linux-firmware ) + sys-process/lsof + app-portage/layman[subversion] + app-admin/syslog-ng + app-admin/logrotate + !hardened? ( + sys-devel/prelink + !sw-suspend? ( sys-kernel/gentoo-sources ) + sw-suspend? ( sys-apps/tuxonice-userui + || ( sys-kernel/tuxonice-sources + sys-kernel/pf-sources ) ) ) + hardened? ( sys-kernel/hardened-sources sys-apps/gradm ) + app-misc/screen + sys-boot/grub + 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 ) + net-misc/wakeonlan + sys-boot/plymouth-openrc-plugin + " + +src_install() { + exeinto /etc/cron.hourly + newexe "${FILESDIR}"/service-check service-check + + 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 + else + if use autoservicerestart ; then + exeinto /usr/libexec/scripts/auto-restart + for f in ${FILESDIR}/restart/* ; do + newexe ${FILESDIR}/restart/`basename $f` `basename $f` + done + exeinto /etc/portage/postsync.d/ + newexe "${FILESDIR}"/auto-restart-services 80-auto-restart-services + fi + fi + fi + + exeinto /sbin + newexe "${FILESDIR}"/update-install2 update-install + newexe "${FILESDIR}"/update-kernel update-kernel +} diff --git a/virtual/miller-base/miller-base-9-r9.ebuild b/virtual/miller-base/miller-base-9-r9.ebuild deleted file mode 100644 index a2a4350..0000000 --- a/virtual/miller-base/miller-base-9-r9.ebuild +++ /dev/null @@ -1,117 +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 lvmboot lvmroot sw-suspend raid -video_cards_nvidia firmware" - -RDEPEND=" - sys-apps/kexec-tools - sys-process/htop - sys-apps/less - app-admin/eclean-kernel - raid? ( sys-fs/mdadm ) - app-admin/ide-smart - sys-cluster/glusterfs - sys-cluster/netfs - sys-apps/ethtool - cdr? ( app-cdr/k3b ) - sys-apps/hdparm - fuse? ( sys-fs/sshfs-fuse ) - xfs? ( sys-fs/xfsdump ) - sys-fs/lvm2 - lvmboot? ( >=sys-boot/grub-1.98 ) - lvmroot? ( - sys-apps/busybox - sys-kernel/dracut[dracut_modules_lvm] - ) - video_cards_nvidia? ( sys-apps/v86d ) - >=app-portage/gentoolkit-0.2.1 - sys-process/vixie-cron - app-admin/sudo - mail-client/mailx - sys-apps/pciutils - sys-apps/usbutils - net-misc/ntp - !minimal? ( - x11-apps/xauth - sys-apps/moreutils - dev-util/strace - net-analyzer/netcat - net-ftp/ncftp - app-text/dos2unix - net-dns/bind-tools - www-servers/apache - app-antivirus/clamav - ) - samba? ( || ( net-fs/cifs-utils net-fs/samba[client] ) ) - firmware? ( sys-kernel/linux-firmware ) - sys-process/lsof - app-portage/layman[subversion] - app-admin/syslog-ng - app-admin/logrotate - !hardened? ( - sys-devel/prelink - !sw-suspend? ( sys-kernel/gentoo-sources ) - sw-suspend? ( sys-apps/tuxonice-userui - || ( sys-kernel/tuxonice-sources - sys-kernel/pf-sources ) ) ) - hardened? ( sys-kernel/hardened-sources sys-apps/gradm ) - app-misc/screen - sys-boot/grub - 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 ) - net-misc/wakeonlan - " - -src_install() { - exeinto /etc/cron.hourly - newexe "${FILESDIR}"/service-check service-check - - 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 - else - if use autoservicerestart ; then - exeinto /usr/libexec/scripts/auto-restart - for f in ${FILESDIR}/restart/* ; do - newexe ${FILESDIR}/restart/`basename $f` `basename $f` - done - exeinto /etc/portage/postsync.d/ - newexe "${FILESDIR}"/auto-restart-services 80-auto-restart-services - fi - fi - fi - - exeinto /sbin - newexe "${FILESDIR}"/update-install2 update-install - newexe "${FILESDIR}"/update-kernel update-kernel -} -- cgit v1.2.3