gentoo resync : 15.10.2017

4 files changed, 153 insertions, 0 deletions

diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index 8cbeb931bd04..7d8cf83e1934 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -7,6 +7,8 @@ AUX logrotate-3.12.2-fbsd.patch 855 SHA256 127c90627ba4dc79d0120d3a86b8e7696b895
 AUX logrotate-3.12.2-ignore-hidden.patch 542 SHA256 35488583344d963ea1c19a798bc9f8d9c174395f299d1a81a65680e47c36362b SHA512 86d7335dda9b913928eb14dc39a120e14f3796fc30516fbfb5424c575520802edb84224bf5673084be7e983f9e2d856d80d58fa4200a0a43a9624d41dc20a206 WHIRLPOOL a711fbb2fe8ee74123ecbca4202ff8cac60bdb8c0fc197aa8dc96e101cad32d8e1b85bc378bfd8d0fd831753e39f7c9a177db194d9d2450bee2e29f09af37f86
 AUX logrotate-3.12.3-fbsd.patch 855 SHA256 127c90627ba4dc79d0120d3a86b8e7696b89546cb164230f12466113d874141b SHA512 3e54314ce32735bd70fe46792c073fd5eb345a77e40eae4b9c899671cc8b7dd8d6f1042a28f05364431fc730a3dbe924d19d6eacbb387c6384268a397dd9ac85 WHIRLPOOL b734147fad23c8a0d16aaee33910995ce11310497616a390c74415d66e74ab6508b65e144e5c692fba635f5c0882106d8dd72b99ec941439e589e2712efdf155
 AUX logrotate-3.12.3-ignore-hidden.patch 542 SHA256 35488583344d963ea1c19a798bc9f8d9c174395f299d1a81a65680e47c36362b SHA512 86d7335dda9b913928eb14dc39a120e14f3796fc30516fbfb5424c575520802edb84224bf5673084be7e983f9e2d856d80d58fa4200a0a43a9624d41dc20a206 WHIRLPOOL a711fbb2fe8ee74123ecbca4202ff8cac60bdb8c0fc197aa8dc96e101cad32d8e1b85bc378bfd8d0fd831753e39f7c9a177db194d9d2450bee2e29f09af37f86
+AUX logrotate-3.13.0-fbsd.patch 855 SHA256 22618ce2fcf3555f4922ea98e90bac7846a840fe4da76d1c14d66614b13b21b0 SHA512 5343814545554392f1ee1be5b35866ebce0d8f2f580cb7807940e3a5b2092025f1b9619fa0ff3bdf4b99aada4c46a602d6c34c6e3c1e42b15ce51cf9d879a3ed WHIRLPOOL e78ea306458781dd88f3efbea57bc1d42f761aa5b98a286608be661a2904d91fbf53475740304e5a5f9f47bb361d87588c829900f90c2b7764fad2b066dac0ad
+AUX logrotate-3.13.0-ignore-hidden.patch 542 SHA256 5e5a1fb4b560d9a8d88f5deefacf09fcfb071144f9195fd5953146b26439adcf SHA512 88bd9dd906171d45877e4c21e40cfc9a729742825b4c5d583fd9364d3943aa604e037e4b58e053a1fc7c0b77bd5ed6171f741778716ef753ecbb02ebaf012589 WHIRLPOOL f9642e6482982ae51f44807bef77a21269fe9f1449d8c8bd16ca845b0e3c9e2b7ef0428daeead65940c7fe4b49c39982c7874e585a6b781076e78000ee4de282
 AUX logrotate-3.9.1-Werror.patch 344 SHA256 63ce419252a8e2ed52c78b018bb1b2247e02f5c2c322168a5772d3faa957bd88 SHA512 6ae8b49d1f29ce1c32603716555085b7fa2d865177558abe92c84867c69ca84b8174563db07537801ad01572717670478b273acb34b5885b9170354d1cc02493 WHIRLPOOL 808769d911f49ed40c572e6f21d42e578aba056b3815017f25bb66d5d14a9fd78c16a92f30874346324ab1e0e7af57f6fa678707d88e8b3f69055c25b4b9a81a
 AUX logrotate-3.9.1-atomic-create.patch 1253 SHA256 f5a93032a0d7f48b4eb295fd40400d527a66804e3f959d391f895cebd86ef7ad SHA512 92fa8e04522f9bf06840befcb019a498d465f2d8afa3475f97e953b4e8abf2cf63f2fa27d8c89c5620da59468f753d94720f5f3a604376d7e51b86c9eb156c99 WHIRLPOOL 29b74ceae23035e4423753042375f1fc713fc780b3ea31d166034746c0d4c89ec1be7979c570f13437902ba7c155299eb870510742fa73656517f5accd43d100
 AUX logrotate-3.9.1-fbsd.patch 1393 SHA256 543a7e7118f66cda16446d5bfd7abdae1c72e786f49f701c515ea595e72fe7ef SHA512 dd8bc024eb280e5bcb2869682bedaf5c8db6d18976e412de3283f32bc5d9ad370fdda27194eae11fa3da53339d83ff20fe541e99eb8ed183997ecb85a606f822 WHIRLPOOL dd34fb0f8070e297a6f760d9d77ed3191ff3e91b152710ac6acaaada70236b12e6cc192259c06e15ef0d54f75a28de23dd3052a3c37d20b888c8069b77794a07
