[arch-commits] Commit in logrotate/repos (22 files)

Allan McRae allan at archlinux.org
Tue Nov 20 02:56:24 UTC 2012


    Date: Monday, November 19, 2012 @ 21:56:24
  Author: allan
Revision: 171604

db-move: moved logrotate from [testing] to [core] (i686, x86_64)

Added:
  logrotate/repos/core-i686/PKGBUILD
    (from rev 171603, logrotate/repos/testing-i686/PKGBUILD)
  logrotate/repos/core-i686/logrotate.conf
    (from rev 171603, logrotate/repos/testing-i686/logrotate.conf)
  logrotate/repos/core-i686/logrotate.cron.daily
    (from rev 171603, logrotate/repos/testing-i686/logrotate.cron.daily)
  logrotate/repos/core-i686/noasprintf.patch
    (from rev 171603, logrotate/repos/testing-i686/noasprintf.patch)
  logrotate/repos/core-i686/paths.patch
    (from rev 171603, logrotate/repos/testing-i686/paths.patch)
  logrotate/repos/core-x86_64/PKGBUILD
    (from rev 171603, logrotate/repos/testing-x86_64/PKGBUILD)
  logrotate/repos/core-x86_64/logrotate.conf
    (from rev 171603, logrotate/repos/testing-x86_64/logrotate.conf)
  logrotate/repos/core-x86_64/logrotate.cron.daily
    (from rev 171603, logrotate/repos/testing-x86_64/logrotate.cron.daily)
  logrotate/repos/core-x86_64/noasprintf.patch
    (from rev 171603, logrotate/repos/testing-x86_64/noasprintf.patch)
  logrotate/repos/core-x86_64/paths.patch
    (from rev 171603, logrotate/repos/testing-x86_64/paths.patch)
Deleted:
  logrotate/repos/core-i686/PKGBUILD
  logrotate/repos/core-i686/logrotate.conf
  logrotate/repos/core-i686/logrotate.cron.daily
  logrotate/repos/core-i686/noasprintf.patch
  logrotate/repos/core-i686/paths.patch
  logrotate/repos/core-x86_64/PKGBUILD
  logrotate/repos/core-x86_64/logrotate.conf
  logrotate/repos/core-x86_64/logrotate.cron.daily
  logrotate/repos/core-x86_64/noasprintf.patch
  logrotate/repos/core-x86_64/paths.patch
  logrotate/repos/testing-i686/
  logrotate/repos/testing-x86_64/

----------------------------------+
 core-i686/PKGBUILD               |   91 ++++++++++++++++---------------
 core-i686/logrotate.conf         |   69 +++++++++++++-----------
 core-i686/logrotate.cron.daily   |   48 ++++++++--------
 core-i686/noasprintf.patch       |  106 ++++++++++++++++++-------------------
 core-i686/paths.patch            |   50 ++++++++---------
 core-x86_64/PKGBUILD             |   91 ++++++++++++++++---------------
 core-x86_64/logrotate.conf       |   69 +++++++++++++-----------
 core-x86_64/logrotate.cron.daily |   48 ++++++++--------
 core-x86_64/noasprintf.patch     |  106 ++++++++++++++++++-------------------
 core-x86_64/paths.patch          |   50 ++++++++---------
 10 files changed, 372 insertions(+), 356 deletions(-)

Deleted: core-i686/PKGBUILD
===================================================================
--- core-i686/PKGBUILD	2012-11-20 02:42:30 UTC (rev 171603)
+++ core-i686/PKGBUILD	2012-11-20 02:56:24 UTC (rev 171604)
@@ -1,45 +0,0 @@
-# $Id$
-# Maintainer: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=logrotate
-pkgver=3.8.2
-pkgrel=1
-pkgdesc="Rotates system logs automatically"
-arch=('i686' 'x86_64')
-url="https://fedorahosted.org/logrotate/"
-license=('GPL')
-groups=('base')
-depends=('popt' 'cron' 'gzip')
-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=('ddd4dcf28c38b3ac6bc6ff4e0148308a'
-         'cd76976b5ce37d328b452c806b55a015'
-         'e76526bcd6fc33c9d921e1cb1eff1ffb'
-         '462a5f364717461537eb2ae6394ad23e'
-         'aa8ac8283908b6114483a293adcb650f')
-
-build() {
-  cd "$srcdir/${pkgname}-${pkgver}"
-
-  patch -p0 -i "$srcdir/noasprintf.patch"
-  patch -p0 -i "$srcdir/paths.patch"
-
-  make RPM_OPT_FLAGS="$CFLAGS" EXTRA_LDFLAGS="$LDFLAGS"
-}
-
-check() {
-  cd "$srcdir/${pkgname}-${pkgver}"
-  make test
-}
-
-package() {
-  cd "$srcdir/${pkgname}-${pkgver}"
-  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"
-}

