Merge remote-tracking branch 'arne_f/kernel-6.1' into next

diff --git a/config/rootfiles/common/keyutils b/config/rootfiles/common/keyutils
index 10058de1c4b2a7d0d2da5151ae2cfa85512c8399..d4a166e4e3cffd6dcddfb254d63b423b7c687f73 100644 (file)
--- a/config/rootfiles/common/keyutils
+++ b/config/rootfiles/common/keyutils
@@ -1,9 +1,11 @@
 bin/keyctl
+etc/keyutils
 etc/request-key.conf
 etc/request-key.d
 #lib/libkeyutils.so
 lib/libkeyutils.so.1
-lib/libkeyutils.so.1.7
+lib/libkeyutils.so.1.10
+#lib/pkgconfig/libkeyutils.pc
 sbin/key.dns_resolver
 sbin/request-key
 #usr/include/keyutils.h
@@ -13,6 +15,7 @@ sbin/request-key
 #usr/share/man/man3/find_key_by_type_and_name.3
 #usr/share/man/man3/keyctl.3
 #usr/share/man/man3/keyctl_assume_authority.3
+#usr/share/man/man3/keyctl_capabilities.3
 #usr/share/man/man3/keyctl_chown.3
 #usr/share/man/man3/keyctl_clear.3
 #usr/share/man/man3/keyctl_describe.3
@@ -29,7 +32,13 @@ sbin/request-key
 #usr/share/man/man3/keyctl_invalidate.3
 #usr/share/man/man3/keyctl_join_session_keyring.3
 #usr/share/man/man3/keyctl_link.3
+#usr/share/man/man3/keyctl_move.3
 #usr/share/man/man3/keyctl_negate.3
+#usr/share/man/man3/keyctl_pkey_decrypt.3
+#usr/share/man/man3/keyctl_pkey_encrypt.3
+#usr/share/man/man3/keyctl_pkey_query.3
+#usr/share/man/man3/keyctl_pkey_sign.3
+#usr/share/man/man3/keyctl_pkey_verify.3
 #usr/share/man/man3/keyctl_read.3
 #usr/share/man/man3/keyctl_read_alloc.3
 #usr/share/man/man3/keyctl_reject.3
@@ -42,9 +51,12 @@ sbin/request-key
 #usr/share/man/man3/keyctl_setperm.3
 #usr/share/man/man3/keyctl_unlink.3
 #usr/share/man/man3/keyctl_update.3
+#usr/share/man/man3/keyctl_watch_key.3
 #usr/share/man/man3/recursive_key_scan.3
 #usr/share/man/man3/recursive_session_key_scan.3
+#usr/share/man/man5/key.dns_resolver.conf.5
 #usr/share/man/man5/request-key.conf.5
+#usr/share/man/man7/asymmetric-key.7
 #usr/share/man/man7/keyutils.7
 #usr/share/man/man8/key.dns_resolver.8
 #usr/share/man/man8/request-key.8

diff --git a/config/rootfiles/common/knot b/config/rootfiles/common/knot
index 79e86141d0442b55442609aef073e00a4d08b6dd..6660b27d11cc4e8afb5f6eade806060383f3a03c 100644 (file)
--- a/config/rootfiles/common/knot
+++ b/config/rootfiles/common/knot
@@ -4,12 +4,12 @@ usr/bin/kdig
 #usr/lib/libdnssec.la
 #usr/lib/libdnssec.lai
 #usr/lib/libdnssec.so
-usr/lib/libdnssec.so.8
-usr/lib/libdnssec.so.8.0.0
+usr/lib/libdnssec.so.9
+usr/lib/libdnssec.so.9.0.0
 #usr/lib/libknot.la
 #usr/lib/libknot.lai
 #usr/lib/libknot.so
