From nobody Fri May 1 18:53:58 2026 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g6gDl2DRZz6c3t7 for ; Fri, 01 May 2026 18:53:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g6gDk5nDCz3Pj5 for ; Fri, 01 May 2026 18:53:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777661638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vH5ReONRPCZX8XyipB9vLd2mx+mpMUy5WSz8o8Z9Mto=; b=eCVLqNa6LqPReCoVN/9eUh8wE2zi+PPEdKOMvWejEhQAw119dcTZ+/iWGVYmiiUIJ5aLiC LqcRfNXvQ+RxDMv1XaoRoMx7nVZG3mhhSmBF0Y+vaLTpEusVQNL+b3WF/+IOZclPiz9Wds r1XyaDe53zn5/0hVS4z3MHmsmgvQdhWbCJAYkTyl6S2NkfNUeXM3QTZVVdSsPd7iX7UAZ9 IWosyyru0nQpIllyrzxV7hXbyHMZj8OhFAslORxsrYx5f8ixCDgiC89Aie4sHYsaJRT2+W hGOkz5JNErDi4ZPrMi5PHySUc4BB8gYQ8ANCd6Btt9Or6rnc+yi52Ez8X9kgCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777661638; a=rsa-sha256; cv=none; b=GWxq5SUoUq2VrQZfTwpBzVUawexlQYNkvlcG+4I/UlLkoc6TYKx5WTUdLvZp7K5HUMxgR1 /2rmKmWOvIpu1uutft4mFs1N5oxsduaRjNreMazJajwbAhi1fcEEqMkID9Dlws3KrPSLsY J8C9pmbkBm6GdxO5DfnR4MlIJjx5i1UwSL79MB6x0SI6kWB7cLMqQNfSyF0klJ9j4h6uWt th7MBRKE3j4LODSgLJBjhDQwkOyrm2V5oulkkCM0ejbpGyo4q9UiUMLrzsl6IcJYpSQsLE BB3l6/GjsCq1WmQ66YifrmkemfPD63Q0gZDvfyWquftML3D0Alj1k6+rke+iOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777661638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vH5ReONRPCZX8XyipB9vLd2mx+mpMUy5WSz8o8Z9Mto=; b=RZaLGJsJmSzX2Lu4JZO0ogztUCxvbkatIj8Eu1CYBFTZfW+zIo/xfMMm0I0O8nQdIwCksx wL1WAF8s4GCk4QwiNVV6mbc0cuipjrBZtbOIGlczNpYSI5xvlDOF4D8gkXh790Fx69bdwo xnHF5qBApiiMI1kwntB0PWu6ye1gff/G8RVC2FPmEmZ3fu7KItxmF1PqdCQ+DFVvWwTSmc 7r6Zl/eHC5jr0t9qhxfxo7j4PlqJ9us2vFHMmyZdKIzMLDp7je218uNMDNgG+wgBnwz9W5 aauYCUa1ilZdW5T9Q3zPJD2xKU+EC8q5zPGf1ZK6ZcEIN8JjtavQnvwLJyB/hQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g6gDk5FFmz19kC for ; Fri, 01 May 2026 18:53:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a223 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 01 May 2026 18:53:58 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 978896a191d7 - main - devel/cvs-devel: fix build on armv7 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 978896a191d705a495efbaf98f3d8e1e47b68ef8 Auto-Submitted: auto-generated Date: Fri, 01 May 2026 18:53:58 +0000 Message-Id: <69f4f6c6.3a223.2e072df1@gitrepo.freebsd.org> The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=978896a191d705a495efbaf98f3d8e1e47b68ef8 commit 978896a191d705a495efbaf98f3d8e1e47b68ef8 Author: Robert Clausecker AuthorDate: 2026-05-01 11:14:35 +0000 Commit: Robert Clausecker CommitDate: 2026-05-01 18:53:46 +0000 devel/cvs-devel: fix build on armv7 Same issue as was previously fixed in 36fcf661b for devel/blame. A 64 bit time_t with a 32 bit long confuses the gnulib mktime.c implementation. Apply the same upstream patch to fix the build. Obtained from: 36fcf661ba23c96004395f6ee52cf2e6133b31f0 MFH: 2026Q2 Approved by: portmgr (build fix blanket) --- devel/cvs-devel/files/patch-lib_mktime.c | 77 ++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/devel/cvs-devel/files/patch-lib_mktime.c b/devel/cvs-devel/files/patch-lib_mktime.c new file mode 100644 index 000000000000..48c7148461eb --- /dev/null +++ b/devel/cvs-devel/files/patch-lib_mktime.c @@ -0,0 +1,77 @@ +From: Paul Eggert +Date: Fri, 28 Jan 2011 21:02:31 -0800 +Subject: [PATCH] mktime: avoid problems on NetBSD 5 / i386 + +* lib/mktime.c (long_int): New type. This works around a problem +on NetBSD 5 / i386, where 'long int' and 'int' are both 32 bits +but time_t is 64 bits, and where I expect the existing code is +wrong in some cases. +(leapyear, ydhms_diff, guess_time_tm, __mktime_internal): Use it. +(ydhms_diff): Bring back the compile-time check for wide-enough +year and yday. + +--- lib/mktime.c.orig 2006-11-18 10:07:43 UTC ++++ lib/mktime.c +@@ -115,9 +115,15 @@ verify (twos_complement_arithmetic, TYPE_TWOS_COMPLEME + #define TM_YEAR_BASE 1900 + verify (base_year_is_a_multiple_of_100, TM_YEAR_BASE % 100 == 0); + ++#if INT_MAX <= LONG_MAX / 2 ++typedef long int long_int; ++#else ++typedef long long int long_int; ++#endif ++ + /* Return 1 if YEAR + TM_YEAR_BASE is a leap year. */ + static inline int +-leapyear (long int year) ++leapyear (long_int year) + { + /* Don't add YEAR to TM_YEAR_BASE, as that might overflow. + Also, work even if YEAR is negative. */ +@@ -163,12 +169,12 @@ const unsigned short int __mon_yday[2][13] = + detect overflow. */ + + static inline time_t +-ydhms_diff (long int year1, long int yday1, int hour1, int min1, int sec1, ++ydhms_diff (long_int year1, long_int yday1, int hour1, int min1, int sec1, + int year0, int yday0, int hour0, int min0, int sec0) + { + verify (C99_integer_division, -1 / 2 == 0); + verify (long_int_year_and_yday_are_wide_enough, +- INT_MAX <= LONG_MAX / 2 || TIME_T_MAX <= UINT_MAX); ++ INT_MAX == INT_MAX * (long_int) 2 / 2); + + /* Compute intervening leap days correctly even if year is negative. + Take care to avoid integer overflow here. */ +@@ -199,7 +205,7 @@ ydhms_diff (long int year1, long int yday1, int hour1, + If overflow occurs, yield the minimal or maximal value, except do not + yield a value equal to *T. */ + static time_t +-guess_time_tm (long int year, long int yday, int hour, int min, int sec, ++guess_time_tm (long_int year, long_int yday, int hour, int min, int sec, + const time_t *t, const struct tm *tp) + { + if (tp) +@@ -301,8 +307,8 @@ __mktime_internal (struct tm *tp, + int mon_remainder = mon % 12; + int negative_mon_remainder = mon_remainder < 0; + int mon_years = mon / 12 - negative_mon_remainder; +- long int lyear_requested = year_requested; +- long int year = lyear_requested + mon_years; ++ long_int lyear_requested = year_requested; ++ long_int year = lyear_requested + mon_years; + + /* The other values need not be in range: + the remaining code handles minor overflows correctly, +@@ -314,8 +320,8 @@ __mktime_internal (struct tm *tp, + int mon_yday = ((__mon_yday[leapyear (year)] + [mon_remainder + 12 * negative_mon_remainder]) + - 1); +- long int lmday = mday; +- long int yday = mon_yday + lmday; ++ long_int lmday = mday; ++ long_int yday = mon_yday + lmday; + + time_t guessed_offset = *offset; +