[arch-commits] Commit in logrotate/trunk (4 files)
Pierre Schmitz
pierre at archlinux.org
Fri Aug 3 08:05:11 UTC 2012
Date: Friday, August 3, 2012 @ 04:05:11
Author: pierre
Revision: 164698
upgpkg: logrotate 3.8.2-1
upstream update
Added:
logrotate/trunk/noasprintf.patch
(from rev 164695, logrotate/trunk/logrotate-3.8.1-noasprintf.patch)
logrotate/trunk/paths.patch
Modified:
logrotate/trunk/PKGBUILD
Deleted:
logrotate/trunk/logrotate-3.8.1-noasprintf.patch
----------------------------------+
PKGBUILD | 22 ++++++---------
logrotate-3.8.1-noasprintf.patch | 53 -------------------------------------
noasprintf.patch | 53 +++++++++++++++++++++++++++++++++++++
paths.patch | 25 +++++++++++++++++
4 files changed, 88 insertions(+), 65 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-08-03 07:57:29 UTC (rev 164697)
+++ PKGBUILD 2012-08-03 08:05:11 UTC (rev 164698)
@@ -2,8 +2,8 @@
# Maintainer: Pierre Schmitz <pierre at archlinux.de>
pkgname=logrotate
-pkgver=3.8.1
-pkgrel=2
+pkgver=3.8.2
+pkgrel=1
pkgdesc="Rotates system logs automatically"
arch=('i686' 'x86_64')
url="https://fedorahosted.org/logrotate/"
@@ -12,24 +12,22 @@
depends=('popt' 'cron' 'gzip')
backup=('etc/logrotate.conf')
source=("https://fedorahosted.org/releases/l/o/logrotate/logrotate-${pkgver}.tar.gz"
- 'logrotate-3.8.1-noasprintf.patch'
+ 'noasprintf.patch'
+ 'paths.patch'
'logrotate.conf'
'logrotate.cron.daily')
-md5sums=('bd2e20d8dc644291b08f9215397d28a5'
- 'fc8e4e15211d8aefd431d0e2e96223c4'
+md5sums=('ddd4dcf28c38b3ac6bc6ff4e0148308a'
+ 'cd76976b5ce37d328b452c806b55a015'
+ 'e76526bcd6fc33c9d921e1cb1eff1ffb'
'462a5f364717461537eb2ae6394ad23e'
'aa8ac8283908b6114483a293adcb650f')
build() {
cd "$srcdir/${pkgname}-${pkgver}"
- patch -p1 -i "$srcdir"/logrotate-3.8.1-noasprintf.patch
+ patch -p0 -i "$srcdir/noasprintf.patch"
+ patch -p0 -i "$srcdir/paths.patch"
- sed -e 's|#define DEFAULT_MAIL_COMMAND .*|#define DEFAULT_MAIL_COMMAND "/usr/bin/mail"|'\
- -e 's|#define COMPRESS_COMMAND .*|#define COMPRESS_COMMAND "/usr/bin/gzip"|'\
- -e 's|#define UNCOMPRESS_COMMAND .*|#define UNCOMPRESS_COMMAND "/usr/bin/gunzip"|'\
- -i config.h
-
make RPM_OPT_FLAGS="$CFLAGS" EXTRA_LDFLAGS="$LDFLAGS"
}
@@ -40,7 +38,7 @@
package() {
cd "$srcdir/${pkgname}-${pkgver}"
- make PREFIX="$pkgdir" MANDIR="usr/share/man" install
+ make PREFIX="$pkgdir" MANDIR="/usr/share/man" install
install -Dm644 "$srcdir/logrotate.conf" "$pkgdir/etc/logrotate.conf"
install -Dm744 "$srcdir/logrotate.cron.daily" "$pkgdir/etc/cron.daily/logrotate"
Deleted: logrotate-3.8.1-noasprintf.patch
===================================================================
--- logrotate-3.8.1-noasprintf.patch 2012-08-03 07:57:29 UTC (rev 164697)
+++ logrotate-3.8.1-noasprintf.patch 2012-08-03 08:05:11 UTC (rev 164698)
@@ -1,53 +0,0 @@
---- 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 @@
- #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-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
Copied: logrotate/trunk/noasprintf.patch (from rev 164695, logrotate/trunk/logrotate-3.8.1-noasprintf.patch)
===================================================================
--- noasprintf.patch (rev 0)
+++ noasprintf.patch 2012-08-03 08:05:11 UTC (rev 164698)
@@ -0,0 +1,53 @@
+--- 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
Added: paths.patch
===================================================================
--- paths.patch (rev 0)
+++ paths.patch 2012-08-03 08:05:11 UTC (rev 164698)
@@ -0,0 +1,25 @@
+--- config.h 2012-08-01 12:56:47.000000000 +0200
++++ config.h 2012-08-03 09:53:05.025039199 +0200
+@@ -27,11 +27,11 @@
+ * Default settings for Linux - leave these last.
+ */
+ #ifndef DEFAULT_MAIL_COMMAND
+-#define DEFAULT_MAIL_COMMAND "/bin/mail"
++#define DEFAULT_MAIL_COMMAND "/usr/bin/mail"
+ #endif
+
+ #ifndef COMPRESS_COMMAND
+-#define COMPRESS_COMMAND "/bin/gzip"
++#define COMPRESS_COMMAND "/usr/bin/gzip"
+ #endif
+
+ #ifndef COMPRESS_EXT
+@@ -39,7 +39,7 @@
+ #endif
+
+ #ifndef UNCOMPRESS_COMMAND
+-#define UNCOMPRESS_COMMAND "/bin/gunzip"
++#define UNCOMPRESS_COMMAND "/usr/bin/gunzip"
+ #endif
+
+ #ifndef STATEFILE
More information about the arch-commits
mailing list