@@ -17,12 +19,14 @@ AUX logrotate.tmpfiles 16 SHA256 5624b71671928b2d5a076c32172b65b679b8502aae66b28
 DIST logrotate-3.11.0.tar.gz 176488 SHA256 7dcb440ed2f1937459e1e06f841c6af1e564b77b2df8009147b56c8649197910 SHA512 67ceb2e18c175a5935c81e7699af7a5e6625cef50a3f52e993d49d6c10d9c433f6c7354a8dd05cb35ab28e4393d1db198f2e46e5f6eafd3e6f040b6518438cc1 WHIRLPOOL 0a581aa5922386b84a7c40a9490364287f4e162f7180fd0e15bf191694294168b663947c7081e92755406fe4f0b3b8792b6f0c5f0e646afa5505a17995a86858
 DIST logrotate-3.12.2.tar.gz 202700 SHA256 754777ada2ef2f34378e8f6025cdb0c0725e212f12195d59971c42df0ae0597f SHA512 ba8c3d7c7134b9ab5968c0dc8a1c5d24d7287a3204e1c6eed080b537d6a0ed7765a47c69b3067493304994e3f4238dc0173b593e4628316bfadf3decd002da16 WHIRLPOOL a299bc2bd50ab36acdd4ab747a479c5b94e84ac92bf55b71a8a8a7d4e1b55eb909dce94c22a5fdadda946dc783376923de5f46729084e21b54811489ce97c482
 DIST logrotate-3.12.3.tar.gz 202991 SHA256 435a3f9a534a37e11657532a090f6bf521d8696bdf9cb799a360c1750ba3aea9 SHA512 ab700a50736c7ce8a6e5b9dc2504919c6d3e6ae48a7f112f6980253df5c6bab7fc507c82a0cd961d73ed1312c930da46d96d9f27046996644e0759c84c6a1ae9 WHIRLPOOL ceadd2a748850f0035702156b9a566bf3a38749edf823062f1c867e60cac1c7b40d770d6c923eed79972ce58394b3220e16e40e97e192a6a7046cf09c5fcbf77
