sagemath · vbraun · May 11, 2025 · Apr 15, 2025 · Apr 30, 2025
diff --git a/README.md b/README.md
@@ -217,7 +217,7 @@ in the Installation Guide.
       for a discussion of suitable compilers.
 
     - Build tools: GNU `make`, GNU `m4`, `perl` (including
-      `ExtUtils::MakeMaker`), `ranlib`, `git`, `tar`, `bc`.
+      `ExtUtils::MakeMaker`), `ranlib`, `git`, `tar`, `bc`, `patch`.
       See [build/pkgs/_prereq/SPKG.rst](build/pkgs/_prereq/SPKG.rst) for
       more details.
 

diff --git a/build/bin/sage-apply-patches b/build/bin/sage-apply-patches
@@ -31,7 +31,7 @@ patchdir="../patches"
 patch_subdir=""
 patch_strip="-p1"
 patch_args_sep=""
-patch_args="--no-backup-if-mismatch"
+patch_args=""
 
 while [[ $# > 0 ]]; do
     if [[ -z "$patch_args_sep" ]]; then

diff --git a/build/pkgs/_prereq/distros/alpine.txt b/build/pkgs/_prereq/distros/alpine.txt
@@ -18,3 +18,4 @@ gcc
 g++
 ca-certificates
 coreutils
+patch
diff --git a/build/pkgs/_prereq/distros/arch.txt b/build/pkgs/_prereq/distros/arch.txt
@@ -17,3 +17,4 @@ bc
 gcc
 # Needed for 4ti2:
 which
+patch
diff --git a/build/pkgs/_prereq/distros/conda.txt b/build/pkgs/_prereq/distros/conda.txt
@@ -14,3 +14,4 @@ perl
 python
 tar
 bc
+patch
diff --git a/build/pkgs/_prereq/distros/debian.txt b/build/pkgs/_prereq/distros/debian.txt
@@ -26,3 +26,4 @@ gcc
 g++
 # Needed if we download some packages from a https upstream URL
 ca-certificates
+patch
diff --git a/build/pkgs/_prereq/distros/fedora.txt b/build/pkgs/_prereq/distros/fedora.txt
@@ -31,3 +31,4 @@ diffutils
 perl-IPC-Cmd
 # Needed to build gcc
 flex
+patch
diff --git a/build/pkgs/_prereq/distros/freebsd.txt b/build/pkgs/_prereq/distros/freebsd.txt
@@ -16,3 +16,4 @@ automake
 bash
 dash
 python # python metaport for bootstrapping the build
+patch
diff --git a/build/pkgs/_prereq/distros/gentoo.txt b/build/pkgs/_prereq/distros/gentoo.txt
@@ -27,3 +27,4 @@ dev-libs/libxml2
 sys-apps/findutils
 sys-apps/which
 sys-apps/diffutils
+sys-devel/patch
diff --git a/build/pkgs/_prereq/distros/nix.txt b/build/pkgs/_prereq/distros/nix.txt
@@ -16,3 +16,4 @@ gnutar
 bc
 gcc
 bash
+gnupatch
diff --git a/build/pkgs/_prereq/distros/opensuse.txt b/build/pkgs/_prereq/distros/opensuse.txt
@@ -26,3 +26,4 @@ gzip
 # Issue #32368
 findutils
 diffutils
+patch
diff --git a/build/pkgs/_prereq/distros/slackware.txt b/build/pkgs/_prereq/distros/slackware.txt
@@ -28,3 +28,4 @@ flex
 ca-certificates
 libxml2
 cyrus-sasl
+patch
diff --git a/build/pkgs/_prereq/distros/void.txt b/build/pkgs/_prereq/distros/void.txt
@@ -32,3 +32,4 @@ libffi-devel
 zlib-devel
 # to build python3 with the crypto module; there may be other packages that need it
 libxcrypt-devel
+patch
diff --git a/build/pkgs/flint/checksums.ini b/build/pkgs/flint/checksums.ini
@@ -1,4 +1,4 @@
 tarball=flint-VERSION.tar.gz
-sha1=35af6e2de8765a841952438f3c915d0505b983b6
-sha256=3259e5ecbb07ea3bebeff025f846a494087be92b0aaf0636d6e36128963cadda
+sha1=ebca3a55e48373c2eeee6c172051f3177845e121
+sha256=577d7729e4c2e79ca1e894ad2ce34bc73516a92f623d42562694817f888a17eb
 upstream_url=https://github.com/flintlib/flint/releases/download/vVERSION/flint-VERSION.tar.gz
diff --git a/build/pkgs/flint/package-version.txt b/build/pkgs/flint/package-version.txt
@@ -1 +1 @@
-3.1.3
+3.2.2
diff --git a/build/pkgs/patch/SPKG.rst b/build/pkgs/patch/SPKG.rst
diff --git a/build/pkgs/patch/checksums.ini b/build/pkgs/patch/checksums.ini
diff --git a/build/pkgs/patch/dependencies b/build/pkgs/patch/dependencies
diff --git a/build/pkgs/patch/distros/alpine.txt b/build/pkgs/patch/distros/alpine.txt
diff --git a/build/pkgs/patch/distros/arch.txt b/build/pkgs/patch/distros/arch.txt
diff --git a/build/pkgs/patch/distros/conda.txt b/build/pkgs/patch/distros/conda.txt
diff --git a/build/pkgs/patch/distros/debian.txt b/build/pkgs/patch/distros/debian.txt
diff --git a/build/pkgs/patch/distros/fedora.txt b/build/pkgs/patch/distros/fedora.txt
diff --git a/build/pkgs/patch/distros/freebsd.txt b/build/pkgs/patch/distros/freebsd.txt
diff --git a/build/pkgs/patch/distros/homebrew.txt b/build/pkgs/patch/distros/homebrew.txt
diff --git a/build/pkgs/patch/distros/macports.txt b/build/pkgs/patch/distros/macports.txt
diff --git a/build/pkgs/patch/distros/opensuse.txt b/build/pkgs/patch/distros/opensuse.txt
diff --git a/build/pkgs/patch/distros/repology.txt b/build/pkgs/patch/distros/repology.txt
diff --git a/build/pkgs/patch/distros/slackware.txt b/build/pkgs/patch/distros/slackware.txt
diff --git a/build/pkgs/patch/distros/void.txt b/build/pkgs/patch/distros/void.txt
diff --git a/build/pkgs/patch/package-version.txt b/build/pkgs/patch/package-version.txt
diff --git a/build/pkgs/patch/patch.exe.manifest b/build/pkgs/patch/patch.exe.manifest
diff --git a/build/pkgs/patch/spkg-configure.m4 b/build/pkgs/patch/spkg-configure.m4
diff --git a/build/pkgs/patch/spkg-install.in b/build/pkgs/patch/spkg-install.in
diff --git a/build/pkgs/patch/type b/build/pkgs/patch/type
diff --git a/build/pkgs/pkgconf/dependencies b/build/pkgs/pkgconf/dependencies
@@ -1,4 +1,4 @@
-| patch xz
+| xz
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/singular/checksums.ini b/build/pkgs/singular/checksums.ini
@@ -1,4 +1,4 @@
 tarball=singular-VERSION.tar.gz
-sha1=1f678e1cc756fd8dc29dcdef5ae67441b6bcc779
-sha256=c269abbd24c84fe33edc0af1e78b8fec53d8e94338410ac06c2666cfd40d43f2
+sha1=0578f25204102ba70cb56c7543b37e98a389f22a
+sha256=6a4fbaaed05b89c35bff3b1c5e124344a088097f81affe129c9ae619b282b49b
 upstream_url=ftp://jim.mathematik.uni-kl.de/pub/Math/Singular/SOURCES/${VERSION_MAJOR}-${VERSION_MINOR}-${VERSION_MICRO}/singular-VERSION.tar.gz
diff --git a/build/pkgs/singular/package-version.txt b/build/pkgs/singular/package-version.txt
@@ -1 +1 @@
-4.4.0
+4.4.1
diff --git a/src/doc/en/developer/portability_testing.rst b/src/doc/en/developer/portability_testing.rst
@@ -205,12 +205,13 @@ example, the file ``build/pkgs/_prereq/distros/debian.txt`` contains the followi
   g++
   # Needed if we download some packages from a https upstream URL
   ca-certificates
+  patch
 
 From this information, we know that we can use the following command
 on our container to install the necessary build prerequisites::
 
   root@39d693b2a75d:/sage# apt-get install binutils make m4 perl python3 \
-                                           tar bc gcc g++ ca-certificates
+                                           tar bc gcc g++ ca-certificates patch
   Reading package lists... Done
   Building dependency tree
   Reading state information... Done
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,3 +18,4 @@ gcc @@
     g++
     ca-certificates
     coreutils
+    patch