From nobody Wed Dec 15 18:40:09 2021 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 3088B18DAEFA; Wed, 15 Dec 2021 18:40:10 +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 4JDkZK6bf7z3QJR; Wed, 15 Dec 2021 18:40:09 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 C219B21413; Wed, 15 Dec 2021 18:40:09 +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 1BFIe9pk075509; Wed, 15 Dec 2021 18:40:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BFIe9FQ075506; Wed, 15 Dec 2021 18:40:09 GMT (envelope-from git) Date: Wed, 15 Dec 2021 18:40:09 GMT Message-Id: <202112151840.1BFIe9FQ075506@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mariusz Zaborski Subject: git: a33ecd73b409 - main - www/chromium: fix obtaining HOST_NAME_MAX 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: oshogbo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a33ecd73b409488686af2342b8d143923805a984 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639593609; 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=rKQ5lA8/wvmIjhyd4CHy7tEwEaV8e2vgtAMOJHZThKw=; b=xWhCYLSJwHs/MWPm2XMUeaKUYaEEDDKmYaFKmGGU/LIfn8JV9a69quyEUbWzNVlRVvYveq BofIBE0M1r1AcqODANjgrrkQwZ4rjhRlWmEeV3NzGtTcp7FtpTZQoRB035NDto3qn6FosI HpFDalQbyXxgrfldUqjWkXRNarPJRWG6WVJ1ZDoZHPWSL28Uggkuy1jnkoAvK33iox8tsL L7ympSjuyYIGznUocEX1bOmAYfw/SSD3pxoRwLKEGOsdSYIMYEIBrxljEGyElBGnemhP9B drwHSNy5ZTpGqtFnisF69MpOHwaGZDQ/Jv2/v98L4MrnJa8cxuzsj5fZdNtsBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639593609; a=rsa-sha256; cv=none; b=X5nXDvS23KDGT+KefRfDbZMU7fvd1CwAnsawcs7XE+gRsfk/E7no1ISEb+chlwFcIx3DXQ gdzvIPdCn37QUeCVjgzn5PHIQ0gKPIOkIRcDufFTX3OWkzBCTDCj3RWgECGfq44qByX1qk jW1tpyhk7OXEHEhXZ3EoD/ugQV2C7bvYznUPm0ni5Ol4qHNWyZoWwmXbidgMoJkIeqifVC k0DUsvOPP53SgbM6BKZBIGc5BKJzijPgPjyVQEjGE8IqfMQbjOTgZ/PE8jhlKQ5ic4VDB4 5wHfG/pQXWKNE6+Xy546CjtRLjN9u1oRqlZh+sU+pS4sO3WFHcPb4z30+mS6IQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by oshogbo (src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=a33ecd73b409488686af2342b8d143923805a984 commit a33ecd73b409488686af2342b8d143923805a984 Author: Adam Wolk AuthorDate: 2021-12-15 18:34:48 +0000 Commit: Mariusz Zaborski CommitDate: 2021-12-15 18:40:00 +0000 www/chromium: fix obtaining HOST_NAME_MAX Using sysconf(3) API lead to accidental introduction of variable length arrays (VLA) in the port. Additionally gethostname(3) has been passed _SC_HOST_NAME_MAX incorrectly as the HOST_NAME_MAX length. Fall back to using _POSIX_HOST_NAME_MAX as the remaining code is not ready for introducing sysconf(3) as a patch. Bump PORTREVISION to rebuild with the new patch. Reviewed by: bapt Sponsored by: Fudo Security Differential Revision: https://reviews.freebsd.org/D30062 --- www/chromium/Makefile | 2 +- ...onents_sync__device__info_local__device__info__util__linux.cc | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 96cb5ca75eb2..f5f6ea1f51cf 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -2,7 +2,7 @@ PORTNAME= chromium PORTVERSION= 94.0.4606.81 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ LOCAL/rene/chromium/:fonts diff --git a/www/chromium/files/patch-components_sync__device__info_local__device__info__util__linux.cc b/www/chromium/files/patch-components_sync__device__info_local__device__info__util__linux.cc index f7aa5e4cfe4d..5b28209a44f6 100644 --- a/www/chromium/files/patch-components_sync__device__info_local__device__info__util__linux.cc +++ b/www/chromium/files/patch-components_sync__device__info_local__device__info__util__linux.cc @@ -1,14 +1,13 @@ ---- components/sync_device_info/local_device_info_util_linux.cc.orig 2021-04-14 18:41:01 UTC +--- components/sync_device_info/local_device_info_util_linux.cc.orig 2021-04-27 04:07:31 UTC +++ components/sync_device_info/local_device_info_util_linux.cc -@@ -38,8 +38,9 @@ std::string GetPersonalizableDeviceNameInternal() { +@@ -38,8 +38,8 @@ std::string GetPersonalizableDeviceNameInternal() { #if BUILDFLAG(IS_CHROMEOS_ASH) return GetChromeOSDeviceNameFromType(); #else - char hostname[HOST_NAME_MAX]; - if (gethostname(hostname, HOST_NAME_MAX) == 0) // Success. -+ int len = sysconf(_SC_HOST_NAME_MAX); -+ char hostname[len]; -+ if (gethostname(hostname, _SC_HOST_NAME_MAX) == 0) // Success. ++ char hostname[_POSIX_HOST_NAME_MAX]; ++ if (gethostname(hostname, _POSIX_HOST_NAME_MAX) == 0) // Success. return hostname; return base::GetLinuxDistro(); #endif