rpms/minicom/devel minicom-2.2-sigs.patch, NONE, 1.1 minicom.spec, 1.24, 1.25

Miroslav Lichvar (mlichvar) fedora-extras-commits at redhat.com
Tue Jul 10 13:00:20 UTC 2007


Author: mlichvar

Update of /cvs/pkgs/rpms/minicom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24612

Modified Files:
	minicom.spec 
Added Files:
	minicom-2.2-sigs.patch 
Log Message:
- improve signal handling a bit (#246465)


minicom-2.2-sigs.patch:

--- NEW FILE minicom-2.2-sigs.patch ---
--- minicom-2.2/src/minicom.c.sigs	2007-07-10 13:52:51.000000000 +0200
+++ minicom-2.2/src/minicom.c	2007-07-10 14:48:52.000000000 +0200
@@ -107,11 +107,17 @@ static void hangsig(int sig)
 /*ARGSUSED*/
 static void shjump(int dummy /* __attribute__((unused)) */)
 {
+  sigset_t ss, oldss;
+
   dummy = dummy; /* avoid compiler warning, should be optimized away... */
   wleave();
   signal(SIGTSTP, SIG_DFL);
+  sigemptyset(&ss);
+  sigaddset(&ss, SIGTSTP);
+  sigprocmask(SIG_UNBLOCK, &ss, &oldss);
   fputs(_("Suspended. Type \"fg\" to resume.\n"),stdout);
   kill(getpid(), SIGTSTP);
+  sigprocmask(SIG_SETMASK, &oldss, NULL);
   signal(SIGTSTP, shjump);
   wreturn();
   if (use_status)
@@ -1524,6 +1530,14 @@ dirty_goto:
       do_log("%s", _("Quit without reset while online."));
     m_hupcl(portfd, 0);
   }
+
+  signal(SIGTERM, SIG_IGN);
+  signal(SIGHUP, SIG_IGN);
+#ifdef SIGTSTP
+  signal(SIGTSTP, SIG_DFL);
+#endif
+  signal(SIGQUIT, SIG_DFL);
+
   if (capfp != (FILE *)0)
     fclose(capfp);
   wclose(us, 0);


Index: minicom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/minicom/devel/minicom.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- minicom.spec	9 Mar 2007 12:19:02 -0000	1.24
+++ minicom.spec	10 Jul 2007 12:59:45 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: A text-based modem control and terminal emulation program
 Name: minicom
 Version: 2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://alioth.debian.org/projects/minicom/
 License: GPL
 Group: Applications/Communications
@@ -22,6 +22,7 @@
 Patch8: minicom-2.2-rh.patch
 Patch9: minicom-2.2-esc.patch
 Patch10: minicom-2.2-staticbuf.patch
+Patch11: minicom-2.2-sigs.patch
 
 %description
 Minicom is a simple text-based modem control and terminal emulation
@@ -41,6 +42,7 @@
 %patch8 -p1 -b .rh
 %patch9 -p1 -b .esc
 %patch10 -p1 -b .staticbuf
+%patch11 -p1 -b .sigs
 
 %build
 %configure
@@ -69,6 +71,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Jul 10 2007 Miroslav Lichvar <mlichvar at redhat.com> 2.2-2
+- improve signal handling a bit (#246465)
+
 * Fri Mar 09 2007 Miroslav Lichvar <mlichvar at redhat.com> 2.2-1
 - update to 2.2
 - handle filenames with spaces (#98655)




More information about the scm-commits mailing list