app-admin/logrotate: Drop old
authorMikle Kolyada <zlogene@gentoo.org>
Sat, 25 Jan 2020 17:42:12 +0000 (20:42 +0300)
committerMikle Kolyada <zlogene@gentoo.org>
Sat, 25 Jan 2020 17:42:44 +0000 (20:42 +0300)
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>
app-admin/logrotate/Manifest
app-admin/logrotate/files/logrotate-3.13.0-fbsd.patch [deleted file]
app-admin/logrotate/files/logrotate-3.13.0-ignore-hidden.patch [deleted file]
app-admin/logrotate/logrotate-3.13.0.ebuild [deleted file]
app-admin/logrotate/logrotate-3.14.0.ebuild
app-admin/logrotate/logrotate-3.15.0.ebuild [deleted file]
app-admin/logrotate/logrotate-3.15.1.ebuild

index 811a098c7fe442eafacd5f835e74b9edae3561f4..8c77d7ead09b74bcd1defd7d9dcc4afc8f8dd250 100644 (file)
@@ -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 (file)
index 028dc05..0000000
+++ /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 (file)
index f3ade24..0000000
+++ /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 (file)
index 88d7a22..0000000
+++ /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
-}
index a33ee2fb1e622af0b1fe09424287c36b93bb490f..4cb39bde390021278c8a42e6ccca737d86c3a5e0 100644 (file)
@@ -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 (file)
index c2bec14..0000000
+++ /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
-}
index ee5b360db5be1237ad54394422c1861a9a87551f..58b95631d2dcfaa39dadcfdc94abb7f2e3a376de 100644 (file)
@@ -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() {