Your message dated Sat, 16 Jul 2016 22:08:53 +0000
with message-id <e1boxlv-0002kx...@franck.debian.org>
and subject line Bug#828748: fixed in libphonenumber 7.1.0-4
has caused the Debian Bug report #828748,
regarding libphonenumber: please make the build reproducible
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 ow...@bugs.debian.org
immediately.)


-- 
828748: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=828748
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Source: libphonennumber
Version: 7.1.0-3
Severity: wishlist
Tags: patch
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 libphonennumber could not be built reproducibly.
While generating the file geocoding_data.cc, it iterates over files in
readdir order.

The attached patch fixes this by sorting the list after the files are
collected.

Regards,
 Reiner

[1]: https://wiki.debian.org/ReproducibleBuilds
diff --git a/debian/patches/0010-reproducible-build.patch b/debian/patches/0010-reproducible-build.patch
new file mode 100644
index 0000000..c417026
--- /dev/null
+++ b/debian/patches/0010-reproducible-build.patch
@@ -0,0 +1,18 @@
+--- a/tools/cpp/src/cpp-build/generate_geocoding_data.cc
++++ b/tools/cpp/src/cpp-build/generate_geocoding_data.cc
+@@ -86,6 +86,7 @@
+ 
+   const std::string& name() const { return name_; }
+   DirEntryKinds kind() const { return kind_; }
++  bool operator<(const DirEntry& d) { return name_ < d.name() || kind_ < d.kind(); }
+ 
+  private:
+   std::string name_;
+@@ -109,6 +110,7 @@
+       return false;
+     }
+     if (dir_result == NULL) {
++      std::sort(entries->begin(), entries->end());
+       return true;
+     }
+     if (strcmp(entry.d_name, ".") == 0 || strcmp(entry.d_name, "..") == 0) {
diff --git a/debian/patches/series b/debian/patches/series
index ab7cb9c..e73a41e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 0006-main-lib-jdk5.patch
 0008-tools-jdk5.patch
 0009-maven-tests-forkmode.patch
+0010-reproducible-build.patch

Attachment: signature.asc
Description: Digital signature


--- End Message ---
--- Begin Message ---
Source: libphonenumber
Source-Version: 7.1.0-4

We believe that the bug you reported is fixed in the latest version of
libphonenumber, 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 828...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Markus Koschany <a...@debian.org> (supplier of updated libphonenumber 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 ftpmas...@ftp-master.debian.org)


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

Format: 1.8
Date: Sat, 16 Jul 2016 23:04:13 +0200
Source: libphonenumber
Binary: libphonenumber7-java libphonenumber-dev libphonenumber7 libgeocoding7
Architecture: source amd64 all
Version: 7.1.0-4
Distribution: unstable
Urgency: medium
Maintainer: Debian Java Maintainers 
<pkg-java-maintainers@lists.alioth.debian.org>
Changed-By: Markus Koschany <a...@debian.org>
Description:
 libgeocoding7 - geocoding phone numbers
 libphonenumber-dev - parsing/formatting/validating phone numbers - development 
files
 libphonenumber7 - parsing/formatting/validating phone numbers
 libphonenumber7-java - parsing/formatting/validating phone numbers - java
Closes: 811613 828748
Changes:
 libphonenumber (7.1.0-4) unstable; urgency=medium
 .
   * Team upload.
   * Vcs-Git: Use https.
   * Add gcc-6-ftbfs.patch and fix FTBFS with GCC-6. (Closes: #811613)
     Thanks to Martin Michlmayr for the report.
   * Fix Lintian warning syntax-error-in-dep5-copyright.
   * Add 0010-reproducible-build.patch and make the build reproducible.
     Thanks to Reiner Herrmann for the report and patch. (Closes: #828748)
   * Fix Lintian warning dep5-copyright-license-name-not-unique.
Checksums-Sha1:
 e053e82e7e9946c7ecb69e54be5bd729f99526bd 2945 libphonenumber_7.1.0-4.dsc
 2677e014c52897c6cf61a6bdbc987a1976583f45 11184 
libphonenumber_7.1.0-4.debian.tar.xz
 993f4d05a1ef690fd9acccdd0aa5dd7ad23396a2 13722 
libgeocoding7-dbgsym_7.1.0-4_amd64.deb
 d2f3162be2d0d0021e5d82d25234af2ef8f95f3c 1006168 
libgeocoding7_7.1.0-4_amd64.deb
 16ea96c7f78bdc652a3be5646f24b74c689b243a 1106954 
libphonenumber-dev_7.1.0-4_amd64.deb
 0baf31268800ab142f1fc2f09f35d93a8b8c773b 50916 
libphonenumber7-dbgsym_7.1.0-4_amd64.deb
 06b8213fab17c5b63e3d0371ed4108f83c365025 1799684 
libphonenumber7-java_7.1.0-4_all.deb
 7588117dcd4a62b5732ccad9fe81ba4fa4261099 186696 
libphonenumber7_7.1.0-4_amd64.deb
Checksums-Sha256:
 d0be11392c38a5065d47c77b1f98620b60bc25858b16d9fb8be585d88a93dda6 2945 
libphonenumber_7.1.0-4.dsc
 fb2c199c1250293d2d26f3521640f7483e8aa535aac71f120573e232882f7e1e 11184 
libphonenumber_7.1.0-4.debian.tar.xz
 9267d5533c73792eed796f7f58a1604e9ca9d65f79a1320f3e09252a5b9d1dd3 13722 
libgeocoding7-dbgsym_7.1.0-4_amd64.deb
 888d88ce618f4a5fbd93cf75c5d0192256f542c4e94249df07b8f79f3a241566 1006168 
libgeocoding7_7.1.0-4_amd64.deb
 2b5570207c4991e3b57180aa19aac1afc80c4d3ae9b98a70a4d5fd14a694f540 1106954 
libphonenumber-dev_7.1.0-4_amd64.deb
 40e3ef988859ac7fb0f9931c9dd6c7a934fa584e5f08c9efa72f6146b528508b 50916 
libphonenumber7-dbgsym_7.1.0-4_amd64.deb
 87957d60f5e495146fa55d4c82814b4df33a884663f326d5169d1bdaf7a7efe5 1799684 
libphonenumber7-java_7.1.0-4_all.deb
 18d096d6174d068d7c3a861c1187c149c4bf20fe4b5530b83c412e618434722e 186696 
libphonenumber7_7.1.0-4_amd64.deb
Files:
 5173f643cc1f89c17465699d33e79b51 2945 libs optional libphonenumber_7.1.0-4.dsc
 dd3040339473d2081aac71e9e0fdba1b 11184 libs optional 
libphonenumber_7.1.0-4.debian.tar.xz
 83a3031a622863829cebd595fe005217 13722 debug extra 
libgeocoding7-dbgsym_7.1.0-4_amd64.deb
 665d4a5a608b23115cce12a716f922a0 1006168 libs optional 
libgeocoding7_7.1.0-4_amd64.deb
 ba1829a42f800e879703b0032c97104f 1106954 libdevel optional 
libphonenumber-dev_7.1.0-4_amd64.deb
 2307181533a6d1b1cd975821033fab16 50916 debug extra 
libphonenumber7-dbgsym_7.1.0-4_amd64.deb
 910806d47316cae695220f9716fc7df0 1799684 java optional 
libphonenumber7-java_7.1.0-4_all.deb
 ef7c1b70c8c5519b17eb2a8881c7b419 186696 libs optional 
libphonenumber7_7.1.0-4_amd64.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQJ8BAEBCgBmBQJXiqlJXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRBQ0YzRDA4OEVGMzJFREVGNkExQTgzNUZE
OUFEMTRCOTUxM0I1MUU0AAoJENmtFLlRO1Hk5mQQAJwQ8DR/eToLj1uxBxDUgiw3
Y+xGWMGtzWwQJMqIKEtsB1GKfHLM5PjkB2FSkebwXPRT2R01VKIkKzDAGWHqffJl
6stsOqeIkiyXhD3V+k+HLdP/8wh8yRWhSXpMeBSP0JFAtLFo4TDO7+wBZAo6IHZ8
/5jlWJt+tT2m37z/hGgFabMFS+C94fJyKTqwatjV5puq+OMnB/Yss7xqVxfGo6tg
p8uUltUbfkRSnZVyxLF4Q04x+s0EfUU4AZqqDAj203oEuqDHwpYBGWwTfYrlVZqs
KxZeSutaZecw2nrxXAJxu5ICDL7mj/hT+uhnAyzWwc0N+9RzyeHeLhhk1GILTfrq
kEekLwGQbheIoBjg0cHdchGQk03r9v0LEJkXS4zgapU4SMv+6FPqDuyd9YnAkhMs
fXi90V67pTxyGqftONvsPj1OquPPwgs4gSnvTGMyN8r1SjAEZGaKa1uSXriTS6i7
a77QxbwvCla/q31h4F4oGi2BS771IZmx5T6ie5ldA7XqyuCb7KO7CJhP5GzepAQj
Op5qU3SCB0KwRTPgGT1RocTedArfOWRxPbqas+85CczD8sxZtqyjbMyj0kAH6Vku
JhcvCv9IipYNND4/4aEJOu0lCdNFYUyOnU4E1Bk+Q6ImztKwSSfRrrKI/HqCX4Y9
6UwlhZTdOLrrr2e7ThtO
=CVjn
-----END PGP SIGNATURE-----

--- End Message ---
__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Reply via email to