From 5a8994b624b71d12fb1f238f840a48c1fc8c9058 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Sun, 31 Jul 2016 02:09:14 +0100 Subject: Fix up find command for clamd scanning --- virtual/miller-base/Manifest | 4 +- virtual/miller-base/files/weekly-av-scan.cron | 4 +- virtual/miller-base/miller-base-10.3-r1.ebuild | 122 +++++++++++++++++++++++++ virtual/miller-base/miller-base-10.3.ebuild | 122 ------------------------- 4 files changed, 126 insertions(+), 126 deletions(-) create mode 100644 virtual/miller-base/miller-base-10.3-r1.ebuild delete mode 100644 virtual/miller-base/miller-base-10.3.ebuild (limited to 'virtual') diff --git a/virtual/miller-base/Manifest b/virtual/miller-base/Manifest index 3851ed5..d2f0227 100644 --- a/virtual/miller-base/Manifest +++ b/virtual/miller-base/Manifest @@ -8,6 +8,6 @@ AUX tmpfiles-d-portage.conf 78 SHA256 6b6f63b38702a86782d1048e0cf54a097a6850ab74 AUX update-autoshutdown 94 SHA256 bd42a7125c4cf5cfb013178f9562f21e8827a9879be85f3fd5445b6c50579023 SHA512 8d131120646ff1aef8403c2decb92bb9150aef9d57cb36438a42438f4573a4d52fe390d2644c423a76997fdbcdb94a7b72c1a56ecebc81937a71d7181ac71ddf WHIRLPOOL a11b2e8c0eaaea890f3aa2ecf4efc61b16e53848ffd67c9e502c4b6516c20f257e685b299b880dc0ee449ca72e26f4cf08aea75ca9da6b75c3cc0e74024403d9 AUX update-install2 646 SHA256 b5a177ec080b8ae0290b9568b4a9b2b075569f0444acfbb654fcac82a480a374 SHA512 f7adacdbb76e90bf39e1896ce6c87494a8a964cc2f74081cf573fe61edbbc70c884b19fd0c4250e406af37503f43a8f47325a77e94fbda3327326c9b22a14501 WHIRLPOOL 1ab958af5b2d3daaa4791cb144c7d417f48be0ddb961ffe1e252ec5f0519716ff00821e2d96ee7e506541655e2d28d2aab6450207e60d52f5caafd167f3767f2 AUX update.portage.cron-2 48 SHA256 db1c43c1d9aa7b906e39dd397499a1a33fc36103a1bc06c21eea36156be895a9 SHA512 431d8ed50c2fc6d4b0e9e3550e4ba5d8320595961c6dab14820ae7b5abd39bf63cb6afb99724f2b4aebb2c0cf14b46927d2abecb6d9509db158000b8ea6a97b8 WHIRLPOOL 8cd7b3a90dbaa55f7dacb22f9408a75a121abea37392328f749cf27c3f82ba81379c4de7a1e0db3352de0cfd1697fe89f866eeb002a5c159c481e22e5243b244 -AUX weekly-av-scan.cron 650 SHA256 bc3af23d46ac2d6c73ec6507ecd2354dc048887f6957b42a239bd12f7fa97a63 SHA512 7419409391019df416d00160bdd555be8288a29d8f66d3add9f374df1c30d4a1d5e6efe0cbe1fc84761911d4ea12eb95ef9ee36884b9a2a75d1324e1741c678e WHIRLPOOL ee80aacd0b03bc0e0bf6e051a22d0bc97fce644cf875c271f0fe3c317f9d2cbb19a50d8a464488450047d0cb18bf979fbb7fb1168d77692ef0281e1253c788d5 +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.ebuild 3315 SHA256 45db7ad886bce57079e7c6ee34ca78393c40dc917a07dea69dafac14a5e9244b SHA512 d9e110a844150ba2336880796ca6f78df6baee64fc47f16472df95c0862a3a26bab6425d0b3cfbfcc027baf1ac98be267689d5edc3441acc721eb7ad02295606 WHIRLPOOL 55cc75b1c5abcc3d723014d2642f41abf353cdc8ed7d16c386899839e0077ec87cd6a1a47bd79bdd2ed0ebcbd592c7798d1ce043710d8b8a94e1352434e01c45 +EBUILD miller-base-10.3-r1.ebuild 3315 SHA256 45db7ad886bce57079e7c6ee34ca78393c40dc917a07dea69dafac14a5e9244b SHA512 d9e110a844150ba2336880796ca6f78df6baee64fc47f16472df95c0862a3a26bab6425d0b3cfbfcc027baf1ac98be267689d5edc3441acc721eb7ad02295606 WHIRLPOOL 55cc75b1c5abcc3d723014d2642f41abf353cdc8ed7d16c386899839e0077ec87cd6a1a47bd79bdd2ed0ebcbd592c7798d1ce043710d8b8a94e1352434e01c45 diff --git a/virtual/miller-base/files/weekly-av-scan.cron b/virtual/miller-base/files/weekly-av-scan.cron index 7823809..462e7e3 100755 --- a/virtual/miller-base/files/weekly-av-scan.cron +++ b/virtual/miller-base/files/weekly-av-scan.cron @@ -16,10 +16,10 @@ echo if [ -S /run/clamav/clamd.sock ] ; then echo "Using clamd" - EXCLARGS=$(ls -1d $EXCL | sed -ne 's/\(.*\)/-path "\1" -prune -o/p') + EXCLARGS=$(ls -1d $EXCL | sed -ne 's/\(.*\)/-path \1 -o/p') rm -f /tmp/scan mkfifo /tmp/scan - find $ROOTS -xdev -type f $EXCLARGS -print > /tmp/scan & + find $ROOTS -xdev \( $EXCLARGS -empty \) -prune -o -type f -print > /tmp/scan & clamdscan -i --fdpass -f /tmp/scan rm -f /tmp/scan else diff --git a/virtual/miller-base/miller-base-10.3-r1.ebuild b/virtual/miller-base/miller-base-10.3-r1.ebuild new file mode 100644 index 0000000..cf8e5e8 --- /dev/null +++ b/virtual/miller-base/miller-base-10.3-r1.ebuild @@ -0,0 +1,122 @@ +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=" + sys-process/htop + sys-apps/less + fuse? ( sys-fs/sshfs ) + !ischroot? ( + 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.ebuild b/virtual/miller-base/miller-base-10.3.ebuild deleted file mode 100644 index cf8e5e8..0000000 --- a/virtual/miller-base/miller-base-10.3.ebuild +++ /dev/null @@ -1,122 +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=" - sys-process/htop - sys-apps/less - fuse? ( sys-fs/sshfs ) - !ischroot? ( - 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