kayprish/timeoutd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

merge into: kayprish:1.5
Branches Tags
kayprish:1.5
kayprish:master
kayprish:for-divegeek
...
pull from: kayprish:for-divegeek
Branches Tags
kayprish:1.5
kayprish:master
kayprish:for-divegeek
Sign in to create a new pull request.

11 commits
1.5 ... for-divege

Author SHA1 Message Date
Clark Rawlins
812394b9df Configure source format 
Define the source format as 3.0 (git)

Signed-off-by: Clark Rawlins <clark@bit63.org>
 2014-12-14 12:17:44 -08:00
Clark Rawlins
ef953698c5 Fix lintian errors in debian/changelog 
Lintian complians about a NMU version number.
Modify the changelog to use a standard version number.

Modify the changelog version to use the last 9 digits
of the sha1 hash for the git commit.

Add the build-arch and build-indep targets to the debian/rules
file.

Source init-functions in init script

Signed-off-by: Clark Rawlins <clark@bit63.org>
 2014-12-14 12:13:54 -08:00
Clark Rawlins
6ff7b56a42 Add ${misc:Depends} to binary dependencies 
Packages built with debhelper may introduce additional
binary package dependencies to a package that uses its
functions.  Adding ${misc:Depends} allows debhelper to
add any required dependencies to the package.

Signed-off-by: Clark Rawlins <clark@bit63.org>
 2014-12-14 10:43:28 -08:00
Clark Rawlins
cde92985ae Switch from dh_clean -k to dh_prep 
dh_clean -k is deprecated. Switch to the supported dh_clean
instead.

Signed-off-by: Clark Rawlins <clark@bit63.org>
 2014-12-14 10:35:22 -08:00
Clark Rawlins
af2d3b48c6 Use a temp to convert ut_time to time_t 
The localtime function takes a time_t* argument.  Passing
the ut_time member of the utmp struct as this argument
doesn't work on 64 bit systems because the lengths of the
arguments don't agree.  So use a temproary variable to
store the ut_time value in a time_t variable and pass
the address of the time_t variable to localtime.

Signed-off-by: Clark Rawlins <clark@bit63.org>
 2014-12-14 10:29:17 -08:00
Clark Rawlins
4f37273c60 Ignore warnings on unused return values 
Modify the Makefile to silence warnings about unused
return values in the source code.

Signed-off-by: Clark Rawlins <clark@bit63.org>
 2014-12-14 09:53:14 -08:00
Clark Rawlins
957c5aefad Update debian/compat to version 5 
To support recent versions of deb-buildpackage
increment debian/compat to version 5 (from version 4)

Signed-off-by: Clark Rawlins <clark@bit63.org>
 2014-12-14 09:51:05 -08:00
Clark Rawlins
ff3a5d11a1 Update debian/changelog with recent local changes 
Update the debian changelog with recent changes to the package.

Signed-off-by: Clark Rawlins <clark@bit63.org>
 2014-12-14 09:50:37 -08:00
Clark Rawlins
73dd70fdf8 Ignore files generated by building debian package 
Configure git to ignore files generated by the
build process and by the debian package build
process.

Signed-off-by: Clark Rawlins <clark@bit63.org>
 2014-12-14 09:21:27 -08:00
Clark Rawlins
119d66d4c1 Update debian/control Standards-Version: 
Update debian/control Standards-Version to the
current value: 3.9.5.

Signed-off-by: Clark Rawlins <clark@bit63.org>
 2014-12-14 09:09:20 -08:00
Clark Rawlins
f8a3bc0509 To resolve the symbol XOpenDisplay link with libX11 
When building the timeoutd binary the linker was not
finding the XOpenDisplay symbol.  By linking with
libX11 the missing symbol is found

Signed-off-by: Clark Rawlins <clark@defiant.bit63.org>
 2014-12-14 09:05:09 -08:00
10 changed files with 36 additions and 14 deletions
Show stats Expand all files Collapse all files

2
.gitignore vendored Normal file
View file

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

4
Makefile
View file

@ -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 timeoutd: timeoutd.c Makefile
#$(CC) $(CFLAGS) -o timeoutd timeoutd.c #$(CC) $(CFLAGS) -o timeoutd timeoutd.c
$(CC) $(CFLAGS) -o timeoutd.o -c timeoutd.c -DTIMEOUTDX11 $(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: install:

7
debian/.gitignore vendored Normal file
View file

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

14
debian/changelog vendored
View file

@ -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 ** -- Clark Rawlins <clark@bit63.org> Sun, 14 Dec 2014 09:28:59 -0800
* UNRELEASED
* Fixed local X session handling
-- Shawn Willden <shawn@kahlan.willden.org> Sun, 04 Jan 2009 23:17:57 -0700
timeoutd (1.5-10.1) unstable; urgency=low timeoutd (1.5-10.1) unstable; urgency=low

2
debian/compat vendored
View file

@ -1 +1 @@
4 5

4
debian/control vendored
View file

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

5
debian/rules vendored
View file

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

1
debian/source/format vendored Normal file
View file

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

2
debian/timeoutd.init.d vendored
View file

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

9
timeoutd.c
View file

@ -398,6 +398,7 @@ void read_wtmp()
FILE *fp; FILE *fp;
struct utmp ut; struct utmp ut;
struct tm *tm; struct tm *tm;
time_t time;
#ifdef DEBUG #ifdef DEBUG
openlog("timeoutd", OPENLOG_FLAGS, LOG_DAEMON); openlog("timeoutd", OPENLOG_FLAGS, LOG_DAEMON);
@ -418,7 +419,13 @@ void read_wtmp()
while (fread(&ut, sizeof(struct utmp), 1, fp) == 1) 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) if (tm->tm_year != now.tm_year || tm->tm_yday != now.tm_yday)
break; break;