+DIST logrotate-3.13.0.tar.gz 213726 SHA256 2ea33f69176dd2668fb85307210d7ed0411ff2a0429e4a0a2d881e740160e4b0 SHA512 3dec2fcdd674d3337b71fd70339cb5e3dd06b4bc24bee191356a30c2a211a290ae7747e63b90581e32a6d6d1f73cf62d5b0ee5a91aa05bad4d6ee403a35d9e76 WHIRLPOOL 952c5eda18870876ea5109d4c5ae7ac1048d3ea07c89b4a0320a48baa8170fbc200f5b4a1cc193da0f6b0e1ef8dbdcdb82f74f23d4f12e5a19bb98650c1e7d5a
 DIST logrotate-3.9.1.tar.gz 79061 SHA256 022769e3288c80981559a8421703c88e8438b447235e36dd3c8e97cd94c52545 SHA512 e6da7c7f067befaf2441e9c6ce77e53cf5ddb4f56cc3304c3e50873b6f20c68520f4a0e50ec466cbebcbed20bfd77bf6dfc489975a8131e9573fb19856c0fe28 WHIRLPOOL 9b3558bb03c6c95f8f386ea75ca09bfda802ae4c45b9ef8408692e3aa7a2ee57447cf15ce04d0289946b9cae2266acb5509d8151d15ac6ea0ad9113aeb32dc17
 EBUILD logrotate-3.11.0.ebuild 2005 SHA256 101653a12e2243dd4253abbc24becfeef0d2bae5037ae848a1f4848bec4a163e SHA512 eb0392730a076565c459a2645b6497b86d3a86d0096661eb468b00cbb909ffbed7db762adb866a9cbfca40ff339d90ce0c970404b718b8f8a4d084dbf51a1ddf WHIRLPOOL 0317478d7fc84c7d1716d2b449298b382a2349a5ed746c458a9e47a129fdbe9d4e7ec330bc36c07e9be0ae2ca041518424f1ce7ef3333e547667947eec5f6c12
 EBUILD logrotate-3.12.2.ebuild 1903 SHA256 d909fdef412279a0147a2f9d02986cafea2c4bd63936ab0fa0538ecad797483e SHA512 78ae7250c4c26ff7f702746535bace0f34b68d2ceb9d6cc3744975d1842781bb2037fa520b873806659db2e5acb8b58ec14996865be82e62d1d892acdae3b134 WHIRLPOOL 728c71c61e3ac0830ea100d891bcaf7fa8c9cf75e7c8f455862442d31a0f83b459d50ef54101a31745c84d6f491473404ded5c9372cf551a8499eff60893a49a
 EBUILD logrotate-3.12.3-r1.ebuild 2487 SHA256 e1871fe019ac5de8ef40c4e4b33e6e2a2b14ff52f39fd7969b3e547551dba63c SHA512 b085e9bbc3a21814f7d12bdbd37b38094527e04253bd64e5a90ecf366b58b1a9aae98752508f0f59a2fcf09f548bfa5c7e65436c4ce80918eee78df978ad34cc WHIRLPOOL 90c109fdf4396b723ecee00ebb676b0d8718d7fe9f72bdb5a87782355c411cfe72af86994c7564cd16c6f26397f2724eb63bcd04e3f767c5e318e59340681416
 EBUILD logrotate-3.12.3-r2.ebuild 2552 SHA256 55c7d7cd58624e29f040d575fe0d695bf66af60dfa735efd24416e2306e07140 SHA512 b3f3b5d0264bb75c717608be706eccf33d97996f38c5ca152e1797f9dfbdfc40add7065fa614a715d0a30d431dd484e34a8b48138b80d99bcdd546b597264436 WHIRLPOOL db532413f8a7aa375b952c7451a482f362ff2aa93316f62dacbc75274e692e6be19088b28305973b610eaed3bae4578998720213c8e33bd252f529cdbc02c754
 EBUILD logrotate-3.12.3.ebuild 2479 SHA256 f5bc883c099160493f924e3b72aa304eac5d23248f21137876b1f774a24539e8 SHA512 4e0b4b99277ee692318a6d6f4358a5463f11c339cc1e610040a9a436b412d5f8ba22ededee3453a4dc6dccd66067ee04931a39d3b27f08189592c2366f0c0365 WHIRLPOOL 9d71a14ec8ba93fa742d20d1275e757236b37413947248614fdbcf723a49dbaf700e20145e6523ac759d637a795355af1f636227db0803b04f994bbbedaafaf3
