From fb888802e80d2e5fc712f307e1a7d1a45a594fdf Mon Sep 17 00:00:00 2001 From: randomdan Date: Wed, 6 Nov 2013 19:36:28 +0000 Subject: Remove old scripts Use emerge command to get paths Use clamscan's cross-fs option to invert logic, scan only specific things --- virtual/miller-base/Manifest | 8 ++--- .../files/hourly-distclean-updatedb.cron | 36 ---------------------- virtual/miller-base/files/update.portage.cron | 10 ------ virtual/miller-base/files/update.portage.cron-2 | 3 +- virtual/miller-base/files/weekly-av-scan.cron | 7 ++--- .../files/weekly-distclean-exec-eclean.cron | 3 -- .../miller-base/files/weekly-distclean-exec.cron | 26 ---------------- 7 files changed, 6 insertions(+), 87 deletions(-) delete mode 100755 virtual/miller-base/files/hourly-distclean-updatedb.cron delete mode 100644 virtual/miller-base/files/update.portage.cron delete mode 100644 virtual/miller-base/files/weekly-distclean-exec-eclean.cron delete mode 100755 virtual/miller-base/files/weekly-distclean-exec.cron diff --git a/virtual/miller-base/Manifest b/virtual/miller-base/Manifest index 1ae0b6d..fe3c81e 100644 --- a/virtual/miller-base/Manifest +++ b/virtual/miller-base/Manifest @@ -2,7 +2,6 @@ AUX auto-download-packages 81 SHA256 0ec31222dc2d7b7dac658faffed8b971d9ee6710811 AUX auto-restart-services 278 SHA256 5db6e30dcc5664ac8a4ef81225eac42d9bb6c33df815e07b250c210dcd252e80 SHA512 a787bd94e3f563a9175874de95bdddd1b4835e4360f226e1bf0040f7d089f0724f2b59df9be6be3281b11f0b1876d0c8c0719ae998ab0a702bbbe75b3223ff3f WHIRLPOOL e2ea0dee391b2fdd2a206f7e357068a2d59146b6373244ac55d9174adda5834b7f4d1e3692915c0ce86bbf489632fe0cd7302a4ae2f1f9d001285a9826e48941 AUX auto-update-overlays 25 SHA256 98ce8786c0fb1612bb1778a2ee0aea88728b7d74929650a5b249bc0e05d3abdd SHA512 70e69f299817b93debbffd0ea7d05cb8fe00be21d8103bf70024fd07443fb3abe3cebe32003128e9d241463b6eb954c98d335d8040a35a0035f05f93b99678d1 WHIRLPOOL 4140a9ffd1ff024260bded5ad5edc7bbb90a755be1b2b4703769d18e83000c8834deaa60aa10e8aebc5b5d03353bfb1a4065c830d481778c46314949ae60363f AUX daily-av-update.cron 31 SHA256 1b83ac59e56ffbc3ec1c0f42c3c43de2b0cf9485690292a7dcb3440d529d0f78 SHA512 cf742cab1cf6129dffdd3c48003f54700227ff1a91458383d1afd73c93bcb981a284933ebf7997bf8cb6a26f9fc08ca3d40591a711c6cfbcb1fd830e8a022dff WHIRLPOOL 80ddba88db28f1c1235f81247815021dd7a4215bdcf0d3b9472843779ffa151d5f714a78ba20a683b8dec4c13df64c132f6380bc15a2f828dca3dd5f3c3d5beb -AUX hourly-distclean-updatedb.cron 940 SHA256 ce2ec02cd3a9b1af3df6f7eba15dedb1b4ca8b224fc68431a9afc1a76702c0c6 SHA512 1bcbed4081c23525275be027e4aa7d02e4cccc391eb0ba945ae7018cde15f916113d82db7f10656890d793747e44bfe6aff0e1449ca0536844495bc06643b9b3 WHIRLPOOL e2b963930a5c1b91bc0b65536617d61c79435684461d5dbf1bed2e090f974267773671e253a331b1a87a078ee7c778f9b24655b87bae3975a4d339f783bf1a02 AUX lvmroot/init 475 SHA256 5d111fef9762050acd13d8b35acc53d42ae90aca39cfabb9d156ed1ad3eeb396 SHA512 1382394bd834058d8c6d47586de00a5212c908f51ee2def8e81f1b9353db8079f5b56a023fb5591580b7b33dbc4db67afda8850c6e2507b39035a5ae02171a0b WHIRLPOOL 287f83fe99a288aa6dec999bcd5b65a61f6b0ac49133530fc0ce3627b53392ddc3103c3654304b40935452e8322dad6d25eed8e6ea802d925786763afba89e4a AUX lvmroot/initrd.list 2052 SHA256 d3908608e227e6b4ac00f81e003baced377bdf5089498f6fd482e566952b41c1 SHA512 a139ae9cf121ef4ff7a564f7646deb0d6920ba644b4881d254e92989cd2138145aca8ace4334b7b44ccbe285a639a074bfdfc5f5d9ab1336b106eb9837a50eea WHIRLPOOL 81e746072f97f3aa047c48ff47361540b40d4b6cfb70a1f616cb991761afa9c5efd521038aa90af02a4eb4fd36698cb9fd82231ab54c2c2e18d3496241010e64 AUX lvmroot/initrd.list.icefb 65 SHA256 6bca253e53621a0acc6ac27568c20b429cac6938054d947684b2d44940e7dcc1 SHA512 be163ad94983572d38c91e0f4e13f3851336fdf823a241b7d8b6a7655e62a1ebee666176810f556710a66dd62abc857d5a86a634af9f08865a29015d67830445 WHIRLPOOL 429ac7146c3e1bba5bcdb1513bf63015f6a568cd6e3fd33a0b41421554bb33c112558855e19bba0bb574bba17b922275abf69be51bfee3ea17c15fd9889cfd9a @@ -47,10 +46,7 @@ AUX sync-distclean-exec.cron 60 SHA256 043df18d533148d33abe2f2cf588953b0193c4a47 AUX update-autoshutdown 88 SHA256 e90d95d158222c493d4fbf8ebcd9c2927535048d97ee743fe658d47e50aa6fb6 SHA512 0f2480fe16ae69279937cab620fa2a4764114659759654b63e844415ba937e1ede8aa3974979c7adec3b8dbb8bf2f68eb80f7da5c97daeccd69df28e8fbf0430 WHIRLPOOL f4619f0bf51faf9d1ab572f32c14b7fc9dec1b8b101f78e8c80e7fa3fb3832567dbeba462f4f27490a3398916aa6f08e1d7e66d69ed4b43c68451bbf15187e00 AUX update-install2 457 SHA256 40fcd47ac532d65e0ea54712df2fc0e0ae1685cb2afd8827082d0ee5575815c7 SHA512 531b7e48c40b4b404c3b5e378ddad6d800a6d637708c0e3755de08e9693abe8785ba5281afcfc835aa391b4eba7345170523fc1f66f2192e5f17abf2d77ee98d WHIRLPOOL 5fa8d93af40819a210b976f8bcd3f1d5ea1ac38d47e208c81014beb0c3b5bdf3304d479eb37e4ca11fc7ea454b947f05bb22a525195f10ec131c571913a6f2ba AUX update-kernel 838 SHA256 5f751d3a567251f0e31134fe18fae7fd1386f73a750061e400a9e4851d1c5432 SHA512 666f0f2bbb4511a70e8b1d8722b8fdc397b46297bdea477ebc5e4c5b0d3f96ca498d90daee6de80302f96386efb7ba96fa6ffc797068fac87d653536e6528c71 WHIRLPOOL 4c9b0f04f77d0a8773358b49d09e2c602deca95a8c91eb2abdbbac9f14971acd1f3861a9d9ca55f7b594d642e08657070ce5095045276ea36310becb9a754e44 -AUX update.portage.cron 171 SHA256 394b727e294166db136d5b5c46ab0ac180952d6f20cd93b4a356a2cfc9bedf03 SHA512 02ca67cf126591a18f5243261c4bcb5ec2f67c75ded69709932d2972bcd43c500eb5d82160f0d23539141285670d12713e12f1f55aba5ca02ad72e4672ff18fa WHIRLPOOL 07630c59b46c9ae0fd8369e5d66375bcc5ad901473721746e1ad8983dbe43bf5182302149334d4367cc49c6da853ca56a2733b2c0e53d953f7b5e55b67bae17f -AUX update.portage.cron-2 180 SHA256 19f7c7171b3c86f60605f6576dd14ceccd1f156c1de600fefe66d00554d153b6 SHA512 742b9e9f792a9e9445a515320b9432fd6f64d148a383c6abd142d44af5806f0c4126800b31261a6b37c7e71fc4d29777ceb68f0019695bd07b510f3393b351b5 WHIRLPOOL a5facd48808b08d561c762d14f82bf42f5dc61cf7adcf6fb59295a5b5fe1b78ed62621998a84d08d4524a3640a43d7fc64804c5331704cb176079bb0d48bc68d -AUX weekly-av-scan.cron 257 SHA256 79c7bca330ec2c2e7d3fe542d8744cdeea84cf97f325f3554dbac849fe80d020 SHA512 c4ff727ab7f9d492a35c42d0b8f1a4153e61e8ea5282f5bdfb2377a0b7af640bea0aa7089a2ac518fe4c771421014c8827022be0ca43b0842bd55a880d3c8bd2 WHIRLPOOL 4064b8bf952fe143070de7d8ecf091ccfc2fb542fb8a8e31da265451971627613d61f33e04cde5b3ba5c9407588f76d26cb2ac1ba091112d6a3e0f764398bfbb -AUX weekly-distclean-exec-eclean.cron 40 SHA256 dbb37593b994102324c5a24b5d5d21597c215924a29d065d84b8c64af3049b38 SHA512 9caeec20a9c19c0eb6c73d1c06b3f0c3ba0477f82b6390ab1392ffbad9e22a3b39d7c58c2d4b58d4a04729b8c3be2adc2735d38a8dd4a5e01862a4911bf67d8e WHIRLPOOL e7e03e6a02883dd35e8a55a67b53f070b7eece1613b5ad60a2d3bd6940ff2fa3319e7371a0b1fe78481e235d665734ae3c8fb158e22c315e15794b7ff4337659 -AUX weekly-distclean-exec.cron 664 SHA256 98808e9a3402beea0f023db32cd09df6195d608256672e01d7f05e21536af141 SHA512 a0c52724253294dd9693577b38e9fa85e328c2c251b6230a436975accc6cf72abbff6083eb0a6c0bc07145ef592d2d224d88a29acb3ef958df1eeeeafc7672a0 WHIRLPOOL 3a894420a2fd430bf0366c995000b851893dad99bba48fa778c95c5f80fa9cced938a6c06c6e4b2dc7909380a0875da733445638cdda8b91350f03b6fe28605e +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 diff --git a/virtual/miller-base/files/hourly-distclean-updatedb.cron b/virtual/miller-base/files/hourly-distclean-updatedb.cron deleted file mode 100755 index e307e44..0000000 --- a/virtual/miller-base/files/hourly-distclean-updatedb.cron +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -source "/etc/make.globals" -source "/etc/make.conf" - -WORLD="/var/lib/portage/world" -DB="${DISTDIR}/.`hostname`.packagefiles" - -# Update timestamp on portdir overlay -local=0 -for l in ${PORTDIR_OVERLAY}; do - for f in `find ${l}`; do - if [ ${f} -nt ${DB} ]; then - local=1; - break; - fi - done -done - -# Compare timestamps of all considered files with database -if [ ${WORLD} -nt ${DB} ] || \ - [ ${PORTDIR} -nt ${DB} ] || \ - [ $local -eq 1 ] || \ - [ /etc/make.conf -nt ${DB} ] || \ - [ /etc/portage/packge.use -nt ${DB} ] || \ - [ /etc/portage/packge.keywords -nt ${DB} ] || \ - [ /etc/portage/packge.mask -nt ${DB} ] || \ - [ /etc/portage/packge.unmask -nt ${DB} ] \ - ; then - # Update the database - for f in `emerge -fpe world 2>&1 | grep :// | grep -v '\*'` ; do basename $f ; done | sort -u > ${DB} - emerge -uDNqkpv world -else - touch ${DB} -fi - diff --git a/virtual/miller-base/files/update.portage.cron b/virtual/miller-base/files/update.portage.cron deleted file mode 100644 index 7c47ae3..0000000 --- a/virtual/miller-base/files/update.portage.cron +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -source "/etc/make.globals" -source "/etc/make.conf" - -layman -SQ0 -if df -l ${PORTDIR} 2> /dev/null > /dev/null ; then - emerge --sync --quiet > /dev/null -fi - diff --git a/virtual/miller-base/files/update.portage.cron-2 b/virtual/miller-base/files/update.portage.cron-2 index 4d6f595..b036dc4 100755 --- a/virtual/miller-base/files/update.portage.cron-2 +++ b/virtual/miller-base/files/update.portage.cron-2 @@ -1,7 +1,6 @@ #!/bin/bash -source "/usr/share/portage/config/make.globals" -source "/etc/make.conf" +eval $(emerge --info | grep '="') if df -l ${PORTDIR} 2> /dev/null > /dev/null ; then emerge --sync --quiet > /dev/null diff --git a/virtual/miller-base/files/weekly-av-scan.cron b/virtual/miller-base/files/weekly-av-scan.cron index 7282a05..a4d0a2c 100644 --- a/virtual/miller-base/files/weekly-av-scan.cron +++ b/virtual/miller-base/files/weekly-av-scan.cron @@ -1,9 +1,8 @@ #!/bin/bash -source "/usr/share/portage/config/make.globals" -source "/etc/make.conf" +eval $(emerge --info | grep '="') -nice clamscan / -ri \ +nice clamscan -ri --cross-fs=no \ --exclude-dir=${PORTDIR} \ --exclude-dir=${DISTDIR} \ - `mount | grep -v ^/dev | grep -v ^rootfs | cut -d ' ' -f 3 | sed -e 's/^/--exclude-dir=/'` + $(mount | grep ^/dev/ | sort -u -k1,1 | cut -d ' ' -f 3 | sort) diff --git a/virtual/miller-base/files/weekly-distclean-exec-eclean.cron b/virtual/miller-base/files/weekly-distclean-exec-eclean.cron deleted file mode 100644 index 568a0e5..0000000 --- a/virtual/miller-base/files/weekly-distclean-exec-eclean.cron +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -eclean-dist -f -d -q -t 2w diff --git a/virtual/miller-base/files/weekly-distclean-exec.cron b/virtual/miller-base/files/weekly-distclean-exec.cron deleted file mode 100755 index e1b6f35..0000000 --- a/virtual/miller-base/files/weekly-distclean-exec.cron +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -source "/etc/make.globals" -source "/etc/make.conf" - -if df -l ${DISTDIR} 2> /dev/null > /dev/null ; then - NEEDED="/tmp/distclean.needed.$$" - DISTGOT="/tmp/distclean.distgot.$$" - RMLIST="/tmp/distclean.rmlist.$$" - - if [ "`find ${DISTDIR} -name ".*.packagefiles" -size 0`" ] ; then - exit 1 - fi - - find ${DISTDIR} -name ".*.packagefiles" -mtime +7 -delete - - cat ${DISTDIR}/.*.packagefiles | sort -u > ${NEEDED} && - find ${DISTDIR} -type f -maxdepth 1 -not -name ".*" -printf "%f\n" | sort -u > ${DISTGOT} && - diff ${NEEDED} ${DISTGOT} | grep "> " | cut -b 3- > ${RMLIST} - - cd ${DISTDIR} && rm -f `cat ${RMLIST}` - - rm ${NEEDED} ${DISTGOT} ${RMLIST} -fi - - -- cgit v1.2.3