From patchwork Fri Mar 17 20:39:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaelyn Takata X-Patchwork-Id: 48084 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 0163B16EC7; Fri, 17 Mar 2023 20:40:23 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 46DDD16EA6 for ; Fri, 17 Mar 2023 20:40:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pdGrt-000587-2M; Fri, 17 Mar 2023 16:40:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pdGrr-00057t-22 for guix-patches@gnu.org; Fri, 17 Mar 2023 16:40:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pdGrq-0002fH-P2 for guix-patches@gnu.org; Fri, 17 Mar 2023 16:40:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pdGrq-00060p-8K for guix-patches@gnu.org; Fri, 17 Mar 2023 16:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62209] [PATCH v2] gnu: glib-networking: Fix 32-bit builds. References: <1ad88ac769189d36139fbfd3ceb562fbe3a1fed5.1678902428.git.kaelyn.alexi@protonmail.com> In-Reply-To: <1ad88ac769189d36139fbfd3ceb562fbe3a1fed5.1678902428.git.kaelyn.alexi@protonmail.com> Resent-From: Kaelyn Takata Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 17 Mar 2023 20:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62209 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62209@debbugs.gnu.org Cc: Kaelyn Takata Received: via spool by 62209-submit@debbugs.gnu.org id=B62209.167908558923088 (code B ref 62209); Fri, 17 Mar 2023 20:40:02 +0000 Received: (at 62209) by debbugs.gnu.org; 17 Mar 2023 20:39:49 +0000 Received: from localhost ([127.0.0.1]:45750 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pdGrc-00060J-TI for submit@debbugs.gnu.org; Fri, 17 Mar 2023 16:39:49 -0400 Received: from mail-4316.protonmail.ch ([185.70.43.16]:13801) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pdGra-000602-T5 for 62209@debbugs.gnu.org; Fri, 17 Mar 2023 16:39:48 -0400 Date: Fri, 17 Mar 2023 20:39:22 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1679085580; x=1679344780; bh=JIWRHUAs77FQqWd1HB6U2fkuBhEWT2gdEszGn62gWlc=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=Jrvh15ucG0k8Srch820E95JPKiXYeWPAUvc257wZR1P9NeBwW8t6yLabRRBHUrNFU 7S2mgytQFdavNAA+sOOnXKMK1uPZSle0QRTu8pmCyvJwXRlLKZ9QKTE96gAHc2sAqx T4lsiASCMYV8o89x0LLOYglrePcH6u953VY5ibHDSi+LdV56885oeO/bbkH4Y6ed1G lao2CoWixX8ajF3EjHp4nmFUtrSYoubDhfP57npymOX4g2g4lhq9OzBAvX1pNUNya2 1XeLq+Vgps/ZYftU0y0p84R0Pe6vneMfy5f/a6OkVYY74v1lv6EyAyvp5EKM6cZ/fD Ps208t9DBS+Hw== Message-ID: <1ad88ac769189d36139fbfd3ceb562fbe3a1fed5.1679085527.git.kaelyn.alexi@protonmail.com> Feedback-ID: 34709329:user:proton MIME-Version: 1.0 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: , Reply-to: Kaelyn Takata X-ACL-Warn: , Kaelyn Takata via Guix-patches X-Patchwork-Original-From: Kaelyn Takata via Guix-patches via From: Kaelyn Takata Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gnome.scm (glib-networking): Remove obsolete patch. * gnu/packages/patches/glib-networking-32-bit-time.patch: Remove patch. * gnu/local: Remove it. --- gnu/local.mk | 1 - gnu/packages/gnome.scm | 11 ---- .../patches/glib-networking-32-bit-time.patch | 61 ------------------- 3 files changed, 73 deletions(-) delete mode 100644 gnu/packages/patches/glib-networking-32-bit-time.patch diff --git a/gnu/local.mk b/gnu/local.mk index 73617d3af7..ff35978f07 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1204,7 +1204,6 @@ dist_patch_DATA = \ %D%/packages/patches/ghostscript-no-header-creationdate.patch \ %D%/packages/patches/glib-appinfo-watch.patch \ %D%/packages/patches/glib-networking-gnutls-binding.patch \ - %D%/packages/patches/glib-networking-32-bit-time.patch \ %D%/packages/patches/glib-skip-failing-test.patch \ %D%/packages/patches/glibc-CVE-2019-7309.patch \ %D%/packages/patches/glibc-CVE-2019-9169.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 62b3ae72c7..ce7f3b6cec 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4911,17 +4911,6 @@ (define-public glib-networking (patches (search-patches "glib-networking-gnutls-binding.patch")))) (build-system meson-build-system) - (arguments - (if (target-64bit?) - '() - (list #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'work-around-32-bit-time-t - (lambda _ - (invoke "patch" "--force" "-p1" "-i" - #$(local-file - (search-patch - "glib-networking-32-bit-time.patch"))))))))) (native-inputs (list pkg-config gettext-minimal)) (inputs diff --git a/gnu/packages/patches/glib-networking-32-bit-time.patch b/gnu/packages/patches/glib-networking-32-bit-time.patch deleted file mode 100644 index a437310270..0000000000 --- a/gnu/packages/patches/glib-networking-32-bit-time.patch +++ /dev/null @@ -1,61 +0,0 @@ -Work around a year-2038 issue when building with a 32-bit 'time_t' -on 32-bit platforms: - - https://gitlab.gnome.org/GNOME/glib-networking/-/issues/172 - -From 4f8ca86a0e460794188c3355f0c7cc11fdbe4229 Mon Sep 17 00:00:00 2001 -From: Simon McVittie -Date: Tue, 21 Sep 2021 17:07:44 +0000 -Subject: [PATCH] tests: Accept GNUTLS' workaround for limited size of time_t - ---- - tls/tests/certificate.c | 15 +++++++++++++++ - tls/tests/meson.build | 1 + - 2 files changed, 16 insertions(+) - -diff --git a/tls/tests/certificate.c b/tls/tests/certificate.c -index c0100d30..d216c710 100644 ---- a/tls/tests/certificate.c -+++ b/tls/tests/certificate.c -@@ -672,6 +672,12 @@ test_certificate_not_valid_before (void) - g_object_unref (cert); - } - -+/* On 32-bit, GNUTLS caps expiry times at 2037-12-31 23:23:23 to avoid -+ * overflowing time_t. Hopefully by 2037, either 32-bit will finally have -+ * died out, or GNUTLS will rethink its approach to -+ * https://gitlab.com/gnutls/gnutls/-/issues/370 */ -+#define GNUTLS_32_BIT_NOT_VALID_AFTER_MAX 2145914603 -+ - static void - test_certificate_not_valid_after (void) - { -@@ -686,7 +692,16 @@ test_certificate_not_valid_after (void) - actual = g_tls_certificate_get_not_valid_after (cert); - g_assert_nonnull (actual); - actual_str = g_date_time_format_iso8601 (actual); -+ -+#if SIZEOF_TIME_T <= 4 -+ if (g_date_time_to_unix (actual) == GNUTLS_32_BIT_NOT_VALID_AFTER_MAX) -+ g_test_incomplete ("not-valid-after date not representable on 32-bit"); -+ else -+ g_assert_cmpstr (actual_str, ==, EXPECTED_NOT_VALID_AFTER); -+#else - g_assert_cmpstr (actual_str, ==, EXPECTED_NOT_VALID_AFTER); -+#endif -+ - g_free (actual_str); - g_date_time_unref (actual); - g_object_unref (cert); -diff --git a/tls/tests/meson.build b/tls/tests/meson.build -index e9c7d8c6..7415f913 100644 ---- a/tls/tests/meson.build -+++ b/tls/tests/meson.build -@@ -69,6 +69,7 @@ foreach backend: backends - test_cflags = cflags + [ - '-DBACKEND="@0@"'.format(backend), - '-DBACKEND_IS_' + backend.to_upper(), -+ '-DSIZEOF_TIME_T=@0@'.format(cc.sizeof('time_t', prefix: '#include ')), - ] - - if backend == 'openssl' base-commit: 37399b18ef70f2b32c50ea45b3bfa649bbf58f16