From nobody Sat Jul 13 12:21:08 2024 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 4WLncm17bTz5Qgln; Sat, 13 Jul 2024 12:21:12 +0000 (UTC) (envelope-from cy@freebsd.org) Received: from omta001.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WLncl2gFNz4HHx; Sat, 13 Jul 2024 12:21:11 +0000 (UTC) (envelope-from cy@freebsd.org) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4003a.ext.cloudfilter.net ([10.228.9.183]) by cmsmtp with ESMTPS id SbdLsRtn7kYKFSbkUsV1no; Sat, 13 Jul 2024 12:21:10 +0000 Received: from spqr.komquats.com ([70.66.152.170]) by cmsmtp with ESMTPSA id SbkSsUQHpE0IVSbkTsLs68; Sat, 13 Jul 2024 12:21:10 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=cI9DsUeN c=1 sm=1 tr=0 ts=66927136 a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=4kmOji7k6h8A:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=sJ1I_z0gd5G3i_KhaGgA:9 a=QEXdDO2ut3YA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 6AC59402; Sat, 13 Jul 2024 05:21:08 -0700 (PDT) Received: from slippy (localhost [IPv6:::1]) by slippy.cwsent.com (Postfix) with ESMTP id 55B361DE; Sat, 13 Jul 2024 05:21:08 -0700 (PDT) Date: Sat, 13 Jul 2024 05:21:08 -0700 From: Cy Schubert To: Vladimir Druzenko Cc: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: Re: git: 518e0275a660 - main - security/libgcrypt: Fix regression Message-ID: <20240713052108.2544bea5@slippy> In-Reply-To: <6cd5eb37-e41c-4e3f-bca9-7a3d16acc784@freebsd.org> References: <202407130446.46D4kfar062483@gitrepo.freebsd.org> <6cd5eb37-e41c-4e3f-bca9-7a3d16acc784@freebsd.org> Organization: KOMQUATS X-Mailer: Claws Mail 3.20.0 (GTK+ 2.24.33; amd64-portbld-freebsd15.0) 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: quoted-printable X-CMAE-Envelope: MS4xfNUmYDqMLW0P+omJlm+XMjXj8SlYlCYIAiwYOJP1Ed8Cg/L0WLf5OA75Cy+yf2isro0imHqhR2bsTNseH2sLm3zNCFw10ZAghBb0P2IsY9BC8gQFtzcw Wd1WbtyogN4zWnTa6Sl7gK66EukH2ZUEk0by+GFp3j5Bgu7YZc37/RXL76CY9Vv9VNWRrlgKI5c0Se2nJmfHDHbbVmpYHk7seP+upGfRt0JAsw+DqpxvlBqb Cd5AnTc3TT2015KPWnTY8oeiNnNa3e1HdRBSWXNQltrnhHvXMX1//+r49snho2wZcJFhsI4OYd3LkEJwDgK525cFSV4ITzZazwlkW8VDzaE= 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:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Queue-Id: 4WLncl2gFNz4HHx On Sat, 13 Jul 2024 14:58:24 +0300 Vladimir Druzenko wrote: > 13.07.2024 07:46, Cy Schubert =D0=BF=D0=B8=D1=88=D0=B5=D1=82: > > The branch main has been updated by cy: > > > > URL: https://cgit.FreeBSD.org/ports/commit/?id=3D518e0275a6603c913816be= 0f6cb4efab3ba56815 > > > > 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 > > =20 > > 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=3D-O3 but will not work when CFLAGS+=3D-O3 is specified. Th= ese > > 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. > > =20 > > 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/securi= ty/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 =3D \ > > + blake2s-amd64-avx.S blake2s-amd64-avx512.S > > + > > + @ENABLE_O_FLAG_MUNGING_FALSE@o_flag_munging =3D cat > > +-@ENABLE_O_FLAG_MUNGING_TRUE@o_flag_munging =3D sed -e 's/[[:blank:]]-= O\([2-9sgz][2-9sgz]*\)/ -O1 /' -e 's/[[:blank:]]-Ofast/ -O1 /g' > > ++@ENABLE_O_FLAG_MUNGING_TRUE@o_flag_munging =3D sed -e 's/[[:blank:]]-= O\([2-9sgz][2-9sgz]*\)/ -O1 /g' -e 's/[[:blank:]]-Ofast/ -O1 /g' > > + @ENABLE_INSTRUMENTATION_MUNGING_FALSE@instrumentation_munging =3D 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/securi= ty/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 =3D cat > > + > > + # The rndjent module needs to be compiled without optimization. */ > > +-@ENABLE_O_FLAG_MUNGING_TRUE@o_flag_munging =3D sed -e 's/[[:blank:]]-= O\([1-9sgz][1-9sgz]*\)/ -O0 /' -e 's/[[:blank:]]-Ofast/ -O0 /g' > > ++@ENABLE_O_FLAG_MUNGING_TRUE@o_flag_munging =3D sed -e 's/[[:blank:]]-= O\([1-9sgz][1-9sgz]*\)/ -O0 /g' -e 's/[[:blank:]]-Ofast/ -O0 /g' > > + all: all-am > > + > > + .SUFFIXES: =20 >=20 > Maybe a bump is needed? >=20 This only affects builds with CFLAGS+=3D-O3 in make.conf. Those without CFLAGS+=3D-O3 (+=3D as opposed to =3D) or no CFLAGS whatsoever in make.conf, the package will not build differently and the binaries will be the same as before. So, no. --=20 Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=3D0