xtrlock (2.6) unstable; urgency=low

  * patch from Simon Ruderich to correctly add hardening flags
  * check returns of setuid and setgid
  * build-depend on dpkg-dev

# imported from the archive

9 files changed, 355 insertions, 0 deletions

diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 0000000..4e2779e
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,57 @@
+This is X Transparent Lock.  Xtrlock is a very minimal X display lock
+program, which uses nothing except the Xlib library.  It doesn't
+obscure the screen, it is completely idle while the display is locked
+and you don't type at it, and it doesn't do funny things to the X
+access control lists.  On my system the binary is under 10K
+(Linux/i386, compiled with gcc -O2 -m486 -s).
+
+Note that xtrlock currently does not work with shadow passwords.  If
+someone sends me some portable patches for shadow password support
+I'll probably include them.
+
+[ Shadow passwords are now supported on Linux, and Solaris 2.x (not
+  tested).  To work with shadow passwords, this program should be
+  compiled with -DSHADOW_PWD and installed setuid root (it will drop
+  privileges as soon as possible).  The shadow-aware version will
+  still work fine if you don't have shadow passwords.
+
+  April 9, 1996
+  -- Marek Michalkiewicz <marekm@i17linuxb.ists.pwr.wroc.pl> ]
+
+You need an ANSI C compiler, such as GCC.  Do not attempt to compile
+xtrlock with an old C compiler such as most systems' `cc'.
+
+There is no support for X resources or command-line arguments - the
+timeouts and cursor bitmaps and colours cannot be modified.  If
+someone sends me some Xlib-only X resource support I may include it.
+
+To install xtrlock:
+
+Build the program:
+	xmkmf
+	make
+
+Test it:
+	./xtrlock
+
+Install it and the manpage:
+	really make install install.man
+
+
+xtrlock is Copyright 1993, 1994 Ian Jackson.  It 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.
+
+It 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.
+
+In order to save space I have not included a copy of version 2 of the
+GNU General Public Licence here.  If you do not have one, send me
+email at <ijackson@nyx.cs.du.edu>, or write to me at Churchill
+College, Cambridge, CB3 0DS, United Kingdom, or to the Free Software
+Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+
+It is also available by anonymous FTP from prep.ai.mit.edu.
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..411cd20
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,171 @@
+xtrlock (2.6) unstable; urgency=low
+
+  * patch from Simon Ruderich to correctly add hardening flags
+  * check returns of setuid and setgid
+  * build-depend on dpkg-dev
+  
+ -- Matthew Vernon <matthew@debian.org>  Tue, 07 Jan 2014 14:22:55 +0000
+
+xtrlock (2.5) unstable; urgency=low
+
+  * correct contributor name (sorry!)
+  * add hardening flags
+  * update version number
+
+ -- Matthew Vernon <matthew@debian.org>  Sun, 05 Jan 2014 16:27:52 +0000
+
+xtrlock (2.4) unstable; urgency=low
+
+  * add a -b option to blank the screen (code based on patch by Markus,
+    waldeck@gmx.de, for which thanks; documentation by myself. 
+    (Closes: #636993)
+
+ -- Matthew Vernon <matthew@debian.org>  Sun, 05 Jan 2014 12:01:48 +0000
+
+xtrlock (2.3) unstable; urgency=low
+
+  * remove reference to xlock, which is no longer in Debian (Closes: #721724)
+
+ -- Matthew Vernon <matthew@debian.org>  Wed, 04 Sep 2013 15:37:38 +0100
+
+xtrlock (2.2) unstable; urgency=low
+
+  * Move menu entry to /usr/share/menu
+  * Change menu section to Screen/Locking
+  * Update standards-version
+  * Add a lintian override for being setgid shadow
+  
+ -- Matthew Vernon <matthew@debian.org>  Tue, 26 Jun 2012 20:22:20 +0100
+
+xtrlock (2.1) unstable; urgency=low
+
+  * never exit non-zero without saying why.
+  * try repeatedly, with waits, to grab the keyboard (Closes: #316343).
+  * include a copy of the GPL in the source package (Closes: #519327).
+  * honour nostrip DEB_BUILD_OPTION (Closes: #438346).
+  * Debian's package is essentially upstream; only include one changelog
+    in the binary package (rather than one and a symlink)
+  * Don't install README.Debian any more, as it's mostly just build
+    instructions
+  
+ -- Matthew Vernon <matthew@debian.org>  Tue, 26 Jun 2012 19:12:02 +0100
+
+xtrlock (2.0-14) unstable; urgency=low
+
+  * remove obsolete build-depends on xutils (closes: #579036)
+
+ -- Matthew Vernon <matthew@debian.org>  Thu, 13 May 2010 18:01:51 +0100
+
+xtrlock (2.0-13) unstable; urgency=low
+
+  * build-depend on x11proto-core-dev rather than the old x-dev
+  * build-depend on xutils-dev (closes: #485728)
+
+ -- Matthew Vernon <matthew@debian.org>  Tue, 23 Dec 2008 11:36:04 +0000
+
+xtrlock (2.0-12) unstable; urgency=low
+
+  * Install into /usr not /usr/X11R6 (closes: #362206, #363293)
+
+ -- Matthew Vernon <matthew@debian.org>  Tue, 18 Apr 2006 17:19:10 +0100
+
+xtrlock (2.0-11) unstable; urgency=low
+  * Fix build-depends: for new etch (closes: #346840)
+
+ -- Matthew Vernon <matthew@debian.org>  Sat, 14 Jan 2006 15:30:28 +0000
+	
+xtrlock (2.0-10) unstable; urgency=low
+
+  * Take over this package, since I seem to have some tuits
+  * Correct the Author's address in the manpage to something sensible
+  * Similarly the original packager's.
+  * For reference, the security problem fixed in -9 was CAN-2005-0079
+	
+ -- Matthew Vernon <matthew@debian.org>  Thu, 20 Jan 2005 14:02:10 +0000
+	
+xtrlock (2.0-9) unstable; urgency=high
+
+  * Fix the problem whereby we unlocked on long input (closes: #278191, #278190)
+  * tidy up a switch statement (closes: #264173)
+
+ -- Matthew Vernon <matthew@debian.org>  Mon, 17 Jan 2005 10:47:09 +0000
+	
+xtrlock (2.0-8) unstable; urgency=low
+
+  * Uploading with maintainer set to QA group
+
+ -- Andrew Pollock <apollock@debian.org>  Sun, 15 Feb 2004 18:32:12 +1100
+
+xtrlock (2.0-7) unstable; urgency=low
+
+  * Maintainer upload.
+  * Update to standards version 3.5.6.
+  * Removes buffer overrun potentiality (closes: #154738)
+  * Drop setgid privileges (closes: #154740)
+
+ -- Martin Mitchell <martin@debian.org>  Sun,  1 Sep 2002 14:49:26 +1000
+
+xtrlock (2.0-6.1) unstable; urgency=low
+
+  * NMU
+  * Removed the buffer overrun potentiallity (closes: #154738)
+  * Update the code for remove the possibilty to read shadow file 
+  (closes: #154740)
+  * Fix spelling error in the copyright file
+  * Fix the place where is stored the common-licenses 
+  * Update the debian/rules to:
+    - strip the /usr/X11R6/bin/xtrlock
+    - include the section and priority in control
+  * Update the debian/control file:
+    - include the build-depends
+    - update the standard-version to 3.5.6
+
+ -- Otavio Salvador <otavio@debian.org>  Sat, 31 Aug 2002 16:23:21 -0300
+
+xtrlock (2.0-6) unstable; urgency=low
+
+  * Update to standards version 3.0.1.
+  * Add menu entry. (closes: #46201)
+
+ -- Martin Mitchell <martin@debian.org>  Thu, 28 Oct 1999 18:38:14 +1000
+
+xtrlock (2.0-5) unstable; urgency=low
+
+  * Correct installation path during package build. (#25055)
+  * Update to standards version 2.4.1.
+  * Update copyright file.
+
+ -- Martin Mitchell <martin@debian.org>  Sun,  2 Aug 1998 13:01:29 +1000
+
+xtrlock (2.0-4) unstable; urgency=low
+
+  * Make xtrlock setgid shadow, instead of setuid root. (#7635,#8543)
+
+ -- Martin Mitchell <martin@debian.org>  Thu,  4 Dec 1997 00:27:07 +1100
+
+xtrlock (2.0-3) unstable; urgency=low
+
+  * New maintainer.
+
+ -- Martin Mitchell <martin@debian.org>  Thu, 27 Nov 1997 01:34:14 +1100
+
+xtrlock (2.0-2.2) unstable; urgency=low
+  
+  * Non-maintainer release.
+  * Libc6 compile.
+  * Update from pre-2.0.0.0 standards.
+
+ -- Martin Mitchell <martin@debian.org>  Wed, 22 Oct 1997 18:07:31 +1000
+
+xtrlock-2.0 Debian 3 - Michael Meskes <meskes@debian.org>
+Include shadow patches
+Add architecture field (Bug#4041)
+Minor changes to debian.rules
+gzip manpage
+
+xtrlock-2.0 Debian 0 - sde
+
+Initial release.
+
+
+
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..c01554d
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,15 @@
+Source: xtrlock
+Maintainer: Matthew Vernon <matthew@debian.org>
+Section: x11
+Priority: optional
+Build-Depends: libx11-dev, x11proto-core-dev, xutils-dev, dpkg-dev (>= 1.16.1~)
+Standards-Version: 3.9.1
+
+Package: xtrlock
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Minimal X display lock program
+ xtrlock is a very minimal X display lock program, which uses nothing
+ except the Xlib library.  It doesn't obscure the screen, it is
+ completely idle while the display is locked and you don't type at it,
+ and it doesn't do funny things to the X access control lists.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..fa5463f
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,29 @@
+This is Debian GNU/Linux's prepackaged version of Ian Jackson's xtrlock
+utility.  This package provides a minimal X display lock program.
+
+This package was put together by Stephen Early
+<steve@greenend.org.uk>, from the source by Ian Jackson, which he
+obtained from Usenet.  Apart from a couple of bugfixes the changes
+were very minimal - merely adding support for the Debian package
+maintenance scheme, by adding various debian.* files.
+
+This package is now maintained by Matthew Vernon <matthew@debian.org>.
+
+Program Copyright (C) 1993, 1994 Ian Jackson.
+Modifications for Debian GNU/Linux Copyright (C) 1995 Stephen Early.
+Modifications for Debian GNU/Linux since v2.0-9 Copyright (C)
+2005-2012 Matthew Vernon
+
+This program and its documentation are free software; you can
+redistribute them and/or modify them under the terms of the GNU
+General Public License as published by the Free Software Foundation;
+either version 3, 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.
+
+On Debian GNU/Linux, a copy of the GNU General Public License version
+3 may be found in /usr/share/common-licenses/GPL-3. It is also
+included in the source package as GPL-3.txt
diff --git a/debian/menu b/debian/menu
new file mode 100644
index 0000000..b4b218a
--- /dev/null
+++ b/debian/menu
@@ -0,0 +1 @@
+?package(xtrlock):command="xtrlock" section="Screen/Locking" needs="x11" title="Xtrlock" longtitle="Xtrlock: X terminal lock"
diff --git a/debian/postinst b/debian/postinst
new file mode 100755
index 0000000..d6c27dd
--- /dev/null
+++ b/debian/postinst
@@ -0,0 +1,2 @@
+#!/bin/sh -e
+if [ -x /usr/bin/update-menus ] ; then update-menus ; fi
diff --git a/debian/postrm b/debian/postrm
new file mode 100755
index 0000000..d6c27dd
--- /dev/null
+++ b/debian/postrm
@@ -0,0 +1,2 @@
+#!/bin/sh -e
+if [ -x /usr/bin/update-menus ] ; then update-menus ; fi
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..c6e755b
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,75 @@
+#!/usr/bin/make -f
+# debian/rules file for xtrlock-2.0
+# Based upon the sample debian.rules file by Ian Jackson.
+
+package=xtrlock
+
+arch=$(shell dpkg --print-architecture)
+STRIP=strip
+
+DPKG_EXPORT_BUILDFLAGS = 1
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+include /usr/share/dpkg/buildflags.mk
+
+CFLAGS+=-DSHADOW_PWD
+
+build:
+	$(checkdir)
+	xmkmf
+	$(MAKE) CFLAGS="$(CFLAGS)" CDEBUGFLAGS="" LOCAL_LDFLAGS="$(LDFLAGS)" xtrlock
+	touch build
+
+clean:
+	$(checkdir)
+	-rm -f build
+	-rm -f xtrlock *.o *.bak Makefile
+	-rm -rf debian/tmp *~ debian/files debian/substvars debian/*~
+
+binary-indep:	checkroot
+#No binary independent files in this package
+
+binary-arch:	checkroot build
+	-rm -rf debian/tmp
+	install -m 755 -d debian/tmp/usr/bin debian/tmp/usr/share/man/man1
+	install -m 755 -d debian/tmp/usr/share/doc/xtrlock debian/tmp/DEBIAN
+	install -m 755 -d debian/tmp/usr/share/menu
+	install -m 755 -d debian/tmp/usr/share/lintian/overrides
+	# has to be setgid shadow to support shadow passwords.  --marekm
+	install -m 755 xtrlock debian/tmp/usr/bin/xtrlock
+	# Is nostrip set in DEB_BUILD_OPTIONS?
+	case "$$DEB_BUILD_OPTIONS" in \
+	*nostrip*)\
+	;; \
+	*) \
+	$(STRIP) debian/tmp/usr/bin/xtrlock \
+	;; \
+	esac
+	install -m 644 xtrlock.man debian/tmp/usr/share/man/man1/xtrlock.1x
+	gzip -9v debian/tmp/usr/share/man/man1/xtrlock.1x
+	install -m 644 debian/changelog debian/tmp/usr/share/doc/xtrlock
+	gzip -9v debian/tmp/usr/share/doc/xtrlock/*
+	install -m 644 debian/copyright debian/tmp/usr/share/doc/xtrlock
+	install -m 644 debian/menu debian/tmp/usr/share/menu/xtrlock
+	install -m 644 debian/xtrlock.lintian-overrides \
+	debian/tmp/usr/share/lintian/overrides/xtrlock
+	install -m 755 debian/postinst debian/postrm debian/tmp/DEBIAN
+	cp debian/control debian/tmp/DEBIAN/control
+	dpkg-shlibdeps debian/tmp/usr/bin/xtrlock
+	dpkg-gencontrol -isp
+	chown -R root.root debian/tmp
+	chown root.shadow debian/tmp/usr/bin/xtrlock
+	chmod -R g-w debian/tmp
+	chmod 2755 debian/tmp/usr/bin/xtrlock
+	dpkg --build debian/tmp ..
+
+binary:	binary-indep binary-arch
+
+define checkdir
+	test -f debian/rules
+endef
+
+checkroot:
+	$(checkdir)
+	test root = "`whoami`"
+
+.PHONY: binary clean checkroot
diff --git a/debian/xtrlock.lintian-overrides b/debian/xtrlock.lintian-overrides
new file mode 100644
index 0000000..505c290
--- /dev/null
+++ b/debian/xtrlock.lintian-overrides
@@ -0,0 +1,3 @@
+#Lintian overrides for xtrlock
+#xtrlock needs to be setgit shadow so it can read the shadow file
+xtrlock: setgid-binary usr/bin/xtrlock 2755 root/shadow