From nobody Tue Jan 25 01:40:01 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 F2C221972667; Tue, 25 Jan 2022 01:40:04 +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 4JjV0L25Hcz4Zpt; Tue, 25 Jan 2022 01:40:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643074802; 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=D87O1sjzX6DlyGrKA0jnyh6SG0WdAfqOuQn4TAoTBEU=; b=qe6+0pnlwJAzD6TAnvHDyJ9FmdHakc5Y8Tat5N0II0Zp0AJAbtqlmZ0R1pISyMmP8vjBKL IfMeY6xyucJrEtz4uoMtG4HqlXn/WLVcfgGE/OrPLyM77ljnumJG7usXahUt/DF86HDPqP P10mhsFRl7Q3RbSvwnqnni2ufWjsKPqaWkqs/+Rh5PcCBEAXbcHCXATOlLwA4K0iAe9biX BMOlj/GKR50Q3paANfmjLtJ5+xH2gqqNEQA0fXFHVKtRieK4jgnYTiAUwL2K8KhqhEx7A9 1ZA80YUoFs9tGg9izEq26EOLJGvfDjosFd0sS0OPhwBPYlAdIiCDD0jcnhgpzQ== 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 EAA0020AC9; Tue, 25 Jan 2022 01:40:01 +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 20P1e1Px044710; Tue, 25 Jan 2022 01:40:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20P1e1LI044707; Tue, 25 Jan 2022 01:40:01 GMT (envelope-from git) Date: Tue, 25 Jan 2022 01:40:01 GMT Message-Id: <202201250140.20P1e1LI044707@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: ca4512889940 - stable/13 - libcrypt: Drop inclusion of libutil.h 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ca451288994042e38b198cd6a7c8c13fe09fb28b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643074802; 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=D87O1sjzX6DlyGrKA0jnyh6SG0WdAfqOuQn4TAoTBEU=; b=LCBZTB4RWU5Ro9OojJmQTp446jieyKrxPQI9glc3yaH8RMUsSbFKzFZTqC2vN+02kmbCjR WbJHohX1vitxW/hOJhmLgXE8R57lsdaSwM6Hq6mrc2KjEHF3y9u8/c2UeKptjwnY+4D0l/ E8fwjztO2Hxwr9KB0xmS5Gx6+igC0BdCfwq4Wvoi/xUbswkz/Efld42JhQiOsFD9olPngZ YrCeSiIHAaWdVzUQ7ajdxLbnC0gVuwqWPxJVQv0eZoHDv3xIAK/ZKKm+mm1KWMZV6N0ADf HalXkKkDX1R63P3jQrrI31No11tV8OMGA//W4IovzFrIv0NViIbk3OWgGL4IQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643074802; a=rsa-sha256; cv=none; b=eDJf5RxYDaDbZVyX8fidHFSoqH7v/u3Q2mpk5PxtbTzHPa1PlZzDPRQR3HBs+Ba2wBYjHk eIL6K5WQkyixEk6AFqsodL3DhtPglahwO8CTC6J9Z46RdffbnIs2FPmm+zfsmQITaZlDTo NeokJqUtA4jmAD1Ce4bxAcDWO4mV3dTt+6at7c3kdLuTvFrECqEM1QzyQK1r4rpY0E4C/x u24RBVPdCn4/ldip0fzRS1zBhGoFfNLJ0jJxDRI14iq2oXnnoh3zO5psQGmGGnrtSO3SqP kTYlcVFS2VYTvBlVtJaa/tNd3UDVJV5tacBHCnCL/kxmNogtgvvWxXruNMEw0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=ca451288994042e38b198cd6a7c8c13fe09fb28b commit ca451288994042e38b198cd6a7c8c13fe09fb28b Author: Jessica Clarke AuthorDate: 2021-12-06 22:28:10 +0000 Commit: Jessica Clarke CommitDate: 2022-01-24 23:59:19 +0000 libcrypt: Drop inclusion of libutil.h This was rendered obsolete in 2012 by a0ee974f0bad, since auth_getval was the only reason the header was included. MFC after: 1 week (cherry picked from commit 7d232d647e3583b495d431b12eaa9343bb29b271) --- lib/libcrypt/Makefile | 2 +- lib/libcrypt/crypt.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/libcrypt/Makefile b/lib/libcrypt/Makefile index f222394b45c3..31346cee2e39 100644 --- a/lib/libcrypt/Makefile +++ b/lib/libcrypt/Makefile @@ -20,7 +20,7 @@ SRCS= crypt.c misc.c \ MAN= crypt.3 MLINKS= crypt.3 crypt_get_format.3 crypt.3 crypt_r.3 \ crypt.3 crypt_set_format.3 -CFLAGS+= -I${SRCTOP}/lib/libmd -I${SRCTOP}/lib/libutil \ +CFLAGS+= -I${SRCTOP}/lib/libmd \ -I${SRCTOP}/sys/crypto/sha2 # Pull in the strong crypto, if it is present. diff --git a/lib/libcrypt/crypt.c b/lib/libcrypt/crypt.c index 8bb3b99e6712..13411321338f 100644 --- a/lib/libcrypt/crypt.c +++ b/lib/libcrypt/crypt.c @@ -32,7 +32,6 @@ __FBSDID("$FreeBSD$"); #include -#include #include #include