diff options
author | Daniel Gryniewicz <dang@gentoo.org> | 2011-10-12 16:29:05 +0000 |
---|---|---|
committer | Daniel Gryniewicz <dang@gentoo.org> | 2011-10-12 16:29:05 +0000 |
commit | 117b2aeb3a656b8252ad98ff7a2071d5d02a714b (patch) | |
tree | 92f90016856bac20907d4c72122c968b26dc7b05 | |
parent | Version bump. (diff) | |
download | gentoo-2-117b2aeb3a656b8252ad98ff7a2071d5d02a714b.tar.gz gentoo-2-117b2aeb3a656b8252ad98ff7a2071d5d02a714b.tar.bz2 gentoo-2-117b2aeb3a656b8252ad98ff7a2071d5d02a714b.zip |
Bump to logrotate-3.8.1
(Portage version: 2.2.0_alpha66/cvs/Linux x86_64)
-rw-r--r-- | app-admin/logrotate/ChangeLog | 9 | ||||
-rw-r--r-- | app-admin/logrotate/files/logrotate-3.8.1-noasprintf.patch | 55 | ||||
-rw-r--r-- | app-admin/logrotate/logrotate-3.8.1.ebuild | 74 |
3 files changed, 137 insertions, 1 deletions
diff --git a/app-admin/logrotate/ChangeLog b/app-admin/logrotate/ChangeLog index 324b8c659131..4a55ecbeec09 100644 --- a/app-admin/logrotate/ChangeLog +++ b/app-admin/logrotate/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-admin/logrotate # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/ChangeLog,v 1.108 2011/08/07 17:32:21 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/ChangeLog,v 1.109 2011/10/12 16:29:05 dang Exp $ + +*logrotate-3.8.1 (12 Oct 2011) + + 12 Oct 2011; Daniel Gryniewicz <dang@gentoo.org> +logrotate-3.8.1.ebuild, + +files/logrotate-3.8.1-noasprintf.patch: + Bump to logrotate-3.8.1 + 07 Aug 2011; Raúl Porcel <armin76@gentoo.org> logrotate-3.8.0.ebuild: alpha/arm/ia64/s390/sh/sparc stable wrt #372973 diff --git a/app-admin/logrotate/files/logrotate-3.8.1-noasprintf.patch b/app-admin/logrotate/files/logrotate-3.8.1-noasprintf.patch new file mode 100644 index 000000000000..cc25fcf8dde8 --- /dev/null +++ b/app-admin/logrotate/files/logrotate-3.8.1-noasprintf.patch @@ -0,0 +1,55 @@ +diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN logrotate-3.8.1.orig/config.c logrotate-3.8.1/config.c +--- logrotate-3.8.1.orig/config.c 2011-08-31 08:39:04.000000000 -0400 ++++ logrotate-3.8.1/config.c 2011-10-12 12:15:04.975340954 -0400 +@@ -42,39 +42,6 @@ + #include "asprintf.c" + #endif + +-#if !defined(asprintf) +-#include <stdarg.h> +- +-int asprintf(char **string_ptr, const char *format, ...) +-{ +- va_list arg; +- char *str; +- int size; +- int rv; +- +- va_start(arg, format); +- size = vsnprintf(NULL, 0, format, arg); +- size++; +- va_start(arg, format); +- str = malloc(size); +- if (str == NULL) { +- va_end(arg); +- /* +- * Strictly speaking, GNU asprintf doesn't do this, +- * but the caller isn't checking the return value. +- */ +- fprintf(stderr, "failed to allocate memory\\n"); +- exit(1); +- } +- rv = vsnprintf(str, size, format, arg); +- va_end(arg); +- +- *string_ptr = str; +- return (rv); +-} +- +-#endif +- + #if !defined(strndup) + char *strndup(const char *s, size_t n) + { +diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN logrotate-3.8.1.orig/logrotate.h logrotate-3.8.1/logrotate.h +--- logrotate-3.8.1.orig/logrotate.h 2011-08-31 08:39:04.000000000 -0400 ++++ logrotate-3.8.1/logrotate.h 2011-10-12 12:13:01.258887623 -0400 +@@ -67,8 +67,5 @@ extern int numLogs; + extern int debug; + + int readAllConfigPaths(const char **paths); +-#if !defined(asprintf) +-int asprintf(char **string_ptr, const char *format, ...); +-#endif + + #endif diff --git a/app-admin/logrotate/logrotate-3.8.1.ebuild b/app-admin/logrotate/logrotate-3.8.1.ebuild new file mode 100644 index 000000000000..290f4a919a3c --- /dev/null +++ b/app-admin/logrotate/logrotate-3.8.1.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.8.1.ebuild,v 1.1 2011/10/12 16:29:05 dang Exp $ + +EAPI="2" + +inherit eutils toolchain-funcs flag-o-matic + +DESCRIPTION="Rotates, compresses, and mails system logs" +HOMEPAGE="https://fedorahosted.org/logrotate/" +SRC_URI="https://fedorahosted.org/releases/l/o/logrotate/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="acl selinux" + +RDEPEND=" + >=dev-libs/popt-1.5 + selinux? ( + sys-libs/libselinux + sec-policy/selinux-logrotate + ) + acl? ( virtual/acl )" + +DEPEND="${RDEPEND} + >=sys-apps/sed-4" + +src_prepare() { + strip-flags + + epatch \ + "${FILESDIR}"/${PN}-3.7.7-datehack.patch \ + "${FILESDIR}"/${PN}-3.8.0-ignore-hidden.patch \ + "${FILESDIR}"/${PN}-3.8.0-fbsd.patch \ + "${FILESDIR}"/${PN}-3.8.0-atomic-create.patch \ + "${FILESDIR}"/${PN}-3.8.1-noasprintf.patch +} + +src_configure() { + return +} + +src_compile() { + local myconf + myconf="CC=$(tc-getCC)" + use selinux && myconf="${myconf} WITH_SELINUX=yes" + use acl && myconf="${myconf} WITH_ACL=yes" + emake ${myconf} RPM_OPT_FLAGS="${CFLAGS}" || die "emake failed" +} + +src_install() { + insinto /usr + dosbin logrotate + doman logrotate.8 + dodoc CHANGES examples/logrotate* + + exeinto /etc/cron.daily + doexe "${FILESDIR}"/logrotate.cron + + insinto /etc + doins "${FILESDIR}"/logrotate.conf + + keepdir /etc/logrotate.d +} + +pkg_postinst() { + 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." +} |