[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/mgetty/devel mgetty-1.1.31-162174_tcflush.patch, NONE, 1.1 mgetty.spec, 1.27, 1.28



Author: jvdias

Update of /cvs/dist/rpms/mgetty/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16879

Modified Files:
	mgetty.spec 
Added Files:
	mgetty-1.1.31-162174_tcflush.patch 
Log Message:
fix bugs 162174, 159581

mgetty-1.1.31-162174_tcflush.patch:
 logname.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE mgetty-1.1.31-162174_tcflush.patch ---
--- mgetty-1.1.31/logname.c.162174_tcflush	2005-07-22 17:11:17.650852000 -0400
+++ mgetty-1.1.31/logname.c	2005-07-22 17:13:13.114273000 -0400
@@ -368,10 +368,11 @@
 	    {
 		printf( "\r\n\07\r\nYour login time (%d minutes) ran out. Goodbye.\r\n",
 		       (max_login_time / 60)+1 );
-		
+		alarm(0);               /* turn off alarm */
 		sleep(3);		/* give message time to xmit */
 		lprintf( L_AUDIT, "failed dev=%s, pid=%d, login time out",
 			 Device, getpid() );
+		tcflush(1,TCOFLUSH);    /* allow us to exit without hanging (bug 164002) */
 		exit(0);		/* bye bye... */
 	    }
 	    ch = CKILL;			/* timeout #1 -> clear input */


Index: mgetty.spec
===================================================================
RCS file: /cvs/dist/rpms/mgetty/devel/mgetty.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- mgetty.spec	5 Jun 2005 17:34:04 -0000	1.27
+++ mgetty.spec	23 Jul 2005 00:37:32 -0000	1.28
@@ -28,6 +28,7 @@
 Patch13: mgetty-1.1.31-W-format.patch
 Patch14: mgetty-1.1.31-sendmail_path.patch
 Patch15: mgetty-1.1.31-lfs.patch
+Patch16: mgetty-1.1.31-162174_tcflush.patch
 License: GPL
 Group: Applications/Communications
 Prereq: /sbin/install-info
@@ -114,7 +115,7 @@
 cp policy.h-dist policy.h
 %patch14 -p1 -b .sendmail_path
 %patch15 -p1 -b .lfs
-
+%patch16 -p1 -b .162174_tcflush
 
 %build
 PATH=$PATH:/usr/X11R6/bin
@@ -182,6 +183,9 @@
 # remove file droppings from $RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT%{_bindir}/cutbl
 
+# remove file conflict with netpbm:
+rm -f $RPM_BUILD_ROOT%{_bindir}/g3topbm
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -299,6 +303,8 @@
 %{_mandir}/man1/pvfsine.1*
 %{_mandir}/man1/pvfspeed.1*
 %{_mandir}/man1/pvftormd.1*
+%{_mandir}/man1/pvffilter.1*
+%{_mandir}/man1/pvfnoise.1*
 %{_mandir}/man1/rmdtopvf.1*
 %{_mandir}/man1/rmdfile.1*
 %{_mandir}/man1/pvftovoc.1*
@@ -326,6 +332,10 @@
 %{_mandir}/man1/viewfax.1x*
 
 %changelog
+* Fri Jul 22 2005 Jason Vas Dias <jvdias redhat com> 1.1.31-10
+- fix bug 162174: prevent uninterruptable hang on exit() when
+                  direct line disconnected (kernel bug 164002)
+
 * Mon Apr 25 2005 Jason Vas Dias <jvdias redhat com> 1.1.33-1
 - Upgrade to new upstream version 1.1.33
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]