-usr/lib/libknot.so.12
-usr/lib/libknot.so.12.0.0
+usr/lib/libknot.so.13
+usr/lib/libknot.so.13.0.0
 #usr/lib/libknotus.a
 #usr/lib/libknotus.la

diff --git a/config/rootfiles/common/lcms2 b/config/rootfiles/common/lcms2
index 17300a91aaac7b1006b0a2e6a7a463bf28992077..696e95cd73314232ec0d2044398eaf4ae261c855 100644 (file)
--- a/config/rootfiles/common/lcms2
+++ b/config/rootfiles/common/lcms2
@@ -8,7 +8,7 @@
 #usr/lib/liblcms2.la
 #usr/lib/liblcms2.so
 usr/lib/liblcms2.so.2
-usr/lib/liblcms2.so.2.0.13
+usr/lib/liblcms2.so.2.0.14
 #usr/lib/pkgconfig/lcms2.pc
 #usr/share/man/man1/jpgicc.1
 #usr/share/man/man1/linkicc.1

diff --git a/config/rootfiles/common/mpfr b/config/rootfiles/common/mpfr
index 2b2a04257b6afc816b29414918b39a48fad06204..84711be398417046586e5e9f9c5b55c1520c4763 100644 (file)
--- a/config/rootfiles/common/mpfr
+++ b/config/rootfiles/common/mpfr
@@ -4,7 +4,7 @@
 #usr/lib/libmpfr.la
 #usr/lib/libmpfr.so
 usr/lib/libmpfr.so.6
-usr/lib/libmpfr.so.6.1.1
+usr/lib/libmpfr.so.6.2.0
 #usr/lib/pkgconfig/mpfr.pc
 #usr/share/doc/mpfr
 #usr/share/doc/mpfr/AUTHORS

diff --git a/config/rootfiles/common/poppler b/config/rootfiles/common/poppler
index 116b1d7aa2c667aa997c529a139ff51c82271c20..97f7b3eb7372e901a741ed6921389960517f1b00 100644 (file)
--- a/config/rootfiles/common/poppler
+++ b/config/rootfiles/common/poppler
@@ -173,8 +173,8 @@ usr/lib/libpoppler-cpp.so.0.11.0
 usr/lib/libpoppler-glib.so.8
 usr/lib/libpoppler-glib.so.8.24.0
 #usr/lib/libpoppler.so
-usr/lib/libpoppler.so.125
-usr/lib/libpoppler.so.125.0.0
+usr/lib/libpoppler.so.126
+usr/lib/libpoppler.so.126.0.0
 #usr/lib/pkgconfig/poppler-cpp.pc
 #usr/lib/pkgconfig/poppler-glib.pc
 #usr/lib/pkgconfig/poppler.pc

diff --git a/config/rootfiles/common/xfsprogs b/config/rootfiles/common/xfsprogs
index eb2f9982eceeeb08cf9b9d51c8e93541901d702a..d3223c0078e850ca43178665a60cbd00afc5b0ce 100644 (file)
--- a/config/rootfiles/common/xfsprogs
+++ b/config/rootfiles/common/xfsprogs
@@ -110,3 +110,4 @@ usr/sbin/xfs_spaceman
 #usr/share/xfsprogs/mkfs/lts_5.10.conf
 #usr/share/xfsprogs/mkfs/lts_5.15.conf
 #usr/share/xfsprogs/mkfs/lts_5.4.conf
+#usr/share/xfsprogs/mkfs/lts_6.1.conf

diff --git a/config/rootfiles/core/173/filelists/file b/config/rootfiles/core/173/filelists/file
new file mode 120000 (symlink)
index 0000000..0c60e43
--- /dev/null
+++ b/config/rootfiles/core/173/filelists/file
@@ -0,0 +1 @@
+../../../common/file
\ No newline at end of file

