From 8fbe25f884d074aea13925dd12ec3bc706fad722 Mon Sep 17 00:00:00 2001 From: Andrej Kacian Date: Sun, 24 Dec 2006 21:07:22 +0000 Subject: [PATCH] =?utf8?q?Include=20script=20for=20logrotate=20(and=20logr?= =?utf8?q?otate=20USE=20flag).=20Closes=20bug=20#122070,=20reported=20by?= =?utf8?q?=20T=C3=B3th=20Csaba=20.=20Package?= =?utf8?q?-Manager:=20portage-2.1.2=5Frc3-r7?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- app-antivirus/clamav/ChangeLog | 9 +- app-antivirus/clamav/Manifest | 27 ++-- app-antivirus/clamav/clamav-0.88.7-r2.ebuild | 135 ++++++++++++++++++ app-antivirus/clamav/files/clamav.logrotate | 17 +++ .../clamav/files/digest-clamav-0.88.7-r2 | 3 + 5 files changed, 182 insertions(+), 9 deletions(-) create mode 100644 app-antivirus/clamav/clamav-0.88.7-r2.ebuild create mode 100644 app-antivirus/clamav/files/clamav.logrotate create mode 100644 app-antivirus/clamav/files/digest-clamav-0.88.7-r2 diff --git a/app-antivirus/clamav/ChangeLog b/app-antivirus/clamav/ChangeLog index 6c9306a20948..d12027c82a5f 100644 --- a/app-antivirus/clamav/ChangeLog +++ b/app-antivirus/clamav/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-antivirus/clamav # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.192 2006/12/20 21:10:32 drizzt Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.193 2006/12/24 21:07:22 ticho Exp $ + +*clamav-0.88.7-r2 (24 Dec 2006) + + 24 Dec 2006; Andrej Kacian +files/clamav.logrotate, + +clamav-0.88.7-r2.ebuild: + Include script for logrotate (and logrotate USE flag). Closes bug #122070, + reported by Tóth Csaba . 20 Dec 2006; Timothy Redaelli clamav-0.88.7-r1.ebuild: Readded ~x86-fbsd keyword since dazuko-2.3.2-r2 is keyworded diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest index 08011af5429c..72095d5e6395 100644 --- a/app-antivirus/clamav/Manifest +++ b/app-antivirus/clamav/Manifest @@ -5,6 +5,10 @@ AUX clamav-milter.README.gentoo 1124 RMD160 4fb1e2d9b444874838bcea1071969ca6862f MD5 08f7b320461c04bbb88555e389c2e544 files/clamav-milter.README.gentoo 1124 RMD160 4fb1e2d9b444874838bcea1071969ca6862fb15b files/clamav-milter.README.gentoo 1124 SHA256 5e7b142b68964bc3463b077e5698fa77cace45ea9612258b1e1849cee944dd11 files/clamav-milter.README.gentoo 1124 +AUX clamav.logrotate 359 RMD160 fe938e68a2849a0673aec596cad6ef9921174c76 SHA1 6faf1a2c03d1feb60826b7d3baa238c526f25147 SHA256 97f2c62d9ba1a728e2ef8b385fb4e2db92c8328e8800638db742fe9e05975b3b +MD5 2a68611f9a0fded9b3ffb3d93210e626 files/clamav.logrotate 359 +RMD160 fe938e68a2849a0673aec596cad6ef9921174c76 files/clamav.logrotate 359 +SHA256 97f2c62d9ba1a728e2ef8b385fb4e2db92c8328e8800638db742fe9e05975b3b files/clamav.logrotate 359 AUX clamd.conf 193 RMD160 abebb5e1607e6819859b51e1a41b583c8266c6df SHA1 5b27737aecf3bd90277988fc60526ede7d4be636 SHA256 cd867dc66af694282584fa2cfd40a662ac2a7c25d6f2288b9afdc657a07226e3 MD5 e29ee77ca9bfe28ed18dbf67a9c90e75 files/clamd.conf 193 RMD160 abebb5e1607e6819859b51e1a41b583c8266c6df files/clamd.conf 193 @@ -30,6 +34,10 @@ EBUILD clamav-0.88.7-r1.ebuild 3804 RMD160 e8a9f02f5da15ef35b24cdd3dbcfb70fd97f0 MD5 22c4b9b87cb2a57b231bef520093e426 clamav-0.88.7-r1.ebuild 3804 RMD160 e8a9f02f5da15ef35b24cdd3dbcfb70fd97f0aad clamav-0.88.7-r1.ebuild 3804 SHA256 5d84809fc70657c67953afabc2373b229338598ad47d55b120cb1a9f16da5025 clamav-0.88.7-r1.ebuild 3804 +EBUILD clamav-0.88.7-r2.ebuild 4004 RMD160 3fb2f2d416e3ec2988d9e7a36515fe0cc11ad125 SHA1 5f1923059d63cc2d2ae1d755ca73eaaf28aa6911 SHA256 fabf07ddb77d1b38a48dfdd09877d13fb8c331eaac6be449cdd3462f5306106b +MD5 4085a25e8409f59abad51656665462e4 clamav-0.88.7-r2.ebuild 4004 +RMD160 3fb2f2d416e3ec2988d9e7a36515fe0cc11ad125 clamav-0.88.7-r2.ebuild 4004 +SHA256 fabf07ddb77d1b38a48dfdd09877d13fb8c331eaac6be449cdd3462f5306106b clamav-0.88.7-r2.ebuild 4004 EBUILD clamav-0.88.7.ebuild 3445 RMD160 1ac10a261c1bf5140e4e4559c1771ea484fb8877 SHA1 b9c4da3875d68abaaa57c8a4ed656bf6933aa626 SHA256 933faa93edca04dcf56707c74fd8c3902b179996909af9f2c9a1e271c2a00675 MD5 93a0c8dc7110cb091742a0410be75a05 clamav-0.88.7.ebuild 3445 RMD160 1ac10a261c1bf5140e4e4559c1771ea484fb8877 clamav-0.88.7.ebuild 3445 @@ -42,10 +50,10 @@ EBUILD clamav-0.90_rc2.ebuild 3623 RMD160 21b2e5d24d5c9e3e46897d8b189f3696d23893 MD5 1bdb66e62df38fc1fdc34c5cb9a9243b clamav-0.90_rc2.ebuild 3623 RMD160 21b2e5d24d5c9e3e46897d8b189f3696d23893a3 clamav-0.90_rc2.ebuild 3623 SHA256 707351666a355341ca524b624a677f8e1185a520fdf09ab30582cec324a03e10 clamav-0.90_rc2.ebuild 3623 -MISC ChangeLog 29905 RMD160 da535cbec9988907b1b95160e9696c370d797365 SHA1 a07670f891848216ba3773232f4807a328eac8a3 SHA256 2d4a0e51ec875fe83e1a380efeecb4157e720ddc61274c707ba49163a3d1e754 -MD5 a2f30f4518788fa5eec48d4d0e3f9834 ChangeLog 29905 -RMD160 da535cbec9988907b1b95160e9696c370d797365 ChangeLog 29905 -SHA256 2d4a0e51ec875fe83e1a380efeecb4157e720ddc61274c707ba49163a3d1e754 ChangeLog 29905 +MISC ChangeLog 30170 RMD160 0d8eaa44633ccfa9f9539e5d7f9051988fd135d1 SHA1 d64d9ca947ef9ee18fa97d94d79dfe0519f42e8b SHA256 aa82cf579250e0d2792ca98c1952a83f2b572d8ed30daacd0b86c95adacd5e34 +MD5 17f1c0cb57297f79bd462862570f84e3 ChangeLog 30170 +RMD160 0d8eaa44633ccfa9f9539e5d7f9051988fd135d1 ChangeLog 30170 +SHA256 aa82cf579250e0d2792ca98c1952a83f2b572d8ed30daacd0b86c95adacd5e34 ChangeLog 30170 MISC metadata.xml 184 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 SHA1 cc0a188d9ad2411e78747326c62dd046bd5413c8 SHA256 d51011aa837db802ef539a1321a4af0a4a00879d475b92fd58f3c01df7320b58 MD5 7e32edfd72887a57b16ecd73f0f7a1a0 metadata.xml 184 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 metadata.xml 184 @@ -62,6 +70,9 @@ SHA256 2e2d87de95403702c16fdcf253ab8f6faaec955053a2eabd917b097e50322d9e files/di MD5 bccf90d7043a4dcf5e63ebfb791fba03 files/digest-clamav-0.88.7-r1 244 RMD160 5da87304d411960a91d80f102be4c2d4937479b6 files/digest-clamav-0.88.7-r1 244 SHA256 2e2d87de95403702c16fdcf253ab8f6faaec955053a2eabd917b097e50322d9e files/digest-clamav-0.88.7-r1 244 +MD5 bccf90d7043a4dcf5e63ebfb791fba03 files/digest-clamav-0.88.7-r2 244 +RMD160 5da87304d411960a91d80f102be4c2d4937479b6 files/digest-clamav-0.88.7-r2 244 +SHA256 2e2d87de95403702c16fdcf253ab8f6faaec955053a2eabd917b097e50322d9e files/digest-clamav-0.88.7-r2 244 MD5 fa7e303f8f99e4693beb43a0a2b0e0b9 files/digest-clamav-0.90_rc1 253 RMD160 ee5645616db2626c6cf87c99f2ea0177f5a4c149 files/digest-clamav-0.90_rc1 253 SHA256 68559c554b8fc8afa9ea0d2b7c3f5db41d19cdf15a8d115d6d83fa27aede0d74 files/digest-clamav-0.90_rc1 253 @@ -69,9 +80,9 @@ MD5 9fc9dd79c51ed6e46836c21abe6521e0 files/digest-clamav-0.90_rc2 247 RMD160 d2538b5e59b8246b686bda02443ae560310b5802 files/digest-clamav-0.90_rc2 247 SHA256 c0187965a68f4423a6d8937f911dde49a724751f436f51741c150f4ac5ee16b6 files/digest-clamav-0.90_rc2 247 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) +Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFFiab7GDyatLGpTbYRAllVAJ9suBprOCKxq8sq/ODF6/Z4z7eBUwCePmVU -ZkR8GIIqI0jimubC1Or7VUw= -=d7b0 +iD8DBQFFjuwYQlM6RnzZP+IRAiv+AJ9+7dE3XINEJYVPNUyC672ySJ0+wQCgl+h2 +9J2e69ZsWTKz4BNpzhKDhfE= +=vQWu -----END PGP SIGNATURE----- diff --git a/app-antivirus/clamav/clamav-0.88.7-r2.ebuild b/app-antivirus/clamav/clamav-0.88.7-r2.ebuild new file mode 100644 index 000000000000..82f5ebaed03a --- /dev/null +++ b/app-antivirus/clamav/clamav-0.88.7-r2.ebuild @@ -0,0 +1,135 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.88.7-r2.ebuild,v 1.1 2006/12/24 21:07:22 ticho Exp $ + +inherit eutils flag-o-matic fixheadtails + +DESCRIPTION="Clam Anti-Virus Scanner" +HOMEPAGE="http://www.clamav.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="crypt logrotate mailwrapper milter onaccess selinux" + +DEPEND="virtual/libc + crypt? ( >=dev-libs/gmp-4.1.2 ) + milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) + onaccess? ( sys-fs/dazuko ) + >=sys-libs/zlib-1.2.1-r3 + >=net-misc/curl-7.10.0 + >=sys-apps/sed-4" +RDEPEND="${DEPEND} + selinux? ( sec-policy/selinux-clamav ) + logrotate? ( app-admin/logrotate ) + sys-apps/grep" +PROVIDE="virtual/antivirus" + +pkg_setup() { + if use milter; then + if [ ! -e /usr/lib/libmilter.a ] ; then + ewarn "In order to enable milter support, clamav needs sendmail with enabled milter" + ewarn "USE flag. Either recompile sendmail with milter USE flag enabled, or disable" + ewarn "this flag for clamav as well to disable milter support." + die "need milter-enabled sendmail" + fi + fi + if use onaccess ; then + echo + ewarn "Warning: On access scan support is experimental!" + echo + fi + enewgroup clamav + enewuser clamav -1 -1 /dev/null clamav +} + +src_compile() { + has_version =sys-libs/glibc-2.2* && filter-lfs-flags + + local myconf + + # we depend on fixed zlib, so we can disable this check to prevent redundant + # warning (bug #61749) + myconf="${myconf} --disable-zlib-vcheck" + # use id utility instead of /etc/passwd parsing (bug #72540) + myconf="${myconf} --enable-id-check" + use milter && { + myconf="${myconf} --enable-milter" + use mailwrapper && \ + myconf="${myconf} --with-sendmail=/usr/sbin/sendmail.sendmail" + } + + ht_fix_file configure + econf ${myconf} \ + $(use_enable onaccess clamuko) \ + --with-dbdir=/var/lib/clamav || die + emake || die +} + +src_install() { + make DESTDIR=${D} install || die + dodoc AUTHORS BUGS NEWS README ChangeLog FAQ INSTALL + newconfd ${FILESDIR}/clamd.conf clamd + newinitd ${FILESDIR}/clamd.rc clamd + dodoc ${FILESDIR}/clamav-milter.README.gentoo + + dodir /var/run/clamav + keepdir /var/run/clamav + fowners clamav:clamav /var/run/clamav + dodir /var/log/clamav + keepdir /var/log/clamav + fowners clamav:clamav /var/log/clamav + + # Change /etc/clamd.conf to be usable out of the box + sed -i -e "s:^\(Example\):\# \1:" \ + -e "s:.*\(PidFile\) .*:\1 /var/run/clamav/clamd.pid:" \ + -e "s:.*\(LocalSocket\) .*:\1 /var/run/clamav/clamd.sock:" \ + -e "s:.*\(User\) .*:\1 clamav:" \ + -e "s:^\#\(LogFile\) .*:\1 /var/log/clamav/clamd.log:" \ + -e "s:^\#\(LogTime\).*:\1:" \ + ${D}/etc/clamd.conf + + # Do the same for /etc/freshclam.conf + sed -i -e "s:^\(Example\):\# \1:" \ + -e "s:.*\(PidFile\) .*:\1 /var/run/clamav/freshclam.pid:" \ + -e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \ + -e "s:^\#\(LogFile\) .*:\1 /var/log/freshclam.log:" \ + -e "s:^\#\(LogTime\).*:\1:" \ + ${D}/etc/freshclam.conf + + if use milter ; then + echo "START_MILTER=no" \ + >> ${D}/etc/conf.d/clamd + echo "MILTER_SOCKET=\"/var/run/clamav/clmilter.sock\"" \ + >>${D}/etc/conf.d/clamd + echo "MILTER_OPTS=\"-m 10 --timeout=0\"" \ + >>${D}/etc/conf.d/clamd + fi + + if use onaccess ; then + dodir /etc/udev/rules.d + echo "KERNEL==\"dazuko\", NAME=\"%k\", GROUP=\"clamav\", MODE=\"0660\"" \ + >${D}/etc/udev/rules.d/60-dazuko.rules + fi + + if use logrotate ; then + diropts "" + dodir /etc/logrotate.d + insopts -m0644 + insinto /etc/logrotate.d + newins ${FILESDIR}/${PN}.logrotate ${PN} + fi +} + +pkg_postinst() { + echo + ewarn "Warning: clamd and/or freshclam have not been restarted." + ewarn "You should restart them with: /etc/init.d/clamd restart" + echo + if use milter ; then + einfo "For simple instructions how to setup the clamav-milter type:" + echo " zless /usr/share/doc/${PF}/clamav-milter.README.gentoo.gz" + echo + fi +} diff --git a/app-antivirus/clamav/files/clamav.logrotate b/app-antivirus/clamav/files/clamav.logrotate new file mode 100644 index 000000000000..a87d45d31690 --- /dev/null +++ b/app-antivirus/clamav/files/clamav.logrotate @@ -0,0 +1,17 @@ +/var/log/clamav/clamd.log { + missingok + create 640 clamav clamav + postrotate + /bin/kill -HUP `cat /var/run/clamav/clamd.pid 2> /dev/null` 2> +/dev/null || true + endscript +} + +/var/log/clamav/freshclam.log { + missingok + create 640 clamav clamav + postrotate + /bin/kill -HUP `cat /var/run/clamav/freshclam.pid 2> /dev/null` 2> +/dev/null || true + endscript +} diff --git a/app-antivirus/clamav/files/digest-clamav-0.88.7-r2 b/app-antivirus/clamav/files/digest-clamav-0.88.7-r2 new file mode 100644 index 000000000000..766a04de5f01 --- /dev/null +++ b/app-antivirus/clamav/files/digest-clamav-0.88.7-r2 @@ -0,0 +1,3 @@ +MD5 34a9d58cf5bcb04dbe3eb32b5367a3f8 clamav-0.88.7.tar.gz 9510548 +RMD160 14d7c6255df618b16b704fc1cb5ce2b1385fa0e8 clamav-0.88.7.tar.gz 9510548 +SHA256 702cb5928bff3d0e647a4a6b505d434e3a0f10f2af74bddac5239a200b92d1e2 clamav-0.88.7.tar.gz 9510548 -- 2.26.2