Copied: logrotate/repos/core-i686/PKGBUILD (from rev 171603, logrotate/repos/testing-i686/PKGBUILD)
===================================================================
--- core-i686/PKGBUILD	                        (rev 0)
+++ core-i686/PKGBUILD	2012-11-20 02:56:24 UTC (rev 171604)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=logrotate
+pkgver=3.8.2
+pkgrel=2
+pkgdesc="Rotates system logs automatically"
+arch=('i686' 'x86_64')
+url="https://fedorahosted.org/logrotate/"
+license=('GPL')
+groups=('base')
+depends=('popt' 'cron' 'gzip')
+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=('ddd4dcf28c38b3ac6bc6ff4e0148308a'
+         'cd76976b5ce37d328b452c806b55a015'
+         'e76526bcd6fc33c9d921e1cb1eff1ffb'
+         '86209d257c8b8bc0ae34d6f6ef057c0f'
+         'aa8ac8283908b6114483a293adcb650f')
+
+build() {
+  cd "$srcdir/${pkgname}-${pkgver}"
+
+  patch -p0 -i "$srcdir/noasprintf.patch"
+  patch -p0 -i "$srcdir/paths.patch"
+
+  make RPM_OPT_FLAGS="$CFLAGS" EXTRA_LDFLAGS="$LDFLAGS"
+}
+
+check() {
+  cd "$srcdir/${pkgname}-${pkgver}"
+  make test
+}
+
+package() {
+  cd "$srcdir/${pkgname}-${pkgver}"
+  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: core-i686/logrotate.conf
===================================================================
--- core-i686/logrotate.conf	2012-11-20 02:42:30 UTC (rev 171603)
+++ core-i686/logrotate.conf	2012-11-20 02:56:24 UTC (rev 171604)
@@ -1,31 +0,0 @@
-# see "man logrotate" for details
-# rotate log files weekly
-weekly
-
-# keep 4 weeks worth of backlogs
-rotate 4
-
-# restrict maximum size of log files
-#size 20M
-
-# create new (empty) log files after rotating old ones
-create
-
-# uncomment this if you want your log files compressed
-#compress
-
-# Logs are moved into directory for rotation
-# olddir /var/log/archive
-
-# Ignore pacman saved files
-tabooext + .pacorig .pacnew .pacsave
-
-# Arch packages drop log rotation information into this directory
-include /etc/logrotate.d
-
-/var/log/wtmp {
-    monthly
-    create 0664 root root
-    rotate 1
-}
-

Copied: logrotate/repos/core-i686/logrotate.conf (from rev 171603, logrotate/repos/testing-i686/logrotate.conf)
===================================================================
--- core-i686/logrotate.conf	                        (rev 0)
+++ core-i686/logrotate.conf	2012-11-20 02:56:24 UTC (rev 171604)
@@ -0,0 +1,38 @@
+# see "man logrotate" for details
+# rotate log files weekly
+weekly
+
+# keep 4 weeks worth of backlogs
+rotate 4
+
+# restrict maximum size of log files
+#size 20M
+
+# create new (empty) log files after rotating old ones
+create
+
+# uncomment this if you want your log files compressed
+#compress
+
+# Logs are moved into directory for rotation
+# olddir /var/log/archive
+
+# Ignore pacman saved files
+tabooext + .pacorig .pacnew .pacsave
+
+# Arch packages drop log rotation information into this directory
+include /etc/logrotate.d
+
+/var/log/wtmp {
+    monthly
+    create 0664 root utmp
+	minsize 1M
+    rotate 1
+}
+
+/var/log/btmp {
+    missingok
+    monthly
+    create 0600 root utmp
+    rotate 1
+}

Deleted: core-i686/logrotate.cron.daily
===================================================================
--- core-i686/logrotate.cron.daily	2012-11-20 02:42:30 UTC (rev 171603)
+++ core-i686/logrotate.cron.daily	2012-11-20 02:56:24 UTC (rev 171604)
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-# nicenesses range from -20 (most favorable scheduling) to 19 (least favorable)
-NICE=19
-
-# 0 for none, 1 for real time, 2 for best-effort, 3 for idle
-IONICE_CLASS=2
-
-# 0-7 (for IONICE_CLASS 1 and 2 only), 0=highest, 7=lowest
-IONICE_PRIORITY=7
-
-CMD_LOGROTATE="/usr/sbin/logrotate /etc/logrotate.conf"
- 
-if [ -x /usr/bin/nice ]; then
-  CMD_LOGROTATE="/usr/bin/nice -n ${NICE:-19} ${CMD_LOGROTATE}"
-fi
- 
-if [ -x /usr/bin/ionice ]; then
-  CMD_LOGROTATE="/usr/bin/ionice -c ${IONICE_CLASS:-2} -n ${IONICE_PRIORITY:-7} ${CMD_LOGROTATE}"
-fi
- 
-${CMD_LOGROTATE}
- 
-exit 0

Copied: logrotate/repos/core-i686/logrotate.cron.daily (from rev 171603, logrotate/repos/testing-i686/logrotate.cron.daily)
===================================================================
--- core-i686/logrotate.cron.daily	                        (rev 0)
+++ core-i686/logrotate.cron.daily	2012-11-20 02:56:24 UTC (rev 171604)
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+# nicenesses range from -20 (most favorable scheduling) to 19 (least favorable)
+NICE=19
+
+# 0 for none, 1 for real time, 2 for best-effort, 3 for idle
+IONICE_CLASS=2
+
+# 0-7 (for IONICE_CLASS 1 and 2 only), 0=highest, 7=lowest
+IONICE_PRIORITY=7
+
+CMD_LOGROTATE="/usr/sbin/logrotate /etc/logrotate.conf"
+ 
+if [ -x /usr/bin/nice ]; then
+  CMD_LOGROTATE="/usr/bin/nice -n ${NICE:-19} ${CMD_LOGROTATE}"
+fi
+ 
+if [ -x /usr/bin/ionice ]; then
+  CMD_LOGROTATE="/usr/bin/ionice -c ${IONICE_CLASS:-2} -n ${IONICE_PRIORITY:-7} ${CMD_LOGROTATE}"
+fi
+ 
+${CMD_LOGROTATE}
+ 
+exit 0

Deleted: core-i686/noasprintf.patch
===================================================================
--- core-i686/noasprintf.patch	2012-11-20 02:42:30 UTC (rev 171603)
+++ core-i686/noasprintf.patch	2012-11-20 02:56:24 UTC (rev 171604)
@@ -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

Copied: logrotate/repos/core-i686/noasprintf.patch (from rev 171603, logrotate/repos/testing-i686/noasprintf.patch)
===================================================================
--- core-i686/noasprintf.patch	                        (rev 0)
+++ core-i686/noasprintf.patch	2012-11-20 02:56:24 UTC (rev 171604)
@@ -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

Deleted: core-i686/paths.patch
===================================================================
--- core-i686/paths.patch	2012-11-20 02:42:30 UTC (rev 171603)
+++ core-i686/paths.patch	2012-11-20 02:56:24 UTC (rev 171604)
@@ -1,25 +0,0 @@
---- 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

Copied: logrotate/repos/core-i686/paths.patch (from rev 171603, logrotate/repos/testing-i686/paths.patch)
===================================================================
--- core-i686/paths.patch	                        (rev 0)
+++ core-i686/paths.patch	2012-11-20 02:56:24 UTC (rev 171604)
@@ -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

Deleted: core-x86_64/PKGBUILD
===================================================================
--- core-x86_64/PKGBUILD	2012-11-20 02:42:30 UTC (rev 171603)
+++ core-x86_64/PKGBUILD	2012-11-20 02:56:24 UTC (rev 171604)
@@ -1,45 +0,0 @@
-# $Id$
-# Maintainer: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=logrotate
-pkgver=3.8.2
-pkgrel=1
-pkgdesc="Rotates system logs automatically"
-arch=('i686' 'x86_64')
-url="https://fedorahosted.org/logrotate/"
-license=('GPL')
-groups=('base')
-depends=('popt' 'cron' 'gzip')
-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=('ddd4dcf28c38b3ac6bc6ff4e0148308a'
-         'cd76976b5ce37d328b452c806b55a015'
-         'e76526bcd6fc33c9d921e1cb1eff1ffb'
-         '462a5f364717461537eb2ae6394ad23e'
-         'aa8ac8283908b6114483a293adcb650f')
-
-build() {
-  cd "$srcdir/${pkgname}-${pkgver}"
-
-  patch -p0 -i "$srcdir/noasprintf.patch"
-  patch -p0 -i "$srcdir/paths.patch"
-
-  make RPM_OPT_FLAGS="$CFLAGS" EXTRA_LDFLAGS="$LDFLAGS"
-}
-
-check() {
-  cd "$srcdir/${pkgname}-${pkgver}"
-  make test
-}
-
-package() {
-  cd "$srcdir/${pkgname}-${pkgver}"
-  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"
-}

Copied: logrotate/repos/core-x86_64/PKGBUILD (from rev 171603, logrotate/repos/testing-x86_64/PKGBUILD)
===================================================================
--- core-x86_64/PKGBUILD	                        (rev 0)
+++ core-x86_64/PKGBUILD	2012-11-20 02:56:24 UTC (rev 171604)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=logrotate
+pkgver=3.8.2
+pkgrel=2
+pkgdesc="Rotates system logs automatically"
+arch=('i686' 'x86_64')
+url="https://fedorahosted.org/logrotate/"
+license=('GPL')
+groups=('base')
+depends=('popt' 'cron' 'gzip')
+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=('ddd4dcf28c38b3ac6bc6ff4e0148308a'
+         'cd76976b5ce37d328b452c806b55a015'
+         'e76526bcd6fc33c9d921e1cb1eff1ffb'
+         '86209d257c8b8bc0ae34d6f6ef057c0f'
+         'aa8ac8283908b6114483a293adcb650f')
+
+build() {
+  cd "$srcdir/${pkgname}-${pkgver}"
+
+  patch -p0 -i "$srcdir/noasprintf.patch"
+  patch -p0 -i "$srcdir/paths.patch"
+
+  make RPM_OPT_FLAGS="$CFLAGS" EXTRA_LDFLAGS="$LDFLAGS"
+}
+
+check() {
+  cd "$srcdir/${pkgname}-${pkgver}"
+  make test
+}
+
+package() {
+  cd "$srcdir/${pkgname}-${pkgver}"
+  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: core-x86_64/logrotate.conf
===================================================================
--- core-x86_64/logrotate.conf	2012-11-20 02:42:30 UTC (rev 171603)
+++ core-x86_64/logrotate.conf	2012-11-20 02:56:24 UTC (rev 171604)
@@ -1,31 +0,0 @@
-# see "man logrotate" for details
-# rotate log files weekly
-weekly
-
-# keep 4 weeks worth of backlogs
-rotate 4
-
-# restrict maximum size of log files
-#size 20M
-
-# create new (empty) log files after rotating old ones
-create
-
-# uncomment this if you want your log files compressed
-#compress
-
-# Logs are moved into directory for rotation
-# olddir /var/log/archive
-
-# Ignore pacman saved files
-tabooext + .pacorig .pacnew .pacsave
-
-# Arch packages drop log rotation information into this directory
-include /etc/logrotate.d
-
-/var/log/wtmp {
-    monthly
-    create 0664 root root
-    rotate 1
-}
-

Copied: logrotate/repos/core-x86_64/logrotate.conf (from rev 171603, logrotate/repos/testing-x86_64/logrotate.conf)
===================================================================
--- core-x86_64/logrotate.conf	                        (rev 0)
+++ core-x86_64/logrotate.conf	2012-11-20 02:56:24 UTC (rev 171604)
@@ -0,0 +1,38 @@
+# see "man logrotate" for details
+# rotate log files weekly
+weekly
+
+# keep 4 weeks worth of backlogs
+rotate 4
+
+# restrict maximum size of log files
+#size 20M
+
+# create new (empty) log files after rotating old ones
+create
+
+# uncomment this if you want your log files compressed
+#compress
+
+# Logs are moved into directory for rotation
+# olddir /var/log/archive
+
+# Ignore pacman saved files
+tabooext + .pacorig .pacnew .pacsave
+
+# Arch packages drop log rotation information into this directory
+include /etc/logrotate.d
+
+/var/log/wtmp {
+    monthly
+    create 0664 root utmp
+	minsize 1M
+    rotate 1
+}
+
+/var/log/btmp {
+    missingok
+    monthly
+    create 0600 root utmp
+    rotate 1
+}

Deleted: core-x86_64/logrotate.cron.daily
===================================================================
--- core-x86_64/logrotate.cron.daily	2012-11-20 02:42:30 UTC (rev 171603)
+++ core-x86_64/logrotate.cron.daily	2012-11-20 02:56:24 UTC (rev 171604)
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-# nicenesses range from -20 (most favorable scheduling) to 19 (least favorable)
-NICE=19
-
-# 0 for none, 1 for real time, 2 for best-effort, 3 for idle
-IONICE_CLASS=2
-
-# 0-7 (for IONICE_CLASS 1 and 2 only), 0=highest, 7=lowest
-IONICE_PRIORITY=7
-
-CMD_LOGROTATE="/usr/sbin/logrotate /etc/logrotate.conf"
- 
-if [ -x /usr/bin/nice ]; then
-  CMD_LOGROTATE="/usr/bin/nice -n ${NICE:-19} ${CMD_LOGROTATE}"
-fi
- 
-if [ -x /usr/bin/ionice ]; then
-  CMD_LOGROTATE="/usr/bin/ionice -c ${IONICE_CLASS:-2} -n ${IONICE_PRIORITY:-7} ${CMD_LOGROTATE}"
-fi
- 
-${CMD_LOGROTATE}
- 
-exit 0

Copied: logrotate/repos/core-x86_64/logrotate.cron.daily (from rev 171603, logrotate/repos/testing-x86_64/logrotate.cron.daily)
===================================================================
--- core-x86_64/logrotate.cron.daily	                        (rev 0)
+++ core-x86_64/logrotate.cron.daily	2012-11-20 02:56:24 UTC (rev 171604)
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+# nicenesses range from -20 (most favorable scheduling) to 19 (least favorable)
+NICE=19
+
+# 0 for none, 1 for real time, 2 for best-effort, 3 for idle
+IONICE_CLASS=2
+
+# 0-7 (for IONICE_CLASS 1 and 2 only), 0=highest, 7=lowest
+IONICE_PRIORITY=7
+
+CMD_LOGROTATE="/usr/sbin/logrotate /etc/logrotate.conf"
+ 
+if [ -x /usr/bin/nice ]; then
+  CMD_LOGROTATE="/usr/bin/nice -n ${NICE:-19} ${CMD_LOGROTATE}"
+fi
+ 
+if [ -x /usr/bin/ionice ]; then
+  CMD_LOGROTATE="/usr/bin/ionice -c ${IONICE_CLASS:-2} -n ${IONICE_PRIORITY:-7} ${CMD_LOGROTATE}"
+fi
+ 
+${CMD_LOGROTATE}
+ 
+exit 0

Deleted: core-x86_64/noasprintf.patch
===================================================================
--- core-x86_64/noasprintf.patch	2012-11-20 02:42:30 UTC (rev 171603)
+++ core-x86_64/noasprintf.patch	2012-11-20 02:56:24 UTC (rev 171604)
@@ -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

Copied: logrotate/repos/core-x86_64/noasprintf.patch (from rev 171603, logrotate/repos/testing-x86_64/noasprintf.patch)
===================================================================
--- core-x86_64/noasprintf.patch	                        (rev 0)
+++ core-x86_64/noasprintf.patch	2012-11-20 02:56:24 UTC (rev 171604)
@@ -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

Deleted: core-x86_64/paths.patch
===================================================================
--- core-x86_64/paths.patch	2012-11-20 02:42:30 UTC (rev 171603)
+++ core-x86_64/paths.patch	2012-11-20 02:56:24 UTC (rev 171604)
@@ -1,25 +0,0 @@
---- 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

Copied: logrotate/repos/core-x86_64/paths.patch (from rev 171603, logrotate/repos/testing-x86_64/paths.patch)
===================================================================
--- core-x86_64/paths.patch	                        (rev 0)
+++ core-x86_64/paths.patch	2012-11-20 02:56:24 UTC (rev 171604)
@@ -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