Be nice to gentoo/bsd - bug #459686

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0x77F1F175586A3B1F

4 files changed, 267 insertions, 5 deletions

diff --git a/app-antivirus/clamav/ChangeLog b/app-antivirus/clamav/ChangeLog
index 75fdd9c8660a..cea839019f2e 100644
--- a/app-antivirus/clamav/ChangeLog
+++ b/app-antivirus/clamav/ChangeLog
@@ -1,6 +1,12 @@
 # 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.441 2013/02/26 14:50:41 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.442 2013/03/01 08:18:17 eras Exp $
+
+*clamav-0.97.6-r3 (01 Mar 2013)
+
+  01 Mar 2013; Eray Aslan <eras@gentoo.org> +clamav-0.97.6-r3.ebuild,
+  +files/clamd.initd-r3:
+  Be nice to gentoo/bsd - bug #459686
 
   26 Feb 2013; Jeroen Roovers <jer@gentoo.org> clamav-0.97.6-r2.ebuild:
   Stable for HPPA (bug #457144).
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index 204f02e15892..d14d48538f5c 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -8,18 +8,30 @@ AUX clamd.conf 234 SHA256 17bf4fe3596dc5b145e4163d85181e2edcaa214df3cf9072d852ba
 AUX clamd.initd 2991 SHA256 c4bd4b52599f2ee1ff40dd9d3ce95e2028d20ac6e1195d89aab0f502fb983a2f SHA512 399ec886ebfb56653473854f2806dad3e801eed09afc4ad0ed0cf5ea6773945213ba25203f8ea312cfad2b1e684c8921ec4d096af6235306e4ee5a36192e92d5 WHIRLPOOL 250f30bdc9074a17782e4e9e62dc1917b4bd156dec25ed85b2b3818b0638b5395f2d942f3d5d04794228eab45ffa2defe2f61a6a176891b5161892647a119609
 AUX clamd.initd-r1 3005 SHA256 b4c0f380a8138b93becf9d33d50047f8ef4c165e64a8e5b156181fd7af40067e SHA512 46eaee71e17c741114dcddaec8ab1af067da81181835c3621da9f0d55fa7d4334108b31bbe65a4a248109a318a5016234b4f2d877e6f425665d1b16ae5c940a0 WHIRLPOOL d75b3d66cd6185ae6df9d66aeed167f22f8069dd0c6fbc7eb1c76ef2de7eadc6396772c5a2a3dd86af87bdd4edfafefe53aad607b4c12824e87b3da0067a6d01
 AUX clamd.initd-r2 3021 SHA256 d7f67aa61f8a93b5f94828b3f3f0c345ed9881a0550cb151274f42f81ce1b59e SHA512 095519b09ee617d587488f32e665f37e052e490913929027c3913a776fe3becdc6f4ee246d24b7494cc9bae65dc6ea2772c6199859d8ac22b1baf64969eb9eab WHIRLPOOL b6ff853682b4678667459ba8d6b95ddb7bc811de4e9a41ff5d6b84f986a12231fd2cbaf42f5e4e82cece335966d25165b4b05df3a4ea5cdbda43eefc1a4fe1be
+AUX clamd.initd-r3 3118 SHA256 68bfcbd582667c719b81a7f0c396de9733bc5efefa4e7b8dd3fc0c02dfcea887 SHA512 9a173f4eef3ef173b6267a7753acd221773ad22fc2b689e8e842783ea787a18ee5990607ebd434a0ad9e45a0347ad8f7ba40935456e4f336cf2b3dcbc09c9f46 WHIRLPOOL d5cd66a07937af859307ca5b22012c33dc3a2c767d42244e9cd5b28a13c235340d604d10baf30f134a74965ba4bec552b943fc659e90952d650387a867633f18
 DIST clamav-0.97.5.tar.gz 14754465 SHA256 db6c5e1a5ec8ca0b8006cf82661d3158d3365ba1b4bc14c03c5d0bca89a93c0d SHA512 618ef2f1d256f2e3cd76beaf92b76d9df0963d449c2d80885ed6039f4edd59ddf9a73ebe0b93549c62264d7df4ac918d306d631f8c0b1df8e47a7e763550f1cc WHIRLPOOL 7d148323a4510acfe706a17f27c12bd808a013aa91807257b03af83e4a6daeb619962243689eee5614ce2922dfa39d21ae357d2509617be4642f162ac91d5d7e
 DIST clamav-0.97.6.tar.gz 14765896 SHA256 a15a2bb9200ac9f2c6f1c5e1072ac265a2c4fe5a9be4663b47d076afdfa123f8 SHA512 f897f4c70c7555d1ede480b089f73020501bceb1d5de568785b842d04f35ee0771213b8050ac6159dde1f19816ab9a8373e8bcb419106eeeb701a386932d96e7 WHIRLPOOL 1a4916592843a3568ebef78663f76e8eba96b7d561bd61199ad1e15b239fc4c2bb3c25dcc49fad713cd09fb221ab83e9e7b1ba923ed71220943eec78dc04fb16
 EBUILD clamav-0.97.5-r1.ebuild 3808 SHA256 9f8df7badb53c741e213140df5f7b17c423f583816bbb18e977c2f1f60f8472d SHA512 6d67c726a98b0778e9ca864f372ed2fd1e9c131f859f6e43031e370a12016beb8a5ec199592f49503008bff7eee0793f5e6033d2911df5ff30053f970697374e WHIRLPOOL db10d814acbed42e22d9d2b9b6d2bd3ead058ce55ba650f5a1c68c57efe31caf21174023314fa8d82c91ae0de5cebe96c14a254ff9b1966d469ea5e4905a2734
 EBUILD clamav-0.97.6-r1.ebuild 3812 SHA256 896051a7a4a96e4aae8b833df155a57fbc0364bf1554f80fe90b998e42d6a16c SHA512 3dfeeee7124d4cc03c3adc76bbca1b63e1f9d108237d6dbde88458a582de8503eca60c2ae5af5314ba78af00370eecf7ed5dec8b5ba2bfb963794c126b3d0568 WHIRLPOOL 9ff0ec2e759b9dba92e1b867756ce9922b026278bd157271f50266ebd328d586ae3e5286769b1ab0ed7eadf583695b087f786d5012852580327996b99adddbbb
 EBUILD clamav-0.97.6-r2.ebuild 3803 SHA256 353440155e0eae9939f9bc838406b7e57dcdbde6e75499f215a02af098949452 SHA512 0257c8ec375b8db2e20251887820ef115baefe750516800d399b6256819680eed9b3ef626b5d311a4de6a3fb98b53f813f31ba2fe302478294f2606b6c021959 WHIRLPOOL b8d2beb4907e17e602b985b2fee7aad9f301496e8f78b68990e7b6efd5ae443466b23b97907d14b04d204e4e4de2b01250d24ef91b011c58ebac1902816ba034
+EBUILD clamav-0.97.6-r3.ebuild 3812 SHA256 eac8b54c1410560e9a463bdb183235bc4008a0f79705b8c53762cf1eda9e7d06 SHA512 9045c26a2feceb9c5527784334ce26ac332dde74f3ec8d018676bea20e0548c6257d57b27ac7e1b4e09f14b7eb6ad45eeffbbc00dee3432268c30d9a857611a5 WHIRLPOOL 73ce429ff0fe71ca8e6a5a07ca6ceee631ddc6fdd865b7ec2d15bbadd14e8927a6a51be8ebd065faecfededa3fbef1c257a5ccd2ea7a11d9a4609713f69c8313
 EBUILD clamav-0.97.6.ebuild 3822 SHA256 29cf66c65d5aae9d8c0c56a9148e6e7c68e287a6dd4debaa5a9dc8393bf1b9b9 SHA512 f07cfc81bcc769499583ace5a712ca0aa7b3d3ae8edef4707774bf647ba4708c4bcebc191dd71fe62e19736dc8df28568a96403f833ad50b4a65b6af7e6298ef WHIRLPOOL 76e9cbd0728111366181573d6d4e78535a77141fd813940cb4228715861ff540141cfdcc2c3bb007a505e1856c5768dad0997ee6816e7df87ea23d832eec6135
-MISC ChangeLog 64414 SHA256 7348069f8f7b671229a81c9561783fcce8c056259de988b7fb4bb8f1bd8ba038 SHA512 b825c5b065eb0f490b4b091fac03faa86b9c6fb19294d233f305c529f5e72f2432c18db95bd986d5eb3b3d8d52ff4ef4d85fb72cbd6865fcca535efec3ef44dc WHIRLPOOL 975c7685cb374a8f946c45c7f214bd16610307caabec75015d2c414838952c533b9b4103693f43e470227234d04fe74ac7263bd55db482f5a3f010851025b395
+MISC ChangeLog 64582 SHA256 433f553e42d1d52de2a4ceee98ed00f900f902c0f091d5460d1f0446b181406b SHA512 417e4f489cc5bb3a22bb74c6e2e9aab25fdc84b171b9df1dcb43755f3ad1d19ecbab85d4580bcff6bd06f0dcdbe03044407c9a2d71e7fd3056df9412a2a30de4 WHIRLPOOL 63e5031c4a8eaeefa73d3a80fa5a3a2fdd06b0982e0023c0e0a1001ecc4aedd2b8d0743eb2bf729033ed00898ecc4b1d44f34745a226781b51730932b7ff6810
 MISC metadata.xml 320 SHA256 e2a8c4c8bedbffe50a126c1c7395a4d92652c2d95347b9496d54aea1f230a22d SHA512 c5bb20c993b91112d9c9e0b7bb6c116ac7f711c769084eaaacc28bc7eeb54db09c9794c6ef057747d80a08cf1502f0f688cdefc741423a38da55b2deaebd6476 WHIRLPOOL 741ff80258dee2c145d08f72f10982bd5c1fcba44ed84054cd1a33787864a7d8821b432c3246ad5a04ce11edde7d045f3eb6e056200e3bd2e8505eeea3d7277d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEsy8IACgkQVWmRsqeSphN0jwCeJQu1j6o0QWVRrpZ4SAnjA9ax
-9SkAn2eeKcWheOLoCyeS+XU7tEzc5u/i
-=Ub93
+iQIcBAEBCAAGBQJRMGRUAAoJEHfx8XVYajsfNZAP/ixZhu7mZelM2ca+o4HyfBk7
+sD8wru9nZr9CQDZN3Whurog/0oAz71mhhqyQIvnzdYcCL88ld1mqDmcbqDhw7k+4
+J6U7Kd0l5WW2pIBRNiEu8Pt+6kLkqm3o09Ma2SnprPz0HuIOmFqrBv/PhF+s0plJ
+DhyZta/f2ek7hz+WevLe14CXtTaxRc7Fh4zfUUyeuiFZLWjaQNLlcfZAEu62ehOG
+eGd3+bDERSiAJQP0zwLwaLBZzmK0oYljUEpQu2k5p3f2CTcrKxTky70Cetdwt+ad
+v0GaNIUKDF6prgpR0hO2Wa7zLLzrxWlB2Dh61wHRH5XSJjbPdYYFiEc7sfsphY1Y
+5cVhA+JL4g/3eQstX5IHAIgabvVEfMq7tnIXGytojcQ9CUoiifQYD/PZbSrhnknB
+t/TGNbeVgsZpHzJoEJGMwmeg+5W09imHQ0P4A/IwESmL2867OS36YiCdoMltSOKE
+tbI/aeqNZg3dJKe93A/tBI0aZY+xp+ZaDyRCqRdsBzwyGsV+3PO7f64P09VSNF+s
+FuYDdw3I9MSwSz4AaW1hvqEdnYyIwqVVbsPY+hpjHlibqgyk7CciE6aIf/MOIuWZ
+D0t5/C6aRMQJHyZnN9Abmx/OSa442U8qiVpiwZCN7osxgFx8AVI1UCSFWMyX8oJ5
+uGQBSifp0c98GEthh3Ze
+=H3zr
 -----END PGP SIGNATURE-----
diff --git a/app-antivirus/clamav/clamav-0.97.6-r3.ebuild b/app-antivirus/clamav/clamav-0.97.6-r3.ebuild
new file mode 100644
index 000000000000..ebe6786d3f6d
--- /dev/null
+++ b/app-antivirus/clamav/clamav-0.97.6-r3.ebuild
@@ -0,0 +1,123 @@
+# 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.6-r3.ebuild,v 1.1 2013/03/01 08:18:17 eras Exp $
+
+EAPI=4
+
+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 )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.97-nls.patch
+)
+
+pkg_setup() {
+	enewgroup clamav
+	enewuser clamav -1 -1 /dev/null clamav
+}
+
+src_prepare() {
+	use ppc64 && append-flags -mminimal-toic
+	use uclibc && export ac_cv_type_error_t=yes
+}
+
+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/files/clamd.initd-r3 b/app-antivirus/clamav/files/clamd.initd-r3
new file mode 100755
index 000000000000..d1ad2e2ae7da
--- /dev/null
+++ b/app-antivirus/clamav/files/clamd.initd-r3
@@ -0,0 +1,121 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/files/clamd.initd-r3,v 1.1 2013/03/01 08:18:17 eras Exp $
+
+daemon_clamd="/usr/sbin/clamd"
+daemon_freshclam="/usr/bin/freshclam"
+daemon_milter="/usr/sbin/clamav-milter"
+
+extra_commands="logfix"
+
+depend() {
+	use net
+	provide antivirus
+}
+
+get_config() {
+	clamconf | sed 's/["=]//g' | \
+	awk "{
+	if(\$0==\"Config file: $1.conf\") S=1
+	if(S==1&&\$0==\"\") {
+		print \"$3\"
+		exit
+	}
+	if(S==1&&\$1~\"^$2\$\") {
+		print \$2!=\"disabled\"?\$2:\"$3\"
+		exit
+	}
+	}"
+}
+
+start() {
+	local clamd_socket=$(get_config clamd LocalSocket /var/run/clamav/clamd.sock)
+	local clamd_user=$(get_config clamd User clamav)
+	local freshclam_user=$(get_config freshclam DatabaseOwner clamav)
+	logfix
+
+	if [ "${START_CLAMD}" = "yes" ]; then
+		checkpath --quiet --mode 755 \
+			--owner "${clamd_user}":"${clamd_user}" \
+			--directory `dirname ${clamd_socket}`
+		if [ -S "${clamd_socket}" ]; then
+			rm -f ${clamd_socket}
+		fi
+		ebegin "Starting clamd"
+		start-stop-daemon --start --quiet \
+			--nicelevel ${CLAMD_NICELEVEL:-0} \
+			--exec ${daemon_clamd}
+		eend $? "Failed to start clamd"
+	fi
+
+	if [ "${START_FRESHCLAM}" = "yes" ]; then
+		ebegin "Starting freshclam"
+		start-stop-daemon --start --quiet \
+			--nicelevel ${FRESHCLAM_NICELEVEL:-0} \
+			--exec ${daemon_freshclam} -- -d
+		retcode=$?
+		if [ ${retcode} = 1 ]; then
+			eend 0
+			einfo "Virus databases are already up to date."
+		else
+			eend ${retcode} "Failed to start freshclam"
+		fi
+	fi
+
+	if [ "${START_MILTER}" = "yes" ]; then
+		if [ -z "${MILTER_CONF_FILE}" ]; then
+			MILTER_CONF_FILE="/etc/clamav-milter.conf"
+		fi
+
+		ebegin "Starting clamav-milter"
+		start-stop-daemon --start --quiet \
+			--nicelevel ${MILTER_NICELEVEL:-0} \
+			--exec ${daemon_milter} -- -c ${MILTER_CONF_FILE}
+		eend $? "Failed to start clamav-milter"
+	fi
+}
+
+stop() {
+	if [ "${START_CLAMD}" = "yes" ]; then
+		ebegin "Stopping clamd"
+		start-stop-daemon --stop --quiet --name clamd
+		eend $? "Failed to stop clamd"
+	fi
+	if [ "${START_FRESHCLAM}" = "yes" ]; then
+		ebegin "Stopping freshclam"
+		start-stop-daemon --stop --quiet --name freshclam
+		eend $? "Failed to stop freshclam"
+	fi
+	if [ "${START_MILTER}" = "yes" ]; then
+		ebegin "Stopping clamav-milter"
+		start-stop-daemon --stop --quiet --name clamav-milter
+		eend $? "Failed to stop clamav-milter"
+	fi
+}
+
+logfix() {
+	if [ "${START_CLAMD}" = "yes" ]; then
+		# fix clamd log permissions
+		# (might be clobbered by logrotate or something)
+		local logfile=$(get_config clamd LogFile)
+		if [ -n "${logfile}" ]; then
+			checkpath --quiet \
+				--owner "${clamd_user}":"${clamd_user}" \
+				--mode 640 \
+				--file ${logfile}
+		fi
+	fi
+
+	if [ "${START_FRESHCLAM}" = "yes" ]; then
+		# fix freshclam log permissions
+		# (might be clobbered by logrotate or something)
+		local logfile=$(get_config freshclam UpdateLogFile)
+		if [ -n "${logfile}" ]; then
+			checkpath --quiet \
+				--owner "${freshclam_user}":"${freshclam_user}" \
+				--mode 640 \
+				--file ${logfile}
+		fi
+	fi
+}