diff --git a/config/rootfiles/core/173/filelists/keyutils b/config/rootfiles/core/173/filelists/keyutils
new file mode 120000 (symlink)
index 0000000..4311917
--- /dev/null
+++ b/config/rootfiles/core/173/filelists/keyutils
@@ -0,0 +1 @@
+../../../common/keyutils
\ No newline at end of file

diff --git a/config/rootfiles/core/173/filelists/knot b/config/rootfiles/core/173/filelists/knot
new file mode 120000 (symlink)
index 0000000..28e96f8
--- /dev/null
+++ b/config/rootfiles/core/173/filelists/knot
@@ -0,0 +1 @@
+../../../common/knot
\ No newline at end of file

diff --git a/config/rootfiles/core/173/filelists/lcms2 b/config/rootfiles/core/173/filelists/lcms2
new file mode 120000 (symlink)
index 0000000..f72a394
--- /dev/null
+++ b/config/rootfiles/core/173/filelists/lcms2
@@ -0,0 +1 @@
+../../../common/lcms2
\ No newline at end of file

diff --git a/config/rootfiles/core/173/filelists/less b/config/rootfiles/core/173/filelists/less
new file mode 120000 (symlink)
index 0000000..65c0e07
--- /dev/null
+++ b/config/rootfiles/core/173/filelists/less
@@ -0,0 +1 @@
+../../../common/less
\ No newline at end of file

diff --git a/config/rootfiles/core/173/filelists/poppler b/config/rootfiles/core/173/filelists/poppler
new file mode 120000 (symlink)
index 0000000..39aa6c2
--- /dev/null
+++ b/config/rootfiles/core/173/filelists/poppler
@@ -0,0 +1 @@
+../../../common/poppler
\ No newline at end of file

diff --git a/config/rootfiles/core/173/filelists/sqlite b/config/rootfiles/core/173/filelists/sqlite
new file mode 120000 (symlink)
index 0000000..4ea5697
--- /dev/null
+++ b/config/rootfiles/core/173/filelists/sqlite
@@ -0,0 +1 @@
+../../../common/sqlite
\ No newline at end of file

diff --git a/config/rootfiles/core/173/filelists/xfsprogs b/config/rootfiles/core/173/filelists/xfsprogs
new file mode 120000 (symlink)
index 0000000..9103296
--- /dev/null
+++ b/config/rootfiles/core/173/filelists/xfsprogs
@@ -0,0 +1 @@
+../../../common/xfsprogs
\ No newline at end of file

diff --git a/lfs/file b/lfs/file
index 264c7322b13455d35df9365ca41b421a2f8897c6..7877425eae9c3f871f7abbb34936c06525c6181d 100644 (file)
--- a/lfs/file
+++ b/lfs/file
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2022  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 5.40
+VER        = 5.44
 
 THISAPP    = file-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 4e15a1ca62fe7c03c90b0e509dc899b87f4474f758ad3d08172b3d838dc3f7c2954ba1074eeeeb3da8c04b8df84eff2b8cdf3177da334a926914429df67f60bf
+$(DL_FILE)_BLAKE2 = a90ccae738a95315d75a0aaee7bbff3624425cc9267daf18ba9147b7c9b9ebfb31288b54c63a73e4695eca0e876f206e40bcb81c422f1bf572b976e753b25a42
 
 install : $(TARGET)
 

diff --git a/lfs/keyutils b/lfs/keyutils
index cbc4956eecd1a6a320cd4dee3e1c3cd6c7d674fc..293ae510d9dfc5ce44da6bb79f3418ccfb9e91dc 100644 (file)
--- a/lfs/keyutils
+++ b/lfs/keyutils
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2023  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 1.5.11
+VER        = 1.6.3
 
 THISAPP    = keyutils-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 1a601b7036bcfe69b6272ae2b4fad44cbb22877aa94722fa26460f8addf105ff8898e851ad7c4f28bc755f7fe293c74bc70cffbe877978e462bc21c428c9a11d
