diff --git a/_servicedata b/_servicedata index d654693..79b495a 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ git://github.com/openSUSE/aaa_base.git - cc9e34e45854d7313e07a0f4b2cc41b720a16003 \ No newline at end of file + 8f12a9e0796fb53980ea55e3911e4399fdfeb320 \ No newline at end of file diff --git a/aaa_base-13.2+git20170814.cc9e34e.tar.xz b/aaa_base-13.2+git20170814.cc9e34e.tar.xz deleted file mode 100644 index 369803f..0000000 --- a/aaa_base-13.2+git20170814.cc9e34e.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2ca3733f4e50dd7597ac97985fb571840304c78dcb67af25a63eae4d4f98d074 -size 81376 diff --git a/aaa_base-13.2+git20170828.8f12a9e.tar.xz b/aaa_base-13.2+git20170828.8f12a9e.tar.xz new file mode 100644 index 0000000..ef2d07b --- /dev/null +++ b/aaa_base-13.2+git20170828.8f12a9e.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8c92dac8b95bc7f3fb59fc6c7a2e517b2e99bb412e36f835e648040c58c18f06 +size 80712 diff --git a/aaa_base.changes b/aaa_base.changes index 5a73d4d..a54fad6 100644 --- a/aaa_base.changes +++ b/aaa_base.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Aug 30 08:29:57 CEST 2017 - kukuk@suse.de + +- 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. + ------------------------------------------------------------------- Sun Aug 20 22:41:01 UTC 2017 - vuntz@opensuse.org diff --git a/aaa_base.spec b/aaa_base.spec index 396358f..e5ddeef 100644 --- a/aaa_base.spec +++ b/aaa_base.spec @@ -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 @@ installed by default as it may degrade performance. %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 @@ esac # # 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 @@ rm -f /root/.gnupg/secring.gpg.aaa_save %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 @@ rm -f /root/.gnupg/secring.gpg.aaa_save # 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*