[arch-commits] Commit in logrotate/trunk (PKGBUILD noasprintf.patch)
Pierre Schmitz
pierre at nymeria.archlinux.org
Mon Jun 10 13:11:31 UTC 2013
Date: Monday, June 10, 2013 @ 15:11:30
Author: pierre
Revision: 188139
upgpkg: logrotate 3.8.5-1
Modified:
logrotate/trunk/PKGBUILD
Deleted:
logrotate/trunk/noasprintf.patch
------------------+
PKGBUILD | 9 +++------
noasprintf.patch | 53 -----------------------------------------------------
2 files changed, 3 insertions(+), 59 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-06-10 13:01:07 UTC (rev 188138)
+++ PKGBUILD 2013-06-10 13:11:30 UTC (rev 188139)
@@ -2,8 +2,8 @@
# Maintainer: Pierre Schmitz <pierre at 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 @@
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 @@
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"
Deleted: noasprintf.patch
===================================================================
--- noasprintf.patch 2013-06-10 13:01:07 UTC (rev 188138)
+++ noasprintf.patch 2013-06-10 13:11:30 UTC (rev 188139)
@@ -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
More information about the arch-commits
mailing list