diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/logrotate/PKGBUILD | 11 | ||||
| -rw-r--r-- | core/logrotate/noasprintf.patch | 53 |
2 files changed, 4 insertions, 60 deletions
diff --git a/core/logrotate/PKGBUILD b/core/logrotate/PKGBUILD index f2760dfb8..fa71caa03 100644 --- a/core/logrotate/PKGBUILD +++ b/core/logrotate/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185626 2013-05-16 13:54:50Z pierre $ +# $Id: PKGBUILD 188802 2013-06-21 12:38:33Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=logrotate -pkgver=3.8.4 -pkgrel=2 +pkgver=3.8.5 +pkgrel=1 pkgdesc="Rotates system logs automatically" arch=('i686' 'x86_64') url="https://fedorahosted.org/logrotate/" @@ -13,12 +13,10 @@ depends=('popt' 'gzip' 'acl') optdepends=('cron: scheduled log rotation') backup=('etc/logrotate.conf') source=("https://fedorahosted.org/releases/l/o/logrotate/logrotate-${pkgver}.tar.gz" - 'noasprintf.patch' 'paths.patch' 'logrotate.conf' 'logrotate.cron.daily') -md5sums=('7be7f1eabea33a1d0483438a6e33d634' - 'cd76976b5ce37d328b452c806b55a015' +md5sums=('d3c13e2a963a55c584cfaa83e96b173d' 'e76526bcd6fc33c9d921e1cb1eff1ffb' '86209d257c8b8bc0ae34d6f6ef057c0f' '3909380f8a55fa160f62ed976a8bef4b') @@ -26,7 +24,6 @@ md5sums=('7be7f1eabea33a1d0483438a6e33d634' build() { cd "$srcdir/${pkgname}-${pkgver}" - patch -p0 -i "$srcdir/noasprintf.patch" patch -p0 -i "$srcdir/paths.patch" make WITH_ACL=yes RPM_OPT_FLAGS="$CFLAGS" EXTRA_LDFLAGS="$LDFLAGS" diff --git a/core/logrotate/noasprintf.patch b/core/logrotate/noasprintf.patch deleted file mode 100644 index 3df943b64..000000000 --- a/core/logrotate/noasprintf.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- config.c 2011-06-21 04:12:02.000000000 -0400 -+++ config.c 2011-07-12 13:47:36.274319050 -0400 -@@ -41,39 +41,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) - { ---- logrotate.h 2011-06-21 04:12:02.000000000 -0400 -+++ 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 |