From 79667bfcb3c7d909567ce007c2a9e10c917cab7b Mon Sep 17 00:00:00 2001
From: Dima Pasechnik <dima@pasechnik.info>
Date: Tue, 10 Oct 2023 12:54:05 +0100
Subject: [PATCH] bump to 2.15.4, patches dropped

---
 build/pkgs/pari/checksums.ini         |  6 ++---
 build/pkgs/pari/package-version.txt   |  2 +-
 build/pkgs/pari/patches/bug2466.patch | 25 -----------------
 build/pkgs/pari/patches/bug2469.patch | 39 ---------------------------
 4 files changed, 4 insertions(+), 68 deletions(-)
 delete mode 100644 build/pkgs/pari/patches/bug2466.patch
 delete mode 100644 build/pkgs/pari/patches/bug2469.patch

diff --git a/build/pkgs/pari/checksums.ini b/build/pkgs/pari/checksums.ini
index fdd2b48bdea..b6fc05baa1a 100644
--- a/build/pkgs/pari/checksums.ini
+++ b/build/pkgs/pari/checksums.ini
@@ -1,5 +1,5 @@
 tarball=pari-VERSION.tar.gz
-sha1=8a98276cb785c4d07b3f2481b82dd0895f5f6b9b
-md5=23ff1ac381bc633cbd138d57a9929595
-cksum=1624634749
+sha1=ae962671b5bf86849d2021113dfb5b2f59331a10
+md5=4ab5c81d93f4bccb94e483b8b48fc336
+cksum=598072677
 upstream_url=https://pari.math.u-bordeaux.fr/pub/pari/unix/pari-VERSION.tar.gz
diff --git a/build/pkgs/pari/package-version.txt b/build/pkgs/pari/package-version.txt
index 3b8576204e0..86fbeafcc20 100644
--- a/build/pkgs/pari/package-version.txt
+++ b/build/pkgs/pari/package-version.txt
@@ -1 +1 @@
-2.15.3.p1
+2.15.4
diff --git a/build/pkgs/pari/patches/bug2466.patch b/build/pkgs/pari/patches/bug2466.patch
deleted file mode 100644
index 569baa288ff..00000000000
--- a/build/pkgs/pari/patches/bug2466.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7ca0c2eae87def89fa7253c60e4791a8ef26629d Mon Sep 17 00:00:00 2001
-From: Bill Allombert <Bill.Allombert@math.u-bordeaux.fr>
-Date: Mon, 3 Apr 2023 15:30:26 +0200
-Subject: [PATCH] quadunitindex(8461,2)->1 instead of 3 [#2466]
-
----
- src/basemath/quad.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/basemath/quad.c b/src/basemath/quad.c
-index 021a404b00..7ed554c2f3 100644
---- a/src/basemath/quad.c
-+++ b/src/basemath/quad.c
-@@ -359,7 +359,7 @@ quadunit_mod(GEN D, GEN N)
-     GEN M = shifti(mulii(q, N), 1);
-     quadunit_uvmod(D, d, M, &u, &v);
-     u = diviiexact(u, q);
--    v = diviiexact(v, q); u = shifti(u,-1);
-+    v = modii(diviiexact(v, q), N); u = shifti(u,-1);
-   }
-   return deg1pol_shallow(v, u, 0);
- }
--- 
-2.40.0
-
diff --git a/build/pkgs/pari/patches/bug2469.patch b/build/pkgs/pari/patches/bug2469.patch
deleted file mode 100644
index 9e7d91d9c21..00000000000
--- a/build/pkgs/pari/patches/bug2469.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/src/basemath/ifactor1.c b/src/basemath/ifactor1.c
-index 526ac5c1b3..5fb4454353 100644
---- a/src/basemath/ifactor1.c
-+++ b/src/basemath/ifactor1.c
-@@ -3595,7 +3595,7 @@ ifactor_sign(GEN n, ulong all, long hint, long sn, GEN *pU)
- {
-   GEN M, N;
-   pari_sp av;
--  long nb = 0, nb0 = 0, i;
-+  long nb = 0, nb0 = -1, i;
-   ulong lim;
-   forprime_t T;
- 
-@@ -3666,7 +3666,7 @@ ifactor_sign(GEN n, ulong all, long hint, long sn, GEN *pU)
-         affii(n, N); n = N; set_avma(av3);
-         STOREu(&nb, p, k);
-       }
--      if (p == 16381 && bit_accuracy(lgefint(n)) < 2048)
-+      if (!stop && p == 16381 && bit_accuracy(lgefint(n)) < 2048)
-       { stop = ifac_isprime(n); nb0 = nb; }
-       if (stop)
-       {
-@@ -3706,15 +3706,14 @@ ifactor_sign(GEN n, ulong all, long hint, long sn, GEN *pU)
-     long k;
-     av = avma;
-     k = isanypower_nosmalldiv(n, &x);
--    if (k > 1) affii(x, n);
-+    if (k > 1) { affii(x, n); nb0 = -1; }
-     if (pU)
-     {
-       GEN F;
-       if (abscmpiu(n, lim) <= 0
-           || cmpii(n, sqru(lim)) <= 0
--          || ((nb > nb0 || k > 1)
--              && bit_accuracy(lgefint(n)) < 2048 && ifac_isprime(n)))
-+          || (nb > nb0 && bit_accuracy(lgefint(n)) < 2048 && ifac_isprime(n)))
-       { set_avma(av); STOREi(&nb, n, k); return aux_end(M,n, nb); }
-       set_avma(av); F = aux_end(M, NULL, nb); /* don't destroy n */
-       *pU = mkvec2(icopy(n), utoipos(k)); /* composite cofactor */