From nobody Mon Feb 13 01:20:31 2023 X-Original-To: dev-commits-src-branches@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 4PFRNb6WVnz3ptq0; Mon, 13 Feb 2023 01:20:31 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PFRNb5ykLz3hqw; Mon, 13 Feb 2023 01:20:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676251231; 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=A9WmiFF9Nnb5HY3GtjVcHObxYytbeBqDeyEi48IUHSE=; b=YPgWtZj/wVssymFlQsLFEglp2dYv4ndd/OpHBT2B6dkz6nse1ZToT482Exn0/c3DOGU0GE Upswt0hC6lGf0X0jK8HdL7FmzmoLQNyn9yysgF1YoZBp9tFUHvySaah8SMcfW0xzXGZy0j dSrzHLuZFfy+QMJNla2QBiSCgeOQIXBY1bTEXCKScqNttfjTb/9R9M2XqGlUhW4tP81Qz5 78R47ZDDKv9BfFwotdBtgXmxaF5zPW97J7R73OaPm1M642bhMTQnzoXggrm9MmcjtATel+ z+hDVSR6cXD/wD5Zre1pKKW33ZUTCEEf/2phwzlUx+ncmU0i6+bb8ehACMJxOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676251231; 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=A9WmiFF9Nnb5HY3GtjVcHObxYytbeBqDeyEi48IUHSE=; b=ro4BpMUIyWkY/ik/AwebQQFQFhih11W66Du3/zoF09EQ8pCL0Hl986/tZCrlurCueVnH9d pxGXzUCLjmkcgZsfTTyQAMSV8SndSVli6QQiGRFvXYeL+OAGyBPlMtn2g7fOkty9QNjPsX uUf0doTdkfDovb/fYjtX4tUbzn+gDOChUcclL4xZ3p1b3TAzpbE4EZzp++881N0/5g2k+U n3IVifGVhgvaQpm+RKDL+sPMnEcKTq1am438l8Y732YIwwAFTf3pNZZCTbE9do819VYKO5 IdBc2fqfJKjQG0SZV8C7pTxzq5B2alt3RGNeqJ9u1g/B/kVyynq2bZHk4TKwhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676251231; a=rsa-sha256; cv=none; b=GEjVc5t2Qk/JoFMLWtZvFVUk/32VMF8Kh6Lv77ABA2C4ZUAt4FAfpniiOWBHQo3UC6681r YWVkb+yBhYUfOkEvd01FJXQTiehvO7mZc+hYwa8DD8R1sfwWg+jKmp3G/NLmbMHroiK7vb jv6MtPYC3Hr3AMfO6rlZRJ7YsPavY9aKyXx8E8ktDNMjssG1U0ZVQjcdKpY4DlldRpWMHX biOaRALmNGCqFZ/J4VbIYuEjWMdmPINCQDYDz4apOrES35/oidNqdvAAvN2fReDHJkBD7C e0Pmw31sztq7o2Obywy0ORnZG5RgnDY8vYMQDZhUgSOVwGNkVoc3y5Fk6FR99w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PFRNb529czyg3; Mon, 13 Feb 2023 01:20:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31D1KVHY062948; Mon, 13 Feb 2023 01:20:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31D1KVsq062947; Mon, 13 Feb 2023 01:20:31 GMT (envelope-from git) Date: Mon, 13 Feb 2023 01:20:31 GMT Message-Id: <202302130120.31D1KVsq062947@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: d795444930d1 - stable/12 - ssh: fix SIZEOF_TIME_T #define on i386 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: d795444930d17ae2a5c3e44ba0b8f4eb4404118f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d795444930d17ae2a5c3e44ba0b8f4eb4404118f commit d795444930d17ae2a5c3e44ba0b8f4eb4404118f Author: Ed Maste AuthorDate: 2023-02-08 18:31:44 +0000 Commit: Ed Maste CommitDate: 2023-02-13 01:20:24 +0000 ssh: fix SIZEOF_TIME_T #define on i386 Reported by: imp Reviewed by: imp MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D38443 (cherry picked from commit 1aa9a35f6361cc898e2323e1f2823771eb4161da) (cherry picked from commit 59ab4b95129dd5d64a52e0822b4fb5621bf65e9c) --- crypto/openssh/config.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/crypto/openssh/config.h b/crypto/openssh/config.h index 55ad3be64e69..e267ba122719 100644 --- a/crypto/openssh/config.h +++ b/crypto/openssh/config.h @@ -1941,7 +1941,11 @@ #define SIZEOF_SHORT_INT 2 /* The size of `time_t', as computed by sizeof. */ +#ifdef __i386__ +#define SIZEOF_TIME_T 4 +#else #define SIZEOF_TIME_T 8 +#endif /* Define as const if snprintf() can declare const char *fmt */ #define SNPRINTF_CONST const