[Git][reproducible-builds/strip-nondeterminism][master] 4 commits: Skip symlinks when manually called via /usr/bin/strip-nondeterminism as well. (Closes: #1139000)

[Chris Lamb (@lamby)]

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


Commits:
faf0645c by Chris Lamb at 2026-06-08T10:50:09-07:00
Skip symlinks when manually called via /usr/bin/strip-nondeterminism as well. (Closes: #1139000)

This matches the established behaviour of dh_strip_nondeterminism, and
avoids replacing symlinks with files in the normalizers that rewrite the
file.

- - - - -
aa3e692f by Chris Lamb at 2026-06-08T10:50:39-07:00
Bump Standards-Version to 4.7.4.

- - - - -
7bbca8ac by Chris Lamb at 2026-06-08T10:51:01-07:00
Release version 1.15.1

Gbp-Dch: ignore

- - - - -
3d798a85 by Chris Lamb at 2026-06-08T10:51:38-07:00
Update changelog for 1.15.1-1 release

- - - - -


4 changed files:

- bin/strip-nondeterminism
- debian/changelog
- debian/control
- lib/File/StripNondeterminism.pm


Changes:

=====================================
bin/strip-nondeterminism
=====================================
@@ -103,6 +103,14 @@ print "$cmd: Using normalizers: "
 for my $filename (@ARGV) {
 	die "$filename: Does not exist\n" unless -e $filename;
 
+	# Skip symlinks in order to match the established behaviour of
+	# dh_strip_nondeterminism, and to avoid replacing symlinks with files
+	# in normalizers that completely rewrite the file.
+	if (-l $filename) {
+		warn "ignoring symlink $filename\n";
+		continue;
+	}
+
 	if (!defined $filetype) {
 		$normalizer
 		  = File::StripNondeterminism::get_normalizer_for_file($filename);


=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+strip-nondeterminism (1.15.1-1) unstable; urgency=medium
+
+  * Skip symlinks when manually called via /usr/bin/strip-nondeterminism as
+    well. (Closes: #1139000)
+  * Bump Standards-Version to 4.7.4.
+
+ -- Chris Lamb <lamby at debian.org>  Mon, 08 Jun 2026 10:51:31 -0700
+
 strip-nondeterminism (1.15.0-1) unstable; urgency=medium
 
   [ Matwey Kornilov ]


=====================================
debian/control
=====================================
@@ -15,7 +15,7 @@ Uploaders:
  Mattia Rizzolo <mattia at debian.org>,
  Chris Lamb <lamby at debian.org>,
 Rules-Requires-Root: no
-Standards-Version: 4.7.2
+Standards-Version: 4.7.4
 Homepage: https://reproducible-builds.org/
 Vcs-Git: https://salsa.debian.org/reproducible-builds/strip-nondeterminism.git
 Vcs-Browser: https://salsa.debian.org/reproducible-builds/strip-nondeterminism


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



View it on GitLab: https://salsa.debian.org/reproducible-builds/strip-nondeterminism/-/compare/0460659ed268c169b5629aca8fb69c3bc6bcc584...3d798a85be4da8e8e2ee97ebdf899bd97aa3cb70

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/strip-nondeterminism/-/compare/0460659ed268c169b5629aca8fb69c3bc6bcc584...3d798a85be4da8e8e2ee97ebdf899bd97aa3cb70
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help


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