ohnobinki_overlay Changeset - 19f4c26f9f62

Changeset - 19f4c26f9f62

Parent rev.

Child rev.

[Not reviewed]

default

1 2 2

Nathan Brink (binki) - 15 years ago 2011-03-26 21:13:33
ohnobinki@ohnopublishing.net

app-antivirus/clamav: Bump to clamav-0.97, trying to copy most changes from gentoo-x86.

(Portage version: 2.2.0_alpha27-r1/hg/Linux x86_64, signed Manifest commit with key 6BA81050)

5 files changed with 69 insertions and 72 deletions:

app-antivirus/clamav/ChangeLog

app-antivirus/clamav/Manifest

app-antivirus/clamav/clamav-0.97.ebuild

app-antivirus/clamav/files/clamav-0.95.1-nls.patch

app-antivirus/clamav/files/clamav-0.97-nls.patch

0 comments (0 inline, 0 general)

app-antivirus/clamav/ChangeLog

➞

Show inline comments

 # ChangeLog for app-antivirus/clamav
 # Copyright 1999-2011 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 2011; Nathan Phillip Brink (binki) <ohnobinki@ohnopublishing.net>
   -files/clamav-0.95.1-nls.patch, +clamav-0.97.ebuild,
   +files/clamav-0.97-nls.patch:
   Bump to clamav-0.97, trying to copy most changes from gentoo-x86.
 Mar 2011; Nathan Phillip Brink (binki) <ohnobinki@ohnopublishing.net>
   -clamav-0.96.1.ebuild:
   Drop old clamav-0.96.1, not in gentoo-x86 anymore.
 Dec 2010; Nathan Phillip Brink (binki) <ohnobinki@ohnopublishing.net>
   +clamav-0.96.5.ebuild:
   Bump to clamava-0.96.5.
 Dec 2010; Nathan Phillip Brink (binki) <ohnobinki@ohnopublishing.net>
   -clamav-0.95.2.ebuild, -clamav-0.95.3.ebuild:
   Drop clamav-0.95.2 and clamav-0.95.3, following the gentoo-x86 repo.
 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.
 Jul 2009; Nathan Phillip Brink (ohnobinki)
   <ohnobinki@ohnopublishing.net> clamav-0.95.2.ebuild,

app-antivirus/clamav/Manifest

➞

Show inline comments

 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
