Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at 2018-02-08 14:02:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aaa_base (Old) and /work/SRC/openSUSE:Factory/.aaa_base.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "aaa_base" Thu Feb 8 14:02:09 2018 rev:444 rq:573087 version:84.87+git20180205.2d2832f Changes: -------- --- /work/SRC/openSUSE:Factory/aaa_base/aaa_base.changes 2018-02-02 22:17:57.641980513 +0100 +++ /work/SRC/openSUSE:Factory/.aaa_base.new/aaa_base.changes 2018-02-08 14:02:08.813073710 +0100 @@ -1,0 +2,30 @@ +Mon Feb 05 14:04:51 UTC 2018 - ku...@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 - ku...@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 - ku...@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 + +------------------------------------------------------------------- Old: ---- aaa_base-84.87+git20180130.ae1f262.tar.xz New: ---- aaa_base-84.87+git20180205.2d2832f.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.1oR56r/_old 2018-02-08 14:02:09.593037292 +0100 +++ /var/tmp/diff_new_pack.1oR56r/_new 2018-02-08 14:02:09.597037106 +0100 @@ -23,7 +23,7 @@ %endif Name: aaa_base -Version: 84.87+git20180130.ae1f262 +Version: 84.87+git20180205.2d2832f Release: 0 Url: https://github.com/openSUSE/aaa_base Provides: aaa_skel = %{version}-%{release} @@ -49,7 +49,7 @@ 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 @@ 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 @@ -102,8 +102,6 @@ %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 @@ # 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 @@ -156,11 +157,18 @@ %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) @@ -195,8 +203,6 @@ # 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 @@ -212,6 +218,8 @@ /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* @@ -223,7 +231,6 @@ /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 +239,6 @@ %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 +248,14 @@ /etc/profile.d/ls.tcsh /etc/profile.d/ls.bash /etc/profile.d/ls.zsh +/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 +/var/adm/backup/sysconfig +%{_fillupdir}/sysconfig.backup %files malloccheck %defattr(-,root,root) ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.1oR56r/_old 2018-02-08 14:02:09.661034118 +0100 +++ /var/tmp/diff_new_pack.1oR56r/_new 2018-02-08 14:02:09.661034118 +0100 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/openSUSE/aaa_base.git</param> - <param name="changesrevision">ae1f2624f86386f0a1cc6b28ff0a86218ad0bc0a</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">2d2832ff10366b2f3e84fbf9d242a1787a52c118</param></service></servicedata> \ No newline at end of file ++++++ aaa_base-84.87+git20180130.ae1f262.tar.xz -> aaa_base-84.87+git20180205.2d2832f.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20180130.ae1f262/aaa_base.post new/aaa_base-84.87+git20180205.2d2832f/aaa_base.post --- old/aaa_base-84.87+git20180130.ae1f262/aaa_base.post 2018-01-30 13:20:54.000000000 +0100 +++ new/aaa_base-84.87+git20180205.2d2832f/aaa_base.post 2018-02-05 14:56:59.000000000 +0100 @@ -61,8 +61,7 @@ if ! [ -d /etc/sysconfig ] ; then mkdir -p /etc/sysconfig fi -for i in language backup \ - proxy windowmanager \ +for i in language proxy windowmanager \ news ; do %{fillup_only -n $i} done @@ -92,26 +91,12 @@ # #### EOF -# fix sysconfig backup dir -if grep -q RCCONFIG_BACKUP_DIR../var/adm/backup/rpmdb /etc/sysconfig/backup; then - sed -i -e "s|^RCCONFIG_BACKUP_DIR=.*|RCCONFIG_BACKUP_DIR=\"/var/adm/backup/sysconfig\"|" \ - /etc/sysconfig/backup - mkdir -p /var/adm/backup/sysconfig - mv /var/adm/backup/rpmdb/sysconfig[-_]* /var/adm/backup/sysconfig 2>/dev/null -fi - # # create mtab if it does not exist # if test ! -e /etc/mtab; then ln -sf /proc/self/mounts /etc/mtab fi -# -# make sure that several log files exist -# -if test ! -d /var/log ; then - mkdir -p /var/log -fi while read file owner mode; do test -h "$file" && continue @@ -123,28 +108,4 @@ /var/log/lastlog root:root 644 EOT -if test -e /usr/sbin/usrdel.local -a ! -e /usr/sbin/userdel.local ; then - cp /usr/sbin/usrdel.local /usr/sbin/userdel.local -fi -if test ! -e /usr/sbin/userdel.local ; then - mkdir -p /usr/sbin - cat << EOT > /usr/sbin/userdel.local -#!/bin/bash -# -# Here you can add your own stuff, that should be done for every user who -# will be deleted. -# -# When you delete a user with YaST, this script will be called -# with the login name as parameter. The rest of data can be taken -# from /etc/passwd. -# -EOT - chmod 744 /usr/sbin/userdel.local -fi - -# change all /media mounts (subfs) to noauto -if test -f /etc/fstab ; then -sed -i -e '/^[[:space:]]*#/{p;d}' -e '/[[:space:]]subfs.*noauto/{p;d}' -e '/\/media.*fs=\(cdfss\|floppyfss\)/s/\([[:space:]]subfs[[:space:]][[:space:]]*\)/\1noauto,/' /etc/fstab -fi - exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20180130.ae1f262/aaa_base.pre new/aaa_base-84.87+git20180205.2d2832f/aaa_base.pre --- old/aaa_base-84.87+git20180130.ae1f262/aaa_base.pre 2018-01-30 13:20:54.000000000 +0100 +++ new/aaa_base-84.87+git20180205.2d2832f/aaa_base.pre 2018-02-05 14:56:59.000000000 +0100 @@ -2,30 +2,6 @@ # # Run this script in C-Locale, or some tools will fail. export LC_ALL=C -# /boot should be the first directory. This increases the probability, that -# lilo stuff lies before 1024 cyl. -mkdir -p boot -# -# make sure, tmp directories do exist -# -for i in /tmp /var/tmp ; do - test -d $i || { - if test -L $i ; then - echo "Error! $i is a dangling symlink." - echo - ls -l $i - echo - echo "To avoid big problems this link has to be deleted and a directory" - echo "will be created. Remember to fix it after installation." - echo - rm -f $i - elif test -f $i ; then - echo "$i is a file. This makes no sense. Moving it to $i.save." - mv -v $i $i.save - fi - mkdir -p $i - } -done # # we have several local files, that changed over the time. Check the @@ -63,88 +39,3 @@ done < $LOCALFILE test "$LOCALFILE_CONTAINS_DATA" = false && rm -f $LOCALFILE done -mkdir -p /etc/init.d -echo "#! /bin/sh -# -# Copyright (c) 2002 SuSE Linux AG Nuernberg, Germany. All rights reserved. -# -# Author: Werner Fink, 1996 -# Burchard Steinbild, 1996 -# -# /etc/init.d/boot.local -# -# script with local commands to be executed from init on system startup -# -# Here you should add things, that should happen directly after booting -# before we're going to the first run level. -# -# Please note that the use of this script is deprecated and should be -# avoided for starting commands. You should consider creating a dedicated -# systemd service instead. -# -" > /etc/init.d/boot.local.new -test -e /etc/init.d/boot.local || mv /etc/init.d/boot.local.new /etc/init.d/boot.local -rm -f /etc/init.d/boot.local.new -chmod 744 /etc/init.d/boot.local -echo "#! /bin/sh -# -# Copyright (c) 2002 SuSE Linux AG Nuernberg, Germany. All rights reserved. -# -# Author: Werner Fink, 1998 -# Burchard Steinbild, 1998 -# -# /etc/init.d/halt.local -# -# script with local commands to be executed from init on system shutdown -# -# Here you should add things, that should happen directly before shuting -# down. -# -# Please note that the use of this script is deprecated and should be -# avoided for starting commands. You should consider creating a dedicated -# systemd service instead. -# -" > /etc/init.d/halt.local.new -test -e /etc/init.d/halt.local || mv /etc/init.d/halt.local.new /etc/init.d/halt.local -rm -f /etc/init.d/halt.local.new -chmod 744 /etc/init.d/halt.local -echo "#! /bin/sh -# -# Copyright (c) 2010 SuSE LINUX Products GmbH, Germany. All rights reserved. -# -# Author: Werner Fink, 2010 -# -# /etc/init.d/after.local -# -# script with local commands to be executed from init after all scripts -# of a runlevel have been executed. -# -# Here you should add things, that should happen directly after -# runlevel has been reached. -# -# Please note that the use of this script is deprecated and should be -# avoided for starting commands. You should consider creating a dedicated -# systemd service instead. -# -" > /etc/init.d/after.local.new -test -e /etc/init.d/after.local || mv /etc/init.d/after.local.new /etc/init.d/after.local -rm -f /etc/init.d/after.local.new -chmod 744 /etc/init.d/after.local - -test -e /etc/init.d/before.local && { -grep -q "not supported by systemd" /etc/init.d/before.local || { -echo "# this file is not supported by systemd and the content will probably not be run during bootup" >> /etc/init.d/before.local -} -} -mkdir -p /etc -for LINK in /usr/X11R6/lib/X11 /var/X11R6/lib/fonts /usr/lib/mgetty+sendfax \ - /usr/man/cat? /usr/X11R6/man/cat? /usr/openwin/man/cat? /usr/lib/news ; do - if test -L $LINK ; then - echo "Found forbidden/oldish Link: $LINK ...deleting" - rm -f $LINK - fi -done - -if test -f /root/.gnupg/secring.gpg ; then - cp -a /root/.gnupg/secring.gpg /root/.gnupg/secring.gpg.aaa_save -fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20180130.ae1f262/files/etc/cron.daily/suse.de-backup-rc.config new/aaa_base-84.87+git20180205.2d2832f/files/etc/cron.daily/suse.de-backup-rc.config --- old/aaa_base-84.87+git20180130.ae1f262/files/etc/cron.daily/suse.de-backup-rc.config 2018-01-30 13:20:54.000000000 +0100 +++ new/aaa_base-84.87+git20180205.2d2832f/files/etc/cron.daily/suse.de-backup-rc.config 1970-01-01 01:00:00.000000000 +0100 @@ -1,64 +0,0 @@ -#!/bin/sh -# -# -# backup_rc.config. -# -# Copyright (c) 1996-2002 SuSE Linux AG, Nuernberg, Germany. -# -# please send bugfixes or comments to http://www.suse.de/feedback. -# -# paranoia settings -# -umask 022 - -PATH=/sbin:/bin:/usr/sbin:/usr/bin -export PATH - -# -# get information from /etc/sysconfig -# -if [ -f /etc/sysconfig/backup ] ; then - . /etc/sysconfig/backup -fi - -# -# create backups archive of sysconfig files -# -if test -n "$RCCONFIG_BACKUP_DIR" -a -e /etc/sysconfig ; then - mkdir -p $RCCONFIG_BACKUP_DIR - OLD_MD5="" - ETC_RCCONFIG="" - test -f /etc/rc.config && ETC_RCCONFIG="/etc/rc.config" - test -e $RCCONFIG_BACKUP_DIR/sysconfig_recent_md5 && \ - OLD_MD5="`cat $RCCONFIG_BACKUP_DIR/sysconfig_recent_md5`" - NEW_MD5="`find $ETC_RCCONFIG /etc/sysconfig -type f -exec cat {} \+ | md5sum`" - if test "$OLD_MD5" != "$NEW_MD5" ; then - DATESTRING=`date +"%Y%m%d"` - - NEWNAME=$RCCONFIG_BACKUP_DIR/sysconfig-$DATESTRING.tar.gz - NUMBER=2 - while [ -e $NEWNAME ] ; do - NEWNAME=$RCCONFIG_BACKUP_DIR/sysconfig-$DATESTRING-$NUMBER.tar.gz - NUMBER=`expr $NUMBER + 1` - done - - if tar czfp $NEWNAME $ETC_RCCONFIG /etc/sysconfig 2>/dev/null ; then - echo "$NEW_MD5" > $RCCONFIG_BACKUP_DIR/sysconfig_recent_md5 - test "$MAX_RCCONFIG_BACKUPS" -gt 0 2> /dev/null || MAX_RCCONFIG_BACKUPS=0 - NUMBER=1 - for BACKUPFILE in `ls -1 -t $RCCONFIG_BACKUP_DIR/sysconfig-*` ; do - if test "$NUMBER" -gt "$MAX_RCCONFIG_BACKUPS" ; then - rm -f $BACKUPFILE - fi - NUMBER=`expr $NUMBER + 1` - done - else - echo "ERROR!! can not backup sysconfig files" - echo "to $RCCONFIG_BACKUP_DIR." - echo "Maybe there is not enough disk space." - rm -f $NEWNAME - fi - fi -fi - -exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20180130.ae1f262/files/etc/cron.daily/suse.de-backup-rpmdb new/aaa_base-84.87+git20180205.2d2832f/files/etc/cron.daily/suse.de-backup-rpmdb --- old/aaa_base-84.87+git20180130.ae1f262/files/etc/cron.daily/suse.de-backup-rpmdb 2018-01-30 13:20:54.000000000 +0100 +++ new/aaa_base-84.87+git20180205.2d2832f/files/etc/cron.daily/suse.de-backup-rpmdb 1970-01-01 01:00:00.000000000 +0100 @@ -1,72 +0,0 @@ -#!/bin/sh -# -# -# backup_rpmdb. This script was split off cron.daily -# Please add your local changes to cron.daily.local -# since this file will be overwritten, when updating your system. -# -# Copyright (c) 1996-2002 SuSE Linux AG, Nuernberg, Germany. -# -# please send bugfixes or comments to http://www.suse.de/feedback. -# -# Author: Burchard Steinbild, 1996 -# Florian La Roche, 1996 -# -# -# paranoia settings -# -umask 022 - -PATH=/sbin:/bin:/usr/sbin:/usr/bin -export PATH - -# -# get information from /etc/sysconfig -# -if [ -f /etc/sysconfig/backup ] ; then - . /etc/sysconfig/backup -fi -# -# -PACKAGEDBFILE=packages.rpm -if test -e /var/lib/rpm/Packages ; then - PACKAGEDBFILE=Packages -fi -# -# create backups of rpm data base -# -if test -n "$RPMDB_BACKUP_DIR" -a -e /var/lib/rpm/$PACKAGEDBFILE ; then - mkdir -p $RPMDB_BACKUP_DIR - OLD_MD5="" - test -e $RPMDB_BACKUP_DIR/rpmdb_recent_md5 && \ - OLD_MD5="`cat $RPMDB_BACKUP_DIR/rpmdb_recent_md5`" - NEW_MD5="`cat /var/lib/rpm/$PACKAGEDBFILE | md5sum`" - if test "$OLD_MD5" != "$NEW_MD5" ; then - DATESTRING=`date +"%Y%m%d"` - - NEWNAME=$RPMDB_BACKUP_DIR/$PACKAGEDBFILE-$DATESTRING - NUMBER=2 - while [ -e $NEWNAME -o -e $NEWNAME.gz ] ; do - NEWNAME=$RPMDB_BACKUP_DIR/$PACKAGEDBFILE-$DATESTRING-$NUMBER - NUMBER=`expr $NUMBER + 1` - done - - if gzip -9 < /var/lib/rpm/$PACKAGEDBFILE > $NEWNAME.gz; then - echo "$NEW_MD5" > $RPMDB_BACKUP_DIR/rpmdb_recent_md5 - test "$MAX_RPMDB_BACKUPS" -gt 0 2> /dev/null || MAX_RPMDB_BACKUPS=0 - NUMBER=1 - for BACKUPFILE in `ls -1 -t $RPMDB_BACKUP_DIR/$PACKAGEDBFILE-*` ; do - if test "$NUMBER" -gt "$MAX_RPMDB_BACKUPS" ; then - rm -f $BACKUPFILE - fi - NUMBER=`expr $NUMBER + 1` - done - else - echo "ERROR!! can not backup RPM Database to $RPMDB_BACKUP_DIR." - echo "Maybe there is not enough disk space." - rm -f $NEWNAME $NEWNAME.gz - fi - fi -fi - -exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20180130.ae1f262/files/etc/cron.daily/suse.de-check-battery new/aaa_base-84.87+git20180205.2d2832f/files/etc/cron.daily/suse.de-check-battery --- old/aaa_base-84.87+git20180130.ae1f262/files/etc/cron.daily/suse.de-check-battery 2018-01-30 13:20:54.000000000 +0100 +++ new/aaa_base-84.87+git20180205.2d2832f/files/etc/cron.daily/suse.de-check-battery 1970-01-01 01:00:00.000000000 +0100 @@ -1,31 +0,0 @@ -#!/bin/sh -# -# -# Copyright (c) 2002 SuSE Linux AG, Nuernberg, Germany. -# -# please send bugfixes or comments to http://www.suse.de/feedback. -# - - -# -# paranoia settings -# -umask 022 - -PATH=/sbin:/bin:/usr/sbin:/usr/bin -export PATH - -# -# check CMOS Battery -# -test -r /proc/driver/rtc && \ - BATT_STATUS=$(awk '$1 == "batt_status" { print $3 }' /proc/driver/rtc) - -test -r /proc/rtc && \ - BATT_STATUS=$(awk '$1 == "batt_status" { print $3 }' /proc/rtc) - - -test -n "$BATT_STATUS" -a "$BATT_STATUS" != "okay" && \ - echo "CMOS battery empty -- expect problems" - -exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20180130.ae1f262/files/etc/cron.daily/suse.de-cron-local new/aaa_base-84.87+git20180205.2d2832f/files/etc/cron.daily/suse.de-cron-local --- old/aaa_base-84.87+git20180130.ae1f262/files/etc/cron.daily/suse.de-cron-local 2018-01-30 13:20:54.000000000 +0100 +++ new/aaa_base-84.87+git20180205.2d2832f/files/etc/cron.daily/suse.de-cron-local 1970-01-01 01:00:00.000000000 +0100 @@ -1,24 +0,0 @@ -#!/bin/sh -# -# -# Copyright (c) 2002 SuSE Linux AG, Nuernberg, Germany. -# -# please send bugfixes or comments to http://www.suse.de/feedback. -# - - -# -# paranoia settings -# -umask 022 - -PATH=/sbin:/bin:/usr/sbin:/usr/bin -export PATH - -# now start the local cron.daily file, if it exists. - -if [ -f /root/bin/cron.daily.local ] ; then - . /root/bin/cron.daily.local -fi - -exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20180130.ae1f262/files/lib/aaa_base/convert_sysctl new/aaa_base-84.87+git20180205.2d2832f/files/lib/aaa_base/convert_sysctl --- old/aaa_base-84.87+git20180130.ae1f262/files/lib/aaa_base/convert_sysctl 2018-01-30 13:20:54.000000000 +0100 +++ new/aaa_base-84.87+git20180205.2d2832f/files/lib/aaa_base/convert_sysctl 1970-01-01 01:00:00.000000000 +0100 @@ -1,127 +0,0 @@ -#!/bin/bash -# read settings from /etc/sysconfig/sysctl and write them to -# /etc/sysctl.conf - -. /etc/sysconfig/sysctl 2>/dev/null || exit 0 - -nofile= -if [ "$1" = "--stdout" ]; then - shift - nofile=1 -fi -if [ -e "$cfg" -a ! -w "$cfg" ]; then - nofile=1 -fi - -cfg=/etc/sysctl.conf - -comment_added='' -_doset() -{ - if [ -z "$nofile" -a -z "$comment_added" ]; then - comment_added=1 - echo - echo "### converted from /etc/sysconfig/sysctl at `date -R`" - fi - echo "$1 = $2" -} - -doset() -{ - if [ -z "$nofile" ]; then - _doset "$@" >> $cfg - else - _doset "$@" - fi -} - -isset() -{ - test -z "$nofile" || return 1 - test -e /etc/sysctl.conf || return 1 - grep -q "$1" /etc/sysctl.conf || return 1 -} - -if ! isset net.ipv4.ip_dynaddr; then - if [ -n "$IP_DYNIP" -a "$IP_DYNIP" != 'no' ]; then - if [ "$IP_DYNIP" = 'yes' ]; then - IP_DYNIP=7 - fi - if [ -z "${IP_DYNIP//[0-9]/}" ]; then - doset net.ipv4.ip_dynaddr "$IP_DYNIP" - fi - fi -fi - - -if ! isset net.ipv4.tcp_syncookies; then - if [ "$IP_TCP_SYNCOOKIES" = "yes" ]; then - doset net.ipv4.tcp_syncookies 1 - fi -fi - -if ! isset net.ipv4.ip_forward; then - if [ "$IP_FORWARD" = "yes" ]; then - doset net.ipv4.ip_forward 1 - else - doset net.ipv4.ip_forward 0 - fi -fi - -if ! isset net.ipv6.conf.all.forwarding; then - if [ "$IPV6_FORWARD" = 'yes' ]; then - doset net.ipv6.conf.all.forwarding 1 - else - doset net.ipv6.conf.all.forwarding 0 - fi -fi - -if ! isset net.ipv6.conf.default.use_tempaddr; then - if [ -n "$IPV6_PRIVACY" ]; then - if [ $IPV6_PRIVACY = yes ]; then - IPV6_PRIVACY=2 - fi - if [ -z "${IPV6_PRIVACY//[0-9]/}" ]; then - doset net.ipv6.conf.default.use_tempaddr $IPV6_PRIVACY - fi - fi -fi - -if ! isset net.ipv6.conf.all.force_mld_version ; then - if [ -n "$IPV6_MLD_VERSION" -a -z "${IPV6_MLD_VERSION//[0-9]/}" ]; then - doset net.ipv6.conf.all.force_mld_version $IPV6_MLD_VERSION - fi -fi - -if ! isset kernel.sysrq; then - if [ "$ENABLE_SYSRQ" = 'yes' ]; then - ENABLE_SYSRQ=1 - elif [ "$ENABLE_SYSRQ" = 'no' -o "$ENABLE_SYSRQ" = '176' ]; then - # 176 is the distro default anyways - ENABLE_SYSRQ='' - fi - if [ -n "$ENABLE_SYSRQ" -a -z "${ENABLE_SYSRQ//[0-9]/}" ]; then - doset kernel.sysrq "$ENABLE_SYSRQ" - fi -fi - -# sparc only -if [ -e /proc/sys/kernel/stop-a ] && ! isset "kernel.stop-a"; then - if [ "$ENABLE_STOP_A" = yes ]; then - doset "kernel.stop-a" 1 - else - doset "kernel.stop-a" 0 - fi -fi - -if ! isset net.ipv4.tcp_ecn; then - if [ "$DISABLE_ECN" = 'yes' ]; then - doset net.ipv4.tcp_ecn 0 - fi -fi - -if ! isset fs.xfs.probe_dmapi; then - if [ "$DMAPI_PROBE" = 'yes' ]; then - doset fs.xfs.probe_dmapi 1 - fi -fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20180130.ae1f262/files/usr/lib/base-scripts/backup-rpmdb new/aaa_base-84.87+git20180205.2d2832f/files/usr/lib/base-scripts/backup-rpmdb --- old/aaa_base-84.87+git20180130.ae1f262/files/usr/lib/base-scripts/backup-rpmdb 1970-01-01 01:00:00.000000000 +0100 +++ new/aaa_base-84.87+git20180205.2d2832f/files/usr/lib/base-scripts/backup-rpmdb 2018-02-05 14:56:59.000000000 +0100 @@ -0,0 +1,70 @@ +#!/bin/sh +# +# +# backup_rpmdb +# +# Copyright (c) 1996-2002 SuSE Linux AG, Nuernberg, Germany. +# Copyright (c) 2018 SUSE Linux GmbH, Nuernberg, Germany. +# +# Author: Burchard Steinbild, 1996 +# Florian La Roche, 1996 +# +# paranoia settings +# +umask 022 + +PATH=/sbin:/bin:/usr/sbin:/usr/bin +export PATH + +RPMDB_PATH="/usr/lib/sysimage/rpm" + +# +# get information from /etc/sysconfig +# +if [ -f /etc/sysconfig/backup ] ; then + . /etc/sysconfig/backup +fi +# +# +PACKAGEDBFILE=packages.rpm +if test -e ${RPMDB_PATH}/Packages ; then + PACKAGEDBFILE=Packages +fi +# +# create backups of rpm data base +# +if test -n "$RPMDB_BACKUP_DIR" -a -e ${RPMDB_PATH}/$PACKAGEDBFILE ; then + mkdir -p $RPMDB_BACKUP_DIR + OLD_MD5="" + test -e $RPMDB_BACKUP_DIR/rpmdb_recent_md5 && \ + OLD_MD5="`cat $RPMDB_BACKUP_DIR/rpmdb_recent_md5`" + NEW_MD5="`cat ${RPMDB_PATH}/$PACKAGEDBFILE | md5sum`" + if test "$OLD_MD5" != "$NEW_MD5" ; then + DATESTRING=`date +"%Y%m%d"` + + NEWNAME=$RPMDB_BACKUP_DIR/$PACKAGEDBFILE-$DATESTRING + NUMBER=2 + while [ -e $NEWNAME -o -e $NEWNAME.gz ] ; do + NEWNAME=$RPMDB_BACKUP_DIR/$PACKAGEDBFILE-$DATESTRING-$NUMBER + NUMBER=`expr $NUMBER + 1` + done + + if gzip -9 < ${RPMDB_PATH}/$PACKAGEDBFILE > $NEWNAME.gz; then + echo "$NEW_MD5" > $RPMDB_BACKUP_DIR/rpmdb_recent_md5 + test "$MAX_RPMDB_BACKUPS" -gt 0 2> /dev/null || MAX_RPMDB_BACKUPS=0 + NUMBER=1 + for BACKUPFILE in `ls -1 -t $RPMDB_BACKUP_DIR/$PACKAGEDBFILE-*` ; do + if test "$NUMBER" -gt "$MAX_RPMDB_BACKUPS" ; then + rm -f $BACKUPFILE + fi + NUMBER=`expr $NUMBER + 1` + done + else + echo "ERROR!! can not backup RPM Database to $RPMDB_BACKUP_DIR." + echo "Maybe there is not enough disk space." + rm -f $NEWNAME $NEWNAME.gz + fi + fi +fi + +exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20180130.ae1f262/files/usr/lib/base-scripts/backup-sysconfig new/aaa_base-84.87+git20180205.2d2832f/files/usr/lib/base-scripts/backup-sysconfig --- old/aaa_base-84.87+git20180130.ae1f262/files/usr/lib/base-scripts/backup-sysconfig 1970-01-01 01:00:00.000000000 +0100 +++ new/aaa_base-84.87+git20180205.2d2832f/files/usr/lib/base-scripts/backup-sysconfig 2018-02-05 14:56:59.000000000 +0100 @@ -0,0 +1,62 @@ +#!/bin/sh +# +# backup-sysconfig +# +# Copyright (c) 1996-2002 SuSE Linux AG, Nuernberg, Germany. +# Copyright (c) 2018 SUSE Linux GmbH, Nuernberg, Germany +# +# + +# paranoia settings +# +umask 022 + +PATH=/sbin:/bin:/usr/sbin:/usr/bin +export PATH + +# +# get information from /etc/sysconfig +# +if [ -f /etc/sysconfig/backup ] ; then + . /etc/sysconfig/backup +fi + +# +# create backups archive of sysconfig files +# +if test -n "$RCCONFIG_BACKUP_DIR" -a -e /etc/sysconfig ; then + mkdir -p $RCCONFIG_BACKUP_DIR + OLD_MD5="" + test -e $RCCONFIG_BACKUP_DIR/sysconfig_recent_md5 && \ + OLD_MD5="`cat $RCCONFIG_BACKUP_DIR/sysconfig_recent_md5`" + NEW_MD5="`find /etc/sysconfig -type f -exec cat {} \+ | md5sum`" + if test "$OLD_MD5" != "$NEW_MD5" ; then + DATESTRING=`date +"%Y%m%d"` + + NEWNAME=$RCCONFIG_BACKUP_DIR/sysconfig-$DATESTRING.tar.gz + NUMBER=2 + while [ -e $NEWNAME ] ; do + NEWNAME=$RCCONFIG_BACKUP_DIR/sysconfig-$DATESTRING-$NUMBER.tar.gz + NUMBER=`expr $NUMBER + 1` + done + + if tar czfp $NEWNAME /etc/sysconfig 2>/dev/null ; then + echo "$NEW_MD5" > $RCCONFIG_BACKUP_DIR/sysconfig_recent_md5 + test "$MAX_RCCONFIG_BACKUPS" -gt 0 2> /dev/null || MAX_RCCONFIG_BACKUPS=0 + NUMBER=1 + for BACKUPFILE in `ls -1 -t $RCCONFIG_BACKUP_DIR/sysconfig-*` ; do + if test "$NUMBER" -gt "$MAX_RCCONFIG_BACKUPS" ; then + rm -f $BACKUPFILE + fi + NUMBER=`expr $NUMBER + 1` + done + else + echo "ERROR!! can not backup sysconfig files" + echo "to $RCCONFIG_BACKUP_DIR." + echo "Maybe there is not enough disk space." + rm -f $NEWNAME + fi + fi +fi + +exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20180130.ae1f262/files/usr/lib/base-scripts/check-battery new/aaa_base-84.87+git20180205.2d2832f/files/usr/lib/base-scripts/check-battery --- old/aaa_base-84.87+git20180130.ae1f262/files/usr/lib/base-scripts/check-battery 1970-01-01 01:00:00.000000000 +0100 +++ new/aaa_base-84.87+git20180205.2d2832f/files/usr/lib/base-scripts/check-battery 2018-02-05 14:56:59.000000000 +0100 @@ -0,0 +1,29 @@ +#!/bin/sh +# +# +# Copyright (c) 2002 SuSE Linux AG, Nuernberg, Germany. +# Copyright (c) 2018 SUSE Linux GmbH, Nuernberg, Germany. +# + +# +# paranoia settings +# +umask 022 + +PATH=/sbin:/bin:/usr/sbin:/usr/bin +export PATH + +# +# check CMOS Battery +# +test -r /proc/driver/rtc && \ + BATT_STATUS=$(awk '$1 == "batt_status" { print $3 }' /proc/driver/rtc) + +test -r /proc/rtc && \ + BATT_STATUS=$(awk '$1 == "batt_status" { print $3 }' /proc/rtc) + + +test -n "$BATT_STATUS" -a "$BATT_STATUS" != "okay" && \ + echo "CMOS battery empty -- expect problems" | logger -p user.crit + +exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20180130.ae1f262/files/usr/lib/base-scripts/convert_sysctl new/aaa_base-84.87+git20180205.2d2832f/files/usr/lib/base-scripts/convert_sysctl --- old/aaa_base-84.87+git20180130.ae1f262/files/usr/lib/base-scripts/convert_sysctl 1970-01-01 01:00:00.000000000 +0100 +++ new/aaa_base-84.87+git20180205.2d2832f/files/usr/lib/base-scripts/convert_sysctl 2018-02-05 14:56:59.000000000 +0100 @@ -0,0 +1,127 @@ +#!/bin/bash +# read settings from /etc/sysconfig/sysctl and write them to +# /etc/sysctl.conf + +. /etc/sysconfig/sysctl 2>/dev/null || exit 0 + +nofile= +if [ "$1" = "--stdout" ]; then + shift + nofile=1 +fi +if [ -e "$cfg" -a ! -w "$cfg" ]; then + nofile=1 +fi + +cfg=/etc/sysctl.conf + +comment_added='' +_doset() +{ + if [ -z "$nofile" -a -z "$comment_added" ]; then + comment_added=1 + echo + echo "### converted from /etc/sysconfig/sysctl at `date -R`" + fi + echo "$1 = $2" +} + +doset() +{ + if [ -z "$nofile" ]; then + _doset "$@" >> $cfg + else + _doset "$@" + fi +} + +isset() +{ + test -z "$nofile" || return 1 + test -e /etc/sysctl.conf || return 1 + grep -q "$1" /etc/sysctl.conf || return 1 +} + +if ! isset net.ipv4.ip_dynaddr; then + if [ -n "$IP_DYNIP" -a "$IP_DYNIP" != 'no' ]; then + if [ "$IP_DYNIP" = 'yes' ]; then + IP_DYNIP=7 + fi + if [ -z "${IP_DYNIP//[0-9]/}" ]; then + doset net.ipv4.ip_dynaddr "$IP_DYNIP" + fi + fi +fi + + +if ! isset net.ipv4.tcp_syncookies; then + if [ "$IP_TCP_SYNCOOKIES" = "yes" ]; then + doset net.ipv4.tcp_syncookies 1 + fi +fi + +if ! isset net.ipv4.ip_forward; then + if [ "$IP_FORWARD" = "yes" ]; then + doset net.ipv4.ip_forward 1 + else + doset net.ipv4.ip_forward 0 + fi +fi + +if ! isset net.ipv6.conf.all.forwarding; then + if [ "$IPV6_FORWARD" = 'yes' ]; then + doset net.ipv6.conf.all.forwarding 1 + else + doset net.ipv6.conf.all.forwarding 0 + fi +fi + +if ! isset net.ipv6.conf.default.use_tempaddr; then + if [ -n "$IPV6_PRIVACY" ]; then + if [ $IPV6_PRIVACY = yes ]; then + IPV6_PRIVACY=2 + fi + if [ -z "${IPV6_PRIVACY//[0-9]/}" ]; then + doset net.ipv6.conf.default.use_tempaddr $IPV6_PRIVACY + fi + fi +fi + +if ! isset net.ipv6.conf.all.force_mld_version ; then + if [ -n "$IPV6_MLD_VERSION" -a -z "${IPV6_MLD_VERSION//[0-9]/}" ]; then + doset net.ipv6.conf.all.force_mld_version $IPV6_MLD_VERSION + fi +fi + +if ! isset kernel.sysrq; then + if [ "$ENABLE_SYSRQ" = 'yes' ]; then + ENABLE_SYSRQ=1 + elif [ "$ENABLE_SYSRQ" = 'no' -o "$ENABLE_SYSRQ" = '176' ]; then + # 176 is the distro default anyways + ENABLE_SYSRQ='' + fi + if [ -n "$ENABLE_SYSRQ" -a -z "${ENABLE_SYSRQ//[0-9]/}" ]; then + doset kernel.sysrq "$ENABLE_SYSRQ" + fi +fi + +# sparc only +if [ -e /proc/sys/kernel/stop-a ] && ! isset "kernel.stop-a"; then + if [ "$ENABLE_STOP_A" = yes ]; then + doset "kernel.stop-a" 1 + else + doset "kernel.stop-a" 0 + fi +fi + +if ! isset net.ipv4.tcp_ecn; then + if [ "$DISABLE_ECN" = 'yes' ]; then + doset net.ipv4.tcp_ecn 0 + fi +fi + +if ! isset fs.xfs.probe_dmapi; then + if [ "$DMAPI_PROBE" = 'yes' ]; then + doset fs.xfs.probe_dmapi 1 + fi +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20180130.ae1f262/files/usr/lib/systemd/system/backup-rpmdb.service new/aaa_base-84.87+git20180205.2d2832f/files/usr/lib/systemd/system/backup-rpmdb.service --- old/aaa_base-84.87+git20180130.ae1f262/files/usr/lib/systemd/system/backup-rpmdb.service 1970-01-01 01:00:00.000000000 +0100 +++ new/aaa_base-84.87+git20180205.2d2832f/files/usr/lib/systemd/system/backup-rpmdb.service 2018-02-05 14:56:59.000000000 +0100 @@ -0,0 +1,8 @@ +[Unit] +Description=Backup RPM database +ConditionACPower=true +After=local-fs.target + +[Service] +Type=oneshot +ExecStart=/usr/lib/base-scripts/backup-rpmdb diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20180130.ae1f262/files/usr/lib/systemd/system/backup-rpmdb.timer new/aaa_base-84.87+git20180205.2d2832f/files/usr/lib/systemd/system/backup-rpmdb.timer --- old/aaa_base-84.87+git20180130.ae1f262/files/usr/lib/systemd/system/backup-rpmdb.timer 1970-01-01 01:00:00.000000000 +0100 +++ new/aaa_base-84.87+git20180205.2d2832f/files/usr/lib/systemd/system/backup-rpmdb.timer 2018-02-05 14:56:59.000000000 +0100 @@ -0,0 +1,12 @@ +[Unit] +Description=Backup of RPM database +After=local-fs.target + +[Timer] +OnCalendar=daily +AccuracySec=1m +RandomizedDelaySec=2h +Persistent=true + +[Install] +WantedBy=timers.target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20180130.ae1f262/files/usr/lib/systemd/system/backup-sysconfig.service new/aaa_base-84.87+git20180205.2d2832f/files/usr/lib/systemd/system/backup-sysconfig.service --- old/aaa_base-84.87+git20180130.ae1f262/files/usr/lib/systemd/system/backup-sysconfig.service 1970-01-01 01:00:00.000000000 +0100 +++ new/aaa_base-84.87+git20180205.2d2832f/files/usr/lib/systemd/system/backup-sysconfig.service 2018-02-05 14:56:59.000000000 +0100 @@ -0,0 +1,8 @@ +[Unit] +Description=Backup /etc/sysconfig directory +ConditionACPower=true +After=local-fs.target + +[Service] +Type=oneshot +ExecStart=/usr/lib/base-scripts/backup-sysconfig diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20180130.ae1f262/files/usr/lib/systemd/system/backup-sysconfig.timer new/aaa_base-84.87+git20180205.2d2832f/files/usr/lib/systemd/system/backup-sysconfig.timer --- old/aaa_base-84.87+git20180130.ae1f262/files/usr/lib/systemd/system/backup-sysconfig.timer 1970-01-01 01:00:00.000000000 +0100 +++ new/aaa_base-84.87+git20180205.2d2832f/files/usr/lib/systemd/system/backup-sysconfig.timer 2018-02-05 14:56:59.000000000 +0100 @@ -0,0 +1,12 @@ +[Unit] +Description=Backup of /etc/sysconfig +After=network.target local-fs.target + +[Timer] +OnCalendar=daily +AccuracySec=1m +RandomizedDelaySec=2h +Persistent=true + +[Install] +WantedBy=timers.target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20180130.ae1f262/files/usr/lib/systemd/system/check-battery.service new/aaa_base-84.87+git20180205.2d2832f/files/usr/lib/systemd/system/check-battery.service --- old/aaa_base-84.87+git20180130.ae1f262/files/usr/lib/systemd/system/check-battery.service 1970-01-01 01:00:00.000000000 +0100 +++ new/aaa_base-84.87+git20180205.2d2832f/files/usr/lib/systemd/system/check-battery.service 2018-02-05 14:56:59.000000000 +0100 @@ -0,0 +1,7 @@ +[Unit] +Description=Check if mainboard battery is Ok +After=local-fs.target + +[Service] +Type=oneshot +ExecStart=/usr/lib/base-scripts/check-battery diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20180130.ae1f262/files/usr/lib/systemd/system/check-battery.timer new/aaa_base-84.87+git20180205.2d2832f/files/usr/lib/systemd/system/check-battery.timer --- old/aaa_base-84.87+git20180130.ae1f262/files/usr/lib/systemd/system/check-battery.timer 1970-01-01 01:00:00.000000000 +0100 +++ new/aaa_base-84.87+git20180205.2d2832f/files/usr/lib/systemd/system/check-battery.timer 2018-02-05 14:56:59.000000000 +0100 @@ -0,0 +1,12 @@ +[Unit] +Description=Check if mainboard battery is Ok +After=local-fs.target + +[Timer] +OnCalendar=daily +AccuracySec=1h +RandomizedDelaySec=2h +Persistent=true + +[Install] +WantedBy=timers.target