diff options
author | Thomas Raschbacher <lordvan@gentoo.org> | 2014-01-27 12:32:56 +0000 |
---|---|---|
committer | Thomas Raschbacher <lordvan@gentoo.org> | 2014-01-27 12:32:56 +0000 |
commit | c85f6947f283071a432f15edcd83620aac4af560 (patch) | |
tree | 8eb561fdb997f44bb862360ae2e0571b321bdc3d /app-antivirus | |
parent | Clean out old versions and remove unused patches. (diff) | |
download | gentoo-2-c85f6947f283071a432f15edcd83620aac4af560.tar.gz gentoo-2-c85f6947f283071a432f15edcd83620aac4af560.tar.bz2 gentoo-2-c85f6947f283071a432f15edcd83620aac4af560.zip |
cleanout and version bump
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key )
Diffstat (limited to 'app-antivirus')
-rw-r--r-- | app-antivirus/clamav/ChangeLog | 11 | ||||
-rw-r--r-- | app-antivirus/clamav/clamav-0.97.7.ebuild | 120 | ||||
-rw-r--r-- | app-antivirus/clamav/clamav-0.97.8.ebuild | 120 | ||||
-rw-r--r-- | app-antivirus/clamav/clamav-0.98.1.ebuild (renamed from app-antivirus/clamav/clamav-0.97.8-r2.ebuild) | 31 | ||||
-rw-r--r-- | app-antivirus/clamav/files/clamav-0.97-nls.patch | 11 |
5 files changed, 28 insertions, 265 deletions
diff --git a/app-antivirus/clamav/ChangeLog b/app-antivirus/clamav/ChangeLog index addf2d3fcd3d..c85fd4d3f80e 100644 --- a/app-antivirus/clamav/ChangeLog +++ b/app-antivirus/clamav/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-antivirus/clamav -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.470 2013/12/24 16:55:00 ago Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.471 2014/01/27 12:32:56 lordvan Exp $ + +*clamav-0.98.1 (27 Jan 2014) + + 27 Jan 2014; <lordvan@gentoo.org> -clamav-0.97.7.ebuild, + -clamav-0.97.8.ebuild, -clamav-0.97.8-r2.ebuild, +clamav-0.98.1.ebuild, + -files/clamav-0.97-nls.patch: + cleanout old versions and version bump to 0.98.1 - fixes bug #498354 24 Dec 2013; Agostino Sarubbo <ago@gentoo.org> clamav-0.97.8-r2.ebuild: Stable for ppc64, wrt bug #480038 diff --git a/app-antivirus/clamav/clamav-0.97.7.ebuild b/app-antivirus/clamav/clamav-0.97.7.ebuild deleted file mode 100644 index c1407e644d96..000000000000 --- a/app-antivirus/clamav/clamav-0.97.7.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.97.7.ebuild,v 1.11 2013/10/09 11:28:32 xarthisius Exp $ - -EAPI=5 - -inherit eutils flag-o-matic user - -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 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" -IUSE="bzip2 clamdtop iconv ipv6 milter selinux static-libs uclibc" - -CDEPEND="bzip2? ( app-arch/bzip2 ) - clamdtop? ( sys-libs/ncurses ) - iconv? ( virtual/libiconv ) - milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) - dev-libs/libtommath - >=sys-libs/zlib-1.2.2 - sys-devel/libtool" -DEPEND="${CDEPEND} - virtual/pkgconfig" -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-clamav )" - -RESTRICT="test" - -DOCS=( AUTHORS BUGS ChangeLog FAQ INSTALL NEWS README UPGRADE ) - -pkg_setup() { - enewgroup clamav - enewuser clamav -1 -1 /dev/null clamav -} - -src_prepare() { - use ppc64 && append-flags -mminimal-toc - use uclibc && export ac_cv_type_error_t=yes - epatch "${FILESDIR}"/${PN}-0.97-nls.patch -} - -src_configure() { - econf \ - --disable-experimental \ - --enable-id-check \ - --with-dbdir="${EPREFIX}"/var/lib/clamav \ - --with-system-tommath \ - --with-zlib="${EPREFIX}"/usr \ - $(use_enable bzip2) \ - $(use_enable clamdtop) \ - $(use_enable ipv6) \ - $(use_enable milter) \ - $(use_enable static-libs static) \ - $(use_with iconv) -} - -src_install() { - default - - rm -rf "${ED}"/var/lib/clamav - newinitd "${FILESDIR}"/clamd.initd-r3 clamd - newconfd "${FILESDIR}"/clamd.conf clamd - - keepdir /var/lib/clamav - fowners clamav:clamav /var/lib/clamav - keepdir /var/log/clamav - fowners clamav:clamav /var/log/clamav - - dodir /etc/logrotate.d - insinto /etc/logrotate.d - newins "${FILESDIR}"/clamav.logrotate clamav - - # Modify /etc/{clamd,freshclam}.conf to be usable out of the box - sed -i -e "s:^\(Example\):\# \1:" \ - -e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/clamd.pid:" \ - -e "s:.*\(LocalSocket\) .*:\1 ${EPREFIX}/var/run/clamav/clamd.sock:" \ - -e "s:.*\(User\) .*:\1 clamav:" \ - -e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamd.log:" \ - -e "s:^\#\(LogTime\).*:\1 yes:" \ - -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \ - "${ED}"/etc/clamd.conf - sed -i -e "s:^\(Example\):\# \1:" \ - -e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/freshclam.pid:" \ - -e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \ - -e "s:^\#\(UpdateLogFile\) .*:\1 ${EPREFIX}/var/log/clamav/freshclam.log:" \ - -e "s:^\#\(NotifyClamd\).*:\1 ${EPREFIX}/etc/clamd.conf:" \ - -e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \ - -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \ - "${ED}"/etc/freshclam.conf - - if use milter ; then - # 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 ${EPREFIX}/var/run/clamav/clamav-milter.pid:" \ - -e "s+^\#\(ClamdSocket\) .*+\1 unix:${EPREFIX}/var/run/clamav/clamd.sock+" \ - -e "s:.*\(User\) .*:\1 clamav:" \ - -e "s+^\#\(MilterSocket\) /.*+\1 unix:${EPREFIX}/var/run/clamav/clamav-milter.sock+" \ - -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \ - -e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamav-milter.log:" \ - "${ED}"/etc/clamav-milter.conf - cat > "${ED}"/etc/conf.d/clamd <<-EOF - MILTER_NICELEVEL=19 - START_MILTER=no - EOF - fi - - prune_libtool_files --all -} - -pkg_postinst() { - if use milter ; then - elog "For simple instructions how to setup the clamav-milter read the" - elog "clamav-milter.README.gentoo in /usr/share/doc/${PF}" - fi -} diff --git a/app-antivirus/clamav/clamav-0.97.8.ebuild b/app-antivirus/clamav/clamav-0.97.8.ebuild deleted file mode 100644 index d5bac2d7fcb7..000000000000 --- a/app-antivirus/clamav/clamav-0.97.8.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.97.8.ebuild,v 1.5 2013/11/29 09:06:23 pinkbyte Exp $ - -EAPI=5 - -inherit eutils flag-o-matic user - -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 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" -IUSE="bzip2 clamdtop iconv ipv6 milter selinux static-libs uclibc" - -CDEPEND="bzip2? ( app-arch/bzip2 ) - clamdtop? ( sys-libs/ncurses ) - iconv? ( virtual/libiconv ) - milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) - dev-libs/libtommath - >=sys-libs/zlib-1.2.2 - sys-devel/libtool" -DEPEND="${CDEPEND} - virtual/pkgconfig" -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-clamav )" - -RESTRICT="test" - -DOCS=( AUTHORS BUGS ChangeLog FAQ INSTALL NEWS README UPGRADE ) - -pkg_setup() { - enewgroup clamav - enewuser clamav -1 -1 /dev/null clamav -} - -src_prepare() { - use ppc64 && append-flags -mminimal-toc - use uclibc && export ac_cv_type_error_t=yes - epatch "${FILESDIR}"/${PN}-0.97-nls.patch -} - -src_configure() { - econf \ - --disable-experimental \ - --enable-id-check \ - --with-dbdir="${EPREFIX}"/var/lib/clamav \ - --with-system-tommath \ - --with-zlib="${EPREFIX}"/usr \ - $(use_enable bzip2) \ - $(use_enable clamdtop) \ - $(use_enable ipv6) \ - $(use_enable milter) \ - $(use_enable static-libs static) \ - $(use_with iconv) -} - -src_install() { - default - - rm -rf "${ED}"/var/lib/clamav - newinitd "${FILESDIR}"/clamd.initd-r5 clamd - newconfd "${FILESDIR}"/clamd.conf clamd - - keepdir /var/lib/clamav - fowners clamav:clamav /var/lib/clamav - keepdir /var/log/clamav - fowners clamav:clamav /var/log/clamav - - dodir /etc/logrotate.d - insinto /etc/logrotate.d - newins "${FILESDIR}"/clamav.logrotate clamav - - # Modify /etc/{clamd,freshclam}.conf to be usable out of the box - sed -i -e "s:^\(Example\):\# \1:" \ - -e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/clamd.pid:" \ - -e "s:.*\(LocalSocket\) .*:\1 ${EPREFIX}/var/run/clamav/clamd.sock:" \ - -e "s:.*\(User\) .*:\1 clamav:" \ - -e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamd.log:" \ - -e "s:^\#\(LogTime\).*:\1 yes:" \ - -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \ - "${ED}"/etc/clamd.conf - sed -i -e "s:^\(Example\):\# \1:" \ - -e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/freshclam.pid:" \ - -e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \ - -e "s:^\#\(UpdateLogFile\) .*:\1 ${EPREFIX}/var/log/clamav/freshclam.log:" \ - -e "s:^\#\(NotifyClamd\).*:\1 ${EPREFIX}/etc/clamd.conf:" \ - -e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \ - -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \ - "${ED}"/etc/freshclam.conf - - if use milter ; then - # 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 ${EPREFIX}/var/run/clamav/clamav-milter.pid:" \ - -e "s+^\#\(ClamdSocket\) .*+\1 unix:${EPREFIX}/var/run/clamav/clamd.sock+" \ - -e "s:.*\(User\) .*:\1 clamav:" \ - -e "s+^\#\(MilterSocket\) /.*+\1 unix:${EPREFIX}/var/run/clamav/clamav-milter.sock+" \ - -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \ - -e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamav-milter.log:" \ - "${ED}"/etc/clamav-milter.conf - cat > "${ED}"/etc/conf.d/clamd <<-EOF - MILTER_NICELEVEL=19 - START_MILTER=no - EOF - fi - - prune_libtool_files --all -} - -pkg_postinst() { - if use milter ; then - elog "For simple instructions how to setup the clamav-milter read the" - elog "clamav-milter.README.gentoo in /usr/share/doc/${PF}" - fi -} diff --git a/app-antivirus/clamav/clamav-0.97.8-r2.ebuild b/app-antivirus/clamav/clamav-0.98.1.ebuild index b9d0e9ef861f..871c79d6daeb 100644 --- a/app-antivirus/clamav/clamav-0.97.8-r2.ebuild +++ b/app-antivirus/clamav/clamav-0.98.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.97.8-r2.ebuild,v 1.6 2013/12/24 16:55:00 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.98.1.ebuild,v 1.1 2014/01/27 12:32:56 lordvan Exp $ EAPI=5 @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" IUSE="bzip2 clamdtop iconv ipv6 milter selinux static-libs uclibc" CDEPEND="bzip2? ( app-arch/bzip2 ) @@ -27,8 +27,6 @@ DEPEND="${CDEPEND} RDEPEND="${CDEPEND} selinux? ( sec-policy/selinux-clamav )" -RESTRICT="test" - DOCS=( AUTHORS BUGS ChangeLog FAQ INSTALL NEWS README UPGRADE ) pkg_setup() { @@ -39,12 +37,12 @@ pkg_setup() { src_prepare() { use ppc64 && append-flags -mminimal-toc use uclibc && export ac_cv_type_error_t=yes - epatch "${FILESDIR}"/${PN}-0.97-nls.patch } src_configure() { econf \ --disable-experimental \ + --disable-fanotify \ --enable-id-check \ --with-dbdir="${EPREFIX}"/var/lib/clamav \ --with-system-tommath \ @@ -61,8 +59,8 @@ src_install() { default rm -rf "${ED}"/var/lib/clamav - newinitd "${FILESDIR}"/clamd.initd-r5 clamd - newconfd "${FILESDIR}"/clamd.conf clamd + newinitd "${FILESDIR}"/clamd.initd-r6 clamd + newconfd "${FILESDIR}"/clamd.conf-r1 clamd systemd_dotmpfilesd "${FILESDIR}/tmpfiles.d/clamav.conf" systemd_newunit "${FILESDIR}/clamd_at.service" "clamd@.service" @@ -86,7 +84,7 @@ src_install() { -e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamd.log:" \ -e "s:^\#\(LogTime\).*:\1 yes:" \ -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \ - "${ED}"/etc/clamd.conf + "${ED}"/etc/clamd.conf.sample || die sed -i -e "s:^\(Example\):\# \1:" \ -e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/freshclam.pid:" \ -e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \ @@ -94,7 +92,7 @@ src_install() { -e "s:^\#\(NotifyClamd\).*:\1 ${EPREFIX}/etc/clamd.conf:" \ -e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \ -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \ - "${ED}"/etc/freshclam.conf + "${ED}"/etc/freshclam.conf.sample || die if use milter ; then # MilterSocket one to include ' /' because there is a 2nd line for @@ -107,8 +105,8 @@ src_install() { -e "s+^\#\(MilterSocket\) /.*+\1 unix:${EPREFIX}/var/run/clamav/clamav-milter.sock+" \ -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \ -e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamav-milter.log:" \ - "${ED}"/etc/clamav-milter.conf - cat > "${ED}"/etc/conf.d/clamd <<-EOF + "${ED}"/etc/clamav-milter.conf.sample || die + cat >> "${ED}"/etc/conf.d/clamd <<-EOF MILTER_NICELEVEL=19 START_MILTER=no EOF @@ -116,6 +114,11 @@ src_install() { systemd_dounit "${FILESDIR}/clamav-milter.service" fi + for i in clamd freshclam clamav-milter + do + [[ -f "${D}"/etc/"${i}".conf.sample ]] && mv "${D}"/etc/"${i}".conf{.sample,} + done + prune_libtool_files --all } @@ -124,4 +127,8 @@ pkg_postinst() { elog "For simple instructions how to setup the clamav-milter read the" elog "clamav-milter.README.gentoo in /usr/share/doc/${PF}" fi + if test -z $(find "${ROOT}"var/lib/clamav -maxdepth 1 -name 'main.c*' -print -quit) ; then + ewarn "You must run freshclam manually to populate the virus database files" + ewarn "before starting clamav for the first time.\n" + fi } diff --git a/app-antivirus/clamav/files/clamav-0.97-nls.patch b/app-antivirus/clamav/files/clamav-0.97-nls.patch deleted file mode 100644 index 6ca0c0e91bfe..000000000000 --- a/app-antivirus/clamav/files/clamav-0.97-nls.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- clamav-0.97/shared/output.c.orig -+++ clamav-0.97/shared/output.c -@@ -63,7 +63,7 @@ - pthread_mutex_t mdprintf_mutex = PTHREAD_MUTEX_INITIALIZER; - #endif - --#ifdef C_LINUX -+#if defined(C_LINUX) && defined(HAVE_LIBINTL_H) - #include <libintl.h> - #include <locale.h> - |