diff options
author | Thomas Sachau <tommy@gentoo.org> | 2008-09-23 17:03:24 +0000 |
---|---|---|
committer | Thomas Sachau <tommy@gentoo.org> | 2008-09-23 17:03:24 +0000 |
commit | c5bce7316ae669f2c16d118da044c17a1179172a (patch) | |
tree | af4eba0e9e670198e0041599111bbbd5021cfa08 /sys-power | |
parent | kde-misc/kndiswrapper: Fixed runtime dependencies (diff) | |
download | sunrise-c5bce7316ae669f2c16d118da044c17a1179172a.tar.gz sunrise-c5bce7316ae669f2c16d118da044c17a1179172a.tar.bz2 sunrise-c5bce7316ae669f2c16d118da044c17a1179172a.zip |
sys-power/acpi-support: Version bump (requested and tested by secludedsage, thanks to him)
svn path=/sunrise/; revision=7146
Diffstat (limited to 'sys-power')
-rw-r--r-- | sys-power/acpi-support/ChangeLog | 5 | ||||
-rw-r--r-- | sys-power/acpi-support/Manifest | 8 | ||||
-rw-r--r-- | sys-power/acpi-support/acpi-support-0.109.ebuild (renamed from sys-power/acpi-support/acpi-support-0.103.ebuild) | 0 | ||||
-rw-r--r-- | sys-power/acpi-support/files/acpi-support-0.109-gentoo.patch (renamed from sys-power/acpi-support/files/acpi-support-0.103-gentoo.patch) | 266 |
4 files changed, 187 insertions, 92 deletions
diff --git a/sys-power/acpi-support/ChangeLog b/sys-power/acpi-support/ChangeLog index f9754e1b6..0a413d454 100644 --- a/sys-power/acpi-support/ChangeLog +++ b/sys-power/acpi-support/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 22 Sep 2008; Thomas Sachau (Tommy[D]) <tommy@gentoo.org> + -acpi-support-0.103.ebuild, -files/acpi-support-0.103-gentoo.patch, + +acpi-support-0.109.ebuild, +files/acpi-support-0.109-gentoo.patch: + Version bump (requested and tested by secludedsage, thanks to him) + 31 Aug 2008; Thomas Sachau (Tommy[D]) <tommy@gentoo.org> metadata.xml: Add local useflags to metadata.xml (GLEP 56) diff --git a/sys-power/acpi-support/Manifest b/sys-power/acpi-support/Manifest index e68f8abfa..4f269143f 100644 --- a/sys-power/acpi-support/Manifest +++ b/sys-power/acpi-support/Manifest @@ -1,5 +1,5 @@ -AUX acpi-support-0.103-gentoo.patch 15638 RMD160 15f003fae0d03674cc66b8b108551a2ae1527057 SHA1 3d188ee26aa66739fa3891e480b3512e4c805ab2 SHA256 cd39a858aca30e30a44ad66f101139a90cced3f17e62886346e10a74a46ea8ce -DIST acpi-support_0.103.tar.gz 40874 RMD160 36a2fb06bfff21a8523d1df9ce917a2603f7c155 SHA1 058dabab97258cca69f8a48a31c5805d0da3ec5b SHA256 c456b9275077a3a0667a683163ba6574c8d7661d2a9a68a19dab8ef0fc0f2bfe -EBUILD acpi-support-0.103.ebuild 2348 RMD160 94e4137b0584ab0655778950d06d1b259a4cf545 SHA1 23f5dd993051bd52d4fa6e9118cd5158c14fac0b SHA256 e6101fa436c9659a6f628a7188ef69f5cc38cd7d5b3ca0e9a67a51cf9c9fe3e8 -MISC ChangeLog 2283 RMD160 aa4f5b993e4dfb85a8760ae0b4e6e24dd2f514e5 SHA1 5ff1671a1c61bdeb439d582a3deb87edde71304f SHA256 f4d60e719dac08577c431da0b6bd9719bac73d692d37ea088724bcf242f6535d +AUX acpi-support-0.109-gentoo.patch 15728 RMD160 011b78ac89337e03645fc373dd2fdffec33094ca SHA1 28b4348e27202a5e215004ec1649629160e21578 SHA256 0b822b1b462546a2649f2eb510090b45384812844d068264de4ff9260b9d9a3a +DIST acpi-support_0.109.tar.gz 42232 RMD160 3eb316e80584ff1c9a6b24f51a6adc374d26f379 SHA1 5f75d97d131f843f674675bc1521c620a8377c35 SHA256 9a9f3246d4b2eb0ba3ce7aac41395435f48e1b106d1c362b95326b2ce8ce9c4c +EBUILD acpi-support-0.109.ebuild 2348 RMD160 94e4137b0584ab0655778950d06d1b259a4cf545 SHA1 23f5dd993051bd52d4fa6e9118cd5158c14fac0b SHA256 e6101fa436c9659a6f628a7188ef69f5cc38cd7d5b3ca0e9a67a51cf9c9fe3e8 +MISC ChangeLog 2552 RMD160 e1f69a4583e9429574a2203cbb465a15413c1ddd SHA1 ff2be299bcd6e3870f966ae44010397bc3e0298b SHA256 30593f9d16f18801726bfbdd1d55bfa107c3a4411ce49f440a78ffd7a4e28f76 MISC metadata.xml 307 RMD160 cf269d898f4e4091bc483d6ed91a433fe0ce92f1 SHA1 81da80ea0f821fc181559aea1b668cc51feac4ea SHA256 613309a16485616fbbaa08c11c802e8da849e0a76b6adc719e6190f726c308b7 diff --git a/sys-power/acpi-support/acpi-support-0.103.ebuild b/sys-power/acpi-support/acpi-support-0.109.ebuild index b8fcd602b..b8fcd602b 100644 --- a/sys-power/acpi-support/acpi-support-0.103.ebuild +++ b/sys-power/acpi-support/acpi-support-0.109.ebuild diff --git a/sys-power/acpi-support/files/acpi-support-0.103-gentoo.patch b/sys-power/acpi-support/files/acpi-support-0.109-gentoo.patch index cb892dc77..fe1dbeea5 100644 --- a/sys-power/acpi-support/files/acpi-support-0.103-gentoo.patch +++ b/sys-power/acpi-support/files/acpi-support-0.109-gentoo.patch @@ -1,6 +1,9 @@ -diff -urN orig/acpi-support-0.102/acpi-support work/acpi-support-0.102/acpi-support ---- orig/acpi-support-0.102/acpi-support 2007-08-30 23:35:02.000000000 -0400 -+++ work/acpi-support-0.102/acpi-support 2007-11-09 10:48:42.000000000 -0500 +diff -urN orig/acpi-support-0.102/acpi-support +work/acpi-support-0.102/acpi-support +--- orig/acpi-support-0.102/acpi-support 2007-08-30 +23:35:02.000000000 -0400 ++++ work/acpi-support-0.102/acpi-support 2007-11-09 +10:48:42.000000000 -0500 @@ -69,4 +69,12 @@ ENABLE_LAPTOP_MODE=false @@ -9,20 +12,27 @@ diff -urN orig/acpi-support-0.102/acpi-support work/acpi-support-0.102/acpi-supp \ No newline at end of file +SPINDOWN_TIME=12 + -+# Disable wake-on-LAN for wired Ethernet devices. WOL is on by default on some ++# Disable wake-on-LAN for wired Ethernet devices. WOL is on by default +on some +# laptops. Disabling it can save power during sleep. +# DISABLE_WOL=true + -+# Use hibernate-script to handle hibernation and sleep. Hibernate-script uses -+# configuration files in /etc/hibernate and does not use the options above. ++# Use hibernate-script to handle hibernation and sleep. +Hibernate-script uses ++# configuration files in /etc/hibernate and does not use the options +above. +# USE_HIBERNATE_SCRIPT=true -diff -urN orig/acpi-support-0.102/debian/init.d work/acpi-support-0.102/debian/init.d ---- orig/acpi-support-0.102/debian/init.d 2007-08-30 22:48:20.000000000 -0400 -+++ work/acpi-support-0.102/debian/init.d 2007-11-09 12:11:54.000000000 -0500 +diff -urN orig/acpi-support-0.102/debian/init.d +work/acpi-support-0.102/debian/init.d +--- orig/acpi-support-0.102/debian/init.d 2007-08-30 +22:48:20.000000000 -0400 ++++ work/acpi-support-0.102/debian/init.d 2007-11-09 +12:11:54.000000000 -0500 @@ -1,35 +1,34 @@ -#!/bin/bash +#!/sbin/runscript - # INIT script to check whether we're on batteries, and so start with laptop + # INIT script to check whether we're on batteries, and so start with +laptop # mode etc enabled. # BUGS: unless we start *really* late, we have no way of throttling @@ -83,41 +93,54 @@ diff -urN orig/acpi-support-0.102/debian/init.d work/acpi-support-0.102/debian/i + /etc/acpi/power.sh stop + eend 0 +} -diff -urN orig/acpi-support-0.102/events/ibm-ultrabay-eject work/acpi-support-0.102/events/ibm-ultrabay-eject ---- orig/acpi-support-0.102/events/ibm-ultrabay-eject 1969-12-31 19:00:00.000000000 -0500 -+++ work/acpi-support-0.102/events/ibm-ultrabay-eject 2007-11-09 10:47:47.000000000 -0500 +diff -urN orig/acpi-support-0.102/events/ibm-ultrabay-eject +work/acpi-support-0.102/events/ibm-ultrabay-eject +--- orig/acpi-support-0.102/events/ibm-ultrabay-eject 1969-12-31 +19:00:00.000000000 -0500 ++++ work/acpi-support-0.102/events/ibm-ultrabay-eject 2007-11-09 +10:47:47.000000000 -0500 @@ -0,0 +1,5 @@ +# /etc/acpi/events/ibm-ultrabay-eject +# This is called when the user ejects the ultrabay lever + +event=ibm/bay MSTR 00000003 00000000 +action=/etc/acpi/thinkpad-ultrabay-eject.sh -diff -urN orig/acpi-support-0.102/events/ibm-ultrabay-insert work/acpi-support-0.102/events/ibm-ultrabay-insert ---- orig/acpi-support-0.102/events/ibm-ultrabay-insert 1969-12-31 19:00:00.000000000 -0500 -+++ work/acpi-support-0.102/events/ibm-ultrabay-insert 2007-11-09 10:47:47.000000000 -0500 +diff -urN orig/acpi-support-0.102/events/ibm-ultrabay-insert +work/acpi-support-0.102/events/ibm-ultrabay-insert +--- orig/acpi-support-0.102/events/ibm-ultrabay-insert 1969-12-31 +19:00:00.000000000 -0500 ++++ work/acpi-support-0.102/events/ibm-ultrabay-insert 2007-11-09 +10:47:47.000000000 -0500 @@ -0,0 +1,5 @@ +# /etc/acpi/events/ibm-ultrabay-insert +# This is called when the user inserts the ultrabay lever + +event=ibm/bay MSTR 00000001 00000000 +action=/etc/acpi/thinkpad-ultrabay-insert.sh -diff -urN orig/acpi-support-0.102/hibernatebtn.sh work/acpi-support-0.102/hibernatebtn.sh ---- orig/acpi-support-0.102/hibernatebtn.sh 2006-02-06 09:54:47.000000000 -0500 -+++ work/acpi-support-0.102/hibernatebtn.sh 2007-11-09 10:47:47.000000000 -0500 +diff -urN orig/acpi-support-0.102/hibernatebtn.sh +work/acpi-support-0.102/hibernatebtn.sh +--- orig/acpi-support-0.102/hibernatebtn.sh 2006-02-06 +09:54:47.000000000 -0500 ++++ work/acpi-support-0.102/hibernatebtn.sh 2007-11-09 +10:47:47.000000000 -0500 @@ -1,3 +1,3 @@ #!/bin/bash -. /usr/share/acpi-support/key-constants -acpi_fakekey $KEY_SUSPEND + +. /etc/acpi/hibernate.sh -diff -urN orig/acpi-support-0.102/hibernate.sh work/acpi-support-0.102/hibernate.sh ---- orig/acpi-support-0.102/hibernate.sh 2006-09-15 16:43:46.000000000 -0400 -+++ work/acpi-support-0.102/hibernate.sh 2007-11-09 10:47:47.000000000 -0500 +diff -urN orig/acpi-support-0.102/hibernate.sh +work/acpi-support-0.102/hibernate.sh +--- orig/acpi-support-0.102/hibernate.sh 2006-09-15 +16:43:46.000000000 -0400 ++++ work/acpi-support-0.102/hibernate.sh 2007-11-09 +10:47:47.000000000 -0500 @@ -8,6 +8,11 @@ exit; fi -+if [[ $USE_HIBERNATE_SCRIPT == true ]] && [[ -x /usr/sbin/hibernate ]] ; then ++if [[ $USE_HIBERNATE_SCRIPT == true ]] && [[ -x /usr/sbin/hibernate ]] +; then + /usr/sbin/hibernate + exit +fi @@ -125,20 +148,29 @@ diff -urN orig/acpi-support-0.102/hibernate.sh work/acpi-support-0.102/hibernate # Unset video posting - it's not needed for suspend to disk unset POST_VIDEO unset USE_DPMS -diff -urN orig/acpi-support-0.102/lib/policy-funcs work/acpi-support-0.102/lib/policy-funcs ---- orig/acpi-support-0.102/lib/policy-funcs 2006-05-19 16:21:58.000000000 -0400 -+++ work/acpi-support-0.102/lib/policy-funcs 2007-11-09 10:47:47.000000000 -0500 +diff -urN orig/acpi-support-0.102/lib/policy-funcs +work/acpi-support-0.102/lib/policy-funcs +--- orig/acpi-support-0.102/lib/policy-funcs 2006-05-19 +16:21:58.000000000 -0400 ++++ work/acpi-support-0.102/lib/policy-funcs 2007-11-09 +10:47:47.000000000 -0500 @@ -1,6 +1,6 @@ CheckPolicy() { if pidof gnome-power-manager kpowersave > /dev/null || -- (pidof dcopserver > /dev/null && test -x /usr/bin/dcop && /usr/bin/dcop kded kded loadedModules | grep -q klaptopdaemon) ; then -+ (pidof dcopserver > /dev/null && test -x /usr/kde/3.5/bin/dcop && /usr/kde/3.5/bin/dcop kded kded loadedModules | grep -q klaptopdaemon) ; then +- (pidof dcopserver > /dev/null && test -x /usr/bin/dcop && +/usr/bin/dcop kded kded loadedModules | grep -q klaptopdaemon) ; then ++ (pidof dcopserver > /dev/null && test -x +/usr/kde/3.5/bin/dcop && /usr/kde/3.5/bin/dcop kded kded loadedModules | +grep -q klaptopdaemon) ; then echo 0; else echo 1; -diff -urN orig/acpi-support-0.102/lib/power-funcs work/acpi-support-0.102/lib/power-funcs ---- orig/acpi-support-0.102/lib/power-funcs 2007-08-30 22:07:02.000000000 -0400 -+++ work/acpi-support-0.102/lib/power-funcs 2007-11-09 10:47:47.000000000 -0500 +diff -urN orig/acpi-support-0.102/lib/power-funcs +work/acpi-support-0.102/lib/power-funcs +--- orig/acpi-support-0.102/lib/power-funcs 2007-08-30 +22:07:02.000000000 -0400 ++++ work/acpi-support-0.102/lib/power-funcs 2007-11-09 +10:47:47.000000000 -0500 @@ -6,9 +6,9 @@ POWERSTATE="/var/lib/acpi-support/powerstate" @@ -146,14 +178,18 @@ diff -urN orig/acpi-support-0.102/lib/power-funcs work/acpi-support-0.102/lib/po - user=`finger| grep -m1 ":$displaynum " | awk '{print $1}'` + user=`who| grep -m1 ":$displaynum " | awk '{print $1}'` if [ x"$user" = x"" ]; then -- user=`finger| grep -m1 ":$displaynum" | awk '{print $1}'` +- user=`finger| grep -m1 ":$displaynum" | awk '{print +$1}'` + user=`who| grep -m1 ":$displaynum" | awk '{print $1}'` fi if [ x"$user" != x"" ]; then userhome=`getent passwd $user | cut -d: -f6` -diff -urN orig/acpi-support-0.102/Makefile work/acpi-support-0.102/Makefile ---- orig/acpi-support-0.102/Makefile 2006-03-21 12:03:00.000000000 -0500 -+++ work/acpi-support-0.102/Makefile 2007-11-09 10:47:47.000000000 -0500 +diff -urN orig/acpi-support-0.102/Makefile +work/acpi-support-0.102/Makefile +--- orig/acpi-support-0.102/Makefile 2006-03-21 12:03:00.000000000 +-0500 ++++ work/acpi-support-0.102/Makefile 2007-11-09 10:47:47.000000000 +-0500 @@ -2,7 +2,6 @@ acpi_fakekey: acpi_fakekey.c @@ -162,20 +198,27 @@ diff -urN orig/acpi-support-0.102/Makefile work/acpi-support-0.102/Makefile # Keep this manually generated so that it doesn't build-dep on # 'linux-headers' and stays predictable. -diff -urN orig/acpi-support-0.102/resume.d/13-855-resolution-set.sh work/acpi-support-0.102/resume.d/13-855-resolution-set.sh ---- orig/acpi-support-0.102/resume.d/13-855-resolution-set.sh 2005-09-26 20:29:27.000000000 -0400 -+++ work/acpi-support-0.102/resume.d/13-855-resolution-set.sh 2007-11-09 10:47:47.000000000 -0500 +diff -urN orig/acpi-support-0.102/resume.d/13-855-resolution-set.sh +work/acpi-support-0.102/resume.d/13-855-resolution-set.sh +--- orig/acpi-support-0.102/resume.d/13-855-resolution-set.sh +2005-09-26 20:29:27.000000000 -0400 ++++ work/acpi-support-0.102/resume.d/13-855-resolution-set.sh +2007-11-09 10:47:47.000000000 -0500 @@ -1,7 +1,6 @@ #!/bin/bash if [ -x /usr/sbin/855resolution ]; then - . /etc/default/855resolution - if [ "$MODE" != "" ] && [ "$XRESO" != "" ] && [ "$YRESO" != "" ]; then + if [ "$MODE" != "" ] && [ "$XRESO" != "" ] && [ "$YRESO" != "" ]; +then /etc/init.d/855resolution start; fi -diff -urN orig/acpi-support-0.102/resume.d/40-infra-red.sh work/acpi-support-0.102/resume.d/40-infra-red.sh ---- orig/acpi-support-0.102/resume.d/40-infra-red.sh 2006-04-21 10:12:54.000000000 -0400 -+++ work/acpi-support-0.102/resume.d/40-infra-red.sh 2007-11-09 10:47:47.000000000 -0500 +diff -urN orig/acpi-support-0.102/resume.d/40-infra-red.sh +work/acpi-support-0.102/resume.d/40-infra-red.sh +--- orig/acpi-support-0.102/resume.d/40-infra-red.sh 2006-04-21 +10:12:54.000000000 -0400 ++++ work/acpi-support-0.102/resume.d/40-infra-red.sh 2007-11-09 +10:47:47.000000000 -0500 @@ -3,7 +3,6 @@ # Restart IR if necessary if [ -f /var/run/irdadev ] && [ x$RESTART_IRDA = xtrue ]; then @@ -185,31 +228,42 @@ diff -urN orig/acpi-support-0.102/resume.d/40-infra-red.sh work/acpi-support-0.1 + /etc/init.d/irda start; fi; -diff -urN orig/acpi-support-0.102/resume.d/49-855-resolution-set.sh work/acpi-support-0.102/resume.d/49-855-resolution-set.sh ---- orig/acpi-support-0.102/resume.d/49-855-resolution-set.sh 2005-09-26 20:29:27.000000000 -0400 -+++ work/acpi-support-0.102/resume.d/49-855-resolution-set.sh 2007-11-09 10:47:47.000000000 -0500 +diff -urN orig/acpi-support-0.102/resume.d/49-855-resolution-set.sh +work/acpi-support-0.102/resume.d/49-855-resolution-set.sh +--- orig/acpi-support-0.102/resume.d/49-855-resolution-set.sh +2005-09-26 20:29:27.000000000 -0400 ++++ work/acpi-support-0.102/resume.d/49-855-resolution-set.sh +2007-11-09 10:47:47.000000000 -0500 @@ -1,7 +1,6 @@ #!/bin/bash if [ -x /usr/sbin/855resolution ]; then - . /etc/default/855resolution - if [ "$MODE" != "" ] && [ "$XRESO" != "" ] && [ "$YRESO" != "" ]; then + if [ "$MODE" != "" ] && [ "$XRESO" != "" ] && [ "$YRESO" != "" ]; +then /etc/init.d/855resolution start; fi -diff -urN orig/acpi-support-0.102/resume.d/62-ifup.sh work/acpi-support-0.102/resume.d/62-ifup.sh ---- orig/acpi-support-0.102/resume.d/62-ifup.sh 2006-04-21 10:13:34.000000000 -0400 -+++ work/acpi-support-0.102/resume.d/62-ifup.sh 2007-11-09 10:47:47.000000000 -0500 +diff -urN orig/acpi-support-0.102/resume.d/62-ifup.sh +work/acpi-support-0.102/resume.d/62-ifup.sh +--- orig/acpi-support-0.102/resume.d/62-ifup.sh 2006-04-21 +10:13:34.000000000 -0400 ++++ work/acpi-support-0.102/resume.d/62-ifup.sh 2007-11-09 +10:47:47.000000000 -0500 @@ -3,6 +3,6 @@ - # Bring up the interfaces (this should probably be left up to some policy + # Bring up the interfaces (this should probably be left up to some +policy # manager, but at the moment we just bring back whatever we ifdowned) for x in $INTERFACES; do - ifup $x & + /etc/init.d/net.$x start & done -diff -urN orig/acpi-support-0.102/resume.d/67-sound.sh work/acpi-support-0.102/resume.d/67-sound.sh ---- orig/acpi-support-0.102/resume.d/67-sound.sh 2006-04-21 10:19:38.000000000 -0400 -+++ work/acpi-support-0.102/resume.d/67-sound.sh 2007-11-09 10:47:47.000000000 -0500 +diff -urN orig/acpi-support-0.102/resume.d/67-sound.sh +work/acpi-support-0.102/resume.d/67-sound.sh +--- orig/acpi-support-0.102/resume.d/67-sound.sh 2006-04-21 +10:19:38.000000000 -0400 ++++ work/acpi-support-0.102/resume.d/67-sound.sh 2007-11-09 +10:47:47.000000000 -0500 @@ -1,7 +1,7 @@ #!/bin/sh @@ -220,23 +274,30 @@ diff -urN orig/acpi-support-0.102/resume.d/67-sound.sh work/acpi-support-0.102/r + /etc/init.d/alsasound start fi -diff -urN orig/acpi-support-0.102/sleepbtn.sh work/acpi-support-0.102/sleepbtn.sh ---- orig/acpi-support-0.102/sleepbtn.sh 2006-02-06 09:55:00.000000000 -0500 -+++ work/acpi-support-0.102/sleepbtn.sh 2007-11-09 10:47:47.000000000 -0500 +diff -urN orig/acpi-support-0.102/sleepbtn.sh +work/acpi-support-0.102/sleepbtn.sh +--- orig/acpi-support-0.102/sleepbtn.sh 2006-02-06 09:55:00.000000000 +-0500 ++++ work/acpi-support-0.102/sleepbtn.sh 2007-11-09 10:47:47.000000000 +-0500 @@ -1,3 +1,3 @@ #!/bin/bash -. /usr/share/acpi-support/key-constants -acpi_fakekey $KEY_SLEEP + +. /etc/acpi/sleep.sh -diff -urN orig/acpi-support-0.102/sleep.sh work/acpi-support-0.102/sleep.sh ---- orig/acpi-support-0.102/sleep.sh 2006-05-19 15:37:32.000000000 -0400 -+++ work/acpi-support-0.102/sleep.sh 2007-11-09 10:47:47.000000000 -0500 +diff -urN orig/acpi-support-0.102/sleep.sh +work/acpi-support-0.102/sleep.sh +--- orig/acpi-support-0.102/sleep.sh 2006-05-19 15:37:32.000000000 +-0400 ++++ work/acpi-support-0.102/sleep.sh 2007-11-09 10:47:47.000000000 +-0500 @@ -16,6 +16,11 @@ exit; fi -+if [[ $USE_HIBERNATE_SCRIPT == true ]] && [[ -x /usr/sbin/hibernate ]] ; then ++if [[ $USE_HIBERNATE_SCRIPT == true ]] && [[ -x /usr/sbin/hibernate ]] +; then + /usr/sbin/hibernate --config-file=/etc/hibernate/ram.conf + exit; +fi @@ -244,9 +305,12 @@ diff -urN orig/acpi-support-0.102/sleep.sh work/acpi-support-0.102/sleep.sh if [ x$LOCK_SCREEN = xtrue ]; then if pidof xscreensaver > /dev/null; then for x in /tmp/.X11-unix/*; do -diff -urN orig/acpi-support-0.102/suspend.d/50-irda-stop.sh work/acpi-support-0.102/suspend.d/50-irda-stop.sh ---- orig/acpi-support-0.102/suspend.d/50-irda-stop.sh 2006-04-21 11:05:47.000000000 -0400 -+++ work/acpi-support-0.102/suspend.d/50-irda-stop.sh 2007-11-09 10:47:47.000000000 -0500 +diff -urN orig/acpi-support-0.102/suspend.d/50-irda-stop.sh +work/acpi-support-0.102/suspend.d/50-irda-stop.sh +--- orig/acpi-support-0.102/suspend.d/50-irda-stop.sh 2006-04-21 +11:05:47.000000000 -0400 ++++ work/acpi-support-0.102/suspend.d/50-irda-stop.sh 2007-11-09 +10:47:47.000000000 -0500 @@ -2,7 +2,7 @@ # Stop IRDA if it's running @@ -256,9 +320,12 @@ diff -urN orig/acpi-support-0.102/suspend.d/50-irda-stop.sh work/acpi-support-0. killall -9 irattach fi -diff -urN orig/acpi-support-0.102/suspend.d/52-disable-wol.sh work/acpi-support-0.102/suspend.d/52-disable-wol.sh ---- orig/acpi-support-0.102/suspend.d/52-disable-wol.sh 1969-12-31 19:00:00.000000000 -0500 -+++ work/acpi-support-0.102/suspend.d/52-disable-wol.sh 2007-11-09 10:47:47.000000000 -0500 +diff -urN orig/acpi-support-0.102/suspend.d/52-disable-wol.sh +work/acpi-support-0.102/suspend.d/52-disable-wol.sh +--- orig/acpi-support-0.102/suspend.d/52-disable-wol.sh 1969-12-31 +19:00:00.000000000 -0500 ++++ work/acpi-support-0.102/suspend.d/52-disable-wol.sh 2007-11-09 +10:47:47.000000000 -0500 @@ -0,0 +1,13 @@ +#!/bin/sh + @@ -269,13 +336,18 @@ diff -urN orig/acpi-support-0.102/suspend.d/52-disable-wol.sh work/acpi-support- + INTERFACES=`/sbin/ifconfig | awk '/^[^ ]+/ {print $1}'` + + for i in $INTERFACES; do -+ # TODO: find out if it's a wired ethernet card (and/or supports WOL) -+ [[ $i =~ "eth" && -n $ETHTOOL && -x $ETHTOOL ]] && $ETHTOOL -s $i wol d > /dev/null 2>&1 ++ # TODO: find out if it's a wired ethernet card (and/or +supports WOL) ++ [[ $i =~ "eth" && -n $ETHTOOL && -x $ETHTOOL ]] && +$ETHTOOL -s $i wol d > /dev/null 2>&1 + done +fi -diff -urN orig/acpi-support-0.102/suspend.d/55-down-interfaces.sh work/acpi-support-0.102/suspend.d/55-down-interfaces.sh ---- orig/acpi-support-0.102/suspend.d/55-down-interfaces.sh 2006-05-16 07:57:43.000000000 -0400 -+++ work/acpi-support-0.102/suspend.d/55-down-interfaces.sh 2007-11-09 10:47:47.000000000 -0500 +diff -urN orig/acpi-support-0.102/suspend.d/55-down-interfaces.sh +work/acpi-support-0.102/suspend.d/55-down-interfaces.sh +--- orig/acpi-support-0.102/suspend.d/55-down-interfaces.sh +2006-05-16 07:57:43.000000000 -0400 ++++ work/acpi-support-0.102/suspend.d/55-down-interfaces.sh +2007-11-09 10:47:47.000000000 -0500 @@ -10,7 +10,7 @@ # And shut them down @@ -285,9 +357,12 @@ diff -urN orig/acpi-support-0.102/suspend.d/55-down-interfaces.sh work/acpi-supp ifconfig $x down; done -diff -urN orig/acpi-support-0.102/suspend.d/85-alsa-state.sh work/acpi-support-0.102/suspend.d/85-alsa-state.sh ---- orig/acpi-support-0.102/suspend.d/85-alsa-state.sh 2006-04-21 11:00:08.000000000 -0400 -+++ work/acpi-support-0.102/suspend.d/85-alsa-state.sh 2007-11-09 10:47:47.000000000 -0500 +diff -urN orig/acpi-support-0.102/suspend.d/85-alsa-state.sh +work/acpi-support-0.102/suspend.d/85-alsa-state.sh +--- orig/acpi-support-0.102/suspend.d/85-alsa-state.sh 2006-04-21 +11:00:08.000000000 -0400 ++++ work/acpi-support-0.102/suspend.d/85-alsa-state.sh 2007-11-09 +10:47:47.000000000 -0500 @@ -1,7 +1,7 @@ #!/bin/sh @@ -298,16 +373,20 @@ diff -urN orig/acpi-support-0.102/suspend.d/85-alsa-state.sh work/acpi-support-0 + /etc/init.d/alsasound stop fi -diff -urN orig/acpi-support-0.102/thinkpad-ultrabay-eject.sh work/acpi-support-0.102/thinkpad-ultrabay-eject.sh ---- orig/acpi-support-0.102/thinkpad-ultrabay-eject.sh 1969-12-31 19:00:00.000000000 -0500 -+++ work/acpi-support-0.102/thinkpad-ultrabay-eject.sh 2007-11-09 10:47:47.000000000 -0500 +diff -urN orig/acpi-support-0.102/thinkpad-ultrabay-eject.sh +work/acpi-support-0.102/thinkpad-ultrabay-eject.sh +--- orig/acpi-support-0.102/thinkpad-ultrabay-eject.sh 1969-12-31 +19:00:00.000000000 -0500 ++++ work/acpi-support-0.102/thinkpad-ultrabay-eject.sh 2007-11-09 +10:47:47.000000000 -0500 @@ -0,0 +1,66 @@ +s#!/bin/sh +# Handle Thinkpad Ultrabay hotswap + +# TODO: /sys/devices/platform/bay* may also work +# TODO: must check that libata is used for the bay! -+if ! ( egrep -sq 'status:.+occupied' /proc/acpi/ibm/bay && egrep -sq 'commands:.+eject' /proc/acpi/ibm/bay ) ; then ++if ! ( egrep -sq 'status:.+occupied' /proc/acpi/ibm/bay && egrep -sq +'commands:.+eject' /proc/acpi/ibm/bay ) ; then + exit 1; +fi + @@ -320,9 +399,11 @@ diff -urN orig/acpi-support-0.102/thinkpad-ultrabay-eject.sh work/acpi-support-0 + $major_minor =~ m/^(\d+):(\d+)$/ or die; + push(@tgt_rdevs, ($1<<8)|$2); + } -+ # Sort by reverse length of mount point, to unmount sub-directories first ++ # Sort by reverse length of mount point, to unmount +sub-directories first + open MOUNTS,"</proc/mounts" or die "$!"; -+ @mounts=sort { length($b->[1]) <=> length($a->[1]) } map { [ split ] } <MOUNTS>; ++ @mounts=sort { length($b->[1]) <=> length($a->[1]) } map { [ +split ] } <MOUNTS>; + close MOUNTS; + foreach $m (@mounts) { + ($dev,$dir)=@$m; @@ -368,9 +449,12 @@ diff -urN orig/acpi-support-0.102/thinkpad-ultrabay-eject.sh work/acpi-support-0 +fi +# Tell the user we're OK +echo 12 > /proc/acpi/ibm/beep -diff -urN orig/acpi-support-0.102/thinkpad-ultrabay-insert.sh work/acpi-support-0.102/thinkpad-ultrabay-insert.sh ---- orig/acpi-support-0.102/thinkpad-ultrabay-insert.sh 1969-12-31 19:00:00.000000000 -0500 -+++ work/acpi-support-0.102/thinkpad-ultrabay-insert.sh 2007-11-09 10:47:47.000000000 -0500 +diff -urN orig/acpi-support-0.102/thinkpad-ultrabay-insert.sh +work/acpi-support-0.102/thinkpad-ultrabay-insert.sh +--- orig/acpi-support-0.102/thinkpad-ultrabay-insert.sh 1969-12-31 +19:00:00.000000000 -0500 ++++ work/acpi-support-0.102/thinkpad-ultrabay-insert.sh 2007-11-09 +10:47:47.000000000 -0500 @@ -0,0 +1,15 @@ +#!/bin/sh +# Handle Thinkpad Ultrabay hotswap @@ -385,11 +469,16 @@ diff -urN orig/acpi-support-0.102/thinkpad-ultrabay-insert.sh work/acpi-support- + +echo 0 0 0 > /sys/class/scsi_host/host1/scan + -+# The beep is necessary as confirmation of success. Instead of the beep, need to configure a messaging system, e.g. using kdialog or gnome equivalent or xosd ++# The beep is necessary as confirmation of success. Instead of the +beep, need to configure a messaging system, e.g. using kdialog or gnome +equivalent or xosd +echo 12 > /proc/acpi/ibm/beep -diff -urN orig/acpi-support-0.102/vbesave work/acpi-support-0.102/vbesave ---- orig/acpi-support-0.102/vbesave 2006-05-03 16:31:51.000000000 -0400 -+++ work/acpi-support-0.102/vbesave 2007-11-09 10:47:47.000000000 -0500 +diff -urN orig/acpi-support-0.102/vbesave +work/acpi-support-0.102/vbesave +--- orig/acpi-support-0.102/vbesave 2006-05-03 16:31:51.000000000 +-0400 ++++ work/acpi-support-0.102/vbesave 2007-11-09 10:47:47.000000000 +-0500 @@ -3,8 +3,6 @@ test -x /usr/sbin/vbetool || exit 0 set -e @@ -398,7 +487,8 @@ diff -urN orig/acpi-support-0.102/vbesave work/acpi-support-0.102/vbesave - test -f /etc/default/rcS && . /etc/default/rcS test -f /etc/default/acpi-support && . /etc/default/acpi-support - test -f /usr/share/acpi-support/device-funcs && . /usr/share/acpi-support/device-funcs + test -f /usr/share/acpi-support/device-funcs && . +/usr/share/acpi-support/device-funcs @@ -20,20 +18,16 @@ fi |