Accepting request 851301 from Base:System

OBS-URL: https://build.opensuse.org/request/show/851301
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/aaa_base?expand=0&rev=476

_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>

aaa_base-84.87+git20200918.331aa2f.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d1ba6f267f1eb930ccf3924ee292d4ec8a73498c940b9e0ccab46ce3d451a1cb
-size 62416

aaa_base-84.87+git20201123.4f16b16.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dd252ea9c0a5dab94b1017844e05297b9baeca37a0da39bfd0dfec5d01563597
+size 62384

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.*")

aaa_base.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+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
 

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 %dir /etc/init.d
-%ghost /etc/init.d/boot.local
+%ghost %config(noreplace) /etc/init.d/boot.local
-%ghost /etc/init.d/after.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)