May 2023 - crux-commits - lists.crux.nu

ports/compat-32 (3.7): libxml2-32: 2.11.2 -> 2.11.3
by crux＠crux.nu 13 May '23

13 May '23

commit d32eae7d905a92c72b8d8cbc79c5f4265504edb3 Author: Tim Biermann <tbier(a)posteo.de> Date: Sat May 13 17:12:05 2023 +0200 libxml2-32: 2.11.2 -> 2.11.3 diff --git a/libxml2-32/.footprint b/libxml2-32/.footprint index 38f83f9..986ed76 100644 --- a/libxml2-32/.footprint +++ b/libxml2-32/.footprint @@ -4,8 +4,8 @@ drwxr-xr-x root/root usr/lib32/cmake/ drwxr-xr-x root/root usr/lib32/cmake/libxml2/ -rw-r--r-- root/root usr/lib32/cmake/libxml2/libxml2-config.cmake -rwxr-xr-x root/root usr/lib32/libxml2.la -lrwxrwxrwx root/root usr/lib32/libxml2.so -> libxml2.so.2.11.2 -lrwxrwxrwx root/root usr/lib32/libxml2.so.2 -> libxml2.so.2.11.2 --rwxr-xr-x root/root usr/lib32/libxml2.so.2.11.2 +lrwxrwxrwx root/root usr/lib32/libxml2.so -> libxml2.so.2.11.3 +lrwxrwxrwx root/root usr/lib32/libxml2.so.2 -> libxml2.so.2.11.3 +-rwxr-xr-x root/root usr/lib32/libxml2.so.2.11.3 drwxr-xr-x root/root usr/lib32/pkgconfig/ -rw-r--r-- root/root usr/lib32/pkgconfig/libxml-2.0.pc diff --git a/libxml2-32/.signature b/libxml2-32/.signature index 025b57a..1c360e7 100644 --- a/libxml2-32/.signature +++ b/libxml2-32/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXaTnE0qua8/hZ6RYKHDyTJVQcXTsk136Ww61GOO057LCM50p2+XOWWpnzoWO/jwdfc3x4q26d+WzLO1GuRSgTg0= -SHA256 (Pkgfile) = 56a944484584a53936fc70c1c8e7ca56e2e3855e05c5b69aa43262cbd1eeeac3 -SHA256 (.footprint) = 50f6dd3fabfd35a32829218ba4d5fb9d77a20a2ec5e9a390229575cecc74eb1c -SHA256 (libxml2-2.11.2.tar.xz) = ac11e8b66176d49514bd4fa17c3fbdb3414aef64518ff9db536862e4682e2a64 +RWSwxGo/zH7eXVRY7cC0ususvAq7hL6kYdnwoUWwAJdoHbgc1RnIqqMzPrpbqzoefrt6PgoODMztoVkV5zZELkQgytWsdTRpIwA= +SHA256 (Pkgfile) = bac83438ce24428a18fe6f601553f91e8a363b57fba8a9eafc289e1176120b0c +SHA256 (.footprint) = 1da6f197f558976566f6a10ff11666603f2d262b2db1b42d97bd8dc63f24f962 +SHA256 (libxml2-2.11.3.tar.xz) = f1acae1664bda006cd81bfc238238217043d586d06659d5c0e3d1bcebe040870 diff --git a/libxml2-32/Pkgfile b/libxml2-32/Pkgfile index f4e3cfd..345d02d 100644 --- a/libxml2-32/Pkgfile +++ b/libxml2-32/Pkgfile @@ -4,7 +4,7 @@ # Depends on: libxml2 xz-32 zlib-32 name=libxml2-32 -version=2.11.2 +version=2.11.3 release=1 source=(https://download.gnome.org/sources/libxml2/${version:0:4}/libxml2-$…

1 0

ports/compat-32 (3.7): libxslt-32: 1.1.37 -> 1.1.38
by crux＠crux.nu 13 May '23

13 May '23

commit 497db8e904d2325e2aa0eb7bc48cb68817e40d6f Author: Tim Biermann <tbier(a)posteo.de> Date: Sat May 13 17:10:45 2023 +0200 libxslt-32: 1.1.37 -> 1.1.38 diff --git a/libxslt-32/.footprint b/libxslt-32/.footprint index c2cb438..8bb5a1f 100644 --- a/libxslt-32/.footprint +++ b/libxslt-32/.footprint @@ -5,14 +5,14 @@ drwxr-xr-x root/root usr/lib32/cmake/libxslt/ -rw-r--r-- root/root usr/lib32/cmake/libxslt/FindGcrypt.cmake -rw-r--r-- root/root usr/lib32/cmake/libxslt/libxslt-config.cmake -rwxr-xr-x root/root usr/lib32/libexslt.la -lrwxrwxrwx root/root usr/lib32/libexslt.so -> libexslt.so.0.8.20 -lrwxrwxrwx root/root usr/lib32/libexslt.so.0 -> libexslt.so.0.8.20 --rwxr-xr-x root/root usr/lib32/libexslt.so.0.8.20 +lrwxrwxrwx root/root usr/lib32/libexslt.so -> libexslt.so.0.8.21 +lrwxrwxrwx root/root usr/lib32/libexslt.so.0 -> libexslt.so.0.8.21 +-rwxr-xr-x root/root usr/lib32/libexslt.so.0.8.21 drwxr-xr-x root/root usr/lib32/libxslt-plugins/ -rwxr-xr-x root/root usr/lib32/libxslt.la -lrwxrwxrwx root/root usr/lib32/libxslt.so -> libxslt.so.1.1.37 -lrwxrwxrwx root/root usr/lib32/libxslt.so.1 -> libxslt.so.1.1.37 --rwxr-xr-x root/root usr/lib32/libxslt.so.1.1.37 +lrwxrwxrwx root/root usr/lib32/libxslt.so -> libxslt.so.1.1.38 +lrwxrwxrwx root/root usr/lib32/libxslt.so.1 -> libxslt.so.1.1.38 +-rwxr-xr-x root/root usr/lib32/libxslt.so.1.1.38 drwxr-xr-x root/root usr/lib32/pkgconfig/ -rw-r--r-- root/root usr/lib32/pkgconfig/libexslt.pc -rw-r--r-- root/root usr/lib32/pkgconfig/libxslt.pc diff --git a/libxslt-32/.signature b/libxslt-32/.signature index 18b040f..e49511a 100644 --- a/libxslt-32/.signature +++ b/libxslt-32/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXQVRLJEWfxZUVB6pWwTVJqVUF/tS3m4Zu7/JsLBl4lSee3pp5paVonR7CWjU8oaqBlNXzThgacw6Gp/0MMMNoAs= -SHA256 (Pkgfile) = 899609e99474512f07dba15daaaaa15b1b71c591b00ac53734afff133a46b3ed -SHA256 (.footprint) = 0fcbfe49a7090627261c68c687e982e70f463a0d96307a23627353f22bf894b0 -SHA256 (libxslt-1.1.37.tar.xz) = 3a4b27dc8027ccd6146725950336f1ec520928f320f144eb5fa7990ae6123ab4 +RWSwxGo/zH7eXRnyaKpYR7nFnrmjN7JoIFFzHavt03G8kutKHwbDGQyIXlgs4cRNeT1KMl9a5BlgrPYimEVlw/G5JLfQN6yhUQw= +SHA256 (Pkgfile) = 43f580f9f73766a46ea94d528936ae2a12486421dfcc1762e368ef85a7d56987 +SHA256 (.footprint) = 75d3922b883345936f85803097695d1787dc330cd885ebf9034c917dbe6097a8 +SHA256 (libxslt-1.1.38.tar.xz) = 1f32450425819a09acaff2ab7a5a7f8a2ec7956e505d7beeb45e843d0e1ecab1 diff --git a/libxslt-32/Pkgfile b/libxslt-32/Pkgfile index 925e79b..22534b4 100644 --- a/libxslt-32/Pkgfile +++ b/libxslt-32/Pkgfile @@ -4,7 +4,7 @@ # Depends on: libxml2-32 libxslt name=libxslt-32 -version=1.1.37 +version=1.1.38 release=1 source=(https://download.gnome.org/sources/libxslt/${version:0:3}/libxslt-$…

1 0

ports/core (3.7): libmpfr: update to 4.2.0-p7
by crux＠crux.nu 13 May '23

13 May '23