+$(DL_FILE)_BLAKE2 = b5620b1b6109415fec1268963c2c65d774f3ef7a69eb1ce8d5d8e78b4b807e4fdfda861662a1b5556975ef867add8f985362a31b6608ac2dc198c8d0395d516b
 
 install : $(TARGET)
 

diff --git a/lfs/knot b/lfs/knot
index 0c0c033c03e4634ce26f83970b2dcd5533d89945..feb3c89311593dde5d6dc59fb4146fca8c338509 100644 (file)
--- a/lfs/knot
+++ b/lfs/knot
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2022  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2023  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.1.7
+VER        = 3.2.4
 
 THISAPP    = knot-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = d0e5c999c1b4bca89b86ad956dd91643f795fcba94757e34c44e3e6b925030c332da9cb0bfd72d6ae0f32b3016a8c50d821cfcc513268682dd6b5715714d9047
+$(DL_FILE)_BLAKE2 = 1d5fec057898d8cbe73f37cd85aa9d56c7db0215e0fe8ba697f3ee4c38d7554780804b8859d062a824b18f823d6cff1546bd7ce54438ee54c555d068c5f19da1
 
 install : $(TARGET)
 

diff --git a/lfs/lcms2 b/lfs/lcms2
index bf317cdb2985935a66bd880cdc6f8716cbd6fce6..c769f1b08048c0b52ed2be3d6e1c08651e3fd35b 100644 (file)
--- a/lfs/lcms2
+++ b/lfs/lcms2
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2023  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.13.1
+VER        = 2.14
 
 THISAPP    = lcms2-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = ff4815fc4bcea94dc942f8072741c592f1bbde9c8e997f4e21e36cd271062a341ecc9b1f3c56e3e36ec19091fec049ee9faf75df04c2bc1e11174dc4cfe8da9e
+$(DL_FILE)_BLAKE2 = 777b0bf65829121a3d32bca1ab936ac022f9af739bccdd02d5f86688c3386b974f526a012bdec4d36649566eea0aa659db317dd383eede6488236d601156a0f9
 
 install : $(TARGET)
 

diff --git a/lfs/less b/lfs/less
index f99718c6b61b822a3483807da20e8a56f49b9f83..0ba8938f2377e05de58c259ab7de571c2a32c70e 100644 (file)
--- a/lfs/less
+++ b/lfs/less
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2019  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2023  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 590
+VER        = 608
 
 THISAPP    = less-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 0f640f1b6b4d4925c4904ee77460e8becd2dae168fe5c1483bf6a9cfabe9eb0abdc4d4811507ba88a2b4cff6c238158bd8b4463b63d3d7863b44ce8538d32adb
+$(DL_FILE)_BLAKE2 = 988940745fef1222c43b0bf4edec7cc7206ded0ac5d89d3faf4dab706a249913581c2fe7aa6063cf3d717176ed07b69299d3e791ba8a60358483fe9d1bf7f7c6
 
 install : $(TARGET)
 

diff --git a/lfs/mpfr b/lfs/mpfr
index f0c0109b2133bf621e85bcc08ac1510bdf2823f3..818566390b36d098c484a30d3e970e0e15be8fdc 100644 (file)
--- a/lfs/mpfr
+++ b/lfs/mpfr
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2022  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2023  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 4.1.1
+VER        = 4.2.0
 
 THISAPP    = mpfr-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = ce20baee2f060acb28b877ffe6fc40c5619cf6af231bd54ca6cfb3e42ef2d74a4ffbab96cf0b5dd6a162e558099a54701d42f34f5bf2256f256fe6f5ae2505d0
+$(DL_FILE)_BLAKE2 = dd88ae3a6a910ad8faeb791b49c3b1085de5d0d4c49c637c124bf4d9bc79fb621d0d1d69e07d0642b9b678f6d355a5830d083dfd189e1e91d0e04c970c10bd64
 
 install : $(TARGET)
 
