Configure source format

Define the source format as 3.0 (git)

Signed-off-by: Clark Rawlins <clark@bit63.org>

.gitignore

@@ -0,0 +1,2 @@
+timeoutd
+*.o

Makefile

@@ -1,8 +1,8 @@
-CFLAGS=-fomit-frame-pointer -O2 -s -g -Wall
+CFLAGS=-fomit-frame-pointer -O2 -s -g -Wall -Wno-unused-result
 timeoutd:	timeoutd.c Makefile
 	#$(CC) $(CFLAGS) -o timeoutd timeoutd.c
 	$(CC) $(CFLAGS) -o timeoutd.o -c timeoutd.c -DTIMEOUTDX11
-	$(CC) $(CFLAGS) -o timeoutd -L/usr/X11R6/lib timeoutd.o -lXss -lXext
+	$(CC) $(CFLAGS) -o timeoutd -L/usr/X11R6/lib timeoutd.o -lXss -lXext -lX11
 	
 
 install:

debian/.gitignore

@@ -0,0 +1,7 @@
+files
+timeoutd.debhelper.log
+timeoutd.postinst.debhelper
+timeoutd.postrm.debhelper
+timeoutd.prerm.debhelper
+timeoutd.substvars
+timeoutd

debian/changelog

@@ -1,11 +1,11 @@
-timeoutd (1.5-10.1ubuntu1~1.gbp45a983) UNRELEASED; urgency=low
+timeoutd (1.5-10.2) unstable; urgency=low
+  * Non-maintainer upload
+  * Resolve the missing symbol XOpenDisplay by linking with libX11
+  * Update debian/control Standards-Version: 3.9.5 
+  * Ignore files generated by building debian package
+  * Update debian/compat to version 5 
 
-  ** SNAPSHOT build @45a9836343ec6efa904b51360713c52fb623d6d8 **
-
-  * UNRELEASED
-  * Fixed local X session handling
-
- -- Shawn Willden <shawn@kahlan.willden.org>  Sun, 04 Jan 2009 23:17:57 -0700
+ -- Clark Rawlins <clark@bit63.org>  Sun, 14 Dec 2014 09:28:59 -0800
 
 timeoutd (1.5-10.1) unstable; urgency=low
 

debian/compat

@@ -1 +1 @@
-4
+5

debian/control

@@ -2,12 +2,12 @@ Source: timeoutd
 Section: admin
 Priority: extra
 Maintainer: Dennis Stampfer <seppy@debian.org>
-Standards-Version: 3.6.2
+Standards-Version: 3.9.5
 Build-Depends: debhelper (>= 4), libx11-dev, libxss-dev
 
 Package: timeoutd
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends} 
 Conflicts: suidmanager (<< 0.50)
 Description: Flexible user timeout daemon with X11 support
  timeoutd enforces the time restrictions specified for each or all users.

debian/rules

@@ -4,6 +4,9 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
+build-arch: build
+
+build-indep: build
 
 build:
 	$(MAKE) timeoutd
@@ -20,7 +23,7 @@ clean:
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 
 	# Add here commands to install the package into debian/<packagename>

debian/source/format

@@ -0,0 +1 @@
+3.0 (git)

debian/timeoutd.init.d

@@ -16,6 +16,8 @@ DESC="user timeout daemon"
 
 test -x $DAEMON || exit 0
 
+. /lib/lsb/init-functions
+
 set -e
 
 case "$1" in

timeoutd.c

@@ -398,6 +398,7 @@ void read_wtmp()
     FILE	*fp;
     struct utmp	ut;
     struct tm	*tm;
+    time_t time;
 
 #ifdef DEBUG
     openlog("timeoutd", OPENLOG_FLAGS, LOG_DAEMON);
@@ -418,7 +419,13 @@ void read_wtmp()
 
     while (fread(&ut, sizeof(struct utmp), 1, fp) == 1)
     {
-      tm = localtime(&ut.ut_time);
+      /* On 64 bit systems time_t is a 64 bit integer
+         while ut_time is a 32 bit (unsigned) integer.
+	 Copy the value to a time_t value so the pointer
+         types agree in the call to localtime.
+       */
+      time = ut.ut_time;
+      tm = localtime(&time);
 
       if (tm->tm_year != now.tm_year || tm->tm_yday != now.tm_yday)
         break;