From 2480c8239d3a2599da4f811361b2c4d6c662b888 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Sun, 18 May 2008 22:37:35 +0200 Subject: [PATCH] Updated to rrdtool-1.3~rc4-1. * debian/patches: - Updated patches to apply on 1.3rc4. - "implicit-decl-fix" partly applied upstream - "typos" removed, has been applied upstream * debian/control: - Added "ttf-dejavu | ttf-bitstream-vera" recommendation to librrd2 - upstream no longer ships DejaVuSansMono-Roman.ttf. * debian/librrd2.symbols: - Updated to the symbols provided by 1.3rc4 - none of the removed symbols is supposed to be used outside of rrdtool. --- debian/changelog | 16 ++ debian/control | 1 + debian/librrd2.install | 1 - debian/librrd2.symbols | 188 ++++++++++++------ .../bts428778-floating-point-exception | 39 ++-- debian/patches/implicit-decl-fix | 33 +-- debian/patches/series | 1 - debian/patches/typos | 22 -- debian/rrdtool.install | 1 - debian/rules | 4 +- 10 files changed, 168 insertions(+), 138 deletions(-) delete mode 100644 debian/patches/typos diff --git a/debian/changelog b/debian/changelog index 01193cc..02f9d69 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,19 @@ +rrdtool (1.3~rc4-1) experimental; urgency=low + + * New upstream release candidate. + * debian/patches: + - Updated patches to apply on 1.3rc4. + - "implicit-decl-fix" partly applied upstream + - "typos" removed, has been applied upstream + * debian/control: + - Added "ttf-dejavu | ttf-bitstream-vera" recommendation to librrd2 - + upstream no longer ships DejaVuSansMono-Roman.ttf. + * debian/librrd2.symbols: + - Updated to the symbols provided by 1.3rc4 - none of the removed symbols + is supposed to be used outside of rrdtool. + + -- Sebastian Harl Sun, 18 May 2008 22:07:23 +0200 + rrdtool (1.2.27-2) unstable; urgency=low * Renamed global definition of LDFLAGS to LINKER_FLAGS in debian/rules to diff --git a/debian/control b/debian/control index bf9b6e7..3330b45 100644 --- a/debian/control +++ b/debian/control @@ -37,6 +37,7 @@ Package: librrd2 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} +Recommends: ttf-dejavu | ttf-bitstream-vera Conflicts: rrdtool (<< 1.0.42-1), librrds-perl (<< 1.0.42-1) Description: Time-series data storage and display system (runtime library) The Round Robin Database Tool (RRDtool) is a system to store and display diff --git a/debian/librrd2.install b/debian/librrd2.install index e24cfc5..de5d277 100644 --- a/debian/librrd2.install +++ b/debian/librrd2.install @@ -1,3 +1,2 @@ usr/lib/librrd.so.* usr/lib/librrd_th.so.* -../../src/DejaVuSansMono-Roman.ttf usr/share/rrdtool/librrd2 diff --git a/debian/librrd2.symbols b/debian/librrd2.symbols index 5340b52..e7f4b86 100644 --- a/debian/librrd2.symbols +++ b/debian/librrd2.symbols @@ -5,20 +5,20 @@ librrd.so.2 librrd2 #MINVER# FnvHash@Base 1.2.15 HandleInputLine@Base 1.2.15 LockRRD@Base 1.2.15 - MyMod@Base 1.2.15 +#MISSING: 1.3~rc4# MyMod@Base 1.2.15 PngSize@Base 1.2.15 PrintUsage@Base 1.2.15 RemoteMode@Base 1.2.15 _rrd_update@Base 1.2.15 addop2str@Base 1.2.15 - afm_fontinfo_count@Base 1.2.15 - afm_fontinfolist@Base 1.2.15 - afm_get_ascender@Base 1.2.15 - afm_get_descender@Base 1.2.15 - afm_get_font_name@Base 1.2.15 - afm_get_font_postscript_name@Base 1.2.15 - afm_get_text_width@Base 1.2.15 - afm_get_text_width_wide@Base 1.2.15 +#MISSING: 1.3~rc4# afm_fontinfo_count@Base 1.2.15 +#MISSING: 1.3~rc4# afm_fontinfolist@Base 1.2.15 +#MISSING: 1.3~rc4# afm_get_ascender@Base 1.2.15 +#MISSING: 1.3~rc4# afm_get_descender@Base 1.2.15 +#MISSING: 1.3~rc4# afm_get_font_name@Base 1.2.15 +#MISSING: 1.3~rc4# afm_get_font_postscript_name@Base 1.2.15 +#MISSING: 1.3~rc4# afm_get_text_width@Base 1.2.15 +#MISSING: 1.3~rc4# afm_get_text_width_wide@Base 1.2.15 apply_gridfit@Base 1.2.15 apply_smoother@Base 1.2.15 auto_scale@Base 1.2.15 @@ -37,7 +37,7 @@ librrd.so.2 librrd2 #MINVER# draw_horizontal_grid@Base 1.2.15 ds_match@Base 1.2.15 dst_conv@Base 1.2.15 - eat_tag@Base 1.2.15 +#MISSING: 1.3~rc4# eat_tag@Base 1.2.15 erase_violations@Base 1.2.15 expand_range@Base 1.2.15 find_first_time@Base 1.2.15 @@ -50,30 +50,50 @@ librrd.so.2 librrd2 #MINVER# gdes_alloc@Base 1.2.15 gf_conv@Base 1.2.15 gfx_add_point@Base 1.2.15 + gfx_area_fit@Base 1.3~rc4 gfx_close_path@Base 1.2.15 - gfx_destroy@Base 1.2.15 + gfx_dashed_line@Base 1.3~rc4 +#MISSING: 1.3~rc4# gfx_destroy@Base 1.2.15 gfx_get_text_width@Base 1.2.15 - gfx_get_text_width_libart@Base 1.2.15 +#MISSING: 1.3~rc4# gfx_get_text_width_libart@Base 1.2.15 + gfx_hex_to_col@Base 1.3~rc4 + gfx_line@Base 1.3~rc4 + gfx_line_fit@Base 1.3~rc4 gfx_new_area@Base 1.2.15 - gfx_new_canvas@Base 1.2.15 - gfx_new_dashed_line@Base 1.2.15 - gfx_new_line@Base 1.2.15 - gfx_new_text@Base 1.2.15 - gfx_render@Base 1.2.15 - gfx_render_eps@Base 1.2.15 - gfx_render_pdf@Base 1.2.15 - gfx_render_png@Base 1.2.15 - gfx_render_svg@Base 1.2.15 - gfx_string_create@Base 1.2.15 - gnome_print_art_rgba_svp_alpha@Base 1.2.15 +#MISSING: 1.3~rc4# gfx_new_canvas@Base 1.2.15 +#MISSING: 1.3~rc4# gfx_new_dashed_line@Base 1.2.15 +#MISSING: 1.3~rc4# gfx_new_line@Base 1.2.15 +#MISSING: 1.3~rc4# gfx_new_text@Base 1.2.15 +#MISSING: 1.3~rc4# gfx_render@Base 1.2.15 +#MISSING: 1.3~rc4# gfx_render_eps@Base 1.2.15 +#MISSING: 1.3~rc4# gfx_render_pdf@Base 1.2.15 +#MISSING: 1.3~rc4# gfx_render_png@Base 1.2.15 +#MISSING: 1.3~rc4# gfx_render_svg@Base 1.2.15 +#MISSING: 1.3~rc4# gfx_string_create@Base 1.2.15 + gfx_text@Base 1.3~rc4 +#MISSING: 1.3~rc4# gnome_print_art_rgba_svp_alpha@Base 1.2.15 graph_col@Base 1.2.15 graph_paint@Base 1.2.15 graph_size_location@Base 1.2.15 grc_conv@Base 1.2.15 grid_paint@Base 1.2.15 + grinfo_push@Base 1.3~rc4 horizontal_log_grid@Base 1.2.15 + hw_additive_calculate_intercept@Base 1.3~rc4 + hw_additive_calculate_prediction@Base 1.3~rc4 + hw_additive_calculate_seasonality@Base 1.3~rc4 + hw_additive_init_seasonality@Base 1.3~rc4 + hw_calculate_seasonal_deviation@Base 1.3~rc4 + hw_calculate_slope@Base 1.3~rc4 + hw_init_seasonal_deviation@Base 1.3~rc4 + hw_multiplicative_calculate_intercept@Base 1.3~rc4 + hw_multiplicative_calculate_prediction@Base 1.3~rc4 + hw_multiplicative_calculate_seasonality@Base 1.3~rc4 + hw_multiplicative_init_seasonality@Base 1.3~rc4 if_conv@Base 1.2.15 im_free@Base 1.2.15 + info_free@Base 1.3~rc4 + info_print@Base 1.3~rc4 info_push@Base 1.2.15 init_hwpredict_cdp@Base 1.2.15 init_seasonal_cdp@Base 1.2.15 @@ -85,9 +105,9 @@ librrd.so.2 librrd2 #MINVER# main@Base 1.2.15 parseCDEF_DS@Base 1.2.15 parseGENERIC_DS@Base 1.2.15 - parse_FAILURES_history@Base 1.2.15 - parse_patch1028_CDP_params@Base 1.2.15 - parse_patch1028_RRA_params@Base 1.2.15 +#MISSING: 1.3~rc4# parse_FAILURES_history@Base 1.2.15 +#MISSING: 1.3~rc4# parse_patch1028_CDP_params@Base 1.2.15 +#MISSING: 1.3~rc4# parse_patch1028_RRA_params@Base 1.2.15 parsetime@Base 1.2.15 print_calc@Base 1.2.15 proc_start_end@Base 1.2.15 @@ -96,7 +116,7 @@ librrd.so.2 librrd2 #MINVER# queue_isempty@Base 1.2.15 queue_pop@Base 1.2.15 queue_push@Base 1.2.15 - read_tag@Base 1.2.15 +#MISSING: 1.3~rc4# read_tag@Base 1.2.15 readfile@Base 1.2.15 reduce_data@Base 1.2.15 reset_aberrant_coefficients@Base 1.2.15 @@ -107,18 +127,23 @@ librrd.so.2 librrd2 #MINVER# rpn_parse@Base 1.2.15 rpnstack_free@Base 1.2.15 rpnstack_init@Base 1.2.15 + rra_random_row@Base 1.3~rc4 rrd_clear_error@Base 1.2.15 + rrd_close@Base 1.3~rc4 rrd_create@Base 1.2.15 rrd_create_fn@Base 1.2.15 rrd_create_r@Base 1.2.15 rrd_diff@Base 1.2.15 + rrd_dontneed@Base 1.3~rc4 rrd_dump@Base 1.2.15 + rrd_dump_opt_r@Base 1.3~rc4 rrd_dump_r@Base 1.2.15 rrd_fetch@Base 1.2.15 rrd_fetch_fn@Base 1.2.15 rrd_fetch_r@Base 1.2.26 rrd_first@Base 1.2.15 rrd_first_r@Base 1.2.15 + rrd_flush@Base 1.3~rc4 rrd_free@Base 1.2.15 rrd_free_context@Base 1.2.15 rrd_freemem@Base 1.2.15 @@ -130,6 +155,7 @@ librrd.so.2 librrd2 #MINVER# rrd_graph_init@Base 1.2.15 rrd_graph_options@Base 1.2.15 rrd_graph_script@Base 1.2.15 + rrd_graph_v@Base 1.3~rc4 rrd_info@Base 1.2.15 rrd_info_r@Base 1.2.15 rrd_init@Base 1.2.15 @@ -149,13 +175,17 @@ librrd.so.2 librrd2 #MINVER# rrd_parse_make_vname@Base 1.2.15 rrd_parse_print@Base 1.2.15 rrd_parse_shift@Base 1.2.15 + rrd_parse_textalign@Base 1.3~rc4 rrd_parse_vdef@Base 1.2.15 rrd_parse_xport@Base 1.2.15 + rrd_read@Base 1.3~rc4 rrd_resize@Base 1.2.15 rrd_restore@Base 1.2.15 + rrd_seek@Base 1.3~rc4 rrd_set_error@Base 1.2.15 rrd_strerror@Base 1.2.15 rrd_strversion@Base 1.2.19 + rrd_tell@Base 1.3~rc4 rrd_test_error@Base 1.2.15 rrd_tune@Base 1.2.15 rrd_update@Base 1.2.15 @@ -172,8 +202,8 @@ librrd.so.2 librrd2 #MINVER# set_to_DNAN@Base 1.2.15 set_windowarg@Base 1.2.15 si_unit@Base 1.2.15 - skip@Base 1.2.15 - skipxml@Base 1.2.15 +#MISSING: 1.3~rc4# skip@Base 1.2.15 +#MISSING: 1.3~rc4# skipxml@Base 1.2.15 sprintf_alloc@Base 1.2.15 text_prop@Base 1.2.15 text_prop_conv@Base 1.2.15 @@ -189,10 +219,10 @@ librrd.so.2 librrd2 #MINVER# vdef_parse@Base 1.2.15 vdef_percent_compar@Base 1.2.15 vertical_grid@Base 1.2.15 - write_RRA_row@Base 1.2.15 +#MISSING: 1.3~rc4# write_RRA_row@Base 1.2.15 xlab@Base 1.2.15 - xml2rrd@Base 1.2.15 - xml_lc@Base 1.2.15 +#MISSING: 1.3~rc4# xml2rrd@Base 1.2.15 +#MISSING: 1.3~rc4# xml_lc@Base 1.2.15 xtr@Base 1.2.15 ylab@Base 1.2.15 ytr@Base 1.2.15 @@ -203,20 +233,20 @@ librrd_th.so.2 librrd2 #MINVER# FnvHash@Base 1.2.15 HandleInputLine@Base 1.2.15 LockRRD@Base 1.2.15 - MyMod@Base 1.2.15 +#MISSING: 1.3~rc4# MyMod@Base 1.2.15 PngSize@Base 1.2.15 PrintUsage@Base 1.2.15 RemoteMode@Base 1.2.15 _rrd_update@Base 1.2.15 addop2str@Base 1.2.15 - afm_fontinfo_count@Base 1.2.15 - afm_fontinfolist@Base 1.2.15 - afm_get_ascender@Base 1.2.15 - afm_get_descender@Base 1.2.15 - afm_get_font_name@Base 1.2.15 - afm_get_font_postscript_name@Base 1.2.15 - afm_get_text_width@Base 1.2.15 - afm_get_text_width_wide@Base 1.2.15 +#MISSING: 1.3~rc4# afm_fontinfo_count@Base 1.2.15 +#MISSING: 1.3~rc4# afm_fontinfolist@Base 1.2.15 +#MISSING: 1.3~rc4# afm_get_ascender@Base 1.2.15 +#MISSING: 1.3~rc4# afm_get_descender@Base 1.2.15 +#MISSING: 1.3~rc4# afm_get_font_name@Base 1.2.15 +#MISSING: 1.3~rc4# afm_get_font_postscript_name@Base 1.2.15 +#MISSING: 1.3~rc4# afm_get_text_width@Base 1.2.15 +#MISSING: 1.3~rc4# afm_get_text_width_wide@Base 1.2.15 apply_gridfit@Base 1.2.15 apply_smoother@Base 1.2.15 auto_scale@Base 1.2.15 @@ -235,7 +265,7 @@ librrd_th.so.2 librrd2 #MINVER# draw_horizontal_grid@Base 1.2.15 ds_match@Base 1.2.15 dst_conv@Base 1.2.15 - eat_tag@Base 1.2.15 +#MISSING: 1.3~rc4# eat_tag@Base 1.2.15 erase_violations@Base 1.2.15 expand_range@Base 1.2.15 find_first_time@Base 1.2.15 @@ -248,30 +278,50 @@ librrd_th.so.2 librrd2 #MINVER# gdes_alloc@Base 1.2.15 gf_conv@Base 1.2.15 gfx_add_point@Base 1.2.15 + gfx_area_fit@Base 1.3~rc4 gfx_close_path@Base 1.2.15 - gfx_destroy@Base 1.2.15 + gfx_dashed_line@Base 1.3~rc4 +#MISSING: 1.3~rc4# gfx_destroy@Base 1.2.15 gfx_get_text_width@Base 1.2.15 - gfx_get_text_width_libart@Base 1.2.15 +#MISSING: 1.3~rc4# gfx_get_text_width_libart@Base 1.2.15 + gfx_hex_to_col@Base 1.3~rc4 + gfx_line@Base 1.3~rc4 + gfx_line_fit@Base 1.3~rc4 gfx_new_area@Base 1.2.15 - gfx_new_canvas@Base 1.2.15 - gfx_new_dashed_line@Base 1.2.15 - gfx_new_line@Base 1.2.15 - gfx_new_text@Base 1.2.15 - gfx_render@Base 1.2.15 - gfx_render_eps@Base 1.2.15 - gfx_render_pdf@Base 1.2.15 - gfx_render_png@Base 1.2.15 - gfx_render_svg@Base 1.2.15 - gfx_string_create@Base 1.2.15 - gnome_print_art_rgba_svp_alpha@Base 1.2.15 +#MISSING: 1.3~rc4# gfx_new_canvas@Base 1.2.15 +#MISSING: 1.3~rc4# gfx_new_dashed_line@Base 1.2.15 +#MISSING: 1.3~rc4# gfx_new_line@Base 1.2.15 +#MISSING: 1.3~rc4# gfx_new_text@Base 1.2.15 +#MISSING: 1.3~rc4# gfx_render@Base 1.2.15 +#MISSING: 1.3~rc4# gfx_render_eps@Base 1.2.15 +#MISSING: 1.3~rc4# gfx_render_pdf@Base 1.2.15 +#MISSING: 1.3~rc4# gfx_render_png@Base 1.2.15 +#MISSING: 1.3~rc4# gfx_render_svg@Base 1.2.15 +#MISSING: 1.3~rc4# gfx_string_create@Base 1.2.15 + gfx_text@Base 1.3~rc4 +#MISSING: 1.3~rc4# gnome_print_art_rgba_svp_alpha@Base 1.2.15 graph_col@Base 1.2.15 graph_paint@Base 1.2.15 graph_size_location@Base 1.2.15 grc_conv@Base 1.2.15 grid_paint@Base 1.2.15 + grinfo_push@Base 1.3~rc4 horizontal_log_grid@Base 1.2.15 + hw_additive_calculate_intercept@Base 1.3~rc4 + hw_additive_calculate_prediction@Base 1.3~rc4 + hw_additive_calculate_seasonality@Base 1.3~rc4 + hw_additive_init_seasonality@Base 1.3~rc4 + hw_calculate_seasonal_deviation@Base 1.3~rc4 + hw_calculate_slope@Base 1.3~rc4 + hw_init_seasonal_deviation@Base 1.3~rc4 + hw_multiplicative_calculate_intercept@Base 1.3~rc4 + hw_multiplicative_calculate_prediction@Base 1.3~rc4 + hw_multiplicative_calculate_seasonality@Base 1.3~rc4 + hw_multiplicative_init_seasonality@Base 1.3~rc4 if_conv@Base 1.2.15 im_free@Base 1.2.15 + info_free@Base 1.3~rc4 + info_print@Base 1.3~rc4 info_push@Base 1.2.15 init_hwpredict_cdp@Base 1.2.15 init_seasonal_cdp@Base 1.2.15 @@ -283,9 +333,9 @@ librrd_th.so.2 librrd2 #MINVER# main@Base 1.2.15 parseCDEF_DS@Base 1.2.15 parseGENERIC_DS@Base 1.2.15 - parse_FAILURES_history@Base 1.2.15 - parse_patch1028_CDP_params@Base 1.2.15 - parse_patch1028_RRA_params@Base 1.2.15 +#MISSING: 1.3~rc4# parse_FAILURES_history@Base 1.2.15 +#MISSING: 1.3~rc4# parse_patch1028_CDP_params@Base 1.2.15 +#MISSING: 1.3~rc4# parse_patch1028_RRA_params@Base 1.2.15 parsetime@Base 1.2.15 print_calc@Base 1.2.15 proc_start_end@Base 1.2.15 @@ -294,7 +344,7 @@ librrd_th.so.2 librrd2 #MINVER# queue_isempty@Base 1.2.15 queue_pop@Base 1.2.15 queue_push@Base 1.2.15 - read_tag@Base 1.2.15 +#MISSING: 1.3~rc4# read_tag@Base 1.2.15 readfile@Base 1.2.15 reduce_data@Base 1.2.15 reset_aberrant_coefficients@Base 1.2.15 @@ -305,18 +355,23 @@ librrd_th.so.2 librrd2 #MINVER# rpn_parse@Base 1.2.15 rpnstack_free@Base 1.2.15 rpnstack_init@Base 1.2.15 + rra_random_row@Base 1.3~rc4 rrd_clear_error@Base 1.2.15 + rrd_close@Base 1.3~rc4 rrd_create@Base 1.2.15 rrd_create_fn@Base 1.2.15 rrd_create_r@Base 1.2.15 rrd_diff@Base 1.2.15 + rrd_dontneed@Base 1.3~rc4 rrd_dump@Base 1.2.15 + rrd_dump_opt_r@Base 1.3~rc4 rrd_dump_r@Base 1.2.15 rrd_fetch@Base 1.2.15 rrd_fetch_fn@Base 1.2.15 rrd_fetch_r@Base 1.2.26 rrd_first@Base 1.2.15 rrd_first_r@Base 1.2.15 + rrd_flush@Base 1.3~rc4 rrd_free@Base 1.2.15 rrd_free_context@Base 1.2.15 rrd_freemem@Base 1.2.15 @@ -328,6 +383,7 @@ librrd_th.so.2 librrd2 #MINVER# rrd_graph_init@Base 1.2.15 rrd_graph_options@Base 1.2.15 rrd_graph_script@Base 1.2.15 + rrd_graph_v@Base 1.3~rc4 rrd_info@Base 1.2.15 rrd_info_r@Base 1.2.15 rrd_init@Base 1.2.15 @@ -347,13 +403,17 @@ librrd_th.so.2 librrd2 #MINVER# rrd_parse_make_vname@Base 1.2.15 rrd_parse_print@Base 1.2.15 rrd_parse_shift@Base 1.2.15 + rrd_parse_textalign@Base 1.3~rc4 rrd_parse_vdef@Base 1.2.15 rrd_parse_xport@Base 1.2.15 + rrd_read@Base 1.3~rc4 rrd_resize@Base 1.2.15 rrd_restore@Base 1.2.15 + rrd_seek@Base 1.3~rc4 rrd_set_error@Base 1.2.15 rrd_strerror@Base 1.2.15 rrd_strversion@Base 1.2.19 + rrd_tell@Base 1.3~rc4 rrd_test_error@Base 1.2.15 rrd_tune@Base 1.2.15 rrd_update@Base 1.2.15 @@ -370,8 +430,8 @@ librrd_th.so.2 librrd2 #MINVER# set_to_DNAN@Base 1.2.15 set_windowarg@Base 1.2.15 si_unit@Base 1.2.15 - skip@Base 1.2.15 - skipxml@Base 1.2.15 +#MISSING: 1.3~rc4# skip@Base 1.2.15 +#MISSING: 1.3~rc4# skipxml@Base 1.2.15 sprintf_alloc@Base 1.2.15 text_prop@Base 1.2.15 text_prop_conv@Base 1.2.15 @@ -387,10 +447,10 @@ librrd_th.so.2 librrd2 #MINVER# vdef_parse@Base 1.2.15 vdef_percent_compar@Base 1.2.15 vertical_grid@Base 1.2.15 - write_RRA_row@Base 1.2.15 +#MISSING: 1.3~rc4# write_RRA_row@Base 1.2.15 xlab@Base 1.2.15 - xml2rrd@Base 1.2.15 - xml_lc@Base 1.2.15 +#MISSING: 1.3~rc4# xml2rrd@Base 1.2.15 +#MISSING: 1.3~rc4# xml_lc@Base 1.2.15 xtr@Base 1.2.15 ylab@Base 1.2.15 ytr@Base 1.2.15 diff --git a/debian/patches/bts428778-floating-point-exception b/debian/patches/bts428778-floating-point-exception index 41d3756..e03890b 100644 --- a/debian/patches/bts428778-floating-point-exception +++ b/debian/patches/bts428778-floating-point-exception @@ -1,20 +1,19 @@ -Index: rrdtool/src/rrd_create.c -=================================================================== ---- rrdtool.orig/src/rrd_create.c 2008-02-24 16:12:49.000000000 +0100 -+++ rrdtool/src/rrd_create.c 2008-02-24 16:13:34.000000000 +0100 -@@ -619,6 +619,15 @@ - default: - /* can not be zero because we don't know anything ... */ - rrd->cdp_prep->scratch[CDP_val].u_val = DNAN; -+ /* If the step is 0, we're going to have a BIG Floating Point Exception (i.e. SIGFPE). */ -+ /* Example: (( 1202705167 - 67 ) % ( 300 * 0 )) / 300 */ -+ if (rrd->rra_def[i].pdp_cnt == 0) -+ { -+ rrd_set_error("Invalid step: must be greater than 0."); -+ rrd_free(rrd); -+ fclose(rrd_file); -+ return(-1); -+ } - /* startup missing pdp count */ - rrd->cdp_prep->scratch[CDP_unkn_pdp_cnt].u_cnt = - ((rrd->live_head->last_up - +diff a/src/rrd_create.c b/src/rrd_create.c +--- a/src/rrd_create.c ++++ b/src/rrd_create.c +@@ -740,6 +740,15 @@ int rrd_create_fn( + default: + /* can not be zero because we don't know anything ... */ + rrd->cdp_prep->scratch[CDP_val].u_val = DNAN; ++ /* If the step is 0, we're going to have a BIG Floating Point Exception (i.e. SIGFPE). */ ++ /* Example: (( 1202705167 - 67 ) % ( 300 * 0 )) / 300 */ ++ if (rrd->rra_def[i].pdp_cnt == 0) ++ { ++ rrd_set_error("Invalid step: must be greater than 0."); ++ rrd_free(rrd); ++ fclose(rrd_file); ++ return(-1); ++ } + /* startup missing pdp count */ + rrd->cdp_prep->scratch[CDP_unkn_pdp_cnt].u_cnt = + ((rrd->live_head->last_up - diff --git a/debian/patches/implicit-decl-fix b/debian/patches/implicit-decl-fix index 4640a1b..fc3d53b 100644 --- a/debian/patches/implicit-decl-fix +++ b/debian/patches/implicit-decl-fix @@ -1,31 +1,12 @@ -Index: rrdtool/src/rrd_tool.c -=================================================================== ---- rrdtool.orig/src/rrd_tool.c 2008-02-24 14:05:10.000000000 +0100 -+++ rrdtool/src/rrd_tool.c 2008-02-24 14:24:37.000000000 +0100 -@@ -4,6 +4,8 @@ - * rrd_tool.c Startup wrapper - *****************************************************************************/ +diff a/src/rrd_tool.c b/src/rrd_tool.c +--- a/src/rrd_tool.c ++++ b/src/rrd_tool.c +@@ -12,6 +12,8 @@ + #endif + #endif +#include + #include "rrd_tool.h" #include "rrd_xport.h" - -Index: rrdtool/src/rrd_update.c -=================================================================== ---- rrdtool.orig/src/rrd_update.c 2008-02-24 14:05:10.000000000 +0100 -+++ rrdtool/src/rrd_update.c 2008-02-24 14:28:33.000000000 +0100 -@@ -432,7 +432,12 @@ - #ifdef USE_MADVISE - /* when we use mmaping we tell the kernel the mmap equivalent - of POSIX_FADV_RANDOM */ -- madvise(rrd_mmaped_file,rrd_filesize,MADV_RANDOM); -+#ifdef __USE_BSD -+ madvise(rrd_mmaped_file,rrd_filesize,MADV_RANDOM); -+#endif -+#ifdef __USE_XOPEN2K -+ posix_madvise(rrd_mmaped_file,rrd_filesize,MADV_RANDOM); -+#endif - #endif - #endif - /* loop through the arguments. */ + #include "rrd_i18n.h" diff --git a/debian/patches/series b/debian/patches/series index 2591de2..69cecaa 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,4 +3,3 @@ setup.py-module-name no-rpath-for-ruby no-rpath-for-perl implicit-decl-fix -typos diff --git a/debian/patches/typos b/debian/patches/typos deleted file mode 100644 index 26749d7..0000000 --- a/debian/patches/typos +++ /dev/null @@ -1,22 +0,0 @@ ---- a/src/rrd_open.c -+++ b/src/rrd_open.c -@@ -125,7 +125,7 @@ - MYFREAD(rrd->stat_head, stat_head_t, 1) - /* lets see if the first read worked */ - if (ferror( *in_file ) || feof(*in_file)) { -- rrd_set_error("reading the cookie off %s faild",file_name); -+ rrd_set_error("reading the cookie off %s failed",file_name); - fclose(*in_file); - return(-1); - } ---- a/src/rrd_thread_safe.c -+++ b/src/rrd_thread_safe.c -@@ -52,7 +52,7 @@ - const char *rrd_strerror(int err) { - struct rrd_context *ctx = rrd_get_context(); - if (strerror_r(err, ctx->lib_errstr, ctx->errlen)) -- return "strerror_r faild. sorry!"; -+ return "strerror_r failed. Sorry!"; - else - return ctx->lib_errstr; - } diff --git a/debian/rrdtool.install b/debian/rrdtool.install index 8b5f8ea..3af7d1e 100644 --- a/debian/rrdtool.install +++ b/debian/rrdtool.install @@ -1,4 +1,3 @@ usr/share/doc/rrdtool usr/bin usr/share/man/man1 -usr/share/rrdtool/fonts diff --git a/debian/rules b/debian/rules index 2722086..ca8115c 100755 --- a/debian/rules +++ b/debian/rules @@ -47,9 +47,6 @@ CONFFLAGS += --prefix=/usr --docdir=/usr/share/doc/rrdtool #install perl libs in vendor mode CONFFLAGS += --with-perl-options=INSTALLDIRS=vendor -#path to our ttf font -CONFFLAGS += --with-rrd-default-font=/usr/share/rrdtool/librrd$(LIB_major)/DejaVuSansMono-Roman.ttf - #path to tcl CONFFLAGS += --with-tcllib=/usr/lib/tcl$(TCL_VERS) @@ -127,6 +124,7 @@ endif rm -f bindings/tcl/pkgIndex.tcl bindings/tcl/tclrrd*.so rm -f examples/cgi-demo.cgi rm -rf src/.libs src/.deps doc/*.html doc/*.1 doc/*.txt + rm -f intltool-extract intltool-merge intltool-update dh_clean -- 2.30.2