From: "Mikle Kolyada" <zlogene@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/logrotate/files/, app-admin/logrotate/
Date: Sat, 25 Jan 2020 17:42:48 +0000 (UTC) [thread overview]
Message-ID: <1579974164.e238b6738bace0fa835d138ba15a6d1d6b11f83e.zlogene@gentoo> (raw)
commit: e238b6738bace0fa835d138ba15a6d1d6b11f83e
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 25 17:42:12 2020 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Jan 25 17:42:44 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e238b673
app-admin/logrotate: Drop old
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
app-admin/logrotate/Manifest | 2 -
.../logrotate/files/logrotate-3.13.0-fbsd.patch | 36 --------
.../files/logrotate-3.13.0-ignore-hidden.patch | 14 ---
app-admin/logrotate/logrotate-3.13.0.ebuild | 99 ----------------------
app-admin/logrotate/logrotate-3.14.0.ebuild | 15 ++--
app-admin/logrotate/logrotate-3.15.0.ebuild | 98 ---------------------
app-admin/logrotate/logrotate-3.15.1.ebuild | 15 ++--
7 files changed, 18 insertions(+), 261 deletions(-)
diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index 811a098c7fe..8c77d7ead09 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -1,4 +1,2 @@
-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.15.0.tar.gz 219496 BLAKE2B b9f9cd0b22b79c3da1ea6092c5f3ebf9fca39da3a4bb7e1da39a8bf96f0bdb573864b77681671ad227cfc444bbc3e64a518805780580adb954bfacd564f00e2f SHA512 9520f15eaec54da426699f1f5ce31949d1372fa25c5c127dfbf29ff717a1c15a6fd14437c1d7b67b116b12c8a5c28f6012e39ad4b3ca2b053c874d02efe98d84
DIST logrotate-3.15.1.tar.gz 220263 BLAKE2B c164c542a0770965f5193f5816509f566b9afeb82ce8388a184d16c2b3e79aa0ef93be10d477c85f62037f01b3e626ea56d3173ca8cf017b8aa315f2e23b1a2b SHA512 72294607762751fb1aaaca1d62ebd87d109d837d50606176159a5e74782a993123321967b7a6185df6ca9c87a54febb832ac7537ceaa580a895901a995570cd5
diff --git a/app-admin/logrotate/files/logrotate-3.13.0-fbsd.patch b/app-admin/logrotate/files/logrotate-3.13.0-fbsd.patch
deleted file mode 100644
index 028dc0551f1..00000000000
--- a/app-admin/logrotate/files/logrotate-3.13.0-fbsd.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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
deleted file mode 100644
index f3ade248d38..00000000000
--- a/app-admin/logrotate/files/logrotate-3.13.0-ignore-hidden.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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
deleted file mode 100644
index 88d7a22eb14..00000000000
--- a/app-admin/logrotate/logrotate-3.13.0.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# 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"
-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
-}
diff --git a/app-admin/logrotate/logrotate-3.14.0.ebuild b/app-admin/logrotate/logrotate-3.14.0.ebuild
index a33ee2fb1e6..4cb39bde390 100644
--- a/app-admin/logrotate/logrotate-3.14.0.ebuild
+++ b/app-admin/logrotate/logrotate-3.14.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit systemd
@@ -14,15 +14,15 @@ SLOT="0"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
IUSE="acl +cron selinux"
-CDEPEND="
+COMMON_DEPEND="
>=dev-libs/popt-1.5
selinux? ( sys-libs/libselinux )
acl? ( virtual/acl )"
-DEPEND="${CDEPEND}
+DEPEND="${COMMON_DEPEND}
>=sys-apps/sed-4"
-RDEPEND="${CDEPEND}
+RDEPEND="${COMMON_DEPEND}
selinux? ( sec-policy/selinux-logrotate )
cron? ( virtual/cron )"
@@ -53,7 +53,10 @@ src_prepare() {
}
src_configure() {
- econf $(use_with acl) $(use_with selinux) --with-state-file-path="${STATEFILE}"
+ econf \
+ $(use_with acl) \
+ $(use_with selinux) \
+ --with-state-file-path="${STATEFILE}"
}
src_test() {
diff --git a/app-admin/logrotate/logrotate-3.15.0.ebuild b/app-admin/logrotate/logrotate-3.15.0.ebuild
deleted file mode 100644
index c2bec14c848..00000000000
--- a/app-admin/logrotate/logrotate-3.15.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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"
-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
- default
-}
-
-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
-
- 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
-}
diff --git a/app-admin/logrotate/logrotate-3.15.1.ebuild b/app-admin/logrotate/logrotate-3.15.1.ebuild
index ee5b360db5b..58b95631d2d 100644
--- a/app-admin/logrotate/logrotate-3.15.1.ebuild
+++ b/app-admin/logrotate/logrotate-3.15.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit systemd
@@ -14,15 +14,15 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
IUSE="acl +cron selinux"
-CDEPEND="
+COMMON_DEPEND="
>=dev-libs/popt-1.5
selinux? ( sys-libs/libselinux )
acl? ( virtual/acl )"
-DEPEND="${CDEPEND}
+DEPEND="${COMMON_DEPEND}
>=sys-apps/sed-4"
-RDEPEND="${CDEPEND}
+RDEPEND="${COMMON_DEPEND}
selinux? ( sec-policy/selinux-logrotate )
cron? ( virtual/cron )"
@@ -53,7 +53,10 @@ src_prepare() {
}
src_configure() {
- econf $(use_with acl) $(use_with selinux) --with-state-file-path="${STATEFILE}"
+ econf \
+ $(use_with acl) \
+ $(use_with selinux) \
+ --with-state-file-path="${STATEFILE}"
}
src_test() {
next reply other threads:[~2020-01-25 17:42 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-25 17:42 Mikle Kolyada [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-06-07 1:31 [gentoo-commits] repo/gentoo:master commit in: app-admin/logrotate/files/, app-admin/logrotate/ Sam James
2018-03-09 19:16 José María Alonso
2017-10-24 19:21 José María Alonso
2017-10-04 20:48 José María Alonso
2017-08-18 14:35 José María Alonso
2017-07-02 14:09 José María Alonso
2017-05-04 8:44 José María Alonso
2017-04-22 22:12 José María Alonso
2016-12-02 22:57 José María Alonso
2016-08-03 22:03 José María Alonso
2015-09-12 3:40 Mike Frysinger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1579974164.e238b6738bace0fa835d138ba15a6d1d6b11f83e.zlogene@gentoo \
--to=zlogene@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox