commit pm-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package pm-utils for openSUSE:Factory
checked in at Tue Jul 14 23:27:52 CEST 2009.
--------
--- pm-utils/pm-utils.changes 2009-04-09 17:48:21.000000000 +0200
+++ pm-utils/pm-utils.changes 2009-06-21 14:24:28.000000000 +0200
@@ -1,0 +2,7 @@
+Sun Jun 21 14:23:32 CEST 2009 - hmacht@suse.de
+
+- add power.d hook script 'wol' and corresponding configuration
+ option to /usr/lib/pm-utils/defaults to enable wake on LAN when
+ running on AC and disabling it when on DC
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
pm-utils-suse-20090409.tar.bz2
New:
----
pm-utils-suse-20090621.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pm-utils.spec ++++++
--- /var/tmp/diff_new_pack.QWXAYL/_old 2009-07-14 23:26:12.000000000 +0200
+++ /var/tmp/diff_new_pack.QWXAYL/_new 2009-07-14 23:26:12.000000000 +0200
@@ -21,8 +21,8 @@
Name: pm-utils
Url: http://webcvs.freedesktop.org/pm-utils/
Version: 0.99.4.20071229
-Release: 16
-%define pm_utils_suse_version 20090409
+Release: 17
+%define pm_utils_suse_version 20090621
Summary: Tools to suspend and hibernate computers
License: GPL v2 or later
Group: System/Base
@@ -111,192 +111,3 @@
%_bindir/powersave
%changelog
-* Thu Apr 09 2009 seife@suse.de
-- be a bit more thorough in kicking the ACPI fans after resume
-- add a paragraph about who is doing the low level suspend stuff
- to the README
-* Thu Mar 19 2009 seife@suse.de
-- fix a potential problem with S2RAM_QUIRKS_SOURCE=hal (bnc#480803)
-* Tue Feb 17 2009 seife@suse.de
-- use s2ram options from config and / or "smart suspend" also for
- s2both aka "hybrid suspend" (bnc#476484)
-- run the 30s2disk-check hook also during "hybrid suspend"
-* Wed Jan 21 2009 hmacht@suse.de
-- powersave:
- - Handle "no CPUFreq on this system" gracefully (bnc#462384)
- - Handle "no AC adapter on this system" gracefully (bnc#462383)
- - Print warning that this tool is obsolete and might vanish
-- Make SATA power management work with crypte devices (bnc#465797)
-* Fri Dec 12 2008 hmacht@suse.de
-- install powersave tool which has been in pm-profiler before
- (bnc#457815)
-* Thu Nov 27 2008 seife@suse.de
-- remove 55battery hook - not needed since HAL 0.5.8
-- add sub-second timestamps to the log file for hook profiling
-* Wed Nov 12 2008 seife@suse.de
-- log the start of suspend operations also to syslog, with a
- reference to the pm-suspend.log file
-- added a reference to the documentation to the suspend log
-- split off the QUIRK variable changes from
- pm-utils-0.99.4-uswsusp-support.diff into its own diff
-* Fri Nov 07 2008 seife@suse.de
-- improve suspend logging (log kernel version and commandline)
-* Tue Oct 28 2008 anaumov@suse.de
-- Added file 01ndiswrapper to documentation directory. It contains
- a possible workaound for resume problems with ndiswrapper
- (bnc#409110)
-* Fri Oct 24 2008 hmacht@suse.de
-- Minor fix to previous change
-- Add basic logging functionality for pm-powersave
-* Tue Oct 21 2008 hmacht@suse.de
-- Kernel sysfs interfaces changed for the rf_kill switch and the
- wireless power saving methods (bnc#435393)
-* Wed Oct 08 2008 seife@suse.de
-- export some more variables for compatibility with that other
- pm-utils project: PM_UTILS_LIBDIR PM_UTILS_ETCDIR PM_FUNCTIONS
-* Mon Oct 06 2008 seife@suse.de
-- add support for "smart" detection of s2ram quirks
-- add support for passing in quirks via command line from HAL
-- add README.smart-suspend-to-RAM documentation
-* Fri Sep 26 2008 seife@suse.de
-- fix pm-action and functions for suspend-hybrid
-* Wed Sep 24 2008 seife@suse.de
-- update the tarball to the latest 0.99.4 upstream CVS which
- includes:
- - manpage fixes
- - fix for config file reading (patch dropped)
- - removal of dangerous laptop-tools hook
- - fixes for hooks running twice in some circumstances
-- add support for hybrid suspend (write image to disk, then s2ram,
- FATE#6368)
-- workaround broken dbus-send (bnc#427829)
-* Fri Sep 12 2008 seife@suse.de
-- Add a config file and hook for calling out to rtcwake, letting
- the user wake the computer up after N seconds of sleep or
- hibernation. The hook also respects the NUM_SECONDS_TO_SLEEP
- environment variable that HAL, for example, might set.
- [Fate#302448]
-* Thu Jun 05 2008 seife@suse.de
-- fix various small bugs in the power.d hooks for sound and iwl
- (bnc #394318)
-* Mon May 26 2008 seife@suse.de
-- fix an error message from sata-pm if no sata disks are present
-* Fri May 09 2008 seife@suse.de
-- remove power.d/laptop-tools hook, is now handled much better by
- laptop-mode-tools package
-* Sat May 03 2008 hmacht@suse.de
-- add hook for enabling audio power management and default to a
- timeout of 10 seconds
-- add hook for enabling sata link power management (ALPM), but
- only for the root partition because of hotplug issues
-* Mon Apr 28 2008 hmacht@suse.de
-- add script 'iwl-pm.sh' to power.d/ for enabling iwl* power
- management
-* Wed Nov 28 2007 lrupp@suse.de
-- touch %%ghost file in %%install and add %%verify(not md5 size mtime)
-- bzip the source
-* Tue Nov 27 2007 seife@suse.de
-- add the logfile to the filelist (novell bug 280475)
-* Mon Sep 24 2007 seife@suse.de
-- add README.update in /etc/pm and fix the README in the documen-
- tation to no longer mention /etc/pm/config but the correct paths
- (novell bug 327828).
-* Thu Aug 16 2007 hmacht@suse.de
-- remove '-s' option from openvt (00clear hook) to avoid flickering
- before suspend to disk
-* Wed Jul 25 2007 hmacht@suse.de
-- do not switch to console and back in pm-utils. Suspend tools are
- doing this in any case and splashy looks nicer this way
-* Tue Jul 24 2007 seife@suse.de
-- update to current CVS:
- - our export-variables patch included
- - minor build system tweaks
-- fix reading of multiple configuration files
-- removed docker hook, is now in dockutils
-* Wed Apr 04 2007 seife@suse.de
-- use long options for s2disk/s2both, short options will be depre-
- cated
-- fix suspend to disk for HIBERNATE_METHOD=userspace
-* Mon Mar 26 2007 seife@suse.de
-- update to current CVS (version 0.99.3)
- - fix source_configs so it doesn't throw an error when the config
- dir is empty.
-- rework userspace-suspend support
-- fix exporting of variables
-* Tue Mar 20 2007 seife@suse.de
-- update to current CVS
- - module unloading and config handling fix integrated upstream
-- pm-utils-suse: be more careful selecting the kernel for resume
- (bug 256105)
-* Fri Mar 16 2007 seife@suse.de
-- fix module unloading, pm-utils-0.99.2-fix-modunload.diff
-* Fri Mar 16 2007 seife@suse.de
-- update to current CVS
- - pm-utils-0.99.2-fix-stopservice.diff integrated upstream
-- fix the handling of config files in /etc/pm/config.d/ (they were
- simply ignored before)
-* Wed Mar 14 2007 seife@suse.de
-- update to version 0.99.2+ (CVS as of today)
- - move the executables from /etc/pm to /usr/lib/pm-utils
- - config file from /etc/pm/config to /usr/lib/pm-utils/defaults
- - many of our local fixes applied upstream
- - add pm-suspend-hybrid (currently a no-op, will do s2both)
- - add pm-is-supported that will show HAL what suspend modes are
- available
- - use bash for scripts, not sh
- - fix module load/unload problems with module names that have
- "-" and "_".
-* Wed Feb 28 2007 seife@suse.de
-- fix cpufreq problem on multicore CPUs after resume (bug 227854)
-* Tue Feb 20 2007 seife@suse.de
-- update to current CVS
- - add pm-reset-swap to reset the swap signature after failed
- suspend to disk
- - some of our fixed incorporated upstream, patches dropped
-- no longer unload the button module, kernel is fixed
-* Sun Feb 18 2007 seife@suse.de
-- support suspend to swap on LVM/EVMS (or generally if the resume
- parameter points to a symlink).
-* Wed Dec 20 2006 seife@suse.de
-- fix resume problems if the "Failsafe" kernel is listed before
- the "good" kernel in /boot/grub/menu.lst (bug 223722)
-- package the disabled hooks in the documentation directory
-- disable the 49blutetooth hook
-* Tue Dec 05 2006 seife@suse.de
-- fix 30s2disk-check hook, so that suspend with the kernel method
- works again (fixes bug 226115)
-* Thu Nov 30 2006 seife@suse.de
-- fix on_ac_power on desktops with battery powered mice
- (bug 221999)
-- make running the hooks slightly more verbose
-* Wed Nov 22 2006 seife@suse.de
-- fix dualcore cpufreq problem after suspend (bug 223164)
-- mark the configfile as "noreplace"
-- print "resuming..." during resume
-* Mon Nov 20 2006 seife@suse.de
-- sync with current CVS, some of our patches went upstream
-- print "Preparing suspend..." so the user has some feedback
-* Thu Nov 16 2006 seife@suse.de
-- comment the available variables in the configuration file
-* Wed Nov 08 2006 seife@suse.de
-- update to current CVS, some of our fixes incorporated upstream
-- increase the logging output of the pm-utils-suse hooks
-* Mon Nov 06 2006 hmacht@suse.de
-- add 23dock hook to undock before suspend and redock after resume
-* Mon Oct 30 2006 seife@suse.de
-- update to current CVS, some of our fixes incorporated upstream
-* Fri Oct 27 2006 hmacht@suse.de
-- readd lost S2DISK_BIN and S2DISK_CONF variables
-* Tue Oct 24 2006 hmacht@suse.de
-- update to current CVS, some fixes incorporated upstream.
-- add logging functionality
-- add hook for ejecting pcmcia cards
-* Mon Oct 23 2006 hmacht@suse.de
-- add hook to log lsmod and free
-* Wed Oct 11 2006 seife@suse.de
-- small fixes, disable not yet ready logging code
-* Tue Oct 10 2006 seife@suse.de
-- update to current CVS, our fixes incorporated upstream.
-- some additional hooks, converted from powersaved.
-* Fri Oct 06 2006 seife@suse.de
-- initial submission
++++++ pm-utils-0.99.4-suse.diff ++++++
--- /var/tmp/diff_new_pack.QWXAYL/_old 2009-07-14 23:26:12.000000000 +0200
+++ /var/tmp/diff_new_pack.QWXAYL/_new 2009-07-14 23:26:12.000000000 +0200
@@ -1,10 +1,8 @@
-Index: b/pm/functions
+Index: pm-utils-0.99.4.20071229/pm/functions
===================================================================
---- a/pm/functions
-+++ b/pm/functions
-@@ -8,17 +8,33 @@ export PATH=/sbin:/usr/sbin:/bin:/usr/bi
- #
- # PM_CMDLINE
+--- pm-utils-0.99.4.20071229.orig/pm/functions
++++ pm-utils-0.99.4.20071229/pm/functions
+@@ -10,13 +10,29 @@ export PATH=/sbin:/usr/sbin:/bin:/usr/bi
# RESUME_MODULES
#
set -a
@@ -36,11 +34,7 @@
[ -f /usr/lib/pm-utils/defaults ] && . /usr/lib/pm-utils/defaults
set +a
-
- # set nullglob to make glob results empty in case the pattern does not
-@@ -39,11 +55,13 @@ source_configs()
- source_configs
-
+@@ -41,7 +57,9 @@ source_configs
take_suspend_lock()
{
VT=$(fgconsole)
@@ -51,11 +45,7 @@
if [ -f /.suspended ]; then
read pid < /.suspended
if [ -d /proc/$pid ]; then
- return 1
- fi
-@@ -54,13 +72,13 @@ take_suspend_lock()
- return 0
- }
+@@ -56,9 +74,9 @@ take_suspend_lock()
remove_suspend_lock()
{
@@ -68,11 +58,7 @@
openvt -- sh -c "usleep $1 ; rm -f /.suspended >/dev/null 2>&1 0<&1" >/dev/null 2>&1 0<&1 &
}
- find_sleepd_files()
- {
-@@ -79,32 +97,32 @@ run_hooks()
- {
- # $1=suspend/suspend_hybrid/hibernate $2=suspend/hibernate/thaw/resume $3=reverse/""
+@@ -81,9 +99,9 @@ run_hooks()
[ -z "$1" ] && return 0
[ -f /var/run/pm-suspend ] && . /var/run/pm-suspend
@@ -84,8 +70,7 @@
files=$(find_sleepd_files)
if [ "$3" = "reverse" ]; then
- filea=($files)
- filen=${#filea[*]}
+@@ -92,17 +110,17 @@ run_hooks()
while [ "$filen" -gt 0 ]; do
let filen--
file="${filea[$filen]}"
@@ -106,15 +91,11 @@
}
get_power_status()
- {
- RETVAL=0
-Index: b/pm/hooks/00clear
+Index: pm-utils-0.99.4.20071229/pm/hooks/00clear
===================================================================
---- a/pm/hooks/00clear
-+++ b/pm/hooks/00clear
-@@ -3,11 +3,11 @@
- . /usr/lib/pm-utils/functions
-
+--- pm-utils-0.99.4.20071229.orig/pm/hooks/00clear
++++ pm-utils-0.99.4.20071229/pm/hooks/00clear
+@@ -5,7 +5,7 @@
RETVAL=0
case "$1" in
hibernate|suspend)
@@ -123,15 +104,11 @@
RETVAL=$?
;;
*)
- ;;
- esac
-Index: b/pm/hooks/50modules
+Index: pm-utils-0.99.4.20071229/pm/hooks/50modules
===================================================================
---- a/pm/hooks/50modules
-+++ b/pm/hooks/50modules
-@@ -4,19 +4,21 @@
-
- suspend_modules()
+--- pm-utils-0.99.4.20071229.orig/pm/hooks/50modules
++++ pm-utils-0.99.4.20071229/pm/hooks/50modules
+@@ -6,6 +6,7 @@ suspend_modules()
{
[ -z "$SUSPEND_MODULES" ] && return 0
for x in $SUSPEND_MODULES ; do
@@ -139,9 +116,7 @@
modunload $x
done
return 0
- }
-
- resume_modules()
+@@ -15,6 +16,7 @@ resume_modules()
{
[ -z "$RESUME_MODULES" ] && return 0
for x in $RESUME_MODULES ; do
@@ -149,15 +124,11 @@
modprobe $x
done
}
-
- case "$1" in
-Index: b/src/pm-powersave
+Index: pm-utils-0.99.4.20071229/src/pm-powersave
===================================================================
---- a/src/pm-powersave
-+++ b/src/pm-powersave
-@@ -26,10 +26,13 @@
-
- # set nullglob to make glob results empty in case the pattern does not
+--- pm-utils-0.99.4.20071229.orig/src/pm-powersave
++++ pm-utils-0.99.4.20071229/src/pm-powersave
+@@ -28,6 +28,9 @@
# match any files
shopt -s nullglob
@@ -167,11 +138,7 @@
find_powerd_files()
{
flist="/etc/pm/power.d/*[^~] /usr/lib/pm-utils/power.d/*[^~]"
- bases=$(for file in $flist ; do echo $(basename $file) ; done | sort -n | uniq)
- for base in $bases ; do
-@@ -43,11 +46,11 @@ find_powerd_files()
-
- runpowerhooks()
+@@ -45,7 +48,7 @@ runpowerhooks()
{
files=$(find_powerd_files)
for file in $files ; do
@@ -180,24 +147,18 @@
done
}
- if [ "$1" == "true" ] ; then
- runpowerhooks true
-@@ -55,5 +58,8 @@ elif [ "$1" == "false" ] ; then
- runpowerhooks false
- else
+@@ -57,3 +60,6 @@ else
echo "Argument needs to be true or false" >&2
exit 1
fi
+
+cat $PM_POWERSAVE_LOGFILE
+
-Index: b/src/pm-action
+Index: pm-utils-0.99.4.20071229/src/pm-action
===================================================================
---- a/src/pm-action
-+++ b/src/pm-action
-@@ -126,10 +126,12 @@ case "$ACTION" in
- *)
- exit 1
+--- pm-utils-0.99.4.20071229.orig/src/pm-action
++++ pm-utils-0.99.4.20071229/src/pm-action
+@@ -128,6 +128,8 @@ case "$ACTION" in
;;
esac
@@ -206,5 +167,21 @@
export PM_CMDLINE="$@"
pm_main "$METHOD" "$ACTION" "$REVERSE"
-
- exit $?
+Index: pm-utils-0.99.4.20071229/pm/defaults
+===================================================================
+--- pm-utils-0.99.4.20071229.orig/pm/defaults
++++ pm-utils-0.99.4.20071229/pm/defaults
+@@ -46,3 +46,13 @@ SATA_PM="medium_power"
+ # Specifies the timeout after a sound card enters a low power mode
+ # Empty string is meant for not touching any power management features at all
+ SOUND_PM="10"
++
++# Wake On LAN handling
++
++# Specifies if we should enable certain wake on LAN settings when running
++# on DC.
++# Possible values are: Flags which can be set through ethtool. Please see
++# the ethtool manpage for more information. Default is 'g', which means
++# "wake on magic packet" only.
++# Empty string is meant for not touching any wol features at all
++WOL="g"
++++++ pm-utils-suse-20090409.tar.bz2 -> pm-utils-suse-20090621.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pm-utils-suse/hooks/power.d/wol new/pm-utils-suse/hooks/power.d/wol
--- old/pm-utils-suse/hooks/power.d/wol 1970-01-01 01:00:00.000000000 +0100
+++ new/pm-utils-suse/hooks/power.d/wol 2009-06-21 14:21:47.000000000 +0200
@@ -0,0 +1,31 @@
+#!/bin/bash
+#
+# Script to set the wake on lan state
+#
+# Copyright (C) 2009 Holger Macht
participants (1)
-
root@hilbert.suse.de