+EBUILD logrotate-3.13.0.ebuild 2552 SHA256 55c7d7cd58624e29f040d575fe0d695bf66af60dfa735efd24416e2306e07140 SHA512 b3f3b5d0264bb75c717608be706eccf33d97996f38c5ca152e1797f9dfbdfc40add7065fa614a715d0a30d431dd484e34a8b48138b80d99bcdd546b597264436 WHIRLPOOL db532413f8a7aa375b952c7451a482f362ff2aa93316f62dacbc75274e692e6be19088b28305973b610eaed3bae4578998720213c8e33bd252f529cdbc02c754
 EBUILD logrotate-3.9.1.ebuild 1767 SHA256 72213fbfa0a0f182e8ac774e29a8763a17b394c1b4e33e7cac664c7bccbcc96a SHA512 ed808392727749efb6d20a410810f6eb9cb364db2e11460f4c2940abd0fb1d7430b75102f2fcabcaf64e8818da39323010d2a5d223df49c705a6171acf541a03 WHIRLPOOL 245d8f38775b0a9296cc41c0af04e6aca66a7722c2eafbe6814b2a865cc4bd1237f5ef1aa146089882112144db8292d1e706323ec63d2b018ba9bac06147cb37
 MISC ChangeLog 11318 SHA256 38d98af46e97c9519c8e99cf7bf71b7c27b1814b35870579057d068c54fc14c7 SHA512 d2992032a405e2c185966f44f50a1a92c0138f8e847b55402a620f144ecedf58a23381c0ae42b12d344cf18eeab833a786ed35401a29c0c45aa2b67664ba8c51 WHIRLPOOL 66cb04fb922ba81fc9bcf4cd200c6d236d5a758f872da2e55bb09981571b914adca5c40e2597b4dea1ef994ce36782aac590adc5d6aa149b1adc08f36b1ea5dc
 MISC ChangeLog-2015 31549 SHA256 9a573fb1c828c7902f5b51a4f331a7df387a331c49509396799505c3e7c5c323 SHA512 13817496f0b30b421db6c36d2f044b7165a8282420d5124c52a6e5220cddc30ac774b63a43b395f0c0392339e67bcf6a855e16c666de34ad13004ec1d0f056fa WHIRLPOOL 4a957803bf090890dcb9ad77152e87bba98952493f97e75a00718ff024e5b774baca23c554e7ae2995d499d3791a38eb4b83f8126ab295fd2ed7c97652ed8687
