diff -Nru libcompress-raw-lzma-perl-2.069/Changes libcompress-raw-lzma-perl-2.074/Changes --- libcompress-raw-lzma-perl-2.069/Changes 2015-09-26 18:36:57.000000000 +0000 +++ libcompress-raw-lzma-perl-2.074/Changes 2017-02-19 20:54:45.000000000 +0000 @@ -1,6 +1,27 @@ CHANGES ------- + 2.074 18 Feb 2017 + + * Lzma.xs + Comment out unused variables & remove C++-ism + #120272: [PATCH] Unbreak compilation + + * Make failure when LZMA_VERSION != lzma_version_number more excplicit + + * Added interface to LZMA_VERSION and LZMA_VERSION_STRING + + 2.072 4 Feb 2017 + * Makefile.PL + #120084: Need Fix for Makefile.PL depending on . in @INC + + * #105460: use of Compress::Raw::Lzma::RawDecoder fails with large amount of data + AppendOutput for "encode" methods said default was 1. It is actually. + + 2.070 28 Dec 2016 + + * #119207: Compress-Raw-Lzma-2.069 bug report + 2.069 26 Sep 2015 * No Changes diff -Nru libcompress-raw-lzma-perl-2.069/debian/changelog libcompress-raw-lzma-perl-2.074/debian/changelog --- libcompress-raw-lzma-perl-2.069/debian/changelog 2015-12-17 15:20:43.000000000 +0000 +++ libcompress-raw-lzma-perl-2.074/debian/changelog 2021-05-07 20:11:37.000000000 +0000 @@ -1,8 +1,41 @@ -libcompress-raw-lzma-perl (2.069-1build1) xenial; urgency=medium +libcompress-raw-lzma-perl (2.074-1~16.04.sav0) xenial; urgency=medium - * Rebuild for Perl 5.22.1. + * Backport to Xenial - -- Colin Watson Thu, 17 Dec 2015 15:20:43 +0000 + -- Rob Savoury Fri, 07 May 2021 13:11:37 -0700 + +libcompress-raw-lzma-perl (2.074-1) unstable; urgency=medium + + [ Nick Morrott ] + * Team upload. + + * Import upstream version 2.070 + * debian/copyright: update copyright years + * debian/upstream/metadata: add Bug-* fields + + [ gregor herrmann ] + * Import upstream version 2.074 + * Update years of upstream and packaging copyright. + * Drop no-version-check.patch. + The runtime version check is gone in Lzma.xs. + * Disable version check at buildtime and for autopkgtests. + + -- gregor herrmann Sat, 17 Jun 2017 23:08:06 +0200 + +libcompress-raw-lzma-perl (2.069-2) unstable; urgency=medium + + [ Salvatore Bonaccorso ] + * debian/control: Use HTTPS transport protocol for Vcs-Git URI + + [ gregor herrmann ] + * debian/copyright: change Copyright-Format 1.0 URL to HTTPS. + * Add patch to turn off check for liblzma version at runtime. + (Closes: #839987) + * Update years of packaging copyright. + * Set bindnow linker flag in debian/rules. + * Declare compliance with Debian Policy 3.9.8. + + -- gregor herrmann Sat, 15 Oct 2016 12:00:49 +0200 libcompress-raw-lzma-perl (2.069-1) unstable; urgency=medium diff -Nru libcompress-raw-lzma-perl-2.069/debian/control libcompress-raw-lzma-perl-2.074/debian/control --- libcompress-raw-lzma-perl-2.069/debian/control 2015-10-05 16:04:40.000000000 +0000 +++ libcompress-raw-lzma-perl-2.074/debian/control 2017-06-17 21:08:06.000000000 +0000 @@ -7,9 +7,9 @@ liblzma-dev, libtest-pod-perl, perl -Standards-Version: 3.9.6 +Standards-Version: 3.9.8 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-perl/packages/libcompress-raw-lzma-perl.git -Vcs-Git: git://anonscm.debian.org/pkg-perl/packages/libcompress-raw-lzma-perl.git +Vcs-Git: https://anonscm.debian.org/git/pkg-perl/packages/libcompress-raw-lzma-perl.git Homepage: https://metacpan.org/release/Compress-Raw-Lzma Testsuite: autopkgtest-pkg-perl diff -Nru libcompress-raw-lzma-perl-2.069/debian/copyright libcompress-raw-lzma-perl-2.074/debian/copyright --- libcompress-raw-lzma-perl-2.069/debian/copyright 2015-10-05 16:04:40.000000000 +0000 +++ libcompress-raw-lzma-perl-2.074/debian/copyright 2017-06-17 21:08:06.000000000 +0000 @@ -1,10 +1,10 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Compress-Raw-Lzma Source: https://metacpan.org/release/Compress-Raw-Lzma Upstream-Contact: Paul Marquess Files: * -Copyright: 2005-2015, Paul Marquess +Copyright: 2005-2017, Paul Marquess License: Artistic or GPL-1+ Files: ppport.h @@ -27,7 +27,7 @@ License: Artistic or GPL-1+ Files: debian/* -Copyright: 2013-2015, gregor herrmann +Copyright: 2013-2017, gregor herrmann License: Artistic or GPL-1+ License: Artistic diff -Nru libcompress-raw-lzma-perl-2.069/debian/rules libcompress-raw-lzma-perl-2.074/debian/rules --- libcompress-raw-lzma-perl-2.069/debian/rules 2015-10-05 16:04:40.000000000 +0000 +++ libcompress-raw-lzma-perl-2.074/debian/rules 2017-06-17 21:08:06.000000000 +0000 @@ -1,4 +1,9 @@ #!/usr/bin/make -f +export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow + %: dh $@ + +override_dh_auto_test: + TEST_SKIP_VERSION_CHECK=1 dh_auto_test diff -Nru libcompress-raw-lzma-perl-2.069/debian/tests/pkg-perl/smoke-env libcompress-raw-lzma-perl-2.074/debian/tests/pkg-perl/smoke-env --- libcompress-raw-lzma-perl-2.069/debian/tests/pkg-perl/smoke-env 1970-01-01 00:00:00.000000000 +0000 +++ libcompress-raw-lzma-perl-2.074/debian/tests/pkg-perl/smoke-env 2017-06-17 21:08:06.000000000 +0000 @@ -0,0 +1 @@ +TEST_SKIP_VERSION_CHECK=1 diff -Nru libcompress-raw-lzma-perl-2.069/debian/upstream/metadata libcompress-raw-lzma-perl-2.074/debian/upstream/metadata --- libcompress-raw-lzma-perl-2.069/debian/upstream/metadata 2015-10-05 16:04:40.000000000 +0000 +++ libcompress-raw-lzma-perl-2.074/debian/upstream/metadata 2017-06-17 21:08:06.000000000 +0000 @@ -1,4 +1,6 @@ --- Archive: CPAN +Bug-Database: https://rt.cpan.org/Public/Dist/Display.html?Name=Compress-Raw-Lzma +Bug-Submit: bug-Compress-Raw-Lzma@rt.cpan.org Contact: Paul Marquess Name: Compress-Raw-Lzma diff -Nru libcompress-raw-lzma-perl-2.069/lib/Compress/Raw/Lzma.pm libcompress-raw-lzma-perl-2.074/lib/Compress/Raw/Lzma.pm --- libcompress-raw-lzma-perl-2.069/lib/Compress/Raw/Lzma.pm 2015-09-26 18:34:29.000000000 +0000 +++ libcompress-raw-lzma-perl-2.074/lib/Compress/Raw/Lzma.pm 2017-02-19 20:55:16.000000000 +0000 @@ -9,10 +9,10 @@ use AutoLoader; use Carp ; -# use bytes ; -use vars qw($VERSION $XS_VERSION @ISA @EXPORT $AUTOLOAD); +use bytes ; +our ($VERSION, $XS_VERSION, @ISA, @EXPORT, $AUTOLOAD); -$VERSION = '2.069'; +$VERSION = '2.074'; $XS_VERSION = $VERSION; $VERSION = eval $VERSION; @@ -1030,6 +1030,13 @@ C and C modules, it can be used on its own for simple compression/uncompression tasks. +There are two functions, called C and C, used in all the +compression and uncompression interfaces defined in this module. By default +both of these functions overwrites any data stored in its output buffer +parameter. If you want to compress/uncompress to a single buffer, and have +C and C append to that buffer, enable the C +option when you create the compression/decompression object. + =head1 Compression There are four compression interfaces available in this module. @@ -1091,7 +1098,9 @@ Controls whether the compressed data is appended to the output buffer in the C and C methods. -Defaults to 1. +Defaults to 0. +(Note in versions of this module prior to 2.072 the defaut value was +incorrectly documented as 1). =item B<< BufSize => $number >> @@ -1133,7 +1142,9 @@ Controls whether the compressed data is appended to the output buffer in the C and C methods. -Defaults to 1. +Defaults to 0. +(Note in versions of this module prior to 2.072 the defaut value was +incorrectly documented as 1). =item B<< BufSize => $number >> @@ -1188,7 +1199,9 @@ Controls whether the compressed data is appended to the output buffer in the C and C methods. -Defaults to 1. +Defaults to 0. +(Note in versions of this module prior to 2.072 the defaut value was +incorrectly documented as 1). =item B<< BufSize => $number >> @@ -1235,7 +1248,9 @@ Controls whether the compressed data is appended to the output buffer in the C and C methods. -Defaults to 1. +Defaults to 0. +(Note in versions of this module prior to 2.072 the defaut value was +incorrectly documented as 1). =item B<< BufSize => $number >> @@ -1636,13 +1651,23 @@ =head2 my $version = Compress::Raw::Lzma::lzma_version_number(); -Returns the version of the underlying lzma library. +Returns the version of the underlying lzma library this module is using at +run-time as a number. =head2 my $version = Compress::Raw::Lzma::lzma_version_string(); -Returns the version of the underlying lzma library. +Returns the version of the underlying lzma library this module is using at +run-time as a string. -TODO - more here +=head2 my $version = Compress::Raw::Lzma::LZMA_VERSION(); + +Returns the version of the underlying lzma library this module was using at +compile-time as a number. + +=head2 my $version = Compress::Raw::Lzma::LZMA_VERSION_STRING(); + +Returns the version of the underlying lzma library this module was using at +compile-time as a string. =head1 Constants @@ -1662,7 +1687,7 @@ =head1 AUTHOR -This module was written by Paul Marquess, F. +This module was written by Paul Marquess, C. =head1 MODIFICATION HISTORY @@ -1670,7 +1695,7 @@ =head1 COPYRIGHT AND LICENSE -Copyright (c) 2005-2015 Paul Marquess. All rights reserved. +Copyright (c) 2005-2017 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. diff -Nru libcompress-raw-lzma-perl-2.069/Lzma.xs libcompress-raw-lzma-perl-2.074/Lzma.xs --- libcompress-raw-lzma-perl-2.069/Lzma.xs 2014-02-01 19:05:28.000000000 +0000 +++ libcompress-raw-lzma-perl-2.074/Lzma.xs 2017-02-19 20:19:06.000000000 +0000 @@ -206,7 +206,7 @@ return errstr ; } -#if 1 +#if 0 static void #ifdef CAN_PROTOTYPE DispHex(void * ptr, int length) @@ -556,11 +556,11 @@ uint32_t size; int cur_length = SvCUR(output) ; lzma_ret status = lzma_properties_size(&size, &s->filters[0]); + uint8_t *props ; if (status != LZMA_OK) return status; - uint8_t *props ; Sv_Grow(output, SvLEN(output) + size + 4) ; props = (uint8_t*) SvPVbyte_nolen(output) + cur_length; @@ -589,24 +589,28 @@ INCLUDE: constants.xs BOOT: - int t = trace; t = t; - if (lzma_version_number() != LZMA_VERSION) { - croak("Version Mismatch - Built with version %d, library used is version %d\n", LZMA_VERSION, lzma_version_number()); + PERL_UNUSED_VAR(trace); } - //set_compression_settings(); - //lzma_init(); MODULE = Compress::Raw::Lzma PACKAGE = Compress::Raw::Lzma PREFIX = MY_ +#define MY_LZMA_VERSION() LZMA_VERSION +uint32_t +MY_LZMA_VERSION() + uint32_t lzma_version_number() const char * lzma_version_string() +#define MY_LZMA_VERSION_STRING() LZMA_VERSION_STRING +const char * +MY_LZMA_VERSION_STRING() + #define MY_LZMA_FILTER_LZMA1() LZMA_FILTER_LZMA1 uint64_t MY_LZMA_FILTER_LZMA1() @@ -962,7 +966,7 @@ if (DO_UTF8(output) && !sv_utf8_downgrade(output, 1)) croak("Wide character in " COMPRESS_CLASS "::flush input parameter"); #endif - if(! s->flags & FLAG_APPEND_OUTPUT) { + if((s->flags & FLAG_APPEND_OUTPUT) != FLAG_APPEND_OUTPUT) { SvCUR_set(output, 0); /* sv_setpvn(output, "", 0); */ } diff -Nru libcompress-raw-lzma-perl-2.069/Makefile.PL libcompress-raw-lzma-perl-2.074/Makefile.PL --- libcompress-raw-lzma-perl-2.069/Makefile.PL 2013-05-21 20:42:04.000000000 +0000 +++ libcompress-raw-lzma-perl-2.074/Makefile.PL 2017-02-04 18:26:20.000000000 +0000 @@ -3,6 +3,7 @@ use strict ; require 5.006 ; +use lib '.'; use private::MakeUtil; use ExtUtils::MakeMaker 5.16 ; diff -Nru libcompress-raw-lzma-perl-2.069/MANIFEST libcompress-raw-lzma-perl-2.074/MANIFEST --- libcompress-raw-lzma-perl-2.069/MANIFEST 2015-09-26 18:37:30.000000000 +0000 +++ libcompress-raw-lzma-perl-2.074/MANIFEST 2017-02-19 22:06:42.000000000 +0000 @@ -9,7 +9,7 @@ ppport.h private/MakeUtil.pm README -t/000prereq.t +t/001version.t t/02filters.t t/09limitoutput.t t/01llzma-generic.t diff -Nru libcompress-raw-lzma-perl-2.069/META.json libcompress-raw-lzma-perl-2.074/META.json --- libcompress-raw-lzma-perl-2.069/META.json 2015-09-26 18:37:30.000000000 +0000 +++ libcompress-raw-lzma-perl-2.074/META.json 2017-02-19 22:06:42.000000000 +0000 @@ -4,7 +4,7 @@ "Paul Marquess " ], "dynamic_config" : 1, - "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.112150", + "generated_by" : "ExtUtils::MakeMaker version 7.1001, CPAN::Meta::Converter version 2.150005", "license" : [ "perl_5" ], @@ -24,12 +24,12 @@ "prereqs" : { "build" : { "requires" : { - "ExtUtils::MakeMaker" : 0 + "ExtUtils::MakeMaker" : "0" } }, "configure" : { "requires" : { - "ExtUtils::MakeMaker" : 0 + "ExtUtils::MakeMaker" : "0" } }, "runtime" : { @@ -37,5 +37,6 @@ } }, "release_status" : "stable", - "version" : "2.069" + "version" : "2.074", + "x_serialization_backend" : "JSON::PP version 2.27300" } diff -Nru libcompress-raw-lzma-perl-2.069/META.yml libcompress-raw-lzma-perl-2.074/META.yml --- libcompress-raw-lzma-perl-2.069/META.yml 2015-09-26 18:37:30.000000000 +0000 +++ libcompress-raw-lzma-perl-2.074/META.yml 2017-02-19 22:06:42.000000000 +0000 @@ -3,15 +3,15 @@ author: - 'Paul Marquess ' build_requires: - ExtUtils::MakeMaker: 0 + ExtUtils::MakeMaker: '0' configure_requires: - ExtUtils::MakeMaker: 0 + ExtUtils::MakeMaker: '0' dynamic_config: 1 -generated_by: 'ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.112150' +generated_by: 'ExtUtils::MakeMaker version 7.1001, CPAN::Meta::Converter version 2.150005' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html - version: 1.4 + version: '1.4' name: Compress-Raw-Lzma no_index: directory: @@ -20,4 +20,5 @@ - t - private requires: {} -version: 2.069 +version: '2.074' +x_serialization_backend: 'CPAN::Meta::YAML version 0.018' diff -Nru libcompress-raw-lzma-perl-2.069/README libcompress-raw-lzma-perl-2.074/README --- libcompress-raw-lzma-perl-2.069/README 2015-09-26 18:34:29.000000000 +0000 +++ libcompress-raw-lzma-perl-2.074/README 2017-02-19 20:55:16.000000000 +0000 @@ -1,11 +1,11 @@ Compress-Raw-Lzma - Version 2.069 + Version 2.074 - 26th September 2015 + 19th February 2017 - Copyright (c) 2009-2015 Paul Marquess. All rights reserved. + Copyright (c) 2009-2017 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. @@ -30,7 +30,7 @@ http://tukaani.org/xz/ -Next you must edit the file config.in that conmes with this distribution. +Next you must edit the file config.in that comes with this distribution. If necessary, change the INCLUDE and LIB variable to the directories where liblzma and the lzma include file are installed. @@ -161,7 +161,7 @@ If you haven't installed Compress-Raw-Lzma then search Compress::Raw::Lzma.pm for a line like this: - $VERSION = "2.069" ; + $VERSION = "2.074" ; c. The version of lzma you have used. If you have successfully installed Compress-Raw-Lzma, this one-liner diff -Nru libcompress-raw-lzma-perl-2.069/t/000prereq.t libcompress-raw-lzma-perl-2.074/t/000prereq.t --- libcompress-raw-lzma-perl-2.069/t/000prereq.t 2015-09-26 13:56:45.000000000 +0000 +++ libcompress-raw-lzma-perl-2.074/t/000prereq.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,57 +0,0 @@ -BEGIN { - if ($ENV{PERL_CORE}) { - chdir 't' if -d 't'; - @INC = ("../lib", "lib/compress"); - } -} - -use lib qw(t t/compress); -use strict ; -use warnings ; - -use Test::More ; - -BEGIN -{ - # use Test::NoWarnings, if available - my $extra = 0 ; - $extra = 1 - if eval { require Test::NoWarnings ; import Test::NoWarnings; 1 }; - - - my $VERSION = '2.069'; - my @NAMES = qw( - - ); - - my @OPT = qw( - - ); - - plan tests => 1 + @NAMES + @OPT + $extra ; - - ok 1; - - foreach my $name (@NAMES) - { - use_ok($name, $VERSION); - } - - - foreach my $name (@OPT) - { - eval " require $name " ; - if ($@) - { - ok 1, "$name not available" - } - else - { - my $ver = eval("\$${name}::VERSION"); - is $ver, $VERSION, "$name version should be $VERSION" - or diag "$name version is $ver, need $VERSION" ; - } - } - -} - diff -Nru libcompress-raw-lzma-perl-2.069/t/001version.t libcompress-raw-lzma-perl-2.074/t/001version.t --- libcompress-raw-lzma-perl-2.069/t/001version.t 1970-01-01 00:00:00.000000000 +0000 +++ libcompress-raw-lzma-perl-2.074/t/001version.t 2017-02-19 16:24:50.000000000 +0000 @@ -0,0 +1,48 @@ +BEGIN { + if ($ENV{PERL_CORE}) { + chdir 't' if -d 't'; + @INC = ("../lib", "lib/compress"); + } +} + +use lib qw(t t/compress); +use strict ; +use warnings ; + +use Test::More ; + +BEGIN +{ + # use Test::NoWarnings, if available + my $extra = 0 ; + $extra = 1 + if eval { require Test::NoWarnings ; import Test::NoWarnings; 1 }; + + plan tests => 2 + $extra ; + + use_ok('Compress::Raw::Lzma') ; +} + +# Check lzma_version and LZMA_VERSION are the same. + +SKIP: { + skip "TEST_SKIP_VERSION_CHECK is set", 1 + if $ENV{TEST_SKIP_VERSION_CHECK}; + my $lzma_h = LZMA_VERSION ; + my $liblzma = Compress::Raw::Lzma::lzma_version_number; + my $lzma_h_string = LZMA_VERSION_STRING ; + my $liblzma_string = Compress::Raw::Lzma::lzma_version_string; + + is($lzma_h, $liblzma, "LZMA_VERSION ($lzma_h_string) matches Compress::Raw::Lzma::lzma_version") + or diag <