Author: baggins Date: Thu Nov 26 22:59:43 2009 GMT Module: packages Tag: HEAD ---- Log message: - rel 9 - open terminal in non-blocking mode to avoid hanging the daemon indefinitely
---- Files affected: packages/idled: idled.spec (1.27 -> 1.28) , idled-O_NONBLOCK.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/idled/idled.spec diff -u packages/idled/idled.spec:1.27 packages/idled/idled.spec:1.28 --- packages/idled/idled.spec:1.27 Tue Feb 13 09:06:35 2007 +++ packages/idled/idled.spec Thu Nov 26 23:59:38 2009 @@ -3,7 +3,7 @@ Summary(pl.UTF-8): Demon który kończy nieaktywne sesje użytkowników Name: idled Version: 1.16 -Release: 8 +Release: 9 License: non-profit Group: Daemons Source0: http://www.darkwing.com/idled/download/%{name}-%{version}.tar.gz @@ -14,6 +14,7 @@ Patch2: %{name}-config.patch Patch3: %{name}-utmp.patch Patch4: %{name}-yacc.patch +Patch5: %{name}-O_NONBLOCK.patch BuildRequires: bison BuildRequires: flex BuildRequires: rpmbuild(macros) >= 1.268 @@ -40,6 +41,7 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build %{__make} clean @@ -99,6 +101,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.28 2009/11/26 22:59:38 baggins +- rel 9 +- open terminal in non-blocking mode to avoid hanging the daemon indefinitely + Revision 1.27 2007/02/13 08:06:35 glen - tabs in preamble ================================================================ Index: packages/idled/idled-O_NONBLOCK.patch diff -u /dev/null packages/idled/idled-O_NONBLOCK.patch:1.1 --- /dev/null Thu Nov 26 23:59:43 2009 +++ packages/idled/idled-O_NONBLOCK.patch Thu Nov 26 23:59:38 2009 @@ -0,0 +1,31 @@ +--- idled-1.16/zap.c~ 1996-05-05 04:37:06.000000000 +0200 ++++ idled-1.16/zap.c 2009-11-26 23:56:30.852304399 +0100 +@@ -94,7 +94,7 @@ + + if (do_msg) + { +- td = open (him->line, O_RDWR, 0600); ++ td = open (him->line, O_RDWR|O_NONBLOCK, 0600); + (void) tcflow(td, TCOON); + } + +--- idled-1.16/warn.c~ 1996-05-16 23:59:57.000000000 +0200 ++++ idled-1.16/warn.c 2009-11-26 23:56:15.652305661 +0100 +@@ -73,6 +73,7 @@ + register struct user *him; + int opened = 0, status; + FILE *termf; ++ int termfd; + time_t tempus; + + #if (DEBUG > 1) || defined(DISABLE_WARNS) +@@ -177,7 +178,8 @@ + else + fclose(termf); /* Just fine. Go ahead and do messages */ + +- if ((termf = fopen (him->line, "w")) == (FILE *) NULL) ++ termfd = open (him->line, O_WRONLY|O_NONBLOCK); ++ if ((termfd == -1) || ((termf = fdopen (termfd, "w")) == (FILE *) NULL)) + { + /* An error! Check to see if we have already logged it. */ + if (inlinetime(him,&errorlines)) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/idled/idled.spec?r1=1.27&r2=1.28&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
