debian/0000755000000000000000000000000012142720055007164 5ustar debian/control0000644000000000000000000000141312142714350010567 0ustar Source: xautolock Section: x11 Priority: optional Maintainer: Roland Stigge Build-Depends: debhelper (>= 9), xutils-dev (>= 1:1.0.2-2), libx11-dev, libxss-dev, x11proto-core-dev, dpkg-dev (>= 1.16.1~) Standards-Version: 3.9.4 Package: xautolock Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: xtrlock | xscreensaver Description: Program launcher for idle X sessions Xautolock monitors input devices under the X Window System, and launches a program of your choice if there is no activity after a user-configurable period of time. You can use this to automatically start up a screen locker if you have left your computer unattended for some period of time. The program launched need not be a screen locker such as xlock. debian/changelog0000644000000000000000000001436612142715261011053 0ustar xautolock (1:2.2-4) unstable; urgency=low * debian/control: - Removed xautolock from Recommends since it was removed from Debian - Standards-Version: 3.9.4 - Depends: debhelper (>= 9) * debian/compat: 9 * debian/rules: - Use hardening flags - Use dh style rules -- Roland Stigge Thu, 09 May 2013 14:20:14 +0200 xautolock (1:2.2-3) unstable; urgency=low * Added debian/watch -- Roland Stigge Mon, 15 Aug 2011 22:14:15 +0200 xautolock (1:2.2-2) unstable; urgency=low * Moved to source format 3.0 (quilt) - removed dpatch dependency * Fixed HPPA build issue (Closes: #577682) -- Roland Stigge Sat, 05 Jun 2010 14:59:08 +0200 xautolock (1:2.2-1) unstable; urgency=low * New upstream release * Removed debian/patches/01_reset-after-sleep.dpatch, included upstream now -- Roland Stigge Sat, 06 Mar 2010 20:52:28 +0100 xautolock (1:2.1-8) unstable; urgency=low * Build-Depend: x11proto-core-dev (Closes: #515410) * Added patch by Miguelangel Jose Freitas Loreto to fix the no DPMS detection (Closes: #545778) * debian/control: Standards-Version: 3.8.4 * Acknowledge NMU -- Roland Stigge Sun, 21 Feb 2010 16:40:38 +0100 xautolock (1:2.1-7.1) unstable; urgency=high * Non-maintainer upload. * 10-fix-memory-corruption to fix a memory corruption problem leading to a user security problem (closes: 514406). Thanks to Uli for spotting the problem and providing the fix. * Urgency high since it is a user security hole that really should make it into lenny. -- Vincent Fourmond Tue, 10 Feb 2009 21:49:25 +0100 xautolock (1:2.1-7) unstable; urgency=high * High-urgency upload for RC bugfix by Steve Langasek * Build against xutils-dev (>= 1:1.0.2-2) to get the X11R7 paths, and fix debian/rules to install to /usr/share/man instead of /usr/X11R6/man (Closes: #362773) -- Roland Stigge Sun, 16 Apr 2006 10:52:38 +0200 xautolock (1:2.1-6) unstable; urgency=low * Changed from xlibs-dev build dependency to new individual X.org development package dependencies (Closes: #346793) * debian/control: Standards-Version: 3.6.2 * debian/rules: renamed xautolock.1x to xautolock.1 -- Roland Stigge Tue, 10 Jan 2006 08:49:45 +0100 xautolock (1:2.1-5) unstable; urgency=low * debian/control: Added dpatch to Build-Depends * Added debian/patches/01_reset-after-sleep.dpatch (Closes: #241213) -- Roland Stigge Sat, 3 Apr 2004 13:48:13 +0200 xautolock (1:2.1-4) unstable; urgency=low * debian/copyright: Copyright clarification -- Roland Stigge Mon, 15 Dec 2003 11:34:50 +0100 xautolock (1:2.1-3) unstable; urgency=low * New maintainer (Closes: #220557) * debian/control: Adjusted Description * debian/rules clean: removes (xmkmf generated) Makefile * Removed redundant man pages from source tree * debian/changelog: Changed encoding from ISO-8859-1 to UTF-8 * debian/copyright: Actuality adjustments * Removed debian/dirs * Standards-Version: 3.6.1 -- Roland Stigge Tue, 18 Nov 2003 21:09:01 +0100 xautolock (1:2.1-2) unstable; urgency=low * Don't use /usr/share/doc/xautolock/html/ (closes: Bug#191389,Bug#190842) -- Søren Boll Overgaard Wed, 30 Apr 2003 12:43:48 +0000 xautolock (1:2.1-1) unstable; urgency=low * New maintainer (Closes: Bug#189522) * New upstream version. * Move to debhelper -- Søren Boll Overgaard Wed, 23 Apr 2003 18:18:20 +0000 xautolock (1:2.0-2.1) unstable; urgency=low * NMU * Update Build-Depends from xlib6g-dev to xlibs-dev. Closes: #170116. -- Daniel Schepler Sat, 15 Mar 2003 20:58:06 -0800 xautolock (1:2.0-2) unstable; urgency=low * patch from Patrice Neff: correct -notify (closes: #147866) -- Frederic Lepied Sun, 3 Nov 2002 17:39:28 +0000 xautolock (1:2.0-1) unstable; urgency=low * new version (closes: #102883) * not native build (closes: #44331) * should build on all platform (closes: #64205) * added Epoch. -- Frederic Lepied Thu, 22 Nov 2001 02:42:49 +0000 xautolock (pl15-3) unstable; urgency=low * removed debian/files in the clean target of debian/rules. Closes: Bug#46480. * changed the package description. Closes: #37502. * Closes: Bug#4433. -- Frederic Lepied Sun, 10 Oct 1999 20:39:13 +0200 xautolock (pl15-2) unstable; urgency=low * pristine sources. CLoses: Bug#4433. -- Frederic Lepied Sun, 5 Sep 1999 18:19:07 +0200 xautolock (pl15-1) unstable; urgency=low * new upstream version. Closes bugs #14630 and #34509.. -- Frederic Lepied Sat, 27 Mar 1999 07:19:35 +0100 xautolock (pl13-1) unstable; urgency=low * new upstream version. -- Frederic Lepied Thu, 19 Nov 1998 20:45:30 +0100 xautolock (pl10-7) unstable; urgency=low * new maintainer. * compiled with libc6. * put the copyright under /usr/doc/xautolock (closed bug #10625). -- Frederic Lepied Sun, 6 Jul 1997 08:48:50 +0200 xautolock (pl10-6) unstable; urgency=LOW * Removed distribution frozen from release -- Michael Meskes Tue, 3 Jun 1997 20:42:04 +0200 xautolock (pl10-5) frozen unstable; urgency=LOW * Really fix bug#8618 -- Michael Meskes Fri, 30 May 1997 14:30:47 +0200 xautolock (pl10-4) frozen unstable; urgency=LOW * Do not use free on a getenv return value (Bug#8618) * Changed section to non-free, although it is almost free (Bug#8676) -- Michael Meskes Mon, 16 Sep 1996 10:31:57 +0200 xautolock (pl10-3) unstable; urgency=LOW * New source packing scheme * Install docs * Added a `Recommends: xlockmore|xtrlock' line to control file (Bug#4438) -- Michael Meskes Mon, 16 Sep 1996 10:31:57 +0200 Tue Apr 30 16:57:14 MET DST 1996 Michael Meskes xautolock (pl10-1): * Added Debian files Sun Jun 30 16:22:25 MET DST 1996 Michael Meskes xautolock (pl10-2): * New naming scheme * Gzip manpage debian/watch0000644000000000000000000000012611622276471010226 0ustar version=3 http://www.ibiblio.org/pub/Linux/X11/screensavers/ xautolock-(\d+\..+)\.tgz debian/rules0000755000000000000000000000072612142717770010263 0ustar #!/usr/bin/make -f # Sample debian/rules that uses debhelper. # GNU copyright 1997 to 1999 by Joey Hess. # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/buildflags.mk %: dh $@ override_dh_auto_build: xmkmf $(MAKE) EXTRA_LDOPTIONS="$(LDFLAGS)" CCOPTIONS="$(CFLAGS) $(CPPFLAGS)" override_dh_auto_install: dh_auto_install cp xautolock.man $(CURDIR)/debian/xautolock/usr/share/man/man1/xautolock.1 debian/patches/0000755000000000000000000000000011402455503010614 5ustar debian/patches/11-fix-no-dpms.patch0000644000000000000000000000401211402450114014203 0ustar Description: Fix no DPMS detection xautolock reset when the screen blanks Author: Roland Stigge Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=545778 diff -x debian -Naur xautolock-2.1.orig/include/config.h xautolock-2.1/include/config.h --- xautolock-2.1.orig/include/config.h 2002-01-15 11:02:14.000000000 -0430 +++ xautolock-2.1/include/config.h 2010-01-07 09:52:22.000000000 -0430 @@ -64,6 +64,7 @@ #ifdef HasScreenSaver #include +#include #endif /* HasScreenSaver */ #ifndef HasVFork diff -x debian -Naur xautolock-2.1.orig/src/engine.c xautolock-2.1/src/engine.c --- xautolock-2.1.orig/src/engine.c 2002-01-15 11:07:31.000000000 -0430 +++ xautolock-2.1/src/engine.c 2010-01-07 09:52:22.000000000 -0430 @@ -30,7 +30,10 @@ void queryIdleTime (Display* d, Bool use_xidle) { - Time idleTime = 0; /* millisecs since last input event */ + int dummy; + CARD16 standby, suspend, off; + CARD16 state; + BOOL onoff; Time idleTime = 0; /* millisecs since last input event */ #ifdef HasXidle if (use_xidle) @@ -48,6 +51,33 @@ #endif /* HasScreenSaver */ } + if (DPMSQueryExtension(d, &dummy, &dummy)) { + if (DPMSCapable(d)) { + DPMSGetTimeouts(d, &standby, &suspend, &off); + DPMSInfo(d, &state, &onoff); + + if (onoff) { + switch (state) { + case DPMSModeStandby: + if (idleTime < (unsigned) (standby * 1000)) + idleTime += (standby * 1000); + break; + case DPMSModeSuspend: + if (idleTime < (unsigned) ((suspend + standby) * 1000)) + idleTime += ((suspend + standby) * 1000); + break; + case DPMSModeOff: + if (idleTime < (unsigned) ((off + suspend + standby) * 1000)) + idleTime += ((off + suspend + standby) * 1000); + break; + case DPMSModeOn: + default: + break; + } + } + } + } + if (idleTime < 1000) { resetTriggers (); debian/patches/10-fix-memory-corruption.patch0000644000000000000000000000201311402450230016335 0ustar Description: Fix memory corruption xautolock: Uses freed memory for starting the locker Author: Roland Stigge Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=514406 diff -urNad xautolock-2.1~/src/options.c xautolock-2.1/src/options.c --- xautolock-2.1~/src/options.c 2002-01-15 16:37:33.000000000 +0100 +++ xautolock-2.1/src/options.c 2009-02-10 21:40:02.000000000 +0100 @@ -250,6 +250,8 @@ * actually consists of multiple ones, we need to look for `;' * characters first. We can only err on the safe side here... */ + /* FIXME: This would also need to handle other stuff like e.g. & */ +#if 0 if (!strchr (*command, ';')) { char* tmp; @@ -257,6 +259,14 @@ "exec %s", *command); *command = tmp; } +#else + /* Create a copy of the string or else XrmDestroyDatabase would free() that + * string from underneath us. + */ + char* tmp = newArray (char, strlen (*command) + 1); + (void) strcpy (tmp, *command); + *command = tmp; +#endif } #endif /* !VMS */ debian/patches/13-fix-hppa-build.patch0000644000000000000000000000125711402455444014700 0ustar Description: Fix HPPA build problem for Debian The Imakefile originally assumed to have a different environment regarding DPMS/screensaver on HPPA. This is not true for Debian since HPPA does not mean HP-UX Author: Roland Stigge Bug-Debian: http://bugs.debian.org/577682 --- xautolock-2.2.orig/Imakefile +++ xautolock-2.2/Imakefile @@ -5,11 +5,7 @@ /* * Tell it what extensions to use. */ -#ifndef HPArchitecture #define HasScreenSaver 1 /* By default assume to have MIT ScreenSaver, */ -#else -#define HasScreenSaver 0 /* except on HP machines (sigh...) */ -#endif #define HasXidle 0 /* By default assume not to have Xidle. */ debian/patches/series0000644000000000000000000000014111402455503012025 0ustar 10-fix-memory-corruption.patch 11-fix-no-dpms.patch 12-fix-manpage.patch 13-fix-hppa-build.patch debian/patches/12-fix-manpage.patch0000644000000000000000000000057111402446701014254 0ustar Description: Fix manpage bug The manpage resulted in errors because "1" was confused with an "l" Author: Roland Stigge --- xautolock-2.2.orig/xautolock.man +++ xautolock-2.2/xautolock.man @@ -1,4 +1,4 @@ -.TH xautolock l "December 28, 2007" +.TH xautolock 1 "December 28, 2007" .SH NAME xautolock \- fire up programs in case of user inactivity under X debian/dirs0000644000000000000000000000002312142716337010053 0ustar usr/share/man/man1 debian/source/0000755000000000000000000000000012142712064010465 5ustar debian/source/format0000644000000000000000000000001411402444547011701 0ustar 3.0 (quilt) debian/copyright0000644000000000000000000000315311402444170011120 0ustar This is the Debian packaged version of xautolock. Authors: Stefan De Troch Michel Eyckmans (current maintainer) Copyright 1990, 1992-1999, 2001-2002 by Stefan De Troch and Michel Eyckmans This package was put together by the following Debian maintainers: Michael Meskes Frederic Lepied Søren Boll Overgaard Roland Stigge The sources can be obtained from: http://www.ibiblio.org/pub/Linux/X11/screensavers/ Xautolock licensing =================== Versions 2.0 and above of xautolock can be redistributed and/or modified under the terms of version 2 of the GNU General Public License as published by the Free Software Foundation. The complete license is available as /usr/share/common-licenses/GPL-2 on your Debian system Note that this General Public License does not permit incorporating version 2.0 and above of xautolock into programs that are distributed under terms incompatible with those of the GNU General Public License. If this limitation is a problem for you, please consider using the earlier versions 1.7 to 1.15 of xautolock (previously known as "patchlevel 7" to "patchlevel 15"). These earlier versions can be redistributed and/or modified under a simple "for non-commercial use" license. On demand, these earlier versions can also be made available under other conditions on a case by case basis. This program is distributed 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. debian/compat0000644000000000000000000000000212142712164010364 0ustar 9 debian/docs0000644000000000000000000000001411402444170010031 0ustar Readme Todo