From nobody Fri Apr 29 23:12:12 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 A0A111ABBD30; Fri, 29 Apr 2022 23:12:13 +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 4KqpCw6gJJz3w1s; Fri, 29 Apr 2022 23:12:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651273933; 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=1V1BipSDhbLekUkGIImZwOURdSUbR1bL63+Pr6bB7cM=; b=oIKc6jnmn9mH76COnzWtexEKHDX5luSFvMipJz+JRVxoJIYq6m8+lDXr+So58ZEkgucjDP sgyRK2iTu4Q1pe69/q5+4lUi3oWDUGcSmzMg5NBCAdXM9apOzE15O6BKi4+ziu8Wm9SXNC zybRcgLBsvVlOKByDwsCzsnOCUK2i4f6zXVLdUDfwuBKmtyKp9NnUMCZ//7S5TAvRVh4L6 4DLNSN/nt5mian2YbnHliVPAiTXdpy4U3DUeMOu9Q6/5XNjwq/xIdbNrLFpeZbZPtJ8UqK tqTUmhKvHKMfMk4TOH+1IByPBSYZD+qcpMjwwRZFKiI6B0FZE02WD+lMQOXdtQ== 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 8A25315FB3; Fri, 29 Apr 2022 23:12:12 +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 23TNCCtC044343; Fri, 29 Apr 2022 23:12:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23TNCCGc044342; Fri, 29 Apr 2022 23:12:12 GMT (envelope-from git) Date: Fri, 29 Apr 2022 23:12:12 GMT Message-Id: <202204292312.23TNCCGc044342@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: 8252f0b6ace2 - stable/13 - Sort libsodium sources by path in sys/modules/crypto/Makefile. 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: 8252f0b6ace274f60efaca3a3cb86e679b7207d3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651273933; 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=1V1BipSDhbLekUkGIImZwOURdSUbR1bL63+Pr6bB7cM=; b=FcWM1x/g/O10qOxSeZkOSDo55NHyqG8azMjFKG65kKq5QJO8zneS1Pbt4JoSA88YP3JFiu AiPCpnoTVDfVZcFJwH9fojQH5Shyzd/66ZHn20dlPGvOxI4GhV9PP4hXVjU3FbdR5GNQuJ kCl0s2t6UR2PO8Z4a6qM5o8hLaXudGMT3OVFp2S/sd32ATvZjZGAu1pXIka/U0iTkSJbHA QgNGwGeEjRWYO7rzTCRjGax704FUgj8ll+BAUlqiaCcG0ReTBf6YTYWBCn1gw66W2UmzpY JazsUPUed0jTeJF2EReks6cGP/vUhkh8finX1DS6lDk5tbV2bBo76S0NxKACDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651273933; a=rsa-sha256; cv=none; b=sYd1JEHIcdMjChJo7qedj3ZH1tKxznxH7TlNwvW57vS3lmsg5z7Z70PlTo6sOgkG2lrbd0 SZLhQ4CoIa9b5oBnm/hkU/bHrTdnZWffzG4Ujlg5ebiDxkCPaSmFeS+e2kz4TPe96AYzBf 4sJs/SmTOTk6HO94RLxiSOUB23OGb9WWFQgxSzEHS+Qfk5WswmouUtuJdZpkwQxBGA6ILx HR55iGYCUbxZrZL6WiYg/XyVlSyGZEhx6hWnQd9MNyZwGJq80n+o8ngpNOzZkILV673/Tu 0k8i+/iggNtA0xlO9z9n0qNtC3XpVbVqZjEFB6UeWeiUkOX4Rq6GpSHLaMFhQQ== 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=8252f0b6ace274f60efaca3a3cb86e679b7207d3 commit 8252f0b6ace274f60efaca3a3cb86e679b7207d3 Author: John Baldwin AuthorDate: 2021-12-16 21:47:03 +0000 Commit: John Baldwin CommitDate: 2022-04-29 21:09:07 +0000 Sort libsodium sources by path in sys/modules/crypto/Makefile. This matches the order used in sys/conf/files to make it easier to keep these two files in sync. Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D33484 (cherry picked from commit 8b4af206f67e93735a5b22921469a2bce63fb6ab) --- sys/modules/crypto/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/modules/crypto/Makefile b/sys/modules/crypto/Makefile index f64ea1f6fc8b..4bea88b2af28 100644 --- a/sys/modules/crypto/Makefile +++ b/sys/modules/crypto/Makefile @@ -61,14 +61,14 @@ SRCS += xform_chacha20_poly1305.c CFLAGS.xform_chacha20_poly1305.c+= -I${LIBSODIUM_INC} -I${LIBSODIUM_COMPAT} SRCS += xform_poly1305.c CFLAGS.xform_poly1305.c += -I${LIBSODIUM_INC} -I${LIBSODIUM_COMPAT} -SRCS += stream_chacha20.c -CFLAGS.stream_chacha20.c += -I${LIBSODIUM_INC}/sodium -I${LIBSODIUM_COMPAT} -SRCS += chacha20_ref.c -CFLAGS.chacha20_ref.c += -I${LIBSODIUM_INC}/sodium -I${LIBSODIUM_COMPAT} SRCS += onetimeauth_poly1305.c CFLAGS.onetimeauth_poly1305.c += -I${LIBSODIUM_INC}/sodium -I${LIBSODIUM_COMPAT} SRCS += poly1305_donna.c CFLAGS.poly1305_donna.c += -I${LIBSODIUM_INC}/sodium -I${LIBSODIUM_COMPAT} +SRCS += stream_chacha20.c +CFLAGS.stream_chacha20.c += -I${LIBSODIUM_INC}/sodium -I${LIBSODIUM_COMPAT} +SRCS += chacha20_ref.c +CFLAGS.chacha20_ref.c += -I${LIBSODIUM_INC}/sodium -I${LIBSODIUM_COMPAT} SRCS += verify.c CFLAGS.verify.c += -I${LIBSODIUM_INC}/sodium -I${LIBSODIUM_COMPAT} SRCS += randombytes.c