[Git][reproducible-builds/strip-nondeterminism][master] 4 commits: Avoid Sub::Override and break circular dependencies in debhelper

[Chris Lamb (@lamby)]

Chris Lamb pushed to branch master at Reproducible Builds / strip-nondeterminism


Commits:
4d235a68 by Alex Muntada at 2024-05-23T16:52:19+02:00
Avoid Sub::Override and break circular dependencies in debhelper

- - - - -
9d05cb86 by Chris Lamb at 2024-05-24T08:53:40+01:00
Drop Depends, Build-Depends and Makefile.PL PREREQ_PM entry for libsub-override-perl.

- - - - -
87a49418 by Chris Lamb at 2024-05-24T08:55:12+01:00
Release version 1.14.0

Gbp-Dch: ignore

- - - - -
fe05913c by Chris Lamb at 2024-05-24T08:55:36+01:00
Update changelog for 1.14.0-1 release

- - - - -


5 changed files:

- Makefile.PL
- debian/changelog
- debian/control
- lib/File/StripNondeterminism.pm
- lib/File/StripNondeterminism/handlers/zip.pm


Changes:

=====================================
Makefile.PL
=====================================
@@ -17,7 +17,6 @@ WriteMakefile(
 		'Archive::Cpio'	=> 0, # required to pass tests
 		'Archive::Zip'	=> 0,
 		'Getopt::Long'	=> 0,
-		'Sub::Override'	=> 0,
 	},
 	LICENSE		=> "gpl",
 	dist		=> { COMPRESS => 'gzip -9nf', SUFFIX => 'gz', },


=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+strip-nondeterminism (1.14.0-1) unstable; urgency=medium
+
+  [ Alex Muntada ]
+  * Avoid Sub::Override and break circular dependencies in debhelper.
+
+  [ Chris Lamb ]
+  * Drop Depends, Build-Depends and Makefile.PL PREREQ_PM entry for
+    libsub-override-perl.
+
+ -- Chris Lamb <lamby at debian.org>  Fri, 24 May 2024 08:55:32 +0100
+
 strip-nondeterminism (1.13.1-1) unstable; urgency=medium
 
   [ FC Stegerman ]


=====================================
debian/control
=====================================
@@ -7,7 +7,6 @@ Build-Depends-Indep:
  libarchive-cpio-perl <!nocheck>,
  libarchive-zip-perl,
  libdevel-cover-perl,
- libsub-override-perl,
  perl,
 Maintainer: Reproducible builds folks <reproducible-builds at lists.alioth.debian.org>
 Uploaders:
@@ -28,7 +27,6 @@ Multi-Arch: foreign
 Depends:
  file,
  libarchive-zip-perl,
- libsub-override-perl,
  ${misc:Depends},
  ${perl:Depends},
 Recommends:


=====================================
lib/File/StripNondeterminism.pm
=====================================
@@ -26,7 +26,7 @@ use POSIX qw(tzset);
 
 our($VERSION, $canonical_time, $clamp_time, $verbose);
 
-$VERSION = '1.13.1'; # <https://semver.org/>
+$VERSION = '1.14.0'; # <https://semver.org/>
 
 sub init() {
 	$ENV{'TZ'} = 'UTC';


=====================================
lib/File/StripNondeterminism/handlers/zip.pm
=====================================
@@ -26,7 +26,6 @@ use File::Basename qw(basename);
 use File::Temp;
 use File::StripNondeterminism;
 use Archive::Zip qw/:CONSTANTS :ERROR_CODES/;
-use Sub::Override;
 
 =head1 DEPRECATION PLANS
 
@@ -265,17 +264,20 @@ sub normalize {
 	my @overrides = map {
 		my $full_name = "Archive::Zip::Member::$_";
 		my $orig_sub = \&$full_name;
-		Sub::Override->new(
-			$full_name => sub {
-				my $result = $orig_sub->(@_);
-				return defined($result) ?
-					normalize_extra_fields($canonical_time, $result) : $result;
-			}
-		);
+
+		no warnings qw(redefine);
+		no strict qw(refs);
+		*{"Archive\::Zip\::Member\::$_"} = sub {
+			my $result = $orig_sub->(@_);
+			return defined($result) ?
+				normalize_extra_fields($canonical_time, $result) : $result;
+		};
+
+		sub { *{"Archive\::Zip\::Member\::$_"} = $orig_sub };
 	} qw(cdExtraField localExtraField);
 
 	return 0 unless $zip->overwrite() == AZ_OK;
-	$_->restore for @overrides;
+	$_->() for @overrides;
 	chmod($old_perms, $zip_filename);
 	return 1;
 }



View it on GitLab: https://salsa.debian.org/reproducible-builds/strip-nondeterminism/-/compare/ba37ebd05e9a15be3541f039a80c0e4d3af2a3b9...fe05913c2e02d2c17fcdf47b23aada203196b20c

-- 
This project does not include diff previews in email notifications.
View it on GitLab: https://salsa.debian.org/reproducible-builds/strip-nondeterminism/-/compare/ba37ebd05e9a15be3541f039a80c0e4d3af2a3b9...fe05913c2e02d2c17fcdf47b23aada203196b20c
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.reproducible-builds.org/pipermail/rb-commits/attachments/20240524/edad51a6/attachment.htm>