diff --git a/aaa_base-rpmlintrc b/aaa_base-rpmlintrc index 82ec4d5..a3d54d0 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 786ff51..873120b 100644 --- a/aaa_base.changes +++ b/aaa_base.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +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 + +- fix typo (merge conflict overlooked) + +------------------------------------------------------------------- +Wed Nov 17 12:53:36 CET 2010 - ro@suse.de + +- fix postinstall to test for existence of /var/run/utmp + before trying to chgrp + ------------------------------------------------------------------- Tue Nov 16 09:51:52 UTC 2010 - aj@suse.de @@ -34,6 +50,21 @@ Wed Nov 10 11:27:14 CET 2010 - ro@suse.de - keep /etc/mtab unchanged if it is a symlink (bnc#651555) +------------------------------------------------------------------- +Tue Nov 9 15:37:06 UTC 2010 - lnussel@suse.de + +- remove weird filelist generation code + +------------------------------------------------------------------- +Tue Nov 9 15:17:51 UTC 2010 - lnussel@suse.de + +- remove /usr/sbin/Check + +------------------------------------------------------------------- +Tue Nov 9 13:05:26 UTC 2010 - lnussel@suse.de + +- move chkstat calls to brp-permissions in brp-checks-suse + ------------------------------------------------------------------- Thu Nov 4 15:58:47 UTC 2010 - lnussel@suse.de diff --git a/aaa_base.extrafilelist b/aaa_base.extrafilelist deleted file mode 100644 index f08a93d..0000000 --- a/aaa_base.extrafilelist +++ /dev/null @@ -1,25 +0,0 @@ -/etc/DIR_COLORS -/etc/cron.daily/suse.de-backup-rc.config -/etc/cron.daily/suse.de-backup-rpmdb -/etc/cron.daily/suse.de-check-battery -/etc/cron.daily/suse.de-cron-local -/etc/skel/.emacs -/etc/skel/.inputrc -/etc/java/README -/etc/profile.d/complete.bash -/etc/profile.d/alias.ash -/etc/profile.d/alias.bash -/etc/profile.d/alias.tcsh -/etc/profile.d/ls.tcsh -/etc/profile.d/ls.bash -/etc/init.d/skeleton -/etc/init.d/skeleton.compat -/root/.exrc -/sbin/quick_halt -/sbin/quick_poweroff -/sbin/quick_reboot -/usr/sbin/setDefaultJava -/usr/share/man/man7/init.d.7 -/usr/share/man/man5/route.conf.5 -/usr/share/man/man8/resolv+.8 -/usr/share/man/man8/quick_halt.8 diff --git a/aaa_base.post b/aaa_base.post index 814f376..b7fddf1 100644 --- a/aaa_base.post +++ b/aaa_base.post @@ -148,28 +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 /var/run/utmp + +while read file owner mode; do + test -e "$file" || touch "$file" + chmod "$mode" "$file" + chown "$owner" "$file" +done < aaa_base.files -for i in `( cd $RPM_BUILD_ROOT ; find * | sort )` ; do - grep -qx "/$i" %{S:4} || continue - if ! grep -E "^.* /$i\$" %{S:3} ; then - if ! test -d $RPM_BUILD_ROOT/$i ; then - echo "/$i" - fi - fi -done > aaa_base-extras.files %pre -f ../scripts/aaa_base.pre @@ -141,10 +118,133 @@ if test -f /root/.gnupg/secring.gpg.aaa_save -a ! -f /root/.gnupg/secring.gpg ; fi rm -f /root/.gnupg/secring.gpg.aaa_save -%files -f aaa_base.files +%files %defattr(-,root,root) +%config(noreplace) /etc/inittab +%config /etc/bash.bashrc +%config /etc/csh.cshrc +%config /etc/csh.login +%config /etc/inputrc +%config /etc/mailcap +%config /etc/mime.types +%config /etc/profile +%config /etc/profile.d/alljava.csh +%config /etc/profile.d/alljava.sh +%config /etc/profile.d/csh.ssh +%config /etc/profile.d/csh.utf8 +%config /etc/profile.d/lang.csh +%config /etc/profile.d/lang.sh +%config /etc/profile.d/malloc-debug.sh +%config /etc/profile.d/malloc-debug.csh +%config /etc/profile.d/profile.csh +%config /etc/profile.d/profile.sh +%config /etc/profile.d/sh.ssh +%config /etc/profile.d/sh.utf8 +%config /etc/profile.d/xdg-environment.csh +%config /etc/profile.d/xdg-environment.sh +%config /etc/rc.splash +%config /etc/rc.status +%config /etc/shells +%config /etc/ttytype +%config /etc/init.d/boot +%config /etc/init.d/halt +%config /etc/init.d/powerfail +%config /etc/init.d/random +%config /etc/init.d/single +%ghost /var/adm/fillup-templates/passwd.aaa_base +%ghost /var/adm/fillup-templates/group.aaa_base +%ghost /var/adm/fillup-templates/gshadow.aaa_base +%ghost /var/adm/fillup-templates/shadow.aaa_base +# 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 +/etc/init.d/boot.clock +/etc/init.d/boot.ipconfig +/etc/init.d/boot.klog +/etc/init.d/boot.ldconfig +/etc/init.d/boot.loadmodules +/etc/init.d/boot.localfs +/etc/init.d/boot.localnet +/etc/init.d/boot.proc +/etc/init.d/boot.rootfsck +/etc/init.d/boot.swap +/etc/init.d/rc +/etc/init.d/reboot +/etc/tmpdirs.d/01_aaa_base +/lib/YaST/SuSEconfig.functions +/sbin/chkconfig +/sbin/get_kernel_version +/sbin/refresh_initrd +/sbin/service +/sbin/smart_agetty +/sbin/SuSEconfig +/usr/bin/ChangeSymlinks +/usr/bin/filesize +/usr/bin/mkinfodir +/usr/bin/old +/usr/bin/rpmlocate +/usr/bin/safe-rm +/usr/bin/safe-rmdir +/usr/bin/setJava +/usr/lib/restricted/bin/hostname +/usr/sbin/Check +/usr/sbin/rcpowerfail +/usr/sbin/rcrandom +/usr/sbin/rcsingle +/usr/sbin/sysconf_addword +/usr/share/man/man1/smart_agetty.1* +/usr/share/man/man5/defaultdomain.5* +/usr/share/man/man8/chkconfig.8* +/usr/share/man/man8/safe-rm.8* +/usr/share/man/man8/safe-rmdir.8* +/usr/share/man/man8/service.8* +/usr/share/man/man8/SuSEconfig.8* +/var/adm/fillup-templates/sysconfig.backup +/var/adm/fillup-templates/sysconfig.boot +/var/adm/fillup-templates/sysconfig.clock +/var/adm/fillup-templates/sysconfig.cron +/var/adm/fillup-templates/sysconfig.kernel +/var/adm/fillup-templates/sysconfig.language +/var/adm/fillup-templates/sysconfig.news +/var/adm/fillup-templates/sysconfig.proxy +/var/adm/fillup-templates/sysconfig.shutdown +/var/adm/fillup-templates/sysconfig.suseconfig +/var/adm/fillup-templates/sysconfig.sysctl +/var/adm/fillup-templates/sysconfig.windowmanager -%files extras -f aaa_base-extras.files +%files extras %defattr(-,root,root) +%config(noreplace) /etc/DIR_COLORS +/etc/cron.daily/suse.de-backup-rc.config +/etc/cron.daily/suse.de-backup-rpmdb +/etc/cron.daily/suse.de-check-battery +/etc/cron.daily/suse.de-cron-local +/etc/skel/.emacs +/etc/skel/.inputrc +/etc/java/README +%config /etc/profile.d/complete.bash +%config /etc/profile.d/alias.ash +/etc/profile.d/alias.bash +/etc/profile.d/alias.tcsh +/etc/profile.d/ls.tcsh +/etc/profile.d/ls.bash +/etc/init.d/skeleton +/etc/init.d/skeleton.compat +%config(noreplace) /root/.exrc +%config /sbin/quick_halt +/sbin/quick_poweroff +/sbin/quick_reboot +/usr/sbin/setDefaultJava +/usr/share/man/man7/init.d.7* +/usr/share/man/man5/route.conf.5* +/usr/share/man/man8/resolv+.8* +/usr/share/man/man8/quick_halt.8* %changelog diff --git a/aaa_base.specialfilelist b/aaa_base.specialfilelist deleted file mode 100644 index 04955f3..0000000 --- a/aaa_base.specialfilelist +++ /dev/null @@ -1,43 +0,0 @@ -%config(noreplace) /root/.exrc -%config(noreplace) /etc/DIR_COLORS -%config(noreplace) /etc/inittab -%config /root/bin/cron.daily -%config /root/bin/cron.daily.local -%config /etc/bash.bashrc -%config /etc/csh.cshrc -%config /etc/csh.login -%config /etc/inputrc -%config /etc/mailcap -%config /etc/mime.types -%config /etc/profile -%config /etc/profile.d/alias.ash -%config /etc/profile.d/alljava.csh -%config /etc/profile.d/alljava.sh -%config /etc/profile.d/complete.bash -%config /etc/profile.d/csh.ssh -%config /etc/profile.d/csh.utf8 -%config /etc/profile.d/lang.csh -%config /etc/profile.d/lang.sh -%config /etc/profile.d/malloc-debug.sh -%config /etc/profile.d/malloc-debug.csh -%config /etc/profile.d/profile.csh -%config /etc/profile.d/profile.sh -%config /etc/profile.d/sh.ssh -%config /etc/profile.d/sh.utf8 -%config /etc/profile.d/xdg-environment.csh -%config /etc/profile.d/xdg-environment.sh -%config /etc/rc.splash -%config /etc/rc.status -%config /etc/shells -%config /etc/ttytype -%config /etc/init.d/boot -%config /etc/init.d/halt -%config /etc/init.d/powerfail -%config /etc/init.d/random -%config /etc/init.d/single -%config /sbin/quick_halt -%ghost /var/adm/fillup-templates/passwd.aaa_base -%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,tty) %verify(not md5 size mtime) /var/log/lastlog diff --git a/aaa_base.tar.bz2 b/aaa_base.tar.bz2 index e1cadc7..c68835d 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:19cc44628dedb9943888b900fae17160f1e63c1de34b45933be44c553eefdb81 -size 82243 +oid sha256:0b98cd1ab6781638425c7371fbe046c6abfebb2e56a19419bf8ba37fb1baaeba +size 81520