Mailinglist Archive: opensuse-commit (2092 mails)
| < Previous | Next > |
commit aaa_base
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Fri, 03 Aug 2007 13:56:07 +0200
- Message-id: <20070803115607.F1A3F678180@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package aaa_base
checked in at Fri Aug 3 13:56:07 CEST 2007.
--------
--- aaa_base/aaa_base.changes 2007-07-27 23:52:09.000000000 +0200
+++ /mounts/work_src_done/STABLE/aaa_base/aaa_base.changes 2007-08-02 14:35:40.000000000 +0200
@@ -1,0 +2,10 @@
+Wed Aug 1 08:42:24 CEST 2007 - adrian@xxxxxxx
+
+- add mimetypes for .ymp and .ymu files (#295677)
+
+-------------------------------------------------------------------
+Mon Jul 30 12:09:27 CEST 2007 - dmueller@xxxxxxx
+
+- remove /bin/ps prereq and replace it with $SHELL
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ aaa_base.spec ++++++
--- /var/tmp/diff_new_pack.xW6500/_old 2007-08-03 13:54:07.000000000 +0200
+++ /var/tmp/diff_new_pack.xW6500/_new 2007-08-03 13:54:07.000000000 +0200
@@ -11,15 +11,15 @@
# norootforbuild
Name: aaa_base
-BuildRequires: aaa_skel
+BuildRequires: aaa_skel procps
License: GPL v2 or later
Group: System/Fhs
Provides: bin bootutls etc skeleng skelger
Requires: aaa_skel filesystem distribution-release logrotate /bin/mktemp /usr/bin/find /usr/bin/xargs mingetty cpio udev
-PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/date /usr/bin/cmp /bin/fillup /sbin/insserv net-tools
+PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/ls /bin/date /usr/bin/cmp /bin/fillup /sbin/insserv net-tools
Autoreqprov: on
Version: 10.3
-Release: 60
+Release: 63
Summary: SUSE Linux Base Package
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: aaa_base.tar.bz2
@@ -134,6 +134,10 @@
%defattr(-,root,root)
%changelog
+* Wed Aug 01 2007 - adrian@xxxxxxx
+- add mimetypes for .ymp and .ymu files (#295677)
+* Mon Jul 30 2007 - dmueller@xxxxxxx
+- remove /bin/ps prereq and replace it with $SHELL
* Fri Jul 27 2007 - coolo@xxxxxxx
- revert the last two changes as they break too much for the moment
* Fri Jul 27 2007 - werner@xxxxxxx
++++++ 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 2007-04-25 16:10:28.000000000 +0200
+++ new/aaa_base/etc/bash.bashrc 2007-07-26 18:25:24.000000000 +0200
@@ -10,15 +10,29 @@
#
if test -z "$is" ; then
if test -f /proc/mounts ; then
- case "`ls --color=never -l /proc/$$/exe`" in
+ case "`/bin/ls --color=never -l /proc/$$/exe`" in
*/bash) is=bash ;;
- */rbash) is=bash ;;
*/ash) is=ash ;;
*/ksh) is=ksh ;;
*/pdksh) is=ksh ;;
*/zsh) is=zsh ;;
*/*) is=sh ;;
esac
+ #
+ # `r' in $- occurs *after* system files are parsed
+ #
+ argv="`/bin/ps -p $$ --no-header -o args=`"
+ argv=${argv#-}
+ for a in $argv ; do
+ case "$a" in
+ r*sh)
+ readonly restricted=true ;;
+ -r*|-[!-]r*|-[!-][!-]r*)
+ readonly restricted=true ;;
+ --restricted)
+ readonly restricted=true ;;
+ esac
+ done
else
is=sh
fi
@@ -38,9 +52,9 @@
# set up the color-ls environment variables:
#
if test -f $HOME/.dir_colors ; then
- eval "`dircolors -b $HOME/.dir_colors`"
+ eval "`/usr/bin/dircolors -b $HOME/.dir_colors`"
elif test -f /etc/DIR_COLORS ; then
- eval "`dircolors -b /etc/DIR_COLORS`"
+ eval "`/usr/bin/dircolors -b /etc/DIR_COLORS`"
fi
fi
@@ -77,15 +91,16 @@
#
# Some useful functions
#
- startx () {
- test -x /usr/bin/startx || {
- echo "No startx installed" 1>&2
- return 1;
+ 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
}
- /usr/bin/startx ${1+"$@"} 2>&1 | tee $HOME/.xsession-errors
- }
-
- remount () { /bin/mount -o remount,${1+"$@"} ; }
+ remount () { /bin/mount -o remount,${1+"$@"} ; }
+ fi
#
# Set prompt to something useful
@@ -130,7 +145,7 @@
then
_t="\$(ppwd \l)"
fi
- if test "${BASH##*/}" = "rbash" ; then
+ if test -n "$restricted" ; then
_t=""
fi
fi
@@ -207,7 +222,7 @@
unalias ls 2>/dev/null
case "$is" in
bash) alias ls='ls $LS_OPTIONS' ;;
- zsh) alias ls='/bin/ls $=LS_OPTIONS' ;;
+ zsh) alias ls='\ls $=LS_OPTIONS' ;;
*) alias ls='/bin/ls $LS_OPTIONS' ;;
esac
alias dir='ls -l'
@@ -312,6 +327,10 @@
test -s /etc/bash.bashrc.local && . /etc/bash.bashrc.local
fi
+if test -n "$restricted" -a -z "$PROFILEREAD" ; then
+ PATH=/usr/lib/restricted/bin
+ export PATH
+fi
#
# End of /etc/bash.bashrc
#
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/mime.types new/aaa_base/etc/mime.types
--- old/aaa_base/etc/mime.types 2007-03-01 18:37:34.000000000 +0100
+++ new/aaa_base/etc/mime.types 2007-08-02 14:34:23.000000000 +0200
@@ -459,6 +459,8 @@
text/x-setext etx
text/x-speech
text/x-sql sql
+text/x-suse-ymp ymp
+text/x-suse-ymu ymu
text/x-tcl tcl tk
text/x-tex tex ltx sty cls
text/x-texinfo texi texinfo
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/profile new/aaa_base/etc/profile
--- old/aaa_base/etc/profile 2007-03-13 11:44:52.000000000 +0100
+++ new/aaa_base/etc/profile 2007-07-26 18:42:14.000000000 +0200
@@ -11,13 +11,27 @@
if test -f /proc/mounts ; then
case "`/bin/ls -l /proc/$$/exe`" in
*/bash) is=bash ;;
- */rbash) is=bash ;;
*/ash) is=ash ;;
*/ksh) is=ksh ;;
*/pdksh) is=ksh ;;
*/zsh) is=zsh ;;
*/*) is=sh ;;
esac
+ #
+ # `r' in $- occurs *after* system files are parsed
+ #
+ argv="`/bin/ps -p $$ --no-header -o args=`"
+ argv=${argv#-}
+ for a in $argv ; do
+ case "$a" in
+ r*sh)
+ readonly restricted=true ;;
+ -r*|-[!-]r*|-[!-][!-]r*)
+ readonly restricted=true ;;
+ --restricted)
+ readonly restricted=true ;;
+ esac
+ done
else
is=sh
fi
@@ -115,7 +129,7 @@
test -d /opt/kde3/sbin && PATH=/opt/kde3/sbin:$PATH
PATH=/sbin:/usr/sbin:/usr/local/sbin:$PATH
fi
- for dir in /usr/X11/bin \
+ for dir in /usr/X11/bin \
/usr/bin/X11 \
/usr/X11R6/bin \
/var/lib/dosemu \
@@ -317,6 +331,9 @@
if test "$is" != ksh ; then
test -r /etc/bash.bashrc && . /etc/bash.bashrc
fi
+ if test -n "$restricted" ; then
+ readonly _HOMEBASHRC=true
+ fi
if test "$is" = "bash" -a -z "$_HOMEBASHRC" ; then
# loop detection
readonly _HOMEBASHRC=true
@@ -327,6 +344,9 @@
# KSH specials
#
if test "$is" = "ksh" -a -r /etc/ksh.kshrc ; then
+ if test -n "$restricted" ; then
+ readonly _HOMEKSHRC=true
+ fi
if test ! /etc/bash.bashrc -ef /etc/ksh.kshrc ; then
test -r /etc/bash.bashrc && . /etc/bash.bashrc
fi
@@ -337,6 +357,10 @@
fi
fi
fi
+if test -n "$restricted" ; then
+ PATH=/usr/lib/restricted/bin
+ export PATH
+fi
#
# End of /etc/profile
#
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/usr/lib/restricted/bin/hostname new/aaa_base/usr/lib/restricted/bin/hostname
--- old/aaa_base/usr/lib/restricted/bin/hostname 1970-01-01 01:00:00.000000000 +0100
+++ new/aaa_base/usr/lib/restricted/bin/hostname 2007-08-03 13:54:07.000000000 +0200
@@ -0,0 +1 @@
+symbolic link to /bin/hostname
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |