diff -Nru debhelper-13.3.4ubuntu1~cloud0/debian/changelog debhelper-13.3.4ubuntu2~cloud0/debian/changelog --- debhelper-13.3.4ubuntu1~cloud0/debian/changelog 2021-03-22 23:36:36.000000000 +0000 +++ debhelper-13.3.4ubuntu2~cloud0/debian/changelog 2021-08-05 12:36:41.000000000 +0000 @@ -1,8 +1,17 @@ -debhelper (13.3.4ubuntu1~cloud0) focal-wallaby; urgency=medium +debhelper (13.3.4ubuntu2~cloud0) focal-xena; urgency=medium * New upstream release for the Ubuntu Cloud Archive. - -- Openstack Ubuntu Testing Bot Mon, 22 Mar 2021 23:36:36 +0000 + -- Openstack Ubuntu Testing Bot Thu, 05 Aug 2021 12:36:41 +0000 + +debhelper (13.3.4ubuntu2) impish; urgency=medium + + * objcopy/strip changed in 2.36.1, not keeping file attributes of the + original file. Work around that in dh_strip to write to a temporary + file, copying attributes, cat'ing this to the original file, copying + attributes again to keep the original attributes. LP: #1938886 + + -- Dimitri John Ledkov Wed, 04 Aug 2021 19:23:25 +0100 debhelper (13.3.4ubuntu1) hirsute; urgency=medium diff -Nru debhelper-13.3.4ubuntu1~cloud0/dh_strip debhelper-13.3.4ubuntu2~cloud0/dh_strip --- debhelper-13.3.4ubuntu1~cloud0/dh_strip 2021-03-19 12:29:56.000000000 +0000 +++ debhelper-13.3.4ubuntu2~cloud0/dh_strip 2021-08-04 18:23:25.000000000 +0000 @@ -332,12 +332,19 @@ return $debug_path; } +sub chmod_and_cat { + my ($file, $tempfile) = @_; + doit("chmod", "--reference", $file, $tempfile); + complex_doit("cat '$tempfile' > '$file'"); + doit("chmod", "--reference", $tempfile, $file); +} + sub attach_debug { my ($objcopy, $file, $debug_path, $tempdir) = @_; my $tempfile; (undef, $tempfile) = File::Temp::tempfile("objcopyXXXXXX", DIR => $tempdir, OPEN => 0); doit($objcopy, "--add-gnu-debuglink", $debug_path, $file, $tempfile); - complex_doit("cat '$tempfile' > '$file'"); + chmod_and_cat($file, $tempfile); } my %all_packages = map { $_ => 1 } getpackages(); @@ -387,7 +394,7 @@ my $tempfile; (undef, $tempfile) = File::Temp::tempfile("stripXXXXXX", DIR => $tempdir, OPEN => 0); doit($strip, "--remove-section=.comment", "--remove-section=.note", "--strip-unneeded", "-o", $tempfile, $_); - complex_doit("cat '$tempfile' > '$_'"); + chmod_and_cat($_, $tempfile); attach_debug($objcopy, $_, $debug_path, $tempdir) if defined $debug_path; } @@ -396,7 +403,7 @@ my $tempfile; (undef, $tempfile) = File::Temp::tempfile("stripXXXXXX", DIR => $tempdir, OPEN => 0); doit($strip, "--remove-section=.comment", "--remove-section=.note", "-o", $tempfile, $_); - complex_doit("cat '$tempfile' > '$_'"); + chmod_and_cat($_, $tempfile); attach_debug($objcopy, $_, $debug_path, $tempdir) if defined $debug_path; } diff -Nru debhelper-13.3.4ubuntu1~cloud0/t/size.t debhelper-13.3.4ubuntu2~cloud0/t/size.t --- debhelper-13.3.4ubuntu1~cloud0/t/size.t 2020-07-17 16:52:21.000000000 +0000 +++ debhelper-13.3.4ubuntu2~cloud0/t/size.t 2021-08-04 18:23:25.000000000 +0000 @@ -27,6 +27,6 @@ } close($fd); print "# $file has $lines lines, max length is $maxlength\n"; - ok($lines < 200, $file); + ok($lines < 210, $file); ok($maxlength < 160, $file); }