Hello community,
here is the log from the commit of package aaa_base for openSUSE:Factory
checked in at Sun Aug 1 17:22:58 CEST 2010.
--------
--- aaa_base/aaa_base.changes 2010-07-16 18:24:41.000000000 +0200
+++ /mounts/work_src_done/STABLE/aaa_base/aaa_base.changes 2010-07-29 18:04:01.000000000 +0200
@@ -1,0 +2,18 @@
+Thu Jul 29 17:52:24 CEST 2010 - ro@suse.de
+
+- split off aaa_base extras subpackage with:
+ - ls settings and aliases
+ - bash completion
+ - other generic shell aliases
+ - quick_halt/poweroff/reboot script
+ - some default cronjobs
+- modified bash.bashrc and csh.cshrc to split out ls settings
+- drop alias for dir: that one has its own binary for a while
+- recommend aaa_base-extras from main package
+
+-------------------------------------------------------------------
+Tue Jul 27 15:34:59 UTC 2010 - cristian.rodriguez@opensuse.org
+
+- get_kernel_version : use O_CLOEXEC everywhere
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
aaa_base.extrafilelist
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ aaa_base.spec ++++++
--- /var/tmp/diff_new_pack.EYYhxK/_old 2010-08-01 17:22:48.000000000 +0200
+++ /var/tmp/diff_new_pack.EYYhxK/_new 2010-08-01 17:22:48.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package aaa_base (Version 11.3)
+# spec file for package aaa_base (Version 11.4)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,35 +19,44 @@
Name: aaa_base
-Version: 11.3
-Release: 9
+Version: 11.4
+Release: 1
License: GPLv2+
Group: System/Fhs
Provides: bin bootutls etc skeleng skelger
Provides: aaa_skel = %{version}-%{release}
Obsoletes: aaa_skel < %{version}
Requires: filesystem distribution-release /bin/mktemp /usr/bin/find /usr/bin/tput /usr/bin/xargs mingetty /bin/login cpio psmisc
-Recommends: cron logrotate netcfg udev net-tools
+Recommends: cron logrotate netcfg udev net-tools aaa_base-extras
PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/ls /bin/date /usr/bin/cmp /bin/fillup /sbin/insserv
AutoReqProv: on
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
Source20: aaa_base-rpmlintrc
Source21: aaa_base.pre
Source22: aaa_base.post
-# %ifarch x86_64
-# Obsoletes: tpctl <= 4.17
-# %endif
%description
This package installs several important configuration files. Central
scripts like SuSEconfig are also in this package.
+%package extras
+License: GPLv2+
+Summary: SUSE Linux Base Package (recommended part)
+Group: System/Fhs
+Requires: %{name} = %{version}
+
+%description extras
+The parts of aaa_base that should be installed by default but are not
+strictly required to run a system. (Shell aliases, bash completions
+and convenience hacks).
+
%prep
%setup -n aaa_base -b 5 -b 7
cd ..
@@ -99,12 +108,21 @@
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
@@ -122,4 +140,7 @@
%files -f aaa_base.files
%defattr(-,root,root)
+%files extras -f aaa_base-extras.files
+%defattr(-,root,root)
+
%changelog
++++++ aaa_base.extrafilelist ++++++
/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
++++++ aaa_base.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/etc/bash.bashrc new/aaa_base/etc/bash.bashrc
--- old/aaa_base/etc/bash.bashrc 2010-06-08 17:58:41.000000000 +0200
+++ new/aaa_base/etc/bash.bashrc 2010-07-29 16:06:55.000000000 +0200
@@ -69,44 +69,15 @@
test -z "$UID" && readonly UID=`path id -ur 2> /dev/null`
test -z "$EUID" && readonly EUID=`path id -u 2> /dev/null`
-#
-# Colored file listings
-#
-if test -x /usr/bin/dircolors ; then
- #
- # set up the color-ls environment variables:
- #
- if test -f $HOME/.dir_colors ; then
- eval "`/usr/bin/dircolors -b $HOME/.dir_colors`"
- elif test -f /etc/DIR_COLORS ; then
- eval "`/usr/bin/dircolors -b /etc/DIR_COLORS`"
- fi
-fi
-
-#
-# ls color option depends on the terminal
-# If LS_COLORS is set but empty, the terminal has no colors.
-#
-if test "${LS_COLORS+empty}" = "${LS_COLORS:+empty}" ; then
- LS_OPTIONS=--color=tty
-else
- LS_OPTIONS=--color=none
-fi
-if test "$UID" = 0 ; then
- LS_OPTIONS="-A -N $LS_OPTIONS -T 0"
-else
- LS_OPTIONS="-N $LS_OPTIONS -T 0"
-fi
+test -s /etc/profile.d/ls.bash && . /etc/profile.d/ls.bash
#
# Avoid trouble with Emacs shell mode
#
if test "$EMACS" = "t" ; then
- LS_OPTIONS='-N --color=none -T 0';
path tset -I -Q
path stty cooked pass8 dec nl -echo
fi
-export LS_OPTIONS
#
# Set prompt and aliases to something useful for an interactive shell
@@ -114,20 +85,6 @@
case "$-" in
*i*)
#
- # Some useful functions
- #
- if test -z "$restricted" ; then
- startx () {
- test -x /usr/bin/startx || {
- echo "No startx installed" 1>&2
- return 1;
- }
- /usr/bin/startx ${1+"$@"} 2>&1 | tee $HOME/.xsession-errors
- }
- remount () { /bin/mount -o remount,${1+"$@"} ; }
- fi
-
- #
# Set prompt to something useful
#
case "$is" in
@@ -246,55 +203,7 @@
# if they parse this even if they do not expand.
test -s /etc/profile.d/alias.ash && . /etc/profile.d/alias.ash
else
- unalias ls 2>/dev/null
- case "$is" in
- bash) alias ls='ls $LS_OPTIONS' ;;
- zsh) alias ls='\ls $=LS_OPTIONS' ;;
- *) alias ls='/bin/ls $LS_OPTIONS' ;;
- esac
- alias dir='ls -l'
- alias ll='ls -l'
- alias la='ls -la'
- alias l='ls -alF'
- alias ls-l='ls -l'
-
- #
- # Set some generic aliases
- #
- alias o='less'
- alias ..='cd ..'
- alias ...='cd ../..'
- alias cd..='cd ..'
- if test "$is" != "ksh" ; then
- alias -- +='pushd .'
- alias -- -='popd'
- fi
- alias rd=rmdir
- alias md='mkdir -p'
- if test "$is" = "bash" -a ! -x /bin/which -a ! -x /usr/bin/which ; then
- #
- # Other shells use the which command in path (e.g. ash) or
- # their own builtin for the which command (e.g. ksh and zsh).
- #
- _which () {
- local file=$(type -p ${1+"$@"} 2>/dev/null)
- if test -n "$file" -a -x "$file"; then
- echo "$file"
- return 0
- fi
- hash -r
- type -P ${1+"$@"}
- }
- alias which=_which
- fi
- alias rehash='hash -r'
- alias you='if test "$EUID" = 0 ; then /sbin/yast2 online_update ; else su - -c "/sbin/yast2 online_update" ; fi'
- if test "$is" != "ksh" ; then
- alias beep='echo -en "\007"'
- else
- alias beep='echo -en "\x07"'
- fi
- alias unmount='echo "Error: Try the command: umount" 1>&2; false'
+ test -s /etc/profile.d/alias.bash && . /etc/profile.d/alias.bash
test -s $HOME/.alias && . $HOME/.alias
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/etc/csh.cshrc new/aaa_base/etc/csh.cshrc
--- old/aaa_base/etc/csh.cshrc 2010-05-18 17:28:27.000000000 +0200
+++ new/aaa_base/etc/csh.cshrc 2010-07-29 16:07:28.000000000 +0200
@@ -98,42 +98,10 @@
#
unset autologout
unset ignoreeof
-#
-if ( -x /usr/bin/dircolors ) then
- if ( -r $HOME/.dir_colors ) then
- eval `/usr/bin/dircolors -c $HOME/.dir_colors`
- else if ( -r /etc/DIR_COLORS ) then
- eval `/usr/bin/dircolors -c /etc/DIR_COLORS`
- endif
-endif
-setenv LS_OPTIONS '--color=tty'
-if ( ${?LS_COLORS} ) then
- if ( "${LS_COLORS}" == "" ) setenv LS_OPTIONS '--color=none'
-endif
-unalias ls
-if ( "$uid" == "0" ) then
- setenv LS_OPTIONS "-A -N $LS_OPTIONS -T 0"
-else
- setenv LS_OPTIONS "-N $LS_OPTIONS -T 0"
-endif
-alias ls 'ls $LS_OPTIONS'
-alias la 'ls -aF --color=none'
-alias ll 'ls -l --color=none'
-alias l 'll'
-alias dir 'ls --format=vertical'
-alias vdir 'ls --format=long'
-alias d dir;
-alias v vdir;
-alias o 'less'
-alias .. 'cd ..'
-alias ... 'cd ../..'
-alias cd.. 'cd ..'
-alias rd rmdir
-alias md 'mkdir -p'
-alias startx 'if ( ! -x /usr/bin/startx ) echo "No startx installed";\
- if ( -x /usr/bin/startx ) /usr/bin/startx |& tee ${HOME}/.xsession-error'
-alias remount '/bin/mount -o remount,\!*'
+if (-r /etc/profile.d/ls.tcsh) source /etc/profile.d/ls.tcsh
+
+if (-r /etc/profile.d/alias.tcsh) source /etc/profile.d/alias.tcsh
#
# Prompting and Xterm title
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/etc/profile.d/alias.ash new/aaa_base/etc/profile.d/alias.ash
--- old/aaa_base/etc/profile.d/alias.ash 2010-07-05 12:39:34.000000000 +0200
+++ new/aaa_base/etc/profile.d/alias.ash 2010-07-29 13:10:10.000000000 +0200
@@ -41,13 +41,6 @@
}
dirs () { echo "`pwd` $DSTACK"; return 0; }
-alias ls='/bin/ls $LS_OPTIONS'
-alias dir='ls -l'
-alias ll='ls -l'
-alias la='ls -la'
-alias l='ls -alF'
-alias ls-l='ls -l'
-
#
# Set some generic aliase functions
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/etc/profile.d/alias.bash new/aaa_base/etc/profile.d/alias.bash
--- old/aaa_base/etc/profile.d/alias.bash 1970-01-01 01:00:00.000000000 +0100
+++ new/aaa_base/etc/profile.d/alias.bash 2010-07-29 13:06:21.000000000 +0200
@@ -0,0 +1,51 @@
+#
+# Some useful functions
+#
+if test -z "$restricted" ; then
+ startx () {
+ test -x /usr/bin/startx || {
+ echo "No startx installed" 1>&2
+ return 1;
+ }
+ /usr/bin/startx ${1+"$@"} 2>&1 | tee $HOME/.xsession-errors
+ }
+ remount () { /bin/mount -o remount,${1+"$@"} ; }
+fi
+
+#
+# Set some generic aliases
+#
+alias o='less'
+alias ..='cd ..'
+alias ...='cd ../..'
+alias cd..='cd ..'
+if test "$is" != "ksh" ; then
+ alias -- +='pushd .'
+ alias -- -='popd'
+fi
+alias rd=rmdir
+alias md='mkdir -p'
+if test "$is" = "bash" -a ! -x /bin/which -a ! -x /usr/bin/which ; then
+ #
+ # Other shells use the which command in path (e.g. ash) or
+ # their own builtin for the which command (e.g. ksh and zsh).
+ #
+ _which () {
+ local file=$(type -p ${1+"$@"} 2>/dev/null)
+ if test -n "$file" -a -x "$file"; then
+ echo "$file"
+ return 0
+ fi
+ hash -r
+ type -P ${1+"$@"}
+ }
+ alias which=_which
+fi
+alias rehash='hash -r'
+alias you='if test "$EUID" = 0 ; then /sbin/yast2 online_update ; else su - -c "/sbin/yast2 online_update" ; fi'
+if test "$is" != "ksh" ; then
+ alias beep='echo -en "\007"'
+else
+ alias beep='echo -en "\x07"'
+fi
+alias unmount='echo "Error: Try the command: umount" 1>&2; false'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/etc/profile.d/alias.tcsh new/aaa_base/etc/profile.d/alias.tcsh
--- old/aaa_base/etc/profile.d/alias.tcsh 1970-01-01 01:00:00.000000000 +0100
+++ new/aaa_base/etc/profile.d/alias.tcsh 2010-07-29 13:12:28.000000000 +0200
@@ -0,0 +1,9 @@
+alias o 'less'
+alias .. 'cd ..'
+alias ... 'cd ../..'
+alias cd.. 'cd ..'
+alias rd rmdir
+alias md 'mkdir -p'
+alias startx 'if ( ! -x /usr/bin/startx ) echo "No startx installed";\
+ if ( -x /usr/bin/startx ) /usr/bin/startx |& tee ${HOME}/.xsession-error'
+alias remount '/bin/mount -o remount,\!*'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/etc/profile.d/ls.bash new/aaa_base/etc/profile.d/ls.bash
--- old/aaa_base/etc/profile.d/ls.bash 1970-01-01 01:00:00.000000000 +0100
+++ new/aaa_base/etc/profile.d/ls.bash 2010-07-29 13:21:11.000000000 +0200
@@ -0,0 +1,57 @@
+case "$-" in
+*i*)
+ #
+ # Colored file listings
+ #
+ if test -x /usr/bin/dircolors ; then
+ #
+ # set up the color-ls environment variables:
+ #
+ if test -f $HOME/.dir_colors ; then
+ eval "`/usr/bin/dircolors -b $HOME/.dir_colors`"
+ elif test -f /etc/DIR_COLORS ; then
+ eval "`/usr/bin/dircolors -b /etc/DIR_COLORS`"
+ fi
+ fi
+
+ #
+ # ls color option depends on the terminal
+ # If LS_COLORS is set but empty, the terminal has no colors.
+ #
+ if test "${LS_COLORS+empty}" = "${LS_COLORS:+empty}" ; then
+ LS_OPTIONS=--color=tty
+ else
+ LS_OPTIONS=--color=none
+ fi
+ if test "$UID" = 0 ; then
+ LS_OPTIONS="-A -N $LS_OPTIONS -T 0"
+ else
+ LS_OPTIONS="-N $LS_OPTIONS -T 0"
+ fi
+
+ #
+ # Avoid trouble with Emacs shell mode
+ #
+ if test "$EMACS" = "t" ; then
+ LS_OPTIONS='-N --color=none -T 0';
+ fi
+ export LS_OPTIONS
+
+ #
+ # useful ls aliases
+ #
+ if test "$is" != "ash" ; then
+ unalias ls 2>/dev/null
+ fi
+ case "$is" in
+ bash) alias ls='ls $LS_OPTIONS' ;;
+ zsh) alias ls='\ls $=LS_OPTIONS' ;;
+ *) alias ls='/bin/ls $LS_OPTIONS' ;;
+ esac
+ alias dir='ls -l'
+ alias ll='ls -l'
+ alias la='ls -la'
+ alias l='ls -alF'
+ alias ls-l='ls -l'
+ ;;
+esac
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/etc/profile.d/ls.tcsh new/aaa_base/etc/profile.d/ls.tcsh
--- old/aaa_base/etc/profile.d/ls.tcsh 1970-01-01 01:00:00.000000000 +0100
+++ new/aaa_base/etc/profile.d/ls.tcsh 2010-07-29 13:20:08.000000000 +0200
@@ -0,0 +1,31 @@
+if (! ${?prompt}) goto done
+
+#
+if ( -x /usr/bin/dircolors ) then
+ if ( -r $HOME/.dir_colors ) then
+ eval `/usr/bin/dircolors -c $HOME/.dir_colors`
+ else if ( -r /etc/DIR_COLORS ) then
+ eval `/usr/bin/dircolors -c /etc/DIR_COLORS`
+ endif
+endif
+setenv LS_OPTIONS '--color=tty'
+if ( ${?LS_COLORS} ) then
+ if ( "${LS_COLORS}" == "" ) setenv LS_OPTIONS '--color=none'
+endif
+unalias ls
+if ( "$uid" == "0" ) then
+ setenv LS_OPTIONS "-A -N $LS_OPTIONS -T 0"
+else
+ setenv LS_OPTIONS "-N $LS_OPTIONS -T 0"
+endif
+alias ls 'ls $LS_OPTIONS'
+alias la 'ls -aF --color=none'
+alias ll 'ls -l --color=none'
+alias l 'll'
+alias dir 'ls --format=vertical'
+alias vdir 'ls --format=long'
+alias d dir;
+alias v vdir;
+
+done:
+
++++++ get_kernel_version.c ++++++
--- /var/tmp/diff_new_pack.EYYhxK/_old 2010-08-01 17:22:48.000000000 +0200
+++ /var/tmp/diff_new_pack.EYYhxK/_new 2010-08-01 17:22:48.000000000 +0200
@@ -14,6 +14,7 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+#define _GNU_SOURCE
#include