commit 00b1a59e37a45e6b30a4f26d83871044b9b2367a Author: Juergen Daubert <jue(a)jue.li> Date: Sat May 13 10:11:12 2023 +0200 libmpfr: update to 4.2.0-p7 diff --git a/libmpfr/.signature b/libmpfr/.signature index 36f1a6d8..072bd2e8 100644 --- a/libmpfr/.signature +++ b/libmpfr/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVeqkkytQ+9E26I6fsiWPWY1GommWX/lWuQR65vqUD/j+7FBDM3mmIU3Pg6du+GTtWRB9ggGfWQ3l/kNDiNXor+fAQ= -SHA256 (Pkgfile) = ae052b9759cb7a5df44cd9447237c96105881e2663046800674ffeddd002e548 +RWRJc1FUaeVeqn1ZRSb6+90p5CoqZyMzRY1glv7QgUwGQatC7uHKQCbcXuLWK/eFmeLZ1VvCD7QyQ80qHR6QkrGYthBEmgdcggk= +SHA256 (Pkgfile) = ab63a0d123a608d0fd9ea843d37a0e7ea2663650cb0a4a8a0f2b80ca9adc1b8d SHA256 (.footprint) = 1814f0743513a2b286e995ff4515e8cf16705a68e084fd4cf6e685255a970721 SHA256 (mpfr-4.2.0.tar.xz) = 06a378df13501248c1b2db5aa977a2c8126ae849a9d9b7be2546fb4a9c26d993 -SHA256 (libmpfr-4.2.0-p4.patch) = 811d3b45c8fc98affbeb0aba2d183ff17339ca2c31958b2f1dfeda1249cc3366 +SHA256 (libmpfr-4.2.0-p7.patch) = c4570f9ed20cee8280c59fedddce6e16ee5b8ededa7004af13c6cacbc487bb93 diff --git a/libmpfr/Pkgfile b/libmpfr/Pkgfile index 107b26b6..32a3677e 100644 --- a/libmpfr/Pkgfile +++ b/libmpfr/Pkgfile @@ -4,7 +4,7 @@ # Depends on: libgmp name=libmpfr -version=4.2.0-p4 +version=4.2.0-p7 release=1 source=(https://www.mpfr.org/mpfr-${version%-*}/mpfr-${version%-*}.tar.xz $name-$version.patch) diff --git a/libmpfr/libmpfr-4.2.0-p4.patch b/libmpfr/libmpfr-4.2.0-p4.patch deleted file mode 100644 index e12ed470..00000000 --- a/libmpfr/libmpfr-4.2.0-p4.patch +++ /dev/null @@ -1,521 +0,0 @@ -diff -Naurd mpfr-4.2.0-a/PATCHES mpfr-4.2.0-b/PATCHES ---- mpfr-4.2.0-a/PATCHES 2023-04-17 21:17:39.748645280 +0000 -+++ mpfr-4.2.0-b/PATCHES 2023-04-17 21:17:39.792645218 +0000 -@@ -0,0 +1 @@ -+tsprintf-thousands -diff -Naurd mpfr-4.2.0-a/VERSION mpfr-4.2.0-b/VERSION ---- mpfr-4.2.0-a/VERSION 2023-01-06 10:55:57.000000000 +0000 -+++ mpfr-4.2.0-b/VERSION 2023-04-17 21:17:39.792645218 +0000 -@@ -1 +1 @@ --4.2.0 -+4.2.0-p1 -diff -Naurd mpfr-4.2.0-a/src/mpfr.h mpfr-4.2.0-b/src/mpfr.h ---- mpfr-4.2.0-a/src/mpfr.h 2023-01-06 10:55:57.000000000 +0000 -+++ mpfr-4.2.0-b/src/mpfr.h 2023-04-17 21:17:39.788645224 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 4 - #define MPFR_VERSION_MINOR 2 - #define MPFR_VERSION_PATCHLEVEL 0 --#define MPFR_VERSION_STRING "4.2.0" -+#define MPFR_VERSION_STRING "4.2.0-p1" - - /* User macros: - MPFR_USE_FILE: Define it to make MPFR define functions dealing -diff -Naurd mpfr-4.2.0-a/src/version.c mpfr-4.2.0-b/src/version.c ---- mpfr-4.2.0-a/src/version.c 2023-01-06 10:55:57.000000000 +0000 -+++ mpfr-4.2.0-b/src/version.c 2023-04-17 21:17:39.792645218 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "4.2.0"; -+ return "4.2.0-p1"; - } -diff -Naurd mpfr-4.2.0-a/tests/tsprintf.c mpfr-4.2.0-b/tests/tsprintf.c ---- mpfr-4.2.0-a/tests/tsprintf.c 2023-01-05 17:09:48.000000000 +0000 -+++ mpfr-4.2.0-b/tests/tsprintf.c 2023-04-17 21:17:39.784645229 +0000 -@@ -1715,7 +1715,25 @@ - check_sprintf ("000000001,000", "%'013.4Rg", x); - - #ifdef PRINTF_GROUPFLAG -- check_vsprintf ("+01,234,567 :", "%0+ -'13.10Pd:", (mpfr_prec_t) 1234567); -+ /* Do not test the thousands separator with a precision field larger -+ than the number of digits (thus needing leading zeros), such as -+ "%0+ -'13.10Pd:" (used up to MPFR 4.2.0), since the GNU libc is -+ buggy: https://sourceware.org/bugzilla/show_bug.cgi?id=23432 -+ We don't know about the other implementations. -+ This new test works fine with glibc up to 2.36, but fails with 2.37 -+ (as reported by Klaus Dittrich in the MPFR mailing-list); this is -+ actually a bug introduced in glibc 2.37, not in MPFR: -+ https://sourceware.org/bugzilla/show_bug.cgi?id=30068 -+ Since this bug can yield a buffer overflow (CVE-2023-25139), possibly -+ affecting MPFR users, let us rather require a fix in glibc. This bug -+ has been fixed in the 2.37 branch: -+ https://sourceware.org/git/?p=glibc.git;a=commit;h=07b9521fc6 -+ If we wanted to check that and avoid a failure of the test because of -+ a buggy C library (while MPFR would be consistent with the C library), -+ we could compare the MPFR output with both the correct output and the -+ output from the C library (possibly buggy). But to do that in a clean -+ way, this would require a change in the check_vsprintf() call. */ -+ check_vsprintf ("+1,234,567 :", "%0+ -'13Pd:", (mpfr_prec_t) 1234567); - #endif - - mpfr_clear (x); -diff -Naurd mpfr-4.2.0-a/PATCHES mpfr-4.2.0-b/PATCHES ---- mpfr-4.2.0-a/PATCHES 2023-04-17 21:18:00.464616127 +0000 -+++ mpfr-4.2.0-b/PATCHES 2023-04-17 21:18:00.512616059 +0000 -@@ -0,0 +1 @@ -+ui_pow_ui-overflow -diff -Naurd mpfr-4.2.0-a/VERSION mpfr-4.2.0-b/VERSION ---- mpfr-4.2.0-a/VERSION 2023-04-17 21:17:39.792645218 +0000 -+++ mpfr-4.2.0-b/VERSION 2023-04-17 21:18:00.512616059 +0000 -@@ -1 +1 @@ --4.2.0-p1 -+4.2.0-p2 -diff -Naurd mpfr-4.2.0-a/src/mpfr.h mpfr-4.2.0-b/src/mpfr.h ---- mpfr-4.2.0-a/src/mpfr.h 2023-04-17 21:17:39.788645224 +0000 -+++ mpfr-4.2.0-b/src/mpfr.h 2023-04-17 21:18:00.508616065 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 4 - #define MPFR_VERSION_MINOR 2 - #define MPFR_VERSION_PATCHLEVEL 0 --#define MPFR_VERSION_STRING "4.2.0-p1" -+#define MPFR_VERSION_STRING "4.2.0-p2" - - /* User macros: - MPFR_USE_FILE: Define it to make MPFR define functions dealing -diff -Naurd mpfr-4.2.0-a/src/ui_pow_ui.c mpfr-4.2.0-b/src/ui_pow_ui.c ---- mpfr-4.2.0-a/src/ui_pow_ui.c 2023-01-05 17:09:48.000000000 +0000 -+++ mpfr-4.2.0-b/src/ui_pow_ui.c 2023-04-17 21:18:00.504616070 +0000 -@@ -23,7 +23,7 @@ - #include "mpfr-impl.h" - - int --mpfr_ui_pow_ui (mpfr_ptr x, unsigned long int y, unsigned long int n, -+mpfr_ui_pow_ui (mpfr_ptr x, unsigned long int k, unsigned long int n, - mpfr_rnd_t rnd) - { - mpfr_exp_t err; -@@ -35,22 +35,28 @@ - MPFR_ZIV_DECL (loop); - MPFR_SAVE_EXPO_DECL (expo); - -+ MPFR_LOG_FUNC -+ (("k=%lu n=%lu rnd=%d", k, n, rnd), -+ ("y[%Pu]=%.*Rg inexact=%d", -+ mpfr_get_prec (x), mpfr_log_prec, x, inexact)); -+ - if (MPFR_UNLIKELY (n <= 1)) - { - if (n == 1) -- return mpfr_set_ui (x, y, rnd); /* y^1 = y */ -+ return mpfr_set_ui (x, k, rnd); /* k^1 = k */ - else -- return mpfr_set_ui (x, 1, rnd); /* y^0 = 1 for any y */ -+ return mpfr_set_ui (x, 1, rnd); /* k^0 = 1 for any k */ - } -- else if (MPFR_UNLIKELY (y <= 1)) -+ else if (MPFR_UNLIKELY (k <= 1)) - { -- if (y == 1) -+ if (k == 1) - return mpfr_set_ui (x, 1, rnd); /* 1^n = 1 for any n > 0 */ - else - return mpfr_set_ui (x, 0, rnd); /* 0^n = 0 for any n > 0 */ - } - -- for (size_n = 0, m = n; m; size_n++, m >>= 1); -+ for (size_n = 0, m = n; m != 0; size_n++, m >>= 1) -+ ; - - MPFR_SAVE_EXPO_MARK (expo); - prec = MPFR_PREC (x) + 3 + size_n; -@@ -60,23 +66,55 @@ - for (;;) - { - int i = size_n; -+ unsigned int inex_res; - -- inexact = mpfr_set_ui (res, y, MPFR_RNDU); -+ inex_res = mpfr_set_ui (res, k, MPFR_RNDU); - err = 1; - /* now 2^(i-1) <= n < 2^i: i=1+floor(log2(n)) */ - for (i -= 2; i >= 0; i--) - { -- inexact |= mpfr_sqr (res, res, MPFR_RNDU); -+ inex_res |= mpfr_sqr (res, res, MPFR_RNDU); - err++; - if (n & (1UL << i)) -- inexact |= mpfr_mul_ui (res, res, y, MPFR_RNDU); -+ inex_res |= mpfr_mul_ui (res, res, k, MPFR_RNDU); - } -+ -+ if (MPFR_UNLIKELY (MPFR_IS_INF (res))) -+ { -+ mpfr_t kf; -+ mpz_t z; -+ int size_k; -+ MPFR_BLOCK_DECL (flags); -+ -+ /* Let's handle the overflow by calling mpfr_pow_z. -+ Alternatively, we could call mpfr_pow_ui; this would -+ need a bit shorter code below, but mpfr_pow_ui handles -+ the overflow by calling mpfr_pow_z, so that calling -+ mpfr_pow_z directly should be a bit more efficient. */ -+ -+ MPFR_ZIV_FREE (loop); -+ mpfr_clear (res); -+ for (size_k = 0, m = k; m != 0; size_k++, m >>= 1) -+ ; -+ mpfr_init2 (kf, size_k); -+ inexact = mpfr_set_ui (kf, k, MPFR_RNDN); -+ MPFR_ASSERTD (inexact == 0); -+ mpz_init (z); -+ mpz_set_ui (z, n); -+ MPFR_BLOCK (flags, inexact = mpfr_pow_z (x, kf, z, rnd);); -+ mpz_clear (z); -+ mpfr_clear (kf); -+ MPFR_SAVE_EXPO_UPDATE_FLAGS (expo, flags); -+ goto end; -+ } -+ - /* since the loop is executed floor(log2(n)) times, - we have err = 1+floor(log2(n)). - Since prec >= MPFR_PREC(x) + 4 + floor(log2(n)), prec > err */ - err = prec - err; - -- if (MPFR_LIKELY (inexact == 0 -+ MPFR_LOG_VAR (res); -+ if (MPFR_LIKELY (!inex_res - || MPFR_CAN_ROUND (res, err, MPFR_PREC (x), rnd))) - break; - -@@ -90,6 +128,7 @@ - - mpfr_clear (res); - -+ end: - MPFR_SAVE_EXPO_FREE (expo); - return mpfr_check_range (x, inexact, rnd); - } -diff -Naurd mpfr-4.2.0-a/src/version.c mpfr-4.2.0-b/src/version.c ---- mpfr-4.2.0-a/src/version.c 2023-04-17 21:17:39.792645218 +0000 -+++ mpfr-4.2.0-b/src/version.c 2023-04-17 21:18:00.512616059 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "4.2.0-p1"; -+ return "4.2.0-p2"; - } -diff -Naurd mpfr-4.2.0-a/tests/tlog10.c mpfr-4.2.0-b/tests/tlog10.c ---- mpfr-4.2.0-a/tests/tlog10.c 2023-01-05 17:09:48.000000000 +0000 -+++ mpfr-4.2.0-b/tests/tlog10.c 2023-04-17 21:18:00.504616070 +0000 -@@ -49,6 +49,60 @@ - #define TEST_RANDOM_POS 8 - #include "tgeneric.c" - -+/* On 2023-02-13, one gets an infinite loop in mpfr_log10 on both -+ 32-bit and 64-bit hosts when the precision is not large enough -+ (precision 12 and below). */ -+static void -+bug20230213 (void) -+{ -+ mpfr_exp_t old_emin, old_emax, e; -+ mpfr_t t, x, y0, y1, y2; -+ int prec; -+ -+ old_emin = mpfr_get_emin (); -+ old_emax = mpfr_get_emax (); -+ -+ set_emin (MPFR_EMIN_MIN); -+ set_emax (MPFR_EMAX_MAX); -+ e = mpfr_get_emax () - 1; -+ -+ /* The precisions of t and y0 should be large enough to avoid -+ a hard-to-round case for the target precisions. */ -+ mpfr_inits2 (64, t, y0, (mpfr_ptr) 0); -+ mpfr_set_exp_t (y0, e, MPFR_RNDN); -+ mpfr_log_ui (t, 10, MPFR_RNDN); -+ mpfr_div (y0, y0, t, MPFR_RNDN); -+ mpfr_log_ui (t, 2, MPFR_RNDN); -+ mpfr_mul (y0, y0, t, MPFR_RNDN); -+ -+ for (prec = 16; prec >= MPFR_PREC_MIN; prec--) -+ { -+ mpfr_inits2 (prec, x, y1, y2, (mpfr_ptr) 0); -+ mpfr_set (y1, y0, MPFR_RNDN); -+ -+ mpfr_set_ui_2exp (x, 1, e, MPFR_RNDN); -+ mpfr_log10 (y2, x, MPFR_RNDN); -+ MPFR_ASSERTN (MPFR_IS_PURE_FP (y2)); -+ MPFR_ASSERTN (MPFR_IS_POS (y2)); -+ -+ if (! mpfr_equal_p (y1, y2)) -+ { -+ printf ("Error in bug20230213.\n"); -+ printf ("Expected "); -+ mpfr_dump (y1); -+ printf ("Got "); -+ mpfr_dump (y2); -+ exit (1); -+ } -+ mpfr_clears (x, y1, y2, (mpfr_ptr) 0); -+ } -+ -+ mpfr_clears (t, y0, (mpfr_ptr) 0); -+ -+ set_emin (old_emin); -+ set_emax (old_emax); -+} -+ - int - main (int argc, char *argv[]) - { -@@ -112,6 +166,8 @@ - mpfr_clear (x); - mpfr_clear (y); - -+ bug20230213 (); -+ - data_check ("data/log10", mpfr_log10, "mpfr_log10"); - - tests_end_mpfr (); -diff -Naurd mpfr-4.2.0-a/tests/tui_pow.c mpfr-4.2.0-b/tests/tui_pow.c ---- mpfr-4.2.0-a/tests/tui_pow.c 2023-01-05 17:09:48.000000000 +0000 -+++ mpfr-4.2.0-b/tests/tui_pow.c 2023-04-17 21:18:00.504616070 +0000 -@@ -142,6 +142,37 @@ - mpfr_clear (t); - } - -+static void -+huge (void) -+{ -+ mpfr_exp_t old_emin, old_emax; -+ mpfr_t x; -+ -+ old_emin = mpfr_get_emin (); -+ old_emax = mpfr_get_emax (); -+ -+ set_emin (MPFR_EMIN_MIN); -+ set_emax (MPFR_EMAX_MAX); -+ -+ mpfr_init2 (x, 8); -+ -+ /* The purpose of this test is more to check that mpfr_ui_pow_ui -+ terminates (without taking much memory) rather than checking -+ the value of x. On 2023-02-13, the +Inf case was not handled -+ in the Ziv iteration, yielding an infinite loop, affecting -+ mpfr_log10 in particular. See -+ commit 90de094f0d9c309daca707aa227470d810866616 -+ */ -+ mpfr_ui_pow_ui (x, 5, ULONG_MAX, MPFR_RNDN); -+ if (MPFR_EMAX_MAX <= ULONG_MAX) /* true with default _MPFR_EXP_FORMAT */ -+ MPFR_ASSERTN (MPFR_IS_INF (x)); -+ -+ mpfr_clear (x); -+ -+ set_emin (old_emin); -+ set_emax (old_emax); -+} -+ - int - main (int argc, char *argv[]) - { -@@ -180,6 +211,7 @@ - } - - test1 (); -+ huge (); - - { - mpfr_t z, t; -diff -Naurd mpfr-4.2.0-a/PATCHES mpfr-4.2.0-b/PATCHES ---- mpfr-4.2.0-a/PATCHES 2023-04-17 21:18:26.860579184 +0000 -+++ mpfr-4.2.0-b/PATCHES 2023-04-17 21:18:26.904579122 +0000 -@@ -0,0 +1 @@ -+multibyte-decimal_point -diff -Naurd mpfr-4.2.0-a/VERSION mpfr-4.2.0-b/VERSION ---- mpfr-4.2.0-a/VERSION 2023-04-17 21:18:00.512616059 +0000 -+++ mpfr-4.2.0-b/VERSION 2023-04-17 21:18:26.904579122 +0000 -@@ -1 +1 @@ --4.2.0-p2 -+4.2.0-p3 -diff -Naurd mpfr-4.2.0-a/src/mpfr.h mpfr-4.2.0-b/src/mpfr.h ---- mpfr-4.2.0-a/src/mpfr.h 2023-04-17 21:18:00.508616065 +0000 -+++ mpfr-4.2.0-b/src/mpfr.h 2023-04-17 21:18:26.900579128 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 4 - #define MPFR_VERSION_MINOR 2 - #define MPFR_VERSION_PATCHLEVEL 0 --#define MPFR_VERSION_STRING "4.2.0-p2" -+#define MPFR_VERSION_STRING "4.2.0-p3" - - /* User macros: - MPFR_USE_FILE: Define it to make MPFR define functions dealing -diff -Naurd mpfr-4.2.0-a/src/version.c mpfr-4.2.0-b/src/version.c ---- mpfr-4.2.0-a/src/version.c 2023-04-17 21:18:00.512616059 +0000 -+++ mpfr-4.2.0-b/src/version.c 2023-04-17 21:18:26.904579122 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "4.2.0-p2"; -+ return "4.2.0-p3"; - } -diff -Naurd mpfr-4.2.0-a/tests/tfprintf.c mpfr-4.2.0-b/tests/tfprintf.c ---- mpfr-4.2.0-a/tests/tfprintf.c 2023-01-05 17:09:48.000000000 +0000 -+++ mpfr-4.2.0-b/tests/tfprintf.c 2023-04-17 21:18:26.896579133 +0000 -@@ -61,6 +61,12 @@ - exit (1); \ - } - -+#if MPFR_LCONV_DPTS -+#define DPLEN ((int) strlen (localeconv()->decimal_point)) -+#else -+#define DPLEN 1 -+#endif -+ - /* limit for random precision in random() */ - const int prec_max_printf = 5000; - -@@ -195,12 +201,12 @@ - lo, &ulo); - check_length (2, ulo, 36, lu); - check_vfprintf (fout, "a. %hi, b. %*f, c. %Re%hn", ush, 3, f, mpfr, &ush); -- check_length (3, ush, 46, hu); -+ check_length (3, ush, 45 + DPLEN, hu); - check_vfprintf (fout, "a. %hi, b. %f, c. %#.2Rf%n", sh, d, mpfr, &i); -- check_length (4, i, 29, d); -+ check_length (4, i, 28 + DPLEN, d); - check_vfprintf (fout, "a. %R*A, b. %Fe, c. %i%zn", rnd, mpfr, mpf, sz, - &sz); -- check_length (5, (unsigned long) sz, 34, lu); /* no format specifier "%zu" in C90 */ -+ check_length (5, (unsigned long) sz, 33 + DPLEN, lu); /* no format specifier "%zu" in C90 */ - check_vfprintf (fout, "a. %Pu, b. %c, c. %Zi%Zn", prec, ch, mpz, &mpz); - check_length_with_cmp (6, mpz, 17, mpz_cmp_ui (mpz, 17), Zi); - check_vfprintf (fout, "%% a. %#.0RNg, b. %Qx%Rn, c. %p", mpfr, mpq, &mpfr, -@@ -224,7 +230,7 @@ - - #ifdef PRINTF_L - check_vfprintf (fout, "a. %RA, b. %Lf, c. %QX%zn", mpfr, ld, mpq, &sz); -- check_length (9, (unsigned long) sz, 30, lu); /* no format specifier "%zu" in C90 */ -+ check_length (9, (unsigned long) sz, 29 + DPLEN, lu); /* no format specifier "%zu" in C90 */ - #endif - - #ifndef NPRINTF_HH -diff -Naurd mpfr-4.2.0-a/tests/tprintf.c mpfr-4.2.0-b/tests/tprintf.c ---- mpfr-4.2.0-a/tests/tprintf.c 2023-01-05 17:09:48.000000000 +0000 -+++ mpfr-4.2.0-b/tests/tprintf.c 2023-04-17 21:18:26.896579133 +0000 -@@ -68,6 +68,12 @@ - exit (1); \ - } - -+#if MPFR_LCONV_DPTS -+#define DPLEN ((int) strlen (localeconv()->decimal_point)) -+#else -+#define DPLEN 1 -+#endif -+ - /* limit for random precision in random() */ - const int prec_max_printf = 5000; - /* boolean: is stdout redirected to a file ? */ -@@ -316,11 +322,11 @@ - check_vprintf ("a. %c, b. %Rb, c. %u, d. %li%ln", i, mpfr, i, lo, &ulo); - check_length (2, ulo, 36, lu); - check_vprintf ("a. %hi, b. %*f, c. %Re%hn", ush, 3, f, mpfr, &ush); -- check_length (3, ush, 46, hu); -+ check_length (3, ush, 45 + DPLEN, hu); - check_vprintf ("a. %hi, b. %f, c. %#.2Rf%n", sh, d, mpfr, &i); -- check_length (4, i, 29, d); -+ check_length (4, i, 28 + DPLEN, d); - check_vprintf ("a. %R*A, b. %Fe, c. %i%zn", rnd, mpfr, mpf, sz, &sz); -- check_length (5, (unsigned long) sz, 34, lu); /* no format specifier '%zu' in C90 */ -+ check_length (5, (unsigned long) sz, 33 + DPLEN, lu); /* no format specifier '%zu' in C90 */ - check_vprintf ("a. %Pu, b. %c, c. %RUG, d. %Zi%Zn", prec, ch, mpfr, mpz, &mpz); - check_length_with_cmp (6, mpz, 24, mpz_cmp_ui (mpz, 24), Zi); - check_vprintf ("%% a. %#.0RNg, b. %Qx%Rn c. %p", -@@ -344,7 +350,7 @@ - - #ifdef PRINTF_L - check_vprintf ("a. %RA, b. %Lf, c. %QX%zn", mpfr, ld, mpq, &sz); -- check_length (9, (unsigned long) sz, 30, lu); /* no format specifier '%zu' in C90 */ -+ check_length (9, (unsigned long) sz, 29 + DPLEN, lu); /* no format specifier '%zu' in C90 */ - #endif - - #ifndef NPRINTF_HH -diff -Naurd mpfr-4.2.0-a/PATCHES mpfr-4.2.0-b/PATCHES ---- mpfr-4.2.0-a/PATCHES 2023-04-17 21:19:01.988530337 +0000 -+++ mpfr-4.2.0-b/PATCHES 2023-04-17 21:19:02.032530276 +0000 -@@ -0,0 +1 @@ -+rec_sqrt-zivloop -diff -Naurd mpfr-4.2.0-a/VERSION mpfr-4.2.0-b/VERSION ---- mpfr-4.2.0-a/VERSION 2023-04-17 21:18:26.904579122 +0000 -+++ mpfr-4.2.0-b/VERSION 2023-04-17 21:19:02.032530276 +0000 -@@ -1 +1 @@ --4.2.0-p3 -+4.2.0-p4 -diff -Naurd mpfr-4.2.0-a/src/mpfr.h mpfr-4.2.0-b/src/mpfr.h ---- mpfr-4.2.0-a/src/mpfr.h 2023-04-17 21:18:26.900579128 +0000 -+++ mpfr-4.2.0-b/src/mpfr.h 2023-04-17 21:19:02.032530276 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 4 - #define MPFR_VERSION_MINOR 2 - #define MPFR_VERSION_PATCHLEVEL 0 --#define MPFR_VERSION_STRING "4.2.0-p3" -+#define MPFR_VERSION_STRING "4.2.0-p4" - - /* User macros: - MPFR_USE_FILE: Define it to make MPFR define functions dealing -diff -Naurd mpfr-4.2.0-a/src/rec_sqrt.c mpfr-4.2.0-b/src/rec_sqrt.c ---- mpfr-4.2.0-a/src/rec_sqrt.c 2023-01-05 17:09:48.000000000 +0000 -+++ mpfr-4.2.0-b/src/rec_sqrt.c 2023-04-17 21:19:02.024530287 +0000 -@@ -463,6 +463,7 @@ - int s, cy, inex; - mpfr_limb_ptr x; - MPFR_TMP_DECL(marker); -+ MPFR_ZIV_DECL (loop); - - MPFR_LOG_FUNC - (("x[%Pu]=%.*Rg rnd=%d", mpfr_get_prec (u), mpfr_log_prec, u, rnd_mode), -@@ -530,6 +531,7 @@ - wp = rp + 11; - if (wp < rn * GMP_NUMB_BITS) - wp = rn * GMP_NUMB_BITS; -+ MPFR_ZIV_INIT (loop, wp); - for (;;) - { - MPFR_TMP_MARK (marker); -@@ -561,8 +563,9 @@ - } - MPFR_TMP_FREE(marker); - -- wp += GMP_NUMB_BITS; -+ MPFR_ZIV_NEXT (loop, wp); - } -+ MPFR_ZIV_FREE (loop); - cy = mpfr_round_raw (MPFR_MANT(r), x, wp, 0, rp, rnd_mode, &inex); - MPFR_EXP(r) = - (MPFR_EXP(u) - 1 - s) / 2; - if (MPFR_UNLIKELY(cy != 0)) -diff -Naurd mpfr-4.2.0-a/src/version.c mpfr-4.2.0-b/src/version.c ---- mpfr-4.2.0-a/src/version.c 2023-04-17 21:18:26.904579122 +0000 -+++ mpfr-4.2.0-b/src/version.c 2023-04-17 21:19:02.032530276 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "4.2.0-p3"; -+ return "4.2.0-p4"; - } -diff -Naurd mpfr-4.2.0-a/tests/trec_sqrt.c mpfr-4.2.0-b/tests/trec_sqrt.c ---- mpfr-4.2.0-a/tests/trec_sqrt.c 2023-01-05 17:09:48.000000000 +0000 -+++ mpfr-4.2.0-b/tests/trec_sqrt.c 2023-04-17 21:19:02.028530282 +0000 -@@ -242,6 +242,8 @@ - data_check ("data/rec_sqrt", mpfr_rec_sqrt, "mpfr_rec_sqrt"); - bad_cases (mpfr_rec_sqrt, pm2, "mpfr_rec_sqrt", 0, -256, 255, 4, 128, - 800, 50); -+ bad_cases (mpfr_rec_sqrt, pm2, "mpfr_rec_sqrt", 0, -256, 255, 9999, 9999, -+ 120000, 1); - - end: - tests_end_mpfr (); diff --git a/libmpfr/libmpfr-4.2.0-p7.patch b/libmpfr/libmpfr-4.2.0-p7.patch new file mode 100644 index 00000000..91201f30 --- /dev/null +++ b/libmpfr/libmpfr-4.2.0-p7.patch @@ -0,0 +1,1305 @@ +diff -Naurd mpfr-4.2.0-a/PATCHES mpfr-4.2.0-b/PATCHES +--- mpfr-4.2.0-a/PATCHES 2023-04-17 21:17:39.748645280 +0000 ++++ mpfr-4.2.0-b/PATCHES 2023-04-17 21:17:39.792645218 +0000 +@@ -0,0 +1 @@ ++tsprintf-thousands +diff -Naurd mpfr-4.2.0-a/VERSION mpfr-4.2.0-b/VERSION +--- mpfr-4.2.0-a/VERSION 2023-01-06 10:55:57.000000000 +0000 ++++ mpfr-4.2.0-b/VERSION 2023-04-17 21:17:39.792645218 +0000 +@@ -1 +1 @@ +-4.2.0 ++4.2.0-p1 +diff -Naurd mpfr-4.2.0-a/src/mpfr.h mpfr-4.2.0-b/src/mpfr.h +--- mpfr-4.2.0-a/src/mpfr.h 2023-01-06 10:55:57.000000000 +0000 ++++ mpfr-4.2.0-b/src/mpfr.h 2023-04-17 21:17:39.788645224 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 4 + #define MPFR_VERSION_MINOR 2 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "4.2.0" ++#define MPFR_VERSION_STRING "4.2.0-p1" + + /* User macros: + MPFR_USE_FILE: Define it to make MPFR define functions dealing +diff -Naurd mpfr-4.2.0-a/src/version.c mpfr-4.2.0-b/src/version.c +--- mpfr-4.2.0-a/src/version.c 2023-01-06 10:55:57.000000000 +0000 ++++ mpfr-4.2.0-b/src/version.c 2023-04-17 21:17:39.792645218 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "4.2.0"; ++ return "4.2.0-p1"; + } +diff -Naurd mpfr-4.2.0-a/tests/tsprintf.c mpfr-4.2.0-b/tests/tsprintf.c +--- mpfr-4.2.0-a/tests/tsprintf.c 2023-01-05 17:09:48.000000000 +0000 ++++ mpfr-4.2.0-b/tests/tsprintf.c 2023-04-17 21:17:39.784645229 +0000 +@@ -1715,7 +1715,25 @@ + check_sprintf ("000000001,000", "%'013.4Rg", x); + + #ifdef PRINTF_GROUPFLAG +- check_vsprintf ("+01,234,567 :", "%0+ -'13.10Pd:", (mpfr_prec_t) 1234567); ++ /* Do not test the thousands separator with a precision field larger ++ than the number of digits (thus needing leading zeros), such as ++ "%0+ -'13.10Pd:" (used up to MPFR 4.2.0), since the GNU libc is ++ buggy: https://sourceware.org/bugzilla/show_bug.cgi?id=23432 ++ We don't know about the other implementations. ++ This new test works fine with glibc up to 2.36, but fails with 2.37 ++ (as reported by Klaus Dittrich in the MPFR mailing-list); this is ++ actually a bug introduced in glibc 2.37, not in MPFR: ++ https://sourceware.org/bugzilla/show_bug.cgi?id=30068 ++ Since this bug can yield a buffer overflow (CVE-2023-25139), possibly ++ affecting MPFR users, let us rather require a fix in glibc. This bug ++ has been fixed in the 2.37 branch: ++ https://sourceware.org/git/?p=glibc.git;a=commit;h=07b9521fc6 ++ If we wanted to check that and avoid a failure of the test because of ++ a buggy C library (while MPFR would be consistent with the C library), ++ we could compare the MPFR output with both the correct output and the ++ output from the C library (possibly buggy). But to do that in a clean ++ way, this would require a change in the check_vsprintf() call. */ ++ check_vsprintf ("+1,234,567 :", "%0+ -'13Pd:", (mpfr_prec_t) 1234567); + #endif + + mpfr_clear (x); +diff -Naurd mpfr-4.2.0-a/PATCHES mpfr-4.2.0-b/PATCHES +--- mpfr-4.2.0-a/PATCHES 2023-04-17 21:18:00.464616127 +0000 ++++ mpfr-4.2.0-b/PATCHES 2023-04-17 21:18:00.512616059 +0000 +@@ -0,0 +1 @@ ++ui_pow_ui-overflow +diff -Naurd mpfr-4.2.0-a/VERSION mpfr-4.2.0-b/VERSION +--- mpfr-4.2.0-a/VERSION 2023-04-17 21:17:39.792645218 +0000 ++++ mpfr-4.2.0-b/VERSION 2023-04-17 21:18:00.512616059 +0000 +@@ -1 +1 @@ +-4.2.0-p1 ++4.2.0-p2 +diff -Naurd mpfr-4.2.0-a/src/mpfr.h mpfr-4.2.0-b/src/mpfr.h +--- mpfr-4.2.0-a/src/mpfr.h 2023-04-17 21:17:39.788645224 +0000 ++++ mpfr-4.2.0-b/src/mpfr.h 2023-04-17 21:18:00.508616065 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 4 + #define MPFR_VERSION_MINOR 2 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "4.2.0-p1" ++#define MPFR_VERSION_STRING "4.2.0-p2" + + /* User macros: + MPFR_USE_FILE: Define it to make MPFR define functions dealing +diff -Naurd mpfr-4.2.0-a/src/ui_pow_ui.c mpfr-4.2.0-b/src/ui_pow_ui.c +--- mpfr-4.2.0-a/src/ui_pow_ui.c 2023-01-05 17:09:48.000000000 +0000 ++++ mpfr-4.2.0-b/src/ui_pow_ui.c 2023-04-17 21:18:00.504616070 +0000 +@@ -23,7 +23,7 @@ + #include "mpfr-impl.h" + + int +-mpfr_ui_pow_ui (mpfr_ptr x, unsigned long int y, unsigned long int n, ++mpfr_ui_pow_ui (mpfr_ptr x, unsigned long int k, unsigned long int n, + mpfr_rnd_t rnd) + { + mpfr_exp_t err; +@@ -35,22 +35,28 @@ + MPFR_ZIV_DECL (loop); + MPFR_SAVE_EXPO_DECL (expo); + ++ MPFR_LOG_FUNC ++ (("k=%lu n=%lu rnd=%d", k, n, rnd), ++ ("y[%Pu]=%.*Rg inexact=%d", ++ mpfr_get_prec (x), mpfr_log_prec, x, inexact)); ++ + if (MPFR_UNLIKELY (n <= 1)) + { + if (n == 1) +- return mpfr_set_ui (x, y, rnd); /* y^1 = y */ ++ return mpfr_set_ui (x, k, rnd); /* k^1 = k */ + else +- return mpfr_set_ui (x, 1, rnd); /* y^0 = 1 for any y */ ++ return mpfr_set_ui (x, 1, rnd); /* k^0 = 1 for any k */ + } +- else if (MPFR_UNLIKELY (y <= 1)) ++ else if (MPFR_UNLIKELY (k <= 1)) + { +- if (y == 1) ++ if (k == 1) + return mpfr_set_ui (x, 1, rnd); /* 1^n = 1 for any n > 0 */ + else + return mpfr_set_ui (x, 0, rnd); /* 0^n = 0 for any n > 0 */ + } + +- for (size_n = 0, m = n; m; size_n++, m >>= 1); ++ for (size_n = 0, m = n; m != 0; size_n++, m >>= 1) ++ ; + + MPFR_SAVE_EXPO_MARK (expo); + prec = MPFR_PREC (x) + 3 + size_n; +@@ -60,23 +66,55 @@ + for (;;) + { + int i = size_n; ++ unsigned int inex_res; + +- inexact = mpfr_set_ui (res, y, MPFR_RNDU); ++ inex_res = mpfr_set_ui (res, k, MPFR_RNDU); + err = 1; + /* now 2^(i-1) <= n < 2^i: i=1+floor(log2(n)) */ + for (i -= 2; i >= 0; i--) + { +- inexact |= mpfr_sqr (res, res, MPFR_RNDU); ++ inex_res |= mpfr_sqr (res, res, MPFR_RNDU); + err++; + if (n & (1UL << i)) +- inexact |= mpfr_mul_ui (res, res, y, MPFR_RNDU); ++ inex_res |= mpfr_mul_ui (res, res, k, MPFR_RNDU); + } ++ ++ if (MPFR_UNLIKELY (MPFR_IS_INF (res))) ++ { ++ mpfr_t kf; ++ mpz_t z; ++ int size_k; ++ MPFR_BLOCK_DECL (flags); ++ ++ /* Let's handle the overflow by calling mpfr_pow_z. ++ Alternatively, we could call mpfr_pow_ui; this would ++ need a bit shorter code below, but mpfr_pow_ui handles ++ the overflow by calling mpfr_pow_z, so that calling ++ mpfr_pow_z directly should be a bit more efficient. */ ++ ++ MPFR_ZIV_FREE (loop); ++ mpfr_clear (res); ++ for (size_k = 0, m = k; m != 0; size_k++, m >>= 1) ++ ; ++ mpfr_init2 (kf, size_k); ++ inexact = mpfr_set_ui (kf, k, MPFR_RNDN); ++ MPFR_ASSERTD (inexact == 0); ++ mpz_init (z); ++ mpz_set_ui (z, n); ++ MPFR_BLOCK (flags, inexact = mpfr_pow_z (x, kf, z, rnd);); ++ mpz_clear (z); ++ mpfr_clear (kf); ++ MPFR_SAVE_EXPO_UPDATE_FLAGS (expo, flags); ++ goto end; ++ } ++ + /* since the loop is executed floor(log2(n)) times, + we have err = 1+floor(log2(n)). + Since prec >= MPFR_PREC(x) + 4 + floor(log2(n)), prec > err */ + err = prec - err; + +- if (MPFR_LIKELY (inexact == 0 ++ MPFR_LOG_VAR (res); ++ if (MPFR_LIKELY (!inex_res + || MPFR_CAN_ROUND (res, err, MPFR_PREC (x), rnd))) + break; + +@@ -90,6 +128,7 @@ + + mpfr_clear (res); + ++ end: + MPFR_SAVE_EXPO_FREE (expo); + return mpfr_check_range (x, inexact, rnd); + } +diff -Naurd mpfr-4.2.0-a/src/version.c mpfr-4.2.0-b/src/version.c +--- mpfr-4.2.0-a/src/version.c 2023-04-17 21:17:39.792645218 +0000 ++++ mpfr-4.2.0-b/src/version.c 2023-04-17 21:18:00.512616059 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "4.2.0-p1"; ++ return "4.2.0-p2"; + } +diff -Naurd mpfr-4.2.0-a/tests/tlog10.c mpfr-4.2.0-b/tests/tlog10.c +--- mpfr-4.2.0-a/tests/tlog10.c 2023-01-05 17:09:48.000000000 +0000 ++++ mpfr-4.2.0-b/tests/tlog10.c 2023-04-17 21:18:00.504616070 +0000 +@@ -49,6 +49,60 @@ + #define TEST_RANDOM_POS 8 + #include "tgeneric.c" + ++/* On 2023-02-13, one gets an infinite loop in mpfr_log10 on both ++ 32-bit and 64-bit hosts when the precision is not large enough ++ (precision 12 and below). */ ++static void ++bug20230213 (void) ++{ ++ mpfr_exp_t old_emin, old_emax, e; ++ mpfr_t t, x, y0, y1, y2; ++ int prec; ++ ++ old_emin = mpfr_get_emin (); ++ old_emax = mpfr_get_emax (); ++ ++ set_emin (MPFR_EMIN_MIN); ++ set_emax (MPFR_EMAX_MAX); ++ e = mpfr_get_emax () - 1; ++ ++ /* The precisions of t and y0 should be large enough to avoid ++ a hard-to-round case for the target precisions. */ ++ mpfr_inits2 (64, t, y0, (mpfr_ptr) 0); ++ mpfr_set_exp_t (y0, e, MPFR_RNDN); ++ mpfr_log_ui (t, 10, MPFR_RNDN); ++ mpfr_div (y0, y0, t, MPFR_RNDN); ++ mpfr_log_ui (t, 2, MPFR_RNDN); ++ mpfr_mul (y0, y0, t, MPFR_RNDN); ++ ++ for (prec = 16; prec >= MPFR_PREC_MIN; prec--) ++ { ++ mpfr_inits2 (prec, x, y1, y2, (mpfr_ptr) 0); ++ mpfr_set (y1, y0, MPFR_RNDN); ++ ++ mpfr_set_ui_2exp (x, 1, e, MPFR_RNDN); ++ mpfr_log10 (y2, x, MPFR_RNDN); ++ MPFR_ASSERTN (MPFR_IS_PURE_FP (y2)); ++ MPFR_ASSERTN (MPFR_IS_POS (y2)); ++ ++ if (! mpfr_equal_p (y1, y2)) ++ { ++ printf ("Error in bug20230213.\n"); ++ printf ("Expected "); ++ mpfr_dump (y1); ++ printf ("Got "); ++ mpfr_dump (y2); ++ exit (1); ++ } ++ mpfr_clears (x, y1, y2, (mpfr_ptr) 0); ++ } ++ ++ mpfr_clears (t, y0, (mpfr_ptr) 0); ++ ++ set_emin (old_emin); ++ set_emax (old_emax); ++} ++ + int + main (int argc, char *argv[]) + { +@@ -112,6 +166,8 @@ + mpfr_clear (x); + mpfr_clear (y); + ++ bug20230213 (); ++ + data_check ("data/log10", mpfr_log10, "mpfr_log10"); + + tests_end_mpfr (); +diff -Naurd mpfr-4.2.0-a/tests/tui_pow.c mpfr-4.2.0-b/tests/tui_pow.c +--- mpfr-4.2.0-a/tests/tui_pow.c 2023-01-05 17:09:48.000000000 +0000 ++++ mpfr-4.2.0-b/tests/tui_pow.c 2023-04-17 21:18:00.504616070 +0000 +@@ -142,6 +142,37 @@ + mpfr_clear (t); + } + ++static void ++huge (void) ++{ ++ mpfr_exp_t old_emin, old_emax; ++ mpfr_t x; ++ ++ old_emin = mpfr_get_emin (); ++ old_emax = mpfr_get_emax (); ++ ++ set_emin (MPFR_EMIN_MIN); ++ set_emax (MPFR_EMAX_MAX); ++ ++ mpfr_init2 (x, 8); ++ ++ /* The purpose of this test is more to check that mpfr_ui_pow_ui ++ terminates (without taking much memory) rather than checking ++ the value of x. On 2023-02-13, the +Inf case was not handled ++ in the Ziv iteration, yielding an infinite loop, affecting ++ mpfr_log10 in particular. See ++ commit 90de094f0d9c309daca707aa227470d810866616 ++ */ ++ mpfr_ui_pow_ui (x, 5, ULONG_MAX, MPFR_RNDN); ++ if (MPFR_EMAX_MAX <= ULONG_MAX) /* true with default _MPFR_EXP_FORMAT */ ++ MPFR_ASSERTN (MPFR_IS_INF (x)); ++ ++ mpfr_clear (x); ++ ++ set_emin (old_emin); ++ set_emax (old_emax); ++} ++ + int + main (int argc, char *argv[]) + { +@@ -180,6 +211,7 @@ + } + + test1 (); ++ huge (); + + { + mpfr_t z, t; +diff -Naurd mpfr-4.2.0-a/PATCHES mpfr-4.2.0-b/PATCHES +--- mpfr-4.2.0-a/PATCHES 2023-04-17 21:18:26.860579184 +0000 ++++ mpfr-4.2.0-b/PATCHES 2023-04-17 21:18:26.904579122 +0000 +@@ -0,0 +1 @@ ++multibyte-decimal_point +diff -Naurd mpfr-4.2.0-a/VERSION mpfr-4.2.0-b/VERSION +--- mpfr-4.2.0-a/VERSION 2023-04-17 21:18:00.512616059 +0000 ++++ mpfr-4.2.0-b/VERSION 2023-04-17 21:18:26.904579122 +0000 +@@ -1 +1 @@ +-4.2.0-p2 ++4.2.0-p3 +diff -Naurd mpfr-4.2.0-a/src/mpfr.h mpfr-4.2.0-b/src/mpfr.h +--- mpfr-4.2.0-a/src/mpfr.h 2023-04-17 21:18:00.508616065 +0000 ++++ mpfr-4.2.0-b/src/mpfr.h 2023-04-17 21:18:26.900579128 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 4 + #define MPFR_VERSION_MINOR 2 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "4.2.0-p2" ++#define MPFR_VERSION_STRING "4.2.0-p3" + + /* User macros: + MPFR_USE_FILE: Define it to make MPFR define functions dealing +diff -Naurd mpfr-4.2.0-a/src/version.c mpfr-4.2.0-b/src/version.c +--- mpfr-4.2.0-a/src/version.c 2023-04-17 21:18:00.512616059 +0000 ++++ mpfr-4.2.0-b/src/version.c 2023-04-17 21:18:26.904579122 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "4.2.0-p2"; ++ return "4.2.0-p3"; + } +diff -Naurd mpfr-4.2.0-a/tests/tfprintf.c mpfr-4.2.0-b/tests/tfprintf.c +--- mpfr-4.2.0-a/tests/tfprintf.c 2023-01-05 17:09:48.000000000 +0000 ++++ mpfr-4.2.0-b/tests/tfprintf.c 2023-04-17 21:18:26.896579133 +0000 +@@ -61,6 +61,12 @@ + exit (1); \ + } + ++#if MPFR_LCONV_DPTS ++#define DPLEN ((int) strlen (localeconv()->decimal_point)) ++#else ++#define DPLEN 1 ++#endif ++ + /* limit for random precision in random() */ + const int prec_max_printf = 5000; + +@@ -195,12 +201,12 @@ + lo, &ulo); + check_length (2, ulo, 36, lu); + check_vfprintf (fout, "a. %hi, b. %*f, c. %Re%hn", ush, 3, f, mpfr, &ush); +- check_length (3, ush, 46, hu); ++ check_length (3, ush, 45 + DPLEN, hu); + check_vfprintf (fout, "a. %hi, b. %f, c. %#.2Rf%n", sh, d, mpfr, &i); +- check_length (4, i, 29, d); ++ check_length (4, i, 28 + DPLEN, d); + check_vfprintf (fout, "a. %R*A, b. %Fe, c. %i%zn", rnd, mpfr, mpf, sz, + &sz); +- check_length (5, (unsigned long) sz, 34, lu); /* no format specifier "%zu" in C90 */ ++ check_length (5, (unsigned long) sz, 33 + DPLEN, lu); /* no format specifier "%zu" in C90 */ + check_vfprintf (fout, "a. %Pu, b. %c, c. %Zi%Zn", prec, ch, mpz, &mpz); + check_length_with_cmp (6, mpz, 17, mpz_cmp_ui (mpz, 17), Zi); + check_vfprintf (fout, "%% a. %#.0RNg, b. %Qx%Rn, c. %p", mpfr, mpq, &mpfr, +@@ -224,7 +230,7 @@ + + #ifdef PRINTF_L + check_vfprintf (fout, "a. %RA, b. %Lf, c. %QX%zn", mpfr, ld, mpq, &sz); +- check_length (9, (unsigned long) sz, 30, lu); /* no format specifier "%zu" in C90 */ ++ check_length (9, (unsigned long) sz, 29 + DPLEN, lu); /* no format specifier "%zu" in C90 */ + #endif + + #ifndef NPRINTF_HH +diff -Naurd mpfr-4.2.0-a/tests/tprintf.c mpfr-4.2.0-b/tests/tprintf.c +--- mpfr-4.2.0-a/tests/tprintf.c 2023-01-05 17:09:48.000000000 +0000 ++++ mpfr-4.2.0-b/tests/tprintf.c 2023-04-17 21:18:26.896579133 +0000 +@@ -68,6 +68,12 @@ + exit (1); \ + } + ++#if MPFR_LCONV_DPTS ++#define DPLEN ((int) strlen (localeconv()->decimal_point)) ++#else ++#define DPLEN 1 ++#endif ++ + /* limit for random precision in random() */ + const int prec_max_printf = 5000; + /* boolean: is stdout redirected to a file ? */ +@@ -316,11 +322,11 @@ + check_vprintf ("a. %c, b. %Rb, c. %u, d. %li%ln", i, mpfr, i, lo, &ulo); + check_length (2, ulo, 36, lu); + check_vprintf ("a. %hi, b. %*f, c. %Re%hn", ush, 3, f, mpfr, &ush); +- check_length (3, ush, 46, hu); ++ check_length (3, ush, 45 + DPLEN, hu); + check_vprintf ("a. %hi, b. %f, c. %#.2Rf%n", sh, d, mpfr, &i); +- check_length (4, i, 29, d); ++ check_length (4, i, 28 + DPLEN, d); + check_vprintf ("a. %R*A, b. %Fe, c. %i%zn", rnd, mpfr, mpf, sz, &sz); +- check_length (5, (unsigned long) sz, 34, lu); /* no format specifier '%zu' in C90 */ ++ check_length (5, (unsigned long) sz, 33 + DPLEN, lu); /* no format specifier '%zu' in C90 */ + check_vprintf ("a. %Pu, b. %c, c. %RUG, d. %Zi%Zn", prec, ch, mpfr, mpz, &mpz); + check_length_with_cmp (6, mpz, 24, mpz_cmp_ui (mpz, 24), Zi); + check_vprintf ("%% a. %#.0RNg, b. %Qx%Rn c. %p", +@@ -344,7 +350,7 @@ + + #ifdef PRINTF_L + check_vprintf ("a. %RA, b. %Lf, c. %QX%zn", mpfr, ld, mpq, &sz); +- check_length (9, (unsigned long) sz, 30, lu); /* no format specifier '%zu' in C90 */ ++ check_length (9, (unsigned long) sz, 29 + DPLEN, lu); /* no format specifier '%zu' in C90 */ + #endif + + #ifndef NPRINTF_HH +diff -Naurd mpfr-4.2.0-a/PATCHES mpfr-4.2.0-b/PATCHES +--- mpfr-4.2.0-a/PATCHES 2023-04-17 21:19:01.988530337 +0000 ++++ mpfr-4.2.0-b/PATCHES 2023-04-17 21:19:02.032530276 +0000 +@@ -0,0 +1 @@ ++rec_sqrt-zivloop +diff -Naurd mpfr-4.2.0-a/VERSION mpfr-4.2.0-b/VERSION +--- mpfr-4.2.0-a/VERSION 2023-04-17 21:18:26.904579122 +0000 ++++ mpfr-4.2.0-b/VERSION 2023-04-17 21:19:02.032530276 +0000 +@@ -1 +1 @@ +-4.2.0-p3 ++4.2.0-p4 +diff -Naurd mpfr-4.2.0-a/src/mpfr.h mpfr-4.2.0-b/src/mpfr.h +--- mpfr-4.2.0-a/src/mpfr.h 2023-04-17 21:18:26.900579128 +0000 ++++ mpfr-4.2.0-b/src/mpfr.h 2023-04-17 21:19:02.032530276 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 4 + #define MPFR_VERSION_MINOR 2 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "4.2.0-p3" ++#define MPFR_VERSION_STRING "4.2.0-p4" + + /* User macros: + MPFR_USE_FILE: Define it to make MPFR define functions dealing +diff -Naurd mpfr-4.2.0-a/src/rec_sqrt.c mpfr-4.2.0-b/src/rec_sqrt.c +--- mpfr-4.2.0-a/src/rec_sqrt.c 2023-01-05 17:09:48.000000000 +0000 ++++ mpfr-4.2.0-b/src/rec_sqrt.c 2023-04-17 21:19:02.024530287 +0000 +@@ -463,6 +463,7 @@ + int s, cy, inex; + mpfr_limb_ptr x; + MPFR_TMP_DECL(marker); ++ MPFR_ZIV_DECL (loop); + + MPFR_LOG_FUNC + (("x[%Pu]=%.*Rg rnd=%d", mpfr_get_prec (u), mpfr_log_prec, u, rnd_mode), +@@ -530,6 +531,7 @@ + wp = rp + 11; + if (wp < rn * GMP_NUMB_BITS) + wp = rn * GMP_NUMB_BITS; ++ MPFR_ZIV_INIT (loop, wp); + for (;;) + { + MPFR_TMP_MARK (marker); +@@ -561,8 +563,9 @@ + } + MPFR_TMP_FREE(marker); + +- wp += GMP_NUMB_BITS; ++ MPFR_ZIV_NEXT (loop, wp); + } ++ MPFR_ZIV_FREE (loop); + cy = mpfr_round_raw (MPFR_MANT(r), x, wp, 0, rp, rnd_mode, &inex); + MPFR_EXP(r) = - (MPFR_EXP(u) - 1 - s) / 2; + if (MPFR_UNLIKELY(cy != 0)) +diff -Naurd mpfr-4.2.0-a/src/version.c mpfr-4.2.0-b/src/version.c +--- mpfr-4.2.0-a/src/version.c 2023-04-17 21:18:26.904579122 +0000 ++++ mpfr-4.2.0-b/src/version.c 2023-04-17 21:19:02.032530276 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "4.2.0-p3"; ++ return "4.2.0-p4"; + } +diff -Naurd mpfr-4.2.0-a/tests/trec_sqrt.c mpfr-4.2.0-b/tests/trec_sqrt.c +--- mpfr-4.2.0-a/tests/trec_sqrt.c 2023-01-05 17:09:48.000000000 +0000 ++++ mpfr-4.2.0-b/tests/trec_sqrt.c 2023-04-17 21:19:02.028530282 +0000 +@@ -242,6 +242,8 @@ + data_check ("data/rec_sqrt", mpfr_rec_sqrt, "mpfr_rec_sqrt"); + bad_cases (mpfr_rec_sqrt, pm2, "mpfr_rec_sqrt", 0, -256, 255, 4, 128, + 800, 50); ++ bad_cases (mpfr_rec_sqrt, pm2, "mpfr_rec_sqrt", 0, -256, 255, 9999, 9999, ++ 120000, 1); + + end: + tests_end_mpfr (); +diff -Naurd mpfr-4.2.0-a/PATCHES mpfr-4.2.0-b/PATCHES +--- mpfr-4.2.0-a/PATCHES 2023-05-12 15:05:00.989811960 +0000 ++++ mpfr-4.2.0-b/PATCHES 2023-05-12 15:05:01.085811835 +0000 +@@ -0,0 +1 @@ ++reldiff +diff -Naurd mpfr-4.2.0-a/VERSION mpfr-4.2.0-b/VERSION +--- mpfr-4.2.0-a/VERSION 2023-04-17 21:19:02.032530276 +0000 ++++ mpfr-4.2.0-b/VERSION 2023-05-12 15:05:01.085811835 +0000 +@@ -1 +1 @@ +-4.2.0-p4 ++4.2.0-p5 +diff -Naurd mpfr-4.2.0-a/src/mpfr.h mpfr-4.2.0-b/src/mpfr.h +--- mpfr-4.2.0-a/src/mpfr.h 2023-04-17 21:19:02.032530276 +0000 ++++ mpfr-4.2.0-b/src/mpfr.h 2023-05-12 15:05:01.077811846 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 4 + #define MPFR_VERSION_MINOR 2 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "4.2.0-p4" ++#define MPFR_VERSION_STRING "4.2.0-p5" + + /* User macros: + MPFR_USE_FILE: Define it to make MPFR define functions dealing +diff -Naurd mpfr-4.2.0-a/src/reldiff.c mpfr-4.2.0-b/src/reldiff.c +--- mpfr-4.2.0-a/src/reldiff.c 2023-01-05 17:09:48.000000000 +0000 ++++ mpfr-4.2.0-b/src/reldiff.c 2023-05-12 15:05:01.069811856 +0000 +@@ -30,31 +30,25 @@ + + if (MPFR_ARE_SINGULAR (b, c)) + { +- if (MPFR_IS_NAN(b) || MPFR_IS_NAN(c)) +- { +- MPFR_SET_NAN(a); +- return; +- } +- else if (MPFR_IS_INF(b)) ++ if (MPFR_IS_NAN (b) || MPFR_IS_INF (b) || MPFR_IS_NAN (c) || ++ (MPFR_IS_ZERO (b) && MPFR_IS_ZERO (c))) + { +- if (MPFR_IS_INF (c) && (MPFR_SIGN (c) == MPFR_SIGN (b))) +- MPFR_SET_ZERO(a); +- else +- MPFR_SET_NAN(a); ++ MPFR_SET_NAN (a); + return; + } +- else if (MPFR_IS_INF(c)) ++ if (MPFR_IS_ZERO (b) || MPFR_IS_INF (c)) + { + MPFR_SET_SAME_SIGN (a, b); + MPFR_SET_INF (a); + return; + } +- else if (MPFR_IS_ZERO(b)) /* reldiff = abs(c)/c = sign(c) */ +- { +- mpfr_set_si (a, MPFR_INT_SIGN (c), rnd_mode); +- return; +- } +- /* Fall through */ ++ /* The case c = 0 with b regular, which should give sign(b) exactly, ++ cannot be optimized here as it is documented in the MPFR manual ++ that this function just computes abs(b-c)/b using the precision ++ of a and the rounding mode rnd_mode for all operations. So let's ++ prefer the potentially "incorrect" result. Note that the correct ++ result is not necessarily better because if could break properties ++ (like monotonicity?) implied by the documentation. */ + } + + if (a == b) +@@ -64,8 +58,8 @@ + } + + mpfr_sub (a, b, c, rnd_mode); +- mpfr_abs (a, a, rnd_mode); /* for compatibility with MPF */ +- mpfr_div (a, a, (a == b) ? b_copy : b, rnd_mode); ++ MPFR_SET_SIGN (a, 1); ++ mpfr_div (a, a, a == b ? b_copy : b, rnd_mode); + + if (a == b) + mpfr_clear (b_copy); +diff -Naurd mpfr-4.2.0-a/src/version.c mpfr-4.2.0-b/src/version.c +--- mpfr-4.2.0-a/src/version.c 2023-04-17 21:19:02.032530276 +0000 ++++ mpfr-4.2.0-b/src/version.c 2023-05-12 15:05:01.081811839 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "4.2.0-p4"; ++ return "4.2.0-p5"; + } +diff -Naurd mpfr-4.2.0-a/PATCHES mpfr-4.2.0-b/PATCHES +--- mpfr-4.2.0-a/PATCHES 2023-05-12 15:06:11.789722083 +0000 ++++ mpfr-4.2.0-b/PATCHES 2023-05-12 15:06:11.885721962 +0000 +@@ -0,0 +1 @@ ++tests-reuse +diff -Naurd mpfr-4.2.0-a/VERSION mpfr-4.2.0-b/VERSION +--- mpfr-4.2.0-a/VERSION 2023-05-12 15:05:01.085811835 +0000 ++++ mpfr-4.2.0-b/VERSION 2023-05-12 15:06:11.885721962 +0000 +@@ -1 +1 @@ +-4.2.0-p5 ++4.2.0-p6 +diff -Naurd mpfr-4.2.0-a/src/mpfr.h mpfr-4.2.0-b/src/mpfr.h +--- mpfr-4.2.0-a/src/mpfr.h 2023-05-12 15:05:01.077811846 +0000 ++++ mpfr-4.2.0-b/src/mpfr.h 2023-05-12 15:06:11.877721972 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 4 + #define MPFR_VERSION_MINOR 2 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "4.2.0-p5" ++#define MPFR_VERSION_STRING "4.2.0-p6" + + /* User macros: + MPFR_USE_FILE: Define it to make MPFR define functions dealing +diff -Naurd mpfr-4.2.0-a/src/version.c mpfr-4.2.0-b/src/version.c +--- mpfr-4.2.0-a/src/version.c 2023-05-12 15:05:01.081811839 +0000 ++++ mpfr-4.2.0-b/src/version.c 2023-05-12 15:06:11.885721962 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "4.2.0-p5"; ++ return "4.2.0-p6"; + } +diff -Naurd mpfr-4.2.0-a/tests/reuse.c mpfr-4.2.0-b/tests/reuse.c +--- mpfr-4.2.0-a/tests/reuse.c 2023-01-05 17:09:48.000000000 +0000 ++++ mpfr-4.2.0-b/tests/reuse.c 2023-05-12 15:06:11.869721983 +0000 +@@ -78,22 +78,16 @@ + mpfr_const_pi (x, MPFR_RNDN); + MPFR_SET_EXP (x, MPFR_GET_EXP (x)-1); + break; +- default: ++ case 11: + mpfr_urandomb (x, RANDS); + if (RAND_BOOL ()) + mpfr_neg (x, x, MPFR_RNDN); + break; ++ default: ++ MPFR_ASSERTN (0); + } + } + +-/* same as mpfr_cmp, but returns 0 for both NaN's */ +-static int +-mpfr_compare (mpfr_srcptr a, mpfr_srcptr b) +-{ +- return (MPFR_IS_NAN(a)) ? !MPFR_IS_NAN(b) : +- (MPFR_IS_NAN(b) || mpfr_cmp(a, b)); +-} +- + static void + test3 (int (*testfunc)(mpfr_ptr, mpfr_srcptr, mpfr_srcptr, mpfr_rnd_t), + const char *foo, mpfr_prec_t prec, mpfr_rnd_t rnd) +@@ -112,10 +106,10 @@ + + /* for each variable, consider each of the following 6 possibilities: + NaN, +Infinity, -Infinity, +0, -0 or a random number */ +- for (i=0; i < SPECIAL_MAX*SPECIAL_MAX ; i++) ++ for (i = 0; i < SPECIAL_MAX * SPECIAL_MAX; i++) + { +- set_special (ref2, i%SPECIAL_MAX); +- set_special (ref3, i/SPECIAL_MAX); ++ set_special (ref2, i % SPECIAL_MAX); ++ set_special (ref3, i / SPECIAL_MAX); + + /* reference call: foo(a, b, c) */ + testfunc (ref1, ref2, ref3, rnd); +@@ -124,11 +118,11 @@ + mpfr_set (res1, ref2, rnd); /* exact operation */ + testfunc (res1, res1, ref3, rnd); + +- if (mpfr_compare (res1, ref1)) ++ if (! SAME_VAL (res1, ref1)) + { + printf ("Error for %s(a, a, c) with %s for ", foo, + mpfr_print_rnd_mode (rnd)); +- DISP("a=",ref2); DISP2(", c=",ref3); ++ DISP("a=", ref2); DISP2(", c=", ref3); + printf ("expected "); mpfr_dump (ref1); + printf ("got "); mpfr_dump (res1); + exit (1); +@@ -137,11 +131,12 @@ + /* foo(a, b, a) */ + mpfr_set (res1, ref3, rnd); + testfunc (res1, ref2, res1, rnd); +- if (mpfr_compare (res1, ref1)) ++ if (! SAME_VAL (res1, ref1)) + { + printf ("Error for %s(a, b, a) for ", foo); +- DISP("b=",ref2); DISP2(", a=", ref3); +- DISP("expected ", ref1); DISP2(", got ",res1); ++ DISP("b=", ref2); DISP2(", a=", ref3); ++ printf ("expected "); mpfr_dump (ref1); ++ printf ("got "); mpfr_dump (res1); + exit (1); + } + +@@ -151,11 +146,12 @@ + mpfr_set (res1, ref2, rnd); + testfunc (res1, res1, res1, rnd); + +- if (mpfr_compare (res1, ref1)) ++ if (! SAME_VAL (res1, ref1)) + { + printf ("Error for %s(a, a, a) for ", foo); +- DISP2("a=",ref2); +- DISP("expected ", ref1); DISP2(", got ", res1); ++ DISP2("a=", ref2); ++ printf ("expected "); mpfr_dump (ref1); ++ printf ("got "); mpfr_dump (res1); + exit (1); + } + } +@@ -187,13 +183,13 @@ + /* for each variable, consider each of the following 6 possibilities: + NaN, +Infinity, -Infinity, +0, -0 or a random number */ + +- for (i=0; i<SPECIAL_MAX; i++) ++ for (i = 0; i < SPECIAL_MAX; i++) + { + set_special (op1, i); +- for (j=0; j<SPECIAL_MAX; j++) ++ for (j = 0; j < SPECIAL_MAX; j++) + { + set_special (op2, j); +- for (k=0; k<SPECIAL_MAX; k++) ++ for (k = 0; k < SPECIAL_MAX; k++) + { + set_special (op3, k); + +@@ -204,11 +200,12 @@ + mpfr_set (res, op1, rnd); /* exact operation */ + testfunc (res, res, op2, op3, rnd); + +- if (mpfr_compare (res, ref)) ++ if (! SAME_VAL (res, ref)) + { + printf ("Error for %s(a, a, b, c) for ", foo); + DISP("a=", op1); DISP(", b=", op2); DISP2(", c=", op3); +- DISP("expected ", ref); DISP2(", got ", res); ++ printf ("expected "); mpfr_dump (ref); ++ printf ("got "); mpfr_dump (res); + exit (1); + } + +@@ -216,11 +213,12 @@ + mpfr_set (res, op2, rnd); + testfunc (res, op1, res, op3, rnd); + +- if (mpfr_compare (res, ref)) ++ if (! SAME_VAL (res, ref)) + { + printf ("Error for %s(a, a, b, c) for ", foo); + DISP("a=", op1); DISP(", b=", op2); DISP2(", c=", op3); +- DISP("expected ", ref); DISP2(", got ", res); ++ printf ("expected "); mpfr_dump (ref); ++ printf ("got "); mpfr_dump (res); + exit (1); + } + +@@ -228,35 +226,38 @@ + mpfr_set (res, op3, rnd); + testfunc (res, op1, op2, res, rnd); + +- if (mpfr_compare (res, ref)) ++ if (! SAME_VAL (res, ref)) + { + printf ("Error for %s(a, a, b, c) for ", foo); + DISP("a=", op1); DISP(", b=", op2); DISP2(", c=", op3); +- DISP("expected ", ref); DISP2(", got ", res); ++ printf ("expected "); mpfr_dump (ref); ++ printf ("got "); mpfr_dump (res); + exit (1); + } + +- /* foo(a, a, a,c) */ ++ /* foo(a, a, a, c) */ + testfunc (ref, op1, op1, op3, rnd); + mpfr_set (res, op1, rnd); + testfunc (res, res, res, op3, rnd); +- if (mpfr_compare (res, ref)) ++ if (! SAME_VAL (res, ref)) + { + printf ("Error for %s(a, a, b, c) for ", foo); + DISP("a=", op1); DISP(", a=", op2); DISP2(", c=", op3); +- DISP("expected ", ref); DISP2(", got ", res); ++ printf ("expected "); mpfr_dump (ref); ++ printf ("got "); mpfr_dump (res); + exit (1); + } + +- /* foo(a, a, b,a) */ ++ /* foo(a, a, b, a) */ + testfunc (ref, op1, op2, op1, rnd); + mpfr_set (res, op1, rnd); + testfunc (res, res, op2, res, rnd); +- if (mpfr_compare (res, ref)) ++ if (! SAME_VAL (res, ref)) + { + printf ("Error for %s(a, a, b, c) for ", foo); + DISP("a=", op1); DISP(", a=", op2); DISP2(", c=", op3); +- DISP("expected ", ref); DISP2(", got ", res); ++ printf ("expected "); mpfr_dump (ref); ++ printf ("got "); mpfr_dump (res); + exit (1); + } + +@@ -264,11 +265,12 @@ + testfunc (ref, op1, op2, op2, rnd); + mpfr_set (res, op2, rnd); + testfunc (res, op1, res, res, rnd); +- if (mpfr_compare (res, ref)) ++ if (! SAME_VAL (res, ref)) + { + printf ("Error for %s(a, a, b, c) for ", foo); + DISP("a=", op1); DISP(", a=", op2); DISP2(", c=", op3); +- DISP("expected ", ref); DISP2(", got ", res); ++ printf ("expected "); mpfr_dump (ref); ++ printf ("got "); mpfr_dump (res); + exit (1); + } + +@@ -276,11 +278,12 @@ + testfunc (ref, op1, op1, op1, rnd); + mpfr_set (res, op1, rnd); + testfunc (res, res, res, res, rnd); +- if (mpfr_compare (res, ref)) ++ if (! SAME_VAL (res, ref)) + { + printf ("Error for %s(a, a, a, a) for ", foo); + DISP2("a=", op1); +- DISP("expected ", ref); DISP2(", got ", res); ++ printf ("expected "); mpfr_dump (ref); ++ printf ("got "); mpfr_dump (res); + exit (1); + } + } +@@ -313,10 +316,10 @@ + + /* ref2 can be NaN, +Inf, -Inf, +0, -0 or any number + ref3 can be 0 or any number */ +- for (i=0; i<SPECIAL_MAX*2; i++) ++ for (i = 0; i < SPECIAL_MAX * 2; i++) + { +- set_special (ref2, i%SPECIAL_MAX); +- ref3 = i/SPECIAL_MAX == 0 ? 0 : randlimb (); ++ set_special (ref2, i % SPECIAL_MAX); ++ ref3 = i / SPECIAL_MAX == 0 ? 0 : randlimb (); + + /* reference call: foo(a, b, c) */ + testfunc (ref1, ref2, ref3, rnd); +@@ -325,10 +328,10 @@ + mpfr_set (res1, ref2, rnd); /* exact operation */ + testfunc (res1, res1, ref3, rnd); + +- if (mpfr_compare (res1, ref1)) ++ if (! SAME_VAL (res1, ref1)) + { + printf ("Error for %s(a, a, c) for c=%u\n", foo, ref3); +- DISP2("a=",ref2); ++ DISP2("a=", ref2); + printf ("expected "); mpfr_dump (ref1); + printf ("got "); mpfr_dump (res1); + exit (1); +@@ -356,10 +359,10 @@ + mpfr_init2 (ref3, prec); + mpfr_init2 (res1, prec); + +- for (i=0; i<SPECIAL_MAX*2; i++) ++ for (i = 0; i < SPECIAL_MAX * 2; i++) + { +- set_special (ref3, i%SPECIAL_MAX); +- ref2 = i/SPECIAL_MAX==0 ? 0 : randlimb (); ++ set_special (ref3, i % SPECIAL_MAX); ++ ref2 = i / SPECIAL_MAX == 0 ? 0 : randlimb (); + + /* reference call: foo(a, b, c) */ + testfunc (ref1, ref2, ref3, rnd); +@@ -367,7 +370,7 @@ + /* foo(a, b, a) */ + mpfr_set (res1, ref3, rnd); /* exact operation */ + testfunc (res1, ref2, res1, rnd); +- if (mpfr_compare (res1, ref1)) ++ if (! SAME_VAL (res1, ref1)) + { + printf ("Error for %s(a, b, a) for b=%u \n", foo, ref2); + DISP2("a=", ref3); +@@ -397,7 +400,7 @@ + mpfr_init2 (ref2, prec); + mpfr_init2 (res1, prec); + +- for (i=0; i<SPECIAL_MAX; i++) ++ for (i = 0; i < SPECIAL_MAX; i++) + { + set_special (ref2, i); + +@@ -407,7 +410,7 @@ + /* foo(a, a) */ + mpfr_set (res1, ref2, rnd); /* exact operation */ + testfunc (res1, res1, rnd); +- if (mpfr_compare (res1, ref1)) ++ if (! SAME_VAL (res1, ref1)) + { + printf ("Error for %s(a, a) for ", foo); + DISP2("a=", ref2); +@@ -437,7 +440,7 @@ + mpfr_init2 (ref2, prec); + mpfr_init2 (res1, prec); + +- for (i=0; i<SPECIAL_MAX; i++) ++ for (i = 0; i < SPECIAL_MAX; i++) + { + set_special (ref2, i); + +@@ -447,10 +450,10 @@ + /* foo(a, a) */ + mpfr_set (res1, ref2, MPFR_RNDN); /* exact operation */ + testfunc (res1, res1); +- if (mpfr_compare (res1, ref1)) ++ if (! SAME_VAL (res1, ref1)) + { + printf ("Error for %s(a, a) for ", foo); +- DISP2("a=",ref2); ++ DISP2("a=", ref2); + DISP("expected", ref1); DISP2(", got ", res1); + exit (1); + } +@@ -479,7 +482,7 @@ + mpfr_init2 (res1, prec); + mpfr_init2 (res2, prec); + +- for (i=0; i<SPECIAL_MAX; i++) ++ for (i = 0; i < SPECIAL_MAX; i++) + { + set_special (ref3, i); + +@@ -489,12 +492,12 @@ + /* foo(a, b, a) */ + mpfr_set (res1, ref3, rnd); /* exact operation */ + testfunc (res1, res2, res1, rnd); +- if (mpfr_compare (res1, ref1) || mpfr_compare (res2, ref2)) ++ if (! SAME_VAL (res1, ref1) || ! SAME_VAL (res2, ref2)) + { + printf ("Error for %s(a, b, a) for rnd=%s, ", foo, + mpfr_print_rnd_mode (rnd)); +- DISP2("a=",ref3); +- DISP("expected (", ref1); DISP(",",ref2); ++ DISP2("a=", ref3); ++ DISP("expected (", ref1); DISP(",", ref2); + DISP("), got (", res1); DISP(",", res2); printf(")\n"); + exit (1); + } +@@ -502,11 +505,11 @@ + /* foo(a, b, b) */ + mpfr_set (res2, ref3, rnd); /* exact operation */ + testfunc (res1, res2, res2, rnd); +- if (mpfr_compare (res1, ref1) || mpfr_compare (res2, ref2)) ++ if (! SAME_VAL (res1, ref1) || ! SAME_VAL (res2, ref2)) + { + printf ("Error for %s(a, b, b) for ", foo); +- DISP2("b=",ref3); +- DISP("expected (", ref1); DISP(",",ref2); ++ DISP2("b=", ref3); ++ DISP("expected (", ref1); DISP(",", ref2); + DISP("), got (", res1); DISP(",", res2); printf(")\n"); + exit (1); + } +@@ -561,10 +564,10 @@ + mpfr_set (res1, ref2, rnd); /* exact operation */ + mpfr_pow (res1, res1, ref3, rnd); + +- if (mpfr_compare (res1, ref1)) ++ if (! SAME_VAL (res1, ref1)) + { + printf ("Error for pow_int(a, a, c) for "); +- DISP("a=",ref2); DISP2(", c=",ref3); ++ DISP("a=", ref2); DISP2(", c=", ref3); + printf ("expected "); mpfr_dump (ref1); + printf ("got "); mpfr_dump (res1); + exit (1); +diff -Naurd mpfr-4.2.0-a/PATCHES mpfr-4.2.0-b/PATCHES +--- mpfr-4.2.0-a/PATCHES 2023-05-12 15:08:39.233546717 +0000 ++++ mpfr-4.2.0-b/PATCHES 2023-05-12 15:08:39.325546612 +0000 +@@ -0,0 +1 @@ ++pow_general +diff -Naurd mpfr-4.2.0-a/VERSION mpfr-4.2.0-b/VERSION +--- mpfr-4.2.0-a/VERSION 2023-05-12 15:06:11.885721962 +0000 ++++ mpfr-4.2.0-b/VERSION 2023-05-12 15:08:39.325546612 +0000 +@@ -1 +1 @@ +-4.2.0-p6 ++4.2.0-p7 +diff -Naurd mpfr-4.2.0-a/src/mpfr.h mpfr-4.2.0-b/src/mpfr.h +--- mpfr-4.2.0-a/src/mpfr.h 2023-05-12 15:06:11.877721972 +0000 ++++ mpfr-4.2.0-b/src/mpfr.h 2023-05-12 15:08:39.321546616 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 4 + #define MPFR_VERSION_MINOR 2 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "4.2.0-p6" ++#define MPFR_VERSION_STRING "4.2.0-p7" + + /* User macros: + MPFR_USE_FILE: Define it to make MPFR define functions dealing +diff -Naurd mpfr-4.2.0-a/src/pow.c mpfr-4.2.0-b/src/pow.c +--- mpfr-4.2.0-a/src/pow.c 2023-01-05 17:09:48.000000000 +0000 ++++ mpfr-4.2.0-b/src/pow.c 2023-05-12 15:08:39.309546630 +0000 +@@ -131,7 +131,6 @@ + /* Declaration of the size variable */ + mpfr_prec_t Nz = MPFR_PREC(z); /* target precision */ + mpfr_prec_t Nt; /* working precision */ +- mpfr_exp_t err; /* error */ + MPFR_ZIV_DECL (ziv_loop); + + MPFR_LOG_FUNC +@@ -171,12 +170,14 @@ + MPFR_ZIV_INIT (ziv_loop, Nt); + for (;;) + { ++ mpfr_exp_t err, exp_t; + MPFR_BLOCK_DECL (flags1); + + /* compute exp(y*ln|x|), using MPFR_RNDU to get an upper bound, so + that we can detect underflows. */ + mpfr_log (t, absx, MPFR_IS_NEG (y) ? MPFR_RNDD : MPFR_RNDU); /* ln|x| */ + mpfr_mul (t, y, t, MPFR_RNDU); /* y*ln|x| */ ++ exp_t = MPFR_GET_EXP (t); + if (k_non_zero) + { + MPFR_LOG_MSG (("subtract k * ln(2)\n", 0)); +@@ -188,14 +189,16 @@ + MPFR_LOG_VAR (t); + } + /* estimate of the error -- see pow function in algorithms.tex. +- The error on t is at most 1/2 + 3*2^(EXP(t)+1) ulps, which is +- <= 2^(EXP(t)+3) for EXP(t) >= -1, and <= 2 ulps for EXP(t) <= -2. ++ The error on t before the subtraction of k*log(2) is at most ++ 1/2 + 3*2^(EXP(t)+1) ulps, which is <= 2^(EXP(t)+3) for EXP(t) >= -1, ++ and <= 2 ulps for EXP(t) <= -2. + Additional error if k_no_zero: treal = t * errk, with + 1 - |k| * 2^(-Nt) <= exp(-|k| * 2^(-Nt)) <= errk <= 1, + i.e., additional absolute error <= 2^(EXP(k)+EXP(t)-Nt). +- Total error <= 2^err1 + 2^err2 <= 2^(max(err1,err2)+1). */ +- err = MPFR_NOTZERO (t) && MPFR_GET_EXP (t) >= -1 ? +- MPFR_GET_EXP (t) + 3 : 1; ++ Total ulp error <= 2^err1 + 2^err2 <= 2^(max(err1,err2)+1), ++ where err1 = EXP(t)+3 for EXP(t) >= -1, and 1 otherwise, ++ and err2 = EXP(k). */ ++ err = MPFR_NOTZERO (t) && exp_t >= -1 ? exp_t + 3 : 1; + if (k_non_zero) + { + if (MPFR_GET_EXP (k) > err) +@@ -328,11 +331,17 @@ + */ + if (rnd_mode == MPFR_RNDN && inexact < 0 && lk < 0 && + MPFR_GET_EXP (z) == __gmpfr_emin - 1 - lk && mpfr_powerof2_raw (z)) +- /* Rounding to nearest, real result > z * 2^k = 2^(emin - 2), +- * underflow case: we will obtain the correct result and exceptions +- * by replacing z by nextabove(z). +- */ +- mpfr_nextabove (z); ++ /* Rounding to nearest, exact result > z * 2^k = 2^(emin - 2), ++ * and underflow case because the rounded result assuming an ++ * unbounded exponent range is 2^(emin - 2). We need to round ++ * to 2^(emin - 1), i.e. to round toward +inf. ++ * Note: the old code was using "mpfr_nextabove (z);" instead of ++ * setting rnd_mode to MPFR_RNDU for the call to mpfr_mul_2si, but ++ * this was incorrect in precision 1 because in this precision, ++ * mpfr_nextabove gave 2^(emin - 1), which is representable, ++ * so that mpfr_mul_2si did not generate the wanted underflow ++ * (the value was correct, but the underflow flag was missing). */ ++ rnd_mode = MPFR_RNDU; + MPFR_CLEAR_FLAGS (); + inex2 = mpfr_mul_2si (z, z, lk, rnd_mode); + if (inex2) /* underflow or overflow */ +diff -Naurd mpfr-4.2.0-a/src/version.c mpfr-4.2.0-b/src/version.c +--- mpfr-4.2.0-a/src/version.c 2023-05-12 15:06:11.885721962 +0000 ++++ mpfr-4.2.0-b/src/version.c 2023-05-12 15:08:39.325546612 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "4.2.0-p6"; ++ return "4.2.0-p7"; + } +diff -Naurd mpfr-4.2.0-a/tests/texp10.c mpfr-4.2.0-b/tests/texp10.c +--- mpfr-4.2.0-a/tests/texp10.c 2023-01-05 17:09:48.000000000 +0000 ++++ mpfr-4.2.0-b/tests/texp10.c 2023-05-12 15:08:39.309546630 +0000 +@@ -190,6 +190,187 @@ + mpfr_clear (y); + } + ++/* Bug in mpfr_pow_general found by ofuf_thresholds (on 2023-02-13 for ++ a 32-bit exponent, changed on 2023-03-06 for a 64-bit exponent too), ++ fixed in commit b62966df913f73f08b3c5252e1d0c702bc20442f. ++ With a 32-bit exponent, failure for i=0. ++ expected 0.1111E1073741823 ++ got @Inf@ ++ expected flags = inexact (8) ++ got flags = overflow inexact (10) ++ With a 64-bit exponent, failure for i=1. ++ expected 0.11111111111111111111111E4611686018427387903 ++ got @Inf@ ++ expected flags = inexact (8) ++ got flags = overflow inexact (10) ++ Note: ofuf_thresholds was added to the master branch, but for the ++ time being, there are issues with these tests. ++*/ ++static void ++bug20230213 (void) ++{ ++ const char *s[2] = { ++ "0x1.34413504b3ccdbd5dd8p+28", ++ "0x1.34413509f79fef2c4e0dd14a7ae0ecfbacdbp+60" ++ }; ++ mpfr_t x1, x2, y1, y2; ++ mpfr_prec_t px[2] = { 74, 147 }; ++ mpfr_prec_t py[2] = { 4, 23 }; ++ mpfr_exp_t old_emax, emax; ++ mpfr_flags_t flags1, flags2; ++ int i; ++ ++ old_emax = mpfr_get_emax (); ++ ++ for (i = 0; i < 2; i++) ++ { ++ if (i != 0) ++ set_emax (MPFR_EMAX_MAX); ++ ++ emax = mpfr_get_emax (); ++ ++ mpfr_inits2 (px[i], x1, x2, (mpfr_ptr) 0); ++ mpfr_inits2 (py[i], y1, y2, (mpfr_ptr) 0); ++ ++ mpfr_setmax (y1, emax); ++ mpfr_log10 (x1, y1, MPFR_RNDD); ++ mpfr_set_str (x2, s[i], 0, MPFR_RNDN); ++ /* For i == 0, emax == 2^30, so that the value can be checked. ++ For i != 0, check the value for the case emax == 2^62. ++ The "0UL" ensures that the shifts are valid. */ ++ if (i == 0 || (((0UL + MPFR_EMAX_MAX) >> 31) >> 30) == 1) ++ { ++ /* printf ("Checking x1 for i=%d\n", i); */ ++ MPFR_ASSERTN (mpfr_equal_p (x1, x2)); ++ } ++ ++ /* Let MAXF be the maximum finite value (y1 above). ++ Since x1 < log10(MAXF), one should have exp10(x1) < MAXF, and ++ therefore, y2 = RU(exp10(x1)) <= RU(MAXF) = MAXF (no overflow). */ ++ flags1 = MPFR_FLAGS_INEXACT; ++ mpfr_clear_flags (); ++ mpfr_exp10 (y2, x1, MPFR_RNDU); ++ flags2 = __gmpfr_flags; ++ ++ if (! (mpfr_lessequal_p (y2, y1) && flags2 == flags1)) ++ { ++ printf ("Error in bug20230213 for i=%d\n", i); ++ printf ("emax = %" MPFR_EXP_FSPEC "d\n", (mpfr_eexp_t) emax); ++ printf ("expected "); mpfr_dump (y1); ++ printf ("got "); mpfr_dump (y2); ++ printf ("expected flags ="); ++ flags_out (flags1); ++ printf ("got flags ="); ++ flags_out (flags2); ++ exit (1); ++ } ++ ++ mpfr_clears (x1, x2, y1, y2, (mpfr_ptr) 0); ++ } ++ ++ set_emax (old_emax); ++} ++ ++/* Bug in mpfr_pow_general in precision 1 in the particular case of ++ rounding to nearest, z * 2^k = 2^(emin - 2) and real result larger ++ than this value; fixed in ff5012b61d5e5fee5156c57b8aa8fc1739c2a771 ++ (which is simplified in 4f5de980be290687ac1409aa02873e9e0dd1a030); ++ initially found by ofuf_thresholds (though the test was incorrect). ++ With a 32-bit exponent, failure for i=0. ++ With a 64-bit exponent, failure for i=1. ++ The result was correct, but the underflow flag was missing. ++ Note: ofuf_thresholds was added to the master branch, but for the ++ time being, there are issues with these tests. ++*/ ++static void ++bug20230427 (void) ++{ ++ const char *s[2] = { ++ "-0.1001101000100000100110101000011E29", ++ "-0.100110100010000010011010100001001111101111001111111101111001101E61" ++ }; ++ mpfr_t x, y, z, t1, t2; ++ mpfr_exp_t old_emin; ++ mpfr_flags_t flags, ex_flags; ++ int i, inex; ++ ++ old_emin = mpfr_get_emin (); ++ ++ mpfr_init2 (x, 63); ++ mpfr_inits2 (1, y, z, (mpfr_ptr) 0); ++ mpfr_inits2 (128, t1, t2, (mpfr_ptr) 0); ++ ++ for (i = 0; i < 2; i++) ++ { ++ if (i == 0) ++ { ++ /* Basic check: the default emin should be -2^30 (exactly). */ ++ if (mpfr_get_emin () != -1073741823) ++ abort (); ++ } ++ else ++ { ++ /* This test assumes that MPFR_EMIN_MIN = -2^62 (exactly). ++ The "0UL" ensures that the shifts are valid. */ ++ if ((((0UL - MPFR_EMIN_MIN) >> 31) >> 30) != 1) ++ break; ++ ++ set_emin (MPFR_EMIN_MIN); ++ } ++ ++ mpfr_set_str_binary (x, s[i]); ++ ++ /* We will test 10^x rounded to nearest in precision 1. ++ Check that 2^(emin - 2) < 10^x < (3/2) * 2^(emin - 2). ++ This is approximate, but by outputting the values, one can check ++ that one is not too close to the boundaries: ++ emin - 2 = -4611686018427387905 ++ log2(10^x) ~= -4611686018427387904.598 ++ emin - 2 + log2(3/2) ~= -4611686018427387904.415 ++ Thus the result should be the smallest positive number 2^(emin - 1) ++ because 10^x is closer to this number than to 0, the midpoint being ++ 2^(emin - 2). And there should be an underflow in precision 1 because ++ the result rounded to nearest in an unbounded exponent range should ++ have been 2^(emin - 2), the midpoint being (3/2) * 2^(emin - 2). ++ */ ++ mpfr_set_ui (t1, 10, MPFR_RNDN); ++ mpfr_log2 (t2, t1, MPFR_RNDN); ++ mpfr_mul (t1, t2, x, MPFR_RNDN); ++ inex = mpfr_set_exp_t (t2, mpfr_get_emin () - 2, MPFR_RNDN); ++ MPFR_ASSERTN (inex == 0); ++ MPFR_ASSERTN (mpfr_greater_p (t1, t2)); /* log2(10^x) > emin - 2 */ ++ inex = mpfr_sub (t1, t1, t2, MPFR_RNDN); ++ MPFR_ASSERTN (inex == 0); ++ mpfr_set_ui (t2, 3, MPFR_RNDN); ++ mpfr_log2 (t2, t2, MPFR_RNDN); ++ mpfr_sub_ui (t2, t2, 1, MPFR_RNDN); /* log2(3/2) */ ++ MPFR_ASSERTN (mpfr_less_p (t1, t2)); ++ ++ mpfr_clear_flags (); ++ mpfr_exp10 (y, x, MPFR_RNDN); ++ flags = __gmpfr_flags; ++ ex_flags = MPFR_FLAGS_UNDERFLOW | MPFR_FLAGS_INEXACT; ++ ++ mpfr_setmin (z, mpfr_get_emin ()); /* z = 0.1@emin */ ++ if (! (mpfr_equal_p (y, z) && flags == ex_flags)) ++ { ++ printf ("Error in bug20230427 for i=%d\n", i); ++ printf ("expected "); mpfr_dump (z); ++ printf ("got "); mpfr_dump (y); ++ printf ("emin = %" MPFR_EXP_FSPEC "d\n", ++ (mpfr_eexp_t) mpfr_get_emin ()); ++ printf ("expected flags ="); ++ flags_out (ex_flags); ++ printf ("got flags ="); ++ flags_out (flags); ++ exit (1); ++ } ++ } ++ ++ mpfr_clears (x, y, z, t1, t2, (mpfr_ptr) 0); ++ set_emin (old_emin); ++} ++ + int + main (int argc, char *argv[]) + { +@@ -199,6 +380,9 @@ + + tests_start_mpfr (); + ++ bug20230213 (); ++ bug20230427 (); ++ + special_overflow (); + emax_m_eps (); + exp_range ();

1 0

ports/opt (3.7): php: update to 8.2.6
by crux＠crux.nu 13 May '23

13 May '23

commit bd236dec5d585676bb21d072b6ad77b7b65f3a6d Author: Juergen Daubert <jue(a)jue.li> Date: Sat May 13 10:01:18 2023 +0200 php: update to 8.2.6 diff --git a/mod_php/.signature b/mod_php/.signature index c29ae6ca4..5b2806b9f 100644 --- a/mod_php/.signature +++ b/mod_php/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/cNNVJvfWsvndvaUEK4fpBmGFKJ2ANTeDW/dHqWa/KHeAToP6qTmSunZtguSMxaO9hqkeHBcfnNLvU/AlRcsSAI= -SHA256 (Pkgfile) = b67558c7f11525f963b562d847b6e702ead0a80b1fc95c8d76d04713139ec015 +RWSE3ohX2g5d/TyKZjdBWSRm6ElscUmBp9Ds5vqv/T8ym7Kmqkpeakn/Aoc0JdVeFFsipNz4OOrX9mKV/8iujmVXJdFmOJ1gUQI= +SHA256 (Pkgfile) = 1b7c0e4ac647b05fb7aa0e94c125842dd9a8040a9522d438d25a9c7ced03541d SHA256 (.footprint) = 7fa4482315662d626464b194385ae557ec401ff110bea6d24f6f48efc315ceba -SHA256 (php-8.2.5.tar.xz) = 800738c359b7f1e67e40c22713d2d90276bc85ba1c21b43d99edd43c254c5f76 +SHA256 (php-8.2.6.tar.xz) = 10b796f0ed45574229851212b30a596a76e70ae365322bcaaaf9c00fa7d58cca diff --git a/mod_php/Pkgfile b/mod_php/Pkgfile index fe7ff552e..4dd4b5e45 100644 --- a/mod_php/Pkgfile +++ b/mod_php/Pkgfile @@ -4,7 +4,7 @@ # Depends on: apache libpcre2 name=mod_php -version=8.2.5 +version=8.2.6 release=1 source=(https://php.net/distributions/php-$version.tar.xz) diff --git a/php-fcgi/.signature b/php-fcgi/.signature index fc9031b72..23defae97 100644 --- a/php-fcgi/.signature +++ b/php-fcgi/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/XZhEctPcN/CipSxK5O/RCWUpQIQFQYDLoBKhrT14sp5XnTe8rpc0haQL7qw8nxk0dqZ7EA8EG5/wefthixWAwk= -SHA256 (Pkgfile) = ae11eeacb7929810ef008aedf2898f7da4ab1977843320cb5b93ecc4ee909107 +RWSE3ohX2g5d/WLp3EkZvGqKY9nUxNjUz+kzNqo8RwKXmmJ6v065TU1zFjnssOe9eeeIf/7LMjjBH1VfC0u1tUpEEaUbma7w3gI= +SHA256 (Pkgfile) = 2daa1bac6540339b1ea4df4c349999b8b466c176f80d2ee24cc7a0129635634e SHA256 (.footprint) = 073d817f449e60b58f4c904bd4ef54ddad9bd0ab946ee178956622bf76d5501b -SHA256 (php-8.2.5.tar.xz) = 800738c359b7f1e67e40c22713d2d90276bc85ba1c21b43d99edd43c254c5f76 +SHA256 (php-8.2.6.tar.xz) = 10b796f0ed45574229851212b30a596a76e70ae365322bcaaaf9c00fa7d58cca SHA256 (php-fcgi) = 058feaf2d8ad8ed61a4191512eb2151b8ed87fd92ce469ee8bab1812c0cb6471 diff --git a/php-fcgi/Pkgfile b/php-fcgi/Pkgfile index 05002185c..4d454bad6 100644 --- a/php-fcgi/Pkgfile +++ b/php-fcgi/Pkgfile @@ -4,7 +4,7 @@ # Depends on: libpcre2 libxml2 name=php-fcgi -version=8.2.5 +version=8.2.6 release=1 source=(https://php.net/distributions/php-$version.tar.xz php-fcgi) diff --git a/php-fpm/.signature b/php-fpm/.signature index e95007f4b..114a4c1a6 100644 --- a/php-fpm/.signature +++ b/php-fpm/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/T4popZIncH5lAH5LRM958oI5iQHXOI1y7MQ9xQsFWJ0ktKNCZx0mS5g8dL3vvCf8r3YGWzUAD48rKIpf2wK/wo= -SHA256 (Pkgfile) = 4fa33f9e26d332c5380aeb90e99969a8635096c08f33f206176fd09c0959af19 +RWSE3ohX2g5d/ccK0xyNi/9hMG7DkypMnp4gdN4V1c2sxcM1+FBsmvpDCU+guFHUU9hlBBUztJf4f+cKMVvE2p2Z01XUYjd7UAo= +SHA256 (Pkgfile) = 107de36da61a00ebbdd59ee745b46d48fcb38ce556f27ffe9931f5b0b427b2e5 SHA256 (.footprint) = a26b7d8af42742c284dd40e96fb4c4d1ba451ac9bf4f714c8f12fb6975ffa5fe -SHA256 (php-8.2.5.tar.xz) = 800738c359b7f1e67e40c22713d2d90276bc85ba1c21b43d99edd43c254c5f76 +SHA256 (php-8.2.6.tar.xz) = 10b796f0ed45574229851212b30a596a76e70ae365322bcaaaf9c00fa7d58cca SHA256 (php-fpm) = 0dff1add3241de5ae058c3339d98c900b2a4082007dc3d93485cb46ca642dade diff --git a/php-fpm/Pkgfile b/php-fpm/Pkgfile index fd6f57976..6a3e30d2e 100644 --- a/php-fpm/Pkgfile +++ b/php-fpm/Pkgfile @@ -4,7 +4,7 @@ # Depends on: libpcre2 libxml2 name=php-fpm -version=8.2.5 +version=8.2.6 release=1 source=(https://php.net/distributions/php-$version.tar.xz php-fpm) diff --git a/php-ftp/.signature b/php-ftp/.signature index 0d861d240..67007d599 100644 --- a/php-ftp/.signature +++ b/php-ftp/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/WRK4KJnrPLErTxbY3ftaZim1mdEcjjxmkDGEJBD+i2d7LkkUaWnQ3gjHzsyw1EaRSBrq0s2mSRnbThksRu4ZAQ= -SHA256 (Pkgfile) = 53956f52631fba165dc7afff4f1877c6642122f712ca0931f3300279a00c2280 +RWSE3ohX2g5d/bcGxr+7O61z6/csQ9A05CsE08z7mqTzQD/75Hrb03Ra9A25/3lpGNI04OLZbNtT7iIpveeAvXgKq/zCv4mWTwU= +SHA256 (Pkgfile) = 048b04b315776cd6cee0d52086269de3ab7f7cbf19ff6c26bc4767725b77f4bf SHA256 (.footprint) = 4b6e9e791f10bb007a541c6a4cfe6a189d549592939bdf3e04c5bd0f25a4bfa0 -SHA256 (php-8.2.5.tar.xz) = 800738c359b7f1e67e40c22713d2d90276bc85ba1c21b43d99edd43c254c5f76 +SHA256 (php-8.2.6.tar.xz) = 10b796f0ed45574229851212b30a596a76e70ae365322bcaaaf9c00fa7d58cca diff --git a/php-ftp/Pkgfile b/php-ftp/Pkgfile index 11ce0aa03..b8aead785 100644 --- a/php-ftp/Pkgfile +++ b/php-ftp/Pkgfile @@ -3,7 +3,7 @@ # Maintainer: Juergen Daubert, jue at crux dot nu name=php-ftp -version=8.2.5 +version=8.2.6 release=1 source=(https://www.php.net/distributions/php-$version.tar.xz) diff --git a/php-gd/.signature b/php-gd/.signature index 041d88f13..67db9532d 100644 --- a/php-gd/.signature +++ b/php-gd/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/SEfUIVM/GlX68tKOnokgdTvGYkaYkPUbyvLunp8hlxAoF5deG40pKIkONexjBdEufR0meESvxEwre1vyebx9gs= -SHA256 (Pkgfile) = fc94893739c7093a8df502d878d8757f902f291036a3b81406edb6d01a381041 +RWSE3ohX2g5d/Zd4BoDoWub/YIWX2aXgCnXPN+JFv+9CgGt3FZgB0Xu4nYg9/Ef32oqlvGV/xbWqg9mKv1e0+ghPTcK7SqyI2wc= +SHA256 (Pkgfile) = b072e63e567fc31fb53492742a5f7656a715d6cbe0493cf9cb932837b4f72b1e SHA256 (.footprint) = 09e41333252c613bbc54155a95e91919aedf35e3fe90607f941528ac9f1a39bb -SHA256 (php-8.2.5.tar.xz) = 800738c359b7f1e67e40c22713d2d90276bc85ba1c21b43d99edd43c254c5f76 +SHA256 (php-8.2.6.tar.xz) = 10b796f0ed45574229851212b30a596a76e70ae365322bcaaaf9c00fa7d58cca diff --git a/php-gd/Pkgfile b/php-gd/Pkgfile index 6780c04b2..380808deb 100644 --- a/php-gd/Pkgfile +++ b/php-gd/Pkgfile @@ -4,7 +4,7 @@ # Depends on: libgd name=php-gd -version=8.2.5 +version=8.2.6 release=1 source=(https://www.php.net/distributions/php-$version.tar.xz) diff --git a/php-gettext/.signature b/php-gettext/.signature index 4c8cf4e42..e40b03af1 100644 --- a/php-gettext/.signature +++ b/php-gettext/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/fv8oUDn3pKJgXJZ8rEbfs21reFdT7vHRrf958vdw0mRTnhvrwqhxqNvVSlN4rOvsCfy/yHoLZnHBRYMAV75LQg= -SHA256 (Pkgfile) = 51b8ad5915164f7fb6da4832c0a2e872ed7c787d911d1451b9690fbfd482105a +RWSE3ohX2g5d/Xh66sEEWJ3qVcF+W+OMZND44vN8ppknKHRnvuCLwtpWObQznUQybbKgCjASXCCOHc+3LkZZy89KJjBLNydrzws= +SHA256 (Pkgfile) = b40e3596453aba41a52f08358522803424317f61c8af2da1fee6dd4d07715aed SHA256 (.footprint) = f2188408bdd37cf12c2eb9ef545b934e6a10d8faf52d3b961cd6c7649bdfaf9a -SHA256 (php-8.2.5.tar.xz) = 800738c359b7f1e67e40c22713d2d90276bc85ba1c21b43d99edd43c254c5f76 +SHA256 (php-8.2.6.tar.xz) = 10b796f0ed45574229851212b30a596a76e70ae365322bcaaaf9c00fa7d58cca diff --git a/php-gettext/Pkgfile b/php-gettext/Pkgfile index c6db30812..6e1d5eb09 100644 --- a/php-gettext/Pkgfile +++ b/php-gettext/Pkgfile @@ -3,7 +3,7 @@ # Maintainer: Juergen Daubert, jue at crux dot nu name=php-gettext -version=8.2.5 +version=8.2.6 release=1 source=(https://www.php.net/distributions/php-$version.tar.xz) diff --git a/php-mbstring/.signature b/php-mbstring/.signature index 155228c07..3700d1fbe 100644 --- a/php-mbstring/.signature +++ b/php-mbstring/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/Uagc0gJsQOwOrKGsqeJT4Z7SkUo322lU3zYQaD3pgRMEgAnrfoQMVkcj2VHoHVUL2DMh0OLgvYORvYWB57+5Q0= -SHA256 (Pkgfile) = b2707c66c4f88432a22f0d9c1bea9d6a287eb35dee232b835d35ec030edd26c3 +RWSE3ohX2g5d/Ukfwiz4qCB+ME/BLyE72iAqTAcNhQ4HMnrseerRsjJjC3rOkZpsgq4TlNR6QaqbaWRL7BJGtNCvVqtHsNzHvQQ= +SHA256 (Pkgfile) = 9ce9263514a4d0fcd3ea0c8000b8a9ea9eadf8a9fb4eb0dc804b4f0eb1c52052 SHA256 (.footprint) = 4a444295762f936750fb32f977171aecc73d9347bf51bace13d7f9dfc200812e -SHA256 (php-8.2.5.tar.xz) = 800738c359b7f1e67e40c22713d2d90276bc85ba1c21b43d99edd43c254c5f76 +SHA256 (php-8.2.6.tar.xz) = 10b796f0ed45574229851212b30a596a76e70ae365322bcaaaf9c00fa7d58cca diff --git a/php-mbstring/Pkgfile b/php-mbstring/Pkgfile index b7d76f58a..189ee476c 100644 --- a/php-mbstring/Pkgfile +++ b/php-mbstring/Pkgfile @@ -4,7 +4,7 @@ # Depends on: oniguruma libpcre2 name=php-mbstring -version=8.2.5 +version=8.2.6 release=1 source=(https://www.php.net/distributions/php-$version.tar.xz) diff --git a/php-mysql/.signature b/php-mysql/.signature index 7c98d56cb..22f830fed 100644 --- a/php-mysql/.signature +++ b/php-mysql/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/RU43azrAXxoTaCi7w9RZfsHqG1BEQYzWNazvVekYpuXxNtw5MpA072AT7WRTs2/b0UjJE9iRxuaJt0jkl/5AQY= -SHA256 (Pkgfile) = 121397b6447dae2e08c84b8ebbb9908f442ecbac449e0322623997ae73d6b871 +RWSE3ohX2g5d/U9Hz9km6gwiMC+9c3deYd7nG58wOB5l+v0nSaM4Fk5tqHvfXiFAPf4Bm/zOt/n+n0+gB57t/Zbnh6YTbwXTlwk= +SHA256 (Pkgfile) = bd087874423f97a332ee2b86e93958f74957af2acf6d1bc70ff9805030380986 SHA256 (.footprint) = 0500f66a60a1c3d5951694c22f29e7e34a6dbc8e5a1487119ff56db1ea7cdda3 -SHA256 (php-8.2.5.tar.xz) = 800738c359b7f1e67e40c22713d2d90276bc85ba1c21b43d99edd43c254c5f76 +SHA256 (php-8.2.6.tar.xz) = 10b796f0ed45574229851212b30a596a76e70ae365322bcaaaf9c00fa7d58cca diff --git a/php-mysql/Pkgfile b/php-mysql/Pkgfile index 43fb01bd4..443736e93 100644 --- a/php-mysql/Pkgfile +++ b/php-mysql/Pkgfile @@ -4,7 +4,7 @@ # Depends on: mariadb name=php-mysql -version=8.2.5 +version=8.2.6 release=1 source=(https://php.net/distributions/php-$version.tar.xz) diff --git a/php-sockets/.signature b/php-sockets/.signature index 72f91a54e..4215c620d 100644 --- a/php-sockets/.signature +++ b/php-sockets/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/WaDvz8PyUgUxi+38FwsQNNfzzoznBCsJlGYGNLDl0N/TPoFJH1kngTZCYSoHjE2P7oH4zstcSeXT1fC/7LPiwo= -SHA256 (Pkgfile) = b373447de3c4a80edd8fc888d23fe9f546bebd67fcf3b8b7771be28925ec10be +RWSE3ohX2g5d/d4iD28J0gbNsbVGLJng8/OIPnCIo0hm8UOvDFnSnnvd75Mq2UuKdJqMnv+EWgjeCqPALtlMOpHVQVv/NxVMRwc= +SHA256 (Pkgfile) = 54a84d2ae78704f7f8a9f6c35f67417e6a9b77599f8f1d80f5e12fde5e1b69ae SHA256 (.footprint) = 1a0e33807dcda8d11408be8b6356860cac8daea5a94d4e9a87e535fbf778f04e -SHA256 (php-8.2.5.tar.xz) = 800738c359b7f1e67e40c22713d2d90276bc85ba1c21b43d99edd43c254c5f76 +SHA256 (php-8.2.6.tar.xz) = 10b796f0ed45574229851212b30a596a76e70ae365322bcaaaf9c00fa7d58cca diff --git a/php-sockets/Pkgfile b/php-sockets/Pkgfile index 530774867..b80ff7f37 100644 --- a/php-sockets/Pkgfile +++ b/php-sockets/Pkgfile @@ -3,7 +3,7 @@ # Maintainer: Juergen Daubert, jue at crux dot nu name=php-sockets -version=8.2.5 +version=8.2.6 release=1 source=(https://www.php.net/distributions/php-$version.tar.xz) diff --git a/php-sqlite3/.signature b/php-sqlite3/.signature index a30919ed1..f83f19c35 100644 --- a/php-sqlite3/.signature +++ b/php-sqlite3/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/cAG7zXxy89FFy9GovonjzwgjM+++xiONHrO+wwDAxuYvXB+/c84Ab/upBnV0Qt8k5pDyRX4kcfteNmj/rHOJAA= -SHA256 (Pkgfile) = 9cae934c9c10589740bbf7a2e3872ce485b715bb7fbd566ff32683f5d09f1c57 +RWSE3ohX2g5d/c0Ha5Zjokvibt3/0xWsNGpSipvdwTFMlAeUzuj9eLjQoRbeZBXiYCTr27ylZaFwL9njFibPah0xcb0pbhSWHAA= +SHA256 (Pkgfile) = b2b40b3840db8411f23dd38d606a2d12e5848ae30d8253f0650a77cd53eec18d SHA256 (.footprint) = e626528b1bc2b3ce187cc979172f24c489075e0bc584aeb1d082b2f7197d6e49 -SHA256 (php-8.2.5.tar.xz) = 800738c359b7f1e67e40c22713d2d90276bc85ba1c21b43d99edd43c254c5f76 +SHA256 (php-8.2.6.tar.xz) = 10b796f0ed45574229851212b30a596a76e70ae365322bcaaaf9c00fa7d58cca diff --git a/php-sqlite3/Pkgfile b/php-sqlite3/Pkgfile index bc85e5548..eff5f027b 100644 --- a/php-sqlite3/Pkgfile +++ b/php-sqlite3/Pkgfile @@ -4,7 +4,7 @@ # Depends on: sqlite3 name=php-sqlite3 -version=8.2.5 +version=8.2.6 release=1 source=(https://php.net/distributions/php-$version.tar.xz) diff --git a/php-zip/.signature b/php-zip/.signature index 6c0b4fa93..0b2fe65a6 100644 --- a/php-zip/.signature +++ b/php-zip/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/cWA0bZQrzfy8sNlY08yjbCkN5yF2SgyRfhwtVEPUIIZBZMemmUwAiszgEWbo/RY34Ui1zNFa7Muhghfig5ivgI= -SHA256 (Pkgfile) = a41cb801b0c12d0f4f9e5d2e3ebf8efd4ea86a049005764900a23ce3689a823f +RWSE3ohX2g5d/T6/1QM3utRNt64UOyOZTFvlVSzdVVChfX1xGAa/2SPudt0aZO4fobjo4f0w/EIPTO2jOTgTBU1OwzwtdWjNJg4= +SHA256 (Pkgfile) = efb58b770ac89247e9d735459f6684fb43185880205f9ce8ba96fe58cf497437 SHA256 (.footprint) = 0ba08044c2d47be4c86015de875a10f15dfee8367b932c5466a0212da28e4203 -SHA256 (php-8.2.5.tar.xz) = 800738c359b7f1e67e40c22713d2d90276bc85ba1c21b43d99edd43c254c5f76 +SHA256 (php-8.2.6.tar.xz) = 10b796f0ed45574229851212b30a596a76e70ae365322bcaaaf9c00fa7d58cca diff --git a/php-zip/Pkgfile b/php-zip/Pkgfile index 899aa3833..b67053474 100644 --- a/php-zip/Pkgfile +++ b/php-zip/Pkgfile @@ -4,7 +4,7 @@ # Depends on: libzip name=php-zip -version=8.2.5 +version=8.2.6 release=1 source=(https://www.php.net/distributions/php-$version.tar.xz) diff --git a/php/.signature b/php/.signature index e91e8254f..2103289c5 100644 --- a/php/.signature +++ b/php/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/a4e1Y4wPrq14I4jB1wxmImatCzVmuacndkD9piquwUNW5Hix4R3DER+bKoBU2DurOQYmA7JokRQg4jyGBVqawI= -SHA256 (Pkgfile) = 362a1b0b31b35d097b500e130d748584107c94bd2288b519a97c909836469f16 +RWSE3ohX2g5d/cEy/mc2Ix+CPRSeiMVG6TBqe0h9k3KgAaQIXLzW48fAAtHVXnZFd13kpuAEJhYNl1Bq5v/8XuVKHzvgq7zanAY= +SHA256 (Pkgfile) = 481db4aaafd1b5129614e699f251240abc018379393c73acd69c972c859de67d SHA256 (.footprint) = 0bb625aad0d4942696525195d34d57ec33691d7cfcda21f96515d2a2fad1f6a0 -SHA256 (php-8.2.5.tar.xz) = 800738c359b7f1e67e40c22713d2d90276bc85ba1c21b43d99edd43c254c5f76 +SHA256 (php-8.2.6.tar.xz) = 10b796f0ed45574229851212b30a596a76e70ae365322bcaaaf9c00fa7d58cca diff --git a/php/Pkgfile b/php/Pkgfile index d87f72653..3eea43b68 100644 --- a/php/Pkgfile +++ b/php/Pkgfile @@ -4,7 +4,7 @@ # Depends on: bzip2 libpcre2 libxml2 curl db gdbm name=php -version=8.2.5 +version=8.2.6 release=1 source=(https://php.net/distributions/php-$version.tar.xz)

1 0

ports/opt (3.7): firefox-bin: update to 113.0.1
by crux＠crux.nu 13 May '23

13 May '23

commit fc378434861b2a9de3d7796168b607a2d26baaf2 Author: Juergen Daubert <jue(a)jue.li> Date: Sat May 13 09:58:04 2023 +0200 firefox-bin: update to 113.0.1 diff --git a/firefox-bin/.signature b/firefox-bin/.signature index 4fdcf33cd..1dec4c25f 100644 --- a/firefox-bin/.signature +++ b/firefox-bin/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/ZkZJTXVGt5rvCXb73bjQ8ReO20d4InoGE+Gr+x1eZXRteYCF4TiVI/AElkSJ2Aedy5rlGC+IfRNMmZseZ1jag8= -SHA256 (Pkgfile) = 33542f6bb337c3ecaa6c1536e81659976d5c1391aaa61aea62b83c3ccb6498f2 +RWSE3ohX2g5d/U795rHBW6zwHwrxqh9xlzPVsRxmTyOMS7LTRKSST084g6FQXrFLyuPEnzerO2w3yxXoDEuvp9usEWXjr41D7As= +SHA256 (Pkgfile) = 3ab6f08ffe0fb6b63e88ca1637fc1ac1876fde7339ff146ae61de6e3bdeeefbd SHA256 (.footprint) = 0124b181c5f8195b512f7e6c90c9c4f4b66800579a09d04f1c73897321372ab5 -SHA256 (firefox-113.0.tar.bz2) = 570d80410aa9333a3749bd538041a0456bf78e83ad27b485aa89f19c07d03890 +SHA256 (firefox-113.0.1.tar.bz2) = eb0a3398e96c928dcf26cb370f73e759341a96f239a69e020868ca13491e3887 SHA256 (policies.json) = cf856011307f7831d74cdacb4e80b6dceaa49882b8dcba008d527a78764903f4 SHA256 (firefox.desktop) = 05bd1a4e283bc68f525f87cabf35ad0a59e5e63e107ce3901a4ac73e3d16ef33 diff --git a/firefox-bin/Pkgfile b/firefox-bin/Pkgfile index b1f8e2986..a5ad4c3d7 100644 --- a/firefox-bin/Pkgfile +++ b/firefox-bin/Pkgfile @@ -4,7 +4,7 @@ # Depends on: gtk3 dbus-glib xorg-libxcomposite xorg-libxcursor name=firefox-bin -version=113.0 +version=113.0.1 release=1 source=(http://ftp.mozilla.org/pub/firefox/releases/$version/linux-x86_64/e… \ policies.json firefox.desktop)

1 0

ports/opt (3.7): mupdf: fix signature, silent tarball update by upstream
by crux＠crux.nu 13 May '23

13 May '23

commit 4319c8a603d881f8a992c127d95b0fe63016bb1f Author: Juergen Daubert <jue(a)jue.li> Date: Sat May 13 09:56:03 2023 +0200 mupdf: fix signature, silent tarball update by upstream diff --git a/mupdf/.signature b/mupdf/.signature index b1625d437..e4b7ef303 100644 --- a/mupdf/.signature +++ b/mupdf/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/U23sIbyTNIQqSikIceu7cXedEF5W1i6jF+fKCDmrmKmKQXzITeSCPcfYHbfbFIW8hxG7kMbcqMC5g4GCFDO+wE= +RWSE3ohX2g5d/W9LGmVHLfW6Dwq7+QPqREuy2oLsDY0m0lEJZdHBq6sksJfZAtcslvgOWe+ejoKzs48t7wt8goT/qQJ104WEzgQ= SHA256 (Pkgfile) = 3c860ade8754577e76df05da69d2549fc3028633adfbc09ceb9e4d16c277bfad SHA256 (.footprint) = 4392c4f9bf4653afee9ebd4a0a5f03df7cad3e8433e760945f1dcfdd877e9194 -SHA256 (mupdf-1.22.1-source.tar.gz) = d3df26f93d6b6c628bfc8cb184378a8e22feb50198909fedeb424e977c7b339d +SHA256 (mupdf-1.22.1-source.tar.gz) = d62f3c0e456ebbc42e71f5a47f0f8cd12cec2bf0a8d72b79e35fa35a6538b25a

