From nobody Sun Feb 9 03:41:27 2025 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 4YrD5h13k4z5nfb3; Sun, 09 Feb 2025 03:41:28 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YrD5h0JLNz3Zrv; Sun, 09 Feb 2025 03:41:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739072488; 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=xRNsCIOBl7BPPbKKd6XL720MH3p8q5ypa3Cxj+mEI2I=; b=N/4mxrLQClG01VZHkP2WIsGgfY0BCWl39wt3njwVQlFeBc5ZAtCltN4rlLVzo9klUHKdii zrfnVxIqpbBKr+HqHK3/IXpK2woCKjfAnva094hTFM4Q71bTTev/5Kh3efVv69+qnfAZT0 72idJYoT0IenATzIf9b2Mn4RCniN9PmVdd0AeByJ5b8cgjQhJT6t2cLXSlPgcbQTlHuHQ1 Td3Snbq3R3P8gZUpidWo41y0ovC0mh3t72AuICdrCkpNU7szMvawJiCrSyLpLbFTB03YU2 AgctHPOjapwoAvUCukC7r71i0ldklzj1NhR1CbkPZL+yoOmC24XyDSRxUaqcQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739072488; 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=xRNsCIOBl7BPPbKKd6XL720MH3p8q5ypa3Cxj+mEI2I=; b=Un+lu5D3d5ZBr/e/Mw2wHmk5YkY0U7giUfpAfChHKrVc1aRNiBHCaTWBY8hUmvHAQsTbqt 7ZTwKutNKrY+F7ADjBZmonqgy0uH6x9qPCub0jOsnVJzpIq4yxHvCyDW9YW7w4wJYcTpOQ JfZNnzV3LfDmBaBVwahLnXia17yC6TRHkeoMqvXQePBsAeUpqnBWCuUYL/7tMdZtNJpke5 mu99WTbIm1AM5EPENCqpPQ/w635/N7dcIeC2s8U+RfNChIU4n3PXt+xlg8kSk+DEcKz7S1 AR91Ewa5Oa+78CwKuc/0VbNecVPhF+feoq0GihatM7HLQFOVOpo64kEXCHZ7tg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739072488; a=rsa-sha256; cv=none; b=GjQ5i09toEB4ECr70JuSi9Pe6NpmL9slWe6TaF2it34mF8fZpuPUbLB7khSnLzn7H7Izxm qS5LKEkKg7Di1nNXbpgyhsWpblwa0OmNfesHGQ38CX+iv3npJln57Mk0dfpmM3LbmjCpQQ uvcRc5+CZTH+wxvCMzW7/ZDh5LJPpp2pjA8Wdd8O/ratz8a4obm+5QIWcwISGotAzgSoHE 0cBjyXhYEriHCpUBOJsQMGhuEI9IRXnbxM022kpiZ0kxY2EUvyrmtJWMteHH2FlPLmh93J Eb8+o0GO1P3JKS7r3s9ltVG9/xBGdMgzusA40+m551JVZMz2hh9nu+U93O9ToA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YrD5g70wFzgsX; Sun, 09 Feb 2025 03:41:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5193fRWq071463; Sun, 9 Feb 2025 03:41:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5193fRKa071460; Sun, 9 Feb 2025 03:41:27 GMT (envelope-from git) Date: Sun, 9 Feb 2025 03:41:27 GMT Message-Id: <202502090341.5193fRKa071460@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 891000e056fa - main - sysutils/grub2-efi: the port had been improved (+) 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: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 891000e056fa707781d605bf47af2f31262cdbd3 Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=891000e056fa707781d605bf47af2f31262cdbd3 commit 891000e056fa707781d605bf47af2f31262cdbd3 Author: Alexey Dokuchaev AuthorDate: 2025-02-09 03:40:06 +0000 Commit: Alexey Dokuchaev CommitDate: 2025-02-09 03:40:06 +0000 sysutils/grub2-efi: the port had been improved (+) - Revert previous naive -fpermissive "fix" and #include to obtain the grub_env_set() prototype - Replace RUN_DEPENDS manipulation with USE_GCC=yes:build and hand-rolled `do-install' target with INSTALL_WRKSRC - While here, adjust LICENSE and wrap overly long lines Fixes: 9bc25ee236c4 PR: 284483 --- sysutils/grub2-efi/Makefile | 21 ++++++++------------- .../grub2-efi/files/patch-grub-core_disk_geli.c | 16 ++++++++++++---- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/sysutils/grub2-efi/Makefile b/sysutils/grub2-efi/Makefile index 6adabb040567..3f15a3329f5c 100644 --- a/sysutils/grub2-efi/Makefile +++ b/sysutils/grub2-efi/Makefile @@ -9,7 +9,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Multiboot EFI boot loader WWW= https://www.gnu.org/software/grub/ -LICENSE= GPLv3 +LICENSE= GPLv3+ RUN_DEPENDS= ${LOCALBASE}/bin/mformat:filesystems/mtools \ ${LOCALBASE}/bin/grub-mkrescue:sysutils/grub2-pcbsd @@ -21,20 +21,19 @@ ONLY_FOR_ARCHS= amd64 USES= autoreconf:build bison cpe gettext gmake python tar:xz WRKSRC= ${WRKDIR}/grub-${PORTVERSION} +INSTALL_WRKSRC= ${WRKSRC}/grub-core SSP_UNSAFE= yes -USE_GCC= yes +USE_GCC= yes:build GNU_CONFIGURE= yes MAKE_JOBS_UNSAFE= yes CPE_PRODUCT= grub CPE_VENDOR= gnu -CONFIGURE_ARGS= --with-platform=efi --disable-werror --localedir=${PREFIX}/share/locale +CONFIGURE_ARGS= --with-platform=efi --disable-werror \ + --localedir=${PREFIX}/share/locale CONFIGURE_ENV= CPP="${CC} -E" \ LEX=${LOCALBASE}/bin/flex -CFLAGS+= -fpermissive - -.include post-patch: @${LN} -s ${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf ${WRKSRC} @@ -45,11 +44,7 @@ pre-configure: cd ${WRKSRC} && ./autogen.sh post-configure: - @${LN} -sfh /usr/include/machine /usr/include/sys /usr/include/x86 ${WRKSRC}/grub-core - -do-install: - @cd ${WRKSRC}/grub-core && ${GMAKE} install DESTDIR=${STAGEDIR} - -RUN_DEPENDS:= ${RUN_DEPENDS:Ngcc*} + @${LN} -sfh /usr/include/machine /usr/include/sys /usr/include/x86 \ + ${WRKSRC}/grub-core -.include +.include diff --git a/sysutils/grub2-efi/files/patch-grub-core_disk_geli.c b/sysutils/grub2-efi/files/patch-grub-core_disk_geli.c index f8d1f9bed333..318610292ea0 100644 --- a/sysutils/grub2-efi/files/patch-grub-core_disk_geli.c +++ b/sysutils/grub2-efi/files/patch-grub-core_disk_geli.c @@ -1,12 +1,20 @@ --- grub-core/disk/geli.c.orig 2015-01-30 16:34:55 UTC +++ grub-core/disk/geli.c -@@ -445,6 +445,9 @@ recover_key (grub_disk_t source, grub_cr +@@ -50,6 +50,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -444,6 +445,9 @@ recover_key (grub_disk_t source, grub_cryptodisk_t dev + grub_free (tmp); if (!grub_password_get (passphrase, MAX_PASSPHRASE)) return grub_error (GRUB_ERR_BAD_ARGUMENT, "Passphrase not supplied"); - ++ + /* Set the GELI passphrase to GRUB env, for passing to FreeBSD kernel */ + grub_env_set ("gelipassphrase", passphrase); -+ + /* Calculate the PBKDF2 of the user supplied passphrase. */ if (grub_le_to_cpu32 (header.niter) != 0) - {