From nobody Sat Jul 13 04:46:41 2024 X-Original-To: dev-commits-ports-all@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 4WLbXL2R3sz5PLs9; Sat, 13 Jul 2024 04:46:42 +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 4WLbXK6pfgz4jb0; Sat, 13 Jul 2024 04:46:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720846002; 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=Ccry0P5NUUH/nTwKrJ/9xriPsu1SqFtNK35DCjq9kiE=; b=g/Q6YYBToyNyzLKuH7XmkhK8PyOZJ/5EPxiD2ww6SQkY/vFT9C7pWzDuH6Sb9CHLSQ/kKY LdhfkZcpvGoZsXoLxh2+YjM9TWZlARRNL7tcj3eUbDyCrtkx4+7bdjpVmltrZw7z0owZce MBZCW6E0B9rq7AVA+shAxwe1iRgaE6ZHANpCdZNQz+dXZE2T7YO0RIjJBQz4ks5wCKsOuV 6TUu+gOf4bp56b+piubr2W/UP0lViWm2W803bsSdq+yLD2RPrJs9bUscMY3WYmL2Nfgvu3 zWRm8yexlfKhKde66fzeDVbTQegvmIDgFElt0Nrebap1iPYE2JiF5jgOcFY5Bw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720846002; a=rsa-sha256; cv=none; b=UCTK7pRZzHIkcv8loTRtPL75399mcUu0o1OyfWm5KSM2qI/C2h6+U6aoSs6hthUlSeM0Mg QYKlJ+AROMziDSem7OYJWrPMHjgGssTrLPYh8YpJJdSpoFNYTjDx1yH81pg1suoFTQa/3d xDf/KYUc9oTDz3WgViSkKjl/yUiEOShwanmSpLgBibqS5VGVBT6QhmCEc5IzAbmSbkdd3X ATs1heauFvRtk4RtaZMNV1kPvPWNk6MybzxgR7WUGQ+FJ+saH5+sUktoykUrOpMtm++bvT /R4AV8bwKUfv60OVx3OuHq66tsR2Os005iPxkCdqMv4hVLXb4lPy1u2Q/w+Rqg== 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=1720846002; 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=Ccry0P5NUUH/nTwKrJ/9xriPsu1SqFtNK35DCjq9kiE=; b=WeKfXtjr9XOicqXwMZaIvSFhyMTyRE5Qgu2FSRM2TBnEDbhcPC0DAd1csf5qpbCQMKPTFz Gz8gFH63NtiWrzVRB17hPIzPlBEW3dL3StVGcakMaiQA9mpeN5Mx6VgItSoUP6oPFBdtUg MvdpGgDgSmLojUEB0wpadN0/eOXY9mNgXe1dZzb2Z0Wp40Zm+qnqEZJ5SXPUVGERovNuTM 1hauZ7fgBbdvT7G7aITUHMIRu/1DVRSeVvt5KE/jpDhL2ltWFZwb6O7ytyjSP8MXja29VP DA6apVYascy95QZdRO2RyL9UxoxDVcoXyoVYLYQNkVSY2KNmwaNmLvIVfIaIZA== 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 4WLbXK5g3yz1C9C; Sat, 13 Jul 2024 04:46:41 +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 46D4kflR062486; Sat, 13 Jul 2024 04:46:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46D4kfar062483; Sat, 13 Jul 2024 04:46:41 GMT (envelope-from git) Date: Sat, 13 Jul 2024 04:46:41 GMT Message-Id: <202407130446.46D4kfar062483@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: 518e0275a660 - main - security/libgcrypt: Fix regression List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 518e0275a6603c913816be0f6cb4efab3ba56815 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=518e0275a6603c913816be0f6cb4efab3ba56815 commit 518e0275a6603c913816be0f6cb4efab3ba56815 Author: Daniel Engberg AuthorDate: 2024-07-13 04:35:25 +0000 Commit: Cy Schubert CommitDate: 2024-07-13 04:45:27 +0000 security/libgcrypt: Fix regression In order to harvest the best entropy jitterentropy-base.c requires that the compiler not optimize out any of its code. To ensure this the cipher and randmom makefiles remove optmization options. This will work in cases where the user has specified, for instance, CFLAGS=-O3 but will not work when CFLAGS+=-O3 is specified. These makefiles will only remove the first occurrence of the optimization flag, resulting in a build failure. This patch alters the "munging" sed command to remove all optimization options. PR: 280081 MFH: 2024Q3 --- security/libgcrypt/files/patch-cipher_Makefile.in | 11 +++++++++++ security/libgcrypt/files/patch-random_Makefile.in | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/security/libgcrypt/files/patch-cipher_Makefile.in b/security/libgcrypt/files/patch-cipher_Makefile.in new file mode 100644 index 000000000000..01f0f32e578b --- /dev/null +++ b/security/libgcrypt/files/patch-cipher_Makefile.in @@ -0,0 +1,11 @@ +--- cipher/Makefile.in.orig 2024-07-13 04:19:00 UTC ++++ cipher/Makefile.in +@@ -643,7 +643,7 @@ EXTRA_libcipher_la_SOURCES = \ + blake2s-amd64-avx.S blake2s-amd64-avx512.S + + @ENABLE_O_FLAG_MUNGING_FALSE@o_flag_munging = cat +-@ENABLE_O_FLAG_MUNGING_TRUE@o_flag_munging = sed -e 's/[[:blank:]]-O\([2-9sgz][2-9sgz]*\)/ -O1 /' -e 's/[[:blank:]]-Ofast/ -O1 /g' ++@ENABLE_O_FLAG_MUNGING_TRUE@o_flag_munging = sed -e 's/[[:blank:]]-O\([2-9sgz][2-9sgz]*\)/ -O1 /g' -e 's/[[:blank:]]-Ofast/ -O1 /g' + @ENABLE_INSTRUMENTATION_MUNGING_FALSE@instrumentation_munging = cat + + # We need to disable instrumentation for these modules as they use cc as diff --git a/security/libgcrypt/files/patch-random_Makefile.in b/security/libgcrypt/files/patch-random_Makefile.in new file mode 100644 index 000000000000..4543139606bf --- /dev/null +++ b/security/libgcrypt/files/patch-random_Makefile.in @@ -0,0 +1,11 @@ +--- random/Makefile.in.orig 2024-07-13 04:20:47 UTC ++++ random/Makefile.in +@@ -407,7 +407,7 @@ jitterentropy-base.c jitterentropy.h jitterentropy-bas + @ENABLE_O_FLAG_MUNGING_FALSE@o_flag_munging = cat + + # The rndjent module needs to be compiled without optimization. */ +-@ENABLE_O_FLAG_MUNGING_TRUE@o_flag_munging = sed -e 's/[[:blank:]]-O\([1-9sgz][1-9sgz]*\)/ -O0 /' -e 's/[[:blank:]]-Ofast/ -O0 /g' ++@ENABLE_O_FLAG_MUNGING_TRUE@o_flag_munging = sed -e 's/[[:blank:]]-O\([1-9sgz][1-9sgz]*\)/ -O0 /g' -e 's/[[:blank:]]-Ofast/ -O0 /g' + all: all-am + + .SUFFIXES: