From a53d3c9974e0d52710581a1eb0b2e16b576990dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98rjan=20Malde?= Date: Sun, 22 Dec 2024 19:35:10 +0100 Subject: groups.d/231.native_packages_etc.d/file.package: bump to v5.46 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ørjan Malde --- groups.d/231.native_packages_etc.d/file.package | 5 +++-- patches/file-5.45.local.patch | 12 ------------ patches/file-5.45_pre.local.patch | 12 ------------ patches/file-5.46_pre.local.patch | 12 ++++++++++++ 4 files changed, 15 insertions(+), 26 deletions(-) delete mode 100644 patches/file-5.45.local.patch delete mode 100644 patches/file-5.45_pre.local.patch create mode 100644 patches/file-5.46_pre.local.patch diff --git a/groups.d/231.native_packages_etc.d/file.package b/groups.d/231.native_packages_etc.d/file.package index db03741e..7b25b576 100644 --- a/groups.d/231.native_packages_etc.d/file.package +++ b/groups.d/231.native_packages_etc.d/file.package @@ -1,7 +1,8 @@ : ${PKG_FILE_DEPENDS:="xz bzip2 libz zstd"}; -: ${PKG_FILE_SHA256SUM:=fc97f51029bb0e2c9f4e3bffefdaf678f0e039ee872b9de5c002a6d09c784d82}; -: ${PKG_FILE_VERSION:=5.45}; +: ${PKG_FILE_SHA256SUM:=c9cc77c7c560c543135edc555af609d5619dbef011997e988ce40a3d75d86088}; +: ${PKG_FILE_VERSION:=5.46}; : ${PKG_FILE_URL:=http://ftp.astron.com/pub/file/file-${PKG_FILE_VERSION}.tar.gz}; +: ${PKG_FILE_CONFIGURE_ARGS_EXTRA:="--disable-lrziplib --disable-libseccomp"}; : ${PKG_FILE_CFLAGS_CONFIGURE_EXTRA:=-std=c99}; ex_pkg_register "file" "${RTL_FILEOP_SOURCE_FNAME}" "native_packages"; diff --git a/patches/file-5.45.local.patch b/patches/file-5.45.local.patch deleted file mode 100644 index b9772ca1..00000000 --- a/patches/file-5.45.local.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru file-5.45.orig/magic/Magdir/images file-5.45/magic/Magdir/images ---- file-5.45.orig/magic/Magdir/images 2023-07-27 20:04:45.000000000 +0200 -+++ file-5.45/magic/Magdir/images 2024-09-09 11:02:19.317463825 +0200 -@@ -3610,7 +3610,7 @@ - - # Microsoft Paint graphic - # http://www.fileformat.info/format/mspaint/egff.htm --0 string DanM icrosoft Paint image data (version 1.x) -+0 string DanM Microsoft Paint image data (version 1.x) - >4 uleshort x (%d - >>6 uleshort x x %d) - 0 string LinS Microsoft Paint image data (version 2.0) diff --git a/patches/file-5.45_pre.local.patch b/patches/file-5.45_pre.local.patch deleted file mode 100644 index c3cbd39d..00000000 --- a/patches/file-5.45_pre.local.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru file-5.42.orig/src/Makefile.in file-5.42/src/Makefile.in ---- file-5.42.orig/src/Makefile.in 2022-06-29 22:49:15.379469079 +0200 -+++ file-5.42/src/Makefile.in 2022-06-29 22:56:35.117265729 +0200 -@@ -199,7 +199,7 @@ - CCLD = $(CC) - LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+ $(AM_LDFLAGS) -o $@ - AM_V_CCLD = $(am__v_CCLD_@AM_V@) - am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) - am__v_CCLD_0 = @echo " CCLD " $@; diff --git a/patches/file-5.46_pre.local.patch b/patches/file-5.46_pre.local.patch new file mode 100644 index 00000000..c3cbd39d --- /dev/null +++ b/patches/file-5.46_pre.local.patch @@ -0,0 +1,12 @@ +diff -ru file-5.42.orig/src/Makefile.in file-5.42/src/Makefile.in +--- file-5.42.orig/src/Makefile.in 2022-06-29 22:49:15.379469079 +0200 ++++ file-5.42/src/Makefile.in 2022-06-29 22:56:35.117265729 +0200 +@@ -199,7 +199,7 @@ + CCLD = $(CC) + LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++ $(AM_LDFLAGS) -o $@ + AM_V_CCLD = $(am__v_CCLD_@AM_V@) + am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) + am__v_CCLD_0 = @echo " CCLD " $@; -- cgit v1.2.3