rpms/saoimage/devel saoimage-1.35.1-bpp.patch, 1.1, 1.2 saoimage-1.35.1-decls.patch, 1.1, 1.2 saoimage-1.35.1-inc.patch, 1.1, 1.2 saoimage-1.35.1-mkstemp.patch, 1.1, 1.2 saoimage.desktop, 1.2, 1.3 saoimage.spec, 1.4, 1.5
Lubomir Rintel
lkundrak at fedoraproject.org
Tue Apr 7 20:08:25 UTC 2009
- Previous message (by thread): rpms/grub/devel grub-0.97-fat-lowercase.patch, NONE, 1.1 grub-0.97-efipxe.patch, 1.3, 1.4 grub.spec, 1.90, 1.91
- Next message (by thread): rpms/libatasmart/devel .cvsignore, 1.7, 1.8 libatasmart.spec, 1.8, 1.9 sources, 1.7, 1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: lkundrak
Update of /cvs/pkgs/rpms/saoimage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15351
Modified Files:
saoimage-1.35.1-bpp.patch saoimage-1.35.1-decls.patch
saoimage-1.35.1-inc.patch saoimage-1.35.1-mkstemp.patch
saoimage.desktop saoimage.spec
Log Message:
* Tue Apr 7 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 1.35.1-6
- Fix blink crash
- Fix print crash caused by mkstemp patch
- Add a lot of missing includes, making FORTIFY_SOURCE effective
saoimage-1.35.1-bpp.patch:
Index: saoimage-1.35.1-bpp.patch
===================================================================
RCS file: /cvs/pkgs/rpms/saoimage/devel/saoimage-1.35.1-bpp.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- saoimage-1.35.1-bpp.patch 3 Nov 2008 22:54:31 -0000 1.1
+++ saoimage-1.35.1-bpp.patch 7 Apr 2009 20:07:54 -0000 1.2
@@ -1,6 +1,10 @@
With depth > 16 pixels occupy more than two octets. Let XCreateImage()
calculate it.
+Fix BadMatch in XCopyPlane() -- src and dest have to have the same depth.
+Heaven knows if I used the right one. I don't even know what blink is
+supposed to do, it seems to do nothing but at least it doesn't crash now :)
+
Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk>
--- saoimage-1.35.1/wndwinit.c.bpp 2008-10-26 21:56:01.000000000 +0100
@@ -14,3 +18,15 @@
set_window_basics(&dispbox, desktop.ID, border_pixel,
(int)desktop.attrs.background_pixel, ximage);
set_window_basics(&panbox, desktop.ID, border_pixel,
+diff -urp saoimage-1.35.1/dispblnk.c saoimage-1.35.1.fixed/dispblnk.c
+--- saoimage-1.35.1/dispblnk.c 2009-04-07 22:02:37.965188331 +0200
++++ saoimage-1.35.1.fixed/dispblnk.c 2009-04-07 22:00:33.840190477 +0200
+@@ -81,7 +81,7 @@ void save_blink ( button )
+ blink[index].depth = blink[0].depth;
+ if( (blink[index].pixmap =
+ XCreatePixmap(dispbox.display, dispbox.ID, dispbox.xwidth,
+- dispbox.yheight, blink[index].depth)) == NULL )
++ dispbox.yheight, dispbox.depth)) == NULL )
+ blink[index].buf = calloc_errchk(bufsz, 1, "blink");
+ blink[index].bufsz = bufsz;
+ }
saoimage-1.35.1-decls.patch:
Index: saoimage-1.35.1-decls.patch
===================================================================
RCS file: /cvs/pkgs/rpms/saoimage/devel/saoimage-1.35.1-decls.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- saoimage-1.35.1-decls.patch 3 Nov 2008 20:04:06 -0000 1.1
+++ saoimage-1.35.1-decls.patch 7 Apr 2009 20:07:54 -0000 1.2
@@ -1,5 +1,5 @@
This is needed to get it compile on Linux with recent gcc (4.1.2).
-Needs some cleanup sho we don't have to be ashamed.
+Needs some cleanup so we don't have to be ashamed.
Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk>
saoimage-1.35.1-inc.patch:
Index: saoimage-1.35.1-inc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/saoimage/devel/saoimage-1.35.1-inc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- saoimage-1.35.1-inc.patch 3 Nov 2008 22:54:31 -0000 1.1
+++ saoimage-1.35.1-inc.patch 7 Apr 2009 20:07:54 -0000 1.2
@@ -3,104 +3,1246 @@
Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk>
---- saoimage-1.35.1/vms/ghstname.c.inc 2008-10-26 19:27:11.000000000 +0100
-+++ saoimage-1.35.1/vms/ghstname.c 2008-10-26 19:27:27.000000000 +0100
+diff -up saoimage-1.35.1/btnlib/attach.c.inc saoimage-1.35.1/btnlib/attach.c
+--- saoimage-1.35.1/btnlib/attach.c.inc 1990-04-20 23:47:32.000000000 +0200
++++ saoimage-1.35.1/btnlib/attach.c 2009-04-07 21:30:27.324188424 +0200
+@@ -20,6 +20,7 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h> /* define stderr */
++#include <string.h>
+ #include <X11/Xlib.h> /* define Xlib types and calls (needed by Buttons.h) */
+ #include "buttons.h"
+
+diff -up saoimage-1.35.1/btnlib/border.c.inc saoimage-1.35.1/btnlib/border.c
+--- saoimage-1.35.1/btnlib/border.c.inc 2009-04-07 21:30:26.986188536 +0200
++++ saoimage-1.35.1/btnlib/border.c 2009-04-07 21:30:27.485188561 +0200
+@@ -21,6 +21,8 @@ static char SccsId[] = "%W% %G%";
+ * {n} <who> -- <does what> -- <when>
+ */
+
++#include <strings.h>
++
+ // Forward declarations
+ static unsigned char btn_ReverseByte();
+ static void btn_MakeBdrLine();
+diff -up saoimage-1.35.1/btnlib/create.c.inc saoimage-1.35.1/btnlib/create.c
+--- saoimage-1.35.1/btnlib/create.c.inc 2009-04-07 21:30:26.987188577 +0200
++++ saoimage-1.35.1/btnlib/create.c 2009-04-07 21:30:27.486189193 +0200
+@@ -23,6 +23,8 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h> /* define stderr */
++#include <string.h>
++#include <stdlib.h>
+ #include <X11/Xlib.h> /* define Xlib types and calls */
+ #include "buttons.h"
+
+diff -up saoimage-1.35.1/btnlib/event.c.inc saoimage-1.35.1/btnlib/event.c
+--- saoimage-1.35.1/btnlib/event.c.inc 2009-04-07 21:30:26.989188574 +0200
++++ saoimage-1.35.1/btnlib/event.c 2009-04-07 21:30:27.326189255 +0200
+@@ -26,6 +26,7 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h> /* define stderr, NULL */
++#include <string.h>
+ #include <sys/types.h> /* define stderr, NULL */
+ #include <X11/Xlib.h>
+ #include "buttons.h"
+diff -up saoimage-1.35.1/btnlib/image.c.inc saoimage-1.35.1/btnlib/image.c
+--- saoimage-1.35.1/btnlib/image.c.inc 2009-04-07 21:30:26.990188697 +0200
++++ saoimage-1.35.1/btnlib/image.c 2009-04-07 21:30:27.487188902 +0200
+@@ -23,6 +23,7 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h> /* define NULL */
++#include <strings.h>
+ #include <X11/Xlib.h>
+ #include "buttons.h"
+
+diff -up saoimage-1.35.1/btnlib/label.c.inc saoimage-1.35.1/btnlib/label.c
+--- saoimage-1.35.1/btnlib/label.c.inc 2009-04-07 21:30:26.992188695 +0200
++++ saoimage-1.35.1/btnlib/label.c 2009-04-07 21:30:27.323188993 +0200
@@ -1,3 +1,5 @@
+#include <string.h>
+
- gethostname (char *node, int nodelen)
- {
- char *p, tmp[32];
-@@ -9,4 +11,4 @@
- strncpy (node, tmp, nodelen);
- node[nodelen] = '\0';
- }
--
-\ No newline at end of file
-+
---- saoimage-1.35.1/vms/zfiovi.c.inc 2008-10-26 19:27:27.000000000 +0100
-+++ saoimage-1.35.1/vms/zfiovi.c 2008-10-26 19:27:39.000000000 +0100
-@@ -53,6 +53,7 @@
- #include <iodef.h> /* I/O definitions */
- #include <ssdef.h> /* System status definitions */
- #include <syidef.h> /* Get system info definitions */
+ #ifndef lint
+ static char SccsId[] = "%W% %G%";
+ #endif
+diff -up saoimage-1.35.1/btnlib/remote.c.inc saoimage-1.35.1/btnlib/remote.c
+--- saoimage-1.35.1/btnlib/remote.c.inc 1990-04-21 00:00:09.000000000 +0200
++++ saoimage-1.35.1/btnlib/remote.c 2009-04-07 21:30:27.327188257 +0200
+@@ -27,6 +27,7 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h> /* get stderr */
+#include <string.h>
+ #include <X11/Xlib.h> /* needed by Buttons.h */
+ #include "buttons.h"
- #ifdef IMTOOL
- #define import_spp /* Import the IRAF SPP constants */
---- saoimage-1.35.1/mainkey.c.inc 2008-10-26 19:28:12.000000000 +0100
-+++ saoimage-1.35.1/mainkey.c 2008-10-26 19:28:21.000000000 +0100
-@@ -16,6 +16,7 @@
+diff -up saoimage-1.35.1/btnlib/resize.c.inc saoimage-1.35.1/btnlib/resize.c
+--- saoimage-1.35.1/btnlib/resize.c.inc 2009-04-07 21:30:27.004188678 +0200
++++ saoimage-1.35.1/btnlib/resize.c 2009-04-07 21:30:27.542188864 +0200
+@@ -20,6 +20,7 @@ static char SccsId[] = "%W% %G%";
+ * {n} <who> -- <does what> -- <when>
+ */
+
++#include <X11/Xutil.h>
+ #include <X11/Xlib.h>
+ #include "buttons.h"
+
+diff -up saoimage-1.35.1/btnlib/tool/bitmap.c.inc saoimage-1.35.1/btnlib/tool/bitmap.c
+--- saoimage-1.35.1/btnlib/tool/bitmap.c.inc 1990-03-28 21:26:20.000000000 +0200
++++ saoimage-1.35.1/btnlib/tool/bitmap.c 2009-04-07 21:30:27.337191652 +0200
+@@ -16,6 +16,7 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h>
++#include <string.h>
+
+ #define ROW_WIDTH 12
+
+diff -up saoimage-1.35.1/btnlib/tool/wrattach.c.inc saoimage-1.35.1/btnlib/tool/wrattach.c
+--- saoimage-1.35.1/btnlib/tool/wrattach.c.inc 1990-04-21 00:45:55.000000000 +0200
++++ saoimage-1.35.1/btnlib/tool/wrattach.c 2009-04-07 21:30:27.338189068 +0200
+@@ -15,6 +15,7 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h>
++#include <string.h>
+ #include "btnmenu.h"
+
+ /*
+diff -up saoimage-1.35.1/btnlib/tool/wrfeel.c.inc saoimage-1.35.1/btnlib/tool/wrfeel.c
+--- saoimage-1.35.1/btnlib/tool/wrfeel.c.inc 1990-04-21 00:47:26.000000000 +0200
++++ saoimage-1.35.1/btnlib/tool/wrfeel.c 2009-04-07 21:30:27.339189539 +0200
+@@ -15,6 +15,7 @@ static char SccsId[] = "%W% %G%";
*/
#include <stdio.h>
+#include <string.h>
+ #include "btnmenu.h"
+
+ /*
+diff -up saoimage-1.35.1/btnlib/util.c.inc saoimage-1.35.1/btnlib/util.c
+--- saoimage-1.35.1/btnlib/util.c.inc 1990-04-21 00:28:44.000000000 +0200
++++ saoimage-1.35.1/btnlib/util.c 2009-04-07 21:30:27.543188841 +0200
+@@ -19,6 +19,8 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h> /* define stderr, NULL */
++#include <string.h>
++#include <stdlib.h>
+
+ /*
+ * Subroutine: btn_Alloc
+@@ -37,7 +39,6 @@ char *btn_Alloc ( count, size, errmess )
+ char *errmess;
+ {
+ char *space;
+- char *calloc();
+
+ if( (space = (char *)calloc((unsigned)count, size)) == NULL ) {
+ fputs(errmess, stderr);
+diff -up saoimage-1.35.1/clralloc.c.inc saoimage-1.35.1/clralloc.c
+--- saoimage-1.35.1/clralloc.c.inc 2009-04-07 21:30:27.015190958 +0200
++++ saoimage-1.35.1/clralloc.c 2009-04-07 21:30:27.544188953 +0200
+@@ -21,6 +21,7 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h> /* stderr, FILE, NULL, etc. */
++#include <strings.h>
+ #include <X11/Xlib.h> /* X window stuff */
+ #include <X11/Xutil.h> /* X window manager stuff */
+ #include "hfiles/define.h" /* YES, NO, MIN, MAX and more */
+diff -up saoimage-1.35.1/clrhard.c.inc saoimage-1.35.1/clrhard.c
+--- saoimage-1.35.1/clrhard.c.inc 2009-04-07 21:30:27.018189209 +0200
++++ saoimage-1.35.1/clrhard.c 2009-04-07 21:30:27.340188610 +0200
+@@ -21,6 +21,7 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h> /* stderr, FILE, NULL, etc. */
++#include <string.h>
+ #include <X11/Xlib.h> /* X window stuff */
+ #include <X11/Xutil.h> /* X window manager stuff */
+ // Forward declarations
+diff -up saoimage-1.35.1/clrinit.c.inc saoimage-1.35.1/clrinit.c
+--- saoimage-1.35.1/clrinit.c.inc 2009-04-07 21:30:27.019188840 +0200
++++ saoimage-1.35.1/clrinit.c 2009-04-07 21:30:27.488188957 +0200
+@@ -18,6 +18,8 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h> /* stderr, NULL, etc. */
++#include <string.h>
++#include <strings.h>
+ #include <X11/Xlib.h> /* X window stuff */
+ #include <X11/Xutil.h> /* X window manager stuff */
+ #include "hfiles/color.h" /* color structs */
+diff -up saoimage-1.35.1/clrmenu.c.inc saoimage-1.35.1/clrmenu.c
+--- saoimage-1.35.1/clrmenu.c.inc 2009-04-07 21:30:27.020187618 +0200
++++ saoimage-1.35.1/clrmenu.c 2009-04-07 21:30:27.545188226 +0200
+@@ -17,6 +17,8 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h> /* stderr, NULL, etc. */
++#include <string.h>
++#include <strings.h>
+ #include <X11/Xlib.h> /* X window stuff */
+ #include <X11/Xutil.h> /* X window manager stuff */
+ #include "hfiles/constant.h" /* code values */
+diff -up saoimage-1.35.1/clrread.c.inc saoimage-1.35.1/clrread.c
+--- saoimage-1.35.1/clrread.c.inc 2009-04-07 21:30:27.021188175 +0200
++++ saoimage-1.35.1/clrread.c 2009-04-07 21:30:27.321188803 +0200
+@@ -17,6 +17,7 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h> /* stderr, NULL, etc. */
++#include <string.h>
+ #include <ctype.h> /* toupper, isalpha, etc. */
+ #include "hfiles/colormap.h" /* color table storage structs */
+ // Forward declarations
+diff -up saoimage-1.35.1/cmddisp.c.inc saoimage-1.35.1/cmddisp.c
+--- saoimage-1.35.1/cmddisp.c.inc 2000-07-28 21:38:19.000000000 +0200
++++ saoimage-1.35.1/cmddisp.c 2009-04-07 21:30:27.572188802 +0200
+@@ -42,6 +42,7 @@ static char SccsId[] = "%W% %G%";
+ #include <X11/Xlib.h> /* X window stuff */
+ #include <X11/Xutil.h> /* X window manager stuff */
+ #include <stdlib.h>
++#include <string.h>
+ #include "hfiles/constant.h" /* define codes */
+ #include "hfiles/struct.h" /* declare structure types */
+ #include "hfiles/extern.h" /* extern main ximage parameter structures */
+diff -up saoimage-1.35.1/cmdimage.c.inc saoimage-1.35.1/cmdimage.c
+--- saoimage-1.35.1/cmdimage.c.inc 1999-02-23 16:21:26.000000000 +0100
++++ saoimage-1.35.1/cmdimage.c 2009-04-07 21:30:27.669188389 +0200
+@@ -42,6 +42,8 @@ static char SccsId[] = "%W% %G%";
+ #include <string.h>
+ #endif
+
++#include <stdlib.h>
++#include <string.h>
+ #include <math.h> /* for atof (see Ultrx atof man page) */
+ #include <X11/Xlib.h> /* X window stuff */
+ #include <X11/Xutil.h> /* X window manager stuff */
+diff -up saoimage-1.35.1/cmdnew.c.inc saoimage-1.35.1/cmdnew.c
+--- saoimage-1.35.1/cmdnew.c.inc 2009-04-07 21:30:27.025189362 +0200
++++ saoimage-1.35.1/cmdnew.c 2009-04-07 21:30:27.574187994 +0200
+@@ -34,6 +34,8 @@ static char SccsId[] = "%W% %G%";
+ #include <string.h>
+ #endif
+
++#include <string.h>
++#include <stdlib.h>
+ #include <X11/Xlib.h> /* X window stuff */
+ #include <X11/Xutil.h> /* X window manager stuff */
+ #include "hfiles/define.h" /* define SZ_LINE, SZ_FNAME, etc */
+diff -up saoimage-1.35.1/cmdparse.c.inc saoimage-1.35.1/cmdparse.c
+--- saoimage-1.35.1/cmdparse.c.inc 2009-04-07 21:30:27.027188731 +0200
++++ saoimage-1.35.1/cmdparse.c 2009-04-07 21:30:27.570188120 +0200
+@@ -29,6 +29,7 @@ static char SccsId[] = "%W% %G%";
+ #include <string.h>
+ #endif
+
++#include <string.h>
+ #include <X11/Xlib.h> /* X window stuff */
+ #include <X11/Xutil.h> /* X window manager stuff */
+ #include "hfiles/constant.h" /* define codes */
+diff -up saoimage-1.35.1/crdrot.c.inc saoimage-1.35.1/crdrot.c
+--- saoimage-1.35.1/crdrot.c.inc 2009-04-07 21:30:27.046189889 +0200
++++ saoimage-1.35.1/crdrot.c 2009-04-07 21:30:27.505189944 +0200
+@@ -22,6 +22,7 @@ static void mult_mtrx();
+ static void mult_mtrx();
+ static void mult_mtrx();
+
++#include <strings.h>
+ #include "hfiles/coord.h" /* coord structs */
+
+ /*
+diff -up saoimage-1.35.1/crdset.c.inc saoimage-1.35.1/crdset.c
+--- saoimage-1.35.1/crdset.c.inc 1996-02-26 21:12:33.000000000 +0100
++++ saoimage-1.35.1/crdset.c 2009-04-07 21:30:27.506187444 +0200
+@@ -31,6 +31,8 @@ static char SccsId[] = "%W% %G%";
+ * {n} <who> -- <does what> -- <when>
+ */
+
++#include <strings.h>
++
+ #include "hfiles/coord.h" /* coord structs */
+ #include "hfiles/image.h" /* image struct */
+
+diff -up saoimage-1.35.1/crdsynth.c.inc saoimage-1.35.1/crdsynth.c
+--- saoimage-1.35.1/crdsynth.c.inc 2009-04-07 21:30:27.047188704 +0200
++++ saoimage-1.35.1/crdsynth.c 2009-04-07 21:30:27.344187898 +0200
+@@ -20,6 +20,7 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h> /* stderr, NULL, etc */
++#include <string.h>
+ #include <math.h> /* get trig functions, sqrt, and fabs */
+ #include "hfiles/coord.h" /* coord structs */
+
+diff -up saoimage-1.35.1/crdtemp.c.inc saoimage-1.35.1/crdtemp.c
+--- saoimage-1.35.1/crdtemp.c.inc 2009-04-07 21:30:27.048188820 +0200
++++ saoimage-1.35.1/crdtemp.c 2009-04-07 21:30:27.671187889 +0200
+@@ -23,6 +23,9 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h> /* stderr, NULL, etc */
++#include <string.h>
++#include <strings.h>
++#include <stdlib.h>
+ #include "hfiles/coord.h" /* coord structs */
+
+ // Forward declarations
+diff -up saoimage-1.35.1/csrcoord.c.inc saoimage-1.35.1/csrcoord.c
+--- saoimage-1.35.1/csrcoord.c.inc 1999-05-06 21:44:16.000000000 +0200
++++ saoimage-1.35.1/csrcoord.c 2009-04-07 21:30:27.347188081 +0200
+@@ -24,6 +24,7 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h> /* stderr, NULL, etc. */
++#include <string.h>
+ #include <math.h>
+ #include <X11/Xlib.h> /* X window stuff */
+ #include <X11/Xutil.h> /* X window manager stuff */
+diff -up saoimage-1.35.1/csrgrab.c.inc saoimage-1.35.1/csrgrab.c
+--- saoimage-1.35.1/csrgrab.c.inc 2009-04-07 21:30:27.051189089 +0200
++++ saoimage-1.35.1/csrgrab.c 2009-04-07 21:30:27.348186833 +0200
+@@ -17,6 +17,7 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h> /* stderr, NULL, etc. */
++#include <string.h>
+ #include <math.h> /* get trig functions and sqrt */
+ #include <X11/Xlib.h> /* X window stuff */
+ #include <X11/Xutil.h> /* X window manager stuff */
+diff -up saoimage-1.35.1/csrmove.c.inc saoimage-1.35.1/csrmove.c
+--- saoimage-1.35.1/csrmove.c.inc 1991-01-04 04:41:46.000000000 +0100
++++ saoimage-1.35.1/csrmove.c 2009-04-07 21:30:27.349188459 +0200
+@@ -22,6 +22,7 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h> /* stderr, NULL, etc. */
++#include <string.h>
+ #include <math.h> /* get trig functions and sqrt */
+ #include <X11/Xlib.h> /* X window stuff */
+ #include <X11/Xutil.h> /* X window manager stuff */
+diff -up saoimage-1.35.1/csrpoly1.c.inc saoimage-1.35.1/csrpoly1.c
+--- saoimage-1.35.1/csrpoly1.c.inc 2009-04-07 21:30:27.052186556 +0200
++++ saoimage-1.35.1/csrpoly1.c 2009-04-07 21:30:27.673189155 +0200
+@@ -19,6 +19,7 @@ static char SccsId[] = "%W% %G%";
+ * {n} <who> -- <does what> -- <when>
+ */
+
++#include <stdlib.h>
+ #include <X11/Xlib.h> /* X window stuff */
+ #include <X11/Xutil.h> /* X window manager stuff */
+ #include "hfiles/color.h" /* cursor colors needed by Cursor.h */
+diff -up saoimage-1.35.1/csrpoly2.c.inc saoimage-1.35.1/csrpoly2.c
+--- saoimage-1.35.1/csrpoly2.c.inc 2009-04-07 21:30:27.053188359 +0200
++++ saoimage-1.35.1/csrpoly2.c 2009-04-07 21:30:27.517186797 +0200
+@@ -23,6 +23,8 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h> /* stderr, NULL, etc. */
++#include <string.h>
++#include <strings.h>
+ #include <X11/Xlib.h> /* X window stuff */
+ #include <X11/Xutil.h> /* X window manager stuff */
+ #include "hfiles/color.h" /* cursor colors needed by Cursor.h */
+diff -up saoimage-1.35.1/csrsave.c.inc saoimage-1.35.1/csrsave.c
+--- saoimage-1.35.1/csrsave.c.inc 2009-04-07 21:30:27.056185907 +0200
++++ saoimage-1.35.1/csrsave.c 2009-04-07 21:30:27.576188139 +0200
+@@ -22,6 +22,8 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h> /* stderr, NULL, etc. */
++#include <string.h>
++#include <stdlib.h>
+ #include <X11/Xlib.h> /* X window stuff */
+ #include <X11/Xutil.h> /* X window manager stuff */
+ #include "hfiles/color.h" /* cursor colors needed by Cursor.h */
+diff -up saoimage-1.35.1/csrshape.c.inc saoimage-1.35.1/csrshape.c
+--- saoimage-1.35.1/csrshape.c.inc 2009-04-07 21:30:27.067188500 +0200
++++ saoimage-1.35.1/csrshape.c 2009-04-07 21:30:27.352187905 +0200
+@@ -20,6 +20,7 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h> /* stderr, NULL, etc. */
++#include <string.h>
#include <X11/Xlib.h> /* X window stuff */
#include <X11/Xutil.h> /* X window manager stuff */
- #include <X11/keysym.h>
---- saoimage-1.35.1/ctrlfile.c.inc 2008-10-26 19:27:52.000000000 +0100
-+++ saoimage-1.35.1/ctrlfile.c 2008-10-26 19:28:03.000000000 +0100
-@@ -19,6 +19,7 @@
+ #include <math.h> /* sin, cos, etc */
+diff -up saoimage-1.35.1/csrtext.c.inc saoimage-1.35.1/csrtext.c
+--- saoimage-1.35.1/csrtext.c.inc 2009-04-07 21:30:27.068188423 +0200
++++ saoimage-1.35.1/csrtext.c 2009-04-07 21:30:27.587192210 +0200
+@@ -32,6 +32,7 @@ static char SccsId[] = "%W% %G%";
+ #include <string.h> /* strlen, strcat, strcpy, strrchr */
+ #endif
+
++#include <string.h>
+ #include <stdio.h> /* stderr, NULL, etc. */
+ #include <X11/Xlib.h> /* X window stuff */
+ #include <X11/Xutil.h> /* X window manager stuff */
+diff -up saoimage-1.35.1/ctrlcntn.c.inc saoimage-1.35.1/ctrlcntn.c
+--- saoimage-1.35.1/ctrlcntn.c.inc 2009-04-07 21:30:27.069188900 +0200
++++ saoimage-1.35.1/ctrlcntn.c 2009-04-07 21:30:27.589189270 +0200
+@@ -24,6 +24,8 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h> /* stderr, NULL, etc. */
++#include <string.h>
++#include <stdlib.h>
+ #include <X11/Xlib.h> /* X window stuff */
+ #include "hfiles/control.h" /* declare control structure types */
+ extern struct controlRec control;
+diff -up saoimage-1.35.1/ctrldisk.c.inc saoimage-1.35.1/ctrldisk.c
+--- saoimage-1.35.1/ctrldisk.c.inc 1999-02-26 19:11:06.000000000 +0100
++++ saoimage-1.35.1/ctrldisk.c 2009-04-07 21:30:27.355187110 +0200
+@@ -30,6 +30,7 @@ static char SccsId[] = "%W% %G%";
+ #ifndef VMS
+
+ #include <stdio.h> /* define stderr, FILE, NULL, etc */
++#include <string.h>
+ #include <unistd.h> /* define read, write, lseek */
+ #include <sys/file.h> /* define open */
+ #include <fcntl.h> /* define fcntl */
+diff -up saoimage-1.35.1/ctrlfile.c.inc saoimage-1.35.1/ctrlfile.c
+--- saoimage-1.35.1/ctrlfile.c.inc 2009-04-07 21:30:27.071189017 +0200
++++ saoimage-1.35.1/ctrlfile.c 2009-04-07 21:30:27.706190058 +0200
+@@ -19,7 +19,9 @@ static char SccsId[] = "%W% %G%";
*/
#include <stdio.h> /* FILE, stderr, NULL, etc. */
+#include <string.h>
#include <ctype.h> /* macros for isupper, tolower, etc */
++#include <unistd.h>
#include <sys/types.h> /* needed for lstat */
#include <sys/stat.h> /* needed for lstat, struct stat */
---- saoimage-1.35.1/imgflip.c.inc 2008-10-26 19:28:38.000000000 +0100
-+++ saoimage-1.35.1/imgflip.c 2008-10-26 19:28:50.000000000 +0100
-@@ -18,6 +18,7 @@
+ #include <errno.h> /* ENOENT */
+diff -up saoimage-1.35.1/ctrlgc.c.inc saoimage-1.35.1/ctrlgc.c
+--- saoimage-1.35.1/ctrlgc.c.inc 2009-04-07 21:30:27.072188450 +0200
++++ saoimage-1.35.1/ctrlgc.c 2009-04-07 21:30:27.356188373 +0200
+@@ -24,6 +24,7 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h> /* get stderr, NULL, etc */
++#include <string.h>
+ #include <X11/Xlib.h> /* X window stuff */
+ #include <X11/Xutil.h> /* X window manager stuff */
+ #include "hfiles/define.h" /* define DONT_CARE, U_DONT_CARE */
+diff -up saoimage-1.35.1/ctrlmbox.c.inc saoimage-1.35.1/ctrlmbox.c
+--- saoimage-1.35.1/ctrlmbox.c.inc 1990-05-02 06:17:46.000000000 +0200
++++ saoimage-1.35.1/ctrlmbox.c 2009-04-07 21:30:27.373193185 +0200
+@@ -24,6 +24,7 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h> /* define stderr, FILE, NULL, etc */
++#include <string.h>
+ #include <sys/file.h> /* define open */
+ #include <X11/Xlib.h> /* X window stuff */
+ #include "hfiles/control.h" /* declare control structure types */
+diff -up saoimage-1.35.1/ctrlsckt.c.inc saoimage-1.35.1/ctrlsckt.c
+--- saoimage-1.35.1/ctrlsckt.c.inc 1995-05-04 20:34:14.000000000 +0200
++++ saoimage-1.35.1/ctrlsckt.c 2009-04-07 21:30:27.674187093 +0200
+@@ -32,6 +32,8 @@ static char SccsId[] = "%W% %G%";
+ #include <strings.h> /* strlen(), strcpy(), strncpy(), rindex() */
+ #endif
+
++#include <unistd.h>
++#include <string.h>
+ #include <X11/Xlib.h> /* X window stuff */
+ #include "hfiles/control.h" /* define struct connectRec */
+
+diff -up saoimage-1.35.1/dispblnk.c.inc saoimage-1.35.1/dispblnk.c
+--- saoimage-1.35.1/dispblnk.c.inc 2009-04-07 21:30:27.073188787 +0200
++++ saoimage-1.35.1/dispblnk.c 2009-04-07 21:30:27.591189064 +0200
+@@ -20,6 +20,9 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h> /* get stderr, NULL */
++#include <string.h>
++#include <strings.h>
++#include <stdlib.h>
+ #include <X11/Xlib.h> /* get X types and constants */
+ #include <X11/Xutil.h> /* X window manager stuff */
+ #include "hfiles/struct.h" /* declare structure types */
+diff -up saoimage-1.35.1/dispbtmp.c.inc saoimage-1.35.1/dispbtmp.c
+--- saoimage-1.35.1/dispbtmp.c.inc 2009-04-07 21:30:27.074188597 +0200
++++ saoimage-1.35.1/dispbtmp.c 2009-04-07 21:30:27.547188987 +0200
+@@ -24,6 +24,7 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h> /* stderr, FILE, NULL, etc. */
++#include <strings.h>
+ #include <X11/Xlib.h> /* X window stuff */
+ #include <X11/Xutil.h> /* X window manager stuff */
+ #include "hfiles/constant.h" /* define codes */
+diff -up saoimage-1.35.1/display.c.inc saoimage-1.35.1/display.c
+--- saoimage-1.35.1/display.c.inc 1998-10-13 19:22:58.000000000 +0200
++++ saoimage-1.35.1/display.c 2009-04-07 21:30:27.548188827 +0200
+@@ -19,6 +19,7 @@ static char SccsId[] = "%W% %G%";
+ * {n} <who> -- <does what> -- <when>
+ */
+
++#include <strings.h>
+ #include <X11/Xlib.h> /* X window stuff */
+ #include <X11/Xutil.h> /* X window manager stuff */
+ #include "hfiles/define.h" /* define MIN, MAX, DONT_CARE, etc. */
+diff -up saoimage-1.35.1/disppsct.c.inc saoimage-1.35.1/disppsct.c
+--- saoimage-1.35.1/disppsct.c.inc 2009-04-07 21:30:27.254189962 +0200
++++ saoimage-1.35.1/disppsct.c 2009-04-07 21:30:27.676188354 +0200
+@@ -39,6 +39,9 @@ static char SccsId[] = "%W% %G%";
+ #include <string.h> /* strlen, strcat, strcpy, strrchr */
+ #endif
+
++#include <unistd.h>
++#include <sys/types.h>
++#include <string.h>
+ #include <stdlib.h>
+ #include <time.h>
+ #include <X11/Xlib.h> /* X window stuff */
+diff -up saoimage-1.35.1/disppxmp.c.inc saoimage-1.35.1/disppxmp.c
+--- saoimage-1.35.1/disppxmp.c.inc 2000-09-13 21:34:46.000000000 +0200
++++ saoimage-1.35.1/disppxmp.c 2009-04-07 21:30:27.677187701 +0200
+@@ -20,6 +20,7 @@ static char SccsId[] = "%W% %G%";
* {n} <who> -- <does what> -- <when>
*/
++#include <strings.h>
+ #include "hfiles/coord.h"
+
+ /*
+diff -up saoimage-1.35.1/distort.c.inc saoimage-1.35.1/distort.c
+--- saoimage-1.35.1/distort.c.inc 2003-11-18 17:45:23.000000000 +0100
++++ saoimage-1.35.1/distort.c 2009-04-07 21:30:27.689189040 +0200
+@@ -38,6 +38,8 @@
+
+ #include <unistd.h>
+ #include <string.h>
++#include <stdio.h>
++#include <stdlib.h>
+ #include "wcs.h"
+
+ void
+diff -up saoimage-1.35.1/editctrl.c.inc saoimage-1.35.1/editctrl.c
+--- saoimage-1.35.1/editctrl.c.inc 2009-04-07 21:30:27.076187992 +0200
++++ saoimage-1.35.1/editctrl.c 2009-04-07 21:30:27.602188787 +0200
+@@ -33,6 +33,7 @@ static char SccsId[] = "%W% %G%";
+ #include <string.h> /* strlen, strcat, strcpy, strrchr */
+ #endif
+
++#include <string.h>
+ #include <X11/Xlib.h> /* X window stuff */
+ #include <X11/Xutil.h> /* X window manager stuff */
+ #include "hfiles/color.h"
+diff -up saoimage-1.35.1/editinit.c.inc saoimage-1.35.1/editinit.c
+--- saoimage-1.35.1/editinit.c.inc 1990-05-02 07:21:29.000000000 +0200
++++ saoimage-1.35.1/editinit.c 2009-04-07 21:30:27.604190685 +0200
+@@ -34,6 +34,7 @@ static char SccsId[] = "%W% %G%";
+ #include <string.h> /* strlen, strcat, strcpy, strrchr */
+ #endif
+
++#include <string.h>
+ #include <X11/Xlib.h>
+ #include "hfiles/edit.h"
+
+diff -up saoimage-1.35.1/editline.c.inc saoimage-1.35.1/editline.c
+--- saoimage-1.35.1/editline.c.inc 1990-05-02 07:22:30.000000000 +0200
++++ saoimage-1.35.1/editline.c 2009-04-07 21:30:27.378192353 +0200
+@@ -20,6 +20,7 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h>
+#include <string.h>
+ #include <X11/Xlib.h>
+ #include "hfiles/edit.h"
+
+diff -up saoimage-1.35.1/grphbtmp.c.inc saoimage-1.35.1/grphbtmp.c
+--- saoimage-1.35.1/grphbtmp.c.inc 2009-04-07 21:30:27.078187806 +0200
++++ saoimage-1.35.1/grphbtmp.c 2009-04-07 21:30:27.550188601 +0200
+@@ -16,6 +16,7 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h> /* stderr, NULL, etc. */
++#include <strings.h>
+ #include <X11/Xlib.h> /* X window stuff */
+ #include <X11/Xutil.h> /* X window manager stuff */
+ #include "hfiles/color.h"
+diff -up saoimage-1.35.1/grphgrab.c.inc saoimage-1.35.1/grphgrab.c
+--- saoimage-1.35.1/grphgrab.c.inc 2009-04-07 21:30:27.080190169 +0200
++++ saoimage-1.35.1/grphgrab.c 2009-04-07 21:30:27.691188502 +0200
+@@ -16,6 +16,7 @@ static char SccsId[] = "%W% %G%";
+ * {n} <who> -- <does what> -- <when>
+ */
+
++#include <stdlib.h>
+ #include <X11/Xlib.h> /* X window stuff */
+ #include <X11/Xutil.h> /* X window manager stuff */
+ #include "hfiles/color.h" /* color structs */
+diff -up saoimage-1.35.1/grphinit.c.inc saoimage-1.35.1/grphinit.c
+--- saoimage-1.35.1/grphinit.c.inc 2009-04-07 21:30:27.081188814 +0200
++++ saoimage-1.35.1/grphinit.c 2009-04-07 21:30:27.605187194 +0200
+@@ -26,6 +26,7 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h> /* stderr, NULL, etc. */
++#include <stdlib.h>
+ #include <X11/Xlib.h> /* X window stuff */
+ #include <X11/Xutil.h> /* X window manager stuff */
+ #include "hfiles/struct.h" /* declare structure types */
+diff -up saoimage-1.35.1/grphlbl.c.inc saoimage-1.35.1/grphlbl.c
+--- saoimage-1.35.1/grphlbl.c.inc 1990-04-20 16:34:58.000000000 +0200
++++ saoimage-1.35.1/grphlbl.c 2009-04-07 21:30:27.399191244 +0200
+@@ -22,6 +22,7 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h> /* stderr, NULL, etc. */
++#include <string.h>
+ #include <X11/Xlib.h> /* X window stuff */
+ #include <X11/Xutil.h> /* X window manager stuff */
+ #include "hfiles/define.h" /* define MIN, etc. */
+diff -up saoimage-1.35.1/histdist.c.inc saoimage-1.35.1/histdist.c
+--- saoimage-1.35.1/histdist.c.inc 2009-04-07 21:30:27.086188119 +0200
++++ saoimage-1.35.1/histdist.c 2009-04-07 21:30:27.401191174 +0200
+@@ -17,6 +17,7 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h>
++#include <string.h>
+ // Forward declarations
+ static int excess_zgroup(), excess_nzgroup(), range_zgroup();
+
+diff -up saoimage-1.35.1/histeql.c.inc saoimage-1.35.1/histeql.c
+--- saoimage-1.35.1/histeql.c.inc 2009-04-07 21:30:27.105190669 +0200
++++ saoimage-1.35.1/histeql.c 2009-04-07 21:30:27.402190273 +0200
+@@ -16,6 +16,7 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h>
++#include <string.h>
+ // Forward declarations
+ static int count_nonzero_histogram_entries(), rescan_histogram();
+ static void unmark_peak_links();
+diff -up saoimage-1.35.1/histlist.c.inc saoimage-1.35.1/histlist.c
+--- saoimage-1.35.1/histlist.c.inc 2009-04-07 21:30:27.106189320 +0200
++++ saoimage-1.35.1/histlist.c 2009-04-07 21:30:27.403187838 +0200
+@@ -17,6 +17,7 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h>
++#include <string.h>
+ #include "hfiles/histeq.h" /* define SubrangeList */
+
+ #define MAXITERATIONS 1000 /* --jrw */
+diff -up saoimage-1.35.1/histmap.c.inc saoimage-1.35.1/histmap.c
+--- saoimage-1.35.1/histmap.c.inc 2009-04-07 21:30:27.115191774 +0200
++++ saoimage-1.35.1/histmap.c 2009-04-07 21:30:27.606187725 +0200
+@@ -15,6 +15,8 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h>
++#include <string.h>
++#include <stdlib.h>
+ // Forward declarations
+ static void make_subrange_scalemap();
+ static void make_gapped_list(), list_to_map();
+diff -up saoimage-1.35.1/histzero.c.inc saoimage-1.35.1/histzero.c
+--- saoimage-1.35.1/histzero.c.inc 2009-04-07 21:30:27.118192953 +0200
++++ saoimage-1.35.1/histzero.c 2009-04-07 21:30:27.618195064 +0200
+@@ -15,6 +15,8 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h>
++#include <string.h>
++#include <stdlib.h>
+ // Forward declarations
+ static void merge_links();
+
+diff -up saoimage-1.35.1/imgcheck.c.inc saoimage-1.35.1/imgcheck.c
+--- saoimage-1.35.1/imgcheck.c.inc 2009-04-07 21:30:27.119189751 +0200
++++ saoimage-1.35.1/imgcheck.c 2009-04-07 21:30:27.620189849 +0200
+@@ -37,6 +37,7 @@ static char SccsId[] = "%W% %G%";
+ #include <string.h>
+ #endif
+
++#include <string.h>
+ #include "hfiles/constant.h" /* define codes */
+ #include "hfiles/image.h"
+ // Forward declarations
+diff -up saoimage-1.35.1/imgflip.c.inc saoimage-1.35.1/imgflip.c
+--- saoimage-1.35.1/imgflip.c.inc 1991-01-08 02:11:30.000000000 +0100
++++ saoimage-1.35.1/imgflip.c 2009-04-07 21:30:27.621186999 +0200
+@@ -18,6 +18,9 @@ static char SccsId[] = "%W% %G%";
+ * {n} <who> -- <does what> -- <when>
+ */
+
++#include <string.h>
++#include <strings.h>
++#include <stdlib.h>
/* Subroutine: xflip_buf
* Purpose: Flip buf to make Y coordinates run in opposite direction
---- saoimage-1.35.1/irafimtl.c.inc 2008-10-26 19:28:21.000000000 +0100
-+++ saoimage-1.35.1/irafimtl.c 2008-10-26 19:28:38.000000000 +0100
-@@ -26,6 +26,7 @@
+diff -up saoimage-1.35.1/imgnew.c.inc saoimage-1.35.1/imgnew.c
+--- saoimage-1.35.1/imgnew.c.inc 2009-04-07 21:30:27.123188365 +0200
++++ saoimage-1.35.1/imgnew.c 2009-04-07 21:30:27.623190242 +0200
+@@ -26,6 +26,7 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h> /* stderr, NULL, etc. */
++#include <stdlib.h>
+
+ #ifndef VMS
+ #ifdef SYSV
+@@ -39,6 +40,7 @@ static char SccsId[] = "%W% %G%";
+ #include <string.h> /* strlen, strcat, strcpy, strrchr */
+ #endif
+
++#include <string.h>
+ #include <X11/Xlib.h> /* X window stuff */
+ #include <X11/Xutil.h> /* X window manager stuff */
+ #include "hfiles/define.h" /* define SZ_FNAME */
+diff -up saoimage-1.35.1/imgread.c.inc saoimage-1.35.1/imgread.c
+--- saoimage-1.35.1/imgread.c.inc 1992-04-24 01:26:55.000000000 +0200
++++ saoimage-1.35.1/imgread.c 2009-04-07 21:30:27.407186628 +0200
+@@ -18,6 +18,7 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h> /* stderr, NULL, etc. */
++#include <string.h>
+ #include <X11/Xlib.h> /* X window stuff */
+ #include <X11/Xutil.h> /* X window manager stuff */
+ #include "hfiles/constant.h" /* constants and codes */
+diff -up saoimage-1.35.1/imgrot.c.inc saoimage-1.35.1/imgrot.c
+--- saoimage-1.35.1/imgrot.c.inc 1991-01-07 21:50:59.000000000 +0100
++++ saoimage-1.35.1/imgrot.c 2009-04-07 21:30:27.624187028 +0200
+@@ -16,6 +16,9 @@ static char SccsId[] = "%W% %G%";
+ * {n} <who> -- <does what> -- <when>
+ */
+
++#include <strings.h>
++#include <stdlib.h>
++
+ /*
+ * Subroutine: cwturn_buf
+ * Purpose: Rotate a square buffer 90 degrees clockwise
+diff -up saoimage-1.35.1/imgtrans.c.inc saoimage-1.35.1/imgtrans.c
+--- saoimage-1.35.1/imgtrans.c.inc 2009-04-07 21:30:27.124188121 +0200
++++ saoimage-1.35.1/imgtrans.c 2009-04-07 21:30:27.523188200 +0200
+@@ -16,6 +16,8 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h> /* define stderr */
++#include <string.h>
++#include <strings.h>
+ // Forward declarations
+ static void square_buf(), unsquare_buf();
+
+diff -up saoimage-1.35.1/irafcrd.c.inc saoimage-1.35.1/irafcrd.c
+--- saoimage-1.35.1/irafcrd.c.inc 2009-04-07 21:30:27.125188232 +0200
++++ saoimage-1.35.1/irafcrd.c 2009-04-07 21:30:27.707187737 +0200
+@@ -33,6 +33,7 @@ static char SccsId[] = "%W% %G%";
+ #include <string.h> /* strlen, strcat, strcpy, strrchr */
+ #endif
+
++#include <stdlib.h>
+ #include <ctype.h> /* isspace */
+ #include <X11/Xlib.h> /* get X types and constants */
+ #include <X11/Xutil.h> /* X window manager stuff */
+diff -up saoimage-1.35.1/irafdisp.c.inc saoimage-1.35.1/irafdisp.c
+--- saoimage-1.35.1/irafdisp.c.inc 1992-10-10 01:31:32.000000000 +0100
++++ saoimage-1.35.1/irafdisp.c 2009-04-07 21:30:27.540188111 +0200
+@@ -24,6 +24,7 @@ static char SccsId[] = "%W% %G%";
+ #ifdef IMTOOL
+
+ #include <stdio.h> /* stderr, FILE, NULL, etc. */
++#include <strings.h>
+ #include <X11/Xlib.h> /* get X types and constants */
+ #include <X11/Xutil.h> /* X window manager stuff */
+ #include "hfiles/constant.h" /* define codes */
+diff -up saoimage-1.35.1/irafenv.c.inc saoimage-1.35.1/irafenv.c
+--- saoimage-1.35.1/irafenv.c.inc 1990-04-20 17:18:13.000000000 +0200
++++ saoimage-1.35.1/irafenv.c 2009-04-07 21:30:27.634188877 +0200
+@@ -33,6 +33,7 @@ static char SccsId[] = "%W% %G%";
+ #include <string.h> /* strlen, strcat, strcpy, strrchr */
+ #endif
+
++#include <string.h>
+ #include "hfiles/coord.h"
+ #include "hfiles/define.h" /* SZ_FNAME, etc. */
+ #include "hfiles/image.h"
+diff -up saoimage-1.35.1/iraffdbk.c.inc saoimage-1.35.1/iraffdbk.c
+--- saoimage-1.35.1/iraffdbk.c.inc 1990-05-02 07:51:29.000000000 +0200
++++ saoimage-1.35.1/iraffdbk.c 2009-04-07 21:30:27.425188601 +0200
+@@ -23,6 +23,7 @@ static char SccsId[] = "%W% %G%";
+ #ifdef IMTOOL
+
+ #include <stdio.h> /* stderr, NULL, etc. */
++#include <string.h>
+ #include <ctype.h> /* isspace, isprint, etc. */
+ #include <X11/Xlib.h> /* X window stuff */
+ #include <X11/Xutil.h> /* window manager stuff */
+diff -up saoimage-1.35.1/irafimtl.c.inc saoimage-1.35.1/irafimtl.c
+--- saoimage-1.35.1/irafimtl.c.inc 2009-04-07 21:30:27.126189007 +0200
++++ saoimage-1.35.1/irafimtl.c 2009-04-07 21:30:27.551188486 +0200
+@@ -26,6 +26,8 @@ static char SccsId[] = "%W% %G%";
#ifdef IMTOOL
#include <stdio.h> /* stderr, FILE, NULL, etc. */
+#include <string.h>
++#include <strings.h>
#include <X11/Xlib.h> /* get X types and constants */
#include <X11/Xutil.h> /* X window manager stuff */
#include "hfiles/constant.h" /* define codes */
---- saoimage-1.35.1/shfile.c.inc 2008-10-26 19:28:50.000000000 +0100
-+++ saoimage-1.35.1/shfile.c 2008-10-26 19:28:58.000000000 +0100
-@@ -1,4 +1,5 @@
+diff -up saoimage-1.35.1/irafio.c.inc saoimage-1.35.1/irafio.c
+--- saoimage-1.35.1/irafio.c.inc 2009-04-07 21:30:27.128189453 +0200
++++ saoimage-1.35.1/irafio.c 2009-04-07 21:30:27.692186826 +0200
+@@ -38,6 +38,8 @@ static char SccsId[] = "%W% %G%";
+ #include <string.h>
+ #endif
+
++#include <unistd.h>
++#include <string.h>
+ #include <X11/Xlib.h> /* X window stuff */
+ #include "hfiles/control.h" /* define struct connectRec */
+ // Forward declarations
+diff -up saoimage-1.35.1/irafpipe.c.inc saoimage-1.35.1/irafpipe.c
+--- saoimage-1.35.1/irafpipe.c.inc 2009-04-07 21:30:27.129188343 +0200
++++ saoimage-1.35.1/irafpipe.c 2009-04-07 21:30:27.426188514 +0200
+@@ -25,6 +25,7 @@ static char SccsId[] = "%W% %G%";
+ #ifdef IMTOOL
+
+ #include <stdio.h> /* stderr, FILE, NULL, etc. */
++#include <string.h>
+ #include <X11/Xlib.h> /* get X types and constants */
+ #include "hfiles/control.h" /* struct connectRec */
+ // Forward declarations
+diff -up saoimage-1.35.1/mainbffr.c.inc saoimage-1.35.1/mainbffr.c
+--- saoimage-1.35.1/mainbffr.c.inc 1996-01-02 20:25:54.000000000 +0100
++++ saoimage-1.35.1/mainbffr.c 2009-04-07 21:30:27.637185459 +0200
+@@ -24,6 +24,8 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h> /* get stderr, NULL, etc */
++#include <string.h>
++#include <stdlib.h>
+ #include <X11/Xlib.h> /* X window stuff */
+ #include <X11/Xutil.h> /* X window manager stuff */
+ #include "hfiles/define.h" /* define MIN, MAX, etc. */
+diff -up saoimage-1.35.1/mainevnt.c.inc saoimage-1.35.1/mainevnt.c
+--- saoimage-1.35.1/mainevnt.c.inc 1991-05-16 00:30:56.000000000 +0200
++++ saoimage-1.35.1/mainevnt.c 2009-04-07 21:30:27.429188662 +0200
+@@ -19,6 +19,7 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h> /* stderr, NULL, etc. */
++#include <string.h>
+ #include <sys/time.h> /* get struct timeval */
+ #include <X11/Xlib.h> /* X window stuff */
+ #include <X11/Xutil.h> /* X window manager stuff */
+diff -up saoimage-1.35.1/maininit.c.inc saoimage-1.35.1/maininit.c
+--- saoimage-1.35.1/maininit.c.inc 2009-04-07 21:30:27.130188199 +0200
++++ saoimage-1.35.1/maininit.c 2009-04-07 21:30:27.694189706 +0200
+@@ -29,6 +29,8 @@ static char SccsId[] = "%W% %G%";
+ #include <string.h> /* strlen, strcat, strcpy, strrchr */
+ #endif
+
++#include <string.h>
++#include <stdlib.h>
+ #include <sys/time.h> /* struct timeval used in <sys/resource.h> */
+ #include <X11/Xlib.h> /* X window stuff */
+ #include <X11/Xutil.h> /* X window manager stuff */
+diff -up saoimage-1.35.1/mainkey.c.inc saoimage-1.35.1/mainkey.c
+--- saoimage-1.35.1/mainkey.c.inc 2009-04-07 21:30:27.132189938 +0200
++++ saoimage-1.35.1/mainkey.c 2009-04-07 21:30:27.305188876 +0200
+@@ -16,6 +16,7 @@ static char SccsId[] = "%W% %G%";
+ */
+
#include <stdio.h>
+#include <string.h>
- #include <sys/types.h>
- #include <sys/file.h>
- #include <X/Xlib.h>
---- saoimage-1.35.1/csrsave.c.inc 2008-10-26 19:27:39.000000000 +0100
-+++ saoimage-1.35.1/csrsave.c 2008-10-26 19:27:52.000000000 +0100
-@@ -22,6 +22,7 @@
+ #include <X11/Xlib.h> /* X window stuff */
+ #include <X11/Xutil.h> /* X window manager stuff */
+ #include <X11/keysym.h>
+diff -up saoimage-1.35.1/mainutil.c.inc saoimage-1.35.1/mainutil.c
+--- saoimage-1.35.1/mainutil.c.inc 1998-08-12 21:53:24.000000000 +0200
++++ saoimage-1.35.1/mainutil.c 2009-04-07 21:30:27.430188117 +0200
+@@ -23,6 +23,7 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h> /* stderr, FILE, NULL, etc. */
++#include <string.h>
+ #include <stdlib.h> /* calloc, etc. */
+ #include <X11/Xlib.h> /* X window stuff */
+ #include <X11/Xutil.h> /* X window manager stuff */
+diff -up saoimage-1.35.1/mgfyctrl.c.inc saoimage-1.35.1/mgfyctrl.c
+--- saoimage-1.35.1/mgfyctrl.c.inc 2009-04-07 21:30:27.151190451 +0200
++++ saoimage-1.35.1/mgfyctrl.c 2009-04-07 21:30:27.553188232 +0200
+@@ -29,6 +29,7 @@ static char SccsId[] = "%W% %G%";
+
+ #include <stdio.h>
+ #include <string.h> /* strlen */
++#include <strings.h>
+ #include <X11/Xlib.h> /* X window stuff */
+ #include <X11/Xutil.h> /* X window manager stuff */
+ #include "hfiles/struct.h" /* declare structure types */
+diff -up saoimage-1.35.1/mgfydraw.c.inc saoimage-1.35.1/mgfydraw.c
+--- saoimage-1.35.1/mgfydraw.c.inc 1995-05-04 20:45:43.000000000 +0200
++++ saoimage-1.35.1/mgfydraw.c 2009-04-07 21:30:27.554187600 +0200
+@@ -18,6 +18,7 @@ static char SccsId[] = "%W% %G%";
+ * {n} <who> -- <does what> -- <when>
+ */
+
++#include <strings.h>
+ #include <X11/Xlib.h> /* X window stuff */
+ #include <X11/Xutil.h> /* X window manager stuff */
+ #include "hfiles/color.h" /* define GCspec */
+diff -up saoimage-1.35.1/mgfyinit.c.inc saoimage-1.35.1/mgfyinit.c
+--- saoimage-1.35.1/mgfyinit.c.inc 1990-04-20 17:58:11.000000000 +0200
++++ saoimage-1.35.1/mgfyinit.c 2009-04-07 21:30:27.640186234 +0200
+@@ -20,6 +20,7 @@ static char SccsId[] = "%W% %G%";
*/
#include <stdio.h> /* stderr, NULL, etc. */
++#include <stdlib.h>
+ #include <X11/Xlib.h> /* X window stuff */
+ #include <X11/Xutil.h> /* X window manager stuff */
+ #include "hfiles/define.h" /* define MAX, etc. */
+diff -up saoimage-1.35.1/mgfytabl.c.inc saoimage-1.35.1/mgfytabl.c
+--- saoimage-1.35.1/mgfytabl.c.inc 2009-04-07 21:30:27.152189002 +0200
++++ saoimage-1.35.1/mgfytabl.c 2009-04-07 21:30:27.431188084 +0200
+@@ -19,6 +19,7 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h> /* get stderr */
+#include <string.h>
#include <X11/Xlib.h> /* X window stuff */
#include <X11/Xutil.h> /* X window manager stuff */
- #include "hfiles/color.h" /* cursor colors needed by Cursor.h */
---- saoimage-1.35.1/clrread.c.inc 2008-10-26 19:28:03.000000000 +0100
-+++ saoimage-1.35.1/clrread.c 2008-10-26 19:28:12.000000000 +0100
-@@ -17,6 +17,7 @@
+ #include "hfiles/struct.h" /* declare structure types */
+diff -up saoimage-1.35.1/pancopy.c.inc saoimage-1.35.1/pancopy.c
+--- saoimage-1.35.1/pancopy.c.inc 1996-02-26 22:09:39.000000000 +0100
++++ saoimage-1.35.1/pancopy.c 2009-04-07 21:30:27.565187392 +0200
+@@ -20,6 +20,8 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h> /* define stderr, NULL, etc. */
++#include <string.h>
++#include <strings.h>
+ #include "hfiles/define.h" /* define MIN, MAX, etc. */
+
+ /*
+diff -up saoimage-1.35.1/panctrl.c.inc saoimage-1.35.1/panctrl.c
+--- saoimage-1.35.1/panctrl.c.inc 1998-11-06 18:16:33.000000000 +0100
++++ saoimage-1.35.1/panctrl.c 2009-04-07 21:30:27.434188899 +0200
+@@ -19,6 +19,7 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h> /* define stderr, NULL, etc. */
++#include <string.h>
+ #include <X11/Xlib.h> /* X window stuff */
+ #include <X11/Xutil.h> /* window manager stuff */
+ #include "hfiles/constant.h" /* define codes */
+diff -up saoimage-1.35.1/panimage.c.inc saoimage-1.35.1/panimage.c
+--- saoimage-1.35.1/panimage.c.inc 2009-04-07 21:30:27.156189057 +0200
++++ saoimage-1.35.1/panimage.c 2009-04-07 21:30:27.435187738 +0200
+@@ -19,6 +19,7 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h> /* define stderr, NULL, etc. */
++#include <string.h>
+ #include <X11/Xlib.h> /* X window stuff */
+ #include <X11/Xutil.h> /* X window manager stuff */
+ #include "hfiles/define.h" /* define MIN, MAX, DONT_CARE, etc. */
+diff -up saoimage-1.35.1/prntcent.c.inc saoimage-1.35.1/prntcent.c
+--- saoimage-1.35.1/prntcent.c.inc 2009-04-07 21:30:27.166189947 +0200
++++ saoimage-1.35.1/prntcent.c 2009-04-07 21:30:27.436187651 +0200
+@@ -23,6 +23,7 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h> /* get stderr */
++#include <string.h>
+ #include <math.h>
+ #include <X11/Xlib.h> /* X window stuff */
+ #include <X11/Xutil.h> /* X window manager stuff */
+diff -up saoimage-1.35.1/prntcurs.c.inc saoimage-1.35.1/prntcurs.c
+--- saoimage-1.35.1/prntcurs.c.inc 2009-04-07 21:30:27.167188950 +0200
++++ saoimage-1.35.1/prntcurs.c 2009-04-07 21:30:27.438188562 +0200
+@@ -21,6 +21,7 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h>
++#include <string.h>
+ #include <X11/Xlib.h> /* X window stuff */
+ #include <X11/Xutil.h> /* X window manager stuff */
+ #include "hfiles/struct.h" /* declare structure types */
+diff -up saoimage-1.35.1/readarr.c.inc saoimage-1.35.1/readarr.c
+--- saoimage-1.35.1/readarr.c.inc 2009-04-07 21:30:27.168188402 +0200
++++ saoimage-1.35.1/readarr.c 2009-04-07 21:30:27.695185886 +0200
+@@ -18,6 +18,8 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h> /* define stderr */
++#include <string.h>
++#include <stdlib.h>
+ #include <X11/Xlib.h> /* needed for control.h */
+ #include "hfiles/constant.h" /* define data type codes */
+ #include "hfiles/control.h" /* define IOP codes */
+diff -up saoimage-1.35.1/readfith.c.inc saoimage-1.35.1/readfith.c
+--- saoimage-1.35.1/readfith.c.inc 2009-04-07 21:30:27.169189719 +0200
++++ saoimage-1.35.1/readfith.c 2009-04-07 21:30:27.651190271 +0200
+@@ -35,6 +35,7 @@ static char SccsId[] = "%W% %G%";
+ #include <string.h> /* strlen, strcat, strcpy, strrchr */
+ #endif
+
++#include <string.h>
+ #include <X11/Xlib.h> /* X window stuff */
+ #include <X11/Xutil.h> /* X window manager stuff */
+ #include "hfiles/define.h" /* define MIN, MAX, etc. */
+diff -up saoimage-1.35.1/readfits0.c.inc saoimage-1.35.1/readfits0.c
+--- saoimage-1.35.1/readfits0.c.inc 2009-04-07 21:30:27.171189669 +0200
++++ saoimage-1.35.1/readfits0.c 2009-04-07 21:30:27.440186992 +0200
+@@ -25,6 +25,7 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h> /* define stderr, NULL, etc. */
++#include <string.h>
+ #include <X11/Xlib.h> /* needed for control.h */
+ #include "hfiles/constant.h"
+ #include "hfiles/control.h" /* define IOP codes */
+diff -up saoimage-1.35.1/readfits.c.inc saoimage-1.35.1/readfits.c
+--- saoimage-1.35.1/readfits.c.inc 2001-11-14 18:54:04.000000000 +0100
++++ saoimage-1.35.1/readfits.c 2009-04-07 21:30:27.653188708 +0200
+@@ -29,6 +29,8 @@ static char SccsId[] = "%W% %G%";
+ #else
+ #include <string.h>
+ #endif
++#include <string.h>
++#include <stdlib.h>
+ #include <X11/Xlib.h> /* needed for control.h */
+ #include "hfiles/constant.h"
+ #include "hfiles/image.h"
+diff -up saoimage-1.35.1/readint.c.inc saoimage-1.35.1/readint.c
+--- saoimage-1.35.1/readint.c.inc 1998-07-09 19:12:27.000000000 +0200
++++ saoimage-1.35.1/readint.c 2009-04-07 21:30:27.712189552 +0200
+@@ -28,6 +28,9 @@ static char SccsId[] = "%W% %G%";
+ * {n} <who> -- <does what> -- <when>
+ */
+
++#include <string.h>
++#include <stdlib.h>
++#include <stdio.h>
+ #include <sys/types.h> /* needed for ntohl (net to host long) */
+ #ifndef VMS
+ #include <netinet/in.h> /* needed for ntohl (net to host long) */
+diff -up saoimage-1.35.1/readreal.c.inc saoimage-1.35.1/readreal.c
+--- saoimage-1.35.1/readreal.c.inc 1998-07-09 19:11:08.000000000 +0200
++++ saoimage-1.35.1/readreal.c 2009-04-07 21:30:27.443188153 +0200
+@@ -23,6 +23,7 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h>
++#include <string.h>
+ #include "hfiles/image.h" /* image struct */
+ #include "hfiles/scale.h" /* define SCALEWIDTH, etc. */
+
+diff -up saoimage-1.35.1/rgnanli.c.inc saoimage-1.35.1/rgnanli.c
+--- saoimage-1.35.1/rgnanli.c.inc 2009-04-07 21:30:27.181193729 +0200
++++ saoimage-1.35.1/rgnanli.c 2009-04-07 21:30:27.471194151 +0200
+@@ -19,6 +19,7 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h> /* stderr, sscanf, NULL */
++#include <string.h>
+ #include <X11/Xlib.h> /* X window stuff */
+ #include <X11/Xutil.h> /* X window manager stuff */
+ // Forward declarations
+diff -up saoimage-1.35.1/rgnctrl.c.inc saoimage-1.35.1/rgnctrl.c
+--- saoimage-1.35.1/rgnctrl.c.inc 2009-04-07 21:30:27.182188790 +0200
++++ saoimage-1.35.1/rgnctrl.c 2009-04-07 21:30:27.472188217 +0200
+@@ -18,6 +18,7 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h> /* Define stderr, NULL */
++#include <string.h>
+ #include <X11/Xlib.h> /* X window stuff */
+ #include <X11/Xutil.h> /* X window manager stuff, visuals */
+ #include <X11/keysym.h>
+diff -up saoimage-1.35.1/rgndraw.c.inc saoimage-1.35.1/rgndraw.c
+--- saoimage-1.35.1/rgndraw.c.inc 2009-04-07 21:30:27.184189731 +0200
++++ saoimage-1.35.1/rgndraw.c 2009-04-07 21:30:27.654188117 +0200
+@@ -31,6 +31,7 @@ static char SccsId[] = "%W% %G%";
+ #include <string.h> /* strlen, strcat, strcpy, strrchr */
+ #endif
+
++#include <string.h>
+ #include <X11/Xlib.h> /* X window stuff */
+ #include <X11/Xutil.h> /* X window manager stuff */
+ #include "hfiles/define.h" /* define MIN, MAX, U_DONT_CARE, etc. */
+diff -up saoimage-1.35.1/rgnmake.c.inc saoimage-1.35.1/rgnmake.c
+--- saoimage-1.35.1/rgnmake.c.inc 2009-04-07 21:30:27.186188406 +0200
++++ saoimage-1.35.1/rgnmake.c 2009-04-07 21:30:27.656189469 +0200
+@@ -31,6 +31,7 @@ static char SccsId[] = "%W% %G%";
+ #include <string.h> /* strlen, strcat, strcpy, strrchr */
+ #endif
+
++#include <string.h>
+ #include <stdio.h> /* get stderr, define sscanf */
+ #include <math.h> /* sin, cos, etc */
+ #include <X11/Xlib.h> /* X window stuff */
+diff -up saoimage-1.35.1/rgnread.c.inc saoimage-1.35.1/rgnread.c
+--- saoimage-1.35.1/rgnread.c.inc 1998-10-14 21:03:09.000000000 +0200
++++ saoimage-1.35.1/rgnread.c 2009-04-07 21:30:27.657188649 +0200
+@@ -32,6 +32,8 @@ static char SccsId[] = "%W% %G%";
+ #include <string.h> /* strlen, strcat, strcpy, strrchr */
+ #endif
+
++#include <string.h>
++#include <stdlib.h>
+ #include <X11/Xlib.h> /* X window stuff */
+ #include <X11/Xutil.h> /* X window manager stuff */
+ #include "hfiles/constant.h" /* define codes */
+diff -up saoimage-1.35.1/rgntoken.c.inc saoimage-1.35.1/rgntoken.c
+--- saoimage-1.35.1/rgntoken.c.inc 1998-10-19 20:53:16.000000000 +0200
++++ saoimage-1.35.1/rgntoken.c 2009-04-07 21:30:27.567189442 +0200
+@@ -20,6 +20,8 @@ static char SccsId[] = "%W% %G%";
*/
#include <stdio.h> /* stderr, NULL, etc. */
+#include <string.h>
++#include <strings.h>
#include <ctype.h> /* toupper, isalpha, etc. */
- #include "hfiles/colormap.h" /* color table storage structs */
- // Forward declarations
---- saoimage-1.35.1/btnlib/label.c.inc 2008-10-26 19:28:58.000000000 +0100
-+++ saoimage-1.35.1/btnlib/label.c 2008-10-26 19:29:09.000000000 +0100
+ #include <X11/Xlib.h> /* X window stuff */
+ #include <X11/Xutil.h> /* X window manager stuff */
+diff -up saoimage-1.35.1/rgnwpros.c.inc saoimage-1.35.1/rgnwpros.c
+--- saoimage-1.35.1/rgnwpros.c.inc 2009-04-07 21:30:27.188188920 +0200
++++ saoimage-1.35.1/rgnwpros.c 2009-04-07 21:30:27.667189702 +0200
+@@ -30,6 +30,7 @@ static char SccsId[] = "%W% %G%";
+ #include <string.h> /* strlen, strcat, strcpy, strrchr */
+ #endif
+
++#include <string.h>
+ #include <X11/Xlib.h> /* get X types and constants */
+ #include <X11/Xutil.h> /* X window manager stuff, visuals */
+ #include "hfiles/color.h" /* gcset needed by cursor */
+diff -up saoimage-1.35.1/rgnwrite.c.inc saoimage-1.35.1/rgnwrite.c
+--- saoimage-1.35.1/rgnwrite.c.inc 2009-04-07 21:30:27.189188503 +0200
++++ saoimage-1.35.1/rgnwrite.c 2009-04-07 21:30:27.668187409 +0200
+@@ -33,6 +33,7 @@ static char SccsId[] = "%W% %G%";
+ #include <string.h> /* strlen, strcat, strcpy, strrchr */
+ #endif
+
++#include <string.h>
+ #include <time.h> /* needed for asctime() */
+ #include <X11/Xlib.h> /* get X types and constants */
+ #include <X11/Xutil.h> /* X window manager, visual stuff */
+diff -up saoimage-1.35.1/rtcmd.c.inc saoimage-1.35.1/rtcmd.c
+--- saoimage-1.35.1/rtcmd.c.inc 1990-05-11 16:21:46.000000000 +0200
++++ saoimage-1.35.1/rtcmd.c 2009-04-07 21:30:27.475188636 +0200
+@@ -1,5 +1,6 @@
+
+ #include <stdio.h>
++#include <string.h>
+
+ #include <X11/Xlib.h> /* X window stuff */
+ #include <X11/Xutil.h> /* X window manager stuff */
+diff -up saoimage-1.35.1/sclctrl.c.inc saoimage-1.35.1/sclctrl.c
+--- saoimage-1.35.1/sclctrl.c.inc 2009-04-07 21:30:27.190187857 +0200
++++ saoimage-1.35.1/sclctrl.c 2009-04-07 21:30:27.476188738 +0200
+@@ -19,6 +19,7 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h> /* get stderr */
++#include <string.h>
+ #include <X11/Xlib.h> /* X window stuff */
+ #include <X11/Xutil.h> /* X window manager stuff */
+ #include "hfiles/constant.h" /* define codes */
+diff -up saoimage-1.35.1/sclmap.c.inc saoimage-1.35.1/sclmap.c
+--- saoimage-1.35.1/sclmap.c.inc 2009-04-07 21:30:27.192188764 +0200
++++ saoimage-1.35.1/sclmap.c 2009-04-07 21:30:27.477188293 +0200
+@@ -18,6 +18,7 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h> /* get stderr, NULL, etc. */
++#include <string.h>
+ #include <math.h> /* get the math definitions */
+ #include <X11/Xlib.h> /* X window stuff */
+ #include <X11/Xutil.h> /* X window manager stuff */
+diff -up saoimage-1.35.1/shfile.c.inc saoimage-1.35.1/shfile.c
+--- saoimage-1.35.1/shfile.c.inc 1991-04-18 21:29:51.000000000 +0200
++++ saoimage-1.35.1/shfile.c 2009-04-07 21:30:27.319188233 +0200
+@@ -1,4 +1,5 @@
+ #include <stdio.h>
++#include <string.h>
+ #include <sys/types.h>
+ #include <sys/file.h>
+ #include <X/Xlib.h>
+diff -up saoimage-1.35.1/tnxpos.c.inc saoimage-1.35.1/tnxpos.c
+--- saoimage-1.35.1/tnxpos.c.inc 2002-06-26 16:35:48.000000000 +0200
++++ saoimage-1.35.1/tnxpos.c 2009-04-07 21:30:27.479188712 +0200
+@@ -29,6 +29,7 @@
+ */
+
+ #include <stdio.h>
++#include <string.h>
+ #include <stdlib.h>
+ #include <math.h>
+ #include "wcs.h"
+diff -up saoimage-1.35.1/vms/ghstname.c.inc saoimage-1.35.1/vms/ghstname.c
+--- saoimage-1.35.1/vms/ghstname.c.inc 1989-11-10 09:55:19.000000000 +0100
++++ saoimage-1.35.1/vms/ghstname.c 2009-04-07 21:30:27.303190137 +0200
@@ -1,3 +1,5 @@
+#include <string.h>
+
- #ifndef lint
- static char SccsId[] = "%W% %G%";
- #endif
+ gethostname (char *node, int nodelen)
+ {
+ char *p, tmp[32];
+@@ -9,4 +11,4 @@ gethostname (char *node, int nodelen)
+ strncpy (node, tmp, nodelen);
+ node[nodelen] = '\0';
+ }
+-
+\ No newline at end of file
++
+diff -up saoimage-1.35.1/vms/zfiovi.c.inc saoimage-1.35.1/vms/zfiovi.c
+--- saoimage-1.35.1/vms/zfiovi.c.inc 1990-05-12 23:57:35.000000000 +0200
++++ saoimage-1.35.1/vms/zfiovi.c 2009-04-07 21:30:27.304190021 +0200
+@@ -53,6 +53,7 @@
+ #include <iodef.h> /* I/O definitions */
+ #include <ssdef.h> /* System status definitions */
+ #include <syidef.h> /* Get system info definitions */
++#include <string.h>
+
+ #ifdef IMTOOL
+ #define import_spp /* Import the IRAF SPP constants */
+diff -up saoimage-1.35.1/wcssubs-3.5.1/tnxpos.c.inc saoimage-1.35.1/wcssubs-3.5.1/tnxpos.c
+--- saoimage-1.35.1/wcssubs-3.5.1/tnxpos.c.inc 2002-06-26 16:35:48.000000000 +0200
++++ saoimage-1.35.1/wcssubs-3.5.1/tnxpos.c 2009-04-07 21:30:27.481189098 +0200
+@@ -29,6 +29,7 @@
+ */
+
+ #include <stdio.h>
++#include <string.h>
+ #include <stdlib.h>
+ #include <math.h>
+ #include "wcs.h"
+diff -up saoimage-1.35.1/wndwcre.c.inc saoimage-1.35.1/wndwcre.c
+--- saoimage-1.35.1/wndwcre.c.inc 2003-09-03 20:54:06.000000000 +0200
++++ saoimage-1.35.1/wndwcre.c 2009-04-07 21:30:27.482187527 +0200
+@@ -24,6 +24,7 @@ static char SccsId[] = "%W% %G%";
+ */
+
+ #include <stdio.h> /* stderr, NULL, etc. */
++#include <string.h>
+ #include <X11/Xlib.h> /* X window stuff */
+ #include <X11/Xutil.h> /* window manager hint stuff */
+ #include "hfiles/window.h"
+diff -up saoimage-1.35.1/wndwinit.c.inc saoimage-1.35.1/wndwinit.c
+--- saoimage-1.35.1/wndwinit.c.inc 2009-04-07 21:30:27.194189503 +0200
++++ saoimage-1.35.1/wndwinit.c 2009-04-07 21:30:27.750189916 +0200
+@@ -28,6 +28,7 @@ static char SccsId[] = "%W% %G%";
+
+ #include <stdlib.h> /* malloc() */
+ #include <stdio.h> /* stderr, FILE, NULL, etc. */
++#include <string.h>
+ #include <X11/Xlib.h> /* X window stuff */
+ #include <X11/Xutil.h> /* X window manager stuff */
+ #include "hfiles/constant.h" /* define codes */
saoimage-1.35.1-mkstemp.patch:
Index: saoimage-1.35.1-mkstemp.patch
===================================================================
RCS file: /cvs/pkgs/rpms/saoimage/devel/saoimage-1.35.1-mkstemp.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- saoimage-1.35.1-mkstemp.patch 3 Nov 2008 20:04:06 -0000 1.1
+++ saoimage-1.35.1-mkstemp.patch 7 Apr 2009 20:07:54 -0000 1.2
@@ -3,9 +3,27 @@
Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk>
---- saoimage-1.35.1/disppsct.c.mkstemp 2008-10-25 00:20:37.000000000 +0200
-+++ saoimage-1.35.1/disppsct.c 2008-10-25 00:22:47.000000000 +0200
-@@ -303,7 +303,7 @@
+diff -up saoimage-1.35.1/disppsct.c.mkstemp saoimage-1.35.1/disppsct.c
+--- saoimage-1.35.1/disppsct.c.mkstemp 2003-09-03 20:23:08.000000000 +0200
++++ saoimage-1.35.1/disppsct.c 2009-04-07 20:24:14.520190757 +0200
+@@ -22,7 +22,7 @@ static char SccsId[] = "%W% %G%";
+ * {n} <who> -- <does what> -- <when>
+ */
+
+-#ifndef SUN
++#if 0
+ #include <sys/file.h>
+ #endif
+
+@@ -39,6 +39,7 @@ static char SccsId[] = "%W% %G%";
+ #include <string.h> /* strlen, strcat, strcpy, strrchr */
+ #endif
+
++#include <stdlib.h>
+ #include <time.h>
+ #include <X11/Xlib.h> /* X window stuff */
+ #include <X11/Xutil.h> /* X window manager stuff */
+@@ -303,7 +304,7 @@ void screen_dump ( nobuttons )
#endif
if( ++index > 26 ) index = 0;
/* open a file with a system chosen unique name */
@@ -14,3 +32,12 @@
if( (fd = mkstemp(tempfile)) == -1 ) {
perror("Cannot make temp file");
#else
+@@ -314,7 +315,7 @@ void screen_dump ( nobuttons )
+ (void)fprintf(stderr, "cannot create temporary file %s\n", tempfile);
+ (void)fflush(stderr);
+ } else {
+-#ifdef SUN
++#if 1
+ fp = fdopen(fd, "a");
+ #endif
+ /* Autoscale to fit output page. */
Index: saoimage.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/saoimage/devel/saoimage.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- saoimage.desktop 24 Mar 2009 15:30:02 -0000 1.2
+++ saoimage.desktop 7 Apr 2009 20:07:54 -0000 1.3
@@ -6,6 +6,6 @@
GenericName=SAOimage Viewer
Exec=saoimage %f
Icon=saoimage
-MimeType=application/x-iraf-image;
+MimeType=image/fits;
Categories=Graphics;2DGraphics;RasterGraphics;Education;Astronomy;
Terminal=false
Index: saoimage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/saoimage/devel/saoimage.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- saoimage.spec 24 Mar 2009 15:30:03 -0000 1.4
+++ saoimage.spec 7 Apr 2009 20:07:54 -0000 1.5
@@ -107,6 +107,11 @@
%changelog
+* Tue Apr 7 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 1.35.1-6
+- Fix blink crash
+- Fix print crash caused by mkstemp patch
+- Add a lot of missing includes, making FORTIFY_SOURCE effective
+
* Tue Mar 24 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 1.35.1-5
- Fix the categories
- Previous message (by thread): rpms/grub/devel grub-0.97-fat-lowercase.patch, NONE, 1.1 grub-0.97-efipxe.patch, 1.3, 1.4 grub.spec, 1.90, 1.91
- Next message (by thread): rpms/libatasmart/devel .cvsignore, 1.7, 1.8 libatasmart.spec, 1.8, 1.9 sources, 1.7, 1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list