From nobody Mon Sep 30 18:57:24 2024 X-Original-To: dev-commits-src-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 4XHVhL6PBlz5XW0V; Mon, 30 Sep 2024 18:58:10 +0000 (UTC) (envelope-from herbert@gojira.at) Received: from mail.bsd4all.net (mail.bsd4all.net [94.130.200.20]) (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 ECDSA (P-384) client-digest SHA384) (Client CN "mail.bsd4all.net", Issuer "E5" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHVhL43rgz40W4; Mon, 30 Sep 2024 18:58:10 +0000 (UTC) (envelope-from herbert@gojira.at) Authentication-Results: mx1.freebsd.org; none Date: Mon, 30 Sep 2024 20:57:24 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=gojira.at; s=mail202005; t=1727722683; bh=h1vmoDHvBUVzHzb6Y8U0mMSsR69ye8WZ9xjzQbtXy+M=; h=Date:Message-ID:From:To:Cc:Subject:MIME-Version:Content-Type; b=dNHSAHN3Nm8nxzHP+9Y3lSsunokQZRX6sUKQLvEm5KKFX/d+afo52t43oMRzZ6Xrc bPJK2sQiIQSB4/U/9EARmqx9+ZYEzYZCHORefdfQRrD/xwM1BCARKpHz7DLYTvLZw6 tTYl+K1fsD1cOxih8kCbb3NoEzi3C9guXCqLlg//+Jc95EZnUXcBfu6jhprA2NGa1D I9VgUAxqyo3FjRGEZMS+HRafjYK8ccE4dsIxL5+tncXbcOyj6A0gzMsPd3DJ0xnYcK /HUhWA4ocNvZAnx6JUXxBUgjR7J3I0WQCL+HhYAntJoSaapygvfX4dKlKsoYFm5D5d ebWWa+Oj3nyRQ== Message-ID: <87wmit2cmj.wl-herbert@gojira.at> From: "Herbert J. Skuhra" To: Kyle Evans Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: e7a629c851d7 - main - libmd, kern, stand: consolidate md5 implementations (NFC) In-Reply-To: <202409300336.48U3a4jV066962@gitrepo.freebsd.org> References: <202409300336.48U3a4jV066962@gitrepo.freebsd.org> User-Agent: Wanderlust/2.15.9 (Almost Unreal) Emacs/31.0 Mule/6.0 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII 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:24940, ipnet:94.130.0.0/16, country:DE] X-Rspamd-Queue-Id: 4XHVhL43rgz40W4 X-Spamd-Bar: ---- On Mon, 30 Sep 2024 05:36:04 +0200, Kyle Evans wrote: > > The branch main has been updated by kevans: > > URL: https://cgit.FreeBSD.org/src/commit/?id=e7a629c851d747772cc138efcb0418809ecdea55 > > commit e7a629c851d747772cc138efcb0418809ecdea55 > Author: Kyle Evans > AuthorDate: 2022-03-08 15:39:52 +0000 > Commit: Kyle Evans > CommitDate: 2024-09-30 03:34:18 +0000 > > libmd, kern, stand: consolidate md5 implementations (NFC) > > Reduce the number of md5c.c between the three of these from two to one > by just reaching into the kernel build for both userland builds. The > precedent for this already exists for sha2 in both cases. > > _libmd_ symbol privatization bits have been moved to sys/md5.h and > md5.h remains to #include for compatibility. > > This stops exporting MD5Pad() in the process because the kernel stopped > exporting it in 502a35d60f4c. soversion is bumped accordingly. > > This also renames the libc version of stack_protector.c; it previously > only worked by coincidence because .PATH ordering worked out such that > we got the right one, but this is not the case anymore. Remove the > landmine. > > PR: 280784 (exp-run) > Reviewed by: allanjude, delphij > Differential Revision: https://reviews.freebsd.org/D34497 > --- > ObsoleteFiles.inc | 3 + > lib/libc/Makefile | 2 +- > lib/libc/md/Makefile.inc | 2 +- > lib/libc/secure/Makefile.inc | 2 +- > .../{stack_protector.c => libc_stack_protector.c} | 0 > lib/libcrypt/Makefile | 2 +- > lib/libmd/Makefile | 3 +- > lib/libmd/md5.h | 40 --- > lib/libmd/md5c.c | 344 --------------------- > lib/libssp/Makefile | 2 +- > stand/libsa/Makefile | 4 +- > sys/kern/md5c.c | 23 +- > sys/sys/md5.h | 42 +++ > 13 files changed, 72 insertions(+), 397 deletions(-) Don't run make delete-old-libs. :-) Does this change break building ports-mgmt/pkg (on arm64)? --- pkg --- cc -o pkg add.o alias.o annotate.o audit.o autoremove.o check.o clean.o config.o create.o delete.o event.o fetch.o globals.o info.o install.o key.o lock.o main.o plugins.o query.o register.o repo.o rquery.o search.o set.o shell.o shlib.o ssh.o stats.o triggers.o update.o updating.o upgrade.o utils.o version.o which.o -fstack-protector-strong -Wl,-Bstatic -Wl,-whole-archive -L/usr/ports/ports-mgmt/pkg/work/pkg-1.21.3/libpkg -lpkg_flat -Wl,-no-whole-archive -Wl,-Bdynamic -lelf -ljail -lssl -lcrypto -larchive -lbz2 -lz -llzma -lprivatezstd -lm -pthread -lutil -lmd -Wl,--export-dynamic --- pkg-static --- cc -o pkg-static add.o alias.o annotate.o audit.o autoremove.o check.o clean.o config.o create.o delete.o event.o fetch.o globals.o info.o install.o key.o lock.o main.o plugins.o query.o register.o repo.o rquery.o search.o set.o shell.o shlib.o ssh.o stats.o triggers.o update.o updating.o upgrade.o utils.o version.o which.o -static -L/usr/ports/ports-mgmt/pkg/work/pkg-1.21.3/libpkg -lpkg_flat -lelf -ljail -lssl -lcrypto -larchive -lbz2 -lz -llzma -lprivatezstd -lm -pthread -lutil -lmd ld: error: duplicate symbol: SHA256_Transform >>> defined at sha256.c >>> sha256.o:(SHA256_Transform) in archive /usr/lib/libcrypto.a >>> defined at sha256c.c >>> sha256c.o:(SHA256_Transform_resolver) in archive /usr/lib/libmd.a cc: error: linker command failed with exit code 1 (use -v to see invocation) *** [pkg-static] Error code 1 -- Herbert