Fix bug #485848 and bug #546462

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xF253DB15

4 files changed, 106 insertions, 16 deletions

diff --git a/app-admin/logrotate/ChangeLog b/app-admin/logrotate/ChangeLog
index af6d92b308de..f219aebed1ce 100644
--- a/app-admin/logrotate/ChangeLog
+++ b/app-admin/logrotate/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/logrotate
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/ChangeLog,v 1.196 2015/04/19 09:36:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/ChangeLog,v 1.197 2015/04/21 09:26:14 nimiux Exp $
+
+*logrotate-3.8.9-r1 (21 Apr 2015)
+
+  21 Apr 2015; Chema Alonso <nimiux@gentoo.org> +logrotate-3.8.9-r1.ebuild,
+  metadata.xml:
+  Bump to fix bug #485848 and bug #546462
 
   19 Apr 2015; Agostino Sarubbo <ago@gentoo.org> logrotate-3.8.9.ebuild:
   Stable for x86, wrt bug #545566
diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index be09cec24ba7..04b05c5b01e6 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -22,23 +22,24 @@ DIST logrotate-3.8.8.tar.gz 72014 SHA256 46a1510ef4a1f4359edd5f361112cfd1523942e
 DIST logrotate-3.8.9.tar.gz 77408 SHA256 700ed7ce9072a1cca324779a74797dfaefdae37ac50a817134b947c4ded1dfa7 SHA512 342533f321a1d77c0ca389fd0a393377ba73f10654aae163cbd35f8d5df25673f1aa6e44d0af42be5419d152a7dae11024d9005076bce0a3b3dad1f0e12b9c0d WHIRLPOOL 005621b5dc7f6954e505876eece76e3adf03b9b89b724e5c28b845c8af3ebb8e978d20e3a82c8a503c32bfd8758517625207e23518d6d08068e237c22fe7212d
 EBUILD logrotate-3.8.7.ebuild 1849 SHA256 116d9d98db5e808f4a15a85f80843bb322534f2b09aad38e700b49e9a205dc95 SHA512 ee3d564aee262200c1ed35f8cec1d7817d6f8e1baaf7c4f68744f16bdd36b1183950958b203383987aac2ecb2ccf914c40c7c15f9242d0f6169b8c3520f0a90f WHIRLPOOL 7588c0fb1b9bfed3460b2af1363325180945fd7a56ef1086ca956068854b69ef443b7a9c890f4925d7f30b77ed72cef2f417d7507faf7ecaef3e1f48ad21e799
 EBUILD logrotate-3.8.8.ebuild 1869 SHA256 4b3bef44e807701b031911599add90da2930405273e9dd47376fb43308e7ba95 SHA512 daf99a58996f293df91a2c691101fcdc7c64ed687e47bf98f43654bf4622854ef7669b87e15be8866850dbdb5b92b06124f17ffa3bdad1b3ae5ae80e8ba712c0 WHIRLPOOL ac534b3b0636b057684681097dc0ec2c4b3828677be4d5451ab8915db719e9b4231931c8a6834c267c8f4ebe2a43b83ab0718ee081b2bc0846a2d9c096c1571d
+EBUILD logrotate-3.8.9-r1.ebuild 1929 SHA256 f99b2b19188f7d1bc70a65e4a5b6b4b39f04bb83282bf732b1c137ea86df37b5 SHA512 131839643b41b2b40b7ce661785b73887e89ea93e12a3e3e815e7359c30d44650f7449b1e54163091fcb1010fe39e4882e83e2d32c955b58f194cab1105c9250 WHIRLPOOL c92c24a35d6754b8e1502a890aa328f338ec3b25f632654cd125e1905baeaaba31bc1bc29715fcc166140e812170f9aebe1f6b01ca778e24627bb0939b196e04
 EBUILD logrotate-3.8.9.ebuild 1917 SHA256 ae07ef8301c8762cda87ca52373ee90dc12f6f671afed5da49fb88cb79097860 SHA512 b905943cf302b8f02ecbfe1baafc6d6d599f7e7bea87c73310abb54b93033010886a275f1337a81f9a28899126501623b88a41789fe051b1ed80d7d379ebeef0 WHIRLPOOL a8d62ca101c19fdd07b430299d30acffca622d8cc8ae31de84c40521a834b8c5a3c31bfbc95ca2be80e68e4727a35f1fa77fb2d3191ec6750795d5bd70813740
