Updated to rrdtool-1.3.0-1.

 * Updated librrd4.symbols.
 * Removed patches/long-version which is no longer necessary.

diff --git a/debian/changelog b/debian/changelog
index 74655c37f508ef5c7d19688f10be09b1037a4448..6f921f6b891f53c212eb720b9d37cc392cb012f4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,12 @@
-rrdtool (1.3~rc9-1) experimental; urgency=low
+rrdtool (1.3.0-1) experimental; urgency=low
 
-  * New upstream release candidate.
+  * New upstream release.
     - Fixes a buffer overflow in librrd's error handling (Closes: #450578).
+    - Validate RRA row count in rrdcreate.
   * debian/patches:
-    - Updated patches to apply on 1.3rc9.
+    - Updated patches to apply on 1.3.0.
     - "implicit-decl-fix" partly applied upstream
     - "typos" removed, has been applied upstream
-    - Added "long-version" to work around a bug in perl 5.10 (see #482139).
   * debian/control:
     - Replaced librrd2 / librrd2-dev with librrd4 / librrd4-dev.
     - Added "ttf-dejavu | ttf-bitstream-vera" recommendation to librrd4 -

diff --git a/debian/librrd4.symbols b/debian/librrd4.symbols
index a0d3745d7864181ebebd7886b063b0e5496cbe47..a0ef644fbf7f5f8d1b7dfd4cb20260553f33eb24 100644 (file)
--- a/debian/librrd4.symbols
+++ b/debian/librrd4.symbols
@@ -1,80 +1,102 @@
 librrd.so.4 librrd4 #MINVER#
- rrd_clear_error@Base 1.3~rc9
- rrd_create@Base 1.3~rc9
- rrd_create_r@Base 1.3~rc9
- rrd_dump@Base 1.3~rc9
- rrd_dump_r@Base 1.3~rc9
- rrd_fetch@Base 1.3~rc9
- rrd_fetch_r@Base 1.3~rc9
- rrd_first@Base 1.3~rc9
- rrd_first_r@Base 1.3~rc9
- rrd_free_context@Base 1.3~rc9
- rrd_freemem@Base 1.3~rc9
- rrd_get_context@Base 1.3~rc9
- rrd_get_error@Base 1.3~rc9
- rrd_graph@Base 1.3~rc9
- rrd_graph_v@Base 1.3~rc9
- rrd_info@Base 1.3~rc9
- rrd_info_free@Base 1.3~rc9
- rrd_info_print@Base 1.3~rc9
- rrd_info_push@Base 1.3~rc9
- rrd_last@Base 1.3~rc9
- rrd_last_r@Base 1.3~rc9
- rrd_lastupdate@Base 1.3~rc9
- rrd_new_context@Base 1.3~rc9
- rrd_parsetime@Base 1.3~rc9
- rrd_proc_start_end@Base 1.3~rc9
- rrd_resize@Base 1.3~rc9
- rrd_restore@Base 1.3~rc9
- rrd_set_error@Base 1.3~rc9
- rrd_set_to_DINF@Base 1.3~rc9
- rrd_set_to_DNAN@Base 1.3~rc9
- rrd_strerror@Base 1.3~rc9
- rrd_strversion@Base 1.3~rc9
- rrd_test_error@Base 1.3~rc9
- rrd_tune@Base 1.3~rc9
- rrd_update@Base 1.3~rc9
- rrd_update_r@Base 1.3~rc9
- rrd_update_v@Base 1.3~rc9
- rrd_version@Base 1.3~rc9
- rrd_xport@Base 1.3~rc9
+ rrd_clear_error@Base 1.3.0
+ rrd_close@Base 1.3.0
+ rrd_create@Base 1.3.0
+ rrd_create_r@Base 1.3.0
+ rrd_dontneed@Base 1.3.0
+ rrd_dump@Base 1.3.0
+ rrd_dump_r@Base 1.3.0
+ rrd_fetch@Base 1.3.0
+ rrd_fetch_r@Base 1.3.0
+ rrd_first@Base 1.3.0
+ rrd_first_r@Base 1.3.0
+ rrd_flush@Base 1.3.0
+ rrd_free@Base 1.3.0
+ rrd_free_context@Base 1.3.0
+ rrd_freemem@Base 1.3.0
+ rrd_get_context@Base 1.3.0
+ rrd_get_error@Base 1.3.0
+ rrd_graph@Base 1.3.0
+ rrd_graph_v@Base 1.3.0
+ rrd_info@Base 1.3.0
+ rrd_info_free@Base 1.3.0
+ rrd_info_print@Base 1.3.0
+ rrd_info_push@Base 1.3.0
+ rrd_init@Base 1.3.0
+ rrd_last@Base 1.3.0
+ rrd_last_r@Base 1.3.0
+ rrd_lastupdate@Base 1.3.0
+ rrd_lock@Base 1.3.0
+ rrd_new_context@Base 1.3.0
+ rrd_open@Base 1.3.0
+ rrd_parsetime@Base 1.3.0
+ rrd_proc_start_end@Base 1.3.0
+ rrd_read@Base 1.3.0
+ rrd_resize@Base 1.3.0
+ rrd_restore@Base 1.3.0
+ rrd_seek@Base 1.3.0
+ rrd_set_error@Base 1.3.0
+ rrd_set_to_DINF@Base 1.3.0
+ rrd_set_to_DNAN@Base 1.3.0
+ rrd_strerror@Base 1.3.0
+ rrd_strversion@Base 1.3.0
+ rrd_tell@Base 1.3.0
+ rrd_test_error@Base 1.3.0
+ rrd_tune@Base 1.3.0
+ rrd_update@Base 1.3.0
+ rrd_update_r@Base 1.3.0
+ rrd_update_v@Base 1.3.0
+ rrd_version@Base 1.3.0
+ rrd_write@Base 1.3.0
+ rrd_xport@Base 1.3.0
 librrd_th.so.4 librrd4 #MINVER#
- rrd_clear_error@Base 1.3~rc9
- rrd_create@Base 1.3~rc9
- rrd_create_r@Base 1.3~rc9
- rrd_dump@Base 1.3~rc9
- rrd_dump_r@Base 1.3~rc9
- rrd_fetch@Base 1.3~rc9
- rrd_fetch_r@Base 1.3~rc9
- rrd_first@Base 1.3~rc9
- rrd_first_r@Base 1.3~rc9
- rrd_free_context@Base 1.3~rc9
- rrd_freemem@Base 1.3~rc9
- rrd_get_context@Base 1.3~rc9
- rrd_get_error@Base 1.3~rc9
- rrd_graph@Base 1.3~rc9
- rrd_graph_v@Base 1.3~rc9
- rrd_info@Base 1.3~rc9
- rrd_info_free@Base 1.3~rc9
- rrd_info_print@Base 1.3~rc9
- rrd_info_push@Base 1.3~rc9
- rrd_last@Base 1.3~rc9
- rrd_last_r@Base 1.3~rc9
- rrd_lastupdate@Base 1.3~rc9
- rrd_new_context@Base 1.3~rc9
- rrd_parsetime@Base 1.3~rc9
- rrd_proc_start_end@Base 1.3~rc9
- rrd_resize@Base 1.3~rc9
- rrd_restore@Base 1.3~rc9
- rrd_set_error@Base 1.3~rc9
- rrd_set_to_DINF@Base 1.3~rc9
- rrd_set_to_DNAN@Base 1.3~rc9
- rrd_strerror@Base 1.3~rc9
- rrd_strversion@Base 1.3~rc9
- rrd_test_error@Base 1.3~rc9
- rrd_tune@Base 1.3~rc9
- rrd_update@Base 1.3~rc9
- rrd_update_r@Base 1.3~rc9
- rrd_update_v@Base 1.3~rc9
- rrd_version@Base 1.3~rc9
- rrd_xport@Base 1.3~rc9
+ rrd_clear_error@Base 1.3.0
+ rrd_close@Base 1.3.0
+ rrd_create@Base 1.3.0
+ rrd_create_r@Base 1.3.0
+ rrd_dontneed@Base 1.3.0
+ rrd_dump@Base 1.3.0
+ rrd_dump_r@Base 1.3.0
+ rrd_fetch@Base 1.3.0
+ rrd_fetch_r@Base 1.3.0
+ rrd_first@Base 1.3.0
+ rrd_first_r@Base 1.3.0
+ rrd_flush@Base 1.3.0
+ rrd_free@Base 1.3.0
+ rrd_free_context@Base 1.3.0
+ rrd_freemem@Base 1.3.0
+ rrd_get_context@Base 1.3.0
+ rrd_get_error@Base 1.3.0
+ rrd_graph@Base 1.3.0
+ rrd_graph_v@Base 1.3.0
+ rrd_info@Base 1.3.0
+ rrd_info_free@Base 1.3.0
+ rrd_info_print@Base 1.3.0
+ rrd_info_push@Base 1.3.0
+ rrd_init@Base 1.3.0
+ rrd_last@Base 1.3.0
+ rrd_last_r@Base 1.3.0
+ rrd_lastupdate@Base 1.3.0
+ rrd_lock@Base 1.3.0
+ rrd_new_context@Base 1.3.0
+ rrd_open@Base 1.3.0
+ rrd_parsetime@Base 1.3.0
+ rrd_proc_start_end@Base 1.3.0
+ rrd_read@Base 1.3.0
+ rrd_resize@Base 1.3.0
+ rrd_restore@Base 1.3.0
+ rrd_seek@Base 1.3.0
+ rrd_set_error@Base 1.3.0
+ rrd_set_to_DINF@Base 1.3.0
+ rrd_set_to_DNAN@Base 1.3.0
+ rrd_strerror@Base 1.3.0
+ rrd_strversion@Base 1.3.0
+ rrd_tell@Base 1.3.0
+ rrd_test_error@Base 1.3.0
+ rrd_tune@Base 1.3.0
+ rrd_update@Base 1.3.0
+ rrd_update_r@Base 1.3.0
+ rrd_update_v@Base 1.3.0
+ rrd_version@Base 1.3.0
+ rrd_write@Base 1.3.0
+ rrd_xport@Base 1.3.0

diff --git a/debian/patches/long-version b/debian/patches/long-version
deleted file mode 100644 (file)
index 1d74989..0000000
--- a/debian/patches/long-version
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/bindings/perl-piped/RRDp.pm b/bindings/perl-piped/RRDp.pm
-index e37104b..710814d 100644
---- a/bindings/perl-piped/RRDp.pm
-+++ b/bindings/perl-piped/RRDp.pm
-@@ -120,7 +120,7 @@ sub cmd (@);
- sub end ();
- sub read ();
- 
--$VERSION=1.299908060801;
-+$VERSION=1.2999002;
- 
- sub start ($){
-   croak "rrdtool is already running"
-diff --git a/bindings/perl-shared/RRDs.pm b/bindings/perl-shared/RRDs.pm
-index b75c9f0..918c642 100644
---- a/bindings/perl-shared/RRDs.pm
-+++ b/bindings/perl-shared/RRDs.pm
-@@ -7,7 +7,7 @@ use vars qw(@ISA $VERSION);
- 
- require DynaLoader;
- 
--$VERSION=1.299908060801;
-+$VERSION=1.2999002;
- 
- bootstrap RRDs $VERSION;
- 
-diff --git a/configure b/configure
-index acfddca..62e0d89 100755
---- a/configure
-+++ b/configure
-@@ -2088,7 +2088,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- 
- 
--NUMVERS=1.299908060801
-+NUMVERS=1.2999002
- 
- 
- LIBVERS=4:0:0

diff --git a/debian/patches/series b/debian/patches/series
index fdbdf1b354346de10363a53b2774f4a85f49f858..69cecaaf69d7d1e3dd0691a382f19e6017caaff2 100644 (file)
--- 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
-long-version