[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#990247: vlc: reproducible builds: Fix passing sort order to tar when generating default.vlt



Source: vlc
Severity: normal
Tags: patch
User: reproducible-builds@lists.alioth.debian.org
Usertags: fileordering
X-Debbugs-Cc: reproducible-bugs@lists.alioth.debian.org

In share/Makefile.am, when creating default.vlt it attempts to detect
the availability of the tar --sort= option, but then incorrectly passes
the variable to tar.

It does not appear to affect the sort order on
tests.reproducible-builds.org, but it does appear to cause issues when
testing with reprotest, and so may occur in other situations in the
wild.


The attached patch fixes this by passing it as a make variable rather
than a quoted shell variable.


This patch does not address all reproducibility issues in vlc
(e.g. build paths).


Thanks for maintaining vlc!


live well,
  vagrant
From 126a1a298a5c658a2d04a064b506da62882b9092 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@reproducible-builds.org>
Date: Wed, 23 Jun 2021 19:42:34 +0000
Subject: [PATCH 2/3] Pass sort option to tar as a make variable when creating
 default.vlt file.

While detection for --sort= support in tar appeared to work, but the
variable ended up not being evaluated when calling tar:

  tarsort= ; \
  tar --help|grep -q sort=ORDER && tarsort=--sort=name ; \
  GZIP=--no-name \
  tar cvvzf skins2/default.vlt.tmp \
  	--format=ustar $tarsort \
  	--owner=root --group=root --directory="./skins2" \
  	default/
---
 share/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/Makefile.am b/share/Makefile.am
index 803964a9f..29e6d36f6 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -96,7 +96,7 @@ skins2/default.vlt: $(skins2_default_vlt_FILES)
 	tar --help|grep -q sort=ORDER && tarsort=--sort=name ; \
 	GZIP=--no-name \
 	tar cvvzf skins2/default.vlt.tmp \
-		--format=ustar $$tarsort \
+		--format=ustar $(tarsort) \
 		--owner=root --group=root --directory="$(srcdir)/skins2" \
 		default/
 	$(AM_V_at)mv -f -- skins2/default.vlt.tmp skins2/default.vlt
-- 
2.32.0

Attachment: signature.asc
Description: PGP signature


Reply to: