From: Daniel Gryniewicz Date: Wed, 12 Oct 2011 16:29:05 +0000 (+0000) Subject: Bump to logrotate-3.8.1 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=336d0e7114727181e8207513fddb171ff124f0da;p=gentoo.git Bump to logrotate-3.8.1 Package-Manager: portage-2.2.0_alpha66/cvs/Linux x86_64 --- 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 +logrotate-3.8.1.ebuild, + +files/logrotate-3.8.1-noasprintf.patch: + Bump to logrotate-3.8.1 + 07 Aug 2011; Raúl Porcel logrotate-3.8.0.ebuild: alpha/arm/ia64/s390/sh/sparc stable wrt #372973 diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest index 02146bf214e3..d5fe9da0bf5a 100644 --- a/app-admin/logrotate/Manifest +++ b/app-admin/logrotate/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA1 AUX logrotate-3.7.7-datehack.patch 589 RMD160 5b9314e3cd6f100cb0272146baceda01777e9614 SHA1 b5e6fb929ba777446c24e086ff8031ee3cc7ca07 SHA256 f68e360afe0a9ab28fa42775bdf0b7ddf4ff925e19a3786bcd40e0067ee4856d AUX logrotate-3.7.7-fbsd.patch 983 RMD160 727327c302e48a3cbea73f3429322c72a67e323f SHA1 5ac5bc9e037c494bb92731deba67e4ca4ad7110b SHA256 961676ab9a0d7f4e5030c4a04531cefc681bfcac883e329c2e1abfc48e790b23 @@ -14,24 +14,25 @@ AUX logrotate-3.8.0-atomic-create.patch 2260 RMD160 6aa29ed20746f69096db8b9f3dbc AUX logrotate-3.8.0-fbsd.patch 645 RMD160 168973d7a13c7e795df08f82fd14f5ab7815db37 SHA1 7a9fbe81fd748a4fc80e68307e10742114c1f253 SHA256 daa17ac29dd3ce2d4d714599816a8cb8d5716c3634833232ebeae69e81dd0b2b AUX logrotate-3.8.0-ignore-hidden.patch 701 RMD160 448b30ddf184ca42daba8e7dc149622ba47e6d01 SHA1 2b08eae87c74c2321713fa42331db90f235d1ea6 SHA256 2ac9d21993a2bb6f269e29472ac7427ad07636b3567540c149c835fdbb84e1b5 AUX logrotate-3.8.0-noasprintf.patch 1423 RMD160 ef135e46c755bb8ba7c2b1b79c95a8960ba803f2 SHA1 e477c20af97bd14b2d2975dfd77b092535369df1 SHA256 c1ee60a69e6372a5ce09ed4f888ebe1cdb070d282ca1d742fee4e3c9d9871c30 +AUX logrotate-3.8.1-noasprintf.patch 1452 RMD160 5f0a6783927c245d10b0d6ccad1c1cabdc5f83cf SHA1 67d60dc20ef42373bc31c05013007885824dab45 SHA256 03e67f55ef2997f10b5b0c5a527c3c966a32e02993e1a8690f70d61c5cb716c3 AUX logrotate.conf 860 RMD160 a7ab0fef1822d135fb1d194ced8d8ae487f729d8 SHA1 c9f1e3cab04c7fcc1a3a4bac5b0c54a88ee81fdb SHA256 5a0d6a2f331af0df8e0b87904ba522b64bfebc13f47b0a5717e03257d3f29ad7 AUX logrotate.cron 52 RMD160 fc2606fcd6d6bbdcf189ff3aa3a112e481182a9e SHA1 0a681301e9f22178691cae25799351c220712a7f SHA256 5eeae7dfbd54f74108d49cda8285211898d29ab7d547dee267803299e7339560 DIST logrotate-3.7.8.tar.gz 43246 RMD160 c90de0efe013b533eff50bb52e2bf6948b839572 SHA1 5742dc0d9541ac59eba5f5718520f7504aea2159 SHA256 21aa3dc830e8cc895ee4199d9325aa1e37cd3b525d0eaef400f66f6c7fc536dd DIST logrotate-3.7.9.tar.gz 45301 RMD160 e3fb77e37c454a52566f7d5b017d70c9dddf9b66 SHA1 b920f9664a2c930f1ccdabc0db4f31f67cf95661 SHA256 080caf904e70e04da16b8dfa95a5a787ec7d722ee1af18ccea437d3ffdd6fec0 DIST logrotate-3.8.0.tar.gz 48199 RMD160 7e1e24f53db5230eee2e1db8d90fe3a33692ca01 SHA1 a79c500c4ce45177b47bb473a6bff4021af7121e SHA256 5e52edc8c1894ab079ea3666cfd828085e3949388703f7236c39b2d20968536e +DIST logrotate-3.8.1.tar.gz 48827 RMD160 cec3bc6a4cb4226b31696977935818695027b0f8 SHA1 1df36cee76a9c4c7438f35ca3599a7bdd68a09b5 SHA256 c12471e70ae8bc923bd5c4f25e8fd6483b68c6301f3cd79f7cfe37bc5b370169 EBUILD logrotate-3.7.8.ebuild 1752 RMD160 5de4eb5d60f7dfeadcc50bd53b44f08cc13035a9 SHA1 e0abbca55ca6613dc3c775aeec600eb03a0d3d2f SHA256 07bd0d2cee517d1ab13be3a35b271eafaf54eff4bbbf692cf8667d0a47c330fd EBUILD logrotate-3.7.9-r1.ebuild 1939 RMD160 f168ab32712bf176d208e513da6c4593d298463f SHA1 a1e02efac76ced6f0cca8149a32ea55e731ec0ef SHA256 0deff84c669a0dfc71f35b6bbfb274fb70317f9c675a6c1924fe5b9fae49a24e EBUILD logrotate-3.7.9-r2.ebuild 1960 RMD160 676562cdcf413f54a902d1e89ccaae92ff963e58 SHA1 c7d953614487f8aea4933367847606cb6332ccab SHA256 d3dfecc2578d72c7241c820c7e3c75a667653aa4f5e1c76d825c5726a691bb84 EBUILD logrotate-3.7.9.ebuild 1762 RMD160 a52d82d66f8913ddbd3d6c2fe2b0507f3ccc32c0 SHA1 9f4a75e8544e9d0b26fc1731f56d39ac1f5088fe SHA256 9ea0798276040f707a4d35a4059263fef2523f78003e0b602fd55a6a04acd257 EBUILD logrotate-3.8.0.ebuild 1832 RMD160 36a20a3b3ebcdb982246505e3a9d5de5ce040761 SHA1 5fc7a4eff5125c6f658164d4444f521bacc4dcc2 SHA256 cb5dfe0f38c98eea602e91ce0dcb45febf529b0e71864b3a2d6206aafbe14719 -MISC ChangeLog 15645 RMD160 a76e3ee78e9c6e2dbc06e5fe85d5ae65654c301c SHA1 65c988ef7a78f3cec92a8145b1597ef44adb8ec6 SHA256 ea873ab26110944a9de04e2a139d2bbd2924009232cd9e4deaf174cbf5254c3b +EBUILD logrotate-3.8.1.ebuild 1840 RMD160 019f01f71e91b96008427044bb443ac8ea6d4e40 SHA1 7ba78e0366d9d05e02b6afe7312790be68799291 SHA256 60752972e569c5561e00415fc2a6255ee9401d525288f5f738f0625fa8fdb43c +MISC ChangeLog 15821 RMD160 ad46c0093b602fa014dbf0f779ed80b8f39b0fe2 SHA1 983a04284728a4cabe44677a5ea5b401c1045db5 SHA256 7d5ea4ddb7c24334b0ee14feb8c3a2f29798e3573b8822f2e9cb6c7d8cea3856 MISC metadata.xml 195 RMD160 9745a0d2105f89cee0e54d5623c28437accc884b SHA1 da79b0d676240dee59487d8a8421ee602f3f8768 SHA256 805c4bf919f9e32d75090171b348db225db7129d97e2053f6eeed565912266a0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iJwEAQEIAAYFAk589RYACgkQfXuS5UK5QB13QAP9E+vSjHGOK9OJ43HQE6TMAQFi -cQLkzYxWkfMP4pvCx7ANDNVW1W5oJtkSB19Eyw/bXl5QQoKrUwSTEcGxH+2epub9 -UV853ZjpfQqnutddHzjEp/NSMu5QNIqura8dz8e2zXXsTqg78DjXsjH2uu3wekyc -1j8eAtVH6TI6ojDMIjM= -=FTAz +iEYEARECAAYFAk6VwHwACgkQomPajV0RnrHxAACfcFgIWsbkoJLNRVYR9itFRGw4 +oJMAn3OjV2CLrn85m3lIMb6IHpVlwF9a +=SL2e -----END PGP SIGNATURE----- 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 +- +-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." +}