Hello community,
here is the log from the commit of package pm-utils
checked in at Wed Mar 21 00:42:49 CET 2007.
--------
--- pm-utils/pm-utils.changes 2007-03-16 14:50:45.000000000 +0100
+++ /mounts/work_src_done/STABLE/pm-utils/pm-utils.changes 2007-03-20 17:02:51.000000000 +0100
@@ -1,0 +2,8 @@
+Tue Mar 20 16:00:56 CET 2007 - seife@suse.de
+
+- update to curren CVS
+ - module unloading and config handling fix integrated upstream
+- pm-utils-suse: be more careful selecting the kernel for resume
+ (bug 256105)
+
+-------------------------------------------------------------------
Old:
----
pm-utils-0.99.2.20070315-suse.diff
pm-utils-0.99.2.20070315.tar.gz
pm-utils-0.99.2-fix-modunload.diff
pm-utils-suse-20070314.tar.gz
New:
----
pm-utils-0.99.2.20070316-suse.diff
pm-utils-0.99.2.20070316.tar.gz
pm-utils-suse-20070320.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pm-utils.spec ++++++
--- /var/tmp/diff_new_pack.z31793/_old 2007-03-21 00:42:33.000000000 +0100
+++ /var/tmp/diff_new_pack.z31793/_new 2007-03-21 00:42:33.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package pm-utils (Version 0.99.2.20070315)
+# spec file for package pm-utils (Version 0.99.2.20070316)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,16 +12,15 @@
Name: pm-utils
URL: http://webcvs.freedesktop.org/pm-utils/
-Version: 0.99.2.20070315
-Release: 2
-%define pm_utils_suse_version 20070314
+Version: 0.99.2.20070316
+Release: 1
+%define pm_utils_suse_version 20070320
Summary: Tools to suspend and hibernate computers.
License: GNU General Public License (GPL)
Group: System/Base
Source: %{name}-%{version}.tar.gz
-Patch0: pm-utils-0.99.2.20070315-suse.diff
+Patch0: pm-utils-0.99.2.20070316-suse.diff
Patch1: pm-utils-0.99.2-uswsusp-support.diff
-Patch2: pm-utils-0.99.2-fix-modunload.diff
Patch3: pm-utils-0.99.2-comment-configfile.diff
Source1: pm-utils-suse-%{pm_utils_suse_version}.tar.gz
Source2: README.upstream-hooks
@@ -46,7 +45,6 @@
%prep
%setup -b 1
%patch1 -p0
-%patch2 -p0
%patch3 -p0
%patch0 -p0
@@ -79,6 +77,11 @@
%doc hooks
%changelog
+* Tue Mar 20 2007 - seife@suse.de
+- update to curren 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
++++++ pm-utils-0.99.2.20070315-suse.diff -> pm-utils-0.99.2.20070316-suse.diff ++++++
--- pm-utils/pm-utils-0.99.2.20070315-suse.diff 2007-03-16 10:49:38.000000000 +0100
+++ /mounts/work_src_done/STABLE/pm-utils/pm-utils-0.99.2.20070316-suse.diff 2007-03-20 15:32:46.000000000 +0100
@@ -1,60 +1,15 @@
--- pm/functions
+++ pm/functions
-@@ -15,39 +15,30 @@
+@@ -15,7 +15,7 @@
HIBERNATE_METHOD=""
S2DISK_BIN=/usr/sbin/s2disk
S2DISK_CONF=/var/lib/s2disk.conf
-TEMPORARY_CPUFREQ_GOVERNOR="userspace"
+TEMPORARY_CPUFREQ_GOVERNOR="performance"
+ set -a
[ -f /usr/lib/pm-utils/defaults ] && . /usr/lib/pm-utils/defaults
-
--GLOBAL_CONFIG_VARIABLES=""
--add_global() {
-- export $1
-- GLOBAL_CONFIG_VARIABLES="$GLOBAL_CONFIG_VARIABLES $1"
--}
--
- # export them all here
--add_global HIBERNATE_RESUME_POST_VIDEO
--add_global INHIBIT
--add_global PM_LOGFILE
--add_global PM_CMDLINE
--add_global RESUME_MODULES
--add_global SUSPEND_MODULES
--add_global TEMPORARY_CPUFREQ_GOVERNOR
--add_global HIBERNATE_METHOD
--add_global S2DISK_BIN
--add_global S2DISK_CONF
-+export HIBERNATE_RESUME_POST_VIDEO
-+export INHIBIT
-+export PM_LOGFILE
-+export PM_CMDLINE
-+export RESUME_MODULES
-+export SUSPEND_MODULES
-+export TEMPORARY_CPUFREQ_GOVERNOR
-+export HIBERNATE_METHOD
-+export S2DISK_BIN
-+export S2DISK_CONF
-
- source_configs()
- {
- cfgs="/etc/pm/config.d/*[^~]"
- for cfg in $cfgs ; do
- [ -x $cfg ] || continue
-- while read LINE ; do
-- case "$GLOBAL_CONFIG_VARIABLES " in
-- *" ${LINE%=*} "*) continue ;;
-- *) eval $LINE ;;
-- esac
-- done < $cfg
-+ set -a
-+ . $cfg
-+ set +a
- done
- }
-
-@@ -71,7 +62,7 @@
+@@ -51,7 +51,7 @@
remove_suspend_lock()
{
@@ -63,7 +18,7 @@
chvt 1
chvt $VT
openvt -- sh -c "usleep $1 ; rm -f /.suspended >/dev/null 2>&1 0<&1" >/dev/null 2>&1 0<&1 &
-@@ -97,7 +88,7 @@
+@@ -77,7 +77,7 @@
[ -z "$1" ] && return 0
[ -f /var/run/pm-suspend ] && . /var/run/pm-suspend
++++++ pm-utils-0.99.2.20070315.tar.gz -> pm-utils-0.99.2.20070316.tar.gz ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pm-utils-0.99.2.20070315/ChangeLog new/pm-utils-0.99.2.20070316/ChangeLog
--- old/pm-utils-0.99.2.20070315/ChangeLog 2007-03-14 18:39:30.000000000 +0100
+++ new/pm-utils-0.99.2.20070316/ChangeLog 2007-03-16 18:29:07.000000000 +0100
@@ -1,3 +1,15 @@
+2007-03-16 Peter Jones
+
+ * pm/functions:
+ - work around broken regexps in some versions of bash, also fewer
+ forks ;) (patch from Stefan)
+
+2007-03-16 Peter Jones
+
+ * pm/functions:
+ - get rid of the complicated config stuff; the new layout obviates the
+ need for it (patch from Stefan)
+
2007-03-14 Peter Jones
* pm/power.d/laptop-tools:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pm-utils-0.99.2.20070315/configure new/pm-utils-0.99.2.20070316/configure
--- old/pm-utils-0.99.2.20070315/configure 2007-03-16 10:47:31.000000000 +0100
+++ new/pm-utils-0.99.2.20070316/configure 2007-03-16 18:30:00.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for pm-utils 0.99.2.20070315.
+# Generated by GNU Autoconf 2.61 for pm-utils 0.99.2.20070316.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -572,8 +572,8 @@
# Identity of this package.
PACKAGE_NAME='pm-utils'
PACKAGE_TARNAME='pm-utils'
-PACKAGE_VERSION='0.99.2.20070315'
-PACKAGE_STRING='pm-utils 0.99.2.20070315'
+PACKAGE_VERSION='0.99.2.20070316'
+PACKAGE_STRING='pm-utils 0.99.2.20070316'
PACKAGE_BUGREPORT=''
ac_unique_file="src"
@@ -1170,7 +1170,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures pm-utils 0.99.2.20070315 to adapt to many kinds of systems.
+\`configure' configures pm-utils 0.99.2.20070316 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1236,7 +1236,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of pm-utils 0.99.2.20070315:";;
+ short | recursive ) echo "Configuration of pm-utils 0.99.2.20070316:";;
esac
cat <<\_ACEOF
@@ -1318,7 +1318,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-pm-utils configure 0.99.2.20070315
+pm-utils configure 0.99.2.20070316
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1332,7 +1332,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by pm-utils $as_me 0.99.2.20070315, which was
+It was created by pm-utils $as_me 0.99.2.20070316, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2023,7 +2023,7 @@
# Define the identity of the package.
PACKAGE=pm-utils
- VERSION=0.99.2.20070315
+ VERSION=0.99.2.20070316
cat >>confdefs.h <<_ACEOF
@@ -3698,7 +3698,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by pm-utils $as_me 0.99.2.20070315, which was
+This file was extended by pm-utils $as_me 0.99.2.20070316, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3751,7 +3751,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-pm-utils config.status 0.99.2.20070315
+pm-utils config.status 0.99.2.20070316
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pm-utils-0.99.2.20070315/configure.in new/pm-utils-0.99.2.20070316/configure.in
--- old/pm-utils-0.99.2.20070315/configure.in 2007-03-16 10:47:20.000000000 +0100
+++ new/pm-utils-0.99.2.20070316/configure.in 2007-03-16 18:29:48.000000000 +0100
@@ -1,6 +1,6 @@
AC_PREREQ(2.52)
-AC_INIT(pm-utils, 0.99.2.20070315)
+AC_INIT(pm-utils, 0.99.2.20070316)
AC_CONFIG_SRCDIR(src)
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
AM_CONFIG_HEADER(config.h)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pm-utils-0.99.2.20070315/pm/functions new/pm-utils-0.99.2.20070316/pm/functions
--- old/pm-utils-0.99.2.20070315/pm/functions 2007-03-16 10:43:57.000000000 +0100
+++ new/pm-utils-0.99.2.20070316/pm/functions 2007-03-16 18:29:08.000000000 +0100
@@ -14,34 +14,17 @@
SUSPEND_MODULES=""
TEMPORARY_CPUFREQ_GOVERNOR="userspace"
+set -a
[ -f /usr/lib/pm-utils/defaults ] && . /usr/lib/pm-utils/defaults
-
-GLOBAL_CONFIG_VARIABLES=""
-add_global() {
- export $1
- GLOBAL_CONFIG_VARIABLES="$GLOBAL_CONFIG_VARIABLES $1"
-}
-
-# export them all here
-add_global HIBERNATE_RESUME_POST_VIDEO
-add_global INHIBIT
-add_global PM_LOGFILE
-add_global PM_CMDLINE
-add_global RESUME_MODULES
-add_global SUSPEND_MODULES
-add_global TEMPORARY_CPUFREQ_GOVERNOR
+set +a
source_configs()
{
cfgs="/etc/pm/config.d/*[^~]"
for cfg in $cfgs ; do
- [ -x $cfg ] || continue
- while read LINE ; do
- case "$GLOBAL_CONFIG_VARIABLES " in
- *" ${LINE%=*} "*) continue ;;
- *) eval $LINE ;;
- esac
- done < $cfg
+ set -a
+ . $cfg
+ set +a
done
}
@@ -191,13 +174,14 @@
{
local MOD D C USED MODS I
local UNL=$1 RET=1
- UNL=$(echo $UNL | sed -e 's/[_-]/\[_-\]/g')
+ # the kernel only knows underscores in module names, no dashes
+ UNL=${UNL//-/_}
# RET is the return code.
# If at least one module was unloaded, return 0.
# if the module was not loaded, also return 0 since this is no error.
# if no module was unloaded successfully, return 1
while read MOD D C USED D; do
- [[ "$MOD" =~ "$UNL" ]] || continue
+ [ "$MOD" = "$UNL" ] || continue
if [ "$USED" == "-" ]; then
_rmmod $MOD $C
RET=$?
++++++ pm-utils-0.99.2-comment-configfile.diff ++++++
--- /var/tmp/diff_new_pack.z31793/_old 2007-03-21 00:42:34.000000000 +0100
+++ /var/tmp/diff_new_pack.z31793/_new 2007-03-21 00:42:34.000000000 +0100
@@ -1,10 +1,7 @@
Index: pm/defaults
-===================================================================
-RCS file: /cvs/pm-utils/pm-utils/pm/defaults,v
-retrieving revision 1.4
-diff -u -p -r1.4 defaults
---- pm/defaults 14 Mar 2007 15:37:04 -0000 1.4
-+++ pm/defaults 14 Mar 2007 18:22:45 -0000
+================================================================================
+--- pm/defaults
++++ pm/defaults
@@ -3,7 +3,25 @@
# DO NOT EDIT THIS FILE, edit /etc/pm/config.d/ instead! #
##########################################################
++++++ pm-utils-0.99.2-uswsusp-support.diff ++++++
--- /var/tmp/diff_new_pack.z31793/_old 2007-03-21 00:42:34.000000000 +0100
+++ /var/tmp/diff_new_pack.z31793/_new 2007-03-21 00:42:34.000000000 +0100
@@ -1,11 +1,8 @@
Index: pm/functions
-===================================================================
-RCS file: /cvs/pm-utils/pm-utils/pm/functions,v
-retrieving revision 1.40
-diff -u -p -r1.40 functions
---- pm/functions 14 Mar 2007 16:40:30 -0000 1.40
-+++ pm/functions 14 Mar 2007 18:31:05 -0000
-@@ -12,6 +12,9 @@ HIBERNATE_RESUME_POST_VIDEO=no
+================================================================================
+--- pm/functions
++++ pm/functions
+@@ -12,6 +12,9 @@
INHIBIT=/var/run/pm-utils.inhibit
PM_LOGFILE=${PM_LOGFILE:=/var/log/pm-suspend.log}
SUSPEND_MODULES=""
@@ -14,18 +11,8 @@
+S2DISK_CONF=/var/lib/s2disk.conf
TEMPORARY_CPUFREQ_GOVERNOR="userspace"
- [ -f /usr/lib/pm-utils/defaults ] && . /usr/lib/pm-utils/defaults
-@@ -30,6 +33,9 @@ add_global PM_CMDLINE
- add_global RESUME_MODULES
- add_global SUSPEND_MODULES
- add_global TEMPORARY_CPUFREQ_GOVERNOR
-+add_global HIBERNATE_METHOD
-+add_global S2DISK_BIN
-+add_global S2DISK_CONF
-
- source_configs()
- {
-@@ -136,13 +142,31 @@ get_power_status()
+ set -a
+@@ -119,13 +122,31 @@
do_suspend()
{
++++++ pm-utils-suse-20070314.tar.gz -> pm-utils-suse-20070320.tar.gz ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pm-utils-suse/hooks/99Zgrub new/pm-utils-suse/hooks/99Zgrub
--- old/pm-utils-suse/hooks/99Zgrub 2006-12-20 18:36:36.000000000 +0100
+++ new/pm-utils-suse/hooks/99Zgrub 2007-03-20 17:01:48.000000000 +0100
@@ -14,9 +14,17 @@
{
# DEBUG "Running getkernels()" INFO
local MENU_LST="/boot/grub/menu.lst"
- local I DUMMY
+ local I DUMMY MNT ROOTDEV
declare -i I=0 J=-1
+ # we need the root partition later to decide if this is the kernel to select
+ while read ROOTDEV MNT DUMMY; do
+ [ "$ROOTDEV" = "rootfs" ] && continue # not what we are searching for
+ if [ "$MNT" = "/" ]; then
+ break
+ fi
+ done < /proc/mounts
+
# build an array KERNELS with all the kernels in /boot/grub/menu.lst
# the array MENU_ENTRIES contains the corresponding menu entry numbers
# DEFAULT_BOOT contains the default entry.
@@ -35,13 +43,26 @@
# we probably found the "failsafe" kernel that won't resume...
echo " Skipping grub entry #${J}, because it has the noresume option" >&2
;;
- kernel*)
+ kernel*root=*)
+ local ROOT
+ ROOT=${LINE#*root=}
+ DUMMY=($ROOT)
+ ROOT=${DUMMY[0]}
+ if [ "$(stat -Lc '%t:%T' $ROOT)" != "$(stat -Lc '%t:%T' $ROOTDEV)" ]; then
+ echo " Skipping grub entry #${J}, because its root= parameter ($ROOT)" >&2
+ echo " does not match the current root device ($ROOTDEV)." >&2
+ continue
+ fi
DUMMY=($LINE) # kernel (hd0,1)/boot/vmlinuz-ABC root=/dev/hda2
echo "KERNELS[$I]='${DUMMY[1]##*/}'" # vmlinuz-ABC
echo "MENU_ENTRIES[$I]=$J"
# DEBUG "Found kernel entry #${I}: '${DUMMY[1]##*/}'" INFO
let I++
;;
+ kernel*)
+ # a kernel without "root="? We better skip that one...
+ echo " Skipping grub entry #${J}, because it has no root= option" >&2
+ ;;
*) ;;
esac
done < $MENU_LST
@@ -151,7 +172,7 @@
T1=`date +"%s%N"`
sync; sync; sync # this is needed to speed up grub-once on reiserfs
T2=`date +"%s%N"`
- grub-once $NEXT_BOOT > /dev/null 2>&1
+ echo " grub-once: `grub-once $NEXT_BOOT`"
T3=`date +"%s%N"`
S=$(((T2-T1)/100000000)); S="$((S/10)).${S:0-1}"
G=$(((T3-T2)/100000000)); G="$((G/10)).${G:0-1}"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org