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

Bug#1039457: marked as done (mplayer: reproducible-builds: version differences caused by /bin/sh implementations)



Your message dated Tue, 12 Dec 2023 00:35:01 +0000
with message-id <E1rCqjl-001Ls7-MC@fasolo.debian.org>
and subject line Bug#1039457: fixed in mplayer 2:1.5+svn38446-1
has caused the Debian Bug report #1039457,
regarding mplayer: reproducible-builds: version differences caused by /bin/sh implementations
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
1039457: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1039457
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message ---
Source: mplayer
Version: 2:1.5+svn38423-2
Severity: normal
Tags: patch
User: reproducible-builds@lists.alioth.debian.org
Usertags: shell
X-Debbugs-Cc: reproducible-bugs@lists.alioth.debian.org

When build with /bin/sh pointing to dash or bash, a different version.h
is generated, which results in different version strings getting
embedded in various binaries:

  https://tests.reproducible-builds.org/debian/rb-pkg/bookworm/amd64/diffoscope-results/mplayer.html

  /usr/bin/mencoder

  MPlayer·1.5+svn38423-2·(Debian)
  vs.
  MPlayer·1.5+svn38423-2·(Debian)\n

The two shell implementations have some differences in echo
implementations.

The patch to debian/rules fixes this by using a single printf call
instead of two echo calls, and adjusting the escaped strings
accordingly.


According to my local tests, with this patch applied mplayer should
build reproducibly again on tests.reproducible-builds.org when it
migrates to trixie/testing! Unfortunately, there are still outstanding
issues with embedded build paths that are tested in unstable and
experimental.


Thanks for maintaining mplayer!


live well,
  vagrant
From 744d893c714f66cd526a83acc21c3adbb9cf786a Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@reproducible-builds.org>
Date: Sun, 25 Jun 2023 18:51:36 -0700
Subject: [PATCH] debian/rules: Use printf instead of echo.

The echo implementations may be dependent on the shell implementation.
---
 debian/rules | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/debian/rules b/debian/rules
index 7ed5090..b17fdbc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@ include /usr/share/dpkg/buildtools.mk
 
 D_VERSION = $(shell dpkg-parsechangelog -SVersion | sed -e 's/^[0-9]*://')
 OUR_VERSION = \#define VERSION \"$(D_VERSION) (Debian)\"
-OUR_TITLE = \#define MP_TITLE \"MPlayer $(D_VERSION) (Debian)\\\n\"
+OUR_TITLE = \#define MP_TITLE \"MPlayer $(D_VERSION) (Debian)\"
 
 CFLAGS +=$(CPPFLAGS)
 
@@ -99,8 +99,7 @@ override_dh_auto_build-arch:
 	$(MAKE) install-gui-msg DESTDIR=$(CURDIR)/gui-msg
 	$(MAKE) distclean
 	./configure $(CONFIGURE_FLAGS) --disable-gui
-	echo "$(OUR_VERSION)"  >> version.h
-	echo "$(OUR_TITLE)"  >> version.h
+	printf "$(OUR_VERSION)\n$(OUR_TITLE)\n"  >> version.h
 	dh_auto_build -- mplayer mencoder
 
 override_dh_auto_build-indep:
@@ -112,8 +111,7 @@ override_dh_auto_clean:
 
 override_dh_auto_configure-arch:
 	./configure $(CONFIGURE_FLAGS) --enable-gui --enable-nls
-	echo "$(OUR_VERSION)"  >> version.h
-	echo "$(OUR_TITLE)"  >> version.h
+	printf "$(OUR_VERSION)\n$(OUR_TITLE)\n"  >> version.h
 
 override_dh_auto_configure-indep:
 	[ -f config.mak ] || ./configure $(CONFIGURE_DOC_FLAGS)
-- 
2.39.2

Attachment: signature.asc
Description: PGP signature


--- End Message ---
--- Begin Message ---
Source: mplayer
Source-Version: 2:1.5+svn38446-1
Done: Bastian Germann <bage@debian.org>

We believe that the bug you reported is fixed in the latest version of
mplayer, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 1039457@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Bastian Germann <bage@debian.org> (supplier of updated mplayer package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Format: 1.8
Date: Sun, 10 Dec 2023 12:38:09 +0100
Source: mplayer
Architecture: source
Version: 2:1.5+svn38446-1
Distribution: unstable
Urgency: medium
Maintainer: Debian Multimedia Maintainers <debian-multimedia@lists.debian.org>
Changed-By: Bastian Germann <bage@debian.org>
Closes: 1039457 1057579
Changes:
 mplayer (2:1.5+svn38446-1) unstable; urgency=medium
 .
   * Team upload
   * d/watch: Scan SVN repo
 .
   [ Lorenzo Puliti ]
   * New upstream version 1.5+svn38446
      - fix FTBFS (Closes: #1057579)
      - d/control: B-D: switch to nasm
      - avoid crahes when -wid specifies an
        invalid Window ID, see #1034867
      - fix ID_VID_0_ROTATE, relevant for #1040168
 .
   [ Vagrant Cascadian ]
   * debian/rules: Use printf instead of echo (Closes: #1039457)
 .
   [ Paul Wise ]
   * improve printf line in d/rules
Checksums-Sha1:
 62e42992ec92a137e4a5d5e60b05132e8ee8eb54 3105 mplayer_1.5+svn38446-1.dsc
 a74342ad077272fa85a73a709daebb3a9970fc49 5228072 mplayer_1.5+svn38446.orig.tar.xz
 e77a0fcd1dc68e19695602f69051928bcc89fd1f 35012 mplayer_1.5+svn38446-1.debian.tar.xz
 dd36a2cf5884400c81cdf23b234912a6ea6d7b3b 8192 mplayer_1.5+svn38446-1_source.buildinfo
Checksums-Sha256:
 a8958293002bc28c14dd51dc1d14bee0b38a8be12ec15e7fd514707a14ce4050 3105 mplayer_1.5+svn38446-1.dsc
 beaf565d3c46fde5f55929785551f36ddc59a10cc9b7b3e9e90560d90c6b7756 5228072 mplayer_1.5+svn38446.orig.tar.xz
 2a7093978d7e733f352219b38d5581f2aeeb832de386ac27378a0b0679e1b3c5 35012 mplayer_1.5+svn38446-1.debian.tar.xz
 7e9655944a728e02f6c89d80a5ab6fc9d528c50cc467df0975e0f0c73bb6ed0f 8192 mplayer_1.5+svn38446-1_source.buildinfo
Files:
 155b00d811e9e7e34b7bc0f029d01115 3105 video optional mplayer_1.5+svn38446-1.dsc
 6749a57bc7f340b7dfb887006ea14b0b 5228072 video optional mplayer_1.5+svn38446.orig.tar.xz
 7a48fa28639edb2664628a0397f34cc5 35012 video optional mplayer_1.5+svn38446-1.debian.tar.xz
 b0eec1c75b3c8dda9a24d2039a027096 8192 video optional mplayer_1.5+svn38446-1_source.buildinfo

-----BEGIN PGP SIGNATURE-----

iQHEBAEBCgAuFiEEQGIgyLhVKAI3jM5BH1x6i0VWQxQFAmV3peYQHGJhZ2VAZGVi
aWFuLm9yZwAKCRAfXHqLRVZDFFOlC/9ilZRAlBgxV0I3Mm3vZ1zkcLuhe4cdgVkh
6FBXzz5kZKI3aUZqEfPDQu4YqPz8Dwv5HETm0Mpkx37iq8GSS3E+WAsl4eiCF2Xl
gP3lNNyVuwJdheQnwOg/5y33bdR3Q9tBBBkaXUIHpozeUHu5684ZNKb0sNFlv4Jf
OzXfHu9tLvNZauoQJoApD9b8ERhuCoXKwe/gMykR9nKoi0M8dtu1QvEfFqIabBmf
PAeGgod5UnEYdsSarxN8KgXZA+QC3IAblXvqQD5GEDTlDAxPFO1LSm7kv8TwHwnL
fG8eVENdd/bFZP/J/kmV+iMvHenKbGnd2qtJ2tGcOMrzyi3XXa0+0a7sYdvxagwa
OZkYpsyN8j8vOlcc4Gp955Ds39Zydlk3EtHwSAnRpaVwKxroGoxbuPuVD9ebcSMY
UT6XPAQv7vfDwGFAsmcmphkf952PDrxnACV/A7qEfXoBXeKkEXSbMS7hiBLBVxAY
eoKFlUK6J8xssJnGziVa7IDJBi6JM2U=
=HVYV
-----END PGP SIGNATURE-----

--- End Message ---

Reply to: