From nobody Mon Sep 30 20:32:21 2024 X-Original-To: dev-commits-src-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 4XHXn41pWwz5XdN4; Mon, 30 Sep 2024 20:32:24 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHXn41D9nz4HGD; Mon, 30 Sep 2024 20:32:24 +0000 (UTC) (envelope-from kevans@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727728344; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=v7rqxePVlmOQNdC2fDBKzQtMmixemUeOthw7K+v6dvA=; b=j9OiTm10Chs9jQ97HM9bAt35rcuXTsoVSBXLv2Bx5sbcc/Fy2ufkXpaFCdl/6NICgy2Teu 8sbZwm+Tts/fmyA5pmu4omXz/wOS46zlpu5SHzmeck8pQUxfY6SjbQ4Cbwwy6NK4v5HHdJ b/ZwpQv6+WsQAs3i5+tD2JK9v9ZssK+K+Xzldinbs9bR5K6raKcMSqJA922wJx5SfdasED LhMzGKfocr9Fo7jJtq0GoWpnPjCfvgTs1Fkgx9MJfP1tMzrPqFM4BdyKqHjE2elvjnCySP D8GhxazcJntbxG+7r7eyA9kCkdjqkptdZMs/aeCHh7frzdFCEPa9MWtYy6s7xA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727728344; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=v7rqxePVlmOQNdC2fDBKzQtMmixemUeOthw7K+v6dvA=; b=WgupIUnVH/ZA0OcoS500dt275Qo9ODSd5UI3lLva94nWRKRpjgqORNV2gZJ9GCXFz548gW e7bL0CpQZmgtGdDKY8ZJma47++vHS0IihaABtyOng4/vJXsk8VK/aUC4Ct5oVli0I9LEtx I0HGsLQrVX7uDYFOGFtlrVAHlBO9ic5RzEsgC2sQQPr0gRK96i1l49a82eoS6eDOoa4aY2 giswYOXkCJ2UWs80S4pgHcBjUoVGYAdciaeNsrxa0EUPwvwIvSzhkCC4dMGDoSQs+M9idk jxxEMTfJlOuNYqbQ92wHgCYk1KdWha8XB04IjDnCs+u2pF8TDIyVmiw/xddeNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727728344; a=rsa-sha256; cv=none; b=E5H1Ufi+Pyyq+TLlpuWUOmaenDgtlrgDFGaZmIND+XiypYNVC4PwXwLBjrBRK8vb9iIMVC j/8Ke2PJ6fC43UA5MzYz0z06hVBJJVffavrWr99dkj+5U+w7QSkNJ0hI+HK2T28YhLTHVo RfQOvAHpn9tOKK7rfQCkYz3vUJngapTRsow3KXyOTwrc7Iw/5POcdzqbaZos5n+WDeMWQk crGUOUtLSq9eVA+p3nX70qoOaA2aH5SYbf+U3V78DizULXy3Hqgx0DaC9M7EuVDLbKviXE JPmXHIInEg6OytdmhBFRLOOYzk83lgiZgZwRPqKbj962LEElW/DXlpDOS5INWg== Received: from [10.9.4.95] (unknown [209.182.120.176]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: kevans/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4XHXn34PnyzSQX; Mon, 30 Sep 2024 20:32:23 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Message-ID: Date: Mon, 30 Sep 2024 15:32:21 -0500 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: e7a629c851d7 - main - libmd, kern, stand: consolidate md5 implementations (NFC) To: Dima Panov , "Herbert J. Skuhra" Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202409300336.48U3a4jV066962@gitrepo.freebsd.org> <87wmit2cmj.wl-herbert@gojira.at> Content-Language: en-US From: Kyle Evans In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 9/30/24 15:04, Dima Panov wrote: > Hello! > > On 30.09.2024 21:57, Herbert J. Skuhra wrote: >> 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 >> > This one is fixed in c02bc0aa0b22009e4bc, sorry about that. I forgot that exp-runs are inherently x86, and there's some aarch64 specific bits in here that shouldn't have been missed. > > also, this prevent to run anything builded with libmd.so.6 > > $ pkg upg > ld-elf.so.1: /usr/local/lib/compat/pkg/libmd.so.6: unsupported file layout > This one doesn't seem to make any sense, though. That message in particular implies the elf header itself is damaged somehow. Thanks, Kyle Evans