From patchwork Wed Jul 20 00:36:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antero Mejr X-Patchwork-Id: 3800 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 07FCD27BBEA; Wed, 20 Jul 2022 01:38:36 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5732A27BBE9 for ; Wed, 20 Jul 2022 01:38:35 +0100 (BST) Received: from localhost ([::1]:45950 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oDxjW-0006z3-HC for patchwork@mira.cbaines.net; Tue, 19 Jul 2022 20:38:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59898) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oDxj0-0006yt-EH for guix-patches@gnu.org; Tue, 19 Jul 2022 20:38:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57675) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oDxj0-0006nR-5i for guix-patches@gnu.org; Tue, 19 Jul 2022 20:38:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oDxiz-0001CG-Rg for guix-patches@gnu.org; Tue, 19 Jul 2022 20:38:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56642] [PATCH v2] gnu: libphonenumber: Build reproducibly. References: <20220719152750.128283-1-antero@mailbox.org> In-Reply-To: <20220719152750.128283-1-antero@mailbox.org> Resent-From: Antero Mejr Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 20 Jul 2022 00:38:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56642 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56642@debbugs.gnu.org Cc: antero@mailbox.org, jonathan.brielmaier@web.de Received: via spool by 56642-submit@debbugs.gnu.org id=B56642.16582774454546 (code B ref 56642); Wed, 20 Jul 2022 00:38:01 +0000 Received: (at 56642) by debbugs.gnu.org; 20 Jul 2022 00:37:25 +0000 Received: from localhost ([127.0.0.1]:55434 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oDxiO-0001BG-Ct for submit@debbugs.gnu.org; Tue, 19 Jul 2022 20:37:24 -0400 Received: from mout-p-201.mailbox.org ([80.241.56.171]:41852) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oDxiH-0001Ax-8H for 56642@debbugs.gnu.org; Tue, 19 Jul 2022 20:37:22 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:b231:465::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4LncGZ5mZjz9skw; Wed, 20 Jul 2022 02:37:10 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1658277430; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=FCApcFe5Ekod8bLEmYXz2E4MhK0m0a+wj08lp7yO9no=; b=wivIkDZFdMWmyTH7h0cXvEuKk9z5pfSo1l/Die0uvMBzbExoSIqDjgFhLfrGVJ6vMckIdb mDFGjrM/5hYFdr2Lc++/KtvZmUUYmuqnGI5R+rTyrXrb15UKV4hXIz3CNajUlAVhtgk0xU /dflBjtNN4QwkMvqE5KEQyM7+dSZDbplVoVrdmmEdDawMcamKESYDCy6Hm4xzlCOMeojoW 2Qk6De5fo4dvdACbg4T+7QiuKkuIRNEGz70xwxmc9X6PA/msYycC4LFxyyBoYn363vqprn A3tgJqgVRmaFYfJB2vQ6Wm0ifZ9Z1dIxCLx6iJMXLizj6SX/6ar0qeutFKHRvg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1658277428; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=FCApcFe5Ekod8bLEmYXz2E4MhK0m0a+wj08lp7yO9no=; b=ZO7XXgJpwki6DKJxAfFCqe3hBz7cFAyCdLbu1jZTPuoYV0ZE9PF6TKq1eLg0V3AcZ/IjRo VJUDPxT9THS4Qa0ywl7hm1MkIlOXhfdB73bi6ZPxFaeKlKPzjFD8ZbnK48qqr7jXzGEpgw 8kKaCaXu9BN1ibFwNAaQdFhAfKCF6kQUI9tJBDdNaIxHj7nvHYLlIzuiA7mGzPJUarHdn5 pJVJRy0ABYJ8k7H9nw+I4TBphQxqOXy7i34RxgSOuvexDonUCTfEkcA6MfoZ1cR0/sMGwX 23e3JVZlMHGLOhF2m2CIAlJLJZA9vttlQ6yTFZ8NNSxFBsl5ljVeiGaKv8jBlA== Date: Tue, 19 Jul 2022 20:36:53 -0400 Message-Id: <20220720003653.211106-1-antero@mailbox.org> MIME-Version: 1.0 X-MBO-RS-ID: a4dbcfd8154e9151c31 X-MBO-RS-META: 9yk5if6d1eir5zcfb8rzs6cnu7uw3cx4 X-Rspamd-Queue-Id: 4LncGZ5mZjz9skw X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Antero Mejr X-ACL-Warn: , Antero Mejr via Guix-patches X-Patchwork-Original-From: Antero Mejr via Guix-patches via From: Antero Mejr X-getmail-retrieved-from-mailbox: Patches * gnu/packages/messaging.scm (libphonenumber): Add patch. * gnu/packages/patches/libphonenumber-reproducible-build.patch: New file. --- I didn't report upstream because they don't have an issue tracker and PRs require signing the Google CLA. If someone willing to sign the CLA wants to submit the patch, please go ahead. However, updating libphonenumber to 8.12.X breaks evolution-data-server. gnu/packages/messaging.scm | 3 ++- .../libphonenumber-reproducible-build.patch | 20 +++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/libphonenumber-reproducible-build.patch diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index b68a798715..c75b504ec5 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2782,6 +2782,8 @@ (define-public libphonenumber (url "https://github.com/google/libphonenumber") (commit (string-append "v" version)))) (file-name (git-file-name name version)) + (patches (search-patches + "libphonenumber-reproducible-build.patch")) (sha256 (base32 "06y3mh1d1mks6d0ynxp3980g712nkf8l5nyljpybsk326b246hg9")))) @@ -2803,7 +2805,6 @@ (define-public libphonenumber (home-page "https://github.com/google/libphonenumber") (license license:asl2.0))) - (define-public chatty (package (name "chatty") diff --git a/gnu/packages/patches/libphonenumber-reproducible-build.patch b/gnu/packages/patches/libphonenumber-reproducible-build.patch new file mode 100644 index 0000000000..6f68fe41a0 --- /dev/null +++ b/gnu/packages/patches/libphonenumber-reproducible-build.patch @@ -0,0 +1,20 @@ +diff --git a/tools/cpp/src/cpp-build/generate_geocoding_data.cc b/tools/cpp/src/cpp-build/generate_geocoding_data.cc +index 021cf5c8..5948e140 100644 +--- a/tools/cpp/src/cpp-build/generate_geocoding_data.cc ++++ b/tools/cpp/src/cpp-build/generate_geocoding_data.cc +@@ -88,6 +88,7 @@ class DirEntry { + + const std::string& name() const { return name_; } + DirEntryKinds kind() const { return kind_; } ++ bool operator<(const DirEntry& d) { return name_ < d.name(); } + + private: + std::string name_; +@@ -115,6 +116,7 @@ bool ListDirectory(const string& path, vector* entries) { + errno = 0; + entry = readdir(dir); + if (entry == NULL) { ++ std::sort(entries->begin(), entries->end()); + return errno == 0; + } + if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0) {