From nobody Thu Dec 16 22:09:23 2021 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 001B918D951D; Thu, 16 Dec 2021 22:09:24 +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 4JFR9H5DJkz3CB1; Thu, 16 Dec 2021 22:09:23 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 937BD1035E; Thu, 16 Dec 2021 22:09:23 +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 1BGM9NO3089062; Thu, 16 Dec 2021 22:09:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BGM9NT4089061; Thu, 16 Dec 2021 22:09:23 GMT (envelope-from git) Date: Thu, 16 Dec 2021 22:09:23 GMT Message-Id: <202112162209.1BGM9NT4089061@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: eb2d9adb246a - main - Sort libsodium entries by path in sys/conf/files. 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: eb2d9adb246a7ff184ddd0d3fccfeccbf067985b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639692563; 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=A2fpIJg7UovIjs5OCQYz47klLjzoLOlZMtwGF+EV6vo=; b=YEPbAnV+2BANy75HGMGgx8kse+oDiJVDRJK1lvhCpsWS43PrxShu6SUD0+IYEVNLteYbRe UGjzmcAsq+iMuMHb3ukK4sgBNUwoB8IFCk/zaDEEs7+xse0tTvHzHGYt+fR3hcm61coqqY 2+kK60eFYwCElQawpqI3G24jtVSmegrhazBu3KKsAgZSPyLlaZfGFvt03mKLj/zwtozyjB 2lgk9T6TKuiSChER15s8ZFph6ldfycAVWh7ReEJ4c5/x9wjLE+5NjlMUFaInqbD4Nj/PE+ h7ayZEuINQ1ipm9VgC0rWEpLCnKtgI0FtOMp2+tZV9uWc7mUVU52RMkrpYwY4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639692563; a=rsa-sha256; cv=none; b=O0/ys94cYkWdm3ZXzaJ9Cm6viYYl0RoPQu1CEoGNn4yfQuNHHRfzzfWMGzIMnkVXo+HSoX RWBcSI6FYCHmdPicjG5tUEjcBzsCxPLXE5pVytLgJT48ZL/80gict20gOlEp47KhvtIFF8 U9DfwGfr0QsRWhVsA8xPQwaXY5/Cd4C9PG6GHbss3iK69DOQzNVTC9v/+Jg8BN2Ki+cpz/ +Oi1VrC6t9Y9196hg9hagu+icLNbW4xnQCoqFS8/ifk6jwYMyR/cCF8hF5/DKN6kIGSeKU 973g+J351zpHhZZhnR/sqDUWEvkE8B8gWvYuNLMURU0F3rafKqvlj/ublG8bYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=eb2d9adb246a7ff184ddd0d3fccfeccbf067985b commit eb2d9adb246a7ff184ddd0d3fccfeccbf067985b Author: John Baldwin AuthorDate: 2021-12-16 21:46:48 +0000 Commit: John Baldwin CommitDate: 2021-12-16 21:46:48 +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 --- sys/conf/files | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index fbb888db2757..a3f7c0928214 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -4939,34 +4939,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