From nobody Mon Jan 13 04:25:36 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 4YWfM473Nxz5kSp2; Mon, 13 Jan 2025 04:25:36 +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 4YWfM46bQdz57C0; Mon, 13 Jan 2025 04:25:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736742336; 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=a1G6/t4iF2YtEXUQinj6JYQCSJ0TQEjX6LpnaGTsP+o=; b=MS21ymLNNUYUPYRJ0xYs6H3nR0Sa2oM2n1K5G+AYcNgvy4vsJUuBFtRYtEIyjIO74gnudp ZuJPUzc1W1oJrSZq/F4ft5fqgcHy7Jqz4b1obJSROnwW+HWhFAgry/PVy/wUF4cMuED7oi atCE17C/nzzTDsLprmQNx+iqydlOuOufskVzhGC7ZgZP1mf6OXGwehRCEoHpNqukX9hWY2 4Zkpu3vl/glHnSAV8i0my2Hn7rvR6syt1x1m32fhgS9i5nx7foamYe8LQQZuAtr8BZRXY9 kEup+CqeS2Ea2WrO5TydOABrK9W60s87kO0pUUscd6wnIF2XxdyxULQgbMZsjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736742336; 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=a1G6/t4iF2YtEXUQinj6JYQCSJ0TQEjX6LpnaGTsP+o=; b=LZEFcrkwTMBBGY9aKtKRNeRDO2ChBNU9IgSOeRBsPshTdv2HKHnAbxLZOWn0Y/AMaBPMJ4 /5V2v2A3fgsL8QNhFWgwm47H8l6vbb3zVuaQHMkAuzGAWM6HhJEIShtpAz0YO3GiMd/rC7 SzYD2Rp7f+zw8TTolV48i8KyLjhL6UU0OG7VsE7PT5GP91b0O2iyu/UUO051zWtQFruag6 u+BlzNwOG7kve8FiJozpXipu7A3Bt+A0NC+iIWqqEr61spjCyQjLKSDjKtv58MfV3UvmZB RbXPtDeoWRC+5B8qTFSP8bNCNlIP1GtgbijU/Q2Fa54tJnlCxjMzdj3CtwKV3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736742336; a=rsa-sha256; cv=none; b=hssQ4K6PBJ6tCkUynvclgsGF7/6gjVJKZPUdx4OSl4Cs9XdDDb0mL4fxDJoAnAEmNHafuO d8JeF9K55awpHM5ammRdXehepM6Hk991MPS5p8aKknx+4Io016vJI/yQrXnl6zeG+5NN51 GIpEhFZMPtiEywbspQeQLcgnpXlD7IJ0cY4Y72Ah+RId/VNvn+RMChnrvcS8B5xnVyZnZV Uzk2d1XhAc4TkJI0pq7ba1bUFE1in2Fu9nHVeLkBjWUFaeUxd63CL6ACO1VEVToepRXXwo KfZ4afEGJyhqN02jzSJPd+4jgr6Ug/N0S1POq4TgICiW2f05xccPgvk/0YJqzw== 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 4YWfM468yzzkD; Mon, 13 Jan 2025 04:25:36 +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 50D4Pa6v050841; Mon, 13 Jan 2025 04:25:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50D4PaeR050838; Mon, 13 Jan 2025 04:25:36 GMT (envelope-from git) Date: Mon, 13 Jan 2025 04:25:36 GMT Message-Id: <202501130425.50D4PaeR050838@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: 163951959866 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 163951959866377ebf6d9af84a412dd22b1a8983 Auto-Submitted: auto-generated The branch stable/13 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=163951959866377ebf6d9af84a412dd22b1a8983 commit 163951959866377ebf6d9af84a412dd22b1a8983 Author: Xin LI AuthorDate: 2025-01-13 04:25:29 +0000 Commit: Xin LI CommitDate: 2025-01-13 04:25:29 +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 */