retitle 177428 wrong assumption on char signedness in built-in gdchart
retitle 314315 Please migrate to libgdchart-gd2
severity 314315 important
merge 177428 314315
tag 314315 patch
thanks
nessus is now the last package depending on libgd-gif1. The attached
patch removes the dependency by replacing the built-in gdchart with
libgdchart-gd2. (It also reverts no longer necessary changes in the
gdchart makefile.)
Let me know if you'd like me to NMU.
Cheers,
Matej
diff -ruN nessus-core-2.2.5.dist/debian/control nessus-core-2.2.5/debian/control
--- nessus-core-2.2.5.dist/debian/control 2005-09-03 20:04:16.000000000
+0200
+++ nessus-core-2.2.5/debian/control 2005-09-03 21:09:17.000000000 +0200
@@ -2,7 +2,7 @@
Section: admin
Priority: optional
Maintainer: Javier Fernandez-Sanguino Pen~a <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 2), xlibs-dev, libnessus-dev (>= 2.2.3),
libnasl-dev (>= 2.2.3), libgmp3-dev, libz-dev, libpcap0.8-dev | libpcap-dev,
libglib1.2-dev, libglib2.0-dev, libgtk2.0-dev, libgd-gif1-dev, libwrap-dev,
libssl-dev
+Build-Depends: debhelper (>= 2), xlibs-dev, libnessus-dev (>= 2.2.3),
libnasl-dev (>= 2.2.3), libgmp3-dev, libz-dev, libpcap0.8-dev | libpcap-dev,
libglib1.2-dev, libglib2.0-dev, libgtk2.0-dev, libgdchart-gd2-noxpm-dev,
libwrap-dev, libssl-dev
Standards-Version: 3.5.10
Package: nessus
diff -ruN nessus-core-2.2.5.dist/nessus/Makefile
nessus-core-2.2.5/nessus/Makefile
--- nessus-core-2.2.5.dist/nessus/Makefile 2005-09-03 20:04:16.000000000
+0200
+++ nessus-core-2.2.5/nessus/Makefile 2005-09-03 19:46:33.000000000 +0200
@@ -1,9 +1,9 @@
include ../nessus.tmpl
GTKLIBS= $(GTKCONFIG_LIBS) $(GLIBCONFIG_LIBS)
-INCLUDE = ${include} $(GTKCONFIG_CFLAGS) $(GLIBCONFIG_CFLAGS) -Igdchart0.94b
+INCLUDE = ${include} $(GTKCONFIG_CFLAGS) $(GLIBCONFIG_CFLAGS)
LIBS = `$(NESSUSCONFIG) --libs` $(X_LIBS) $(X_CFLAGS) $(GTKLIBS) \
- $(RUN_LIBS) $(C_R_LIB) -lgd -lm
+ $(RUN_LIBS) $(C_R_LIB) -lgdc -lm
NESSUS_INCLUDE=`sh ./cflags`
@@ -47,10 +47,6 @@
netmap.o \
detached_index.o \
read_target_file.o \
- gdchart0.94b/gdc.o \
- gdchart0.94b/price_conv.o \
- gdchart0.94b/gdc_pie.o \
- gdchart0.94b/gdchart.o \
regex.o \
filter.o \
dirutils.o \
diff -ruN nessus-core-2.2.5.dist/nessus/gdchart0.94b/makefile
nessus-core-2.2.5/nessus/gdchart0.94b/makefile
--- nessus-core-2.2.5.dist/nessus/gdchart0.94b/makefile 2005-09-03
20:04:16.000000000 +0200
+++ nessus-core-2.2.5/nessus/gdchart0.94b/makefile 2005-09-03
19:56:04.000000000 +0200
@@ -1,11 +1,12 @@
include ../../nessus.tmpl
GDC_INCL = .
-GD_INCL = .
+GD_INCL = gd1.3
+GD_LIB = gd1.3
IINCL = $(CFLAGS) `sh ../cflags`
-all: gdc.o gdchart.o price_conv.o gdc_pie.o
+all: gdc.o gdchart.o price_conv.o gdc_pie.o $(GD_LIB)/libgd.a
# compile the samples
gdc_samp1: gdc.o gdchart.o price_conv.o gdc_samp1.o $(GD_LIB)/libgd.a
@@ -45,3 +46,5 @@
# --- clean ---
clean:
rm -f *.o gdc_samp1 gdc_samp2 gdc_pie_samp
+ cd $(GD_LIB) ; $(MAKE) -f Makefile clean
+
diff -ruN nessus-core-2.2.5.dist/nessus/html_graph_output.c
nessus-core-2.2.5/nessus/html_graph_output.c
--- nessus-core-2.2.5.dist/nessus/html_graph_output.c 2005-07-21
19:50:28.000000000 +0200
+++ nessus-core-2.2.5/nessus/html_graph_output.c 2005-09-03
21:52:03.000000000 +0200
@@ -65,9 +65,13 @@
-------------------------------------------------------------------*/
#include <includes.h>
-#include "gdchart0.94b/gdc.h"
-#include "gdchart0.94b/gdchart.h"
-#include "gdchart0.94b/gdcpie.h"
+#ifndef HAVE_LIBFREETYPE
+/* prevent undefined references in gdc (http://bugs.debian.org/242936) */
+# define HAVE_LIBFREETYPE 0
+#endif
+#include <gdc.h>
+#include <gdchart.h>
+#include <gdcpie.h>
#include "report.h"
#include "report_utils.h"
#include "error_dialog.h"
@@ -78,9 +82,6 @@
static void insert_img(FILE *, char*);
-extern int out_graph(short, short, FILE *, GDC_CHART_T, int, char **, int,
float *);
-
-
/*
* Handy functions
@@ -905,7 +906,7 @@
GDCPIE_label_dist = 15;
GDCPIE_LineColor = 0x000000L;
GDCPIE_PlotColor = 0xC0C0C0L;
- GDCPIE_EdgeColor = 0x000000L;
+ GDCPIE_EdgeColor = GDC_NOCOLOR; /* http://bugs.debian.org/326502 */
GDCPIE_label_size = GDC_SMALL;
GDCPIE_title_size = GDC_MEDBOLD;
GDCPIE_3d_angle = 45;
@@ -915,8 +916,10 @@
GDC_generate_gif = TRUE;
GDC_hold_img = GDC_DESTROY_IMAGE;
GDC_image = NULL;
+ GDC_image_type = GDC_GIF;
GDCPIE_missing = NULL;
GDCPIE_percent_labels = GDCPIE_PCT_RIGHT;
+ GDCPIE_percent_fmt = " (%.0f%%)";
/* remove zero elements */
{
@@ -1056,9 +1059,11 @@
GDCPIE_explode = expl;
GDCPIE_Color = clr;
GDCPIE_BGColor = 0xFFFFFFL;
- GDCPIE_EdgeColor = 0x000000L;
+ GDCPIE_EdgeColor = GDC_NOCOLOR; /* http://bugs.debian.org/326502 */
GDCPIE_missing = NULL;
GDCPIE_percent_labels = GDCPIE_PCT_RIGHT;
+ GDCPIE_percent_fmt = " (%.0f%%)";
+ GDC_image_type = GDC_GIF;
pie_gif(480, 360, pie, GDC_3DPIE, num_risks, lbl, risks_f);
fclose(pie);
insert_img(f, "pie_risks.gif");
@@ -1091,6 +1096,7 @@
GDC_BGColor = 0xFFFFFFL; /* backgound color (white) */
GDC_LineColor = 0x000000L; /* line color (black) */
GDC_SetColor = &(color);
+ GDC_image_type = GDC_GIF;
out_graph(480, 360, chart, GDC_3DBAR, num, services, 1, value);
fclose(chart);
insert_img(f, "chart_dangerous_services.gif");
@@ -1124,6 +1130,7 @@
GDC_BGColor = 0xFFFFFFL; /* backgound color (white) */
GDC_LineColor = 0x000000L; /* line color (black) */
GDC_SetColor = color;
+ GDC_image_type = GDC_GIF;
out_graph(480, 360, chart, GDC_3DBAR, num, services, 1, value);
fclose(chart);
insert_img(f, "chart_services_occurences.gif");
@@ -1155,6 +1162,7 @@
GDC_BGColor = 0xFFFFFFL; /* backgound color (white) */
GDC_LineColor = 0x000000L; /* line color (black) */
GDC_SetColor = &(color);
+ GDC_image_type = GDC_GIF;
out_graph(480, 360, chart, GDC_3DBAR, num, oses, 1, value);
fclose(chart);
insert_img(f, "chart_operating_systems.gif");
@@ -1207,9 +1215,11 @@
GDCPIE_explode = expl;
GDCPIE_Color = clr;
GDCPIE_BGColor = 0xFFFFFFL;
- GDCPIE_EdgeColor = 0x000000L;
+ GDCPIE_EdgeColor = GDC_NOCOLOR; /* http://bugs.debian.org/326502 */
GDCPIE_missing = NULL;
GDCPIE_percent_labels = GDCPIE_PCT_RIGHT;
+ GDCPIE_percent_fmt = " (%.0f%%)";
+ GDC_image_type = GDC_GIF;
pie_gif(480, 360, pie, GDC_3DPIE, 2,names, values);
fclose(pie);
insert_img(f, "pie_most.gif");
