Update Compress-Raw-Zlib to CPAN version 2.069
authorChris 'BinGOs' Williams <chris@bingosnet.co.uk>
Tue, 6 Oct 2015 12:58:58 +0000 (13:58 +0100)
committerChris 'BinGOs' Williams <chris@bingosnet.co.uk>
Tue, 6 Oct 2015 12:58:58 +0000 (13:58 +0100)
  [DELTA]

  2.069 26 Sept 2015

      * reduce compiler warnings and stderr noise
        [#101341]

      * amigaos4: cpan/Compress-Raw-Zlib: also __amigaos4__
        [#106799]

      * const all global data
        https://github.com/madler/zlib/commit/82e9dc60932bf2ce5422a5e76e66e5a05abd26e3
        [#101298]

      * Coverity finding: Unused value
        https://github.com/madler/zlib/commit/9859a94c1002484ee5f824c05683a5b2484cbf49
        [105414]

      * Coverity findings
        [102399]

      * Coverity finding: Overlapping buffer in memory copy
        [105413]

Porting/Maintainers.pl
cpan/Compress-Raw-Zlib/Zlib.xs
cpan/Compress-Raw-Zlib/lib/Compress/Raw/Zlib.pm
cpan/Compress-Raw-Zlib/zlib-src/deflate.c
cpan/Compress-Raw-Zlib/zlib-src/deflate.h
cpan/Compress-Raw-Zlib/zlib-src/inflate.c
cpan/Compress-Raw-Zlib/zlib-src/trees.c
t/porting/customized.dat

index 46d0a60..5e0cd02 100755 (executable)
@@ -209,7 +209,7 @@ use File::Glob qw(:case);
     },
 
     'Compress::Raw::Zlib' => {
-        'DISTRIBUTION' => 'PMQS/Compress-Raw-Zlib-2.068.tar.gz',
+        'DISTRIBUTION' => 'PMQS/Compress-Raw-Zlib-2.069.tar.gz',
 
         'FILES'    => q[cpan/Compress-Raw-Zlib],
         'EXCLUDED' => [
@@ -219,9 +219,6 @@ use File::Glob qw(:case);
                 t/99pod.t
                 ),
         ],
-
-        # https://rt.cpan.org/Ticket/Display.html?id=106799
-        'CUSTOMIZED'   => [ qw[ Zlib.xs ] ],
     },
 
     'Config::Perl::V' => {
index 0184062..664c26c 100644 (file)
@@ -274,9 +274,10 @@ static const char my_z_errmsg[][32] = {
 # define NO_WRITEABLE_DATA
 #endif
 
+/* Set TRACE_DEFAULT to a non-zero value to enable tracing */
 #define TRACE_DEFAULT 0
 
-#ifdef NO_WRITEABLE_DATA
+#if defined(NO_WRITEABLE_DATA) || TRACE_DEFAULT == 0
 #  define trace TRACE_DEFAULT
 #else
   static int trace = TRACE_DEFAULT ;
@@ -372,7 +373,7 @@ rotate(list, len, rot)
     /* do simple left shift by one */
     if (rot == 1) {
         tmp = *list;
-        memcpy(list, list + 1, len - 1);
+        memmove(list, list + 1, len - 1);
         *last = tmp;
         return;
     }
index 0089b59..59a6100 100644 (file)
@@ -10,7 +10,7 @@ use warnings ;
 use bytes ;
 our ($VERSION, $XS_VERSION, @ISA, @EXPORT, %EXPORT_TAGS, @EXPORT_OK, $AUTOLOAD, %DEFLATE_CONSTANTS, @DEFLATE_CONSTANTS);
 
-$VERSION = '2.068_01'; # patched in perl5.git
+$VERSION = '2.069';
 $XS_VERSION = $VERSION; 
 $VERSION = eval $VERSION;
 
@@ -1590,7 +1590,7 @@ See the Changes file.
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (c) 2005-2014 Paul Marquess. All rights reserved.
+Copyright (c) 2005-2015 Paul Marquess. All rights reserved.
 
 This program is free software; you can redistribute it and/or
 modify it under the same terms as Perl itself.
index e001a05..3a28aa1 100644 (file)
@@ -156,7 +156,7 @@ struct static_tree_desc_s {int dummy;}; /* for buggy compilers */
 #endif
 
 /* rank Z_BLOCK between Z_NO_FLUSH and Z_PARTIAL_FLUSH */
-#define RANK(f) (((f) << 1) - ((f) > 4 ? 9 : 0))
+#define RANK(f) (((f) * 2) - ((f) > 4 ? 9 : 0))
 
 /* ===========================================================================
  * Update a hash value with the given input byte
index ce0299e..0ee924e 100644 (file)
@@ -83,7 +83,7 @@ typedef struct static_tree_desc_s  static_tree_desc;
 typedef struct tree_desc_s {
     ct_data *dyn_tree;           /* the dynamic tree */
     int     max_code;            /* largest code with non zero frequency */
-    static_tree_desc *stat_desc; /* the corresponding static tree */
+    const static_tree_desc *stat_desc; /* the corresponding static tree */
 } FAR tree_desc;
 
 typedef ush Pos;
index c8dca0b..c938f49 100644 (file)
@@ -1490,8 +1490,8 @@ int ZEXPORT inflateUndermine(
 
     if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
     state = (struct inflate_state FAR *)strm->state;
-    state->sane = !subvert;
 #ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
+    state->sane = !subvert;
     return Z_OK;
 #else
     state->sane = 1;
index 9dbd905..622859a 100644 (file)
@@ -122,13 +122,13 @@ struct static_tree_desc_s {
     int     max_length;          /* max bit length for the codes */
 };
 
-local static_tree_desc  static_l_desc =
+local const static_tree_desc  static_l_desc =
 {static_ltree, extra_lbits, LITERALS+1, L_CODES, MAX_BITS};
 
-local static_tree_desc  static_d_desc =
+local const static_tree_desc  static_d_desc =
 {static_dtree, extra_dbits, 0,          D_CODES, MAX_BITS};
 
-local static_tree_desc  static_bl_desc =
+local const static_tree_desc  static_bl_desc =
 {(const ct_data *)0, extra_blbits, 0,   BL_CODES, MAX_BL_BITS};
 
 /* ===========================================================================
index 190161c..d7bd22c 100644 (file)
@@ -1,5 +1,4 @@
 CPAN cpan/CPAN/lib/CPAN.pm ce62c43d72f101c011184dbbc59e21c2790826f0
-Compress::Raw::Zlib cpan/Compress-Raw-Zlib/Zlib.xs 50a0176905a1702caef88abf268e0b60ae1f7382
 ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm fd048a43fc1a53acbe133bd96ddbf1421cfb28cf
 ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm 0c78ba02d6249dfcca12ac9886a7c7cfb60e77fe
 ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/t/prereq.t 53bda2c549fd13a6b6c13a070ca6bc79883081c0