From 86de4ad3dcd3c7f328bffe0e85dd64fdfea874c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez@opensuse.org>
Date: Thu, 18 Nov 2010 12:49:58 +0000
Subject: [PATCH] Accepting request 53326 from home:lnussel:fscaps

OBS-URL: https://build.opensuse.org/request/show/53326
OBS-URL: https://build.opensuse.org/package/show/Base:System/aaa_base?expand=0&rev=169
---
 aaa_base-rpmlintrc |  2 +-
 aaa_base.changes   |  5 +++++
 aaa_base.post      | 38 +++++++++++++-------------------------
 aaa_base.spec      |  8 +++++++-
 aaa_base.tar.bz2   |  4 ++--
 5 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/aaa_base-rpmlintrc b/aaa_base-rpmlintrc
index 18192f7..c3ac916 100644
--- a/aaa_base-rpmlintrc
+++ b/aaa_base-rpmlintrc
@@ -23,7 +23,7 @@ addFilter("hidden-file-or-dir.*/root/.exrc")
 # perhaps should be configurable later...
 addFilter("non-etc-or-var-file-marked-as-conffile.*/sbin/quick_halt")
 # confirmed - but standard
-addFilter("non-root-group-log-file.*/var/log/lastlog.*tty")
+addFilter("non-root-group-log-file /var/log/wtmp utmp")
 # the following init script don't need to be reloaded - 
 # even after an update
 addFilter("no-reload-entry.*/etc/init.d/README")
diff --git a/aaa_base.changes b/aaa_base.changes
index 12764e6..329aea6 100644
--- a/aaa_base.changes
+++ b/aaa_base.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Nov 18 10:26:44 UTC 2010 - lnussel@suse.de
+
+- own /var/log/wtmp, /var/run/utmp, /var/log/faillog and /var/log/btmp
+
 -------------------------------------------------------------------
 Wed Nov 17 15:55:09 CET 2010 - ro@suse.de
 
diff --git a/aaa_base.post b/aaa_base.post
index 5b6ba9c..4786fc3 100644
--- a/aaa_base.post
+++ b/aaa_base.post
@@ -148,31 +148,19 @@ touch /etc/mtab
 if test ! -d /var/log ; then
     mkdir -p /var/log
 fi
-if test ! -e /var/log/faillog ; then
-    touch /var/log/faillog
-    chmod 600 /var/log/faillog
-    chown root:root /var/log/faillog
-fi
-if test ! -e /root/.bash_history ; then
-    touch /root/.bash_history
-    chmod 600 /root/.bash_history
-fi
-if test ! -e /var/log/lastlog ; then
-    touch /var/log/lastlog
-    chmod 644 /var/log/lastlog
-    chown root:utmp /var/log/lastlog
-fi
-if test ! -e /var/log/wtmp ; then
-    touch /var/log/wtmp
-    chmod 664 /var/log/wtmp
-    chown root:utmp /var/log/wtmp
-fi
-# The group ownership of the following files has changed for openSUSE 11.4
-# update it:
-chgrp utmp /var/log/wtmp /var/log/lastlog
-if test -e /var/run/utmp ; then
-    chgrp utmp /var/run/utmp
-fi
+
+while read file owner mode; do
+    test -e "$file" || touch "$file"
+    chmod "$mode" "$file"
+    chown "$owner" "$file"
+done <<EOT
+/root/.bash_history root:root 600
+/var/log/lastlog    root:root 644
+/var/log/faillog    root:root 600
+/var/log/wtmp       root:utmp 664
+/var/log/btmp       root:root 600
+/var/run/utmp       root:utmp 664
+EOT
 
 if test -e /usr/sbin/usrdel.local -a ! -e /usr/sbin/userdel.local ; then
     cp /usr/sbin/usrdel.local /usr/sbin/userdel.local
diff --git a/aaa_base.spec b/aaa_base.spec
index 6690aab..d6dd5e4 100644
--- a/aaa_base.spec
+++ b/aaa_base.spec
@@ -155,7 +155,13 @@ rm -f /root/.gnupg/secring.gpg.aaa_save
 %ghost /var/adm/fillup-templates/group.aaa_base
 %ghost /var/adm/fillup-templates/gshadow.aaa_base
 %ghost /var/adm/fillup-templates/shadow.aaa_base
-%ghost %attr(0644,root,utmp) %verify(not md5 size mtime) /var/log/lastlog
+# don't forget to also change aaa_base.post, boot.cleanup
+# and /etc/permissions!
+%ghost %attr(0644,root,root) %verify(not md5 size mtime) /var/log/lastlog
+%ghost %attr(0600,root,root) %verify(not md5 size mtime) /var/log/faillog
+%ghost %attr(0664,root,utmp) %verify(not md5 size mtime) /var/log/wtmp
+%ghost %attr(0600,root,root) %verify(not md5 size mtime) /var/log/btmp
+%ghost %attr(0664,root,utmp) %verify(not md5 size mtime) /var/run/utmp
 /etc/cron.daily/suse.de-clean-tmp
 /etc/hushlogins
 /etc/init.d/boot.cleanup
diff --git a/aaa_base.tar.bz2 b/aaa_base.tar.bz2
index 5842554..85fdb58 100644
--- a/aaa_base.tar.bz2
+++ b/aaa_base.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:208c58153b03b693632eabf10ceb5b238d37b9e7a1db5523ace198b22c003f1c
-size 81479
+oid sha256:0b98cd1ab6781638425c7371fbe046c6abfebb2e56a19419bf8ba37fb1baaeba
+size 81520