diff --git a/app-admin/logrotate/files/logrotate-3.13.0-fbsd.patch b/app-admin/logrotate/files/logrotate-3.13.0-fbsd.patch
new file mode 100644
index 000000000000..028dc0551f17
--- /dev/null
+++ b/app-admin/logrotate/files/logrotate-3.13.0-fbsd.patch
@@ -0,0 +1,36 @@
+diff -Nuar a/config.c b/config.c
+--- a/config.c	2017-10-14 18:52:56.829467653 +0200
++++ b/config.c	2017-10-14 18:54:57.049467139 +0200
+@@ -25,6 +25,10 @@
+ #include <sys/mman.h>
+ #include <libgen.h>
+ 
++#if !defined(PATH_MAX) && defined(__FreeBSD__)
++#include <sys/param.h>
++#endif
++
+ #include "log.h"
+ #include "logrotate.h"
+ 
+diff -Nuar a/logrotate.c b/logrotate.c
+--- a/logrotate.c	2017-10-12 17:19:41.000000000 +0200
++++ b/logrotate.c	2017-10-14 18:56:23.419466769 +0200
+@@ -1,6 +1,6 @@
+ #include "queue.h"
+ /* alloca() is defined in stdlib.h in NetBSD */
+-#ifndef __NetBSD__
++#if !defined(__NetBSD__) && !defined(__FreeBSD__)
+ #include <alloca.h>
+ #endif
+ #include <limits.h>
+@@ -27,6 +27,10 @@
+ #include <limits.h>
+ #endif
+ 
++#if !defined(PATH_MAX) && defined(__FreeBSD__)
++#include <sys/param.h>
++#endif
++
+ #include "log.h"
+ #include "logrotate.h"
+ 
diff --git a/app-admin/logrotate/files/logrotate-3.13.0-ignore-hidden.patch b/app-admin/logrotate/files/logrotate-3.13.0-ignore-hidden.patch
new file mode 100644
index 000000000000..f3ade248d38c
--- /dev/null
+++ b/app-admin/logrotate/files/logrotate-3.13.0-ignore-hidden.patch
@@ -0,0 +1,14 @@
+diff -Nuar a/config.c b/config.c
+--- a/config.c	2017-10-12 16:05:41.000000000 +0200
++++ b/config.c	2017-10-14 18:52:56.829467653 +0200
+@@ -432,7 +432,9 @@
+ 	int i;
+ 
+ 	/* Check if fname is '.' or '..'; if so, return false */
+-	if (fname[0] == '.' && (!fname[1] || (fname[1] == '.' && !fname[2])))
++  /* Don't include 'hidden' files either; this breaks Gentoo
++     portage config file management http://bugs.gentoo.org/87683 */
++  if (fname[0] == '.')
+ 		return 0;
+ 
+ 	/* Check if fname is ending in a taboo-extension; if so, return false */
diff --git a/app-admin/logrotate/logrotate-3.13.0.ebuild b/app-admin/logrotate/logrotate-3.13.0.ebuild
new file mode 100644
index 000000000000..f0661a39594e
--- /dev/null
+++ b/app-admin/logrotate/logrotate-3.13.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd
+
+DESCRIPTION="Rotates, compresses, and mails system logs"
+HOMEPAGE="https://github.com/logrotate/logrotate"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz -> ${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 )"
+
+STATEFILE="/var/lib/misc/logrotate.status"
+OLDSTATEFILE="/var/lib/logrotate.status"
+
+move_old_state_file() {
+	elog "logrotate state file is now located at ${STATEFILE}"
+	elog "See bug #357275"
+	if [[ -e "${OLDSTATEFILE}" ]] ; then
+		elog "Moving your current state file to new location: ${STATEFILE}"
+		mv -n "${OLDSTATEFILE}" "${STATEFILE}"
+	fi
+}
+
+install_cron_file() {
+	exeinto /etc/cron.daily
+	newexe "${S}"/examples/logrotate.cron "${PN}"
+}
+
+PATCHES=(
+	"${FILESDIR}/${P}-ignore-hidden.patch"
+	"${FILESDIR}/${P}-fbsd.patch"
+)
+
+src_prepare() {
+	default
+	sed -i -e 's#/usr/sbin/logrotate#/usr/bin/logrotate#' "${S}"/examples/logrotate.{cron,service} || die
+}
+
+src_configure() {
+	econf $(use_with acl) $(use_with selinux) --with-state-file-path="${STATEFILE}"
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	insinto /usr
+	dobin logrotate
+	doman logrotate.8
+	dodoc ChangeLog.md examples/logrotate-default
+
+	insinto /etc
+	doins "${FILESDIR}"/logrotate.conf
+
+	use cron && install_cron_file
+
+	systemd_dounit examples/logrotate.{service,timer}
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}".conf
+
+	keepdir /etc/logrotate.d
+}
+
+pkg_postinst() {
+	elog
+	elog "The ${PN} binary is now installed under /usr/bin. Please"
+	elog "update your links"
+	elog
+	move_old_state_file
+	elog "If you are running systemd you might need to run:"
+	elog "systemd-tmpfiles --create /usr/lib/tmpfiles.d/logrotate.conf"
+	elog "in order to create the new location of the logrotate state file"
+	elog
+	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
+}