1 Description: Permit compilation with hardening flags in dpkg >= 1.16.0
4 Index: grace-5.1.22/src/utils.c
5 ===================================================================
6 --- grace-5.1.22.orig/src/utils.c 2012-05-17 19:00:52.144748609 -0700
7 +++ grace-5.1.22/src/utils.c 2012-05-17 19:00:54.000000000 -0700
8 @@ -1171,12 +1171,12 @@
16 /* log results to file */
19 + fprintf(resfp, "%s", s);
24 char buf[GR_MAXPATHLEN];
27 - getcwd(workingdir, GR_MAXPATHLEN - 1);
28 + if (getcwd(workingdir, GR_MAXPATHLEN - 1) == NULL) {
29 + return RETURN_FAILURE;
31 if (workingdir[strlen(workingdir)-1] != '/') {
32 strcat(workingdir, "/");
34 Index: grace-5.1.22/src/svgdrv.c
35 ===================================================================
36 --- grace-5.1.22.orig/src/svgdrv.c 2012-05-17 19:00:52.144748609 -0700
37 +++ grace-5.1.22/src/svgdrv.c 2012-05-17 19:00:54.000000000 -0700
40 scaleval(vp.x), scaleval(vp.y));
42 - fprintf(prstream, escape_specials((unsigned char *) s, len));
43 + fprintf(prstream, "%s", escape_specials((unsigned char *) s, len));
45 fprintf(prstream, "</text>\n");
47 Index: grace-5.1.22/auxiliary/Makefile
48 ===================================================================
49 --- grace-5.1.22.orig/auxiliary/Makefile 2012-05-17 19:00:52.144748609 -0700
50 +++ grace-5.1.22/auxiliary/Makefile 2012-05-17 19:08:21.791557072 -0700
54 convcal$(EXE) : convcal.c
55 - $(CC) $(CFLAGS0) $(CPPFLAGS) -o $@ convcal.c $(NOGUI_LIBS)
56 + $(CC) $(CFLAGS0) $(CPPFLAGS) -Wl,-z,relro -Wl,-z,now -o $@ convcal.c $(NOGUI_LIBS)
58 install : $(AUXILIARIES) $(PROGRAMS) $(SCRIPTS)
59 $(MKINSTALLDIRS) $(DESTDIR)$(GRACE_HOME)/auxiliary