[Astlinux-commits] SF.net SVN: astlinux:[6165] branches/1.0

[<abe...@us...>]

Revision: 6165
          http://sourceforge.net/p/astlinux/code/6165
Author:   abelbeck
Date:     2013-08-06 12:58:43 +0000 (Tue, 06 Aug 2013)
Log Message:
-----------
logrotate, enable by default to manage non-syslog log files

Modified Paths:
--------------
    branches/1.0/astlinux-ast11.config
    branches/1.0/astlinux.config
    branches/1.0/astlinux18.config
    branches/1.0/package/logrotate/logrotate.conf
    branches/1.0/package/logrotate/logrotate.mk

Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config	2013-08-05 20:40:29 UTC (rev 6164)
+++ branches/1.0/astlinux-ast11.config	2013-08-06 12:58:43 UTC (rev 6165)
@@ -790,7 +790,7 @@
 # BR2_PACKAGE_FILE is not set
 # BR2_PACKAGE_INOTIFY_TOOLS is not set
 # BR2_PACKAGE_LOCKFILE_PROGS is not set
-# BR2_PACKAGE_LOGROTATE is not set
+BR2_PACKAGE_LOGROTATE=y
 BR2_PACKAGE_SCREEN=y
 BR2_PACKAGE_SUDO=y
 # BR2_PACKAGE_WHICH is not set

Modified: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config	2013-08-05 20:40:29 UTC (rev 6164)
+++ branches/1.0/astlinux.config	2013-08-06 12:58:43 UTC (rev 6165)
@@ -792,7 +792,7 @@
 # BR2_PACKAGE_FILE is not set
 # BR2_PACKAGE_INOTIFY_TOOLS is not set
 # BR2_PACKAGE_LOCKFILE_PROGS is not set
-# BR2_PACKAGE_LOGROTATE is not set
+BR2_PACKAGE_LOGROTATE=y
 BR2_PACKAGE_SCREEN=y
 BR2_PACKAGE_SUDO=y
 # BR2_PACKAGE_WHICH is not set

Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config	2013-08-05 20:40:29 UTC (rev 6164)
+++ branches/1.0/astlinux18.config	2013-08-06 12:58:43 UTC (rev 6165)
@@ -790,7 +790,7 @@
 # BR2_PACKAGE_FILE is not set
 # BR2_PACKAGE_INOTIFY_TOOLS is not set
 # BR2_PACKAGE_LOCKFILE_PROGS is not set
-# BR2_PACKAGE_LOGROTATE is not set
+BR2_PACKAGE_LOGROTATE=y
 BR2_PACKAGE_SCREEN=y
 BR2_PACKAGE_SUDO=y
 # BR2_PACKAGE_WHICH is not set

Modified: branches/1.0/package/logrotate/logrotate.conf
===================================================================
--- branches/1.0/package/logrotate/logrotate.conf	2013-08-05 20:40:29 UTC (rev 6164)
+++ branches/1.0/package/logrotate/logrotate.conf	2013-08-06 12:58:43 UTC (rev 6165)
@@ -1,14 +1,15 @@
-compress
-
+#
+# packages place log rotation information into this directory
 include /etc/logrotate.d
 
-/var/log/messages /var/log/auth.log /var/log/user.log {
-	rotate 7
-	daily
-	delaycompress
-	missingok
-	sharedscripts
-	postrotate
-		/usr/bin/killall -HUP syslogd
-	endscript
+# don't compress by default
+nocompress
+
+# no packages own wtmp -- we'll rotate it here
+/var/log/wtmp {
+  missingok
+  size 100k
+  create 0644 root root
+  rotate 1
 }
+

Modified: branches/1.0/package/logrotate/logrotate.mk
===================================================================
--- branches/1.0/package/logrotate/logrotate.mk	2013-08-05 20:40:29 UTC (rev 6164)
+++ branches/1.0/package/logrotate/logrotate.mk	2013-08-06 12:58:43 UTC (rev 6165)
@@ -3,9 +3,9 @@
 # logrotate
 #
 #############################################################
-LOGROTATE_VERSION = 3.7.9
+LOGROTATE_VERSION = 3.8.4
 LOGROTATE_SOURCE = logrotate-$(LOGROTATE_VERSION).tar.gz
-LOGROTATE_SITE = https://fedorahosted.org/releases/l/o/logrotate/
+LOGROTATE_SITE = https://www.fedorahosted.org/releases/l/o/logrotate
 
 LOGROTATE_DEPENDENCIES = popt
 
@@ -15,10 +15,10 @@
 
 define LOGROTATE_INSTALL_TARGET_CMDS
 	$(MAKE) PREFIX=$(TARGET_DIR) -C $(@D) install
-	if [ ! -f $(TARGET_DIR)/etc/logrotate.conf ]; then \
-		$(INSTALL) -m 0644 package/logrotate/logrotate.conf $(TARGET_DIR)/etc/logrotate.conf; \
+	$(INSTALL) -m 0644 package/logrotate/logrotate.conf $(TARGET_DIR)/etc/logrotate.conf
+	if [ ! -d $(TARGET_DIR)/etc/logrotate.d ]; then \
+		$(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/logrotate.d; \
 	fi
-	$(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/logrotate.d
 endef
 
 define LOGROTATE_UNINSTALL_TARGET_CMDS
@@ -26,7 +26,6 @@
 	rm -f $(TARGET_DIR)/etc/logrotate.conf
 	rm -f $(TARGET_DIR)/usr/man/man5/logrotate.conf.5
 	rm -f $(TARGET_DIR)/usr/man/man8/logrotate.8
-	rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/etc/logrotate.d
 endef
 
 define LOGROTATE_CLEAN_CMDS

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.