From 569f8bd245fd42a4323c7ec4a2e40ca9c1f0e5eb Mon Sep 17 00:00:00 2001 From: Tobias Scherbaum Date: Thu, 29 Oct 2009 17:47:34 +0000 Subject: Version bump, #291041 Package-Manager: portage-2.2_rc46/cvs/Linux x86_64 --- app-antivirus/clamav/ChangeLog | 9 +- app-antivirus/clamav/Manifest | 6 +- app-antivirus/clamav/clamav-0.95.2-r1.ebuild | 140 --------------------- app-antivirus/clamav/clamav-0.95.3.ebuild | 139 ++++++++++++++++++++ .../files/clamav-0.95.2-fno-strict-aliasing.patch | 18 --- 5 files changed, 150 insertions(+), 162 deletions(-) delete mode 100644 app-antivirus/clamav/clamav-0.95.2-r1.ebuild create mode 100644 app-antivirus/clamav/clamav-0.95.3.ebuild delete mode 100644 app-antivirus/clamav/files/clamav-0.95.2-fno-strict-aliasing.patch diff --git a/app-antivirus/clamav/ChangeLog b/app-antivirus/clamav/ChangeLog index f5d083748084..1f94c1c6f74f 100644 --- a/app-antivirus/clamav/ChangeLog +++ b/app-antivirus/clamav/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-antivirus/clamav # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.341 2009/10/17 17:21:18 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.342 2009/10/29 17:47:32 dertobi123 Exp $ + +*clamav-0.95.3 (29 Oct 2009) + + 29 Oct 2009; Tobias Scherbaum + -clamav-0.95.2-r1.ebuild, -files/clamav-0.95.2-fno-strict-aliasing.patch, + +clamav-0.95.3.ebuild: + Version bump, #291041 *clamav-0.95.2-r1 (17 Oct 2009) diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest index a540201d6b06..ad8dc4b42872 100644 --- a/app-antivirus/clamav/Manifest +++ b/app-antivirus/clamav/Manifest @@ -1,12 +1,12 @@ AUX clamav-0.95-nls.patch 315 RMD160 d446e489cd3e27c4624467d920baedb554dd1b6b SHA1 8ea2c9580ac04cfcf7daf181e9dc65daefd4c836 SHA256 516828587dbef6a569a06f7d85be807aa18155d709722ca94b98a043caf4925d AUX clamav-0.95.1-nls.patch 319 RMD160 403558e6e71e620da2092f80d1d5b450281cb468 SHA1 2ae10843856aa6d7fd9a42e92b8685a6e9e14fbf SHA256 7bba0e938ae577b2b338f1b48f0173a8ec7e3b6785893319fd044d77847d03ba -AUX clamav-0.95.2-fno-strict-aliasing.patch 371 RMD160 4af65b8712cd85902a15447b3c14e38c3a62a22c SHA1 722582e87826c7ec853db1069eb0d6c6e486cdbb SHA256 92bf30b49e5384178fc1d7e75952288eac81b751dd1ca34734f9e616135345de AUX clamav-milter.README.gentoo 1124 RMD160 4fb1e2d9b444874838bcea1071969ca6862fb15b SHA1 0b9b86a0e7732eaaf7f880859265754f7a4efd3a SHA256 5e7b142b68964bc3463b077e5698fa77cace45ea9612258b1e1849cee944dd11 AUX clamav.logrotate 355 RMD160 f59cd8ce96da8210aa858ee59ee3b6940e3253a6 SHA1 5fbd9364997400681d5a93cb50cac8a0f188e56f SHA256 ab91f784d5098d2162be9277e3a006bdb392d9d89975838ad4ac7dfd8b418170 AUX clamd.conf 234 RMD160 b517b05e587637cbdd443f7ca3625d582e32722f SHA1 564b1e2f6cf85567f69f2e20cbc942967fa6304b SHA256 17bf4fe3596dc5b145e4163d85181e2edcaa214df3cf9072d852ba0e7a569891 AUX clamd.rc 2839 RMD160 3dae59c683e5c3566ab0c8c14e20c1da64646054 SHA1 ed542b9c1259ccaff12ba8949c375e012225bbdd SHA256 0508ad290f20e5a785fb932ee6c5d7e4413cc068ece3dcd1f4dd5b2d3cce01c9 DIST clamav-0.95.2.tar.gz 25137010 RMD160 83cab51c224251316288e4c3189ba91f640e9f82 SHA1 7544b39d84f2233b984a9c2ce3ef74d407add483 SHA256 f5f2a5a9984fd1ade69a7c2cc78da2f5dc0c505f94ab58fb2aa6613399ab1c56 -EBUILD clamav-0.95.2-r1.ebuild 4179 RMD160 e17e31c295a134c9e61f90636f44809a6995dac3 SHA1 39e5ab609c492252fbe09c658aedf345c207d75a SHA256 aa955cf7d04d45fbc07eaf7b3503703a250e88d38b7aba5088519a7028cbbc05 +DIST clamav-0.95.3.tar.gz 26919541 RMD160 c68a2948aa9ab7a3b5f8e9744322d3606ae6df71 SHA1 ab4b1f49d0f24154767d303d6a27b74acf6f4b59 SHA256 003e7a570932fdffbd19fa7a7996274fbfc93f890d26c3066a36eb824c906250 EBUILD clamav-0.95.2.ebuild 4111 RMD160 1c962a178dc749569835f56b948468153a7b26b8 SHA1 cf0bb9c093d6c6aff0b0f0aefa8fc84e4a0ffca7 SHA256 25ef28025a0b05baa0422386df8cf236d9c9d6eea3c6647f26d575d58f0c198a -MISC ChangeLog 51986 RMD160 9882f2ac594ae134cae143e010770010a6c7dc51 SHA1 4e0e4262f07aec0a56e354814ea126ecf452f8b3 SHA256 ee9d644fe5a43548d5026cbf21943db9a357f32a4f16e8d3cfc45bf1eab8887b +EBUILD clamav-0.95.3.ebuild 4123 RMD160 03c10de90c1f90e4cfc85634c46a8eaa2c0360b3 SHA1 0187c9dcb6842da95c85b5fe881fd0e21ef22c5f SHA256 02dd62ca5dddaad81d6bed2b7f00f59f0a717bbd0748036a3a8bc497838d5679 +MISC ChangeLog 52198 RMD160 a82a57b940ab155de08c21d2422017630c2560d8 SHA1 0ebc0cb5c4ffc49a0e3a15e56d2403014e8d02c8 SHA256 408c0f18eb3900cbbaa76757f536c883796a8fcd85ccff3a604c3a5f3791d01f MISC metadata.xml 320 RMD160 3546393e30d87f0b0a2fb17e2f15f57dd8c19661 SHA1 b959e38933418e6fc818ed40cd9a4921b8c66102 SHA256 e2a8c4c8bedbffe50a126c1c7395a4d92652c2d95347b9496d54aea1f230a22d diff --git a/app-antivirus/clamav/clamav-0.95.2-r1.ebuild b/app-antivirus/clamav/clamav-0.95.2-r1.ebuild deleted file mode 100644 index a153d75027ce..000000000000 --- a/app-antivirus/clamav/clamav-0.95.2-r1.ebuild +++ /dev/null @@ -1,140 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.95.2-r1.ebuild,v 1.1 2009/10/17 17:21:19 dertobi123 Exp $ - -EAPI=2 - -inherit eutils flag-o-matic fixheadtails multilib versionator - -# for when rc1 is appended to release candidates: -MY_PV=$(replace_version_separator 3 ''); -MY_P="${PN}-${MY_PV}" -S="${WORKDIR}/${MY_P}" - -DESCRIPTION="Clam Anti-Virus Scanner" -HOMEPAGE="http://www.clamav.net/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="bzip2 clamdtop iconv milter selinux ipv6" - -COMMON_DEPEND="bzip2? ( app-arch/bzip2 ) - milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) - iconv? ( virtual/libiconv ) - clamdtop? ( sys-libs/ncurses ) - >=sys-libs/zlib-1.2.1-r3 - >=sys-apps/sed-4" - -DEPEND="${COMMON_DEPEND} - >=dev-util/pkgconfig-0.20" - -RDEPEND="${COMMON_DEPEND} - selinux? ( sec-policy/selinux-clamav ) - sys-apps/grep" - -PROVIDE="virtual/antivirus" - -RESTRICT="test" - -pkg_setup() { - enewgroup clamav - enewuser clamav -1 -1 /dev/null clamav -} - -src_prepare() { - epatch "${FILESDIR}/${PN}-0.95.1-nls.patch" - epatch "${FILESDIR}/${P}-fno-strict-aliasing.patch" -} - -src_configure() { - has_version =sys-libs/glibc-2.2* && filter-lfs-flags - - ht_fix_file configure - econf \ - $(use_enable bzip2) \ - $(use_enable ipv6) \ - $(use_enable clamdtop) \ - $(use_enable milter) \ - $(use_with iconv) \ - --disable-experimental \ - --enable-id-check \ - --disable-zlib-vcheck \ - --with-dbdir=/var/lib/clamav || die -} - -src_install() { - emake DESTDIR="${D}" install || die - dodoc AUTHORS BUGS NEWS README ChangeLog FAQ - newconfd "${FILESDIR}/clamd.conf" clamd - newinitd "${FILESDIR}/clamd.rc" clamd - - 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 - - # Modify /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 yes:" \ - -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \ - "${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:^\#\(UpdateLogFile\) .*:\1 /var/log/clamav/freshclam.log:" \ - -e "s:^\#\(NotifyClamd\).*:\1 /etc/clamd.conf:" \ - -e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \ - -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \ - "${D}"/etc/freshclam.conf - - if use milter; then - # And again same for /etc/clamav-milter.conf - # MilterSocket one to include ' /' because there is a 2nd line for - # inet: which we want to leave - dodoc "${FILESDIR}/clamav-milter.README.gentoo" - - sed -i -e "s:^\(Example\):\# \1:" \ - -e "s:.*\(PidFile\) .*:\1 /var/run/clamav/clamav-milter.pid:" \ - -e "s+^\#\(ClamdSocket\) .*+\1 unix:/var/run/clamav/clamd.sock+" \ - -e "s:.*\(User\) .*:\1 clamav:" \ - -e "s+^\#\(MilterSocket\) /.*+\1 unix:/var/run/clamav/clamav-milter.sock+" \ - -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \ - -e "s:^\#\(LogFile\) .*:\1 /var/log/clamav/clamav-milter.log:" \ - "${D}"/etc/clamav-milter.conf - fi - - if use milter ; then - cat << EOF >> "${D}"/etc/conf.d/clamd -MILTER_NICELEVEL=19 -START_MILTER=no -EOF - fi - - diropts "" - dodir /etc/logrotate.d - insopts -m0644 - insinto /etc/logrotate.d - newins "${FILESDIR}"/${PN}.logrotate ${PN} -} - -pkg_postinst() { - if use milter ; then - elog "For simple instructions how to setup the clamav-milter" - elog "read the clamav-milter.README.gentoo in /usr/share/doc/${PF}" - elog - fi - ewarn "The soname for libclamav has changed in clamav-0.95." - ewarn "If you have upgraded from that or earlier version, it is" - ewarn "recommended to run revdep-rebuild, in order to fix anything" - ewarn "that links against libclamav.so library." -} diff --git a/app-antivirus/clamav/clamav-0.95.3.ebuild b/app-antivirus/clamav/clamav-0.95.3.ebuild new file mode 100644 index 000000000000..e8dc10c171b5 --- /dev/null +++ b/app-antivirus/clamav/clamav-0.95.3.ebuild @@ -0,0 +1,139 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.95.3.ebuild,v 1.1 2009/10/29 17:47:32 dertobi123 Exp $ + +EAPI=2 + +inherit eutils flag-o-matic fixheadtails multilib versionator + +# for when rc1 is appended to release candidates: +MY_PV=$(replace_version_separator 3 ''); +MY_P="${PN}-${MY_PV}" +S="${WORKDIR}/${MY_P}" + +DESCRIPTION="Clam Anti-Virus Scanner" +HOMEPAGE="http://www.clamav.net/" +SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="bzip2 clamdtop iconv milter selinux ipv6" + +COMMON_DEPEND="bzip2? ( app-arch/bzip2 ) + milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) + iconv? ( virtual/libiconv ) + clamdtop? ( sys-libs/ncurses ) + >=sys-libs/zlib-1.2.1-r3 + >=sys-apps/sed-4" + +DEPEND="${COMMON_DEPEND} + >=dev-util/pkgconfig-0.20" + +RDEPEND="${COMMON_DEPEND} + selinux? ( sec-policy/selinux-clamav ) + sys-apps/grep" + +PROVIDE="virtual/antivirus" + +RESTRICT="test" + +pkg_setup() { + enewgroup clamav + enewuser clamav -1 -1 /dev/null clamav +} + +src_prepare() { + epatch "${FILESDIR}/${PN}-0.95.1-nls.patch" +} + +src_configure() { + has_version =sys-libs/glibc-2.2* && filter-lfs-flags + + ht_fix_file configure + econf \ + $(use_enable bzip2) \ + $(use_enable ipv6) \ + $(use_enable clamdtop) \ + $(use_enable milter) \ + $(use_with iconv) \ + --disable-experimental \ + --enable-id-check \ + --disable-zlib-vcheck \ + --with-dbdir=/var/lib/clamav || die +} + +src_install() { + emake DESTDIR="${D}" install || die + dodoc AUTHORS BUGS NEWS README ChangeLog FAQ + newconfd "${FILESDIR}/clamd.conf" clamd + newinitd "${FILESDIR}/clamd.rc" clamd + + 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 + + # Modify /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 yes:" \ + -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \ + "${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:^\#\(UpdateLogFile\) .*:\1 /var/log/clamav/freshclam.log:" \ + -e "s:^\#\(NotifyClamd\).*:\1 /etc/clamd.conf:" \ + -e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \ + -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \ + "${D}"/etc/freshclam.conf + + if use milter; then + # And again same for /etc/clamav-milter.conf + # MilterSocket one to include ' /' because there is a 2nd line for + # inet: which we want to leave + dodoc "${FILESDIR}/clamav-milter.README.gentoo" + + sed -i -e "s:^\(Example\):\# \1:" \ + -e "s:.*\(PidFile\) .*:\1 /var/run/clamav/clamav-milter.pid:" \ + -e "s+^\#\(ClamdSocket\) .*+\1 unix:/var/run/clamav/clamd.sock+" \ + -e "s:.*\(User\) .*:\1 clamav:" \ + -e "s+^\#\(MilterSocket\) /.*+\1 unix:/var/run/clamav/clamav-milter.sock+" \ + -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \ + -e "s:^\#\(LogFile\) .*:\1 /var/log/clamav/clamav-milter.log:" \ + "${D}"/etc/clamav-milter.conf + fi + + if use milter ; then + cat << EOF >> "${D}"/etc/conf.d/clamd +MILTER_NICELEVEL=19 +START_MILTER=no +EOF + fi + + diropts "" + dodir /etc/logrotate.d + insopts -m0644 + insinto /etc/logrotate.d + newins "${FILESDIR}"/${PN}.logrotate ${PN} +} + +pkg_postinst() { + if use milter ; then + elog "For simple instructions how to setup the clamav-milter" + elog "read the clamav-milter.README.gentoo in /usr/share/doc/${PF}" + elog + fi + ewarn "The soname for libclamav has changed in clamav-0.95." + ewarn "If you have upgraded from that or earlier version, it is" + ewarn "recommended to run revdep-rebuild, in order to fix anything" + ewarn "that links against libclamav.so library." +} diff --git a/app-antivirus/clamav/files/clamav-0.95.2-fno-strict-aliasing.patch b/app-antivirus/clamav/files/clamav-0.95.2-fno-strict-aliasing.patch deleted file mode 100644 index e36411d0d801..000000000000 --- a/app-antivirus/clamav/files/clamav-0.95.2-fno-strict-aliasing.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- configure.in -+++ configure.in -@@ -97,9 +97,15 @@ - AC_MSG_RESULT([ok (${gcc_version})]) - ;; - esac -+ case "${gcc_version}" in -+ [[56789]].* | 4.[[3456789]].*) - # bb #1581 - temporarely add -fno-strict-aliasing so gcc 4.4.0 - # works correctly - CFLAGS="$CFLAGS -fno-strict-aliasing" -+ ;; -+ *) -+ ;; -+ esac - fi - else - CFLAGS="$CFLAGS -O0" -- cgit v1.2.3-65-gdbad