-AUX clamav-0.95.1-nls.patch 319 RMD160 403558e6e71e620da2092f80d1d5b450281cb468 SHA1 2ae10843856aa6d7fd9a42e92b8685a6e9e14fbf SHA256 7bba0e938ae577b2b338f1b48f0173a8ec7e3b6785893319fd044d77847d03ba
+AUX clamav-0.97-nls.patch 269 RMD160 038abf3964f555f909a33b627546a3260479f356 SHA1 c9bc151ff7c029718feae91f6e0d0f6b25bea337 SHA256 088b9edcdb678ce9c072042cf51266e061ab5f5ab0e8e42bd953242138c64fd1
 AUX clamav-milter.README.gentoo 1124 RMD160 4fb1e2d9b444874838bcea1071969ca6862fb15b SHA1 0b9b86a0e7732eaaf7f880859265754f7a4efd3a SHA256 5e7b142b68964bc3463b077e5698fa77cace45ea9612258b1e1849cee944dd11
 AUX clamav-milter.conf 166 RMD160 f14a4f94686862e5f92c2855c4f14e783609fbf9 SHA1 4c9d72f21b9ea2a804ded9bab41a3c9c49ff4bbd SHA256 7271da5d23d8b9cfbb0990c926a9a410988f6b15b6b966d992bb2f43a2350b43
 AUX clamav-milter.rc 2162 RMD160 f9c67517dd916653a85baa34ced0ed917190c2d2 SHA1 6bd00082bda0195e4b22b1e30c2d666bda67caf1 SHA256 e7a206184d3eba81b3669aa6ed372b0140cfa78a64e34a68389eeed2b7496c2c
 AUX clamav.logrotate 355 RMD160 f59cd8ce96da8210aa858ee59ee3b6940e3253a6 SHA1 5fbd9364997400681d5a93cb50cac8a0f188e56f SHA256 ab91f784d5098d2162be9277e3a006bdb392d9d89975838ad4ac7dfd8b418170
 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.96.5.tar.gz 41164924 RMD160 70c465548395301b83bb2f5428aa383825089af4 SHA1 a7253e30d40e0c03964a60ed589b356a115b26c5 SHA256 83a683d51eceb5aaf0c249efb3d9d95aa4fd8bbc1f05817ab7b1030f6d84d059
 DIST clamav-0.97.tar.gz 41834871 RMD160 bc37a2da03c1d8923da9f28a7e051f6e67db8603 SHA1 68f5a6736b3f67d608c4064ef839777877f09115 SHA256 ec5d88303c0a6e1d8e1354b68ae8c184faee7989aac11dfacff466d9e0471932
 EBUILD clamav-0.96.5.ebuild 4482 RMD160 742d2e71ef9343c58f2328b68d208e86e1f26494 SHA1 85eb9dd2d8ab388c467b2704af08b574b6913085 SHA256 7d97469ff105e47cb6f60203e6619f8cfa9f7d66426973658fe2dc2cc4d0792f
 MISC ChangeLog 49522 RMD160 69ffa440cde7c4f4e88c9534f31cca1310440042 SHA1 5cde78252ea13b0f22171e95010ff72bb5a5db1e SHA256 1d78c288d76804f0ff4cf5977845084df185b0fa1f23d2e00b467473f218cd2f
 EBUILD clamav-0.97.ebuild 4139 RMD160 35c151320b7900a3c9377d47c1a83eaf751ef656 SHA1 86741f66018a04708a4235c571c67e8518ebbec3 SHA256 9e58f83020aaa543992fc66919bd65f19dbe4a751354993556f8717bf8d29ba0
 MISC ChangeLog 49753 RMD160 2131d5af1e726c728ba8fced76dde2699f5d00e8 SHA1 2fa560e9323fc14a3cde050d08e22f16fa896a90 SHA256 82aacd763680e7021c5472c4f4363102a1ed1e0782f3232c4166af7d19d89a75
 MISC metadata.xml 320 RMD160 3546393e30d87f0b0a2fb17e2f15f57dd8c19661 SHA1 b959e38933418e6fc818ed40cd9a4921b8c66102 SHA256 e2a8c4c8bedbffe50a126c1c7395a4d92652c2d95347b9496d54aea1f230a22d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 iQIcBAEBCAAGBQJNirL5AAoJEHQ6UuhrqBBQ/RAP/1zUQZTyVI+eU3JpVotIa9wb
 gyKB5x/sE0k1kqHVVAmwhnemAnBS6Sa6954hpG/t9kftKVWrBtbMIrvo9QsKAHN1
 xDPVqQN1xj3lHLKZa8khM6QGmV1bNV8IOaqV0ywgdmmItNHg3h3J9llHSrmNcufx
 oqgE+FmbZLtpm6uWFUhuzjRCtSGEEK+1mr4ciKklW2qYpiuyonDJ5CgFM+wRjbA7
 JoPcalh/h/SkbNDTo3ZSV3+Z3qbpawvaCASyS4tFfWjEyM7Gzc1GCiLw67RtaHPb
 ggah6V5AA1aw1nLT4h4473C/XbSP7YgP1D+BXvKl5F0SCpdCLguDVZXOSczBbXxT
 uaw+J/2qbq72TXJVImxlUBjmO51ScN8XbgXeZLbLY32Sj/3Mv0+OWu3VqkZl6cmw
 IRCF2TWhHaIgw8K5vUUNlZNY3VOekBJWsPMrPGSFjGyRiRK/Ft5jvN+8KvnZZnIh
 xf/sWQ3xp2AN9w0rM5+/Lo3pbLve65lA3MabokscpDhXyLri8Mp/bWA2ZvKSuux2
 jvkKOy2ICRCm9S4n9F9eQNdrQpy2MA5nqcaaxldyZ1DMyOeY6AxkHlU+qPQ8ZVFG
 ++5QfWNrXC2Fc2SHcv3nCa1twrJKR0IReEpCX5FjlXqVnkEVGbTiIQPcrtYZhdt7
 puX+KdME0/wNG64Ve6fz
 =uYnB
 iQIcBAEBCAAGBQJNjo88AAoJEHQ6UuhrqBBQklAP/j9GHxvReNxpyyW1WOCKeiYD
 IGZtzdhnoUVKmSVAskiKBqKoxRR75FquE6LxxyjMbbr6CKLpKw4Qb2pQR3llz+h
 fgQhVpvEjUfUh39MOBMjeEwu4Q58NKAqik/nmjc6cM4+xgScvHgXiRuCnAiLOWfK
 wfWrMG34GwRO8BOH3rTcQlh+er/4pHzyXvqgcjN0of0nVlka+y83OQMB9m2/cg4D
 bbo9a8OoT6/m30ofmxNPvxRfG4CGXJRsu8Wm/ZGNJLHoUzqRiJX3wKjWDab7lRfb
 cUyldWBFa/kKXRZX2NwFlxQltF9Wvb4NGa7KBYDo+pzDoPih2z4xIuDr580bv5AZ
 hSNA2TIxMxSH3e2VEjTOskJ+8njkL9YFS8/hrxdrzsLJ+GZqtUgpkzaIhE3127Yt
 scfeUZNlI6WDvbnn6J3a5kn0vEq3xpFbtAz4aYce1mjwPe1j0mALfY/zJGAxu3kd
 aJ+X8EgFyrriOEPVeoi1Q0nBWjM1t3qmat/CSPaaTycPv+qOi29HnpXtY2z2UhD
 Wiea4R0MkbUqRq7sUwCCFMbmjHgmX67/kYRimWBpnUhN/1MfWcxyHY4jkluVHj0m
 BfdLk9rINNPADIR6tl341YLxbxnjXXFa4mHr8B3uWzDDniMdFFY340GlZvOjIXcW
 z/qsjvN6H3sBDhqX9rJS
 =IC5v
 -----END PGP SIGNATURE-----

