Hello community,
here is the log from the commit of package aaa_base for openSUSE:Factory
checked in at Thu Nov 18 16:41:12 CET 2010.
--------
--- aaa_base/aaa_base.changes 2010-11-16 10:52:43.000000000 +0100
+++ aaa_base/aaa_base.changes 2010-11-18 11:38:10.000000000 +0100
@@ -1,0 +2,16 @@
+Thu Nov 18 10:26:44 UTC 2010 - lnussel(a)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(a)suse.de
+
+- fix typo (merge conflict overlooked)
+
+-------------------------------------------------------------------
+Wed Nov 17 12:53:36 CET 2010 - ro(a)suse.de
+
+- fix postinstall to test for existence of /var/run/utmp
+ before trying to chgrp
+
+-------------------------------------------------------------------
@@ -35,0 +52,15 @@
+
+-------------------------------------------------------------------
+Tue Nov 9 15:37:06 UTC 2010 - lnussel(a)suse.de
+
+- remove weird filelist generation code
+
+-------------------------------------------------------------------
+Tue Nov 9 15:17:51 UTC 2010 - lnussel(a)suse.de
+
+- remove /usr/sbin/Check
+
+-------------------------------------------------------------------
+Tue Nov 9 13:05:26 UTC 2010 - lnussel(a)suse.de
+
+- move chkstat calls to brp-permissions in brp-checks-suse
calling whatdependson for head-i586
Old:
----
aaa_base.extrafilelist
aaa_base.specialfilelist
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ aaa_base.spec ++++++
--- /var/tmp/diff_new_pack.O0mWHz/_old 2010-11-18 16:39:38.000000000 +0100
+++ /var/tmp/diff_new_pack.O0mWHz/_new 2010-11-18 16:39:38.000000000 +0100
@@ -20,7 +20,7 @@
Name: aaa_base
Version: 11.4
-Release: 12
+Release: 13
License: GPLv2+
Group: System/Fhs
Provides: bin bootutls etc skeleng skelger
@@ -33,8 +33,6 @@
Summary: SUSE Linux Base Package
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: aaa_base.tar.bz2
-Source3: aaa_base.specialfilelist
-Source4: aaa_base.extrafilelist
Source5: arch_special.tar.bz2
Source7: sysconfig_parts.tar.bz2
Source8: get_kernel_version.c
@@ -106,27 +104,6 @@
for i in passwd group shadow gshadow ; do
touch $RPM_BUILD_ROOT/var/adm/fillup-templates/$i.aaa_base
done
-#
-# generate the file-list with config-files et al.
-#
-test -x /usr/sbin/Check && /usr/sbin/Check
-#
-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.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 @@
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
++++++ aaa_base-rpmlintrc ++++++
--- /var/tmp/diff_new_pack.O0mWHz/_old 2010-11-18 16:39:39.000000000 +0100
+++ /var/tmp/diff_new_pack.O0mWHz/_new 2010-11-18 16:39:39.000000000 +0100
@@ -23,7 +23,7 @@
# 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")
++++++ aaa_base.post ++++++
--- /var/tmp/diff_new_pack.O0mWHz/_old 2010-11-18 16:39:39.000000000 +0100
+++ /var/tmp/diff_new_pack.O0mWHz/_new 2010-11-18 16:39:39.000000000 +0100
@@ -148,28 +148,19 @@
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 <<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
++++++ aaa_base.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/usr/sbin/Check new/aaa_base/usr/sbin/Check
--- old/aaa_base/usr/sbin/Check 2010-11-10 13:09:40.000000000 +0100
+++ new/aaa_base/usr/sbin/Check 2010-11-16 10:31:26.000000000 +0100
@@ -1,111 +1,5 @@
-#!/bin/bash --login
-
-test "$UID" = 0 -o ! -z "$RPM_BUILD_ROOT" || {
- echo Check does not work for normal users.
- exit 1
-}
-
-. /etc/sysconfig/security
-
-do_gzip() {
- while read input; do
- if test -f "$input.gz"; then
- #echo "Remove old file $input.gz"
- rm -f "$input.gz"
- fi
- if test -L "$input"; then
- link=`perl -e 'print readlink($ARGV[0]);' -- "$input"`
- test -d "$link" && continue
- test -d "$RPM_BUILD_ROOT/$link" && continue
- rm -f "$input"
- ln -sf "$link.gz" "$input.gz"
- else
- gzip -nf9 "$input"
- fi
- ls -l "$input.gz"
- done
- return
-}
-
-DIRS="/usr/info /usr/share/info /usr/X11R6/lib/X11/fonts/* /usr/share/fonts/*"
-
-OLD_IFS="$IFS"
-IFS="$IFS:"
-
-for MANDIR in $MANPATH $manpath /usr/openwin/man ; do
- case $MANDIR in
- .|..) continue ;;
- esac
- DIRS="$DIRS $MANDIR"
-done
-
-IFS="$OLD_IFS"
-
-if test -n "$RPM_BUILD_ROOT" ; then
- TDIRS=""
- for DIR in $DIRS ; do
- test "$UID" = 0 && TDIRS="$TDIRS $DIR"
- TDIRS="$TDIRS ${RPM_BUILD_ROOT%/}/$DIR"
- done
- DIRS="$TDIRS"
-fi
-
-
-for DIR in $DIRS ; do
- test -d $DIR && find $DIR -name "*.Z" -type f | \
- xargs --no-run-if-empty gunzip
-done
-
-for DIR in $DIRS ; do
- case "$DIR" in
- */usr/X11R6/lib/X11/fonts/CID) continue ;;
- */usr/X11R6/lib/X11/fonts/truetype) continue ;;
- */usr/X11R6/lib/X11/fonts/TTF) continue ;;
- */usr/share/fonts/truetype) continue ;;
- esac
- test -d $DIR && find $DIR \! -name "*.gz" \! -name "*.Z" \! -name "*.bz2" \
- \! -name dir \! -name dir.old \! -name localdir \
- \! -name whatis \! -name fonts.alias \! -name fonts.dir \
- \! -name "fonts.*" \! -name ".fonts-*" \
- \! -name "*.spd" \! -name "*.pfa" \! -name "*.pfb" \
- \! -name "*.pfm" \! -name "*.phont" \! -name ".*.gz" \
- \! -name ".*.Z" \! -name ".*.spd" \! -name ".*.pfa" \
- \! -name ".*.pfb" \! -name ".*.phont" \! -name URW \
- \! -name "*.ttf" \! -name "*.TTF" \! -name "encodings.dir" \
- \! -name "XftConfig" \! -name "*.TXT" \! -name "*.rpmorig" \
- \! -name "map-*-*" \! -name "*.afm" \! -name "*.exe" \
- \! -name "*.EXE" \! -name "XftCache" \! -path "*/CVS/*" \
- \! -path "*/RCS/*" \! -path "*/.svn/*" \! -path "*/SCCS/*" \
- \! -type d | do_gzip
-done
-
-
-TMPFILE=`mktemp /tmp/Check.perms.XXXXXX`
-
-if test -n "$CHECK_PERMISSIONS" -a -e /etc/permissions -a -x /usr/bin/chkstat ; then
- if test "$UID" = 0 -o -n "$RPM_BUILD_ROOT" ; then
- cat /etc/permissions > $TMPFILE
- for PERMEXT in $PERMISSION_SECURITY ; do
- test -e /etc/permissions."$PERMEXT" &&\
- cat /etc/permissions."$PERMEXT" >> $TMPFILE
- done
- # run below RPM_BUILD_ROOT regardless of UID
- if test -n "$RPM_BUILD_ROOT" ; then
- if test "$CHECK_PERMISSIONS" = "set" ; then
- /usr/bin/chkstat -root $RPM_BUILD_ROOT -set $TMPFILE
- elif test "$CHECK_PERMISSIONS" = "warn" ; then
- /usr/bin/chkstat -root $RPM_BUILD_ROOT $TMPFILE
- fi
- fi
- # run for / only if UID = 0
- if test "$UID" = 0 ; then
- if test "$CHECK_PERMISSIONS" = "set" ; then
- /usr/bin/chkstat -set $TMPFILE
- elif test "$CHECK_PERMISSIONS" = "warn" ; then
- /usr/bin/chkstat $TMPFILE
- fi
- fi
- fi
-fi
-
-rm -rf $TMPFILE
+#!/bin/sh
+# this script is obsolete. We keep it around to avoid boot strapping
+# problems as some rpm macros may still refer to it.
+echo "/usr/sbin/Check is obsolete, don't call it!"
+exit 0
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
