diff -Nru libsocket-perl-2.029/Changes libsocket-perl-2.030/Changes --- libsocket-perl-2.029/Changes 2019-02-20 19:19:30.000000000 +0000 +++ libsocket-perl-2.030/Changes 2020-07-06 13:52:24.000000000 +0000 @@ -1,5 +1,11 @@ Revision history for Socket +2.030 2020-06-07 + [CHANGES] + * Prepare for a stricter perl: + + use strict; use warnings in all unit tests (RT132846) + + declare use v5.6.1 in all perl files + 2.029 2019-02-20 19:19:12 [BUGFIXES] * Old MinGW lacks ADDRESS_FAMILY; use USHORT instead (RT128550) diff -Nru libsocket-perl-2.029/debian/changelog libsocket-perl-2.030/debian/changelog --- libsocket-perl-2.029/debian/changelog 2019-10-18 19:34:59.000000000 +0000 +++ libsocket-perl-2.030/debian/changelog 2020-07-10 18:13:38.000000000 +0000 @@ -1,8 +1,26 @@ -libsocket-perl (2.029-1build1) focal; urgency=medium +libsocket-perl (2.030-1) unstable; urgency=medium - * No-change rebuild for the perl update. + * Team upload. - -- Matthias Klose Fri, 18 Oct 2019 19:34:59 +0000 + [ Debian Janitor ] + * Bump debhelper from old 11 to 12. + * Set debhelper-compat version in Build-Depends. + * Remove obsolete fields Contact, Name from debian/upstream/metadata + (already present in machine-readable debian/copyright). + * Update standards version to 4.4.1, no changes needed. + + [ gregor herrmann ] + * debian/control: update Build-Depends for cross builds. + * debian/watch: use uscan version 4. + * Update 'DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow' to '=+all'. + + * Import upstream version 2.030. + * Refresh disable-network-tests.patch (offset). + * Set Rules-Requires-Root: no. + * Annotate test-only build dependencies with . + * Bump debhelper-compat to 13. + + -- gregor herrmann Fri, 10 Jul 2020 20:13:38 +0200 libsocket-perl (2.029-1) unstable; urgency=medium diff -Nru libsocket-perl-2.029/debian/compat libsocket-perl-2.030/debian/compat --- libsocket-perl-2.029/debian/compat 2019-02-25 16:51:57.000000000 +0000 +++ libsocket-perl-2.030/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -11 diff -Nru libsocket-perl-2.029/debian/control libsocket-perl-2.030/debian/control --- libsocket-perl-2.029/debian/control 2019-02-25 16:51:57.000000000 +0000 +++ libsocket-perl-2.030/debian/control 2020-07-10 18:13:38.000000000 +0000 @@ -4,13 +4,15 @@ Section: perl Testsuite: autopkgtest-pkg-perl Priority: optional -Build-Depends: debhelper (>= 11), - netbase, - perl -Standards-Version: 4.3.0 +Build-Depends: debhelper-compat (= 13), + netbase , + perl-xs-dev, + perl:native +Standards-Version: 4.5.0 Vcs-Browser: https://salsa.debian.org/perl-team/modules/packages/libsocket-perl Vcs-Git: https://salsa.debian.org/perl-team/modules/packages/libsocket-perl.git Homepage: https://metacpan.org/release/Socket +Rules-Requires-Root: no Package: libsocket-perl Architecture: any diff -Nru libsocket-perl-2.029/debian/patches/disable-network-tests.patch libsocket-perl-2.030/debian/patches/disable-network-tests.patch --- libsocket-perl-2.029/debian/patches/disable-network-tests.patch 2019-02-25 16:51:57.000000000 +0000 +++ libsocket-perl-2.030/debian/patches/disable-network-tests.patch 2020-07-10 18:13:38.000000000 +0000 @@ -1,12 +1,12 @@ Description: skip network tests Origin: vendor -Forwarded: not needed +Forwarded: not-needed Author: gregor herrmann -Last-Update: 2016-08-12 +Last-Update: 2020-07-10 --- a/t/getaddrinfo.t +++ b/t/getaddrinfo.t -@@ -70,6 +70,7 @@ +@@ -71,6 +71,7 @@ my $goodhost = "cpan.perl.org"; SKIP: { @@ -14,7 +14,7 @@ skip "Resolver has no answer for $goodhost", 2 unless gethostbyname( $goodhost ); ( $err, @res ) = getaddrinfo( "cpan.perl.org", "ftp", { socktype => SOCK_STREAM } ); -@@ -85,6 +86,7 @@ +@@ -86,6 +87,7 @@ # any request. We'd better check for them SKIP: { @@ -22,7 +22,7 @@ skip "Resolver has an answer for $missinghost", 1 if gethostbyname( $missinghost ); # Some OSes return $err == 0 but no results -@@ -124,6 +126,7 @@ +@@ -125,6 +127,7 @@ # Now check that names with AI_NUMERICHOST fail SKIP: { diff -Nru libsocket-perl-2.029/debian/rules libsocket-perl-2.030/debian/rules --- libsocket-perl-2.029/debian/rules 2019-02-25 16:51:57.000000000 +0000 +++ libsocket-perl-2.030/debian/rules 2020-07-10 18:13:38.000000000 +0000 @@ -1,6 +1,6 @@ #!/usr/bin/make -f -export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow +export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: dh $@ diff -Nru libsocket-perl-2.029/debian/upstream/metadata libsocket-perl-2.030/debian/upstream/metadata --- libsocket-perl-2.029/debian/upstream/metadata 2019-02-25 16:51:57.000000000 +0000 +++ libsocket-perl-2.030/debian/upstream/metadata 2020-07-10 18:13:38.000000000 +0000 @@ -1,4 +1,2 @@ --- -Archive: CPAN -Contact: unknown -Name: Socket +Repository: http://bazaar.leonerd.org.uk/perl/Socket diff -Nru libsocket-perl-2.029/debian/watch libsocket-perl-2.030/debian/watch --- libsocket-perl-2.029/debian/watch 2019-02-25 16:51:57.000000000 +0000 +++ libsocket-perl-2.030/debian/watch 2020-07-10 18:13:38.000000000 +0000 @@ -1,2 +1,2 @@ -version=3 -https://metacpan.org/release/Socket .*/Socket-v?(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)$ +version=4 +https://metacpan.org/release/Socket .*/Socket-v?@ANY_VERSION@@ARCHIVE_EXT@$ diff -Nru libsocket-perl-2.029/META.json libsocket-perl-2.030/META.json --- libsocket-perl-2.029/META.json 2019-02-21 19:39:59.000000000 +0000 +++ libsocket-perl-2.030/META.json 2020-07-06 13:54:23.000000000 +0000 @@ -38,6 +38,6 @@ } }, "release_status" : "stable", - "version" : "2.029", - "x_serialization_backend" : "JSON::PP version 4.00" + "version" : "2.030", + "x_serialization_backend" : "JSON::PP version 4.04" } diff -Nru libsocket-perl-2.029/META.yml libsocket-perl-2.030/META.yml --- libsocket-perl-2.029/META.yml 2019-02-21 19:39:59.000000000 +0000 +++ libsocket-perl-2.030/META.yml 2020-07-06 13:54:23.000000000 +0000 @@ -20,5 +20,5 @@ - inc requires: perl: '5.006001' -version: '2.029' +version: '2.030' x_serialization_backend: 'CPAN::Meta::YAML version 0.018' diff -Nru libsocket-perl-2.029/Socket.pm libsocket-perl-2.030/Socket.pm --- libsocket-perl-2.029/Socket.pm 2019-02-20 19:18:56.000000000 +0000 +++ libsocket-perl-2.030/Socket.pm 2020-07-06 13:52:24.000000000 +0000 @@ -1,9 +1,9 @@ package Socket; use strict; -{ use 5.006001; } +{ use v5.6.1; } -our $VERSION = '2.029'; +our $VERSION = '2.030'; =head1 NAME diff -Nru libsocket-perl-2.029/t/getaddrinfo.t libsocket-perl-2.030/t/getaddrinfo.t --- libsocket-perl-2.029/t/getaddrinfo.t 2019-02-20 19:18:56.000000000 +0000 +++ libsocket-perl-2.030/t/getaddrinfo.t 2020-07-06 13:48:52.000000000 +0000 @@ -1,3 +1,4 @@ +use v5.6.1; use strict; use warnings; use Test::More tests => 31; diff -Nru libsocket-perl-2.029/t/getnameinfo.t libsocket-perl-2.030/t/getnameinfo.t --- libsocket-perl-2.029/t/getnameinfo.t 2019-02-20 19:18:56.000000000 +0000 +++ libsocket-perl-2.030/t/getnameinfo.t 2020-07-06 13:48:52.000000000 +0000 @@ -1,3 +1,4 @@ +use v5.6.1; use strict; use warnings; use Test::More tests => 13; diff -Nru libsocket-perl-2.029/t/ip_mreq.t libsocket-perl-2.030/t/ip_mreq.t --- libsocket-perl-2.029/t/ip_mreq.t 2019-02-20 19:18:56.000000000 +0000 +++ libsocket-perl-2.030/t/ip_mreq.t 2020-07-06 13:48:52.000000000 +0000 @@ -1,3 +1,4 @@ +use v5.6.1; use strict; use warnings; use Test::More; diff -Nru libsocket-perl-2.029/t/ipv6_mreq.t libsocket-perl-2.030/t/ipv6_mreq.t --- libsocket-perl-2.029/t/ipv6_mreq.t 2019-02-20 19:18:56.000000000 +0000 +++ libsocket-perl-2.030/t/ipv6_mreq.t 2020-07-06 13:48:52.000000000 +0000 @@ -1,3 +1,4 @@ +use v5.6.1; use strict; use warnings; use Test::More; diff -Nru libsocket-perl-2.029/t/sockaddr.t libsocket-perl-2.030/t/sockaddr.t --- libsocket-perl-2.029/t/sockaddr.t 2019-02-20 19:18:56.000000000 +0000 +++ libsocket-perl-2.030/t/sockaddr.t 2020-07-06 13:48:52.000000000 +0000 @@ -1,5 +1,6 @@ #!./perl +use v5.6.1; use strict; use warnings; diff -Nru libsocket-perl-2.029/t/socketpair.t libsocket-perl-2.030/t/socketpair.t --- libsocket-perl-2.029/t/socketpair.t 2019-02-20 19:18:56.000000000 +0000 +++ libsocket-perl-2.030/t/socketpair.t 2020-07-06 13:48:52.000000000 +0000 @@ -1,9 +1,14 @@ #!./perl -w +use v5.6.1; +use strict; +use warnings; + my $child; my $can_fork; my $has_perlio; +our %Config; BEGIN { require Config; import Config; $can_fork = $Config{'d_fork'} || $Config{'d_pseudofork'}; diff -Nru libsocket-perl-2.029/t/Socket.t libsocket-perl-2.030/t/Socket.t --- libsocket-perl-2.029/t/Socket.t 2019-02-20 19:18:56.000000000 +0000 +++ libsocket-perl-2.030/t/Socket.t 2020-07-06 13:48:52.000000000 +0000 @@ -1,5 +1,11 @@ #!./perl +use v5.6.1; +use strict; +use warnings; + +our %Config; +my $has_alarm; BEGIN { require Config; import Config; if ($Config{'extensions'} !~ /\bSocket\b/ && @@ -13,8 +19,8 @@ use Socket qw(:all); use Test::More tests => 6; -$has_echo = $^O ne 'MSWin32'; -$alarmed = 0; +my $has_echo = $^O ne 'MSWin32'; +my $alarmed = 0; sub arm { $alarmed = 0; alarm(shift) if $has_alarm } sub alarmed { $alarmed = 1 } $SIG{ALRM} = 'alarmed' if $has_alarm; @@ -48,7 +54,8 @@ arm(0); arm(5); - $read = sysread(T,$buff,10); # Connection may be granted, then closed! + my $buff; + my $read = sysread(T,$buff,10); # Connection may be granted, then closed! arm(0); while ($read > 0 && length($buff) < 5) { @@ -87,7 +94,8 @@ arm(0); arm(5); - $read = sysread(S,$buff,10); # Connection may be granted, then closed! + my $buff; + my $read = sysread(S,$buff,10); # Connection may be granted, then closed! arm(0); while ($read > 0 && length($buff) < 5) {