rpms/xastir/devel xastir-1.9.4-engunits.patch, 1.1, 1.2 xastir.spec, 1.12, 1.13

[Lucian Langa]

Author: lucilanga

Update of /cvs/pkgs/rpms/xastir/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29196

Modified Files:
	xastir-1.9.4-engunits.patch xastir.spec 
Log Message:
* Tue Oct 07 2008 Lucian Langa <cooly at gnome.eu.org> - 1.9.4-5
- upstream patch, fix for #435762

xastir-1.9.4-engunits.patch:

Index: xastir-1.9.4-engunits.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xastir/devel/xastir-1.9.4-engunits.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xastir-1.9.4-engunits.patch	4 Oct 2008 19:13:38 -0000	1.1
+++ xastir-1.9.4-engunits.patch	7 Oct 2008 05:25:31 -0000	1.2
@@ -1,11 +1,50 @@
+diff -Naur xastir-1.9.4/src/main.c xastir-1.9.4-mod/src/main.c
 --- xastir-1.9.4/src/main.c	2008-08-01 03:09:18.000000000 +0300
-+++ xastir-1.9.4-mod/src/main.c	2008-10-04 22:03:58.000000000 +0300
++++ xastir-1.9.4-mod/src/main.c	2008-10-07 08:11:38.000000000 +0300
 @@ -3663,7 +3663,7 @@
  
  
  static void TrackMouse( /*@unused@*/ Widget w, XtPointer clientData, XEvent *event, /*@unused@*/ Boolean *flag) {
 -    char my_text[50];
-+    char my_text[60];
++    char my_text[70];
      char str_lat[20];
      char str_long[20];
      long x, y;
+@@ -3732,11 +3732,11 @@
+ 
+     strncat(my_text,
+         "  ",
+-        sizeof(my_text) - strlen(my_text));
++        sizeof(my_text) - strlen(my_text) - 1);
+ 
+     strncat(my_text,
+         sec_to_loc(x,y),
+-        sizeof(my_text) - strlen(my_text));
++        sizeof(my_text) - strlen(my_text) - 1);
+ 
+     // begin dist/bearing
+     if ( do_dbstatus ) {
+@@ -3785,19 +3785,19 @@
+ 
+         strncat(my_text,
+             " ",
+-            sizeof(my_text) - strlen(my_text));
++            sizeof(my_text) - strlen(my_text) - 1);
+ 
+         strncat(my_text,
+             temp_my_distance,
+-            sizeof(my_text) - strlen(my_text));
++            sizeof(my_text) - strlen(my_text) - 1);
+ 
+         strncat(my_text,
+             " ",
+-            sizeof(my_text) - strlen(my_text));
++            sizeof(my_text) - strlen(my_text) - 1);
+ 
+         strncat(my_text,
+             temp_my_course,
+-            sizeof(my_text) - strlen(my_text));
++            sizeof(my_text) - strlen(my_text) - 1);
+     }
+ 
+     XmTextFieldSetString(textarea, my_text);


Index: xastir.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xastir/devel/xastir.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xastir.spec	5 Oct 2008 09:45:27 -0000	1.12
+++ xastir.spec	7 Oct 2008 05:25:31 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Amateur Station Tracking and Reporting system for amateur radio
 Name:    xastir
 Version: 1.9.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group:   Applications/Internet
 Source0: http://downloads.sourceforge.net/xastir/xastir-%{version}.tar.gz
@@ -82,6 +82,9 @@
 %doc README.MAPS README.win32 UPGRADE
 
 %changelog
+* Tue Oct 07 2008 Lucian Langa <cooly at gnome.eu.org> - 1.9.4-5
+- upstream patch, fix for #435762
+
 * Sat Oct 05 2008 Lucian Langa <cooly at gnome.eu.org> - 1.9.4-4
 - misc cleanups