From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 68DFCC433F5 for ; Sat, 1 Jan 2022 10:14:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 2932F4012F; Sat, 1 Jan 2022 10:14:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id y8ThsNFgM8NK; Sat, 1 Jan 2022 10:14:04 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id A6799404BB; Sat, 1 Jan 2022 10:14:03 +0000 (UTC) Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id F3F211BF5A4 for ; Sat, 1 Jan 2022 10:13:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id E122C4012F for ; Sat, 1 Jan 2022 10:13:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id p91Clf6a-B5W for ; Sat, 1 Jan 2022 10:13:37 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from smtp5-g21.free.fr (smtp5-g21.free.fr [212.27.42.5]) by smtp2.osuosl.org (Postfix) with ESMTPS id 47CFC400D9 for ; Sat, 1 Jan 2022 10:13:37 +0000 (UTC) Received: from ymorin.is-a-geek.org (unknown [IPv6:2a01:cb19:8b51:cb00:b440:9a6c:7abd:86f8]) (Authenticated sender: yann.morin.1998@free.fr) by smtp5-g21.free.fr (Postfix) with ESMTPSA id B750E5FFAB; Sat, 1 Jan 2022 11:13:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=free.fr; s=smtp-20201208; t=1641032015; bh=DWxx9dQmB6KWhUtRa8dhUHvqRLvD4Zu2bc581HaM8pk=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=LQeVAvs+aKttAikE3Rmm3oMURubGhfnQpCZml9zmCoFP4nkAsNmtL1++qijK69m1d +zqW05erUyapp0qZv6LoFefGkQpHAa+pcW/QpVYefi16tFZqbvhBQf3lqJpfI2DDGc QuWyCfd1c6c11R2n6ii2COKxpJh08fXBC0ajnIi/1d3myg+zUTx7w225YkqSLT01Dd zvRP31/Ax6eVL+faW5pgFsD63dgCLLvQ9sQ9uRBu9/pUqAbysvU3V9bT7359IYE6Rm 2I3RlYL7mDZ1l5n3oGUUzoHPoNzTeuQRoz91gMqtGoQo72aeqQ8IsDaB2bjy7G/BPe IygVG4t9Jd4Bw== Received: by ymorin.is-a-geek.org (sSMTP sendmail emulation); Sat, 01 Jan 2022 11:13:31 +0100 Date: Sat, 1 Jan 2022 11:13:31 +0100 From: "Yann E. MORIN" To: Fabrice Fontaine Message-ID: <20220101101331.GZ3390456@scaer> References: <20211230231836.3197707-1-fontaine.fabrice@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20211230231836.3197707-1-fontaine.fabrice@gmail.com> User-Agent: Mutt/1.5.22 (2013-10-16) Subject: Re: [Buildroot] [PATCH 1/1] package/file: bump to version 5.41 X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: buildroot@buildroot.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Fabrice, All, On 2021-12-31 00:18 +0100, Fabrice Fontaine spake thusly: > - Drop patch (already in version) and so autoreconf > - Update hash of vasprintf.c (changes not related to license: > https://github.com/file/file/commit/80816651588efb79a5d054e13703bf2a3378d024 > https://github.com/file/file/commit/43f7989076aa3731f3558c6954780bc7b2734b64) > > https://github.com/file/file/blob/FILE5_41/ChangeLog > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/file/0001-Add-libmagic.pc.patch | 76 ------------------------- > package/file/file.hash | 10 ++-- > package/file/file.mk | 4 +- > 3 files changed, 6 insertions(+), 84 deletions(-) > delete mode 100644 package/file/0001-Add-libmagic.pc.patch > > diff --git a/package/file/0001-Add-libmagic.pc.patch b/package/file/0001-Add-libmagic.pc.patch > deleted file mode 100644 > index b26d16224d..0000000000 > --- a/package/file/0001-Add-libmagic.pc.patch > +++ /dev/null > @@ -1,76 +0,0 @@ > -From d079cac1110cc2761417f0dcb0a142b217eb1eda Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Fri, 31 Jan 2020 20:26:29 +0100 > -Subject: [PATCH] Add libmagic.pc > - > -libmagic can optionally depends on xz (for lzma) or bzip2 since version > -5.38 and > -https://github.com/file/file/commit/b259a07ea95827f565faa20f0316e5b2704064f7 > -so add libmagic.pc so package (such as gerbera) that links with libmagic > -will be able to use pkg-config to retrieve those static dependencies > -For example, this will avoid the following build failure: > - > -[100%] Linking CXX executable gerbera > -/home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /home/br-user/autobuild/run/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libmagic.a(compress.o): in function `uncompressbuf': > -compress.c:(.text+0x69c): undefined reference to `BZ2_bzDecompressInit' > -/home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x710): undefined reference to `BZ2_bzDecompress' > -/home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x730): undefined reference to `BZ2_bzDecompressEnd' > -/home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x7bc): undefined reference to `lzma_auto_decoder' > -/home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x828): undefined reference to `lzma_code' > -/home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x848): undefined reference to `lzma_end' > - > -Fixes: > - - http://autobuild.buildroot.org/results/37b1ef54dc41100689f311fbc31fc9300dc6ae63 > - > -Signed-off-by: Fabrice Fontaine > -[Upstream status: https://bugs.astron.com/view.php?id=136] > ---- > - Makefile.am | 5 +++++ > - configure.ac | 2 +- > - libmagic.pc.in | 10 ++++++++++ > - 3 files changed, 16 insertions(+), 1 deletion(-) > - create mode 100644 libmagic.pc.in > - > -diff --git a/Makefile.am b/Makefile.am > -index 8bd927d9..2ab67ed7 100644 > ---- a/Makefile.am > -+++ b/Makefile.am > -@@ -3,3 +3,8 @@ ACLOCAL_AMFLAGS = -I m4 > - EXTRA_DIST = MAINT > - > - SUBDIRS = src magic tests doc python > -+ > -+# This variable must have 'exec' in its name, in order to be installed > -+# by 'install-exec' target (instead of default 'install-data') > -+pkgconfigexecdir = $(libdir)/pkgconfig > -+pkgconfigexec_DATA = libmagic.pc > -diff --git a/configure.ac b/configure.ac > -index ac37fccd..b2e2e5b8 100644 > ---- a/configure.ac > -+++ b/configure.ac > -@@ -217,5 +217,5 @@ if test "$ac_cv_header_lzma_h$ac_cv_lib_lzma_lzma_stream_decoder" = "yesyes"; t > - AC_DEFINE([XZLIBSUPPORT], 1, [Enable xzlib compression support]) > - fi > - > --AC_CONFIG_FILES([Makefile src/Makefile magic/Makefile tests/Makefile doc/Makefile python/Makefile]) > -+AC_CONFIG_FILES([Makefile src/Makefile magic/Makefile tests/Makefile doc/Makefile python/Makefile libmagic.pc]) > - AC_OUTPUT > -diff --git a/libmagic.pc.in b/libmagic.pc.in > -new file mode 100644 > -index 00000000..3ad1290b > ---- /dev/null > -+++ b/libmagic.pc.in > -@@ -0,0 +1,10 @@ > -+prefix=@prefix@ > -+exec_prefix=@exec_prefix@ > -+libdir=@libdir@ > -+includedir=@includedir@ > -+ > -+Name: libmagic > -+Description: Magic number recognition library > -+Version: @VERSION@ > -+Libs: -L${libdir} -lmagic > -+Libs.private: @LIBS@ > --- > -2.24.1 > - > diff --git a/package/file/file.hash b/package/file/file.hash > index 96efaf8483..33875776eb 100644 > --- a/package/file/file.hash > +++ b/package/file/file.hash > @@ -1,7 +1,7 @@ > # Locally calculated after verifying signature > -# ftp://ftp.astron.com/pub/file/file-5.38.tar.gz.asc > +# ftp://ftp.astron.com/pub/file/file-5.41.tar.gz.asc > # using key BE04995BA8F90ED0C0C176C471112AB16CB33B3A > -sha256 593c2ffc2ab349c5aea0f55fedfe4d681737b6b62376a9b3ad1e77b2cc19fa34 file-5.38.tar.gz > -sha256 0bfa856a9930bddadbef95d1be1cf4e163c0be618e76ea3275caaf255283e274 COPYING > -sha256 4ccb60d623884ef637af4a5bc16b2cb350163e2135e967655837336019a64462 src/mygetopt.h > -sha256 58b5932aca6c10f2194290a3b26088ec9ba07ef6b52cc9bb2dd638cc634db6f1 src/vasprintf.c > +sha256 13e532c7b364f7d57e23dfeea3147103150cb90593a57af86c10e4f6e411603f file-5.41.tar.gz > +sha256 0bfa856a9930bddadbef95d1be1cf4e163c0be618e76ea3275caaf255283e274 COPYING > +sha256 4ccb60d623884ef637af4a5bc16b2cb350163e2135e967655837336019a64462 src/mygetopt.h > +sha256 c4fa92d6504b88484a12140fe3e24b9b29b0112717f94b1ff4205d54828b1c70 src/vasprintf.c > diff --git a/package/file/file.mk b/package/file/file.mk > index c41a8eb3a4..12647af8bb 100644 > --- a/package/file/file.mk > +++ b/package/file/file.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -FILE_VERSION = 5.38 > +FILE_VERSION = 5.41 > FILE_SITE = ftp://ftp.astron.com/pub/file > FILE_DEPENDENCIES = host-file > HOST_FILE_DEPENDENCIES = host-zlib > @@ -13,8 +13,6 @@ FILE_INSTALL_STAGING = YES > FILE_LICENSE = BSD-2-Clause, BSD-4-Clause (one file), BSD-3-Clause (one file) > FILE_LICENSE_FILES = COPYING src/mygetopt.h src/vasprintf.c > FILE_CPE_ID_VENDOR = file_project > -# We're patching configure.ac > -FILE_AUTORECONF = YES > HOST_FILE_CONF_OPTS = --disable-libseccomp > > ifeq ($(BR2_PACKAGE_BZIP2),y) > -- > 2.33.0 > > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot