Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at 2020-05-12 22:25:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aaa_base (Old) and /work/SRC/openSUSE:Factory/.aaa_base.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "aaa_base" Tue May 12 22:25:47 2020 rev:467 rq:801760 version:84.87+git20200507.e2243a4 Changes: -------- --- /work/SRC/openSUSE:Factory/aaa_base/aaa_base.changes 2020-04-01 19:18:15.043528751 +0200 +++ /work/SRC/openSUSE:Factory/.aaa_base.new.2738/aaa_base.changes 2020-05-12 22:27:29.211262690 +0200 @@ -1,0 +2,20 @@ +Thu May 07 12:43:27 UTC 2020 - [email protected] + +- Update to version 84.87+git20200507.e2243a4: + * handle non-existing /etc/nsswitch.conf + * set SYSTEMD_OFFLINE=1 if there's no systemd + * Better support of Midnight Commander (bsc#1170527) + * improve sysconf_addword: remove/cleanup spaces while adding/removing flags/modules + +------------------------------------------------------------------- +Tue Mar 31 18:00:15 UTC 2020 - Michal Suchanek <[email protected]> + +- Require xz (boo#1162581). + +------------------------------------------------------------------- +Tue Mar 24 13:13:10 UTC 2020 - [email protected] + +- Update to version 84.87+git20200312.411a96b: + * get_kernel_version: support xz compressed kernel (boo#1162581). + +------------------------------------------------------------------- Old: ---- aaa_base-84.87+git20200224.7105b32.tar.xz New: ---- aaa_base-84.87+git20200507.e2243a4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.NyDUmD/_old 2020-05-12 22:27:31.955268416 +0200 +++ /var/tmp/diff_new_pack.NyDUmD/_new 2020-05-12 22:27:31.955268416 +0200 @@ -23,7 +23,7 @@ %endif Name: aaa_base -Version: 84.87+git20200224.7105b32 +Version: 84.87+git20200507.e2243a4 Release: 0 URL: https://github.com/openSUSE/aaa_base # do not require systemd - aaa_base is in the build environment and we don't @@ -36,6 +36,7 @@ Requires: /usr/bin/mv Requires: /usr/bin/sed Requires: /usr/bin/tput +Requires: /usr/bin/xz Requires: distribution-release Requires: filesystem Recommends: logrotate netcfg udev iputils iproute2 aaa_base-extras ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.NyDUmD/_old 2020-05-12 22:27:32.027268566 +0200 +++ /var/tmp/diff_new_pack.NyDUmD/_new 2020-05-12 22:27:32.031268574 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/openSUSE/aaa_base.git</param> - <param name="changesrevision">b27e1402705aa9f2140b15e2d7aff32c31445f1e</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">e2243a4b9f47fa4a51de471811fc32da925a2ffe</param></service></servicedata> \ No newline at end of file ++++++ aaa_base-84.87+git20200224.7105b32.tar.xz -> aaa_base-84.87+git20200507.e2243a4.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20200224.7105b32/aaa_base.post new/aaa_base-84.87+git20200507.e2243a4/aaa_base.post --- old/aaa_base-84.87+git20200224.7105b32/aaa_base.post 2020-02-24 11:21:41.000000000 +0100 +++ new/aaa_base-84.87+git20200507.e2243a4/aaa_base.post 2020-05-07 14:43:18.000000000 +0200 @@ -14,15 +14,16 @@ %{remove_and_set -n clock SYSTOHC FORCE_SYSTOHC BADYEAR HCTOSYS_DEVICE USE_HWCLOCK USE_ADJUST} fi -# Fix /etc/nsswitch.conf, either because admin ignored *.rpmnew, -# or because of YaST bug [bsc#1162916] -for key in services protocols rpc ; do - grep -q ^${key}.*usrfiles /etc/nsswitch.conf - if [ $? -eq 1 ]; then - cp /etc/nsswitch.conf /etc/nsswitch.conf.pre-usrfiles.${key} - sed -i -e "s|^\(${key}:.*[[:space:]]\)files\([[:space:]].*\)*$|\1files usrfiles\2|" /etc/nsswitch.conf - fi -done +#XXX Fix /etc/nsswitch.conf to include usrfiles [bsc#1162916] +if [ -e /etc/nsswitch.conf ]; then + for key in services protocols rpc ; do + grep -q ^${key}.*usrfiles /etc/nsswitch.conf + if [ $? -eq 1 ]; then + cp /etc/nsswitch.conf /etc/nsswitch.conf.pre-usrfiles.${key} + sed -i -e "s|^\(${key}:.*[[:space:]]\)files\([[:space:]].*\)*$|\1files usrfiles\2|" /etc/nsswitch.conf + fi + done +fi for i in language proxy windowmanager ; do %{fillup_only -n $i} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20200224.7105b32/files/etc/csh.cshrc new/aaa_base-84.87+git20200507.e2243a4/files/etc/csh.cshrc --- old/aaa_base-84.87+git20200224.7105b32/files/etc/csh.cshrc 2020-02-24 11:21:41.000000000 +0100 +++ new/aaa_base-84.87+git20200507.e2243a4/files/etc/csh.cshrc 2020-05-07 14:43:18.000000000 +0200 @@ -50,7 +50,7 @@ # Avoid trouble with Emacs shell mode # if ($?EMACS) then - setenv LS_OPTIONS '-N --color=none -T 0'; + setenv LS_OPTIONS '-N --color=none -T 0' endif # @@ -61,7 +61,7 @@ # # Avoid trouble with Emacs shell mode # -if ($?EMACS) then +if ($?EMACS || $?MC_SID) then path tset -I -Q path stty cooked pass8 dec nl -echo endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20200224.7105b32/files/etc/profile.d/wsl.csh new/aaa_base-84.87+git20200507.e2243a4/files/etc/profile.d/wsl.csh --- old/aaa_base-84.87+git20200224.7105b32/files/etc/profile.d/wsl.csh 2020-02-24 11:21:41.000000000 +0100 +++ new/aaa_base-84.87+git20200507.e2243a4/files/etc/profile.d/wsl.csh 2020-05-07 14:43:18.000000000 +0200 @@ -3,6 +3,7 @@ if ( -f /proc/version ) set is_wsl=`grep -ic microsoft /proc/version` if ( $is_wsl == 1 ) then + if ( ! -e /run/systemd/system/ ) set SYSTEMD_OFFLINE=1 if ( ${?orig_path} ) then set -f path=($orig_path $path) endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20200224.7105b32/files/etc/profile.d/wsl.sh new/aaa_base-84.87+git20200507.e2243a4/files/etc/profile.d/wsl.sh --- old/aaa_base-84.87+git20200224.7105b32/files/etc/profile.d/wsl.sh 2020-02-24 11:21:41.000000000 +0100 +++ new/aaa_base-84.87+git20200507.e2243a4/files/etc/profile.d/wsl.sh 2020-05-07 14:43:18.000000000 +0200 @@ -6,6 +6,11 @@ PATH=$ORIG_PATH:$PATH fi + if ! test -e /run/systemd/system/; then + SYSTEMD_OFFLINE=1 + export SYSTEMD_OFFLINE + fi + if test $(umask) -eq 0000; then local logindefs for logindefs in /etc/login.defs /usr/etc/login.defs; do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20200224.7105b32/files/usr/sbin/sysconf_addword new/aaa_base-84.87+git20200507.e2243a4/files/usr/sbin/sysconf_addword --- old/aaa_base-84.87+git20200224.7105b32/files/usr/sbin/sysconf_addword 2020-02-24 11:21:41.000000000 +0100 +++ new/aaa_base-84.87+git20200507.e2243a4/files/usr/sbin/sysconf_addword 2020-05-07 14:43:18.000000000 +0200 @@ -55,6 +55,7 @@ sed -i -e "${lineno} { s/^[[:space:]]*\($var=\".*\)\(\".*\)/\1 $word_quoted\2/; s/=\" */=\"/ + s/ \+/ /g }" $file $debug && diff -u $tmpf $file else @@ -70,7 +71,8 @@ $debug && cp $file $tmpf sed -i -e "${lineno} { s/\(['\" ]\)$word_quoted\(['\" ]\)/\1 \2/g - s/ / /g + s/ \+/ /g + s/\ \+\(\"\)/\1/g }" $file $debug && diff -u $tmpf $file else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20200224.7105b32/get_kernel_version.c new/aaa_base-84.87+git20200507.e2243a4/get_kernel_version.c --- old/aaa_base-84.87+git20200224.7105b32/get_kernel_version.c 2020-02-24 11:21:41.000000000 +0100 +++ new/aaa_base-84.87+git20200507.e2243a4/get_kernel_version.c 2020-05-07 14:43:18.000000000 +0200 @@ -47,7 +47,8 @@ /* check if file exist and is compressed */ { - unsigned char buf [2]; +#define DETECT_SIZE 6 + unsigned char buf [DETECT_SIZE]; int fd = open (argv[1], O_RDONLY | O_CLOEXEC); if (fd == -1) { @@ -55,16 +56,30 @@ return 1; } - if (read (fd, buf, 2) != 2) + if (read (fd, buf, DETECT_SIZE) != DETECT_SIZE) { fprintf (stderr, "Short read\n"); close (fd); return 1; } + /* \xFD7zXZ\x00 */ + if ((buf [0] == 0xfd) && + (buf [1] == '7') && + (buf [2] == 'z') && + (buf [3] == 'X') && + (buf [4] == 'Z') && + (buf [5] == 0)) + { + snprintf (command, sizeof (command), "/usr/bin/xz -dc %s 2>/dev/null", argv[1]); + } + if (buf [0] == 037 && (buf [1] == 0213 || buf [1] == 0236)) { snprintf (command, sizeof (command), "/bin/gzip -dc %s 2>/dev/null", argv[1]); + } + + if (*command) { fp = popen (command, "re"); if (fp == NULL) {