1 0

ports/opt (3.7): rpcsvc-proto: update to 1.4.4
by crux＠crux.nu 12 May '23

12 May '23

commit 772b92954b25158151e3f7680af8b6db46ab6c87 Author: Juergen Daubert <jue(a)jue.li> Date: Fri May 12 12:51:15 2023 +0200 rpcsvc-proto: update to 1.4.4 diff --git a/rpcsvc-proto/.signature b/rpcsvc-proto/.signature index 1914ac107..3864763a6 100644 --- a/rpcsvc-proto/.signature +++ b/rpcsvc-proto/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/YXWCCPGzrY4sVP0SAeeUAtx00QoYiSbNmRtqrgPtjfMnUEF86QknJK9ZpKEPrvJsNhu4Fu+6jscoqRTVz1mAQM= -SHA256 (Pkgfile) = db17b8b85edb29c892406796f6bacd7c202ccfd92c248b68889f20492f418139 +RWSE3ohX2g5d/eoxAJIqodEqaY8sFtLrKlKZKgmXGuQyIMDMS3DsUMn4rDeYvQ/dHbfrnnJccVs0saUDqVmPeVytV/aqu7R8wAI= +SHA256 (Pkgfile) = f8613d134c1a79cd166fbe67c9c14f814227f54d0e5e6d95e7d35d27f0e2f1c5 SHA256 (.footprint) = 32eb61e7ba81492c68950b91e0c922c916e5c5fb969725b3b9ba89f19cfbef2e -SHA256 (rpcsvc-proto-1.4.3.tar.xz) = 69315e94430f4e79c74d43422f4a36e6259e97e67e2677b2c7d7060436bd99b1 +SHA256 (rpcsvc-proto-1.4.4.tar.xz) = 81c3aa27edb5d8a18ef027081ebb984234d5b5860c65bd99d4ac8f03145a558b diff --git a/rpcsvc-proto/Pkgfile b/rpcsvc-proto/Pkgfile index 2bdb293e9..eeca1d395 100644 --- a/rpcsvc-proto/Pkgfile +++ b/rpcsvc-proto/Pkgfile @@ -3,7 +3,7 @@ # Maintainer: CRUX System Team, core-ports at crux dot nu name=rpcsvc-proto -version=1.4.3 +version=1.4.4 release=1 source=(https://github.com/thkukuk/$name/releases/download/v$version/$name-…