@@ -70,7 +70,8 @@ $(subst %,%_BLAKE2,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/mpfr-4.1.1-cumulative-patches-1-to-1.patch
+# No patches yet for version 4.2.0
+#      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/mpfr-4.1.1-cumulative-patches-1-to-1.patch
        cd $(DIR_APP) && $(CONFIGURE_ARGS) ./configure --prefix=/usr \
                --enable-thread-safe
        cd $(DIR_APP) && make $(MAKETUNING)

diff --git a/lfs/poppler b/lfs/poppler
index 485500b702d96f3e7482cde26e912f84526adab0..f7ccb68babed94c36810f642a1d08140577694e7 100644 (file)
--- a/lfs/poppler
+++ b/lfs/poppler
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2022  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2023  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 22.11.0
+VER        = 23.01.0
 
 THISAPP    = poppler-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 958eb5e99725e46f3fd79138f4e1197ede9df5be19b6e5b0899b6a8c8b071734b3b41af7681bd857662e7d9c36fde09117418c1db347c5dad9a2fbd07cb1eec9
+$(DL_FILE)_BLAKE2 = 8dd85767a0c101b3d7166719374658a233aff491b0990917aacaa6fb3c5d8e51104b3ac45c78dcfb380286ea48067d1db57c2794d99a93cae9f4d64e9ca3dd07
 
 install : $(TARGET)
 

diff --git a/lfs/sqlite b/lfs/sqlite
index 180b7b30bd1db2d3589c73b3e85442ab8716ad12..49771ff339c933a7d0864e4755b0a11a512b47f2 100644 (file)
--- a/lfs/sqlite
+++ b/lfs/sqlite
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2022  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3400000
+VER        = 3400100
 
 THISAPP    = sqlite-autoconf-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = b5d03a5117de708681acb6074e63d1d5e6e45a260622b5f8efd31f52210097f31e5cf926802aa6e094ec6db0ac677fe62f9b34bf1f50a561efd1e8f110687021
+$(DL_FILE)_BLAKE2 = 495ffa185598b11e8258d2bfed88516753c0a13b3a67850f3464a112f225a13db3b75e4f977ed549305e05a995074a8c5ef12d65c2b353306e58c098c89b36b6
 
 install : $(TARGET)
 

diff --git a/lfs/xfsprogs b/lfs/xfsprogs
index b9ea1f6940fcf6b3fea3ff40d9269ca55bbd951d..92784a6198ead26ef172b274371b0187aab82533 100644 (file)
--- a/lfs/xfsprogs
+++ b/lfs/xfsprogs
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2022  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2023  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 5.18.0
+VER        = 6.1.0
 
 THISAPP    = xfsprogs-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = a2a2835d53ee6ac55279636f3f3cdcecab8757911ce5c1ea5f350a4da9ff4c1ca64b2aba1c0e5424c0c0a01fd0504396d5fecca12e4689c372ed5bb76b9ac24e
+$(DL_FILE)_BLAKE2 = 0be85ec90079bb4cb5888785f872365382dc2bdeb9f64780dfd3dd2c8ec5fdea7eda76f5fe683de7f768d5d4b822e85a59e80ed713f196647f5c4431601fab7b
 
 install : $(TARGET)
 

diff --git a/src/patches/mpfr-4.1.1-cumulative-patches-1-to-1.patch b/src/patches/mpfr-4.1.1-cumulative-patches-1-to-1.patch
deleted file mode 100644 (file)
index 0566c80..0000000
--- a/src/patches/mpfr-4.1.1-cumulative-patches-1-to-1.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff -Naurd mpfr-4.1.1-a/PATCHES mpfr-4.1.1-b/PATCHES
---- mpfr-4.1.1-a/PATCHES       2022-11-23 11:45:26.800476079 +0000
-+++ mpfr-4.1.1-b/PATCHES       2022-11-23 11:45:26.844475966 +0000
-@@ -0,0 +1 @@
-+mpfr_custom_get_kind
-diff -Naurd mpfr-4.1.1-a/VERSION mpfr-4.1.1-b/VERSION
---- mpfr-4.1.1-a/VERSION       2022-11-17 13:28:44.000000000 +0000
-+++ mpfr-4.1.1-b/VERSION       2022-11-23 11:45:26.844475966 +0000
-@@ -1 +1 @@
--4.1.1
-+4.1.1-p1
-diff -Naurd mpfr-4.1.1-a/src/mpfr.h mpfr-4.1.1-b/src/mpfr.h
---- mpfr-4.1.1-a/src/mpfr.h    2022-11-17 13:28:44.000000000 +0000
-+++ mpfr-4.1.1-b/src/mpfr.h    2022-11-23 11:45:26.840475978 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 4
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 1
--#define MPFR_VERSION_STRING "4.1.1"
-+#define MPFR_VERSION_STRING "4.1.1-p1"
- 
- /* User macros:
-    MPFR_USE_FILE:        Define it to make MPFR define functions dealing
-@@ -1027,7 +1027,7 @@
- #if __GNUC__ > 2 || __GNUC_MINOR__ >= 95
- #define mpfr_custom_get_kind(x)                                         \
-   __extension__ ({                                                      \
--    mpfr_ptr _x = (x);                                                  \
-+    mpfr_srcptr _x = (x);                                               \
-     _x->_mpfr_exp >  __MPFR_EXP_INF ?                                   \
-       (mpfr_int) MPFR_REGULAR_KIND * MPFR_SIGN (_x)                     \
-       : _x->_mpfr_exp == __MPFR_EXP_INF ?                               \
-diff -Naurd mpfr-4.1.1-a/src/version.c mpfr-4.1.1-b/src/version.c
---- mpfr-4.1.1-a/src/version.c 2022-11-17 13:28:44.000000000 +0000
-+++ mpfr-4.1.1-b/src/version.c 2022-11-23 11:45:26.844475966 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "4.1.1";
-+  return "4.1.1-p1";
- }
-diff -Naurd mpfr-4.1.1-a/tests/tstckintc.c mpfr-4.1.1-b/tests/tstckintc.c
---- mpfr-4.1.1-a/tests/tstckintc.c     2022-05-06 13:47:17.000000000 +0000
-+++ mpfr-4.1.1-b/tests/tstckintc.c     2022-11-23 11:45:26.836475987 +0000
-@@ -295,14 +295,16 @@
- test_nan_inf_zero (void)
- {
-   mpfr_ptr val;
-+  mpfr_srcptr sval;  /* for compilation error checking */
-   int sign;
-   int kind;
- 
-   reset_stack ();
- 
-   val = new_mpfr (MPFR_PREC_MIN);
-+  sval = val;
-   mpfr_set_nan (val);
--  kind = (mpfr_custom_get_kind) (val);
-+  kind = (mpfr_custom_get_kind) (sval);
-   if (kind != MPFR_NAN_KIND)
-     {
-       printf ("mpfr_custom_get_kind error: ");
-@@ -380,7 +382,8 @@
- dummy_set_si (long si)
- {
-   mpfr_t x;
--  long * r = dummy_new ();
-+  mpfr_srcptr px;  /* for compilation error checking */
-+  long *r = dummy_new ();
-   int i1, i2, i3, i4, i5;
- 
-   /* Check that the type "void *" can be used, like with the function.
-@@ -405,7 +408,8 @@
-   MPFR_ASSERTN (i5 == 1);
- 
-   mpfr_set_si (x, si, MPFR_RNDN);
--  r[0] = mpfr_custom_get_kind (x);
-+  px = x;
-+  r[0] = mpfr_custom_get_kind (px);
- 
-   /* Check that the type "void *" can be used in C, like with the function
-      (forbidden in C++). Also check side effects. */