-MISC ChangeLog 29031 SHA256 ab98ea0f71e1779e18068fdf7051ba5d90e039bbd85fe90b081b7db3d3613eae SHA512 5afb25f43905161cd65f3ad54cfb12763a742feb25cbcaa9c7fb1cd277735bdc644f28fff05dcd136aaa90f4d30ad7c82627e508b9ba24b386eda386241e847a WHIRLPOOL 4a142a0c041110d010e491af2cec01ffc2ed1a8cb4aa056f3352309640178442c5e0f11edd74f16e9c375c6fc086f8680e2eeb31e6ab025a25866f59884ca829
-MISC metadata.xml 975 SHA256 a329700a1e76593184907198fff2f678e429294226461ac1a913fe58cbb28c8d SHA512 c7736be8ad13e6e31c6561ff0fdbc2e3df7f59069eafdc5b655f780d96d277795201b9db747bc3da24c932aaaad16d40aebf18b8fc679f7ae8fa528088828d4f WHIRLPOOL 931ab959ebfb43aaac9c8926f26e17750c38f155ed15905117e2c8ca3374db427db763c6b724db9eb7f05fcf600dac54ed8008c222410073d82e17e38b0a45be
+MISC ChangeLog 29204 SHA256 1479a0a76407a91396a4db4d4734ca0451a443214e14c7d44e871782d0cde75c SHA512 9afd13cb2c0d53815bee2c791fe8121e129289670ef21ae254f9b051961eff4c03174ff686ee6c61462a5d79c90834a09891a6ea3e9b5ea5fb4c2b871c6670c6 WHIRLPOOL 7d8d1b33365e940732dc24439d1f3c8dd167ae088f62280032481564fb0b73dc09e68e142679488adbed9d971643956e226f786143e5a617f467987fdefc237e
+MISC metadata.xml 1021 SHA256 38ee9077db5b0f3223b2ea558b0c86fcb6c76fe2f1892c26d10d3b88c7e7b64f SHA512 dad453f4151ca9454c4374c6b4521e861b6adaa7352f147b0809e80ac2b6cafc51db04eca428754b48bde9caa2f54ed84d0b383c496c45684c0510be0a4ef575 WHIRLPOOL c260e541af2a735ec5bce0bf38eb060f002daa3ab4b41bd9c1dc3187c3ab669bed34a1bf5f4fe0713f80588bed6c703968302baf67022faf7fd80bfe07dda113
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVM3cuAAoJELp701BxlEWfcSsP/jgHnefZQG2077TUEjBt02zZ
-SBex/YtJ2T5tnNZIgX6lnp0KjUmJcvcyZuMaB2rxFh8BY9Decm5ZQWHYwNBjnxEp
-5ufKIjfaYRjm2t4HSUTZTw6W33wxlTxWz7HWcR6J6L5cOX7xDGDxWHhztbxHHBGT
-MocJVjZOzHdTf3qN8hTG1gbfftj7P8zJ/IcrIFEiL0Laa62uIuFd98zZELOWvZM/
-wladgulAe8SmkYbgIaoO+MVI8vQg1CvMHr1glF7GGx5A75myOtsWLkOMJsqMVeVU
-zacjXeeGACrvorxFIfrO5ieQidwEbzO2ZZO0zWps0jVTiwPy5fQTsRJI8ZMeX5Yi
-SrcijEeHhv+fu9gwMF/0fQi1NC7uo/gsuGDgS3Rq/aOLDTpy3+l0z1jbKo3ytuGp
-ZrfdyO2NruL+/vi0TP6iFnlRr9jgPtx1aw1dbMJxYyKyPjr0hNAmRVmZnAEAsyfZ
-hTVvi7JsDAF39wIxiO7AvaoJ1SMCqcFbjBj552XPiej3DwElhNXdLBP5jG5RE9BQ
-eYeM/ph2fRW6oSnshOrVX2S/5AK6aHlxeaQCsp8ml0g6/L7zTPWcWV9Teb8f0O17
-Bu98mb35tDezyKnmHWEiz8mdaTH6lILDtCCULyKqGsdbpTg41AqCXhj3ZG0G0lkm
-P1P/zuURr+1bCt26W2Lm
-=YC+r
+iQIcBAEBCAAGBQJVNhhlAAoJEH/rgyzyU9sVhoAP/2h9D2N5qnwt86lG2MyCNw/3
+FVBjyfCO28UFD6z7voVjzI0OwidpgfeZYGhm+3ox23GMZ1pWZ0bXEJTyatT59Ma6
+o0jE0ga+e5nwUZgN2j83yerShOYBrMFEnBXiL6S00bOoEI5GcgerZGup1TD8214H
+oXdBkMCYjXvQuNfm+7aPlcXz8rSObh1u/HbyNsOk2vuX9ZpK0H0i+LfbcGtOYkDZ
+3Gmuw55ydBTvC9kixGgTsAm012lnXh2H6YdpJVBMtXreTZqRktKHuDrZtmPgisCu
+4kn1budLPJJ5Hsll7acsEW2XD+VwVf/kbFdk49dXFXHs80B9sx+Wo4KZlLJyq9h4
+t9MdIKiAf7qWFJupPnJLx2HNE07GQh9yRV7/br2KzDpCe9pbvzWJ7MgsrvhfcqX8
+iq4zupBzzFyEmq1OuwTWoJKVaiYe+7O8b4bwskMDDxbwlhqHeH3nT8fKtrTEYq3M
+w5BQ0GqfQBYU2yXY92rQzjvf7MX16VTSC3MO//C6UcwF1TruJhRfJUp5O3v9FdqO
+rgv7h0cfP972dd5SmxPAFDULlhPOfg8MZVCFgocCcEy4N2lgc7QFMkTEqC/LJNRk
+Iij9yqelDmYCDcU6D0QcsFgH9b1koA3RtCis8acPRtT2xfJ9VpKSBRvqne5TkLVd
+Uou4B0/TNvFH2g0uB4gJ
+=KJtA
 -----END PGP SIGNATURE-----
