From 28c62b64e9fa592e4260746a51d3e8848bb86f846d1aa20558fceadde55deab4 Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk Date: Sun, 4 Feb 2018 21:48:41 +0000 Subject: [PATCH 1/3] - Update to version 84.87+git20180204.875cba8: * Move sysconfig.backup into extra subpackage, where all the scripts using it are, too. * Create systemd timer for the cron.daily scripts for backup-rpmdb, backup-sysconfig and check-battery. Move scripts to /usr/lib/base-scripts. * Remove suse.de-cron-local. If somebody really still has a /root/cron.daily.local file, he can move it to /etc/cron.daily. * Don't modify data in root's home directory * Don't create userdel.local, this isn't in use since many years OBS-URL: https://build.opensuse.org/package/show/Base:System/aaa_base?expand=0&rev=620 --- _servicedata | 2 +- aaa_base-84.87+git20180130.ae1f262.tar.xz | 3 --- aaa_base-84.87+git20180204.875cba8.tar.xz | 3 +++ aaa_base.changes | 14 ++++++++++ aaa_base.spec | 31 +++++++++++++---------- 5 files changed, 36 insertions(+), 17 deletions(-) delete mode 100644 aaa_base-84.87+git20180130.ae1f262.tar.xz create mode 100644 aaa_base-84.87+git20180204.875cba8.tar.xz diff --git a/_servicedata b/_servicedata index 4256ea9..18c9765 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ git://github.com/openSUSE/aaa_base.git - ae1f2624f86386f0a1cc6b28ff0a86218ad0bc0a \ No newline at end of file + 875cba8a0876c6e9d56c215976a7c26396534124 \ No newline at end of file diff --git a/aaa_base-84.87+git20180130.ae1f262.tar.xz b/aaa_base-84.87+git20180130.ae1f262.tar.xz deleted file mode 100644 index 6b4cb99..0000000 --- a/aaa_base-84.87+git20180130.ae1f262.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:301ddc505790079c0c1c0dfcbf8cb41ec853d3262cf93586c022ff062a2bc956 -size 75108 diff --git a/aaa_base-84.87+git20180204.875cba8.tar.xz b/aaa_base-84.87+git20180204.875cba8.tar.xz new file mode 100644 index 0000000..af6bbc8 --- /dev/null +++ b/aaa_base-84.87+git20180204.875cba8.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:13b94725e7f9c84fa7138dca8118dd40b8ff8249faafded279505b5a377de45f +size 75088 diff --git a/aaa_base.changes b/aaa_base.changes index 1f5ff55..6c802f1 100644 --- a/aaa_base.changes +++ b/aaa_base.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Sun Feb 04 21:39:14 UTC 2018 - kukuk@suse.de + +- Update to version 84.87+git20180204.875cba8: + * Move sysconfig.backup into extra subpackage, where all the + scripts using it are, too. + * Create systemd timer for the cron.daily scripts for backup-rpmdb, + backup-sysconfig and check-battery. Move scripts to + /usr/lib/base-scripts. + * Remove suse.de-cron-local. If somebody really still has a + /root/cron.daily.local file, he can move it to /etc/cron.daily. + * Don't modify data in root's home directory + * Don't create userdel.local, this isn't in use since many years + ------------------------------------------------------------------- Tue Jan 30 13:26:42 CET 2018 - kukuk@suse.de diff --git a/aaa_base.spec b/aaa_base.spec index b014f00..116581b 100644 --- a/aaa_base.spec +++ b/aaa_base.spec @@ -23,7 +23,7 @@ %endif Name: aaa_base -Version: 84.87+git20180130.ae1f262 +Version: 84.87+git20180204.875cba8 Release: 0 Url: https://github.com/openSUSE/aaa_base Provides: aaa_skel = %{version}-%{release} @@ -49,7 +49,7 @@ BuildRequires: net-tools BuildRequires: xz Recommends: logrotate netcfg udev net-tools aaa_base-extras PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/ls /bin/date -Requires(post): fillup /usr/bin/cmp +Requires(post): fillup Summary: openSUSE Base Package License: GPL-2.0+ Group: System/Fhs @@ -70,8 +70,8 @@ This package installs several important configuration files and central scripts. Summary: SUSE Linux Base Package (recommended part) Group: System/Fhs Requires: %{name} = %{version} +Requires(post): fillup Provides: aaa_base:/etc/DIR_COLORS -Recommends: cron %description extras The parts of aaa_base that should be installed by default but are not @@ -156,11 +156,18 @@ mkdir -p %{buildroot}%{_fillupdir} %post -f aaa_base.post -%triggerpostun -- aaa_base -if test -f /root/.gnupg/secring.gpg.aaa_save -a ! -f /root/.gnupg/secring.gpg ; then - mv /root/.gnupg/secring.gpg.aaa_save /root/.gnupg/secring.gpg -fi -rm -f /root/.gnupg/secring.gpg.aaa_save +%pre extras +%service_add_pre backup-rpmdb.service backup-rpmdb.timer backup-sysconfig.service backup-sysconfig.timer check-battery.service check-battery.timer + +%post extras +%fillup_only -n backup +%service_add_post backup-rpmdb.service backup-rpmdb.timer backup-sysconfig.service backup-sysconfig.timer check-battery.service check-battery.timer + +%preun extras +%service_del_preun backup-rpmdb.service backup-rpmdb.timer backup-sysconfig.service backup-sysconfig.timer check-battery.service check-battery.timer + +%postun extras +%service_del_postun backup-rpmdb.service backup-rpmdb.timer backup-sysconfig.service backup-sysconfig.timer check-battery.service check-battery.timer %files %defattr(-,root,root) @@ -223,7 +230,6 @@ rm -f /root/.gnupg/secring.gpg.aaa_save /usr/lib/sysctl.d/*.conf %dir /usr/lib/initscripts %dir /usr/lib/initscripts/legacy-actions -%{_fillupdir}/sysconfig.backup %{_fillupdir}/sysconfig.language %{_fillupdir}/sysconfig.news %{_fillupdir}/sysconfig.proxy @@ -232,10 +238,6 @@ rm -f /root/.gnupg/secring.gpg.aaa_save %files extras %defattr(-,root,root) %config(noreplace) /etc/DIR_COLORS -/etc/cron.daily/suse.de-backup-rc.config -/etc/cron.daily/suse.de-backup-rpmdb -/etc/cron.daily/suse.de-check-battery -/etc/cron.daily/suse.de-cron-local /etc/skel/.emacs /etc/skel/.inputrc %config /etc/profile.d/complete.bash @@ -245,7 +247,10 @@ rm -f /root/.gnupg/secring.gpg.aaa_save /etc/profile.d/ls.tcsh /etc/profile.d/ls.bash /etc/profile.d/ls.zsh +/usr/lib/base-scripts +/usr/lib/systemd/system/* /usr/share/man/man8/resolv+.8* +%{_fillupdir}/sysconfig.backup %files malloccheck %defattr(-,root,root) From ecaec4b4d77654fd8cbbc62c3c11172a506e9ad32874738f7a5efe5694477e6f Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk Date: Mon, 5 Feb 2018 12:32:06 +0000 Subject: [PATCH 2/3] - Add /var/adm/backup subdirectories to aaa_base-extras, they are only needed by this package. OBS-URL: https://build.opensuse.org/package/show/Base:System/aaa_base?expand=0&rev=621 --- aaa_base.changes | 6 ++++++ aaa_base.spec | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/aaa_base.changes b/aaa_base.changes index 6c802f1..84682c2 100644 --- a/aaa_base.changes +++ b/aaa_base.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Feb 5 13:31:50 CET 2018 - kukuk@suse.de + +- Add /var/adm/backup subdirectories to aaa_base-extras, they are + only needed by this package. + ------------------------------------------------------------------- Sun Feb 04 21:39:14 UTC 2018 - kukuk@suse.de diff --git a/aaa_base.spec b/aaa_base.spec index 116581b..9a38a60 100644 --- a/aaa_base.spec +++ b/aaa_base.spec @@ -102,8 +102,6 @@ systems. %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 @@ -136,6 +134,9 @@ install -d -m 755 %buildroot/usr/lib/initscripts/legacy-actions # keep as ghost for migration touch %buildroot/etc/inittab +# Backup directories +install -d -m 755 %{buildroot}/var/adm/backup/{rpmdb,sysconfig} + mkdir -p %{buildroot}%{_fillupdir} %if "%{_fillupdir}" != "/var/adm/fillup-templates" for f in %{buildroot}/var/adm/fillup-templates/* ; do @@ -250,6 +251,8 @@ mkdir -p %{buildroot}%{_fillupdir} /usr/lib/base-scripts /usr/lib/systemd/system/* /usr/share/man/man8/resolv+.8* +/var/adm/backup/rpmdb +/var/adm/backup/sysconfig %{_fillupdir}/sysconfig.backup %files malloccheck From fa80f6244d41b7be023096acbf9fc9b17438d96633090571cf758006e3d9c919 Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk Date: Mon, 5 Feb 2018 14:57:35 +0000 Subject: [PATCH 3/3] - Update to version 84.87+git20180205.2d2832f: * Move /lib/aaa_base/convert_sysctl to /usr/lib/base-scripts/convert_sysctl to cleanup filesystem. * Don't create /etc/init.d/{boot.local,after.local,halt.local} in aaa_base.pre section. * Remove dead code from pre/post install sections. OBS-URL: https://build.opensuse.org/package/show/Base:System/aaa_base?expand=0&rev=622 --- _servicedata | 2 +- aaa_base-84.87+git20180204.875cba8.tar.xz | 3 --- aaa_base-84.87+git20180205.2d2832f.tar.xz | 3 +++ aaa_base.changes | 10 ++++++++++ aaa_base.spec | 10 ++++++---- 5 files changed, 20 insertions(+), 8 deletions(-) delete mode 100644 aaa_base-84.87+git20180204.875cba8.tar.xz create mode 100644 aaa_base-84.87+git20180205.2d2832f.tar.xz diff --git a/_servicedata b/_servicedata index 18c9765..29338bb 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ git://github.com/openSUSE/aaa_base.git - 875cba8a0876c6e9d56c215976a7c26396534124 \ No newline at end of file + 2d2832ff10366b2f3e84fbf9d242a1787a52c118 \ No newline at end of file diff --git a/aaa_base-84.87+git20180204.875cba8.tar.xz b/aaa_base-84.87+git20180204.875cba8.tar.xz deleted file mode 100644 index af6bbc8..0000000 --- a/aaa_base-84.87+git20180204.875cba8.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:13b94725e7f9c84fa7138dca8118dd40b8ff8249faafded279505b5a377de45f -size 75088 diff --git a/aaa_base-84.87+git20180205.2d2832f.tar.xz b/aaa_base-84.87+git20180205.2d2832f.tar.xz new file mode 100644 index 0000000..c7510d6 --- /dev/null +++ b/aaa_base-84.87+git20180205.2d2832f.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0845a5758ffef4a079c5e4d157831625535cf6076d91978a2390e3fac956d84c +size 74252 diff --git a/aaa_base.changes b/aaa_base.changes index 84682c2..5f8cec4 100644 --- a/aaa_base.changes +++ b/aaa_base.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Feb 05 14:04:51 UTC 2018 - kukuk@suse.de + +- Update to version 84.87+git20180205.2d2832f: + * Move /lib/aaa_base/convert_sysctl to /usr/lib/base-scripts/convert_sysctl + to cleanup filesystem. + * Don't create /etc/init.d/{boot.local,after.local,halt.local} in + aaa_base.pre section. + * Remove dead code from pre/post install sections. + ------------------------------------------------------------------- Mon Feb 5 13:31:50 CET 2018 - kukuk@suse.de diff --git a/aaa_base.spec b/aaa_base.spec index 9a38a60..9c1727b 100644 --- a/aaa_base.spec +++ b/aaa_base.spec @@ -23,7 +23,7 @@ %endif Name: aaa_base -Version: 84.87+git20180204.875cba8 +Version: 84.87+git20180205.2d2832f Release: 0 Url: https://github.com/openSUSE/aaa_base Provides: aaa_skel = %{version}-%{release} @@ -203,8 +203,6 @@ mkdir -p %{buildroot}%{_fillupdir} # and /etc/permissions! %ghost %attr(0644,root,root) %verify(not md5 size mtime) /var/log/lastlog /etc/hushlogins -%dir /lib/aaa_base -/lib/aaa_base/convert_sysctl* /usr/bin/chkconfig /sbin/chkconfig /usr/bin/get_kernel_version @@ -220,6 +218,8 @@ mkdir -p %{buildroot}%{_fillupdir} /usr/bin/rpmlocate /usr/bin/safe-rm /usr/bin/safe-rmdir +%dir /usr/lib/base-scripts +/usr/lib/base-scripts/convert_sysctl /usr/lib/restricted/bin/hostname /usr/sbin/sysconf_addword /usr/share/man/man1/smart_agetty.1* @@ -248,7 +248,9 @@ mkdir -p %{buildroot}%{_fillupdir} /etc/profile.d/ls.tcsh /etc/profile.d/ls.bash /etc/profile.d/ls.zsh -/usr/lib/base-scripts +/usr/lib/base-scripts/backup-rpmdb +/usr/lib/base-scripts/backup-sysconfig +/usr/lib/base-scripts/check-battery /usr/lib/systemd/system/* /usr/share/man/man8/resolv+.8* /var/adm/backup/rpmdb