From nobody Mon Jan 13 04:24:40 2025 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 4YWfL045tbz5kSr6; Mon, 13 Jan 2025 04:24:40 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YWfL03RG8z56pK; Mon, 13 Jan 2025 04:24:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736742280; 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=7U1XaJIo3WoJPlZ+nBVgKz8wn2KOzdNCaDRn1NKjCNk=; b=iz/cPXYNKSlvYvyJ5sxRcai5I9yVEsuCNISmc5M9kkoXThozYX52gSrpIYYAvY8rCp2zfL j639W/VlCbqYagSWXQDu/rW+dwB2iHjOSSwBngEhwg/gX1XKE4rciXtXY1fiaRrJaO2Rcl 8jyObOreknZuoPQB0d7tmGYHBi0wWFE3ZEEdtLpSGstE0sa268Sl5PF3zG4NTUQswpg6g7 WXz9Z1E58ADXn1M3rOkm+8ZO8P8vOwW0AkWFZyNGYtjmISWjjnrNukYhNNC5P9VcPqaHLA rojZzzdz5Pxcq5AeRmhshIl84llfrwvREa/tWSUoQtSmvF4iwe/+N384l9HMqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736742280; 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=7U1XaJIo3WoJPlZ+nBVgKz8wn2KOzdNCaDRn1NKjCNk=; b=Kb4wM2ySk9e8lbtL8bNTdXyJ5BjyhWu9F/z+yflW53ijwuxAWBNTTD3Yr5ul3mfoA+4DPm T+cueztXJEX6BHgnjoI4IBGhsVKxWOnhuR2LDzGZkJhMNNdTZefhJfFJOOrySngPHjUIim c3bsc4Li5F+71ARmTlVwcv57yNbx/EEW4KMWvy8C99anJMTaA3/el1GrH9G2fC36bc1+/U vIcXmLASqPlMGD0BRWm0lJonNTzBA3rszs0Nb2kjprpFcdDiJNLXRLuOSzh0nk9zyj+D/H yQNpM5zRIXwRBwQ/skBGBqg4yMkTZLeryzr5ogCAyaRksYl0tKncFiI9cezXpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736742280; a=rsa-sha256; cv=none; b=DGAiPDs9ACdGgUge01tbBH0H8h1aSsf8Iz+Dt1NHdHJpjsn41wf/NXW0AFMZnNa7qBVh9z 6X91Q4c/apbXk/af2hqlK+pKzv0zRSX2uWGkD6mBg6uxlKtr98c/NOdQrBtOQw3hA5Z+Kx MzIrGln9lFTWQYhnG2khJ7XE0Fsg9pXkvPZOp8KjlfoCJctFUhJbe4mSO/wdV8ZIGHNSTw LPDzYWTh0cOq3yzVNb/l6CmXMhqppvsEHf6+N1gt2D6vVb7pCc1nkv7CGVDl+rrQSmi7bs 2q1/aA1xwCJYm//QGzEKT0iKhBFaIkqQBhRtMFSDBSAJh2jH4rpb7B1xIZEqPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YWfL02kbszhG; Mon, 13 Jan 2025 04:24:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50D4Oecp050387; Mon, 13 Jan 2025 04:24:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50D4OeFq050384; Mon, 13 Jan 2025 04:24:40 GMT (envelope-from git) Date: Mon, 13 Jan 2025 04:24:40 GMT Message-Id: <202501130424.50D4OeFq050384@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: e6de39be80e2 - stable/14 - MFC: libmagic: Unbreak for older FreeBSD releases. 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e6de39be80e2283517f3c51d3d238d851435898e Auto-Submitted: auto-generated The branch stable/14 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=e6de39be80e2283517f3c51d3d238d851435898e commit e6de39be80e2283517f3c51d3d238d851435898e Author: Xin LI AuthorDate: 2025-01-08 04:42:16 +0000 Commit: Xin LI CommitDate: 2025-01-13 04:24:19 +0000 MFC: libmagic: Unbreak for older FreeBSD releases. PR: bin/273736 Reported by: philip (cherry picked from commit 7f8f120439b77e60a1070d87f4dc6cb9a43d0335) --- lib/libmagic/config.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/libmagic/config.h b/lib/libmagic/config.h index 12cd382ab9bb..d642880d6096 100644 --- a/lib/libmagic/config.h +++ b/lib/libmagic/config.h @@ -1,6 +1,9 @@ /* config.h. Generated from config.h.in by configure. */ /* config.h.in. Generated from configure.ac by autoheader. */ +/* FreeBSD */ +#include + /* Define if building universal (internal helper macro) */ /* #undef AC_APPLE_UNIVERSAL_BUILD */ @@ -21,8 +24,10 @@ /* Define to 1 if you have the header file. */ #ifndef __APPLE__ /* Cross building tools on macOS */ +#if __FreeBSD_version >= 1400079 || (__FreeBSD_version < 1400000 && __FreeBSD_version >= 1302500) #define HAVE_BYTESWAP_H 1 #endif +#endif /* Define to 1 if you have the header file. */ /* #undef HAVE_BZLIB_H */