commit: f902818573513baad78ba32fb46ca7946ffd8d03 Author: Chema Alonso Josa <nimiux <AT> gentoo <DOT> org> AuthorDate: Sun Jul 2 14:08:26 2017 +0000 Commit: José María Alonso <nimiux <AT> gentoo <DOT> org> CommitDate: Sun Jul 2 14:09:13 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9028185
app-admin/logrotate: Bumps version to 3.12.3 and fixes some bugs. Bug: https://bugs.gentoo.org/show_bug.cgi?id=525418 Bug: https://bugs.gentoo.org/show_bug.cgi?id=621850 Closes: https://github.com/gentoo/gentoo/pull/4994 Package-Manager: Portage-2.3.6, Repoman-2.3.1 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.ebuild | 88 ++++++++++++++++++++++ app-admin/logrotate/metadata.xml | 1 + 5 files changed, 140 insertions(+) diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest index 071199755e3..ff140485d8e 100644 --- a/app-admin/logrotate/Manifest +++ b/app-admin/logrotate/Manifest @@ -1,4 +1,5 @@ DIST logrotate-3.11.0.tar.gz 176488 SHA256 7dcb440ed2f1937459e1e06f841c6af1e564b77b2df8009147b56c8649197910 SHA512 67ceb2e18c175a5935c81e7699af7a5e6625cef50a3f52e993d49d6c10d9c433f6c7354a8dd05cb35ab28e4393d1db198f2e46e5f6eafd3e6f040b6518438cc1 WHIRLPOOL 0a581aa5922386b84a7c40a9490364287f4e162f7180fd0e15bf191694294168b663947c7081e92755406fe4f0b3b8792b6f0c5f0e646afa5505a17995a86858 DIST logrotate-3.12.1.tar.gz 202420 SHA256 2f439241355cab306ed6b2e6c9450347a35806ee0377d86ef0eb1048ab3969a2 SHA512 3d84c835be9b3a394f5c0e6abd2519d572e4e2c49f807a31f94894adc0908457cdb3e33cb832f34febc25ce8e34be1e7091b489c14e84c59d58ad42787f91b16 WHIRLPOOL 282c98e66d5a723dcdbbf1ec20b0196e56523a7f3a05a9071ac56c841e88f1745fa35af78f43171e3e1de4c76566537a844e05f305373b5da28f83099ff4e27b 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.9.1.tar.gz 79061 SHA256 022769e3288c80981559a8421703c88e8438b447235e36dd3c8e97cd94c52545 SHA512 e6da7c7f067befaf2441e9c6ce77e53cf5ddb4f56cc3304c3e50873b6f20c68520f4a0e50ec466cbebcbed20bfd77bf6dfc489975a8131e9573fb19856c0fe28 WHIRLPOOL 9b3558bb03c6c95f8f386ea75ca09bfda802ae4c45b9ef8408692e3aa7a2ee57447cf15ce04d0289946b9cae2266acb5509d8151d15ac6ea0ad9113aeb32dc17 diff --git a/app-admin/logrotate/files/logrotate-3.12.3-fbsd.patch b/app-admin/logrotate/files/logrotate-3.12.3-fbsd.patch new file mode 100644 index 00000000000..67a60e3af17 --- /dev/null +++ b/app-admin/logrotate/files/logrotate-3.12.3-fbsd.patch @@ -0,0 +1,36 @@ +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 <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-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 <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.12.3-ignore-hidden.patch b/app-admin/logrotate/files/logrotate-3.12.3-ignore-hidden.patch new file mode 100644 index 00000000000..0bbb91dcb4f --- /dev/null +++ b/app-admin/logrotate/files/logrotate-3.12.3-ignore-hidden.patch @@ -0,0 +1,14 @@ +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.ebuild b/app-admin/logrotate/logrotate-3.12.3.ebuild new file mode 100644 index 00000000000..d455e749b40 --- /dev/null +++ b/app-admin/logrotate/logrotate-3.12.3.ebuild @@ -0,0 +1,88 @@ +# 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 bzip2" + +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 ) + bzip2? ( app-arch/bzip2 )" + +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 || die +} + +src_configure() { + if use bzip2 ; then + compressconf="--with-compress-command=/bin/bzip2 --with-uncompress-command=/bin/bunzip2 --with-compress-extension=.bz2" + fi + econf $(use_with acl) $(use_with selinux) ${compressconf} +} + +src_compile() { + emake RPM_OPT_FLAGS="${CFLAGS}" +} + +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 "The ${PN} binary is now installed under /usr/bin. Please" + elog "update your links" + 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/metadata.xml b/app-admin/logrotate/metadata.xml index e5648d41d70..de61486807a 100644 --- a/app-admin/logrotate/metadata.xml +++ b/app-admin/logrotate/metadata.xml @@ -22,6 +22,7 @@ <flag name="acl">Installs acl support</flag> <flag name="cron">Installs cron file</flag> <flag name="selinux">Installs Security Enhanced Linux support</flag> + <flag name="bzip2">Compresses rotated log files with bzip2 instead of gzip</flag> </use> <upstream> <remote-id type="github">logrotate/logrotate</remote-id>
