Created attachment 251616 [details] Patch for libgcrypt * Add USES= pathfix * Remove USE_CSTD (needed?) * Minor rearragement of Makefile for better readability Compile and runtime tested on FreeBSD 14.0-RELEASE (amd64) (make, make check-plist, make test) Mini-exp run on 13.2 (amd64) with libgpg-error 1.50 looks fine (dependency list grabbed from https://www.freshports.org/security/libgcrypt/) https://pdr2.bofh.network/build.html?mastername=132-diizzy&build=libgpg-gcrypt
Looks like this is doing more than an update but also some cleanup. Can you separate those up into two commits, please?
Created attachment 251789 [details] Update
Created attachment 251790 [details] Makefile Makefile adjustments
Can this be broken up into three separate commits, please? Or better yet, I'll do the commits. I'm AFK this week and will try to either do them Tuesday (my time) or next week.
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=013f956ddb6837deb4948d1ab474183c371677b9 commit 013f956ddb6837deb4948d1ab474183c371677b9 Author: Cy Schubert <cy@FreeBSD.org> AuthorDate: 2024-07-01 03:27:46 +0000 Commit: Cy Schubert <cy@FreeBSD.org> CommitDate: 2024-07-01 03:27:46 +0000 security/libgcrypt: Improve legibility PR: 279904 Submitted by: dizzy (part of a larger patch) security/libgcrypt/Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=0f1758093444df122a9ec355f077bb6c99f9cde9 commit 0f1758093444df122a9ec355f077bb6c99f9cde9 Author: Cy Schubert <cy@FreeBSD.org> AuthorDate: 2024-07-01 03:13:03 +0000 Commit: Cy Schubert <cy@FreeBSD.org> CommitDate: 2024-07-01 03:13:03 +0000 security/libgcrypt: Update to 1.11.0 PR: 279904 Submitted by: dizzy (first part of a larger patch) security/libgcrypt/Makefile | 3 +-- security/libgcrypt/distinfo | 6 +++--- security/libgcrypt/pkg-plist | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-)
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=be69018e3841fad2d6001b8a4c878676253550af commit be69018e3841fad2d6001b8a4c878676253550af Author: Cy Schubert <cy@FreeBSD.org> AuthorDate: 2024-07-01 03:24:16 +0000 Commit: Cy Schubert <cy@FreeBSD.org> CommitDate: 2024-07-01 03:24:16 +0000 security/libgcrypt: Remove redundant USE_CSTD USE=CSTD=gnu89 has not been needed for a while. Let's remove it. PR: 279904 Submitted by: dizzy (part of a larger patch) security/libgcrypt/Makefile | 1 - 1 file changed, 1 deletion(-)
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=c49e178f6ec54f504d1831d7320299f91d16d0d8 commit c49e178f6ec54f504d1831d7320299f91d16d0d8 Author: Cy Schubert <cy@FreeBSD.org> AuthorDate: 2024-07-01 03:30:44 +0000 Commit: Cy Schubert <cy@FreeBSD.org> CommitDate: 2024-07-01 03:30:44 +0000 security/libgcrypt: Remove GNU_CONFIGURE_MANPREFIX Now that manprefix has been moved we no longer need GNU_CONFIGURE_MANPREFIX. Remove it. PR: 279904 Submitted by: dizzy (part of a larger patch) security/libgcrypt/Makefile | 1 - 1 file changed, 1 deletion(-)
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=4ea1376d3c7b9dd5d9a3e189b0e1869bb33ca5b6 commit 4ea1376d3c7b9dd5d9a3e189b0e1869bb33ca5b6 Author: Cy Schubert <cy@FreeBSD.org> AuthorDate: 2024-07-01 03:17:45 +0000 Commit: Cy Schubert <cy@FreeBSD.org> CommitDate: 2024-07-01 03:17:45 +0000 security/libgcrypt: Use pathfix Lookup WRKSRC and fix common path. (NOOP for this port.) PR: 279904 Submitted by: dizzy (part of a larger patch) security/libgcrypt/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Sorry for being so fastidious. My src mentor back in the day drilled this into me and I've brought this attention to detail from src to my ports.
# make showconfig ===> The following configuration options are available for libgcrypt-1.11.0: DOCS=off: Build and/or install documentation INFO=off: Build and/or install GNU info pages STATIC=on: Build static executables and/or libraries ===> Use 'make config' to modify these settings --- random.lo --- libtool: compile: cc -DHAVE_CONFIG_H -I. -I.. -I../src -I../src -I/usr/local/include -O2 -pipe -O3 -pipe -funroll-loops -mretpoline -fno-delete-null-pointer-checks -fstack-protector-strong -fno-strict-aliasing -fdebug-prefix-map=/tmp/ports/usr/ports/security/libgcrypt/work/libgcrypt-1.11.0=. -fvisibility=hidden -fno-delete-null-pointer-checks -Wall -MT random.lo -MD -MP -MF .deps/random.Tpo -c random.c -o random.o >/dev/null 2>&1 --- rndjent.lo --- In file included from ./rndjent.c:99: ./jitterentropy-base.c:58:3: error: "The CPU Jitter random number generator must not be compiled with optimizations. See documentation. Use the compiler switch -O0 for compiling jitterentropy.c." 58 | #error "The CPU Jitter random number generator must not be compiled with optimizations. See documentation. Use the compiler switch -O0 for compiling jitterentropy.c." | ^ --- rndgetentropy.lo --- mv -f .deps/rndgetentropy.Tpo .deps/rndgetentropy.Plo --- random-csprng.lo --- mv -f .deps/random-csprng.Tpo .deps/random-csprng.Plo --- random-system.lo --- mv -f .deps/random-system.Tpo .deps/random-system.Plo --- rndhw.lo --- mv -f .deps/rndhw.Tpo .deps/rndhw.Plo --- random-drbg.lo --- mv -f .deps/random-drbg.Tpo .deps/random-drbg.Plo --- rndjent.lo --- 1 error generated. *** [rndjent.lo] Error code 1 make[2]: stopped in /tmp/ports/usr/ports/security/libgcrypt/work/libgcrypt-1.11.0/random --- random.lo --- mv -f .deps/random.Tpo .deps/random.Plo 1 error make[2]: stopped in /tmp/ports/usr/ports/security/libgcrypt/work/libgcrypt-1.11.0/random
(In reply to Ivan Rozhuk from comment #11) Please open a new PR for this.