diff options
| author | root <root@rshg054.dnsready.net> | 2011-08-28 23:14:35 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2011-08-28 23:14:35 +0000 |
| commit | 57fc7b041fcd8bc73a40cd31d3b80bed779e79fe (patch) | |
| tree | 63093bd8fb4def305b25e47e4b42dcf50e1c8b45 /core | |
| parent | a4c358009dd89183b4124505c694ea7f5fcdbeec (diff) | |
Sun Aug 28 23:14:35 UTC 2011
Diffstat (limited to 'core')
| -rw-r--r-- | core/logrotate/PKGBUILD | 10 | ||||
| -rw-r--r-- | core/logrotate/logrotate-3.8.0-noasprintf.patch | 55 |
2 files changed, 62 insertions, 3 deletions
diff --git a/core/logrotate/PKGBUILD b/core/logrotate/PKGBUILD index 95a0681bd..901a55b64 100644 --- a/core/logrotate/PKGBUILD +++ b/core/logrotate/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 130804 2011-07-08 03:53:21Z eric $ +# $Id: PKGBUILD 136351 2011-08-27 04:08:31Z allan $ # Maintainer: Aaron Griffin <aaron@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=logrotate pkgver=3.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="Rotates system logs automatically" arch=('i686' 'x86_64') url="https://fedorahosted.org/logrotate/" @@ -13,15 +13,19 @@ groups=('base') depends=('popt' 'cron' 'gzip') backup=('etc/logrotate.conf') source=(https://fedorahosted.org/releases/l/o/logrotate/logrotate-${pkgver}.tar.gz + logrotate-3.8.0-noasprintf.patch logrotate.conf logrotate.cron.daily) md5sums=('590f77c13077a4c384dbec7ca9c5f242' + '624801859beb9abe7958b6392c854d72' '462a5f364717461537eb2ae6394ad23e' '8e23d5d4cc29b1e055b24df87e355cdc') build() { cd "$srcdir/${pkgname}-${pkgver}" - + + patch -Np1 -i "$srcdir"/logrotate-3.8.0-noasprintf.patch + sed -i 's|#define DEFAULT_MAIL_COMMAND .*|#define DEFAULT_MAIL_COMMAND "/usr/bin/mail"|'\ config.h sed -i "s|CFLAGS = -Wall|CFLAGS = -Wall $CFLAGS|" Makefile diff --git a/core/logrotate/logrotate-3.8.0-noasprintf.patch b/core/logrotate/logrotate-3.8.0-noasprintf.patch new file mode 100644 index 000000000..b9464e230 --- /dev/null +++ b/core/logrotate/logrotate-3.8.0-noasprintf.patch @@ -0,0 +1,55 @@ +diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN logrotate-3.8.0.orig/config.c logrotate-3.8.0/config.c +--- logrotate-3.8.0.orig/config.c 2011-06-21 04:12:02.000000000 -0400 ++++ logrotate-3.8.0/config.c 2011-07-12 13:47:36.274319050 -0400 +@@ -41,39 +41,6 @@ + #endif + #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 +- + enum { + STATE_DEFAULT = 2, + STATE_SKIP_LINE = 4, +diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN logrotate-3.8.0.orig/logrotate.h logrotate-3.8.0/logrotate.h +--- logrotate-3.8.0.orig/logrotate.h 2011-06-21 04:12:02.000000000 -0400 ++++ logrotate-3.8.0/logrotate.h 2011-07-12 13:47:38.949285608 -0400 +@@ -66,8 +66,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 |