From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8E3971382C5 for ; Fri, 9 Mar 2018 19:17:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9A4CAE08EE; Fri, 9 Mar 2018 19:17:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 63EA7E08EE for ; Fri, 9 Mar 2018 19:17:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D2B0D335C31 for ; Fri, 9 Mar 2018 19:16:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2842021D for ; Fri, 9 Mar 2018 19:16:58 +0000 (UTC) From: "José María Alonso" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "José María Alonso" Message-ID: <1520622996.44443cb00e9b57dd4566bf845b45bbce77b06d4c.nimiux@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/logrotate/files/, app-admin/logrotate/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/logrotate/Manifest app-admin/logrotate/files/logrotate-3.14.0-ignore-hidden.patch app-admin/logrotate/logrotate-3.14.0.ebuild X-VCS-Directories: app-admin/logrotate/ app-admin/logrotate/files/ X-VCS-Committer: nimiux X-VCS-Committer-Name: José María Alonso X-VCS-Revision: 44443cb00e9b57dd4566bf845b45bbce77b06d4c X-VCS-Branch: master Date: Fri, 9 Mar 2018 19:16:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: afe17872-cda6-4fd6-ad08-47d7172e3af0 X-Archives-Hash: 066c38d5d07e21bed2a5b6946f80f498 commit: 44443cb00e9b57dd4566bf845b45bbce77b06d4c Author: Chema Alonso Josa gentoo org> AuthorDate: Fri Mar 9 19:16:08 2018 +0000 Commit: José María Alonso gentoo org> CommitDate: Fri Mar 9 19:16:36 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44443cb0 app-admin/logrotate: Bumps version to 3.14.0 Package-Manager: Portage-2.3.19, Repoman-2.3.6 app-admin/logrotate/Manifest | 1 + .../files/logrotate-3.14.0-ignore-hidden.patch | 14 ++++ app-admin/logrotate/logrotate-3.14.0.ebuild | 98 ++++++++++++++++++++++ 3 files changed, 113 insertions(+) diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest index c0753bf1cec..9fe40fb9471 100644 --- a/app-admin/logrotate/Manifest +++ b/app-admin/logrotate/Manifest @@ -1,2 +1,3 @@ DIST logrotate-3.13.0.tar.gz 213726 BLAKE2B b9970a0fb49b9de9c83ee679fd4587b6a1623cf1aae2444e818339361c7b7762ce51fcbd124fefafbe47d529dd21ef346a6c9a267da20547914388db99dce003 SHA512 3dec2fcdd674d3337b71fd70339cb5e3dd06b4bc24bee191356a30c2a211a290ae7747e63b90581e32a6d6d1f73cf62d5b0ee5a91aa05bad4d6ee403a35d9e76 +DIST logrotate-3.14.0.tar.gz 215413 BLAKE2B 7914188922d81b1f8b6c4e493fae71d23bc9e65ebfcb190ebb4287c875af53204cbecb51c2731a3dc57530a30c685c3a626074265d9a2462714ff6ff077ea5ca SHA512 5f584d9be01737960eaffcf43746270a5395486d2161577a9ee3e757cb4dfe5a207c8b1d097181dd413560d76ecc0e3d526f87d1b123a52dc3e5e49d529a5fb5 DIST logrotate-3.9.1.tar.gz 79061 BLAKE2B b07f8fd8eb59cc4d6c80441a3b5a8aab090bc13eb8fa5e35b111feb2203fb2c3092daa469e6fec02a29b1d377bca33fbbf5859bcd351a1f4a0d82343c5f65d3d SHA512 e6da7c7f067befaf2441e9c6ce77e53cf5ddb4f56cc3304c3e50873b6f20c68520f4a0e50ec466cbebcbed20bfd77bf6dfc489975a8131e9573fb19856c0fe28 diff --git a/app-admin/logrotate/files/logrotate-3.14.0-ignore-hidden.patch b/app-admin/logrotate/files/logrotate-3.14.0-ignore-hidden.patch new file mode 100644 index 00000000000..6745126259b --- /dev/null +++ b/app-admin/logrotate/files/logrotate-3.14.0-ignore-hidden.patch @@ -0,0 +1,14 @@ +diff -Nuar a/config.c b/config.c +--- a/config.c 2018-03-09 17:47:08.000000000 +0100 ++++ b/config.c 2018-03-09 19:47:42.274696766 +0100 +@@ -440,7 +440,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.14.0.ebuild b/app-admin/logrotate/logrotate-3.14.0.ebuild new file mode 100644 index 00000000000..901ce887429 --- /dev/null +++ b/app-admin/logrotate/logrotate-3.14.0.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2018 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" +) + +src_prepare() { + sed -i -e 's#/usr/sbin/logrotate#/usr/bin/logrotate#' "${S}"/examples/logrotate.{cron,service} || die + eapply_user +} + +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 +}