From nobody Mon Apr 24 20:50:56 2023 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 4Q4y2m65xBz47KqY; Mon, 24 Apr 2023 20:50:56 +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 4Q4y2m5YmWz3m1R; Mon, 24 Apr 2023 20:50:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682369456; 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=kjYIcJtQe0IU8uh+ULp34Qyj266wOZD+HiNOyvpTyUM=; b=Ue8bFUviQeomyVRab8N4Ye2SXELLNRlSR4be+d13LFfzIBaUc3aZxMSZKn6CfK1bzXvndz VBhoO/Be6V1WhrjW1l6Efm5NOxtEnuRA0oh36aFw+E/QHNhnIqi9Pc2UuyAnIFyevXwycv MQWkbUDImZ0qC6BNepriY6+ZIMSqzdEztnpqsISlQJSkQdyPWniCrmmi/STjRhOCGU8oPp CTT+bIw/1sv0Dym8D3Z2wS0THPapSifQZHrkJQ3d0rbwHTj5KnAn8waP6SqWdugsk4tjgr NBfGdlmC6gpeGcXYL2LtmgX3EK5Rpho8iUKqPnD5t0po9RCjJGFTYZh/7cDNEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682369456; 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=kjYIcJtQe0IU8uh+ULp34Qyj266wOZD+HiNOyvpTyUM=; b=cZ4ITm+Y9L4h4JIo4s5SlbChBdezN6SN4NcNjmo66Kn09yBRChqo2BdW0ADZdqQjQhWUUG UT50KH7Dwc2TWNKClvAAH2eRfnuNzj8MTcPpVp9zv2TbwIdFn85MN2s6aozut/CyXXdtPZ vQk86gAd8txy4uccDm/T6loshubeAt/YWCV6vMCXGL0OEUhI/WmtY3bRz2+q1CwKKF7waT 8kRrHQEBQ0MKAl8anGw7VwmCL8wvWF4do/s/OoMb43xiY+uP0x18sk8fcPrnjq61rVQebk yHDA11RS7j52KuX2xR2/NvL4mhzUKiZHt4AJuyXix0pL7Vj4lXNXwvrps3wM+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682369456; a=rsa-sha256; cv=none; b=fXOepzSmEny6c5y9eG3+DpSCT0lReQ5yr6JoDopmbn33Px45NXeZsKSd0eEFIrod6Pqtej f/sW50kQ8Ev6BsEEoHakAjgoHnomeCyclOVCbLqaRe4v49WgyNfEgCbvHgkyeD57i5iVqw Qn2/DC2rEJhiB9YZ4qsxpnGlX7IfITlBEETmriENzTgnFApBAVd4UgBKzboFC1v7iJqcp1 OJCYJyPl6NZBUGFbEKg0tTE3r5Up3jiPuP8mCs9thOLoB1WiJuv42OPRwcbrM/9+aSWni0 CGBH7/rpt2nm7bs7zYXFL21PyokPOD3HdmVjwytVSe4O4DCC6wcd0UBVpsuGug== 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 4Q4y2m4cPlzfxW; Mon, 24 Apr 2023 20:50:56 +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 33OKouco087487; Mon, 24 Apr 2023 20:50:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33OKouDP087486; Mon, 24 Apr 2023 20:50:56 GMT (envelope-from git) Date: Mon, 24 Apr 2023 20:50:56 GMT Message-Id: <202304242050.33OKouDP087486@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: 644d346d998e - main - We do not need readpassphrase from openssh 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 644d346d998e2785bfa35ec0ddd4cea2885e2da7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=644d346d998e2785bfa35ec0ddd4cea2885e2da7 commit 644d346d998e2785bfa35ec0ddd4cea2885e2da7 Author: Simon J. Gerraty AuthorDate: 2023-04-24 20:50:18 +0000 Commit: Simon J. Gerraty CommitDate: 2023-04-24 20:50:18 +0000 We do not need readpassphrase from openssh When building tar for linux, just disable HAVE_READPASSPHRASE in config_freebsd.h and libarchive will provide for readpassphrase Otherwise the two conflict. --- lib/libarchive/config_freebsd.h | 2 ++ tools/build/Makefile | 11 ----------- tools/build/cross-build/include/linux/includes.h | 4 ---- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/lib/libarchive/config_freebsd.h b/lib/libarchive/config_freebsd.h index dabc84d17ee6..2d891bc9bd5e 100644 --- a/lib/libarchive/config_freebsd.h +++ b/lib/libarchive/config_freebsd.h @@ -166,8 +166,10 @@ #define HAVE_READDIR_R 1 #define HAVE_READLINK 1 #define HAVE_READLINKAT 1 +#ifndef __linux__ #define HAVE_READPASSPHRASE 1 #define HAVE_READPASSPHRASE_H 1 +#endif #define HAVE_REGEX_H 1 #define HAVE_SELECT 1 #define HAVE_SETENV 1 diff --git a/tools/build/Makefile b/tools/build/Makefile index 1dc6e9fc189b..eb5bd44db6a1 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -209,17 +209,6 @@ SRCS+= progname.c # Stub implementations of fflagstostr/strtofflags SRCS+= fflags.c -# tar needs readpassphrase -# the version from openssh is already "portable" -# but we need to take care with .PATH as we -# do not want getopt_long.c from crypto/openssh/openbsd-compat -# and we do not want readpassphrase.c from libc/gen -.PATH: ${SRCTOP}/crypto/openssh -OBJS_SRCS_FILTER= T R -SRCS+= openbsd-compat/readpassphrase.c - -INCS+= ${SRCTOP}/crypto/openssh/openbsd-compat/readpassphrase.h - .endif # ${MAKE.OS} == "Linux" .if ${.MAKE.OS} == "Darwin" diff --git a/tools/build/cross-build/include/linux/includes.h b/tools/build/cross-build/include/linux/includes.h deleted file mode 100644 index ed9ea212ee10..000000000000 --- a/tools/build/cross-build/include/linux/includes.h +++ /dev/null @@ -1,4 +0,0 @@ -#include -#include - -#define DEF_WEAK(a)