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 0B6C01382C5 for ; Thu, 1 Feb 2018 20:42:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 310A0E0942; Thu, 1 Feb 2018 20:42:24 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 00084E0942 for ; Thu, 1 Feb 2018 20:42:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 7F2C9335C63 for ; Thu, 1 Feb 2018 20:42:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 14EC81C0 for ; Thu, 1 Feb 2018 20:42:21 +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: <1517517655.49280b6dc51df4c4a73c27df24a38f8515fd4cf8.nimiux@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/logrotate/, app-admin/logrotate/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/logrotate/Manifest app-admin/logrotate/files/logrotate-3.12.3-fbsd.patch app-admin/logrotate/files/logrotate-3.12.3-ignore-hidden.patch app-admin/logrotate/logrotate-3.12.3-r1.ebuild app-admin/logrotate/logrotate-3.12.3-r2.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: 49280b6dc51df4c4a73c27df24a38f8515fd4cf8 X-VCS-Branch: master Date: Thu, 1 Feb 2018 20:42:21 +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: acf76d94-7693-4f45-8286-4d73ab932054 X-Archives-Hash: 6684979dc73be78fc051cf39e5a90bb5 commit: 49280b6dc51df4c4a73c27df24a38f8515fd4cf8 Author: Chema Alonso Josa gentoo org> AuthorDate: Thu Feb 1 20:40:05 2018 +0000 Commit: José María Alonso gentoo org> CommitDate: Thu Feb 1 20:40:55 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49280b6d app-admin/logrotate: Drops old version 3.12.3 Package-Manager: Portage-2.3.19, Repoman-2.3.6 app-admin/logrotate/Manifest | 1 - .../logrotate/files/logrotate-3.12.3-fbsd.patch | 36 -------- .../files/logrotate-3.12.3-ignore-hidden.patch | 14 --- app-admin/logrotate/logrotate-3.12.3-r1.ebuild | 99 ---------------------- app-admin/logrotate/logrotate-3.12.3-r2.ebuild | 99 ---------------------- 5 files changed, 249 deletions(-) diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest index 50ece1aff4f..c0753bf1cec 100644 --- a/app-admin/logrotate/Manifest +++ b/app-admin/logrotate/Manifest @@ -1,3 +1,2 @@ -DIST logrotate-3.12.3.tar.gz 202991 BLAKE2B 26e6507eeeeae15cfa1e183a64151a66600462a48aa6eb951b30634b90644b24ae7ceb9e26da5954919c83e05cab5a102589b621b7a8fdc8bea8d40dd1c813fe SHA512 ab700a50736c7ce8a6e5b9dc2504919c6d3e6ae48a7f112f6980253df5c6bab7fc507c82a0cd961d73ed1312c930da46d96d9f27046996644e0759c84c6a1ae9 DIST logrotate-3.13.0.tar.gz 213726 BLAKE2B b9970a0fb49b9de9c83ee679fd4587b6a1623cf1aae2444e818339361c7b7762ce51fcbd124fefafbe47d529dd21ef346a6c9a267da20547914388db99dce003 SHA512 3dec2fcdd674d3337b71fd70339cb5e3dd06b4bc24bee191356a30c2a211a290ae7747e63b90581e32a6d6d1f73cf62d5b0ee5a91aa05bad4d6ee403a35d9e76 DIST logrotate-3.9.1.tar.gz 79061 BLAKE2B b07f8fd8eb59cc4d6c80441a3b5a8aab090bc13eb8fa5e35b111feb2203fb2c3092daa469e6fec02a29b1d377bca33fbbf5859bcd351a1f4a0d82343c5f65d3d SHA512 e6da7c7f067befaf2441e9c6ce77e53cf5ddb4f56cc3304c3e50873b6f20c68520f4a0e50ec466cbebcbed20bfd77bf6dfc489975a8131e9573fb19856c0fe28 diff --git a/app-admin/logrotate/files/logrotate-3.12.3-fbsd.patch b/app-admin/logrotate/files/logrotate-3.12.3-fbsd.patch deleted file mode 100644 index 67a60e3af17..00000000000 --- a/app-admin/logrotate/files/logrotate-3.12.3-fbsd.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -Nuar a/config.c b/config.c ---- a/config.c 2017-04-22 23:46:08.201991730 +0200 -+++ b/config.c 2017-04-22 23:49:43.021996055 +0200 -@@ -25,6 +25,10 @@ - #include - #include - -+#if !defined(PATH_MAX) && defined(__FreeBSD__) -+#include -+#endif -+ - #include "log.h" - #include "logrotate.h" - -diff -Nuar a/logrotate.c b/logrotate.c ---- a/logrotate.c 2017-04-21 10:52:10.000000000 +0200 -+++ b/logrotate.c 2017-04-22 23:50:20.691996814 +0200 -@@ -1,6 +1,6 @@ - #include "queue.h" - /* alloca() is defined in stdlib.h in NetBSD */ --#ifndef __NetBSD__ -+#if !defined(__NetBSD__) && !defined(__FreeBSD__) - #include - #endif - #include -@@ -27,6 +27,10 @@ - #include - #endif - -+#if !defined(PATH_MAX) && defined(__FreeBSD__) -+#include -+#endif -+ - #include "log.h" - #include "logrotate.h" - diff --git a/app-admin/logrotate/files/logrotate-3.12.3-ignore-hidden.patch b/app-admin/logrotate/files/logrotate-3.12.3-ignore-hidden.patch deleted file mode 100644 index 0bbb91dcb4f..00000000000 --- a/app-admin/logrotate/files/logrotate-3.12.3-ignore-hidden.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nuar a/config.c b/config.c ---- a/config.c 2017-04-18 14:57:02.000000000 +0200 -+++ b/config.c 2017-04-22 23:46:08.201991730 +0200 -@@ -389,7 +389,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.12.3-r1.ebuild b/app-admin/logrotate/logrotate-3.12.3-r1.ebuild deleted file mode 100644 index 81b5ffc20c5..00000000000 --- a/app-admin/logrotate/logrotate-3.12.3-r1.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# 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} - - 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 - 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 -} diff --git a/app-admin/logrotate/logrotate-3.12.3-r2.ebuild b/app-admin/logrotate/logrotate-3.12.3-r2.ebuild deleted file mode 100644 index f0661a39594..00000000000 --- a/app-admin/logrotate/logrotate-3.12.3-r2.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# 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 -}