1 0

ports/opt (3.7): mupdf: update to 1.22.1
by crux＠crux.nu 12 May '23

12 May '23

commit 33e1a53ef87142b152b98c1359914409a95edfee Author: Juergen Daubert <jue(a)jue.li> Date: Fri May 12 12:50:50 2023 +0200 mupdf: update to 1.22.1 diff --git a/mupdf/.signature b/mupdf/.signature index 751e4ceed..b1625d437 100644 --- a/mupdf/.signature +++ b/mupdf/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/W4CBS1bQlnEErD8jUUiTTUtW71RIv92sKXw9sWXC25TgN1JsBUCEptHp9K8WbMQKlAIS5Po1DnN9Dr7rfVzPgQ= -SHA256 (Pkgfile) = 6276c56591d705ff016a3aac7e83fd9524554e23ad169126543b17af4f1b0c90 +RWSE3ohX2g5d/U23sIbyTNIQqSikIceu7cXedEF5W1i6jF+fKCDmrmKmKQXzITeSCPcfYHbfbFIW8hxG7kMbcqMC5g4GCFDO+wE= +SHA256 (Pkgfile) = 3c860ade8754577e76df05da69d2549fc3028633adfbc09ceb9e4d16c277bfad SHA256 (.footprint) = 4392c4f9bf4653afee9ebd4a0a5f03df7cad3e8433e760945f1dcfdd877e9194 -SHA256 (mupdf-1.22.0-source.tar.gz) = 5cae91c6332fa6cb08f1258addd27b736c4663f92698c8897b382c453534ee60 +SHA256 (mupdf-1.22.1-source.tar.gz) = d3df26f93d6b6c628bfc8cb184378a8e22feb50198909fedeb424e977c7b339d diff --git a/mupdf/Pkgfile b/mupdf/Pkgfile index 2c42052ef..aaadad06e 100644 --- a/mupdf/Pkgfile +++ b/mupdf/Pkgfile @@ -5,7 +5,7 @@ # Optional: freeglut openjpeg2 jbig2dec gumbo-parser name=mupdf -version=1.22.0 +version=1.22.1 release=1 source=(https://mupdf.com/downloads/archive/$name-$version-source.tar.gz)

