Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at 2017-09-28 12:32:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aaa_base (Old) and /work/SRC/openSUSE:Factory/.aaa_base.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "aaa_base" Thu Sep 28 12:32:25 2017 rev:438 rq:520102 version:13.2+git20170828.8f12a9e Changes: -------- --- /work/SRC/openSUSE:Factory/aaa_base/aaa_base.changes 2017-08-29 11:35:23.505685446 +0200 +++ /work/SRC/openSUSE:Factory/.aaa_base.new/aaa_base.changes 2017-09-28 12:32:30.483829308 +0200 @@ -1,0 +2,10 @@ +Wed Aug 30 08:29:57 CEST 2017 - [email protected] + +- Update to version 13.2+git20170828.8f12a9e: + * profile: don't override PATH in WSL + * Remove passwd, group and shadow files. Remove %ghost entry for + /run/utmp, /var/log/wtmp and /var/log/btmp, systemd is taking + care of them + * Remove run/utmp, too. + +------------------------------------------------------------------- Old: ---- aaa_base-13.2+git20170814.cc9e34e.tar.xz New: ---- aaa_base-13.2+git20170828.8f12a9e.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.Cz7uJ9/_old 2017-09-28 12:32:31.263719649 +0200 +++ /var/tmp/diff_new_pack.Cz7uJ9/_new 2017-09-28 12:32:31.263719649 +0200 @@ -18,7 +18,7 @@ Name: aaa_base -Version: 13.2+git20170814.cc9e34e +Version: 13.2+git20170828.8f12a9e Release: 0 Url: https://github.com/openSUSE/aaa_base Provides: aaa_skel = %{version}-%{release} @@ -86,6 +86,8 @@ %setup -q %build +rm -rfv files/run +rm -fv files/var/log/btmp files/var/log/wtmp make CFLAGS="$RPM_OPT_FLAGS" CC="%{__cc}" %{?_smp_mflags} if test -d patches/$RPM_ARCH; then pushd files @@ -108,12 +110,6 @@ # # make sure it does not creep in again test -d $RPM_BUILD_ROOT/root/.gnupg && exit 1 -# -# -# mark these as ghost -for i in passwd group shadow gshadow ; do - touch $RPM_BUILD_ROOT/var/adm/fillup-templates/$i.aaa_base -done mkdir -p $RPM_BUILD_ROOT/etc/init.d for i in boot.local after.local halt.local ; do echo "#!bin/bash" > $RPM_BUILD_ROOT/etc/init.d/$i @@ -159,10 +155,6 @@ %config /etc/rc.status %config /etc/shells %config /etc/ttytype -%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 %ghost /etc/init.d/boot.local %ghost /etc/init.d/after.local %ghost /etc/init.d/halt.local @@ -170,9 +162,6 @@ # 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(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) /run/utmp /etc/hushlogins %dir /lib/aaa_base /lib/aaa_base/convert_sysctl* ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.Cz7uJ9/_old 2017-09-28 12:32:31.347707839 +0200 +++ /var/tmp/diff_new_pack.Cz7uJ9/_new 2017-09-28 12:32:31.351707277 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/openSUSE/aaa_base.git</param> - <param name="changesrevision">cc9e34e45854d7313e07a0f4b2cc41b720a16003</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">8f12a9e0796fb53980ea55e3911e4399fdfeb320</param></service></servicedata> \ No newline at end of file ++++++ aaa_base-13.2+git20170814.cc9e34e.tar.xz -> aaa_base-13.2+git20170828.8f12a9e.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-13.2+git20170814.cc9e34e/aaa_base.post new/aaa_base-13.2+git20170828.8f12a9e/aaa_base.post --- old/aaa_base-13.2+git20170814.cc9e34e/aaa_base.post 2017-08-14 15:33:23.000000000 +0200 +++ new/aaa_base-13.2+git20170828.8f12a9e/aaa_base.post 2017-08-28 15:47:50.000000000 +0200 @@ -101,60 +101,6 @@ fi # -# Backup gshadow file and remove it (merge passwords into -# /etc/group before). -# -if [ -f /etc/gshadow -a -x /usr/sbin/grpunconv ]; then - cp -p /etc/gshadow /etc/gshadow-`date "+%Y%m%d"` - chmod 600 /etc/gshadow-`date "+%Y%m%d"` - /usr/sbin/grpunconv -fi - -# -# handle password files -# -for i in passwd group shadow ; do - test -e /var/adm/fillup-templates/$i.aaa_base || continue - echo -n "Updating etc/$i..." - if test -f /etc/$i ; then - cp /etc/$i /etc/$i.tmp - rm -f /etc/$i.add - sort -k 1,1 -t: -u /etc/$i /var/adm/fillup-templates/$i.aaa_base \ - | sort -k 1,1 -t: /etc/$i - | uniq -u > /etc/$i.add - cat /etc/$i.add >> /etc/$i - rm -f /etc/$i.add - if cmp -s /etc/$i /etc/$i.tmp ; then - echo "unchanged" - else - echo "modified" - fi - rm -f /etc/$i.tmp - # If we have a NIS system, we have to make sure, that "^+" is at the end - grep -v "^+" /etc/$i > /etc/$i.tmp || : - grep "^+" /etc/$i >> /etc/$i.tmp || : - test -s /etc/$i.tmp && cat /etc/$i.tmp > /etc/$i - rm -f /etc/$i.tmp - else - cat /var/adm/fillup-templates/$i.aaa_base > /etc/$i - echo "new" - fi -done -# check/fix owner and permission of shadow files -for i in /etc/shadow ; do - chmod 640 $i - chgrp shadow $i -done -# -# Change primary group of nobody to nobody -# and change mistakenly root:users group to root:root (bnc#843230) -# -if [ -x /usr/sbin/usermod ]; then - /usr/sbin/usermod -g nobody nobody 2> /dev/null ||: - - /usr/sbin/usermod -g root root 2> /dev/null ||: -fi - -# # create mtab if it does not exist # if test ! -e /etc/mtab; then @@ -175,9 +121,6 @@ done <<EOT /root/.bash_history root:root 600 /var/log/lastlog root:root 644 -/var/log/wtmp root:utmp 664 -/var/log/btmp root:root 600 -/run/utmp root:utmp 664 EOT if test -e /usr/sbin/usrdel.local -a ! -e /usr/sbin/userdel.local ; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-13.2+git20170814.cc9e34e/aaa_base.pre new/aaa_base-13.2+git20170828.8f12a9e/aaa_base.pre --- old/aaa_base-13.2+git20170814.cc9e34e/aaa_base.pre 2017-08-14 15:33:23.000000000 +0200 +++ new/aaa_base-13.2+git20170828.8f12a9e/aaa_base.pre 2017-08-28 15:47:50.000000000 +0200 @@ -26,52 +26,6 @@ mkdir -p $i } done -# -# now create a var/adm/fillup-templates/passwd.aaa_base. -# If etc/passwd does not exist, copy -# var/adm/fillup-templates/passwd.aaa_base to etc/passwd. -# deleted db2 groups and users were uids 46,47,48 and gids 46,47,48 -# -mkdir -p /etc -mkdir -p /var/adm/fillup-templates -echo "root:x:0:0:root:/root:/bin/bash" \ - > /var/adm/fillup-templates/passwd.aaa_base - -echo "root:x:0: -shadow:x:15: -dialout:x:16: -utmp:x:22: -users:x:100:" > /var/adm/fillup-templates/group.aaa_base - -rm -f /var/adm/fillup-templates/shadow.aaa_base -while read LINE ; do - case $LINE in - root*) - echo "root::$(($(date '+%s')/86400))::::::" \ - >> /var/adm/fillup-templates/shadow.aaa_base - ;; - *) - echo "${LINE%%%%:*}:*:$(($(date '+%s')/86400))::::::" \ - >> /var/adm/fillup-templates/shadow.aaa_base - ;; - esac -done < /var/adm/fillup-templates/passwd.aaa_base - - -for file in passwd group ; do - if test -f /etc/$file ; then - # like fillup, but : is the only separator - rm -f /etc/$file.add - sort -k 1,1 -t: -u /etc/$file /var/adm/fillup-templates/$file.aaa_base \ - | sort -k 1,1 -t: /etc/$file - | uniq -u > /etc/$file.add - cat /etc/$file.add >> /etc/$file - rm -f /etc/$file.add - # fix permissions if this script is called with strange umask - chmod 644 /etc/$file - else - cat /var/adm/fillup-templates/$file.aaa_base > /etc/$file - fi -done # # we have several local files, that changed over the time. Check the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-13.2+git20170814.cc9e34e/files/etc/profile new/aaa_base-13.2+git20170828.8f12a9e/files/etc/profile --- old/aaa_base-13.2+git20170814.cc9e34e/files/etc/profile 2017-08-14 15:33:23.000000000 +0200 +++ new/aaa_base-13.2+git20170828.8f12a9e/files/etc/profile 2017-08-28 15:47:50.000000000 +0200 @@ -148,6 +148,8 @@ # Do NOT export UID, EUID, USER, and LOGNAME export MAIL HOST CPU HOSTNAME HOSTTYPE OSTYPE MACHTYPE +IS_WSL=`grep -i microsoft /proc/version` + # # You may use /etc/initscript, /etc/profile.local or the # ulimit package instead to set up ulimits and your PATH. @@ -163,7 +165,10 @@ # Make path more comfortable # if test -z "$PROFILEREAD" ; then - PATH=/usr/local/bin:/usr/bin:/bin + # WSL already sets PATH, shouldn't be overridden + if test "$IS_WSL" = ""; then + PATH=/usr/local/bin:/usr/bin:/bin + fi if test "$HOME" != "/" ; then for dir in $HOME/bin/$CPU $HOME/bin ; do test -d $dir && PATH=$dir:$PATH
