ohnobinki_overlay Changeset - abc03e43976b

Changeset - abc03e43976b

Parent rev.

Child rev.

[Not reviewed]

default

0 2 1

Nathan Brink (binki) - 16 years ago 2010-03-13 02:36:08
ohnobinki@ohnopublishing.net

app-antivirus/clamav: Bump to clamav-0.95.3. Leave 0.95.2 in case if there are regressions.

3 files changed with 37 insertions and 30 deletions:

app-antivirus/clamav/ChangeLog

app-antivirus/clamav/Manifest

app-antivirus/clamav/clamav-0.95.3.ebuild

0 comments (0 inline, 0 general)

app-antivirus/clamav/ChangeLog

➞

Show inline comments

 # ChangeLog for app-antivirus/clamav
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.308 2008/09/13 22:48:04 dertobi123 Exp $
 Mar 2010; Nathan Phillip Brink (ohnobinki)
   <ohnobinki@ohnopublishing.net> +clamav-0.95.3.ebuild:
   Bump to clamav-0.95.3. Leave 0.95.2 in case if there are regressions.
 Mar 2010; Nathan Phillip Brink (ohnobinki)
   <ohnobinki@ohnopublishing.net> -clamav-0.94.2.ebuild,
   -clamav-0.94.2-r1.ebuild, -files/clamav-0.94.2-buildfix.patch,
   -files/clamav-0.94.2-nls.patch:
   Remove old versions.

app-antivirus/clamav/Manifest

➞

Show inline comments

@@ @@ -6,9 +6,11 @@ AUX clamav.logrotate 355 RMD160 f59cd8ce @@
 AUX clamd.conf 55 RMD160 2ffd4914654469ee0178ebd33b6c8753b691f90a SHA1 4e7df38ed3fb0a76ca3dc49d65d5d4846a759a94 SHA256 3e6d26f3cc0b8b33b990de47bdb856e0651e69150ef803d4b0bb60fdb2506fd8
 AUX clamd.rc 1746 RMD160 0158e536289796660479e0aed28ff002b4054923 SHA1 3edad93b30164d7eaa5021daa699f65c7a99dc48 SHA256 d897b1425f21af30ccc6c2f3e0720dabd90271ba66cec483d1aecde4c779c4e0
 AUX freshclam.conf 64 RMD160 39f5a64cadb0f766605b62a2019303b0ef6b0a36 SHA1 8d112cd09865174b7fc96ff4f415c881eab902e1 SHA256 95b8c1aed21f8eafe911d3c8f21a57b1212f7abeb8de32d29aa3cb9248c17c3b
 AUX freshclam.rc 1070 RMD160 cdd42aa9b9999e3c53e3f28443fb0bdf024c426f SHA1 9fc65761d9d9dbb8565d9abb5e634d73304ceede SHA256 436ddaf181cfb3bc84ad6f7a1858fbb5353ad079405016094b4fc0008b7ce28c
 AUX lib-ld.m4 3417 RMD160 7b412510e7ef9966f70ed29937e3556283128a9b SHA1 8b72b8f5f76e41e4ca0f2521c06c568490894a84 SHA256 18c4c458009da32c9daf0ea332a539e5edc82ba009b6c2faac004626313f00e5
 DIST clamav-0.95.2.tar.gz 25137010 RMD160 83cab51c224251316288e4c3189ba91f640e9f82 SHA1 7544b39d84f2233b984a9c2ce3ef74d407add483 SHA256 f5f2a5a9984fd1ade69a7c2cc78da2f5dc0c505f94ab58fb2aa6613399ab1c56
 DIST clamav-0.95.3.tar.gz 26919541 RMD160 c68a2948aa9ab7a3b5f8e9744322d3606ae6df71 SHA1 ab4b1f49d0f24154767d303d6a27b74acf6f4b59 SHA256 003e7a570932fdffbd19fa7a7996274fbfc93f890d26c3066a36eb824c906250
 EBUILD clamav-0.95.2.ebuild 4363 RMD160 e4d089f72a56fd09022bbd794b380def005bab0a SHA1 8a75afedb78cd01fcf3c4598d1ff18e85abd61e7 SHA256 3604c4464785ae13c33e71e41873ba24218de724c89c92c0c0991b669934a345
 MISC ChangeLog 48642 RMD160 99b8db68505b988dbc293ecc387097cd7c2cbb35 SHA1 d136107934968e3a37119ab5bc2b19be4a8395ca SHA256 eb09dc8763074169b3dd6c6221938deb168a5d3fe2e962e910186583a39a0b71
 EBUILD clamav-0.95.3.ebuild 4500 RMD160 93080f10dfa5c1151a796174291060aaa5654998 SHA1 bbc6054bdd687ff3c97b6a953d279572f6ea8d68 SHA256 96b7069ea3e24cc97101d85ab13edb3310d10d19e31ede60b9e405e103321b23
 MISC ChangeLog 49046 RMD160 92f4c1775a2c36b0d707b02b4b3cc6798f000e2a SHA1 04221739a3cba3a486da6907a5d098e62ce5eebe SHA256 ab4fc00a4b8ea0218e17e9d09461dc44c0d4a1d394c3eda26be2f50e2ad859b4
 MISC metadata.xml 320 RMD160 3546393e30d87f0b0a2fb17e2f15f57dd8c19661 SHA1 b959e38933418e6fc818ed40cd9a4921b8c66102 SHA256 e2a8c4c8bedbffe50a126c1c7395a4d92652c2d95347b9496d54aea1f230a22d

