From nobody Mon Jan 03 02:09:52 2022 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 5AE0D19368A2; Mon, 3 Jan 2022 02:09:53 +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 4JRzhx0wNlz4q8L; Mon, 3 Jan 2022 02:09:53 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 F3BA21D027; Mon, 3 Jan 2022 02:09:52 +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 20329qOe018385; Mon, 3 Jan 2022 02:09:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20329qRc018384; Mon, 3 Jan 2022 02:09:52 GMT (envelope-from git) Date: Mon, 3 Jan 2022 02:09:52 GMT Message-Id: <202201030209.20329qRc018384@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: 902665210189 - main - libmagic: Remove support for older FreeBSD where xlocale was not available. 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: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 90266521018938b7b9f0003ba9a383b6920859e9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641175793; 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=wzmt+UZQ2s1NsiBDpy2pCh1v00HNwk1miTX2T6fwu28=; b=UlXNEYCN8dtUiDikaB0r0UNCKKRtDHsct58MOf8HF+yri6et+hkrOHYMv/ARZ9cwzqzaLw 3CMVSUzGq+KoleDh6BtTSwL3gEF0RHzjQZeRw4nuMME3Vl7Fr6mLn7QstKj44QUaCE3u1T 7c6/z4fAgo8FYvhgQvXcIVzWG1gTJLZvEOtyF7pi30PV9672CzhJdyY6Dy3T7SI9YzKvkc 8agbmCs/WK3cAYpFPjPGDDW6dVXS6i9OzcdGzri/peqWXilDLxxsH/XjN/sjVKn4ubUp6t P2yU5GaKhvTd0DVncU64OA8K45qJPGPHBkYhVWNF7KMv+CDlXr+BKId5cQtM3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641175793; a=rsa-sha256; cv=none; b=hLGQUHzPqVMuFdrB+PgcvvLfW21JJ3vL5fANbNoGcgMiQTaIE5mzeAi2yoBmIhcLdSYPJ9 iVnmeTbr0c1ww17UJ+lZnIfkUdWTGph2k0iICDWDb76GsfKc8tbmKZ6Z2DhXVGVE0WoeIW U6x1jI8IqCGPkzLzl3BCPWOQN6PQa6dWi9eiD6YfRkmik66bSozlW/3J7bvhyhg6pp9d1i jTIBJR1fCq+p2q6IxBl3upz5f9jX2sLJsQ7uWVuEITOpIt6qC0/zhg1+e88Lq4glkt6r2F 0MWATIt887erXRSQm7e1z+5QW36NCI5wXt8gfGy9uo/vXCdpcDTarD2UjijmoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=90266521018938b7b9f0003ba9a383b6920859e9 commit 90266521018938b7b9f0003ba9a383b6920859e9 Author: Xin LI AuthorDate: 2022-01-03 02:05:08 +0000 Commit: Xin LI CommitDate: 2022-01-03 02:05:08 +0000 libmagic: Remove support for older FreeBSD where xlocale was not available. The MINIMUM_SUPPORTED_OSREL is 1002501 (FreeBSD 10.3), and xlocale is supported there. While I'm there, explicitly use config.h generated with --disable-bzlib --disable-xzlib instead of deleting them manually. MFC after: 2 weeks --- lib/libmagic/config.h | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/lib/libmagic/config.h b/lib/libmagic/config.h index 263fdfb571cd..90a9a115420c 100644 --- a/lib/libmagic/config.h +++ b/lib/libmagic/config.h @@ -1,13 +1,3 @@ -/* $FreeBSD$ */ - -/* Get __FreeBSD_version. */ -#include - -/* Only specific versions of FreeBSD support xlocale */ -#if __FreeBSD_version >= 1000002 || (__FreeBSD_version < 1000000 && __FreeBSD_version >= 900506) -#define FREEBSD_XLOCALE_SUPPORT 1 -#endif - /* config.h. Generated from config.h.in by configure. */ /* config.h.in. Generated from configure.ac by autoheader. */ @@ -17,6 +7,9 @@ /* Define in built-in ELF support is used */ #define BUILTIN_ELF 1 +/* Enable bzlib compression support */ +/* #undef BZLIBSUPPORT */ + /* Define for ELF core file support */ #define ELFCORE 1 @@ -26,6 +19,9 @@ /* Define to 1 if you have the `asprintf' function. */ #define HAVE_ASPRINTF 1 +/* Define to 1 if you have the header file. */ +/* #undef HAVE_BZLIB_H */ + /* Define to 1 if you have the `ctime_r' function. */ #define HAVE_CTIME_R 1 @@ -59,9 +55,7 @@ #define HAVE_FORK 1 /* Define to 1 if you have the `freelocale' function. */ -#ifdef FREEBSD_XLOCALE_SUPPORT #define HAVE_FREELOCALE 1 -#endif /* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ #define HAVE_FSEEKO 1 @@ -87,9 +81,15 @@ /* Define to 1 if you have the header file. */ #define HAVE_INTTYPES_H 1 +/* Define to 1 if you have the `bz2' library (-lbz2). */ +/* #undef HAVE_LIBBZ2 */ + /* Define to 1 if you have the `gnurx' library (-lgnurx). */ /* #undef HAVE_LIBGNURX */ +/* Define to 1 if you have the `lzma' library (-llzma). */ +/* #undef HAVE_LIBLZMA */ + /* Define to 1 if you have the `seccomp' library (-lseccomp). */ /* #undef HAVE_LIBSECCOMP */ @@ -99,6 +99,9 @@ /* Define to 1 if you have the `localtime_r' function. */ #define HAVE_LOCALTIME_R 1 +/* Define to 1 if you have the header file. */ +/* #undef HAVE_LZMA_H */ + /* Define to 1 if mbrtowc and mbstate_t are properly declared. */ #define HAVE_MBRTOWC 1 @@ -121,9 +124,7 @@ #define HAVE_MMAP 1 /* Define to 1 if you have the `newlocale' function. */ -#ifdef FREEBSD_XLOCALE_SUPPORT #define HAVE_NEWLOCALE 1 -#endif /* Define to 1 if you have the `pread' function. */ #define HAVE_PREAD 1 @@ -210,9 +211,7 @@ #define HAVE_UNISTD_H 1 /* Define to 1 if you have the `uselocale' function. */ -#ifdef FREEBSD_XLOCALE_SUPPORT #define HAVE_USELOCALE 1 -#endif /* Define to 1 if you have the `utime' function. */ #define HAVE_UTIME 1 @@ -252,9 +251,7 @@ #define HAVE_WORKING_VFORK 1 /* Define to 1 if you have the header file. */ -#ifdef FREEBSD_XLOCALE_SUPPORT #define HAVE_XLOCALE_H 1 -#endif /* Define to 1 if you have the header file. */ #define HAVE_ZLIB_H 1 @@ -334,6 +331,9 @@ # endif #endif +/* Enable xzlib compression support */ +/* #undef XZLIBSUPPORT */ + /* Enable zlib compression support */ #define ZLIBSUPPORT 1