app-antivirus/clamav/clamav-0.97.ebuild

➞

Show inline comments

-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.96.ebuild,v 1.7 2010/04/17 22:21:02 maekke Exp $
 # $Header: $
-EAPI=2
+EAPI=3
 inherit eutils flag-o-matic fixheadtails multilib versionator
 # for when rc1 is appended to release candidates:
 MY_P=${PN}-$(replace_version_separator 3 '')
 inherit eutils flag-o-matic
 DESCRIPTION="Clam Anti-Virus Scanner"
 HOMEPAGE="http://www.clamav.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="bzip2 clamdtop iconv milter selinux ipv6 test"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="bzip2 clamdtop iconv ipv6 milter selinux test"
 COMMON_DEPEND="bzip2? ( app-arch/bzip2 )
 CDEPEND="bzip2? ( app-arch/bzip2 )
 	clamdtop? ( sys-libs/ncurses )
 	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
 	iconv? ( virtual/libiconv )
 	clamdtop? ( sys-libs/ncurses )
 	sys-libs/zlib
 	sys-apps/sed
 	>=sys-libs/zlib-1.2.2
 	dev-libs/libtommath"
 DEPEND="${COMMON_DEPEND}
 	dev-util/pkgconfig
 DEPEND="${CDEPEND}
 	>=dev-util/pkgconfig-0.20
 	test? ( dev-libs/check )"
 RDEPEND="${COMMON_DEPEND}
 	selinux? ( sec-policy/selinux-clamav )
 	sys-apps/grep"
 PROVIDE="virtual/antivirus"
 S=${WORKDIR}/${MY_P}
 RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-clamav )"
 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.97-nls.patch
+}
 src_configure() {
 	has_version =sys-libs/glibc-2.2* && filter-lfs-flags
 	ht_fix_file configure
 	econf  \
 		--disable-experimental \
 		--enable-id-check \
 		--with-dbdir=/var/lib/clamav \
 		$(use_enable bzip2) \
 		$(use_enable test check) \
 		$(use_enable clamdtop) \
 		$(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
 		--disable-zlib-vcheck
+}
 src_install() {
 	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS BUGS NEWS README ChangeLog FAQ || die
 	rm -rf "${D}"/var/lib/clamav
 	dodoc AUTHORS BUGS ChangeLog FAQ INSTALL NEWS README UPGRADE || die
 	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 || die
 		newinitd "${FILESDIR}/clamav-milter.rc" clamav-milter || die
 	fi
 	keepdir /var/run/clamav || die
 	fowners clamav:clamav /var/run/clamav || die
 	keepdir /var/log/clamav || die
 	fowners clamav:clamav /var/log/clamav || die
 	for dir in lib run log; do
 		keepdir /var/${dir}/clamav || die "Can't create /var/${dir}/clamav"
 		fowners clamav:clamav /var/${dir}/clamav || die
 	done
 	# Modify /etc/clamd.conf to be usable out of the box
+	# Modify /etc/{clamd,freshclam}.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 || 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 || 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 || 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 || die
 	fi
 	if use milter ; then
 		cat << EOF >> "${D}"/etc/conf.d/clamd || die
 MILTER_NICELEVEL=19
 START_MILTER=no
 EOF
 	fi
 	diropts ""
 	dodir /etc/logrotate.d || die
 	insopts -m0644
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}"/${PN}.logrotate ${PN} || die
+}
 pkg_postinst() {
 	ewarn
 	ewarn "Since clamav-0.97, signatures are not installed anymore. If you are"
 	ewarn "installing for the first time or upgrading from a version older"
 	ewarn "than clamav-0.97 you must download the newest signatures by"
 	ewarn "executing: /usr/bin/freshclam"
 	ewarn
 	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
 		elog "For simple instructions how to setup the clamav-milter read the"
 		elog "clamav-milter.README.gentoo in /usr/share/doc/${PF}"
 	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."
+}

app-antivirus/clamav/files/clamav-0.95.1-nls.patch

➞

Show inline comments

deleted file

app-antivirus/clamav/files/clamav-0.97-nls.patch

➞

Show inline comments

@@ new file 100644 @@
 --- 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>

0 comments (0 inline, 0 general)