From nobody Tue Jun 04 15:21:57 2024 X-Original-To: dev-commits-src-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 4VtvTP1jR0z5LgWx for ; Tue, 04 Jun 2024 15:22:01 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: from mail-io1-xd31.google.com (mail-io1-xd31.google.com [IPv6:2607:f8b0:4864:20::d31]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VtvTN4tyRz40Ys for ; Tue, 4 Jun 2024 15:22:00 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Authentication-Results: mx1.freebsd.org; none Received: by mail-io1-xd31.google.com with SMTP id ca18e2360f4ac-7eb3a348247so5208439f.1 for ; Tue, 04 Jun 2024 08:22:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd.org; s=google; t=1717514519; x=1718119319; darn=freebsd.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=pTSJHZVZj1ncAxsmZyI9XraOlC3l13IxljIR/fVbtBU=; b=P4yIl9RGF8XE8KozPdPzI7ETRvnjGRePhdh40YZumzXJ6HMt6Oh1P1uaSNkOCSiIx0 iMdb29/4qfwgTIZ9bGBO9SNo+w2Ui4wJvM8/CdP6c/vYrXwiFlQ6LANA12cHF49bon+I +sjy+ryuG4VxSb7D7sLLsCmHLf7IYDnH1tI0qszhY6GXhd2JwsuejpBslpYKOgNa2Iwu OwnqnM9AmmkNkUXFsxpSj17lBUEZngaQg6UAX/78M/4CnK2tOrNKeiyLSfivk9bsviEJ AqA4rPHgCp1UReASlAGZKPoE/AYXMNrXS0F+MbRn8g4opTGrm+R8lSO5tZddj9m3Qeuo 7/xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717514519; x=1718119319; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=pTSJHZVZj1ncAxsmZyI9XraOlC3l13IxljIR/fVbtBU=; b=PHmu0ieeY5qFkAY7nVn1i7j0j2Zh4Ey/hRnwilB09l6WrUrUhZMDA+d0vhTvpHHIwa b5ra45xLMrB6WA09lJPwOOTpzaILvIj0tOVN7bfLeRrlN6Rxztp5lOeMk+EzZPS2oL9C c/wJ6Yo4C5uewrzZzOJh0gDGtIy5TLYBcbCgIphfMyYMyP2gULh2c/KK7+Q97hqZrs2b +cNTeTvOwL94wgyhBPngXTaQhTpdziJgh+Oh+SVyxuFlEE2d8lwjeyEsGpu2ZV3mjtVb aClPXixE255nnNLX2f1yqdfmu2SC3C+5feJuzPc8rOohbOns6bw1yd1HrquKEIqJZgmG SSVg== X-Forwarded-Encrypted: i=1; AJvYcCVeuc4AA5ACASs3okDXr9sSYiogdR8oEkDeAntvOyG/2MUdPtfI57oDFzK0kaBkTzQmCaGxb8XAabrVBp3I6YMtD08OHFVW438hrABsHwqPag== X-Gm-Message-State: AOJu0YytN9nQJlThx1l4IODgat2H8Dc2PFteZlbzwzAYSkI8fIOEPCNH CDMdkT3jfiyy+7tGot3L3InTCE6/PmVsP3sBP1Ge/UDkkL6ZO3n2XGk98nCEjvQ= X-Google-Smtp-Source: AGHT+IGkfE8F6z07lnApwcC46lDwJtOlyq+ScvKO5xwRMtcLsUuBugi3Z//SiIo5ohsYwG8XKPzsPQ== X-Received: by 2002:a05:6602:6d11:b0:7ea:ff17:d3a5 with SMTP id ca18e2360f4ac-7eaffea28c9mr1581068439f.10.1717514519243; Tue, 04 Jun 2024 08:21:59 -0700 (PDT) Received: from mutt-hbsd ([184.99.37.29]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4b60c29db9dsm391065173.123.2024.06.04.08.21.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jun 2024 08:21:58 -0700 (PDT) Date: Tue, 4 Jun 2024 15:21:57 +0000 From: Shawn Webb To: Stefan =?utf-8?B?RcOfZXI=?= Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 41ee91c64f47 - main - newfs_msdos: fix build on non-FreeBSD systems Message-ID: X-Operating-System: FreeBSD mutt-hbsd 15.0-CURRENT-HBSD FreeBSD 15.0-CURRENT-HBSD X-PGP-Key: https://git.hardenedbsd.org/hardenedbsd/pubkeys/-/blob/master/Shawn_Webb/03A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc References: <202406040628.4546SJ98088668@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="w6kuvq3p3istedrw" Content-Disposition: inline In-Reply-To: <202406040628.4546SJ98088668@gitrepo.freebsd.org> X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4VtvTN4tyRz40Ys --w6kuvq3p3istedrw Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Jun 04, 2024 at 06:28:19AM +0000, Stefan E=DFer wrote: > The branch main has been updated by se: >=20 > URL: https://cgit.FreeBSD.org/src/commit/?id=3D41ee91c64f47faaa8131df3cd8= a63bdb60fa486a >=20 > commit 41ee91c64f47faaa8131df3cd8a63bdb60fa486a > Author: Stefan E=DFer > AuthorDate: 2024-06-04 06:26:09 +0000 > Commit: Stefan E=DFer > CommitDate: 2024-06-04 06:26:09 +0000 >=20 > newfs_msdos: fix build on non-FreeBSD systems > =20 > Disable data area alignment if the build environment does not define > PAGE_SIZE (e.g., when building on Linux or macOS). > =20 > Reported by: jrtc27 > MFC after: 1 week > --- > sbin/newfs_msdos/mkfs_msdos.c | 4 ++++ > 1 file changed, 4 insertions(+) >=20 > diff --git a/sbin/newfs_msdos/mkfs_msdos.c b/sbin/newfs_msdos/mkfs_msdos.c > index 423fbbcadcc5..1bca560a59e1 100644 > --- a/sbin/newfs_msdos/mkfs_msdos.c > +++ b/sbin/newfs_msdos/mkfs_msdos.c > @@ -571,7 +571,11 @@ mkfs_msdos(const char *fname, const char *dtype, con= st struct msdos_options *op) > if (o.align) > alignto =3D bpb.bpbSecPerClust; > else > +#ifdef PAGE_SIZE > alignto =3D PAGE_SIZE / bpb.bpbBytesPerSec; > +#else > + alignto =3D 1; > +#endif Imagine the following: 1. someone builds FreeBSD on Linux or macOS 2. that build is deployed 3. FreeBSD is rebuilt on that deployment Could the value of alignto be different on step 1 versus step 3? Thanks, --=20 Shawn Webb Cofounder / Security Engineer HardenedBSD Tor-ified Signal: +1 303-901-1600 / shawn_webb_opsec.50 https://git.hardenedbsd.org/hardenedbsd/pubkeys/-/raw/master/Shawn_Webb/03A= 4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc --w6kuvq3p3istedrw Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEA6TL67gupaZ9nzhT/y5nonf44foFAmZfMQwACgkQ/y5nonf4 4fqdVQ//a8kGQZCX9aIFfavw8Mv7/xh578+eVUGl5a9OY6Qri3QJjHyjvvfvU3Hm LFHrN/IyqNaj/K/a+R4Gqxbv+a0UhvYnHu6WYGySoYE8hZPyqkPMUwtT0HaSAbNS hC6S42iIJVV3e0hK/0JtiE+mkXl+AINhN9Aw91nVKKmKHX68kcWFjz812zGP8R5s EJnCsAi8Ja6KCV1+2EH4sL87c37ikQGdl1D594yJCEtBh0+khBXTyj171vWcBPBP fojdX7ayzUI49uUV0scbpwnFR9RT5yww7zEvarZzW858TSS448GW7BuHtoC95iwi 9YOcQK0ib64VlcxfKZY91HlF9Ef4/BvK6aV7Ce0rpHa5b5V2i1gRyI8gekRNFR4W Uv5fA6TdrLgG9CNVrur71j3jZFuu9Q1atfDdJO9BVk/2sWnFw6zmEBCRk3YkdmbG DDu7IByV4+NwLgYfGLiE2IJxY9tIcVr2hxu9jz/JXV8DCiGLQN/cVNcLAF23WYen cHAuTFSuytiadGarYwOgfOJuaIhabcgp2QkmAWeHvU4/KnCuc6hb2p3db06k2n6J 87+pgLX0jv/FV7gcUvsEvaWEG5wVBu4OkdCX/J4zSGKSqaCotyEfK1NV9lONS/mG dh5+J81nbew8w2EcJpR6yGK0tPpqOWRlwfyUGHR1CMrqJ4HoQBQ= =jkgX -----END PGP SIGNATURE----- --w6kuvq3p3istedrw--