rpms/minicom/F-12 minicom-2.3-overflow.patch, NONE, 1.1 minicom-2.3-rh.patch, 1.1, 1.2 minicom.spec, 1.35, 1.36

[Jan Görig]

Author: jgorig

Update of /cvs/pkgs/rpms/minicom/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3980

Modified Files:
	minicom-2.3-rh.patch minicom.spec 
Added Files:
	minicom-2.3-overflow.patch 
Log Message:
- modify minicom-2.3-rh.patch - wrong doinit checking (#519637)
- backported translation overflow patch (#555283)


minicom-2.3-overflow.patch:
 dial.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE minicom-2.3-overflow.patch ---
--- minicom-2.3/src/dial.c	2007-10-10 22:18:20.000000000 +0200
+++ minicom-2.4/src/dial.c	2009-12-12 16:47:47.000000000 +0100
@@ -849,13 +844,14 @@
 
   /* Make the manual dial entry. */
   d_man = mkstdent();
-  strcpy(d_man->name, _("Manually entered number"));
+  strncpy(d_man->name, _("Manually entered number"), sizeof(d_man->name));
+  d_man->name[sizeof(d_man->name) - 1] = 0;
 
   /* Construct path */
   snprintf(dfile, sizeof(dfile), "%s/.dialdir", homedir);
 
   /* Try to open ~/.dialdir */
-  if ((fp = sfopen(dfile, "r")) == NULL) {
+  if ((fp = fopen(dfile, "r")) == NULL) {
     if (errno == EPERM) {
       werror(_("Cannot open ~/.dialdir: permission denied"));
       dialents = mkstdent();

minicom-2.3-rh.patch:
 main.c         |   39 ++++++++++++++++++++++++++++++++++-----
 main.c.orig    |only
 main.c.rej     |only
 minicom.c      |    2 +-
 minicom.c.orig |only
 minicom.h      |    4 +++-
 minicom.h.orig |only
 updown.c       |    8 +++++++-
 updown.c.orig  |only
 9 files changed, 45 insertions(+), 8 deletions(-)

Index: minicom-2.3-rh.patch
===================================================================
RCS file: /cvs/pkgs/rpms/minicom/F-12/minicom-2.3-rh.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- minicom-2.3-rh.patch	24 Feb 2008 20:34:38 -0000	1.1
+++ minicom-2.3-rh.patch	16 Mar 2010 12:38:58 -0000	1.2
@@ -40,7 +40,7 @@ diff -urp minicom-2.3.orig/src/main.c mi
  
 +#else
 +  lockfile[0] = 0;
-+  if (doinit >= 0) {
++  if (doinit > 0) {
 +       int rc = ttylock(dial_tty);
 +       if (rc < 0) {
 +               if (access(dial_tty, W_OK) == -1)


Index: minicom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/minicom/F-12/minicom.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- minicom.spec	25 Jul 2009 14:33:28 -0000	1.35
+++ minicom.spec	16 Mar 2010 12:38:58 -0000	1.36
@@ -1,7 +1,7 @@
 Summary: A text-based modem control and terminal emulation program
 Name: minicom
 Version: 2.3
-Release: 6%{?dist}
+Release: 7%{?dist}
 URL: http://alioth.debian.org/projects/minicom/
 License: GPLv2+
 Group: Applications/Communications
@@ -21,6 +21,7 @@ Patch8: minicom-2.3-rh.patch
 Patch9: minicom-2.3-esc.patch
 Patch10: minicom-2.3-staticbuf.patch
 Patch11: minicom-2.3-getline.patch
+Patch12: minicom-2.3-overflow.patch
 
 %description
 Minicom is a simple text-based modem control and terminal emulation
@@ -39,6 +40,7 @@ language, and other features.
 %patch9 -p1 -b .esc
 %patch10 -p1 -b .staticbuf
 %patch11 -p1 -b .getline
+%patch12 -p1 -b .overflow
 
 cp -pr doc doc_
 rm -f doc_/Makefile*
@@ -70,6 +72,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Tue Mar 16 2010 Jan Görig <jgorig at redhat.com> 2.3-7
+- modify minicom-2.3-rh.patch - wrong doinit checking (#519637)
+- backported translation overflow patch (#555283)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild