Control: tags -1 + fixed-upstream

On 2016-11-03 23:30:48, Reiner Herrmann wrote:
> Source: zathura-ps
> Version: 0.2.3-1
> Severity: wishlist
> Tags: patch upstream
> User: reproducible-bui...@lists.alioth.debian.org
> Usertags: fileordering
> X-Debbugs-Cc: reproducible-bui...@lists.alioth.debian.org
> 
> Hi!
> 
> While working on the "reproducible builds" effort [1], we have noticed
> that zathura-ps could not be built reproducibly.
> During build objects are linked in non-deterministic order.
> 
> The attached patch fixes this by sorting the list of source files.

Fixed upstream but in a different way:
https://git.pwmt.org/pwmt/zathura-ps/commit/b61d750770604921f025b92a6783de7fb2e90603
and 
https://git.pwmt.org/pwmt/zathura-ps/commit/b60b09043a29a341f7dbd7891349a8a0f750a104

Cheers

> Regards,
>  Reiner
> 
> [1]: https://wiki.debian.org/ReproducibleBuilds

> diff --git a/debian/patches/reproducible-build.patch 
> b/debian/patches/reproducible-build.patch
> new file mode 100644
> index 0000000..8f5c785
> --- /dev/null
> +++ b/debian/patches/reproducible-build.patch
> @@ -0,0 +1,14 @@
> +Author: Reiner Herrmann <rei...@reiner-h.de>
> +Description: Sort list of source files for deterministic linking order
> +
> +--- a/Makefile
> ++++ b/Makefile
> +@@ -5,7 +5,7 @@
> + 
> + PROJECT  = zathura-ps
> + PLUGIN   = ps
> +-SOURCE   = $(shell find . -iname "*.c")
> ++SOURCE   = $(shell find . -iname "*.c" | LC_ALL=C sort)
> + HEADER   = $(shell find . -iname "*.h")
> + OBJECTS  = ${SOURCE:.c=.o}
> + DOBJECTS = ${SOURCE:.c=.do}
> diff --git a/debian/patches/series b/debian/patches/series
> new file mode 100644
> index 0000000..55077d0
> --- /dev/null
> +++ b/debian/patches/series
> @@ -0,0 +1 @@
> +reproducible-build.patch




-- 
Sebastian Ramacher

Reply via email to