Hello community,
here is the log from the commit of package aaa_base for openSUSE:Factory
checked in at 2014-02-19 14:10:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/aaa_base (Old)
and /work/SRC/openSUSE:Factory/.aaa_base.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "aaa_base"
Changes:
--------
--- /work/SRC/openSUSE:Factory/aaa_base/aaa_base.changes 2014-01-30
06:53:56.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.aaa_base.new/aaa_base.changes 2014-02-19
14:10:09.000000000 +0100
@@ -1,0 +2,15 @@
+Mon Feb 17 13:39:19 UTC 2014 - wer...@suse.de
+
+- Avoid warning from grep if complete file is not found (bnc#864282)
+
+-------------------------------------------------------------------
+Mon Feb 17 10:10:09 UTC 2014 - r...@suse.com
+
+- remove etc/init.d/powerfail (bnc#864044)
+
+-------------------------------------------------------------------
+Fri Jan 31 15:22:31 UTC 2014 - r...@suse.com
+
+- drop sysconfig files: boot, clock, cron, shutdown as none of these are used
anymore
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ aaa_base.spec ++++++
--- /var/tmp/diff_new_pack.CYArIz/_old 2014-02-19 14:10:09.000000000 +0100
+++ /var/tmp/diff_new_pack.CYArIz/_new 2014-02-19 14:10:09.000000000 +0100
@@ -169,7 +169,6 @@
%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/init.d/powerfail
/etc/hushlogins
%dir /lib/aaa_base
/lib/aaa_base/convert_sysctl*
@@ -204,13 +203,9 @@
/usr/share/man/man8/service.8*
/usr/lib/sysctl.d/*.conf
/var/adm/fillup-templates/sysconfig.backup
-/var/adm/fillup-templates/sysconfig.boot
-/var/adm/fillup-templates/sysconfig.clock
-/var/adm/fillup-templates/sysconfig.cron
/var/adm/fillup-templates/sysconfig.language
/var/adm/fillup-templates/sysconfig.news
/var/adm/fillup-templates/sysconfig.proxy
-/var/adm/fillup-templates/sysconfig.shutdown
/var/adm/fillup-templates/sysconfig.windowmanager
%files extras
++++++ aaa_base-13.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/aaa_base-13.1/aaa_base.post
new/aaa_base-13.1/aaa_base.post
--- old/aaa_base-13.1/aaa_base.post 2014-01-29 12:17:28.000000000 +0100
+++ new/aaa_base-13.1/aaa_base.post 2014-02-17 14:37:31.000000000 +0100
@@ -24,33 +24,6 @@
test -f /etc/nsswitch.conf.rpmnew && grep dns6 /etc/nsswitch.conf >/dev/null
2>&1 && {
sed -i -e "s|dns6|dns|g" /etc/nsswitch.conf
}
-# GMT might already be in sysconfig/clock
-%{rename_sysconfig_variable -f /etc/sysconfig/clock GMT HWCLOCK}
-
-# just do a one-time migration of the time setting from /etc/sysconfig/clock
-# to /etc/adjtime as systemd now use the later as reference
-#
-if test ! -e /etc/adjtime
-then
- echo -e "0.0 0 0.0\n0\nUTC" > /etc/adjtime
-fi
-if test -s /etc/sysconfig/clock
-then
- . /etc/sysconfig/clock
- if test -n "$HWCLOCK"
- then
- sed -ri
'\@^##[[:blank:]]+Type:[[:blank:]]+string\(-u,--utc,--localtime\)@,\@^HWCLOCK=@c\
-#\
-# Be aware that the time reference of the CMOS/HW clock has been\
-# forwarded to /etc/adjtime, the file used by hwclock(8) and\
-# systemd(1) as reference for the CMOS/HW clock.\
-' /etc/sysconfig/clock
- case "$HWCLOCK" in
- *-l*) sed -ri 's@^UTC$@LOCAL@' /etc/adjtime ;;
- *) sed -ri 's@^LOCAL$@UTC@' /etc/adjtime ;;
- esac
- fi
-fi
%{remove_and_set -n security CONSOLE_SHUTDOWN}
%{remove_and_set -n suseconfig CHECK_INITTAB}
@@ -59,9 +32,9 @@
if ! [ -d /etc/sysconfig ] ; then
mkdir -p /etc/sysconfig
fi
-for i in language backup boot \
- suseconfig clock proxy windowmanager \
- cron news shutdown ; do
+for i in language backup \
+ proxy windowmanager \
+ news ; do
%{fillup_only -n $i}
done
if [ -e /etc/sysconfig/sysctl ]; then
@@ -90,10 +63,6 @@
#
####
EOF
-# migrate HALT_SOUND value if set before
-if [ -n "$HALT_SOUND" -a "$HALT_SOUND" != "no" ] ; then
- sed -i -e "s|^HALT_SOUND=.*|HALT_SOUND=\"$HALT_SOUND\"|"
/etc/sysconfig/shutdown
-fi
# 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\"|" \
@@ -102,14 +71,6 @@
mv /var/adm/backup/rpmdb/sysconfig[-_]* /var/adm/backup/sysconfig
2>/dev/null
fi
-if grep -q "SEND_OUTPUT_ON_NO_ERROR=\"yes\"" /etc/sysconfig/cron ; then
- if test ! -f /var/adm/bnc_622203_fixed ; then
- sed -i -e
"s|^SEND_OUTPUT_ON_NO_ERROR=\"yes\"|SEND_OUTPUT_ON_NO_ERROR=\"no\"|" \
- /etc/sysconfig/cron
- touch /var/adm/bnc_622203_fixed
- fi
-fi
-
#
# Backup gshadow file and remove it (merge passwords into
# /etc/group before).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/aaa_base-13.1/files/etc/init.d/powerfail
new/aaa_base-13.1/files/etc/init.d/powerfail
--- old/aaa_base-13.1/files/etc/init.d/powerfail 2014-01-29
12:17:28.000000000 +0100
+++ new/aaa_base-13.1/files/etc/init.d/powerfail 1970-01-01
01:00:00.000000000 +0100
@@ -1,98 +0,0 @@
-#! /bin/sh
-# Copyright (c) 1996-2002 SuSE Linux AG, Nuernberg, Germany.
-# All rights reserved.
-#
-# Author: Florian La Roche, 1996
-# Werner Fink <wer...@suse.de>, 1996,2000
-#
-# Please send feedback to http://www.suse.de/feedback
-#
-# /etc/init.d/powerfail
-#
-# This script is run when the UPS tells the system
-# the power has gone. Tell everybody, sync the disks
-# and drop into single user mode within two minutes.
-# This script is also being run when the power comes
-# up again (if it does in time!)
-#
-
-trap "echo" SIGINT SIGSEGV SIGTERM
-
-POWERFAIL='THE POWER IS FAILED! SYSTEM GOING DOWN! PLEASE LOG OFF NOW!'
-POWERFAILNOW='THE POWER IS FAILED! LOW BATTERY - EMERGENCY SYSTEM SHUTDOWN!'
-POWERISBACK='THE POWER IS BACK'
-
-case "$1" in
- start)
- # don't allow users to login and go into single-user
- shutdown +2 "$POWERFAIL" <> /dev/console 1>&0 2>&0 &
- sync &
- ;;
- now)
- # tell init to immediatelly halt the system
- shutdown -h now "$POWERFAILNOW" <> /dev/console 1>&0 2>&0 &
- sync &
- ;;
- stop)
- # Stop any running shutdown
- shutdown -c now "$POWERISBACK" <> /dev/console 1>&0 2>&0
-
- # allow users to log in
- rm -f /etc/nologin
-
- # if we're not single user, don't try to restore
- test "$RUNLEVEL" != "S" && exit 0
-
- # go back to previous runlevel
- if test -n "$PREVLEVEL" -a \
- "$PREVLEVEL" != 0 -a "$PREVLEVEL" != 6
- then
- init $PREVLEVEL
- else
- # may not happen, but...
- init -t5 S
- fi
-
- # allow users to log in
- rm -f /etc/nologin
- ;;
- killups)
- POWERD_UPSPORT=""
- KILL_UPS_CMD=""
- if test -r /etc/powerd.conf -a -x /sbin/genpowerd ; then
- while read key value ; do
- case "$key" in
- \#*|"") ;;
- disabled) echo 'powerd is disabled in /etc/powerd.conf!' |
wall
- break ;;
- serialline) POWERD_UPSPORT=${value} ; break ;;
- esac
- done < /etc/powerd.conf
- test -c $POWERD_UPSPORT || POWERD_UPSPORT=""
- if test -n "$POWERD_UPSPORT" ; then
- KILL_UPS_CMD="/sbin/genpowerd -k $POWERD_UPSPORT eff-shutup"
- fi
- POWER_STATUS=/var/run/powerstatus
- fi
- #
- # Kill UPS inverter (in the case of genpowerd)
- #
- if test -n "$KILL_UPS_CMD" -a -r $POWER_STATUS ; then
- read STATUS < $POWER_STATUS
- case "$STATUS" in
- F|FAIL)
- echo "Trying to kill UPS inverter"
- $KILL_UPS_CMD
- ;;
- esac
- else
- echo "Not implemented"
- fi
- ;;
- *)
- echo "Usage: $0 {start|now|killups|stop}"
- exit 1
- ;;
-esac
-
-exit 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/aaa_base-13.1/files/etc/profile.d/complete.bash
new/aaa_base-13.1/files/etc/profile.d/complete.bash
--- old/aaa_base-13.1/files/etc/profile.d/complete.bash 2014-01-29
12:17:28.000000000 +0100
+++ new/aaa_base-13.1/files/etc/profile.d/complete.bash 2014-02-17
14:37:31.000000000 +0100
@@ -679,7 +679,7 @@
{
local dir=/usr/share/bash-completion/completions
local cmd="${1##*/}"
- local -i init=$(grep -c _init_completion "${dir}/${cmd}")
+ local -i init=$(grep -c _init_completion "${dir}/${cmd}" 2>/dev/null)
if ((init > 0)) && ! type -t _init_completion &> /dev/null ; then
complete -o default -o bashdefault "${cmd}" &>/dev/null && return
124
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/aaa_base-13.1/files/var/adm/fillup-templates/sysconfig.boot
new/aaa_base-13.1/files/var/adm/fillup-templates/sysconfig.boot
--- old/aaa_base-13.1/files/var/adm/fillup-templates/sysconfig.boot
2014-01-29 12:17:28.000000000 +0100
+++ new/aaa_base-13.1/files/var/adm/fillup-templates/sysconfig.boot
1970-01-01 01:00:00.000000000 +0100
@@ -1,67 +0,0 @@
-## Path: System/Boot
-## Description: Controlling of the boot process
-## Type: yesno
-## Default: no
-## Config:
-#
-# For interactive debugging of the startup process. If set
-# to "yes" the system will ask whether to confirm every
-# step of the boot process. This will however only work
-# if the keyboard is already accessable at this time,
-# eg. USB keyboards need their modules loaded first.
-#
-PROMPT_FOR_CONFIRM="no"
-
-## Type: integer
-## Default: 5
-#
-# For interactive debugging of the startup process. How long
-# wait before the default answer is assumed.
-#
-CONFIRM_PROMPT_TIMEOUT="5"
-
-## Type: yesno
-## Default: yes
-#
-# Run all scripts or rather start/stop all services
-# which are independent from each other in parallel.
-#
-RUN_PARALLEL="yes"
-
-## Type: yesno
-## Default: no
-#
-# If set to "yes" this enables to stop the boot process by
-# pressing Ctrl-S and continue with Ctrl-Q (xon/xoff
-# flow control).
-#
-FLOW_CONTROL="no"
-
-## Type: integer
-## Default: 10
-#
-# Limit the number of file system checkers that can be running in
-# parallel. This allows configurations which have a large number of
-# disks to avoid fsck starting too many file system checkers at once,
-# which might overload CPU and memory resources available on the
-# system.
-#
-FSCK_MAX_INST="10"
-
-## Type: string
-## Default: ""
-#
-# Set additional parameters for klogconsole, e.g. "-l 7"
-#
-KLOGCONSOLE_PARAMS=""
-
-## Type: yesno
-## Default: no
-#
-# If set to "yes" this enforce to use the boot logging facility
-# even if "fastboot" and/or "quiet" was found on the kernel
-# command line e.g. specified at /boot/grub/menu.lst in the
-# optional kernel parameter list. The current log can be found
-# at /var/log/boot.msg and the last at /var/log/boot.omsg
-#
-ENFORCE_BLOGD="no"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/aaa_base-13.1/files/var/adm/fillup-templates/sysconfig.clock
new/aaa_base-13.1/files/var/adm/fillup-templates/sysconfig.clock
--- old/aaa_base-13.1/files/var/adm/fillup-templates/sysconfig.clock
2014-01-29 12:17:28.000000000 +0100
+++ new/aaa_base-13.1/files/var/adm/fillup-templates/sysconfig.clock
1970-01-01 01:00:00.000000000 +0100
@@ -1,79 +0,0 @@
-## Path: System/Environment/Clock
-## Description: Information about your timezone and time
-#
-# Be aware that the time reference of the CMOS/HW clock has been
-# forwarded to /etc/adjtime, the file used by hwclock(8),
-# systemd(1), and the kernel as reference for the CMOS/HW clock.
-
-## Type: list(yes,no,)
-## Description: Write back system time to the hardware clock
-#
-# Is set to "yes" write back the system time to the hardware
-# clock at reboot or shutdown. Usefull if hardware clock is
-# much more inaccurate than system clock. Set to "no" if
-# system time does it wrong due e.g. missed timer interrupts.
-# If set to "no" the hardware clock adjust feature is also
-# skipped because it is rather useless without writing back
-# the system time to the hardware clock.
-#
-# Note that you need to enable boot.clock for this feature to take
-# effect.
-#
-# defaults to 'yes' if unset
-#
-SYSTOHC=""
-
-## Type: list(no,yes)
-## Description: Write back system time if if already done by
kernel
-#
-# Is set to "yes" write back the system time to the hardware
-# clock at reboot or shutdown eveb if this is done by the kernel
-# in the so called ``Eleven Minute Mode''.
-#
-FORCE_SYSTOHC="no"
-
-## Type: string
-## Type: list(yes,no)
-## Description: HW clock is not able to use years outside
1994-1999.
-#
-# Indicates that the Hardware Clock is incapable of storing years
-# outside the range 1994-1999.
-#
-BADYEAR="no"
-
-## Type: string
-## Description: Overrides the default device file name
-#
-# Overrides the default /dev file name, which is /dev/rtc on many
-# platforms but may be /dev/rtc0, /dev/rtc1, and so on.
-#
-HCTOSYS_DEVICE=""
-
-## Type: list(yes,no,)
-## Description: Do or do not not run hwclock(8)
-#
-# Set this to yes if it is possible to access the hardware clock,
-# or no if it is not. On some platforms (s390 or xen) this may
-# overwritten by the service its self.
-#
-USE_HWCLOCK="yes"
-
-## Type: list(yes,no,)
-## Description: Correct systematic drift of the HW clock
-#
-# Add or subtract time from the Hardware Clock to account for
-# systematic drift since the last time the clock was set or
-# adjusted. By default off as this can cause trouble. For
-# systems using localtime for HW clock this will ignored.
-#
-USE_ADJUST="no"
-
-## Type: string(Europe/Berlin,Europe/London,Europe/Paris)
-## ServiceRestart: boot.clock
-## Command: /sbin/refresh_initrd
-#
-# Timezone (e.g. CET or Asia/Tokyo). The value should correspond
-# to the contents of the /etc/localtime file and is for internal
-# YaST use only.
-#
-TIMEZONE=""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/aaa_base-13.1/files/var/adm/fillup-templates/sysconfig.cron
new/aaa_base-13.1/files/var/adm/fillup-templates/sysconfig.cron
--- old/aaa_base-13.1/files/var/adm/fillup-templates/sysconfig.cron
2014-01-29 12:17:28.000000000 +0100
+++ new/aaa_base-13.1/files/var/adm/fillup-templates/sysconfig.cron
1970-01-01 01:00:00.000000000 +0100
@@ -1,109 +0,0 @@
-## Path: System/Cron
-## Description: days to keep old files in tmp-dirs, 0 to disable
-## Type: integer
-## Default: 0
-## Config:
-#
-# cron.daily can check for old files in tmp-dirs. It will delete all files
-# not accessed for more than MAX_DAYS_IN_TMP. If MAX_DAYS_IN_TMP is not set
-# or set to 0, this feature will be disabled.
-#
-MAX_DAYS_IN_TMP="0"
-
-## Type: integer
-## Default: 0
-#
-# see MAX_DAYS_IN_TMP. This allows to specify another frequency for
-# a second set of directories.
-#
-MAX_DAYS_IN_LONG_TMP="0"
-
-## Type: string
-#
-# This variable contains a list of directories, in which old files are to
-# be searched and deleted. The frequency is determined by MAX_DAYS_IN_TMP
-#
-# Defaults to /tmp if empty
-#
-TMP_DIRS_TO_CLEAR=""
-
-## Type: string
-## Default: ""
-#
-# This variable contains a list of directories, in which old files are to
-# be searched and deleted. The frequency is determined by MAX_DAYS_IN_LONG_TMP
-# If cleaning of /var/tmp is wanted add it here.
-#
-LONG_TMP_DIRS_TO_CLEAR=""
-
-## Type: string
-## Default: root
-#
-# In OWNER_TO_KEEP_IN_TMP, you can specify, whose files shall not be deleted.
-#
-OWNER_TO_KEEP_IN_TMP="root"
-
-## Type: string
-#
-# "Set this to "yes" to entirely remove (rm -rf) all files and subdirectories
-# from the temporary directories defined in TMP_DIRS_TO_CLEAR on bootup.
-# Please note, that this feature ignores OWNER_TO_KEEP_IN_TMP - all files will
-# be removed without exception."
-#
-# If this is set to a list of directories (i.e. starts with a "/"), these
-# directories will be cleared instead of those listed in TMP_DIRS_TO_CLEAR.
-# This can be used to clear directories at boot as well as clearing unused
-# files out of other directories.
-#
-# Defaults to 'no' if unset
-#
-CLEAR_TMP_DIRS_AT_BOOTUP=""
-
-## Type: string
-## Default: ""
-#
-# At which time cron.daily should start. Default is 15 minutes after booting
-# the system. Example setting would be "14:00".
-# Due to the fact that cron script runs only every 15 minutes,
-# it will only run on xx:00, xx:15, xx:30, xx:45, not at the accurate time
-# you set.
-DAILY_TIME=""
-
-## Type: integer
-## Default: 5
-#
-# Maximum days not running when using a fixed time set in DAILY_TIME.
-# 0 to skip this. This is for users who will power off their system.
-#
-# There is a fixed max. of 14 days set, if you want to override this
-# change MAX_NOT_RUN_FORCE in /usr/lib/cron/run-crons
-MAX_NOT_RUN="5"
-
-## Type: yesno
-## Default: no
-#
-# send status email even if all scripts in
-# cron.{hourly,daily,weekly,monthly}
-# returned without error? (yes/no)
-#
-SEND_MAIL_ON_NO_ERROR="no"
-
-## Type: yesno
-## Default: no
-#
-# send email containing output from all successful jobs in
-# cron.{hourly,daily,weekly,monthly}. Output from failed
-# jobs is always sent. If SEND_MAIL_ON_NO_ERROR is yes, this
-# setting is ignored. (yes/no)
-#
-SEND_OUTPUT_ON_NO_ERROR="no"
-
-## Type: yesno
-## Default: no
-#
-# generate syslog message for all scripts in
-# cron.{hourly,daily,weekly,monthly}
-# even if they haven't returned an error? (yes/no)
-#
-SYSLOG_ON_NO_ERROR="no"
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/aaa_base-13.1/files/var/adm/fillup-templates/sysconfig.shutdown
new/aaa_base-13.1/files/var/adm/fillup-templates/sysconfig.shutdown
--- old/aaa_base-13.1/files/var/adm/fillup-templates/sysconfig.shutdown
2014-01-29 12:17:28.000000000 +0100
+++ new/aaa_base-13.1/files/var/adm/fillup-templates/sysconfig.shutdown
1970-01-01 01:00:00.000000000 +0100
@@ -1,43 +0,0 @@
-## Path: System/Boot
-## Description: Variables used on system shutdown, reboot, or halt
-## Type: list(no,yes,octave)
-## Default: no
-#
-# Set to "yes" or "quint" to play a quint tone sequence at system halt or
reboot
-# or set to "octave" to play octave sound at that occasion.
-#
-HALT_SOUND="no"
-
-## Type: string
-## Default: ""
-#
-# Hook during system shutdown to run extra command
-#
-HALT_POWERDOWN_INSERT=""
-
-## Type: list(poweroff,halt,auto)
-## Default: auto
-#
-# What should the system do on halt? With poweroff the
-# system not only halt the OS but also switch the power
-# down. On ix86 or x86_64 this depends on the APM and/or
-# ACPI capabilities of the hardware, therefore "auto" will
-# cause the system to check about.
-#
-HALT="auto"
-
-## Type: list(no,yes)
-## Default: no
-#
-# By default the network is not stopped at halt/poweroff.
-# Sometimes this may be to "yes" to avoid wake-on-lan.
-#
-HALT_NETWORK="no"
-
-## Type: list(no,yes)
-## Default: yes
-#
-# By default the disk are also halted at halt/poweroff.
-# For software raids this option is ignored.
-#
-HALT_DISKS="yes"
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
