diff -Nru hibernate-1.99/blacklisted-modules hibernate-2.0+15+g88d54a8/blacklisted-modules --- hibernate-1.99/blacklisted-modules 2008-05-01 11:59:58.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/blacklisted-modules 2010-06-03 05:50:32.000000000 +0000 @@ -18,11 +18,10 @@ # Unversioned modules (modules with no version: line shown in modinfo) are # always unloaded if listed, regardless of the version range. # -# This format has some limitations - it does not take into account Software -# Suspend 2 versions (which may include driver updates). +# This format has some limitations - it does not take into account +# TuxOnIce versions (which may include driver updates). # -nvidia acx100 acx_pci hsfmodem @@ -42,9 +41,9 @@ ehci-hcd 2.4.0 2.4.99 usb-ohci 2.4.0 2.4.99 usb-uhci 2.4.0 2.4.99 -snd_ens1370 2.6.0 2.6.99 -snd_ens1371 2.6.0 2.6.99 -snd_maestro3 2.6.0 2.6.99 +snd_ens1370 2.6.0 2.6.19 +snd_ens1371 2.6.0 2.6.19 +snd_maestro3 2.6.0 2.6.19 @snd_bt_sco 0.0 1.18 en1370 2.6.0 2.6.99 en1371 2.6.0 2.6.99 @@ -59,6 +58,8 @@ @ndiswrapper 0.10 0.11 +nvidia 0.0 2.6.25 + # #383169 ath_pci @@ -66,10 +67,18 @@ ipw3945 # suggested by Jan Ondrej. -iwl3945 -mac80211 +iwl3945 2.6.0 2.6.27 +mac80211 2.6.0 2.6.27 sky2 #uvcvideo has a bug which I'm working to find at the moment #It will sometimes cause an oops at atomic copy time. uvcvideo + +# Suggested by Miklos Aubert 5/2/2009 AEST - TuxOnIce users. +snd_ice1712 + +# Suggested by Vladimir Skuratovich - TuxOnIce users, 26/3/2009 AEST. +firewire-core +firewire-sbp2 +firewire-ohci diff -Nru hibernate-1.99/CHANGELOG hibernate-2.0+15+g88d54a8/CHANGELOG --- hibernate-1.99/CHANGELOG 2008-05-01 11:59:59.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/CHANGELOG 2010-06-03 05:50:32.000000000 +0000 @@ -1,3 +1,30 @@ +Unreleased + - Change default compressor to lzo (applies to TuxOnIce 3.0.1 and later) + - Remove executable state from virtualbox scriptlet. + +2.0 + - Change remaining "Software Suspend", "Software Suspend 2" and suspend2 + references to TuxOnIce. + - Redirect stderr to /dev/null when resetting the cpu scaling speed. + - Fix errors of the type sh: arithmetic expression: expecting primary: "5&1", + which occured at resume time. sh likes whitespace around operators, it seems. + - Remove NVidia from blacklist as of 2.6.25 kernels (seems to be about the time + when it became usable). + - Blacklist snd_ice1712. + - Rename suspend2 files to tuxonice. + - Apply Archlinux patch for KDE4 locking from + http://repos.archlinux.org/viewvc.cgi/hibernate-script/repos/extra-i686/add-freedesktop.org-locking.patch?view=markup + - Add VirtualBox scriptlet from bug 394 + - Apply fix from bug 245, so amarok's use of xmms plugins doesn't make the + hibernate script think xmms is running. + - Modify HIBERNATE_FILEWRITER_TRAIL in init.d/hibernate-cleanup.sh to + match scriptlets.d/tuxonice. + - Add support for locking Enlightenment 17, from bug 400. + - Unblacklist iwl3945 and the mac80211 modules, post 2.6.27. + - Add pidgin script from bug 322. + - Add DirectIsa option for clock scriptlet. + - Bump version to 2.0. + 1.99 (1 May 2008) - Complete support for the new binary signature - Blacklist uvcvideo for now. Causes an oops at atomic copy under some diff -Nru hibernate-1.99/common.conf hibernate-2.0+15+g88d54a8/common.conf --- hibernate-1.99/common.conf 2008-05-01 11:59:58.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/common.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,153 +0,0 @@ -# Configuration options common for suspending to disk or RAM. -# Options are not case sensitive. -# -# See hibernate.conf(5) for help on the configuration items. - -############################################################################## -### Some global settings -############################################################################## - -Verbosity 0 -LogFile /var/log/hibernate.log -LogVerbosity 1 -# LogTimestamp yes -# AlwaysForce yes -# AlwaysKill yes -# HibernateVT 15 -# Distribution debian (or fedora/gentoo/mandrake/redhat/slackware/suse) -# XDisplay :0 - -############################################################################## -### Scriptlets -### Scriptlets provide support for doing all sorts of things before and after -### suspending. The defaults settings here should work for most people, but -### you may wish to edit these to taste. Consult "hibernate -h" for help on -### the configuration settings. -############################################################################## - -### bootsplash -## If you use bootsplash, also enabling SwitchToTextMode is recommended if -## you use X, otherwise you may end up with a garbled X display. -# Bootsplash on -# BootsplashConfig /etc/bootsplash/default/config/bootsplash-1024x768.cfg - -### clock -SaveClock restore-only - -### devices -# IncompatibleDevices /dev/dsp /dev/video* - -### diskcache -# DisableWriteCacheOn /dev/hda - -### fbsplash (enable SwitchToTextMode if you use this) -# FBSplash on -# FBSplashTheme suspend2 - -### filesystems -# Unmount /nfsshare /windows /mnt/sambaserver -# UnmountFSTypes smbfs nfs -# UnmountGraceTime 1 -# Mount /windows - -### grub -# ChangeGrubMenu yes -# GrubMenuFile /boot/grub/menu.lst -# AlternateGrubMenuFile /boot/grub/menu-suspended.lst -# BackupGrubMenuFile /boot/grub/menu.lst.hibernate.bak - -# see http://bugs.debian.org/317479 -# RemountXFSBoot yes - -### hardware_tweaks -# IbmAcpi yes -# RadeonTool yes -# Runi915resolution yes -# FullSpeedCPU yes - -### lilo -# EnsureLILOResumes yes - -### lock (generally you only want one of the following options) -## For console you need vlock available. -## For x you need xscreensaver-command-command available. -## For gnome you need gnome-screensaver-command available. -## For kde you need dcop, kscreensaver available. -## For XAuto you need xautolock available. -## For Xtr you need xtrlock available. -# LockConsoleAs root -# LockXScreenSaver yes -# LockGnomeScreenSaver yes -# LockKDE yes -# LockXLock yes -# LockXAutoLock yes -# LockXtrLock yes - -### misclaunch -# OnSuspend 20 echo "Good night!" -# OnResume 20 echo "Good morning!" - -### modules -# UnloadModules snd_via82cxxx usb-ohci -# UnloadAllModules yes -UnloadBlacklistedModules yes -LoadModules auto -# LoadModulesFromFile /etc/modules - -### modules-gentoo -# GentooModulesAutoload yes - -### network -# DownInterfaces eth0 -# UpInterfaces auto - -### networkmanager -# EnableNMReconnect yes - -### pause_audio -# MuteAudio yes -# PauseAudio yes - -### pcmcia -# EjectCards yes - -### programs -# IncompatiblePrograms xmms - -### services -# RestartServices laptop_mode anacron -# StopServices alsasound -# StartServices aumix - -### vbetool -# EnableVbetool yes -# RestoreVbeStateFrom /var/lib/vbetool/vbestate -# VbetoolPost yes -# RestoreVCSAData yes - -### xhacks -SwitchToTextMode yes -# UseDummyXServer yes -# DummyXServerConfig xorg-dummy.conf - -### xstatus -## This can be set to gnome, kde or x: -## For gnome you need zenity available. -## For kde you need dcop, kstart, kdialog available. -## For x you need to have xosd OR xmessage available. -# XStatus gnome -# XmessageDisable yes -# XSuspendText Preparing to suspend... -# XResumeText Resuming from suspend... -## When using XStatus x, and you have xosd installed: -# XosdSettings --font '-misc-fixed-medium-r-semicondensed--*-120-*-*-c-*-*-*' --colour=Green --shadow 1 --pos bottom --align center --offset 50 - -### xbacklight -# BackLight yes - -### gaim -## You need to have dbus, gaim_remote available. -# LogoutGaim yes -# GaimRestoreStatus yes -# GaimLogoutMessage Hibernating -# GaimLoginMessage Back from hibernation diff -Nru hibernate-1.99/conf/common.conf hibernate-2.0+15+g88d54a8/conf/common.conf --- hibernate-1.99/conf/common.conf 1970-01-01 00:00:00.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/conf/common.conf 2010-06-03 05:50:32.000000000 +0000 @@ -0,0 +1,172 @@ +# Configuration options common for suspending to disk or RAM. +# Options are not case sensitive. +# +# See hibernate.conf(5) for help on the configuration items. + +############################################################################## +### Some global settings +############################################################################## + +Verbosity 0 +LogFile /var/log/hibernate.log +LogVerbosity 1 +# LogTimestamp yes +# AlwaysForce yes +# AlwaysKill yes +# HibernateVT 15 +# Distribution debian (or fedora/gentoo/mandrake/redhat/slackware/suse) +# XDisplay :0 + +############################################################################## +### Scriptlets +### Scriptlets provide support for doing all sorts of things before and after +### suspending. The defaults settings here should work for most people, but +### you may wish to edit these to taste. Consult "hibernate -h" for help on +### the configuration settings. +############################################################################## + +### bootsplash +## If you use bootsplash, also enabling SwitchToTextMode is recommended if +## you use X, otherwise you may end up with a garbled X display. +# Bootsplash on +# BootsplashConfig /etc/bootsplash/default/config/bootsplash-1024x768.cfg + +### clock +SaveClock restore-only +#DirectIsa + +### devices +# IncompatibleDevices /dev/dsp /dev/video* + +### diskcache +# DisableWriteCacheOn /dev/hda + +### fbsplash (enable SwitchToTextMode if you use this) +# FBSplash on +# FBSplashTheme tuxonice + +### filesystems +# Unmount /nfsshare /windows /mnt/sambaserver +# UnmountFSTypes smbfs nfs +# UnmountGraceTime 1 +# Mount /windows + +### grub +# ChangeGrubMenu yes +# GrubMenuFile /boot/grub/menu.lst +# AlternateGrubMenuFile /boot/grub/menu-suspended.lst +# BackupGrubMenuFile /boot/grub/menu.lst.hibernate.bak + +# see http://bugs.debian.org/317479 +# RemountXFSBoot yes + +### hardware_tweaks +# IbmAcpi yes +# RadeonTool yes +# Runi915resolution yes +# FullSpeedCPU yes + +### lilo +# EnsureLILOResumes yes + +### lock (generally you only want one of the following options) +## For console you need vlock available. +## For x you need xscreensaver-command-command available. +## For gnome you need gnome-screensaver-command available. +## For kde you need dcop, kscreensaver available. +## For XAuto you need xautolock available. +## For Xtr you need xtrlock available. +## For Freedesktop (for example KDE4) you need dbus-send available +# LockConsoleAs root +# LockXScreenSaver yes +# LockGnomeScreenSaver yes +# LockFreedesktop +# LockKDE yes +# LockXLock yes +# LockXAutoLock yes +# LockXtrLock yes + +### misclaunch +# OnSuspend 20 echo "Good night!" +# OnResume 20 echo "Good morning!" + +### modules +# UnloadModules snd_via82cxxx usb-ohci +# UnloadAllModules yes +UnloadBlacklistedModules yes +LoadModules auto +# LoadModulesFromFile /etc/modules + +### modules-gentoo +# GentooModulesAutoload yes + +### network +# DownInterfaces eth0 +# UpInterfaces auto + +### networkmanager +# EnableNMReconnect yes + +### wicd +# EnableWICDReconnect yes + +### pause_audio +# MuteAudio yes +# PauseAudio yes + +### pcmcia +# EjectCards yes + +### programs +# IncompatiblePrograms xmms + +### services +# RestartServices laptop_mode anacron +# StopServices alsasound +# StartServices aumix + +### vbetool +# EnableVbetool yes +# RestoreVbeStateFrom /var/lib/vbetool/vbestate +# VbetoolPost yes +# RestoreVCSAData yes + +### xhacks +SwitchToTextMode yes +# UseDummyXServer yes +# DummyXServerConfig xorg-dummy.conf + +### xstatus +## This can be set to gnome, kde or x: +## For gnome you need zenity available. +## For kde you need dcop, kstart, kdialog available. +## For x you need to have xosd OR xmessage available. +# XStatus gnome +# XmessageDisable yes +# XSuspendText Preparing to suspend... +# XResumeText Resuming from suspend... +## When using XStatus x, and you have xosd installed: +# XosdSettings --font '-misc-fixed-medium-r-semicondensed--*-120-*-*-c-*-*-*' --colour=Green --shadow 1 --pos bottom --align center --offset 50 + +### xbacklight +# BackLight yes + +### gaim +## You need to have dbus, gaim_remote available. +# LogoutGaim yes +# GaimRestoreStatus yes +# GaimLogoutMessage Hibernating +# GaimLoginMessage Back from hibernation + +### pidgin +# LogoutPidgin yes +# PidginRestoreStatus yes +# PidginLogoutMessage Hibernating - bye! +# PidginLoginMessage I'm back! + +### SSH and PGP keys +# AgentsClearGPG yes +# AgentsClearSSH yes + +### Virtualbox +# SuspendVirtualbox yes diff -Nru hibernate-1.99/conf/disk.conf hibernate-2.0+15+g88d54a8/conf/disk.conf --- hibernate-1.99/conf/disk.conf 1970-01-01 00:00:00.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/conf/disk.conf 2010-06-03 05:50:32.000000000 +0000 @@ -0,0 +1,8 @@ +# This file is used when suspending to disk. Use the *-disk.conf files to add +# configuration options, or add them before the TryMethod lines in this file. +# Options are not case-sensitive. +# +# See hibernate.conf(5) for help on the configuration items. + +TryMethod ususpend-disk.conf +TryMethod sysfs-disk.conf diff -Nru hibernate-1.99/conf/hibernate.conf hibernate-2.0+15+g88d54a8/conf/hibernate.conf --- hibernate-1.99/conf/hibernate.conf 1970-01-01 00:00:00.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/conf/hibernate.conf 2010-06-03 05:50:32.000000000 +0000 @@ -0,0 +1,15 @@ +# hibernate.conf is split into separate configuration files. +# +# Each file is tried in the order below, until an available suspend +# method is found. +# +# Options specific to a particular suspend method should be placed in the +# appropriate configuration file (tuxonice.conf, ususpend.conf, disk.conf +# or ram.conf). +# Options common to all suspend methods should be placed in common.conf. +# +# See hibernate.conf(5) for help on the configuration items. + +TryMethod tuxonice.conf +TryMethod disk.conf +TryMethod ram.conf diff -Nru hibernate-1.99/conf/ram.conf hibernate-2.0+15+g88d54a8/conf/ram.conf --- hibernate-1.99/conf/ram.conf 1970-01-01 00:00:00.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/conf/ram.conf 2010-06-03 05:50:32.000000000 +0000 @@ -0,0 +1,26 @@ +# This file is used when suspending to RAM. Use the *-ram.conf files to add +# configuration options, or add them before the TryMethod lines in this file. +# Options are not case-sensitive. +# +# See hibernate.conf(5) for help on the configuration items. + +# save to both, RAM and disk +# (disabled by default, since it takes longer) +# TryMethod ususpend-both.conf + +TryMethod ususpend-ram.conf +TryMethod sysfs-ram.conf + +# The following vbetool settings help with a number of laptops +# EnableVbetool yes +# VbetoolPost yes + +# Users with a Radeon graphics card may need to enable this line for +# suspend-to-ram, and install the radeontool program available from +# http://fdd.com/software/radeon/ or your distribution's package. +# +# RadeonTool yes + +# The following is needed for most old BIOS laptops +# AcpiVideoS3Bios yes +# AcpiVideoS3Mode yes diff -Nru hibernate-1.99/conf/sysfs-disk.conf hibernate-2.0+15+g88d54a8/conf/sysfs-disk.conf --- hibernate-1.99/conf/sysfs-disk.conf 1970-01-01 00:00:00.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/conf/sysfs-disk.conf 2010-06-03 05:50:32.000000000 +0000 @@ -0,0 +1,9 @@ +# This file is used when suspending to disk using the swsusp functionality in +# the vanilla kernel. Add any configuration options specific to suspend-to-disk +# to this file. Ordering is not crucial, and options are not case-sensitive. +# +# See hibernate.conf(5) for help on the configuration items. + +UseSysfsPowerState disk + +Include common.conf diff -Nru hibernate-1.99/conf/sysfs-ram.conf hibernate-2.0+15+g88d54a8/conf/sysfs-ram.conf --- hibernate-1.99/conf/sysfs-ram.conf 1970-01-01 00:00:00.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/conf/sysfs-ram.conf 2010-06-03 05:50:32.000000000 +0000 @@ -0,0 +1,9 @@ +# This file is used when suspending to RAM. Add any configuration options +# specific to suspend-to-RAM to this file. Ordering is not crucial, and options +# are not case-sensitive. +# +# See hibernate.conf(5) for help on the configuration items. + +UseSysfsPowerState mem + +Include common.conf diff -Nru hibernate-1.99/conf/tuxonice.conf hibernate-2.0+15+g88d54a8/conf/tuxonice.conf --- hibernate-1.99/conf/tuxonice.conf 1970-01-01 00:00:00.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/conf/tuxonice.conf 2010-06-03 05:50:32.000000000 +0000 @@ -0,0 +1,45 @@ +# Example tuxonice.conf file. +# +# See hibernate.conf(5) for help on the configuration items. +# +# NOTE: TuxOnIce is an improved version of suspend-to-disk which currently +# requires patching your kernel. For more information, see www.tuxonice.net +# +# If you do not wish to patch your kernel but still be able to suspend to +# disk, see disk.conf instead. + +### TuxOnIce +UseTuxOnIce yes +Reboot no +EnableEscape yes +DefaultConsoleLevel 1 +Compressor lzo +Encryptor none +# ImageSizeLimit 200 + +## useful for initrd usage: +# SuspendDevice swap:/dev/hda2 + +## Powerdown method - 3 for suspend-to-RAM, 4 for ACPI S4 sleep, 5 for poweroff +# PowerdownMethod 5 + +## Any other /proc/software_suspend setting can be set like so: +# ProcSetting expected_compression 50 + +## Or traditionally like this: +# TuxOnIceAllSettings 0 0 2056 65535 5 + +## Or even from the results of hibernate --save-settings with this: +# TuxOnIceAllSettingsFile /etc/hibernate/suspend-settings.conf + +## For filewriter: +# FilewriterLocation /suspend_file 1000 +# VerifyFilewriterResume2 yes + +## Specify a userui like this: +# ProcSetting userui_program /usr/local/sbin/tuxoniceui_text + +# Scale CPU to full speed to make sure we suspend as fast as possible. +FullSpeedCPU yes + +Include common.conf diff -Nru hibernate-1.99/conf/ususpend-both.conf hibernate-2.0+15+g88d54a8/conf/ususpend-both.conf --- hibernate-1.99/conf/ususpend-both.conf 1970-01-01 00:00:00.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/conf/ususpend-both.conf 2010-06-03 05:50:32.000000000 +0000 @@ -0,0 +1,12 @@ +# This file is used when suspending to RAM and disk using the uswsusp +# functionality in the kernel. You will require the s2disk binary to be +# installed - this can be downloaded from http://suspend.sourceforge.net/ . On +# Debian systems, just install the uswsusp package. +# Add any configuration options specific to ususpend to this file. Ordering is +# not crucial, and options are not case-sensitive. +# +# See hibernate.conf(5) for help on the configuration items. + +USuspendMethod both + +Include common.conf diff -Nru hibernate-1.99/conf/ususpend-disk.conf hibernate-2.0+15+g88d54a8/conf/ususpend-disk.conf --- hibernate-1.99/conf/ususpend-disk.conf 1970-01-01 00:00:00.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/conf/ususpend-disk.conf 2010-06-03 05:50:32.000000000 +0000 @@ -0,0 +1,12 @@ +# This file is used when suspending to disk using the uswsusp functionality in +# the kernel. You will require the s2disk binary to be installed - this can be +# downloaded from http://suspend.sourceforge.net/ . On Debian systems, just +# install the uswsusp package. +# Add any configuration options specific to ususpend to this file. Ordering is +# not crucial, and options are not case-sensitive. +# +# See hibernate.conf(5) for help on the configuration items. + +USuspendMethod disk + +Include common.conf diff -Nru hibernate-1.99/conf/ususpend-ram.conf hibernate-2.0+15+g88d54a8/conf/ususpend-ram.conf --- hibernate-1.99/conf/ususpend-ram.conf 1970-01-01 00:00:00.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/conf/ususpend-ram.conf 2010-06-03 05:50:32.000000000 +0000 @@ -0,0 +1,41 @@ +# This file is used when suspending to RAM using the uswsusp functionality in +# the kernel. You will require the s2disk binary to be installed - this can be +# downloaded from http://suspend.sourceforge.net/ . On Debian systems, just +# install the uswsusp package. +# Add any configuration options specific to ususpend to this file. Ordering is +# not crucial, and options are not case-sensitive. +# +# See hibernate.conf(5) for help on the configuration items. + +USuspendMethod ram + +## if needed, pass the -f option to s2ram +# USuspendRamForce yes + +## if s2ram is unsure, let it use system-specific options instead of having to +## force it. +# USuspendRamUnsureOk yes + +## if needed, pass the -m option to s2ram +## (-m should be used instead of -s, if possible; see +## https://bugzilla.novell.com/show_bug.cgi?id=229603) +# USuspendRamVbeMode yes + +## if needed, pass the -s option to s2ram +## (if possible, prefer -m to -s; see above) +# USuspendRamVbeSave yes + +## if needed, pass the -p option to s2ram +# USuspendRamVbePost yes + +## if needed, pass the -a option to s2ram +## (Intel users see: http://en.opensuse.org/S2ram#Intel_Graphics_Chipsets) +# USuspendRamAcpiSleep 3 + +## if needed, pass the -v option to s2ram +# USuspendRamPciSave yes + +## if needed, pass the -r option to s2ram +# USuspendRamRadeontool yes + +Include common.conf diff -Nru hibernate-1.99/debian/bugscript hibernate-2.0+15+g88d54a8/debian/bugscript --- hibernate-1.99/debian/bugscript 2016-01-10 23:38:14.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/bugscript 2016-01-10 23:36:03.000000000 +0000 @@ -32,7 +32,7 @@ case "$L" in 0|1|2) cat <<-_eof - Your hibernate LogVerbosity is set to $L. If would be of great + Your hibernate LogVerbosity is set to $L. It would be of great help if you could bump that up to 3, rerun hibernate to reproduce the bug, and then fire up reportbug. You may also wish to set the verbosity to 4 and submit a URL to your /var/log/hibernate.log in diff -Nru hibernate-1.99/debian/bzr-builder.manifest hibernate-2.0+15+g88d54a8/debian/bzr-builder.manifest --- hibernate-1.99/debian/bzr-builder.manifest 1970-01-01 00:00:00.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/bzr-builder.manifest 2016-01-10 23:36:04.000000000 +0000 @@ -0,0 +1,2 @@ +# bzr-builder format 0.3 deb-version {debupstream}-1~15 +lp:ubuntu/trusty/hibernate revid:package-import@ubuntu.com-20120502235316-tu8q8dt87466lhll diff -Nru hibernate-1.99/debian/changelog hibernate-2.0+15+g88d54a8/debian/changelog --- hibernate-1.99/debian/changelog 2016-01-10 23:38:14.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/changelog 2016-01-10 23:36:04.000000000 +0000 @@ -1,3 +1,41 @@ +hibernate (2.0+15+g88d54a8-1~15~ubuntu12.04.1) precise; urgency=low + + * Auto build. + + -- Martin Schläffer Sun, 10 Jan 2016 23:36:04 +0000 + +hibernate (2.0+15+g88d54a8-1) unstable; urgency=low + + [ martin f. krafft ] + * New upstream release (Closes: #491071, #532124, #555410). + + [ Andrey Rahmatullin ] + * Adopt the package (Closes: #651194). + * Bump Standards-Version to 3.9.3. + * Switch to source package format 3.0 (quilt). + * Switch to debhelper v9. + * Switch to dh(1). + * Change Priority to optional. + * Fix a typo in debian/bugscript (Closes: #531290). + * Remove Conflicts/Replaces on suspend-script. + * Add an md5sums control file. + * Use the Debian path to the userui program in the config (Closes: #492392). + * Do not install the initscript, it needs rewriting (Closes: #363004) + * Add Homepage. + * Update Description. + * Fix some manpage issues (Closes: #473530, #664830, #668978). + * Replace 2.6.99 with 3.99.0 as a "maximum possible" version in + blacklist-modules. + * Fix the license file name in debian/copyright. + * Fix option names for s2ram and apply s2ram options to s2both + (Closes: #505410). + * Update the default GRUB config name for GRUB2 (Closes: #512112). + * Move sh options from the shebang to the maintscript body. + * Remove outdated README.Debian (Closes: #495145). + * Drop the optional dependency on console-tools (Closes: #671081). + + -- Andrey Rahmatullin Wed, 02 May 2012 23:53:16 +0600 + hibernate (1.99-1.1) unstable; urgency=low * Non-maintainer upload. diff -Nru hibernate-1.99/debian/compat hibernate-2.0+15+g88d54a8/debian/compat --- hibernate-1.99/debian/compat 2016-01-10 23:38:14.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/compat 2016-01-10 23:36:03.000000000 +0000 @@ -1 +1 @@ -6 +9 diff -Nru hibernate-1.99/debian/control hibernate-2.0+15+g88d54a8/debian/control --- hibernate-1.99/debian/control 2016-01-10 23:38:14.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/control 2016-01-10 23:36:03.000000000 +0000 @@ -1,20 +1,20 @@ Source: hibernate Section: utils -Priority: extra -Maintainer: martin f. krafft -Uploaders: Cameron Patrick -Build-Depends: debhelper (>> 6), dpatch -Standards-Version: 3.7.3 +Priority: optional +Maintainer: Andrey Rahmatullin +Uploaders: martin f. krafft , Cameron Patrick +Build-Depends: debhelper (>= 9) +Standards-Version: 3.9.3 +Homepage: http://tuxonice.net/ Vcs-Git: git://git.debian.org/collab-maint/hibernate.git Vcs-Browser: http://git.debian.org/?p=collab-maint/hibernate.git Package: hibernate Architecture: all -Depends: console-tools | kbd +Pre-Depends: ${misc:Pre-Depends} +Depends: ${misc:Depends}, kbd Recommends: dash, hdparm, vbetool, uswsusp Suggests: 915resolution, xscreensaver | kscreensaver | gnome-screensaver | xlock | vlock -Conflicts: suspend-script (<= 0.94-1) -Replaces: suspend-script (<= 0.94-1) Description: smartly puts your computer to sleep (suspend to RAM or disk) The hibernate script helps you in putting your computer to sleep, using one of the various methods available in the kernel. @@ -27,4 +27,4 @@ . Currently the script supports all suspend mechanisms available through the /sys/power/state interface (including ACPI suspend and the in-kernel software - suspend), as well as Software Suspend 2 (http://www.suspend2.net) + suspend), as well as TuxOnIce. diff -Nru hibernate-1.99/debian/copyright hibernate-2.0+15+g88d54a8/debian/copyright --- hibernate-1.99/debian/copyright 2016-01-10 23:38:14.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/copyright 2016-01-10 23:36:03.000000000 +0000 @@ -17,4 +17,4 @@ (at your option) any later version. On Debian GNU/Linux systems, the complete text of the GNU General -Public License can be found in '/usr/share/common-licenses/GPL'. +Public License can be found in '/usr/share/common-licenses/GPL-2'. diff -Nru hibernate-1.99/debian/gbp.conf hibernate-2.0+15+g88d54a8/debian/gbp.conf --- hibernate-1.99/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/gbp.conf 2016-01-10 23:36:03.000000000 +0000 @@ -0,0 +1,2 @@ +[DEFAULT] +pristine-tar = True diff -Nru hibernate-1.99/debian/hibernate.dirs hibernate-2.0+15+g88d54a8/debian/hibernate.dirs --- hibernate-1.99/debian/hibernate.dirs 2016-01-10 23:38:14.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/hibernate.dirs 2016-01-10 23:36:03.000000000 +0000 @@ -1,3 +1,4 @@ etc/logrotate.d etc/hibernate/scriptlets.d +usr/sbin usr/share/bug/hibernate diff -Nru hibernate-1.99/debian/hibernate.install hibernate-2.0+15+g88d54a8/debian/hibernate.install --- hibernate-1.99/debian/hibernate.install 2016-01-10 23:38:14.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/hibernate.install 2016-01-10 23:36:03.000000000 +0000 @@ -1,13 +1,12 @@ -hibernate /usr/sbin/ -hibernate.conf /etc/hibernate/ -ram.conf /etc/hibernate/ -disk.conf /etc/hibernate/ -suspend2.conf /etc/hibernate/ -sysfs-ram.conf /etc/hibernate/ -sysfs-disk.conf /etc/hibernate/ -ususpend-ram.conf /etc/hibernate/ -ususpend-disk.conf /etc/hibernate/ -ususpend-both.conf /etc/hibernate/ -common.conf /etc/hibernate/ +conf/hibernate.conf /etc/hibernate/ +conf/ram.conf /etc/hibernate/ +conf/disk.conf /etc/hibernate/ +conf/tuxonice.conf /etc/hibernate/ +conf/sysfs-ram.conf /etc/hibernate/ +conf/sysfs-disk.conf /etc/hibernate/ +conf/ususpend-ram.conf /etc/hibernate/ +conf/ususpend-disk.conf /etc/hibernate/ +conf/ususpend-both.conf /etc/hibernate/ +conf/common.conf /etc/hibernate/ blacklisted-modules /etc/hibernate/ scriptlets.d/ /usr/share/hibernate/ diff -Nru hibernate-1.99/debian/hibernate.maintscript hibernate-2.0+15+g88d54a8/debian/hibernate.maintscript --- hibernate-1.99/debian/hibernate.maintscript 1970-01-01 00:00:00.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/hibernate.maintscript 2016-01-10 23:36:03.000000000 +0000 @@ -0,0 +1,2 @@ +mv_conffile /etc/hibernate/suspend2.conf /etc/hibernate/tuxonice.conf 1.99-1.1 +rm_conffile /etc/init.d/hibernate 1.99-1.1 diff -Nru hibernate-1.99/debian/hibernate.postinst hibernate-2.0+15+g88d54a8/debian/hibernate.postinst --- hibernate-1.99/debian/hibernate.postinst 2016-01-10 23:38:14.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/hibernate.postinst 2016-01-10 23:36:03.000000000 +0000 @@ -1,4 +1,4 @@ -#!/bin/sh -eu +#!/bin/sh # # Post-install script for Debian hibernate package # @@ -11,6 +11,9 @@ # $Id$ # +set -e +set -u + if [ "${1:-}" = configure ]; then mkdir --parent /usr/local/share/hibernate/scriptlets.d || : fi diff -Nru hibernate-1.99/debian/hibernate.prerm hibernate-2.0+15+g88d54a8/debian/hibernate.prerm --- hibernate-1.99/debian/hibernate.prerm 2016-01-10 23:38:14.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/hibernate.prerm 2016-01-10 23:36:03.000000000 +0000 @@ -1,4 +1,4 @@ -#! /bin/sh -eu +#!/bin/sh # # Pre-removal hook script for hibernate # @@ -11,6 +11,9 @@ # $Id$ # +set -e +set -u + if [ "${1:-}" = remove ]; then rmdir --ignore-fail-on-non-empty --parents \ /usr/local/share/hibernate/scriptlets.d 2>/dev/null || : diff -Nru hibernate-1.99/debian/NEWS hibernate-2.0+15+g88d54a8/debian/NEWS --- hibernate-1.99/debian/NEWS 2016-01-10 23:38:14.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/NEWS 2016-01-10 23:36:03.000000000 +0000 @@ -1,4 +1,4 @@ -hibernate (1.90-1) unstable; urgency=low +hibernate (1.91-1) unstable; urgency=low This version of hibernate introduces significant changes to the configuration file structure. Previously, /etc/hibernate/hibernate.conf was diff -Nru hibernate-1.99/debian/patches/00list hibernate-2.0+15+g88d54a8/debian/patches/00list --- hibernate-1.99/debian/patches/00list 2016-01-10 23:38:14.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/patches/00list 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -10-grub-backup -50-init.d-lsb-depends -70-laptop-mode-rename -80-log-permissions -99-store-ifdown-auto diff -Nru hibernate-1.99/debian/patches/10-grub-backup.dpatch hibernate-2.0+15+g88d54a8/debian/patches/10-grub-backup.dpatch --- hibernate-1.99/debian/patches/10-grub-backup.dpatch 2016-01-10 23:38:14.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/patches/10-grub-backup.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,63 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 10-grub-backup.dpatch by martin f. krafft -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Moves the grub menu.lst backup file to /var/backups . - -@DPATCH@ -diff -urNad upstream.trunk~/common.conf upstream.trunk/common.conf ---- upstream.trunk~/common.conf 2006-09-13 15:17:41.000000000 +0200 -+++ upstream.trunk/common.conf 2006-09-13 15:17:52.000000000 +0200 -@@ -54,7 +54,7 @@ - # ChangeGrubMenu yes - # GrubMenuFile /boot/grub/menu.lst - # AlternateGrubMenuFile /boot/grub/menu-suspended.lst --# BackupGrubMenuFile /boot/grub/menu.lst.hibernate.bak -+# BackupGrubMenuFile /var/backups/grub.conf.hibernate - - ### hardware_tweaks - # IbmAcpi yes -diff -urNad upstream.trunk~/scriptlets.d/grub upstream.trunk/scriptlets.d/grub ---- upstream.trunk~/scriptlets.d/grub 2006-09-13 15:16:38.000000000 +0200 -+++ upstream.trunk/scriptlets.d/grub 2006-09-13 15:17:44.000000000 +0200 -@@ -1,18 +1,20 @@ - # -*- sh -*- - # vim:ft=sh:ts=8:sw=4:noet - -+GRUB_MENU_DFLT_BACKUP_FILE="/var/backups/grub.conf.hibernate" -+ - AddConfigHandler GrubConfigOptions - AddConfigHelp "ChangeGrubMenu " "Change grub's config file to show system is suspended before suspending and restore after resume." - AddConfigHelp "GrubMenuFile " "Filename of grub's config file. Default is /boot/grub/grub.conf." - AddConfigHelp "AlternateGrubMenuFile " "Filename of the grub config file to put in place when the machine is suspended. If this is not specified, the script will add a small header to the existing grub menu." --AddConfigHelp "BackupGrubMenuFile " "Where to keep a backup of your real grub menu file. Defaults to the current grub menu file with '.hibernate.bak' appended." -+AddConfigHelp "BackupGrubMenuFile " "Where to keep a backup of your real grub menu file. Defaults to ${GRUB_MENU_DFLT_BACKUP_FILE}." - - AddOptionHandler GrubCmdlineOptions - AddShortOption 'g' - AddLongOption 'restore-grub' - AddOptionHelp '-g, --restore-grub' 'Restores the grub menu to normal (use if a resume was not completed sucessfully) and exits the script. A suspend is not performed.' - --GRUB_MENU_FILE="/boot/grub/grub.conf" -+GRUB_MENU_FILE="/boot/grub/menu.lst" - - GRUB_BEGIN_SENTINEL="### BEGIN HIBERNATE SENTINEL" - GRUB_END_SENTINEL="### END HIBERNATE SENTINEL" -@@ -25,7 +27,7 @@ - vecho 2 "Changing grub menu..." - - # Make a backup, and abort if we fail to. -- if ! cp "$GRUB_MENU_FILE" "${BACKUP_GRUB_MENU_FILE:-$GRUB_MENU_FILE.hibernate.bak}" ; then -+ if ! cp "$GRUB_MENU_FILE" "${BACKUP_GRUB_MENU_FILE:-$GRUB_MENU_DFLT_BACKUP_FILE}" ; then - vecho 0 "Could not make backup of grub menu. Not changing!" - return 1 # abort if not forced - fi -@@ -65,7 +67,7 @@ - $GRUB_MENU_FILE > $GRUB_MENU_FILE.hibernate.new \ - && mv $GRUB_MENU_FILE.hibernate.new $GRUB_MENU_FILE - else -- mv "${BACKUP_GRUB_MENU_FILE:-$GRUB_MENU_FILE.hibernate.bak}" "$GRUB_MENU_FILE" -+ mv "${BACKUP_GRUB_MENU_FILE:-$GRUB_MENU_DFLT_BACKUP_FILE}" "$GRUB_MENU_FILE" - fi - fi - } diff -Nru hibernate-1.99/debian/patches/10-grub-backup.patch hibernate-2.0+15+g88d54a8/debian/patches/10-grub-backup.patch --- hibernate-1.99/debian/patches/10-grub-backup.patch 1970-01-01 00:00:00.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/patches/10-grub-backup.patch 2016-01-10 23:36:03.000000000 +0000 @@ -0,0 +1,39 @@ +Description: Moves the grub menu.lst backup file to /var/backups +Author: martin f. krafft +Last-Update: 2012-05-01 + +--- a/scriptlets.d/grub ++++ b/scriptlets.d/grub +@@ -1,11 +1,13 @@ + # -*- sh -*- + # vim:ft=sh:ts=8:sw=4:noet + ++GRUB_MENU_DFLT_BACKUP_FILE="/var/backups/grub.conf.hibernate" ++ + AddConfigHandler GrubConfigOptions + AddConfigHelp "ChangeGrubMenu " "Change grub's config file to show system is suspended before suspending and restore after resume." + AddConfigHelp "GrubMenuFile " "Filename of grub's config file. Default is /boot/grub/grub.conf." + AddConfigHelp "AlternateGrubMenuFile " "Filename of the grub config file to put in place when the machine is suspended. If this is not specified, the script will add a small header to the existing grub menu." +-AddConfigHelp "BackupGrubMenuFile " "Where to keep a backup of your real grub menu file. Defaults to the current grub menu file with '.hibernate.bak' appended." ++AddConfigHelp "BackupGrubMenuFile " "Where to keep a backup of your real grub menu file. Defaults to ${GRUB_MENU_DFLT_BACKUP_FILE}." + + AddOptionHandler GrubCmdlineOptions + AddShortOption 'g' +@@ -25,7 +27,7 @@ + vecho 2 "Changing grub menu..." + + # Make a backup, and abort if we fail to. +- if ! cp "$GRUB_MENU_FILE" "${BACKUP_GRUB_MENU_FILE:-$GRUB_MENU_FILE.hibernate.bak}" ; then ++ if ! cp "$GRUB_MENU_FILE" "${BACKUP_GRUB_MENU_FILE:-$GRUB_MENU_DFLT_BACKUP_FILE}" ; then + vecho 0 "Could not make backup of grub menu. Not changing!" + return 1 # abort if not forced + fi +@@ -65,7 +67,7 @@ + $GRUB_MENU_FILE > $GRUB_MENU_FILE.hibernate.new \ + && mv $GRUB_MENU_FILE.hibernate.new $GRUB_MENU_FILE + else +- mv "${BACKUP_GRUB_MENU_FILE:-$GRUB_MENU_FILE.hibernate.bak}" "$GRUB_MENU_FILE" ++ mv "${BACKUP_GRUB_MENU_FILE:-$GRUB_MENU_DFLT_BACKUP_FILE}" "$GRUB_MENU_FILE" + fi + fi + } diff -Nru hibernate-1.99/debian/patches/50-init.d-lsb-depends.dpatch hibernate-2.0+15+g88d54a8/debian/patches/50-init.d-lsb-depends.dpatch --- hibernate-1.99/debian/patches/50-init.d-lsb-depends.dpatch 2016-01-10 23:38:14.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/patches/50-init.d-lsb-depends.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 50-init.d-lsb-depends.dpatch by martin f. krafft -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad hibernate-1.99~/init.d/hibernate-cleanup.sh hibernate-1.99/init.d/hibernate-cleanup.sh ---- hibernate-1.99~/init.d/hibernate-cleanup.sh 2008-05-01 13:59:59.000000000 +0200 -+++ hibernate-1.99/init.d/hibernate-cleanup.sh 2009-12-20 15:00:29.090706611 +0100 -@@ -20,6 +20,8 @@ - # Default-Stop: - # Required-Start: - # Required-Stop: -+# Should-Start: udev devfsd raid2 mdadm-raid lvm evms cryptdisks -+# X-Start-Before: mountall - # Short-Description: invalidates stale swsusp and Software Suspend 2 image - # Description: This script invalidates any stale swsusp and Software Suspend 2 images. It - # searches all swap partitions on your machine, as well as diff -Nru hibernate-1.99/debian/patches/50-init.d-lsb-depends.patch hibernate-2.0+15+g88d54a8/debian/patches/50-init.d-lsb-depends.patch --- hibernate-1.99/debian/patches/50-init.d-lsb-depends.patch 1970-01-01 00:00:00.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/patches/50-init.d-lsb-depends.patch 2016-01-10 23:36:03.000000000 +0000 @@ -0,0 +1,15 @@ +Description: Add Should-Start and X-Start-Before initscript headers +Author: martin f. krafft +Last-Update: 2012-02-11 + +--- a/init.d/hibernate-cleanup.sh ++++ b/init.d/hibernate-cleanup.sh +@@ -20,6 +20,8 @@ + # Default-Stop: + # Required-Start: + # Required-Stop: ++# Should-Start: udev devfsd raid2 mdadm-raid lvm evms cryptdisks ++# X-Start-Before: mountall + # Short-Description: invalidates stale swsusp and TuxOnIce image + # Description: This script invalidates any stale swsusp and TuxOnIce images. It + # searches all swap partitions on your machine, as well as diff -Nru hibernate-1.99/debian/patches/70-laptop-mode-rename.dpatch hibernate-2.0+15+g88d54a8/debian/patches/70-laptop-mode-rename.dpatch --- hibernate-1.99/debian/patches/70-laptop-mode-rename.dpatch 2016-01-10 23:38:14.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/patches/70-laptop-mode-rename.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 99-debian-misc.dpatch by martin f. krafft -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Change laptop-mode init.d script name. - -@DPATCH@ -diff -urNad hibernate-1.91~/common.conf hibernate-1.91/common.conf ---- hibernate-1.91~/common.conf 2006-06-05 14:13:19.328072919 +0200 -+++ hibernate-1.91/common.conf 2006-06-05 14:13:26.517094913 +0200 -@@ -99,7 +99,7 @@ - # IncompatiblePrograms xmms - - ### services --# RestartServices laptop_mode anacron -+# RestartServices laptop-mode anacron - # StopServices alsasound - # StartServices aumix - diff -Nru hibernate-1.99/debian/patches/70-laptop-mode-rename.patch hibernate-2.0+15+g88d54a8/debian/patches/70-laptop-mode-rename.patch --- hibernate-1.99/debian/patches/70-laptop-mode-rename.patch 1970-01-01 00:00:00.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/patches/70-laptop-mode-rename.patch 2016-01-10 23:36:03.000000000 +0000 @@ -0,0 +1,15 @@ +Description: Change laptop-mode init.d script name. +Author: martin f. krafft +Last-Update: 2012-02-11 + +--- a/conf/common.conf ++++ b/conf/common.conf +@@ -121,7 +121,7 @@ + # IncompatiblePrograms xmms + + ### services +-# RestartServices laptop_mode anacron ++# RestartServices laptop-mode anacron + # StopServices alsasound + # StartServices aumix + diff -Nru hibernate-1.99/debian/patches/80-log-permissions.dpatch hibernate-2.0+15+g88d54a8/debian/patches/80-log-permissions.dpatch --- hibernate-1.99/debian/patches/80-log-permissions.dpatch 2016-01-10 23:38:14.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/patches/80-log-permissions.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,35 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 80-log-permissions.dpatch by martin f. krafft -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad upstream.trunk~/hibernate.sh upstream.trunk/hibernate.sh ---- upstream.trunk~/hibernate.sh 2006-08-07 23:56:03.000000000 +0100 -+++ upstream.trunk/hibernate.sh 2006-08-08 11:45:52.198837598 +0100 -@@ -826,7 +826,14 @@ - ParseOptions "$@" - - # Set a logfile if we need one. --[ -n "$LOGFILE" ] && LOGPIPE="tee -a -i $LOGFILE" -+if [ -n "$LOGFILE" ]; then -+ if [ ! -f "$LOGFILE" ]; then -+ touch "$LOGFILE" -+ chmod 644 "$LOGFILE" -+ chown root:adm "$LOGFILE" -+ fi -+ LOGPIPE="tee -a -i $LOGFILE" -+fi - - # Redirect everything to a given VT if we've been given one - if [ -n "$SWSUSPVT" ] && [ -c /dev/tty$SWSUSPVT ] ; then -diff -urNad upstream.trunk~/logrotate.d-hibernate-script upstream.trunk/logrotate.d-hibernate-script ---- upstream.trunk~/logrotate.d-hibernate-script 2006-08-07 23:56:03.000000000 +0100 -+++ upstream.trunk/logrotate.d-hibernate-script 2006-08-08 11:46:11.439702283 +0100 -@@ -3,4 +3,5 @@ - rotate 5 - size 100k - weekly -+ notifempty - } diff -Nru hibernate-1.99/debian/patches/80-log-permissions.patch hibernate-2.0+15+g88d54a8/debian/patches/80-log-permissions.patch --- hibernate-1.99/debian/patches/80-log-permissions.patch 1970-01-01 00:00:00.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/patches/80-log-permissions.patch 2016-01-10 23:36:03.000000000 +0000 @@ -0,0 +1,28 @@ +Author: martin f. krafft + +--- a/hibernate.sh ++++ b/hibernate.sh +@@ -876,7 +876,14 @@ + ParseOptions "$@" + + # Set a logfile if we need one. +-[ -n "$LOGFILE" ] && LOGPIPE="tee -a -i $LOGFILE" ++if [ -n "$LOGFILE" ]; then ++ if [ ! -f "$LOGFILE" ]; then ++ touch "$LOGFILE" ++ chmod 644 "$LOGFILE" ++ chown root:adm "$LOGFILE" ++ fi ++ LOGPIPE="tee -a -i $LOGFILE" ++fi + + # Redirect everything to a given VT if we've been given one + if [ -n "$SWSUSPVT" ] && [ -c /dev/tty$SWSUSPVT ] ; then +--- a/logrotate.d-hibernate-script ++++ b/logrotate.d-hibernate-script +@@ -3,4 +3,5 @@ + rotate 5 + size 100k + weekly ++ notifempty + } diff -Nru hibernate-1.99/debian/patches/99-store-ifdown-auto.dpatch hibernate-2.0+15+g88d54a8/debian/patches/99-store-ifdown-auto.dpatch --- hibernate-1.99/debian/patches/99-store-ifdown-auto.dpatch 2016-01-10 23:38:14.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/patches/99-store-ifdown-auto.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,136 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 99-store-ifdown-auto.dpatch by martin f. krafft -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad upstream.trunk~/scriptlets.d/network upstream.trunk/scriptlets.d/network ---- upstream.trunk~/scriptlets.d/network 2007-07-09 17:34:28.000000000 +0200 -+++ upstream.trunk/scriptlets.d/network 2007-07-09 17:46:09.000000000 +0200 -@@ -30,9 +30,7 @@ - [ "$int" = "lo" ] && continue - fi - vecho 2 "Bringing down interface $int" -- network_ifdown $int -- [ $? -ne 0 ] && ret=1 -- NETWORK_DOWNEDIFS="$int $NETWORK_DOWNEDIFS" -+ NETWORK_DOWNEDIFS="$(network_ifdown $int) $NETWORK_DOWNEDIFS" || ret=$? - done - return $ret - } -@@ -95,7 +93,9 @@ - [ -x "/etc/init.d/net.$1" ] && /etc/init.d/net.$1 start - } - network_ifdown() { -- [ -x "/etc/init.d/net.$1" ] && /etc/init.d/net.$1 stop -+ [ -x "/etc/init.d/net.$1" ] && /etc/init.d/net.$1 stop \ -+ || return $? -+ echo $1 - } - ;; - suse) -@@ -103,7 +103,8 @@ - /etc/init.d/network start - } - network_ifdown() { -- /etc/init.d/network stop -+ /etc/init.d/network stop || return $? -+ echo all - } - NETWORK_CALL_ONCE=1 - ;; -@@ -113,15 +114,20 @@ - --startas /sbin/ifup --name "hibernate_ifup_$1" -- $* - } - network_ifdown() { -- /sbin/ifdown $* -- } -+ STDERR="$(/sbin/ifdown $1 2>&1 1>/dev/null)" || return $? -+ case "$STDERR" in -+ "/sbin/ifdown: interface $1 not configured") :;; -+ *) echo $1;; -+ esac -+ } - ;; - mandrake|fedora|redhat) - network_ifup() { - /sbin/ifup $* - } - network_ifdown() { -- /sbin/ifdown $* -+ /sbin/ifdown $* || return $? -+ echo $* - } - ;; - slackware) -@@ -129,7 +135,8 @@ - /etc/rc.d/rc.inet1 start - } - network_ifdown() { -- /etc/rc.d/rc.inet1 stop -+ /etc/rc.d/rc.inet1 stop || return $? -+ echo all - } - NETWORK_CALL_ONCE=1 - ;; -@@ -140,28 +147,35 @@ - /sbin/ifup $* - } - network_ifdown() { -- /sbin/ifdown $* -+ STDERR="$(/sbin/ifdown $1 2>&1 1>/dev/null)" || return $? -+ case "$STDERR" in -+ "/sbin/ifdown: interface $1 not configured") :;; -+ *) echo $1;; -+ esac - } - elif [ -x "/etc/init.d/ifup" ] ; then - network_ifup() { - /etc/init.d/ifup $* - } - network_ifdown() { -- /etc/init.d/ifdown $* -+ /etc/init.d/ifdown $* || return $? -+ echo $* - } - elif [ -x "/etc/sysconfig/network-scripts/ifup" ] ; then - network_ifup() { - /etc/sysconfig/network-scripts/ifup $* - } - network_ifdown() { -- /etc/sysconfig/network-scripts/ifdown $* -+ /etc/sysconfig/network-scripts/ifdown $* || return $? -+ echo $* - } - elif [ -x "/etc/init.d/networking" ] ; then - network_ifup() { - /etc/init.d/networking start - } - network_ifdown() { -- /etc/init.d/networking stop -+ /etc/init.d/networking stop || return $? -+ echo all - } - NETWORK_CALL_ONCE=1 - elif [ -x "/etc/init.d/network" ] ; then -@@ -169,7 +183,8 @@ - /etc/init.d/network start - } - network_ifdown() { -- /etc/init.d/network stop -+ /etc/init.d/network stop || return $? -+ echo all - } - NETWORK_CALL_ONCE=1 - else -@@ -177,7 +192,8 @@ - /sbin/ifconfig $1 up - } - network_ifdown() { -- /sbin/ifconfig $1 down -+ /sbin/ifconfig $1 down || return $? -+ echo $1 - } - fi - esac diff -Nru hibernate-1.99/debian/patches/99-store-ifdown-auto.patch hibernate-2.0+15+g88d54a8/debian/patches/99-store-ifdown-auto.patch --- hibernate-1.99/debian/patches/99-store-ifdown-auto.patch 1970-01-01 00:00:00.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/patches/99-store-ifdown-auto.patch 2016-01-10 23:36:03.000000000 +0000 @@ -0,0 +1,130 @@ +Author: martin f. krafft + +--- a/scriptlets.d/network ++++ b/scriptlets.d/network +@@ -30,9 +30,7 @@ + [ "$int" = "lo" ] && continue + fi + vecho 2 "Bringing down interface $int" +- network_ifdown $int +- [ $? -ne 0 ] && ret=1 +- NETWORK_DOWNEDIFS="$int $NETWORK_DOWNEDIFS" ++ NETWORK_DOWNEDIFS="$(network_ifdown $int) $NETWORK_DOWNEDIFS" || ret=$? + done + return $ret + } +@@ -103,7 +101,9 @@ + [ -x "/etc/init.d/net.$1" ] && /etc/init.d/net.$1 start + } + network_ifdown() { +- [ -x "/etc/init.d/net.$1" ] && /etc/init.d/net.$1 stop ++ [ -x "/etc/init.d/net.$1" ] && /etc/init.d/net.$1 stop \ ++ || return $? ++ echo $1 + } + ;; + suse) +@@ -111,7 +111,8 @@ + /etc/init.d/network start + } + network_ifdown() { +- /etc/init.d/network stop ++ /etc/init.d/network stop || return $? ++ echo all + } + NETWORK_CALL_ONCE=1 + ;; +@@ -121,15 +122,20 @@ + --startas /sbin/ifup --name "hibernate_ifup_$1" -- $* + } + network_ifdown() { +- /sbin/ifdown $* +- } ++ STDERR="$(/sbin/ifdown $1 2>&1 1>/dev/null)" || return $? ++ case "$STDERR" in ++ "/sbin/ifdown: interface $1 not configured") :;; ++ *) echo $1;; ++ esac ++ } + ;; + mandrake|fedora|redhat) + network_ifup() { + /sbin/ifup $* + } + network_ifdown() { +- /sbin/ifdown $* ++ /sbin/ifdown $* || return $? ++ echo $* + } + ;; + slackware) +@@ -137,7 +143,8 @@ + /etc/rc.d/rc.inet1 start + } + network_ifdown() { +- /etc/rc.d/rc.inet1 stop ++ /etc/rc.d/rc.inet1 stop || return $? ++ echo all + } + NETWORK_CALL_ONCE=1 + ;; +@@ -148,28 +155,35 @@ + /sbin/ifup $* + } + network_ifdown() { +- /sbin/ifdown $* ++ STDERR="$(/sbin/ifdown $1 2>&1 1>/dev/null)" || return $? ++ case "$STDERR" in ++ "/sbin/ifdown: interface $1 not configured") :;; ++ *) echo $1;; ++ esac + } + elif [ -x "/etc/init.d/ifup" ] ; then + network_ifup() { + /etc/init.d/ifup $* + } + network_ifdown() { +- /etc/init.d/ifdown $* ++ /etc/init.d/ifdown $* || return $? ++ echo $* + } + elif [ -x "/etc/sysconfig/network-scripts/ifup" ] ; then + network_ifup() { + /etc/sysconfig/network-scripts/ifup $* + } + network_ifdown() { +- /etc/sysconfig/network-scripts/ifdown $* ++ /etc/sysconfig/network-scripts/ifdown $* || return $? ++ echo $* + } + elif [ -x "/etc/init.d/networking" ] ; then + network_ifup() { + /etc/init.d/networking start + } + network_ifdown() { +- /etc/init.d/networking stop ++ /etc/init.d/networking stop || return $? ++ echo all + } + NETWORK_CALL_ONCE=1 + elif [ -x "/etc/init.d/network" ] ; then +@@ -177,7 +191,8 @@ + /etc/init.d/network start + } + network_ifdown() { +- /etc/init.d/network stop ++ /etc/init.d/network stop || return $? ++ echo all + } + NETWORK_CALL_ONCE=1 + else +@@ -185,7 +200,8 @@ + /sbin/ifconfig $1 up + } + network_ifdown() { +- /sbin/ifconfig $1 down ++ /sbin/ifconfig $1 down || return $? ++ echo $1 + } + fi + esac diff -Nru hibernate-1.99/debian/patches/blacklisted-modules-3.x.patch hibernate-2.0+15+g88d54a8/debian/patches/blacklisted-modules-3.x.patch --- hibernate-1.99/debian/patches/blacklisted-modules-3.x.patch 1970-01-01 00:00:00.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/patches/blacklisted-modules-3.x.patch 2016-01-10 23:36:03.000000000 +0000 @@ -0,0 +1,51 @@ +Description: Replace 2.6.99 with 3.99.0 in blacklisted-modules +Author: Andrey Rahmatullin +Last-Update: 2012-05-01 + +diff --git a/blacklisted-modules b/blacklisted-modules +index 4400b37..bb69889 100644 +--- a/blacklisted-modules ++++ b/blacklisted-modules +@@ -27,14 +27,14 @@ acx_pci + hsfmodem + prism54 + +-bcm4400 2.6.0 2.6.99 +-emu10k1 2.4.0 2.4.99 2.6.0 2.6.99 +-forcedeth 2.4.0 2.4.99 2.6.0 2.6.99 ++bcm4400 2.6.0 3.99.0 ++emu10k1 2.4.0 2.4.99 2.6.0 3.99.0 ++forcedeth 2.4.0 2.4.99 2.6.0 3.99.0 + @ipw2100 0.0 1.0.2 + @ipw2200 0.0 0.20 +-natsemi 2.6.0 2.6.99 ++natsemi 2.6.0 3.99.0 + psmouse 2.6.0 2.6.19 +-rt2400 2.4.0 2.4.99 2.6.0 2.6.99 ++rt2400 2.4.0 2.4.99 2.6.0 3.99.0 + ehci_hcd 2.6.0 2.6.14 + ohci_hcd 2.6.0 2.6.14 + uhci_hcd 2.6.0 2.6.14 +@@ -45,16 +45,16 @@ snd_ens1370 2.6.0 2.6.19 + snd_ens1371 2.6.0 2.6.19 + snd_maestro3 2.6.0 2.6.19 + @snd_bt_sco 0.0 1.18 +-en1370 2.6.0 2.6.99 +-en1371 2.6.0 2.6.99 ++en1370 2.6.0 3.99.0 ++en1371 2.6.0 3.99.0 + via_agp 2.6.0 2.6.8 +-via_rhine 2.6.0 2.6.99 +-i8042 2.6.10 2.6.99 +-intel_mch_agp 2.6.0 2.6.99 ++via_rhine 2.6.0 3.99.0 ++i8042 2.6.10 3.99.0 ++intel_mch_agp 2.6.0 3.99.0 + rt2500 2.6.0 2.6.14 + + button 2.6.9 2.6.22 +-speedstep_smi 2.6.12 2.6.99 ++speedstep_smi 2.6.12 3.99.0 + + @ndiswrapper 0.10 0.11 + diff -Nru hibernate-1.99/debian/patches/fix-grub-config-name.patch hibernate-2.0+15+g88d54a8/debian/patches/fix-grub-config-name.patch --- hibernate-1.99/debian/patches/fix-grub-config-name.patch 1970-01-01 00:00:00.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/patches/fix-grub-config-name.patch 2016-01-10 23:36:03.000000000 +0000 @@ -0,0 +1,46 @@ +Description: Update the default GRUB config name for GRUB2. +Author: Andrey Rahmatullin +Bug-Debian: http://bugs.debian.org/512112 +Last-Update: 2012-05-01 + +--- a/conf/common.conf ++++ b/conf/common.conf +@@ -53,9 +53,9 @@ + + ### grub + # ChangeGrubMenu yes +-# GrubMenuFile /boot/grub/menu.lst +-# AlternateGrubMenuFile /boot/grub/menu-suspended.lst +-# BackupGrubMenuFile /boot/grub/menu.lst.hibernate.bak ++# GrubMenuFile /boot/grub/grub.cfg ++# AlternateGrubMenuFile /boot/grub/grub-suspended.cfg ++# BackupGrubMenuFile /var/backups/grub.cfg.hibernate + + # see http://bugs.debian.org/317479 + # RemountXFSBoot yes +--- a/scriptlets.d/grub ++++ b/scriptlets.d/grub +@@ -1,11 +1,12 @@ + # -*- sh -*- + # vim:ft=sh:ts=8:sw=4:noet + +-GRUB_MENU_DFLT_BACKUP_FILE="/var/backups/grub.conf.hibernate" ++GRUB_MENU_FILE="/boot/grub/grub.cfg" ++GRUB_MENU_DFLT_BACKUP_FILE="/var/backups/grub.cfg.hibernate" + + AddConfigHandler GrubConfigOptions + AddConfigHelp "ChangeGrubMenu " "Change grub's config file to show system is suspended before suspending and restore after resume." +-AddConfigHelp "GrubMenuFile " "Filename of grub's config file. Default is /boot/grub/grub.conf." ++AddConfigHelp "GrubMenuFile " "Filename of grub's config file. Default is ${GRUB_MENU_FILE}." + AddConfigHelp "AlternateGrubMenuFile " "Filename of the grub config file to put in place when the machine is suspended. If this is not specified, the script will add a small header to the existing grub menu." + AddConfigHelp "BackupGrubMenuFile " "Where to keep a backup of your real grub menu file. Defaults to ${GRUB_MENU_DFLT_BACKUP_FILE}." + +@@ -14,8 +15,6 @@ + AddLongOption 'restore-grub' + AddOptionHelp '-g, --restore-grub' 'Restores the grub menu to normal (use if a resume was not completed sucessfully) and exits the script. A suspend is not performed.' + +-GRUB_MENU_FILE="/boot/grub/grub.conf" +- + GRUB_BEGIN_SENTINEL="### BEGIN HIBERNATE SENTINEL" + GRUB_END_SENTINEL="### END HIBERNATE SENTINEL" + diff -Nru hibernate-1.99/debian/patches/fix-manpage-parentheses.patch hibernate-2.0+15+g88d54a8/debian/patches/fix-manpage-parentheses.patch --- hibernate-1.99/debian/patches/fix-manpage-parentheses.patch 1970-01-01 00:00:00.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/patches/fix-manpage-parentheses.patch 2016-01-10 23:36:03.000000000 +0000 @@ -0,0 +1,16 @@ +Description: Fix a typo in hibernate.conf(5) +Author: Aditya Vaidya +Bug-Debian: http://bugs.debian.org/668978 +Last-Update: 2012-04-22 + +--- hibernate-1.99~/gen-manpages.sh 2008-05-01 07:00:21.000000000 -0500 ++++ hibernate-1.99/gen-manpages.sh 2012-04-02 17:53:17.888038183 -0500 +@@ -161,7 +161,7 @@ + reads its configuration from the + .I /etc/hibernate/hibernate.conf + file when it runs (unless an alternative configuration file is +-specified on the command line. ++specified on the command line). + .PP + If configuration directives are specified multiple times, typically + the last one will take effect. diff -Nru hibernate-1.99/debian/patches/fix-s2ram-options.patch hibernate-2.0+15+g88d54a8/debian/patches/fix-s2ram-options.patch --- hibernate-1.99/debian/patches/fix-s2ram-options.patch 1970-01-01 00:00:00.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/patches/fix-s2ram-options.patch 2016-01-10 23:36:03.000000000 +0000 @@ -0,0 +1,42 @@ +Description: Fix option names for s2ram and apply s2ram options to s2both. +Bug-Debian: http://bugs.debian.org/505410 +Origin: vendor, http://bugs.debian.org/505410#5 +Last-Update: 2012-05-01 + +diff --git a/scriptlets.d/ususpend b/scriptlets.d/ususpend +index 25d9aa5..edf801e 100644 +--- a/scriptlets.d/ususpend ++++ b/scriptlets.d/ususpend +@@ -33,10 +33,7 @@ USuspendConfigEnabler() { + case "$1" in + ususpendmethod) + case "$2" in +- disk|both) USUSPEND_PROG=s2$2;; +- ram) +- USUSPEND_PROG=s2ram +- ;; ++ disk|both|ram) USUSPEND_PROG=s2$2;; + *) + vecho 1 "$EXE: Invalid value fo USuspendMethod." + return 2 +@@ -104,13 +101,13 @@ USuspendOptionHandler() { + DoUSuspend() { + if [ -z "$USUSPEND_NO_SUSPEND" ] ; then + ARGS= +- if [ "$USUSPEND_PROG" = s2ram ]; then +- [ $USUSPEND_RAM_FORCE -eq 1 ] && ARGS="$ARGS -f" +- [ $USUSPEND_RAM_VBESAVE -eq 1 ] && ARGS="$ARGS -s" +- [ $USUSPEND_RAM_VBEPOST -eq 1 ] && ARGS="$ARGS -p" +- [ $USUSPEND_RAM_RADEONTOOL -eq 1 ] && ARGS="$ARGS -r" +- [ $USUSPEND_RAM_VBEMODE -eq 1 ] && ARGS="$ARGS -m" +- [ $USUSPEND_RAM_ACPISLEEP -ne 0 ] && ARGS="$ARGS -a $USUSPEND_RAM_ACPISLEEP" ++ if [ "$USUSPEND_PROG" = s2ram -o "$USUSPEND_PROG" = s2both ]; then ++ [ $USUSPEND_RAM_FORCE -eq 1 ] && ARGS="$ARGS --force" ++ [ $USUSPEND_RAM_VBESAVE -eq 1 ] && ARGS="$ARGS --vbe_save" ++ [ $USUSPEND_RAM_VBEPOST -eq 1 ] && ARGS="$ARGS --vbe_post" ++ [ $USUSPEND_RAM_RADEONTOOL -eq 1 ] && ARGS="$ARGS --radeontool" ++ [ $USUSPEND_RAM_VBEMODE -eq 1 ] && ARGS="$ARGS --vbe_mode" ++ [ $USUSPEND_RAM_ACPISLEEP -ne 0 ] && ARGS="$ARGS --acpi_sleep $USUSPEND_RAM_ACPISLEEP" + [ $USUSPEND_RAM_PCISAVE -eq 1 ] && ARGS="$ARGS -v" + fi + vecho 1 "$EXE: Running $USUSPEND_PROG_PATH $ARGS..." diff -Nru hibernate-1.99/debian/patches/fix-typos.patch hibernate-2.0+15+g88d54a8/debian/patches/fix-typos.patch --- hibernate-1.99/debian/patches/fix-typos.patch 1970-01-01 00:00:00.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/patches/fix-typos.patch 2016-01-10 23:36:03.000000000 +0000 @@ -0,0 +1,26 @@ +Description: Fix some typos in help strings. +Author: Andrey Rahmatullin +Last-Update: 2012-05-01 + +--- a/scriptlets.d/grub ++++ b/scriptlets.d/grub +@@ -13,7 +13,7 @@ + AddOptionHandler GrubCmdlineOptions + AddShortOption 'g' + AddLongOption 'restore-grub' +-AddOptionHelp '-g, --restore-grub' 'Restores the grub menu to normal (use if a resume was not completed sucessfully) and exits the script. A suspend is not performed.' ++AddOptionHelp '-g, --restore-grub' 'Restores the grub menu to normal (use if a resume was not completed successfully) and exits the script. A suspend is not performed.' + + GRUB_BEGIN_SENTINEL="### BEGIN HIBERNATE SENTINEL" + GRUB_END_SENTINEL="### END HIBERNATE SENTINEL" +--- a/scriptlets.d/modules ++++ b/scriptlets.d/modules +@@ -3,7 +3,7 @@ + + AddConfigHandler ModulesOptions + AddConfigHelp "UnloadModules [...]" "Names of modules to unload prior to suspending." +-AddConfigHelp "LoadModules auto| [...]" "Names of modules to load after resumimg. If auto is specified, the modules that were unloaded previously are loaded." ++AddConfigHelp "LoadModules auto| [...]" "Names of modules to load after resuming. If auto is specified, the modules that were unloaded previously are loaded." + AddConfigHelp "UnloadBlacklistedModules " "Try to remove any modules that are known to be incompatible with hibernation prior to suspending." + AddConfigHelp "UnloadAllModules " "Try to remove all modules loaded prior to suspending." + AddConfigHelp "LoadModulesFromFile " "Load default modules after resuming from a given filename. Each module name must appear on its own line, and lines starting with # are ignored. (eg, Debian's /etc/modules, Gentoo's /etc/modules.autoload)" diff -Nru hibernate-1.99/debian/patches/fix-userui-path.patch hibernate-2.0+15+g88d54a8/debian/patches/fix-userui-path.patch --- hibernate-1.99/debian/patches/fix-userui-path.patch 1970-01-01 00:00:00.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/patches/fix-userui-path.patch 2016-01-10 23:36:03.000000000 +0000 @@ -0,0 +1,19 @@ +Description: Update default userui path to Debian default. +Author: Andrey Rahmatullin +Bug-Debian: http://bugs.debian.org/492392 +Forwarded: not-needed +Last-Update: 2012-04-22 + +diff --git a/conf/tuxonice.conf b/conf/tuxonice.conf +index 4fee3fb..69828ec 100644 +--- a/conf/tuxonice.conf ++++ b/conf/tuxonice.conf +@@ -37,7 +37,7 @@ Encryptor none + # VerifyFilewriterResume2 yes + + ## Specify a userui like this: +-# ProcSetting userui_program /usr/local/sbin/tuxoniceui_text ++# ProcSetting userui_program /usr/lib/tuxonice-userui/tuxoniceui + + # Scale CPU to full speed to make sure we suspend as fast as possible. + FullSpeedCPU yes diff -Nru hibernate-1.99/debian/patches/Makefile hibernate-2.0+15+g88d54a8/debian/patches/Makefile --- hibernate-1.99/debian/patches/Makefile 2016-01-10 23:38:14.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/patches/Makefile 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -.PHONY: 00list -00list: - find . -maxdepth 1 -name Makefile -prune -o -name 00list -prune -o -type f -print \ - | sed -ne 's,\./\(.*\)\.dpatch,\1,p' | sort -n > $@ diff -Nru hibernate-1.99/debian/patches/series hibernate-2.0+15+g88d54a8/debian/patches/series --- hibernate-1.99/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/patches/series 2016-01-10 23:36:03.000000000 +0000 @@ -0,0 +1,10 @@ +10-grub-backup.patch +70-laptop-mode-rename.patch +80-log-permissions.patch +99-store-ifdown-auto.patch +fix-userui-path.patch +fix-manpage-parentheses.patch +blacklisted-modules-3.x.patch +fix-s2ram-options.patch +fix-grub-config-name.patch +fix-typos.patch diff -Nru hibernate-1.99/debian/README.Debian hibernate-2.0+15+g88d54a8/debian/README.Debian --- hibernate-1.99/debian/README.Debian 2016-01-10 23:38:14.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/README.Debian 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -hibernate for Debian -==================== - -Patches for Suspend2 which apply to vanilla (non-Debian) kernels can be -obtained from the upstream web site at http://www.suspend2.net/ - -Those who prefer to run Debian kernels (compiled from the sources in the -kernel-source-2.6.x packages) won't be able to use these patches, due to the -changes in the Debian kernels and the invasiveness of the suspend2 patch. -A kernel patch package for Debian (linux-patch-suspend2) is planned. Please -contact me if you would be able to donate time to make it happen. - -Hibernate will just fall back to using the in-kernel suspend methods when -suspend2 is not present. - -Users with /boot/grub on an XFS partition, make sure to read -/usr/share/doc/README.xfs! - -hibernate is maintained with SVN as part of Alioth's collab-maint project. Get -the source from - - anonymous: svn://svn.debian.org/svn/collab-maint/deb-maint/hibernate/trunk - developer: svn+ssh://@svn.debian.org/svn/collab-maint/deb-maint/hibernate/trunk - -It is designed to be used with svn-buildpackage. - - -- martin f. krafft Sat, 15 Jul 2006 19:07:59 +0200 - -$Id$ diff -Nru hibernate-1.99/debian/rules hibernate-2.0+15+g88d54a8/debian/rules --- hibernate-1.99/debian/rules 2016-01-10 23:38:14.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/rules 2016-01-10 23:36:03.000000000 +0000 @@ -1,85 +1,22 @@ #!/usr/bin/make -f -# -# Debian rules file for hibernate -# -# Originally written by Cameron Patrick, 2004 and released to the public domain. -# Modified by martin f. krafft. -# -# Copyright © martin f. krafft -# Released under the terms of the Artistic Licence 2.0 -# -# $Id$ -# -include /usr/share/dpatch/dpatch.make +%: + dh $@ -$(DPATCH_STAMPFN): debian/patches/00list -force-run: -.PHONY: force-run -debian/patches/00list: force-run - dh_testdir - make -sC debian/patches - -configure: debian/patches/00list - -hibernate: hibernate.sh - install -m755 $< $@ - -hibernate.8 hibernate.conf.5: +override_dh_auto_build: sh ./gen-manpages.sh + sed -i 's,^'\''-misc,\\\&\0,' hibernate.conf.5 -debian/hibernate.init: init.d/hibernate-cleanup.sh - ln $< $@ - -build: build-stamp -build-stamp: configure patch hibernate hibernate.8 hibernate.conf.5 debian/hibernate.init - dh_testdir - touch $@ -.PHONY: build-stamp - -binary: binary-arch binary-indep - -binary-arch: - -binary-indep: build - dh_testroot - dh_testdir - dh_clean -i -k - dh_installdirs -i - dh_install -i - - install -o root -g root -m 644 logrotate.d-hibernate-script \ - debian/hibernate/etc/logrotate.d/hibernate - - install -o root -g root -m 755 debian/bugscript \ - debian/hibernate/usr/share/bug/hibernate/script +override_dh_auto_install: + install -m 644 logrotate.d-hibernate-script \ + debian/hibernate/etc/logrotate.d/hibernate + install -m 755 debian/bugscript \ + debian/hibernate/usr/share/bug/hibernate/script + install -m 755 hibernate.sh \ + debian/hibernate/usr/sbin/hibernate +override_dh_install: + dh_install sed -i -e 's,^[^#].*Distribution.*,# &,' \ -e 's,^# Distribution.*,Distribution debian,' \ debian/hibernate/etc/hibernate/common.conf - - find debian/hibernate -type d -name .svn -print0 | xargs -0 rm -rf - - dh_installdocs -i - dh_installexamples -i - dh_installchangelogs -i CHANGELOG - dh_installinit --no-start -- start 31 S . - dh_installman -i - dh_link -i - dh_compress -i - dh_fixperms -i - dh_installdeb -i - dh_gencontrol -i - dh_builddeb -i - -clean: clean-patched unpatch - -clean-patched: - dh_testdir - dh_testroot - dh_clean - $(MAKE) -C debian/patches - rm -f hibernate hibernate.8 hibernate.conf.5 debian/hibernate.init - rm -f configure-stamp build-stamp - -# arch-tag: daab4fb5-a946-4271-be82-425047e0d2ac diff -Nru hibernate-1.99/debian/source/format hibernate-2.0+15+g88d54a8/debian/source/format --- hibernate-1.99/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/source/format 2016-01-10 23:36:03.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru hibernate-1.99/disk.conf hibernate-2.0+15+g88d54a8/disk.conf --- hibernate-1.99/disk.conf 2008-05-01 11:59:58.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/disk.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -# This file is used when suspending to disk. Use the *-disk.conf files to add -# configuration options, or add them before the TryMethod lines in this file. -# Options are not case-sensitive. -# -# See hibernate.conf(5) for help on the configuration items. - -TryMethod ususpend-disk.conf -TryMethod sysfs-disk.conf diff -Nru hibernate-1.99/gen-manpages.sh hibernate-2.0+15+g88d54a8/gen-manpages.sh --- hibernate-1.99/gen-manpages.sh 2008-05-01 12:00:21.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/gen-manpages.sh 2010-06-03 05:50:32.000000000 +0000 @@ -41,7 +41,7 @@ .\" Author: Cameron Patrick .\" Information on the command line options is automatically generated .\" from the hibernate scripts themselves. -.TH HIBERNATE 8 "$THE_DATE" "Linux Software Suspend" "" +.TH HIBERNATE 8 "$THE_DATE" "Linux Hibernation" "" .SH NAME hibernate \- save your computer's state to disk, and then switch it off .SH SYNOPSIS @@ -50,14 +50,14 @@ .SH DESCRIPTION .PP The hibernate script (or "suspend script") is used to invoke the Linux -kernel's Software Suspend functionality. +kernel's Hibernation functionality. .PP When you hibernate your machine, the contents of your computer's memory will be saved to disc, and your computer will switch off. When you switch it back on again, it will resume exactly as it was when you -hibernated. This script is designed for Software Suspend 2, which +hibernated. This script is designed for TuxOnIce, which is not yet included in the main kernel tree and must be downloaded -from the Software Suspend web site at \fIhttp://www.suspend2.net/\fR, +from the TuxOnIce web site at \fIhttp://www.tuxonice.net/\fR, but can also utilise the vanilla kernel interfaces for swsusp or pmdisk (through /proc/acpi/sleep or /sys/power/state). Instructions on setting up the kernel can also be found on that web @@ -119,14 +119,14 @@ .PP Probably lots! .PP -If you have problems with the hibernate script or Software Suspend, the best -place to ask is on the mailing list - suspend2-users@lists.suspend2.net. You -will need to subscribe to post. See http://www.suspend2.net/lists +If you have problems with the hibernate script or TuxOnIce, the best +place to ask is on the mailing list - tuxonice-users@lists.tuxonice.net. You +will need to subscribe to post. See http://www.tuxonice.net/lists for details. .PP If the suspend process itself crashes (while "Writing caches", "Reading caches", or "Copying original kernel back", etc), then the problem lies with -Software Suspend 2 itself. See the FAQ at http://www.suspend2.net/ for +TuxOnIce itself. See the FAQ at http://www.tuxonice.net/ for help on debugging. .SH AUTHOR .PP @@ -149,7 +149,7 @@ .\" Author: Cameron Patrick .\" Information on the various options is automatically generated .\" from the hibernate scripts themselves. -.TH HIBERNATE.CONF 5 "$THE_DATE" "Linux Software Suspend" "" +.TH HIBERNATE.CONF 5 "$THE_DATE" "Linux Hibernation" "" .SH NAME hibernate.conf \- configuration file for the hibernate script .SH SYNOPSIS @@ -281,4 +281,4 @@ ProgramManFooter >> $PROGRAM_MAN ConfigManFooter >> $CONFIG_MAN -# $Id: gen-manpages.sh 1196 2008-05-01 11:58:52Z nigel $ +# $Id$ diff -Nru hibernate-1.99/hibernate-1.96-tuxonice-fix.patch hibernate-2.0+15+g88d54a8/hibernate-1.96-tuxonice-fix.patch --- hibernate-1.99/hibernate-1.96-tuxonice-fix.patch 2008-05-01 11:59:59.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/hibernate-1.96-tuxonice-fix.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,75 +0,0 @@ -diff -ruN hibernate-script-1.96/scriptlets.d/suspend2 hibernate-script-1.96.fixed/scriptlets.d/suspend2 ---- hibernate-script-1.96/scriptlets.d/suspend2 2007-07-16 14:33:09.000000000 +0200 -+++ hibernate-script-1.96.fixed/scriptlets.d/suspend2 2007-07-30 18:40:13.000000000 +0200 -@@ -74,9 +74,13 @@ - /sbin/modprobe --first-time "${mod}" >/dev/null 2>&1 && SWSUSP_RMOD="${mod} ${SWSUSP_RMOD}" - done - -+ # signature for filewriter -+ FILEWRITER_SIGNATURE="Suspend2" -+ - # Detect where suspend2 is these days. - if [ -d "/sys/power/tuxonice/" ] ; then - SWSUSP_ROOT="/sys/power/tuxonice" -+ FILEWRITER_SIGNATURE="TuxOnIce" - elif [ -d "/sys/power/suspend2/" ] ; then - SWSUSP_ROOT="/sys/power/suspend2" - elif [ -d "/proc/swsusp/" ] ; then -@@ -748,22 +752,31 @@ - if ! [ -e "$SWSUSP_FILEWRITER_LOC" ] ; then - vecho 0 "$EXE: Creating $SWSUSP_FILEWRITER_SIZE MB filewriter target." - { -- echo Suspend2 -+ echo $FILEWRITER_SIGNATURE - dd if=/dev/zero bs=1M count=$SWSUSP_FILEWRITER_SIZE 2>/dev/null - } > $SWSUSP_FILEWRITER_LOC - sync - fi - - case "`dd \"if=$SWSUSP_FILEWRITER_LOC\" bs=8 count=1 2>/dev/null`" in -- Suspend2) -+ $FILEWRITER_SIGNATURE) - # We're good to go. - vecho 1 "$EXE: Detected filewriter image ready for use." - ;; -+ Suspend2|TuxOnIce) -+ # Eeek! This is an incompatible image -+ # reliably preserve the starting block. -+ vecho 1 "$EXE: Killing incompatible filewriter image." -+ if ! /bin/echo -ne "$FILEWRITER_SIGNATURE\n\0\0" | dd "of=$SWSUSP_FILEWRITER_LOC" bs=11 count=1 conv=notrunc 2>/dev/null ; then -+ vecho 0 "$EXE: Failed to kill imcompatible image!" -+ return 2 # Abort even with force -+ fi -+ ;; - HaveImag) - # Eeek! There's already an image here. Erase it using dd to - # reliably preserve the starting block. - vecho 1 "$EXE: Killing existing filewriter image." -- if ! /bin/echo -ne "Suspend2\n\0\0" | dd "of=$SWSUSP_FILEWRITER_LOC" bs=11 count=1 conv=notrunc 2>/dev/null ; then -+ if ! /bin/echo -ne "$FILEWRITER_SIGNATURE\n\0\0" | dd "of=$SWSUSP_FILEWRITER_LOC" bs=11 count=1 conv=notrunc 2>/dev/null ; then - vecho 0 "$EXE: Failed to kill existing image!" - return 2 # Abort even with force - fi -@@ -794,17 +807,17 @@ - [ x"$SWSUSP_FILEWRITER_NOVERIFY" = "x1" ] && return 0 - - local new_resume2 -- new_resume2="`cat $SWSUSP_ROOT/$RESUME_FILE`" -+ new_resume2="`cat $SWSUSP_ROOT/$RESUME2_FILE`" - if [ -z "$new_resume2" ] ; then -- vecho 0 "ABORTING: $SWSUSP_ROOT/$RESUME_FILE did not return a valid result." -+ vecho 0 "ABORTING: $SWSUSP_ROOT/$RESUME2_FILE did not return a valid result." - return 2 # abort even if forced - fi - - if ! grep "$new_resume2" /proc/cmdline ; then -- filewriter_target=`cat $SWSUSP_ROOT/$RESUME_FILE` -- vecho 0 "ABORTING: $RESUME_FILE is not setup correctly. Unless you have setup your bootloader" -+ filewriter_target=`cat $SWSUSP_ROOT/$RESUME2_FILE` -+ vecho 0 "ABORTING: $RESUME2_FILE is not setup correctly. Unless you have setup your bootloader" - vecho 0 " correctly, resuming will most likely fail. To correct this, add" -- vecho 0 " \"$RESUME_FILE=$filewriter_target\" to your kernel command line in your" -+ vecho 0 " \"$RESUME2_FILE=$filewriter_target\" to your kernel command line in your" - vecho 0 " LILO or GRUB configuration file and reboot." - return 2 # abort even if forced - fi diff -Nru hibernate-1.99/hibernate.conf hibernate-2.0+15+g88d54a8/hibernate.conf --- hibernate-1.99/hibernate.conf 2008-05-01 11:59:58.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/hibernate.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -# hibernate.conf is split into separate configuration files. -# -# Each file is tried in the order below, until an available suspend -# method is found. -# -# Options specific to a particular suspend method should be placed in the -# appropriate configuration file (suspend2.conf, ususpend.conf, disk.conf -# or ram.conf). -# Options common to all suspend methods should be placed in common.conf. -# -# See hibernate.conf(5) for help on the configuration items. - -TryMethod suspend2.conf -TryMethod disk.conf -TryMethod ram.conf diff -Nru hibernate-1.99/hibernate.sh hibernate-2.0+15+g88d54a8/hibernate.sh --- hibernate-1.99/hibernate.sh 2008-05-01 12:00:21.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/hibernate.sh 2010-06-03 05:50:32.000000000 +0000 @@ -58,7 +58,7 @@ SCRIPTLET_PATH="$SWSUSP_D/scriptlets.d /usr/local/share/hibernate/scriptlets.d /usr/share/hibernate/scriptlets.d" DEFAULT_CONFIG_FILE="$SWSUSP_D/hibernate.conf" EXE="${0##*/}" -VERSION="1.99" +VERSION="2.0" # Add these to the $PATH just in case. PATH="$PATH:/sbin:/usr/sbin:/usr/local/sbin" @@ -713,11 +713,13 @@ fi fi - if [ "${conffiles_read#*$file_name}" != "$conffiles_read" ]; then + if [ -n "$(echo ${conffiles_read} | grep ${file_name})" ]; then vecho 2 "$EXE: Skipping already included config file $file_name" return 0 fi + conffiles_read="${conffiles_read} ${file_name}" + while true ; do # Doing the read this way allows means we don't require a new-line # at the end of the file. @@ -915,4 +917,4 @@ exit $EXIT_CODE -# $Id: hibernate.sh 1196 2008-05-01 11:58:52Z nigel $ +# $Id$ diff -Nru hibernate-1.99/hibernate.sh.orig hibernate-2.0+15+g88d54a8/hibernate.sh.orig --- hibernate-1.99/hibernate.sh.orig 2008-05-01 11:59:58.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/hibernate.sh.orig 1970-01-01 00:00:00.000000000 +0000 @@ -1,920 +0,0 @@ -#!/bin/sh -# -*- sh -*- -# vim:ft=sh:ts=8:sw=4:noet -# -# Hibernate Script -# Copyright (C) 2004-2006 Bernard Blackham -# -# The hibernate-script package is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) any later -# version. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more -# details. -# -# You should have received a copy of the GNU General Public License along with -# this program. If not, write to the Free Software Foundation, Inc., 59 Temple -# Place - Suite 330, Boston, MA 02111-1307, USA. -# - -umask 077 - -USING_ZSH= -USING_BASH= -NEED_POSIX= - -# For zsh sanity... -# allows splitting strings on whitespace in zsh. -setopt SH_WORD_SPLIT 2>/dev/null && USING_ZSH=1 || true -# allows sourced files to know they're sourced in zsh. -unsetopt FUNCTION_ARGZERO 2>/dev/null || true - -# Detect bash and tell it not to be POSIX, because we like it better that way. -shopt > /dev/null 2>&1 && USING_BASH=1 -[ -n "$USING_BASH" ] && set +o posix 2>/dev/null - -[ -z "$USING_BASH$USING_ZSH" ] && NEED_POSIX=1 - -# We prefer to use dash if we've got it. -if [ -z "$NEED_POSIX" ] && [ -z "$TRIED_DASH" ] && - command -v dash > /dev/null 2>&1 ; then - - if [ "${0##*/}" = "$0" ] ; then - myself=`command -v $0` || myself= - elif [ -x "$0" ] ; then - myself=$0 - fi - - TRIED_DASH=1 - export TRIED_DASH - [ -n "$myself" ] && exec dash $myself $* -fi -unset TRIED_DASH - -SWSUSP_D="/etc/hibernate" -SCRIPTLET_PATH="$SWSUSP_D/scriptlets.d /usr/local/share/hibernate/scriptlets.d /usr/share/hibernate/scriptlets.d" -DEFAULT_CONFIG_FILE="$SWSUSP_D/hibernate.conf" -EXE="${0##*/}" -VERSION="1.98.1" - -# Add these to the $PATH just in case. -PATH="$PATH:/sbin:/usr/sbin:/usr/local/sbin" -export PATH - -# vecho N : acts like echo but with verbosity control - If it's -# high enough to go to stdout, then it'll get logged as well. Else write it to -# the log file if it needs to. Otherwise, ignore it. -vecho() { - local v - v="$1" - shift - [ "x$LOG_TIMESTAMP" = "x1" ] && set -- $(date "+%b %e %H:%M:%S.%2N") "$@" - if [ "$v" -le $VERBOSITY ] ; then - echo $@ - else - if [ "$v" -le $LOG_VERBOSITY -a "$LOGPIPE" != "cat" ] ; then - echo "$@" | $LOGPIPE > /dev/null - fi - fi -} - -# vcat N : acts like cat but with verbosity control - If it's -# high enough to go to stdout, then it'll get logged as well. Else write it to -# the log file if it needs to. Otherwise, ignore it. -vcat() { - local v - v="$1" - shift - if [ "$v" -le $VERBOSITY ] ; then - cat "$@" - else - if [ "$v" -le $LOG_VERBOSITY -a "$LOGPIPE" != "cat" ] ; then - cat "$@" | $LOGPIPE > /dev/null - else - cat > /dev/null - fi - fi -} - -############################################################################## -### The following functions can be called safely from within scriptlets ###### -############################################################################## - -# AddSuspendHook NN name: Adds a function to the suspend chain. NN must be a -# number between 00 and 99, inclusive. Smaller numbers get called earlier on -# suspend. -AddSuspendHook() { - SUSPEND_BITS="$1$2\\n$SUSPEND_BITS" -} -SUSPEND_BITS="" - -# AddResumeHook NN name: Adds a function to the resume chain. NN must be a number -# between 00 and 99, inclusive. Smaller numbers get called later on resume. -AddResumeHook() { - RESUME_BITS="$1$2\\n$RESUME_BITS" -} -RESUME_BITS="" - -# AddTerminationHandler : adds the given function to the chain of -# functions to handle termination cleanups. -AddTerminationHandler() { - TERMINATION_HANDLERS="$TERMINATIONS_HANDLERS $1" -} -TERMINATION_HANDLERS="" - -# AddConfigHandler : adds the given function to the chain of -# functions to handle extra configuration options. -AddConfigHandler() { - CONFIG_OPTION_HANDLERS="$CONFIG_OPTION_HANDLERS $1" -} -CONFIG_OPTION_HANDLERS="" - -# AddOptionHandler : adds the given function to the chain of -# functions to handle extra command line options. The scriptlet must also -# register the options with AddShortOption or AddLongOption -AddOptionHandler() { - CMDLINE_OPTION_HANDLERS="$CMDLINE_OPTION_HANDLERS $1" -} -CMDLINE_OPTION_HANDLERS="" - -# AddShortOption