1 0

ports/opt (3.7): libxml2: update to 2.11.3
by crux＠crux.nu 12 May '23

12 May '23

commit 16bc25aff94e0078fbfe925f50d0d9185c207c7c Author: Juergen Daubert <jue(a)jue.li> Date: Fri May 12 12:50:29 2023 +0200 libxml2: update to 2.11.3 diff --git a/libxml2/.footprint b/libxml2/.footprint index efe0b7115..d5f051c25 100644 --- a/libxml2/.footprint +++ b/libxml2/.footprint @@ -57,9 +57,9 @@ drwxr-xr-x root/root usr/lib/cmake/ drwxr-xr-x root/root usr/lib/cmake/libxml2/ -rw-r--r-- root/root usr/lib/cmake/libxml2/libxml2-config.cmake -rwxr-xr-x root/root usr/lib/libxml2.la -lrwxrwxrwx root/root usr/lib/libxml2.so -> libxml2.so.2.11.2 -lrwxrwxrwx root/root usr/lib/libxml2.so.2 -> libxml2.so.2.11.2 --rwxr-xr-x root/root usr/lib/libxml2.so.2.11.2 +lrwxrwxrwx root/root usr/lib/libxml2.so -> libxml2.so.2.11.3 +lrwxrwxrwx root/root usr/lib/libxml2.so.2 -> libxml2.so.2.11.3 +-rwxr-xr-x root/root usr/lib/libxml2.so.2.11.3 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libxml-2.0.pc drwxr-xr-x root/root usr/lib/python3.10/ diff --git a/libxml2/.signature b/libxml2/.signature index ef9712c77..545a7fb57 100644 --- a/libxml2/.signature +++ b/libxml2/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/aMj445veJzagy+VnF004ro208OcUdA2sK9kUuKtFLFpqIQh9YXYiaXep45L0Rn1QvGHaHEg/PhR3ZOk8NVo8wo= -SHA256 (Pkgfile) = 798570880995451d9487ae84319642433966f41bec762121fbadc9ffe2053581 -SHA256 (.footprint) = 86065f00881f8abb10b34aa8e9506d11019a4be0d74e32dcc42b912a2e29c559 -SHA256 (libxml2-2.11.2.tar.xz) = ac11e8b66176d49514bd4fa17c3fbdb3414aef64518ff9db536862e4682e2a64 +RWSE3ohX2g5d/fmlRVXNQb5tJzKb6t34T6KoJKt8FkUHf9n0VDO1rET56MW1vFzDJJ2p4T4UhoF47WORk/xiaee5pV6EMfSYHQo= +SHA256 (Pkgfile) = ea4d48e9682c34e2b82bdc7bb71501de03184ce5685b520a98cbfd9d331bf921 +SHA256 (.footprint) = 7f29df1b057f1b86e5f4b1e17d19d6569b4b1dda26647acdfbcb1e8c10d31d07 +SHA256 (libxml2-2.11.3.tar.xz) = f1acae1664bda006cd81bfc238238217043d586d06659d5c0e3d1bcebe040870 diff --git a/libxml2/Pkgfile b/libxml2/Pkgfile index 6b82f4490..37867682a 100644 --- a/libxml2/Pkgfile +++ b/libxml2/Pkgfile @@ -4,7 +4,7 @@ # Depends on: zlib xz name=libxml2 -version=2.11.2 +version=2.11.3 release=1 source=(https://download.gnome.org/sources/libxml2/${version:0:4}/$name-$ve…

1 0

ports/opt (3.7): at-spi2-core: update to 2.48.2
by crux＠crux.nu 12 May '23

12 May '23

commit 41cf58d4c9544e7a6b1c04e740091345330e8666 Author: Juergen Daubert <jue(a)jue.li> Date: Fri May 12 12:50:04 2023 +0200 at-spi2-core: update to 2.48.2 diff --git a/at-spi2-core/.footprint b/at-spi2-core/.footprint index 3363aa8eb..7eda0367f 100644 --- a/at-spi2-core/.footprint +++ b/at-spi2-core/.footprint @@ -93,8 +93,8 @@ drwxr-xr-x root/root usr/lib/gtk-2.0/ drwxr-xr-x root/root usr/lib/gtk-2.0/modules/ -rwxr-xr-x root/root usr/lib/gtk-2.0/modules/libatk-bridge.so lrwxrwxrwx root/root usr/lib/libatk-1.0.so -> libatk-1.0.so.0 -lrwxrwxrwx root/root usr/lib/libatk-1.0.so.0 -> libatk-1.0.so.0.24809.1 --rwxr-xr-x root/root usr/lib/libatk-1.0.so.0.24809.1 +lrwxrwxrwx root/root usr/lib/libatk-1.0.so.0 -> libatk-1.0.so.0.24811.1 +-rwxr-xr-x root/root usr/lib/libatk-1.0.so.0.24811.1 lrwxrwxrwx root/root usr/lib/libatk-bridge-2.0.so -> libatk-bridge-2.0.so.0 lrwxrwxrwx root/root usr/lib/libatk-bridge-2.0.so.0 -> libatk-bridge-2.0.so.0.0.0 -rwxr-xr-x root/root usr/lib/libatk-bridge-2.0.so.0.0.0 diff --git a/at-spi2-core/.signature b/at-spi2-core/.signature index 6bbf262fc..64d59e615 100644 --- a/at-spi2-core/.signature +++ b/at-spi2-core/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/cTYVwMMAVMhC4kpsdezzVW211yy5Dpy3yLkpvh8q5yYvnuAkw1y+QlxluBsYmDBl9R69CsfYEXFTgy5leXOlwc= -SHA256 (Pkgfile) = e21aa141917b8745b9e8e61d9eba9d1e9de64965d8ef9cfa59e3f9b1891b291e -SHA256 (.footprint) = 2aedc5d0ed06baf8b27508d5b9e967d9b175fe311cb4f039550d133f997eb455 -SHA256 (at-spi2-core-2.48.0.tar.xz) = 905a5b6f1790b68ee803bffa9f5fab4ceb591fb4fae0b2f8c612c54f1d4e8a30 +RWSE3ohX2g5d/Ze/p6S8L1zqjNkYauAnz4b1PFe44XTUZ4nd1/bGwmRnIkoaXPuLodnth/jSywNA67/D+XuPZfZ2bAuXO+zV0QQ= +SHA256 (Pkgfile) = 724d7aca99ec5b2cbdc0d087ac87b976fcf46617bd08627c2e768339b46f5c3b +SHA256 (.footprint) = e37eaae0fb52deeef08ad1844f31deb0a0b0f8c2d71037f9be77e6af6c63cae9 +SHA256 (at-spi2-core-2.48.2.tar.xz) = 86ebcb55f678381d7ed7825736add42dfccb70ad3b981dfd65d72e58f87828ee diff --git a/at-spi2-core/Pkgfile b/at-spi2-core/Pkgfile index 6b90a0459..fd8f2a108 100644 --- a/at-spi2-core/Pkgfile +++ b/at-spi2-core/Pkgfile @@ -4,7 +4,7 @@ # Depends on: dbus gobject-introspection intltool libxml2 xorg-libxtst name=at-spi2-core -version=2.48.0 +version=2.48.2 release=1 source=(https://download.gnome.org/sources/$name/${version:0:4}/$name-$vers…

1 0