Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at 2020-08-02 12:27:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aaa_base (Old) and /work/SRC/openSUSE:Factory/.aaa_base.new.3592 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "aaa_base" Sun Aug 2 12:27:34 2020 rev:470 rq:822172 version:84.87+git20200708.f5e90d7 Changes: -------- --- /work/SRC/openSUSE:Factory/aaa_base/aaa_base.changes 2020-06-24 15:47:33.628089545 +0200 +++ /work/SRC/openSUSE:Factory/.aaa_base.new.3592/aaa_base.changes 2020-08-02 12:27:45.887820552 +0200 @@ -1,0 +2,9 @@ +Wed Jul 08 10:00:41 UTC 2020 - ro@suse.de + +- Update to version 84.87+git20200708.f5e90d7: + * check for Packages.db and use this instead of Packages + (boo#1171762) + * Add also support for /usr/etc/profile.d for tcsh + * Do add some support for /usr/etc/profile.d + +------------------------------------------------------------------- @@ -22,0 +32,5 @@ + +------------------------------------------------------------------- +Thu May 07 08:26:51 UTC 2020 - werner@suse.de + +- Better support of Midnight Commander (bsc#1170527) Old: ---- aaa_base-84.87+git20200507.e2243a4.tar.xz New: ---- aaa_base-84.87+git20200708.f5e90d7.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.WQCGEJ/_old 2020-08-02 12:27:46.839821531 +0200 +++ /var/tmp/diff_new_pack.WQCGEJ/_new 2020-08-02 12:27:46.843821535 +0200 @@ -23,7 +23,7 @@ %endif Name: aaa_base -Version: 84.87+git20200507.e2243a4 +Version: 84.87+git20200708.f5e90d7 Release: 0 URL: https://github.com/openSUSE/aaa_base # do not require systemd - aaa_base is in the build environment and we don't ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.WQCGEJ/_old 2020-08-02 12:27:46.899821593 +0200 +++ /var/tmp/diff_new_pack.WQCGEJ/_new 2020-08-02 12:27:46.899821593 +0200 @@ -1,4 +1,6 @@ <servicedata> <service name="tar_scm"> - <param name="url">https://github.com/openSUSE/aaa_base.git</param> - <param name="changesrevision">e2243a4b9f47fa4a51de471811fc32da925a2ffe</param></service></servicedata> \ No newline at end of file + <param name="url">https://github.com/openSUSE/aaa_base.git</param> + <param name="changesrevision">f5e90d70d119b6aa12d019947029f9337aec378d</param> +</service> +</servicedata> ++++++ aaa_base-84.87+git20200507.e2243a4.tar.xz -> aaa_base-84.87+git20200708.f5e90d7.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20200507.e2243a4/files/etc/bash.bashrc new/aaa_base-84.87+git20200708.f5e90d7/files/etc/bash.bashrc --- old/aaa_base-84.87+git20200507.e2243a4/files/etc/bash.bashrc 2020-05-07 14:43:18.000000000 +0200 +++ new/aaa_base-84.87+git20200708.f5e90d7/files/etc/bash.bashrc 2020-07-08 11:57:32.000000000 +0200 @@ -89,7 +89,11 @@ test -z "$UID" && readonly UID=`path id -ur 2> /dev/null` test -z "$EUID" && readonly EUID=`path id -u 2> /dev/null` -test -s /etc/profile.d/ls.bash && . /etc/profile.d/ls.bash +if test -s /etc/profile.d/ls.bash +then . /etc/profile.d/ls.bash +elif test -s /usr/etc/profile.d/ls.bash +then . /usr/etc/profile.d/ls.bash +fi # # Avoid trouble with Emacs shell mode @@ -282,9 +286,17 @@ # therefore we use functions here. This is a seperate # file because other shells may run into trouble # if they parse this even if they do not expand. - test -s /etc/profile.d/alias.ash && . /etc/profile.d/alias.ash + if test -s /etc/profile.d/alias.ash + then . /etc/profile.d/alias.ash + elif test -s /usr/etc/profile.d/alias.ash + then . /usr/etc/profile.d/alias.ash + fi else - test -s /etc/profile.d/alias.bash && . /etc/profile.d/alias.bash + if test -s /etc/profile.d/alias.bash + then . /etc/profile.d/alias.bash + elif -s /usr/etc/profile.d/alias.bash + then . /usr/etc/profile.d/alias.bash + fi test -s $HOME/.alias && . $HOME/.alias fi @@ -302,20 +314,30 @@ . /etc/bash_completion elif test -s /etc/profile.d/bash_completion.sh ; then . /etc/profile.d/bash_completion.sh + elif test -s /usr/etc/profile.d/bash_completion.sh ; then + . /usr/etc/profile.d/bash_completion.sh elif test -s /etc/profile.d/complete.bash ; then . /etc/profile.d/complete.bash + elif test -s /usr/etc/profile.d/complete.bash ; then + . /usr/etc/profile.d/complete.bash fi # Do not source twice if already handled by bash-completion if [[ -n $BASH_COMPLETION_COMPAT_DIR && $BASH_COMPLETION_COMPAT_DIR != /etc/bash_completion.d ]]; then for s in /etc/bash_completion.d/*.sh ; do test -r $s && . $s done + elif [[ -n $BASH_COMPLETION_COMPAT_DIR && $BASH_COMPLETION_COMPAT_DIR != /usr/etc/bash_completion.d ]]; then + for s in /usr/etc/bash_completion.d/*.sh ; do + test -r $s && . $s + done fi if test -e $HOME/.bash_completion ; then . $HOME/.bash_completion fi - if test -f /etc/bash_command_not_found ; then - . /etc/bash_command_not_found + if test -f /etc/bash_command_not_found + then . /etc/bash_command_not_found + elif test -f /usr/etc/bash_command_not_found + then . /usr/etc/bash_command_not_found fi ;; *) ;; @@ -335,8 +357,10 @@ fi # command not found handler in zsh version if test "$is" = "zsh" ; then - if test -f /etc/zsh_command_not_found ; then - . /etc/zsh_command_not_found + if test -f /etc/zsh_command_not_found + then . /etc/zsh_command_not_found + elif test -f /usr/etc/zsh_command_not_found + then . /usr/etc/zsh_command_not_found fi fi ;; @@ -345,8 +369,10 @@ # Source /etc/profile.d/vte.sh, which improvies usage of VTE based terminals. # It is vte.sh's responsibility to 'not load' when it's not applicable (not inside a VTE term) # If you want to 'disable' this functionality, set the sticky bit on /etc/profile.d/vte.sh -if test -r /etc/profile.d/vte.sh -a ! -k /etc/profile.d/vte.sh; then - . /etc/profile.d/vte.sh +if test -r /etc/profile.d/vte.sh -a ! -k /etc/profile.d/vte.sh +then . /etc/profile.d/vte.sh +elif test -r /usr/etc/profile.d/vte.sh -a ! -k /usr/etc/profile.d/vte.sh +then . /usr/etc/profile.d/vte.sh fi if test "$_is_save" = "unset" ; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20200507.e2243a4/files/etc/csh.cshrc new/aaa_base-84.87+git20200708.f5e90d7/files/etc/csh.cshrc --- old/aaa_base-84.87+git20200507.e2243a4/files/etc/csh.cshrc 2020-05-07 14:43:18.000000000 +0200 +++ new/aaa_base-84.87+git20200708.f5e90d7/files/etc/csh.cshrc 2020-07-08 11:57:32.000000000 +0200 @@ -2,15 +2,15 @@ # (c) System csh.cshrc for tcsh, Werner Fink '93 # and Jörg Stadler '94 # -# This file sources /etc/profile.d/complete.tcsh and -# /etc/profile.d/bindkey.tcsh used especially by tcsh. +# This file sources /(usr/)etc/profile.d/complete.tcsh and +# /(usr/)etc/profile.d/bindkey.tcsh used especially by tcsh. # # PLEASE DO NOT CHANGE /etc/csh.cshrc. There are chances that your changes # will be lost during system upgrades. Instead use /etc/csh.cshrc.local for # your local settings, favourite global aliases, VISUAL and EDITOR # variables, etc ... # USERS may write their own $HOME/.csh.expert to skip sourcing of -# /etc/profile.d/complete.tcsh and most parts oft this file. +# /(usr/)etc/profile.d/complete.tcsh and most parts oft this file. # # @@ -79,7 +79,13 @@ # # Now read in the key bindings of the tcsh # -if ($?tcsh && -r /etc/profile.d/bindkey.tcsh) source /etc/profile.d/bindkey.tcsh +if ($?tcsh) then + if ( -r /etc/profile.d/bindkey.tcsh ) then + source /etc/profile.d/bindkey.tcsh + else if ( -r /usr/etc/profile.d/bindkey.tcsh ) then + source /usr/etc/profile.d/bindkey.tcsh + endif +endif # # Some useful settings @@ -105,9 +111,15 @@ unset autologout unset ignoreeof -if (-r /etc/profile.d/ls.tcsh) source /etc/profile.d/ls.tcsh +foreach _s (ls.tcsh alias.tcsh) + if (-r /etc/profile.d/$_s) then + source /etc/profile.d/$_s + continue + endif + if (-r /usr/etc/profile.d/$_s) source /usr/etc/profile.d/$_s +end +unset _s -if (-r /etc/profile.d/alias.tcsh) source /etc/profile.d/alias.tcsh # # Prompting and Xterm title # @@ -173,8 +185,12 @@ set _rev=${tcsh:r} set _rel=${_rev:e} set _rev=${_rev:r} - if (($_rev > 6 || ($_rev == 6 && $_rel > 1)) && -r /etc/profile.d/complete.tcsh) then - source /etc/profile.d/complete.tcsh + if ($_rev > 6 || ($_rev == 6 && $_rel > 1)) then + if (-r /etc/profile.d/complete.tcsh) then + source /etc/profile.d/complete.tcsh + else if (-r /usr/etc/profile.d/complete.tcsh) then + source /usr/etc/profile.d/complete.tcsh + endif endif # # Enable editing in multibyte encodings for the locales diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20200507.e2243a4/files/etc/csh.login new/aaa_base-84.87+git20200708.f5e90d7/files/etc/csh.login --- old/aaa_base-84.87+git20200507.e2243a4/files/etc/csh.login 2020-05-07 14:43:18.000000000 +0200 +++ new/aaa_base-84.87+git20200708.f5e90d7/files/etc/csh.login 2020-07-08 11:57:32.000000000 +0200 @@ -233,21 +233,27 @@ # overriding locale variables already present in the environment # if (! ${?CSHRCREAD} ) then - if ( -r /etc/profile.d/csh.ssh ) source /etc/profile.d/csh.ssh + if ( -r /etc/profile.d/csh.ssh ) then + source /etc/profile.d/csh.ssh + else if ( -r /usr/etc/profile.d/csh.ssh ) then + source /usr/etc/profile.d/csh.ssh + endif endif # # Source profile extensions for certain packages, the super # may disable some of them by setting the sticky bit. # -if ( -d /etc/profile.d && ! ${?CSHRCREAD} ) then +if ((-d /etc/profile.d || -d /usr/etc/profile.d ) && ! ${?CSHRCREAD} ) then set _tmp=${?nonomatch} set nonomatch unset noglob + foreach _s ( /usr/etc/profile.d/*.csh ) + if ( -e /etc/profile.d/${_s:t} ) continue + if ( -r $_s && ! -k $_s ) source $_s + end foreach _s ( /etc/profile.d/*.csh ) - if ( -r $_s && ! -k $_s ) then - source $_s - endif + if ( -r $_s && ! -k $_s ) source $_s end set noglob if ( ! ${_tmp} ) unset nonomatch diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20200507.e2243a4/files/etc/profile new/aaa_base-84.87+git20200708.f5e90d7/files/etc/profile --- old/aaa_base-84.87+git20200507.e2243a4/files/etc/profile 2020-05-07 14:43:18.000000000 +0200 +++ new/aaa_base-84.87+git20200708.f5e90d7/files/etc/profile 2020-07-08 11:57:32.000000000 +0200 @@ -291,14 +291,22 @@ # overriding locale variables already present in the environment # if test -z "$PROFILEREAD" ; then - test -r /etc/profile.d/sh.ssh && . /etc/profile.d/sh.ssh + if test -r /etc/profile.d/sh.ssh + then . /etc/profile.d/sh.ssh + elif test -r /usr/etc/profile.d/sh.ssh + then . /usr/etc/profile.d/sh.ssh + fi fi # # Source profile extensions for certain packages, the super # may disable some of them by setting the sticky bit. # -if test -d /etc/profile.d -a -z "$PROFILEREAD" ; then +if test \( -d /etc/profile.d -o -d /usr/etc/profile.d \) -a -z "$PROFILEREAD" ; then + for s in /usr/etc/profile.d/*.sh ; do + test -e /etc/profile.d/${s##*/} && continue + test -r $s -a ! -k $s && . $s + done for s in /etc/profile.d/*.sh ; do test -r $s -a ! -k $s && . $s done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20200507.e2243a4/files/usr/lib/base-scripts/backup-rpmdb new/aaa_base-84.87+git20200708.f5e90d7/files/usr/lib/base-scripts/backup-rpmdb --- old/aaa_base-84.87+git20200507.e2243a4/files/usr/lib/base-scripts/backup-rpmdb 2020-05-07 14:43:18.000000000 +0200 +++ new/aaa_base-84.87+git20200708.f5e90d7/files/usr/lib/base-scripts/backup-rpmdb 2020-07-08 11:57:32.000000000 +0200 @@ -27,7 +27,9 @@ # # PACKAGEDBFILE=packages.rpm -if test -e ${RPMDB_PATH}/Packages ; then +if test -e ${RPMDB_PATH}/Packages.db ; then + PACKAGEDBFILE=Packages.db +elif test -e ${RPMDB_PATH}/Packages ; then PACKAGEDBFILE=Packages fi #