Author: timb Date: 2007-12-28 21:11:11 +0100 (Fri, 28 Dec 2007) New Revision: 557
Added: trunk/openvas-client/packaging/debian/patches/ trunk/openvas-client/packaging/debian/patches/00list trunk/openvas-client/packaging/debian/patches/01_libgdchart-gd2-noxpm-dev.patch Modified: trunk/openvas-client/packaging/debian/control trunk/openvas-client/packaging/debian/rules Log: Incorporates the fixes to use libgdchart-gd2-noxpm-dev Modified: trunk/openvas-client/packaging/debian/control =================================================================== --- trunk/openvas-client/packaging/debian/control 2007-12-28 19:58:57 UTC (rev 556) +++ trunk/openvas-client/packaging/debian/control 2007-12-28 20:11:11 UTC (rev 557) @@ -3,7 +3,7 @@ Priority: extra Maintainer: Tim Brown <[EMAIL PROTECTED]> Uploaders: Javier Fernandez-Sanguino Pen~a <[EMAIL PROTECTED]> -Build-Depends: debhelper (>= 5), autotools-dev, libssl-dev, libgtk2.0-dev +Build-Depends: debhelper (>= 5), autotools-dev, libssl-dev, libgtk2.0-dev, libgdchart-gd2-noxpm-dev Homepage: http://www.openvas.org/ Standards-Version: 3.7.2 Added: trunk/openvas-client/packaging/debian/patches/00list =================================================================== --- trunk/openvas-client/packaging/debian/patches/00list 2007-12-28 19:58:57 UTC (rev 556) +++ trunk/openvas-client/packaging/debian/patches/00list 2007-12-28 20:11:11 UTC (rev 557) @@ -0,0 +1 @@ +01_libgdchart-gd2-noxpm-dev.patch Added: trunk/openvas-client/packaging/debian/patches/01_libgdchart-gd2-noxpm-dev.patch =================================================================== --- trunk/openvas-client/packaging/debian/patches/01_libgdchart-gd2-noxpm-dev.patch 2007-12-28 19:58:57 UTC (rev 556) +++ trunk/openvas-client/packaging/debian/patches/01_libgdchart-gd2-noxpm-dev.patch 2007-12-28 20:11:11 UTC (rev 557) @@ -0,0 +1,176 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_libgdchart-gd2-noxpm-dev.dpatch by <[EMAIL PROTECTED]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Incorporates the fixes to use libgdchart-gd2-noxpm-dev + [EMAIL PROTECTED]@ + +diff -cr openvas-client-1.0.2.orig/nessus/html_graph_output.c openvas-client-1.0.2/nessus/html_graph_output.c +*** openvas-client-1.0.2.orig/nessus/html_graph_output.c 2007-08-20 11:52:01.000000000 +0100 +--- openvas-client-1.0.2/nessus/html_graph_output.c 2007-12-28 11:22:35.000000000 +0000 +*************** +*** 66,74 **** + -------------------------------------------------------------------*/ + #include <includes.h> + #include "nessus_i18n.h" +! #include "gdchart0.94b/gdc.h" +! #include "gdchart0.94b/gdchart.h" +! #include "gdchart0.94b/gdcpie.h" + #include "report.h" + #include "report_utils.h" + #include "error_dlg.h" +--- 66,78 ---- + -------------------------------------------------------------------*/ + #include <includes.h> + #include "nessus_i18n.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_dlg.h" +*************** +*** 968,974 **** + GDCPIE_label_dist = 15; + GDCPIE_LineColor = 0x000000L; + GDCPIE_PlotColor = 0xC0C0C0L; +! GDCPIE_EdgeColor = 0x000000L; + GDCPIE_label_size = GDC_SMALL; + GDCPIE_title_size = GDC_MEDBOLD; + GDCPIE_3d_angle = 45; +--- 972,978 ---- + GDCPIE_label_dist = 15; + GDCPIE_LineColor = 0x000000L; + GDCPIE_PlotColor = 0xC0C0C0L; +! GDCPIE_EdgeColor = GDC_NOCOLOR; /* http://bugs.debian.org/326502 */ + GDCPIE_label_size = GDC_SMALL; + GDCPIE_title_size = GDC_MEDBOLD; + GDCPIE_3d_angle = 45; +*************** +*** 978,983 **** +--- 982,988 ---- + 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; + +*************** +*** 1119,1127 **** + GDCPIE_explode = expl; + GDCPIE_Color = clr; + GDCPIE_BGColor = 0xFFFFFFL; +! GDCPIE_EdgeColor = 0x000000L; + GDCPIE_missing = NULL; + GDCPIE_percent_labels = GDCPIE_PCT_RIGHT; + pie_gif(480, 360, pie, GDC_3DPIE, num_risks, lbl, risks_f); + fclose(pie); + insert_img(f, "pie_risks.gif"); +--- 1124,1134 ---- + GDCPIE_explode = expl; + GDCPIE_Color = clr; + GDCPIE_BGColor = 0xFFFFFFL; +! GDCPIE_EdgeColor = GDC_NOCOLOR; + 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"); +*************** +*** 1154,1159 **** +--- 1161,1167 ---- + 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"); +*************** +*** 1187,1192 **** +--- 1195,1201 ---- + 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"); +*************** +*** 1218,1223 **** +--- 1227,1233 ---- + 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"); +*************** +*** 1270,1278 **** + GDCPIE_explode = expl; + GDCPIE_Color = clr; + GDCPIE_BGColor = 0xFFFFFFL; +! GDCPIE_EdgeColor = 0x000000L; + GDCPIE_missing = NULL; + GDCPIE_percent_labels = GDCPIE_PCT_RIGHT; + pie_gif(480, 360, pie, GDC_3DPIE, 2,names, values); + fclose(pie); + insert_img(f, "pie_most.gif"); +--- 1280,1290 ---- + GDCPIE_explode = expl; + GDCPIE_Color = clr; + GDCPIE_BGColor = 0xFFFFFFL; +! 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"); +diff -cr openvas-client-1.0.2.orig/nessus/Makefile openvas-client-1.0.2/nessus/Makefile +*** openvas-client-1.0.2.orig/nessus/Makefile 2007-08-20 11:38:47.000000000 +0100 +--- openvas-client-1.0.2/nessus/Makefile 2007-12-28 11:25:51.000000000 +0000 +*************** +*** 1,9 **** + include ../nessus.tmpl + + GTKLIBS= $(GTKCONFIG_LIBS) +! INCLUDE = ${include} $(GTKCONFIG_CFLAGS) -I../src/gui -Igdchart0.94b -Igdchart0.94b/gd1.3 + LIBS = $(X_LIBS) $(X_CFLAGS) $(GTKLIBS) \ +! $(RUN_LIBS) $(C_R_LIB) gdchart0.94b/gd1.3/libgd.a -lm -L../libnessus -lnessus-client -lssl -lcrypto $(DL_LIB) -lz $(SOCKET_LIB) + + NESSUS_INCLUDE=`sh ./cflags` + CFLAGS+=-Wall +--- 1,9 ---- + include ../nessus.tmpl + + GTKLIBS= $(GTKCONFIG_LIBS) +! INCLUDE = ${include} $(GTKCONFIG_CFLAGS) -I../src/gui + LIBS = $(X_LIBS) $(X_CFLAGS) $(GTKLIBS) \ +! $(RUN_LIBS) $(C_R_LIB) -lgdc -lm -L../libnessus -lnessus-client -lssl -lcrypto $(DL_LIB) -lz $(SOCKET_LIB) + + NESSUS_INCLUDE=`sh ./cflags` + CFLAGS+=-Wall +*************** +*** 58,67 **** + prefs_kb.o \ + listnotebook.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 \ +--- 58,63 ---- Modified: trunk/openvas-client/packaging/debian/rules =================================================================== --- trunk/openvas-client/packaging/debian/rules 2007-12-28 19:58:57 UTC (rev 556) +++ trunk/openvas-client/packaging/debian/rules 2007-12-28 20:11:11 UTC (rev 557) @@ -24,7 +24,7 @@ CFLAGS += -O2 endif -config.status: configure +config.status: patch configure dh_testdir # Add here commands to configure the package. ifneq "$(wildcard /usr/share/misc/config.sub)" "" @@ -38,16 +38,22 @@ build: build-stamp -build-stamp: config.status +build-stamp: config.status dh_testdir # Add here commands to compile the package. $(MAKE) #docbook-to-man debian/openvas-client.sgml > openvas-client.1 - touch $@ +patch: patch-stamp -clean: +patch-stamp: + dpatch apply-all + dpatch cat-all >patch-stamp + +clean: clean-patched unpatch + +clean-patched: dh_testdir dh_testroot rm -f build-stamp @@ -64,6 +70,10 @@ dh_clean +unpatch: + dpatch deapply-all + rm -rf patch-stamp debian/patched + install: build dh_testdir dh_testroot _______________________________________________ Openvas-commits mailing list [email protected] http://lists.wald.intevation.org/mailman/listinfo/openvas-commits
