From cabad6d3a1e1e4026b9435d47b9ed504ade65409 Mon Sep 17 00:00:00 2001
From: kukuk <>
Date: Jan 10 2021 18:38:17 +0000
Subject: Update aaa_base to version 84.87+git20201123.4f16b16 / rev 476 via SR 851301


https://build.opensuse.org/request/show/851301
by user kukuk + dimstar_suse

---

diff --git a/.files b/.files
index 7289714..947824d 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index e441964..95af78f 100644
--- a/.rev
+++ b/.rev
@@ -3861,4 +3861,12 @@
   * alias.bash check if ip command knows color=auto (jsc#SLE-7679)</comment>
     <requestid>835405</requestid>
   </revision>
+  <revision rev="476" vrev="1">
+    <srcmd5>07a574738f21cea667d9bf4a456bdf71</srcmd5>
+    <version>84.87+git20201123.4f16b16</version>
+    <time>1610303871</time>
+    <user>dimstar_suse</user>
+    <comment></comment>
+    <requestid>851301</requestid>
+  </revision>
 </revisionlist>
diff --git a/.servicemark b/.servicemark
index 7065fe0..242f195 100644
--- a/.servicemark
+++ b/.servicemark
@@ -1 +1 @@
-42a840faced17b6ee790a58d2d3f13ec
+f63effe819d5dcd8751addcfc0dc9386
diff --git a/_servicedata b/_servicedata
index d956155..51466b5 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,6 +1,6 @@
 <servicedata>
 <service name="tar_scm">
     <param name="url">https://github.com/openSUSE/aaa_base.git</param>
-    <param name="changesrevision">91f496b1f65af29832192bad949685a7bc25da0a</param>
+    <param name="changesrevision">4f16b1614fac8432188271c8363b1e6217944b4c</param>
 </service>
 </servicedata>
\ No newline at end of file
diff --git a/aaa_base-84.87+git20200918.331aa2f.tar.xz b/aaa_base-84.87+git20200918.331aa2f.tar.xz
deleted file mode 120000
index 8bab186..0000000
--- a/aaa_base-84.87+git20200918.331aa2f.tar.xz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafkreigrxjxsm7y6xeymz44sj3rjfvhmrjzutdeubopazsvuntr5iunbzm
\ No newline at end of file
diff --git a/aaa_base-84.87+git20201123.4f16b16.tar.xz b/aaa_base-84.87+git20201123.4f16b16.tar.xz
new file mode 120000
index 0000000..1c7b2ed
--- /dev/null
+++ b/aaa_base-84.87+git20201123.4f16b16.tar.xz
@@ -0,0 +1 @@
+/ipfs/bafkreig5euxktqff3k4uweaxqrhakkl3toxmun5a3i437ug75roqcvrvs4
\ No newline at end of file
diff --git a/aaa_base-rpmlintrc b/aaa_base-rpmlintrc
index d2546e6..5d189b4 100644
--- a/aaa_base-rpmlintrc
+++ b/aaa_base-rpmlintrc
@@ -1,66 +1,9 @@
-# it's just a README....
-addFilter("non-remote_fs-dependency.*/etc/init.d/README")
-addFilter("init-script-non-executable.*/etc/init.d/README")
-addFilter("no-status-entry.*/etc/init.d/README")
-addFilter("non-executable-script.*/sbin/init.d.README")
-addFilter("non-executable-in-bin.*/sbin/init.d.README")
-addFilter("script-without-shebang.*/sbin/init.d.README")
-# contains just functions - executable bit is not needed
-addFilter("non-executable-script.*/lib/YaST/SuSEconfig.functions")
-# random don't need $remote-fs
-addFilter("non-remote_fs-dependency.*/etc/init.d/random")
-# if this script is triggered, remote-fs is not important
-addFilter("non-remote_fs-dependency.*/etc/init.d/powerfail")
-# single user mode is without remote connection
-addFilter("non-remote_fs-dependency.*/etc/init.d/single")
-# no comment
-addFilter("non-remote_fs-dependency.*/etc/init.d/halt")
-# this script is only for runlevel changes
-addFilter("non-remote_fs-dependency.*/etc/init.d/rc")
-# perhaps should be configurable later...
-addFilter("non-etc-or-var-file-marked-as-conffile.*/sbin/quick_halt")
 # confirmed - but standard
 addFilter("non-root-group-log-file /var/log/wtmp utmp")
-# the following init script don't need to be reloaded - 
-# even after an update
-addFilter("no-reload-entry.*/etc/init.d/README")
-addFilter("no-reload-entry.*/etc/init.d/boot.swap")
-addFilter("no-reload-entry.*/etc/init.d/boot.proc")
-addFilter("no-reload-entry.*/etc/init.d/random")
-addFilter("no-reload-entry.*/etc/init.d/boot.ipconfig")
-addFilter("no-reload-entry.*/etc/init.d/boot.rootfsck")
-addFilter("no-reload-entry.*/etc/init.d/powerfail")
-addFilter("no-reload-entry.*/etc/init.d/single")
-addFilter("no-reload-entry.*/etc/init.d/boot.cleanup")
-addFilter("no-reload-entry.*/etc/init.d/halt")
-addFilter("no-reload-entry.*/etc/init.d/boot.ldconfig")
-addFilter("no-reload-entry.*/etc/init.d/boot")
-addFilter("no-reload-entry.*/etc/init.d/boot.klog")
-addFilter("no-reload-entry.*/etc/init.d/rc")
-addFilter("no-reload-entry.*/etc/init.d/boot.clock")
-addFilter("no-reload-entry.*/etc/init.d/boot.localnet")
-addFilter("no-reload-entry.*/etc/init.d/boot.localfs")
-# the following init scripts don't need to be stopped - 
-# even after an update
-addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/skeleton.compat")
-addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/README")
-addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/boot.swap")
-addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/boot.proc")
-addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/random")
-addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/boot.ipconfig")
-addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/boot.rootfsck")
-addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/powerfail")
-addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/single")
-addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/boot.cleanup")
-addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/skeleton")
-addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/halt")
-addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/boot.ldconfig")
-addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/boot")
-addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/boot.klog")
-addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/rc")
-addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/boot.clock")
-addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/boot.localnet")
-addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/boot.localfs")
 
 # aaa_base requires net-tools
 addFilter("dangling-symlink.*/usr/lib/restricted/bin/hostname.*/bin/hostname")
+
+# for /etc/init.d/*.local. To be removed at some point
+addFilter(".*suse-deprecated-init-script.*")
+addFilter(".*suse-deprecated-boot-script.*")
diff --git a/aaa_base.changes b/aaa_base.changes
index ddc0d81..6bc77df 100644
--- a/aaa_base.changes
+++ b/aaa_base.changes
@@ -1,4 +1,18 @@
 -------------------------------------------------------------------
+Mon Nov 23 09:41:55 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
+
+- clean up rpmlintrc. Add filter for deprecated init scripts. We'll have to
+  keep them around for a while until systemd takes over ownership.
+- Update to version 84.87+git20201123.4f16b16:
+  * mark /etc/init.d/{boot,after}.local as %config(noreplace) (boo#1179097)
+  * Avoid semicolon within (t)csh login script on S/390
+
+-------------------------------------------------------------------
+Thu Oct 29 09:39:56 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
+
+- prepare usrmerge (boo#1029961)
+
+-------------------------------------------------------------------
 Fri Sep 18 11:30:53 UTC 2020 - dleuenberger@suse.com
 
 - Update to version 84.87+git20200918.331aa2f:
diff --git a/aaa_base.spec b/aaa_base.spec
index dc9f03a..ed01a24 100644
--- a/aaa_base.spec
+++ b/aaa_base.spec
@@ -23,7 +23,7 @@
 %endif
 
 Name:           aaa_base
-Version:        84.87+git20200918.331aa2f
+Version:        84.87+git20201123.4f16b16
 Release:        0
 URL:            https://github.com/openSUSE/aaa_base
 # do not require systemd - aaa_base is in the build environment and we don't
@@ -113,6 +113,9 @@ fi
 %install
 #
 make DESTDIR=$RPM_BUILD_ROOT install
+%if 0%{?usrmerged}
+rm -f %{buildroot}/sbin/*
+%endif
 #
 mkdir -p %{buildroot}/etc/sysctl.d
 case "$RPM_ARCH" in
@@ -122,9 +125,10 @@ esac
 #
 # make sure it does not creep in again
 test -d $RPM_BUILD_ROOT/root/.gnupg && exit 1
+# TODO: get rid of that at some point in the future
 mkdir -p $RPM_BUILD_ROOT/etc/init.d
 for i in boot.local after.local ; do
-  touch $RPM_BUILD_ROOT/etc/init.d/$i
+  install -m 755 /dev/null $RPM_BUILD_ROOT/etc/init.d/$i
 done
 #
 install -d -m 755 %buildroot%{_libexecdir}/initscripts/legacy-actions
@@ -197,20 +201,17 @@ mkdir -p %{buildroot}%{_fillupdir}
 /etc/profile.d/ls.zsh
 %config /etc/shells
 %config /etc/ttytype
-%dir /etc/init.d/
-%ghost /etc/init.d/boot.local
-%ghost /etc/init.d/after.local
+%ghost %dir /etc/init.d
+%ghost %config(noreplace) /etc/init.d/boot.local
+%ghost %config(noreplace) /etc/init.d/after.local
 %ghost %config /etc/inittab
 # 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
 /etc/hushlogins
 /usr/bin/get_kernel_version
-/sbin/refresh_initrd
 /usr/sbin/refresh_initrd
-/sbin/service
 /usr/sbin/service
-/sbin/smart_agetty
 /usr/sbin/smart_agetty
 /usr/bin/filesize
 /usr/bin/old
@@ -230,6 +231,11 @@ mkdir -p %{buildroot}%{_fillupdir}
 %{_fillupdir}/sysconfig.language
 %{_fillupdir}/sysconfig.proxy
 %{_fillupdir}/sysconfig.windowmanager
+%if !0%{?usrmerged}
+/sbin/service
+/sbin/refresh_initrd
+/sbin/smart_agetty
+%endif
 
 %files extras
 %defattr(-,root,root)