diff --git a/app-admin/logrotate/logrotate-3.8.9-r1.ebuild b/app-admin/logrotate/logrotate-3.8.9-r1.ebuild
new file mode 100644
index 000000000000..f40dbe0c3eb4
--- /dev/null
+++ b/app-admin/logrotate/logrotate-3.8.9-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.8.9-r1.ebuild,v 1.1 2015/04/21 09:26:14 nimiux Exp $
+
+EAPI=5
+
+inherit autotools eutils toolchain-funcs flag-o-matic
+
+DESCRIPTION="Rotates, compresses, and mails system logs"
+HOMEPAGE="https://fedorahosted.org/logrotate/"
+SRC_URI="https://fedorahosted.org/releases/l/o/logrotate/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="acl +cron selinux"
+
+CDEPEND="
+	>=dev-libs/popt-1.5
+	selinux? (
+		sys-libs/libselinux
+	)
+	acl? ( virtual/acl )"
+
+DEPEND="${CDEPEND}
+	>=sys-apps/sed-4"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-logrotate )
+	cron? ( virtual/cron )"
+
+install_cron_file() {
+	exeinto /etc/cron.daily
+	newexe "${S}"/examples/logrotate.cron "${PN}"
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-ignore-hidden.patch \
+		"${FILESDIR}"/${P}-fbsd.patch \
+		"${FILESDIR}"/${P}-noasprintf.patch \
+		"${FILESDIR}"/${P}-atomic-create.patch \
+		"${FILESDIR}"/${P}-Werror.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with acl) $(use_with selinux)
+}
+
+src_compile() {
+	emake ${myconf} RPM_OPT_FLAGS="${CFLAGS}"
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	insinto /usr
+	dosbin logrotate
+	doman logrotate.8
+	dodoc CHANGES examples/logrotate*
+
+	insinto /etc
+	doins "${FILESDIR}"/logrotate.conf
+
+	use cron && install_cron_file
+
+	keepdir /etc/logrotate.d
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "If you wish to have logrotate e-mail you updates, please"
+		elog "emerge virtual/mailx and configure logrotate in"
+		elog "/etc/logrotate.conf appropriately"
+		elog
+		elog "Additionally, /etc/logrotate.conf may need to be modified"
+		elog "for your particular needs.  See man logrotate for details."
+	fi
+}
diff --git a/app-admin/logrotate/metadata.xml b/app-admin/logrotate/metadata.xml
index 4322944542ff..f92e835578bb 100644
--- a/app-admin/logrotate/metadata.xml
+++ b/app-admin/logrotate/metadata.xml
@@ -20,6 +20,7 @@
 	</longdescription>
 	<use>
 		<flag name="acl">Installs acl support</flag>
+		<flag name="cron">Installs cron file</flag>
 		<flag name="selinux">Installs Security Enhanced Linux support</flag>
 	</use>
 </pkgmetadata>