From nobody Fri Apr 29 23:12:11 2022 X-Original-To: dev-commits-src-branches@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 706401ABBE83; Fri, 29 Apr 2022 23:12:12 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KqpCv6HyPz3vlr; Fri, 29 Apr 2022 23:12:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651273931; 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=0nVk8OGJzLxi3kNt1Gucr0oLKOcuUKpb48L+BQWpLQc=; b=AT7tIEQeu4WBSPS3wQ+/xmdDJkRphzVMyMNJUlRXm6wVsaTz+3/zW5n/6Y1E22BAS5fohO y53nKFYM/Rw10W9WEyebI+qFhVJdrpxMSII0KDr/RqyQUmjlSKC+BuRKm0ehb+sRjXtjfP 11hj+6t1LINhfetrFykQPLablAJ45yfQy4Zoi1EvSnLbYKzmyZHLfUoYu1fHIGVQnfiXEg m/+TzH0RO7Sb2DUVC9MxSFBdHSx/bWRvmQV5XJ0zSLcyFTkzWQm+mn3sjCvIkv3ArAcL7g u6z0SMh4kABDXexsJ4cqWy0bE8Cx6e2UETJ7+yblEZnDKE/GK5tzQTEelTqMaQ== 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 8174015EDA; Fri, 29 Apr 2022 23:12:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23TNCBIm044319; Fri, 29 Apr 2022 23:12:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23TNCBQk044318; Fri, 29 Apr 2022 23:12:11 GMT (envelope-from git) Date: Fri, 29 Apr 2022 23:12:11 GMT Message-Id: <202204292312.23TNCBQk044318@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: e173f70cb1b4 - stable/13 - Sort libsodium entries by path in sys/conf/files. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e173f70cb1b467172b206c9ef235e3095d317ee3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651273931; 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=0nVk8OGJzLxi3kNt1Gucr0oLKOcuUKpb48L+BQWpLQc=; b=PjbKuzZnH0OSYxDMzlhhP+U+ieAkdf2RZyU5fE5Mv6EfnCKRCxz/4PFFFERN8B1lpuujlO HYozEoFfbwePbhcJVUODVn/o6gEEGWzJK5Q80lIrD/0fT7hcSsXSCXSjxwrlsjEpzeLjkn OkHp4ImRsKHnZ37W/V3mkn7CDNUwWFKiaBg5DX70LMaxH2YXqDTQ2vQ2ggu5dzwm+m43MM M/Oi0iWH2Wr5rUXc22qRpEyo0BlzMxbENVlMLlzmAU9RmJ0a8gpOn9ByaeC3Sx90x9UKpK W/DpwIIVl4zvs0uFbuzNg9tUFQGYTtyiAJeGVoJxSMt0gSg6Nz+43/MKP5ROeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651273931; a=rsa-sha256; cv=none; b=PrGCuj3fYti+bio/ogpDF9htKRof/YdSuRGtDWEGa+n4qjo9i/SpxbTelmS/3W9Pw0zkfe G5EJmVGhDvqAQxPnKPVBKVR32Jr0+s9N27T82Mdz9X0s6RBtQCO3QvVQUHm+TMhhYu8cbF jMljfVgteil4szgUUVRK1NANNkA5kRnUS8zPZIb2VAvkDYn5VqttYU3N5mmqJsjRjm0pKb 9v1cYikOsxVcBwjTw3LAJyL3QipPxBZWIyBSxiqyh1J1GZmVDVgIsX9bpCH6++AVltagvT GoZdAL4ngrEGtGvVNrTN0RU1hYjUE5NHwgSRnTvxB2DRIwgZp3m10+j3uZarGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e173f70cb1b467172b206c9ef235e3095d317ee3 commit e173f70cb1b467172b206c9ef235e3095d317ee3 Author: John Baldwin AuthorDate: 2021-12-16 21:46:48 +0000 Commit: John Baldwin CommitDate: 2022-04-29 21:09:02 +0000 Sort libsodium entries by path in sys/conf/files. Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D33483 (cherry picked from commit eb2d9adb246a7ff184ddd0d3fccfeccbf067985b) --- sys/conf/files | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index b9f0c225afe8..a0e9dbba04d2 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -4976,34 +4976,34 @@ opencrypto/xform_chacha20_poly1305.c optional crypto \ compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include -I$S/crypto/libsodium" opencrypto/xform_poly1305.c optional crypto \ compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include -I$S/crypto/libsodium" -contrib/libsodium/src/libsodium/crypto_onetimeauth/poly1305/onetimeauth_poly1305.c \ +contrib/libsodium/src/libsodium/crypto_aead/chacha20poly1305/sodium/aead_chacha20poly1305.c \ optional crypto \ compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include/sodium -I$S/crypto/libsodium" -contrib/libsodium/src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna.c \ +contrib/libsodium/src/libsodium/crypto_aead/xchacha20poly1305/sodium/aead_xchacha20poly1305.c \ optional crypto \ compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include/sodium -I$S/crypto/libsodium" -contrib/libsodium/src/libsodium/crypto_verify/sodium/verify.c \ +contrib/libsodium/src/libsodium/crypto_core/hchacha20/core_hchacha20.c \ optional crypto \ compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include/sodium -I$S/crypto/libsodium" -crypto/libsodium/randombytes.c optional crypto \ - compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include -I$S/crypto/libsodium" -crypto/libsodium/utils.c optional crypto \ - compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include -I$S/crypto/libsodium" -contrib/libsodium/src/libsodium/crypto_core/hchacha20/core_hchacha20.c \ +contrib/libsodium/src/libsodium/crypto_onetimeauth/poly1305/onetimeauth_poly1305.c \ optional crypto \ compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include/sodium -I$S/crypto/libsodium" -contrib/libsodium/src/libsodium/crypto_stream/chacha20/stream_chacha20.c \ +contrib/libsodium/src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna.c \ optional crypto \ compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include/sodium -I$S/crypto/libsodium" -contrib/libsodium/src/libsodium/crypto_stream/chacha20/ref/chacha20_ref.c \ +contrib/libsodium/src/libsodium/crypto_stream/chacha20/stream_chacha20.c \ optional crypto \ compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include/sodium -I$S/crypto/libsodium" -contrib/libsodium/src/libsodium/crypto_aead/chacha20poly1305/sodium/aead_chacha20poly1305.c \ +contrib/libsodium/src/libsodium/crypto_stream/chacha20/ref/chacha20_ref.c \ optional crypto \ compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include/sodium -I$S/crypto/libsodium" -contrib/libsodium/src/libsodium/crypto_aead/xchacha20poly1305/sodium/aead_xchacha20poly1305.c \ +contrib/libsodium/src/libsodium/crypto_verify/sodium/verify.c \ optional crypto \ compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include/sodium -I$S/crypto/libsodium" +crypto/libsodium/randombytes.c optional crypto \ + compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include -I$S/crypto/libsodium" +crypto/libsodium/utils.c optional crypto \ + compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include -I$S/crypto/libsodium" rpc/auth_none.c optional krpc | nfslockd | nfscl | nfsd rpc/auth_unix.c optional krpc | nfslockd | nfscl | nfsd