Fix log file permissions - bug #463208

Package-Manager: portage-2.2.0_alpha169/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 13f16704cf69..306eb2b7bdf4 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.449 2013/03/24 16:11:11 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.450 2013/03/25 14:34:52 eras Exp $
+
+*clamav-0.97.7-r1 (25 Mar 2013)
+
+  25 Mar 2013; Eray Aslan <eras@gentoo.org> +clamav-0.97.7-r1.ebuild,
+  +files/clamd.initd-r4:
+  Fix log file permissions - bug #463208
 
   24 Mar 2013; Jeroen Roovers <jer@gentoo.org> clamav-0.97.7.ebuild:
   Stable for HPPA (bug #462278).
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index fd37c4a04344..a88bc38a21b2 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -9,6 +9,7 @@ AUX clamd.initd 2991 SHA256 c4bd4b52599f2ee1ff40dd9d3ce95e2028d20ac6e1195d89aab0
 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
+AUX clamd.initd-r4 3100 SHA256 995effee345e6d353ce91ac062cec38ab6c4f7d656bae18d714c8c96e0cf3183 SHA512 db1ce0c80bb903e48546acf61b1333fdbc6b25413ee8ba7aea7c90620dadca5ccf4039c0d54e1464812b8a03c2c35e6c2acac0a826de735e3aa531931024567c WHIRLPOOL 6843e6f7ce392d3410b267475a46527963aafc02ff31948afb57b514a1b16fd0dd10fdfa61419442255bbb2545db1500ba9a74009f36c055e8f8546691b0ac74
 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
 DIST clamav-0.97.7.tar.gz 14598481 SHA256 8527754e7eb235317e37a50706d94d3fc9d880fd0bf6f3cb83757d64a720e9ff SHA512 92120250afb882b7fb9f956f2095797f8e3c93076a229967123261c907d9b4436cda6cf2d18b2c61cec8b33afeacba9c2701ad3322aa3316163fe4f36f7a7bc7 WHIRLPOOL 1f3fb155ad4e35ef1ea3835941e40363f9da9c37ab46fe1b9d44e29add6fee9d775e1f5858648a6229f9d0f41c40ed4ade726a4fc044156d208bf10f6cc8c705
@@ -17,13 +18,24 @@ EBUILD clamav-0.97.6-r1.ebuild 3812 SHA256 896051a7a4a96e4aae8b833df155a57fbc036
 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
+EBUILD clamav-0.97.7-r1.ebuild 3812 SHA256 2fdb27893f603d3e342b16f49b2ed7283336db69c29c98697e37d93f870bb2fd SHA512 73e41a379c9c06af6aa9d920094a12421eaa310a5aed0b8095606c060ead1092b8bdebf9b1946270656e2e27c341ce644f8693897c243f89becbdf69a552f176 WHIRLPOOL 590c84d7dcdaa32e610464209ef5e898046a07aff190704d5fa0a67a40358365eb27ab253b43fc25847d01d7ff91724ec1ce00a55549885a9742f6c2ac762e46
 EBUILD clamav-0.97.7.ebuild 3802 SHA256 043e4b678085adc80cea6b451ad1fde7428388a781a5562d3b6a38495737351b SHA512 5b66419616a1655cecf1d32d70e8fcb3198594e818e0695a22dd80ff398ea199d89be12328f5948c7a8c94bbaa92298a2342944a6b6b740f5bf0f9bd5a1ad39e WHIRLPOOL ade0ee79f4b4c5533b6755614f130efb282640cdc07607e08146d5708461af08aa86d81f48b5d337b7c1a1139383b1decf87f7898d0549f9ff871e860268916a
-MISC ChangeLog 65333 SHA256 f52043647d90059930351c51fb016229cd84a6f8af3d3135354f282226700a62 SHA512 5ac245ec302eadbd2bb779af11320bd525abca1096a26b9a12beb1645771790f265d165a5128079adefdd02e168fb20e234ea99462167ea6594292dd080411a7 WHIRLPOOL 21b738ec86c2ee614755d5a35d363aa9bec053cd22d0e489d1f6823b60c2f677140f2964880da4985f342a2850fb1bef8895138343278d7d34d5f6de80e7f576
+MISC ChangeLog 65504 SHA256 9af51f27b969b9380e8d3078c23528f1f7ffb52975cad25b11b3650cfa66972b SHA512 52fa8ff20b097fa04a76b8749b68ce398c662a58f409fdc77ec2e99d6a2c0d2959b1e43bfcf976a58024236ad6343a87edad90839d3f6c13e82c8112d7e62711 WHIRLPOOL 64b73d57cd8abe07bd4e6adcd0c03071961f78ab5eb3ca8fd6cf32eaa7d0daa9de31b298060dadab14a797fcc0d3a9c14d4984c59642b01d45762d47d8c03adb
 MISC metadata.xml 320 SHA256 e2a8c4c8bedbffe50a126c1c7395a4d92652c2d95347b9496d54aea1f230a22d SHA512 c5bb20c993b91112d9c9e0b7bb6c116ac7f711c769084eaaacc28bc7eeb54db09c9794c6ef057747d80a08cf1502f0f688cdefc741423a38da55b2deaebd6476 WHIRLPOOL 741ff80258dee2c145d08f72f10982bd5c1fcba44ed84054cd1a33787864a7d8821b432c3246ad5a04ce11edde7d045f3eb6e056200e3bd2e8505eeea3d7277d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFPJaAACgkQVWmRsqeSphOweACfV3pARe3ZkRua4q6lLDlxxQSH
-6owAnRsEb5YefvJcixlClpzGav+px7vf
-=WSF2
+iQIcBAEBCAAGBQJRUGCWAAoJEHfx8XVYajsfHzkP/RIP9iWAyHZaNdd7oWDRXxCZ
+lJfeyOKHSc7D3KqaFKT2j+2+VK6dG3CjAcDBtv/HIS7cq9zfKb4XIP1rDXyNbpaP
+dz0nqHNk52JZgRXaaVJ2fyYC0wgMIm4vkYWLPb3Kzh9pcx8SFyDHZ0MSJjLzRI9m
+C81oYFEEvNqDE3FMgU+1scYXnJ0JKOeuUmH53wGMBjzq7G61pjfyBoDNGArmrarx
+dZhsblTLqDL9oGpDKutHxwkei6h/j/rXg3Dcf6Qi/NsbNSt5TCXb2xAntYnuBTiC
+LAFNz2p71QQpqjDzaH7js3Kb1GGa0kjYJ4Az0MENhmz3wHzt1xz9wcHLGgObjLYD
+dZUMIWQHds9jA4gNAbwtRNdPJPeHNuLi+fUVeHYCndcUiImsLYGi2MM1WIWOc/bT
+eGKNB7IgOzUlgDVrHGhxNZgLvVuJwoefWgUiDRzM3RkwhsFNB0FuJERB5lBtRYIB
+gtWG4di2Nl6O1UhHxrtBGikDtFilnw/3TrzD4oONHBlQcisaWOwoWzOiWMIJQ/x8
+OTXI/Dr1l7Zr/1AOhJ07if5Eb3yynFEWOpns+3vgy34BRpk+0eZIPWyoUHBvvN2B
+efefqzF6/PhfaQnwuNNoJOHWp5URhSCzD5fynWOfZVRI2wPf+WQbKJ2xCZXSq0rf
+rSejdbkVe5bMk2eq4esO
+=v3nC
 -----END PGP SIGNATURE-----
diff --git a/app-antivirus/clamav/clamav-0.97.7-r1.ebuild b/app-antivirus/clamav/clamav-0.97.7-r1.ebuild
new file mode 100644
index 000000000000..bef8efd86559
--- /dev/null
+++ b/app-antivirus/clamav/clamav-0.97.7-r1.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.7-r1.ebuild,v 1.1 2013/03/25 14:34:52 eras 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 )
+
+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-r4 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-r4 b/app-antivirus/clamav/files/clamd.initd-r4
new file mode 100755
index 000000000000..70ea22a75457
--- /dev/null
+++ b/app-antivirus/clamav/files/clamd.initd-r4
@@ -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-r4,v 1.1 2013/03/25 14:34:52 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() {
+	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() {
+	clamd_socket=$(get_config clamd LocalSocket /var/run/clamav/clamd.sock)
+	clamd_user=$(get_config clamd User clamav)
+	freshclam_user=$(get_config freshclam DatabaseOwner clamav)
+	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
+}