app-antivirus/clamav/clamav-0.95.3.ebuild

➞

Show inline comments

-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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.ebuild,v 1.5 2009/06/27 14:15:58 ranger 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}"
 MY_P=${PN}-${MY_PV}
 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="~amd64"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="bzip2 clamdtop iconv milter selinux ipv6 test"
 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
 	sys-libs/zlib
 	sys-apps/sed
 	dev-libs/libtommath"
 DEPEND="${COMMON_DEPEND}
-	>=dev-util/pkgconfig-0.20
 	dev-util/pkgconfig
 	test? ( dev-libs/check )"
 RDEPEND="${COMMON_DEPEND}
 	selinux? ( sec-policy/selinux-clamav )
 	sys-apps/grep"
 PROVIDE="virtual/antivirus"
 S=${WORKDIR}/${MY_P}
 pkg_setup() {
 	enewgroup clamav
 	enewuser clamav -1 -1 /dev/null clamav
+}
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.95.1-nls.patch"
+	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 test check) \
 		$(use_enable ipv6) \
 		$(use_enable clamdtop) \
 		$(use_enable milter) \
 		$(use_with iconv) \
 		--with-system-tommath \
 		--without-libpdcurses-prefix \
 		--disable-experimental \
 		--enable-id-check \
 		--disable-zlib-vcheck \
-		--with-dbdir=/var/lib/clamav || die
 		--with-dbdir=/var/lib/clamav
+}
 src_install() {
 	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS BUGS NEWS README ChangeLog FAQ
+	dodoc AUTHORS BUGS NEWS README ChangeLog FAQ || die
 	newconfd "${FILESDIR}/clamd.conf" clamd
 	newinitd "${FILESDIR}/clamd.rc" clamd
 	newconfd "${FILESDIR}/freshclam.conf" freshclam
 	newinitd "${FILESDIR}/freshclam.rc" freshclam
 	newconfd "${FILESDIR}/clamd.conf" clamd || die
 	newinitd "${FILESDIR}/clamd.rc" clamd || die
 	newconfd "${FILESDIR}/freshclam.conf" freshclam || die
 	newinitd "${FILESDIR}/freshclam.rc" freshclam || die
 	if use milter; then
 		newconfd "${FILESDIR}/clamav-milter.conf" clamav-milter
 		newinitd "${FILESDIR}/clamav-milter.rc" clamav-milter
 		newconfd "${FILESDIR}/clamav-milter.conf" clamav-milter || die
 		newinitd "${FILESDIR}/clamav-milter.rc" clamav-milter || die
 	fi
 	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
 	keepdir /var/run/clamav || die
 	fowners clamav:clamav /var/run/clamav || die
 	keepdir /var/log/clamav || die
 	fowners clamav:clamav /var/log/clamav || die
 	# 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
+		"${D}"/etc/clamd.conf || die
 	# 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
+		"${D}"/etc/freshclam.conf || die
 	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"
+		dodoc "${FILESDIR}"/clamav-milter.README.gentoo || die
 		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
+			"${D}"/etc/clamav-milter.conf || die
 	fi
 	if use milter ; then
 		cat << EOF >> "${D}"/etc/conf.d/clamd
+		cat << EOF >> "${D}"/etc/conf.d/clamd || die
 MILTER_NICELEVEL=19
 START_MILTER=no
 EOF
 	fi
 	diropts ""
 	dodir /etc/logrotate.d
+	dodir /etc/logrotate.d || die
 	insopts -m0644
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}"/${PN}.logrotate ${PN}
+	newins "${FILESDIR}"/${PN}.logrotate ${PN} || die
+}
 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}"

0 comments (0 inline, 0 general)