From ecd3895717f1e6434771b670fb710a29613c0855 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 17 Apr 2022 12:25:36 -0700 Subject: [PATCH 1/2] build/pkgs/giac/patches/0001-src-global.cc-Do-not-send-SIGINT-to-process-1.patch: New --- build/pkgs/giac/package-version.txt | 2 +- ...l.cc-Do-not-send-SIGINT-to-process-1.patch | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 build/pkgs/giac/patches/0001-src-global.cc-Do-not-send-SIGINT-to-process-1.patch diff --git a/build/pkgs/giac/package-version.txt b/build/pkgs/giac/package-version.txt index dc9d0d659ba..f490da152c5 100644 --- a/build/pkgs/giac/package-version.txt +++ b/build/pkgs/giac/package-version.txt @@ -1 +1 @@ -1.6.0.47p3 +1.6.0.47p3.p0 diff --git a/build/pkgs/giac/patches/0001-src-global.cc-Do-not-send-SIGINT-to-process-1.patch b/build/pkgs/giac/patches/0001-src-global.cc-Do-not-send-SIGINT-to-process-1.patch new file mode 100644 index 00000000000..5ab40921c98 --- /dev/null +++ b/build/pkgs/giac/patches/0001-src-global.cc-Do-not-send-SIGINT-to-process-1.patch @@ -0,0 +1,25 @@ +From 5546fba822d4816eb27c94964b96caa69989b846 Mon Sep 17 00:00:00 2001 +From: Matthias Koeppe +Date: Sun, 17 Apr 2022 12:20:55 -0700 +Subject: [PATCH] src/global.cc: Do not send SIGINT to process 1 + +--- + src/global.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/global.cc b/src/global.cc +index c343aea..87e4575 100755 +--- a/src/global.cc ++++ b/src/global.cc +@@ -1978,7 +1978,7 @@ extern "C" void Sleep(unsigned int miliSecond); + void ctrl_c_signal_handler(int signum){ + ctrl_c=true; + #if !defined KHICAS && !defined NSPIRE_NEWLIB && !defined WIN32 && !defined BESTA_OS && !defined NSPIRE && !defined FXCG && !defined POCKETCAS +- if (child_id) ++ if (child_id && child_id != 1) + kill(child_id,SIGINT); + #endif + #if defined HAVE_SIGNAL_H && !defined HAVE_NO_SIGNAL_H +-- +2.35.1 + From ad69a5b07b86a62dd20693056208f234ba4b06b9 Mon Sep 17 00:00:00 2001 From: Release Manager Date: Tue, 19 Apr 2022 22:34:41 +0200 Subject: [PATCH 2/2] Updated SageMath version to 9.6.rc1 --- .zenodo.json | 8 ++++---- VERSION.txt | 2 +- build/pkgs/configure/checksums.ini | 6 +++--- build/pkgs/configure/package-version.txt | 2 +- build/pkgs/sagelib/package-version.txt | 2 +- src/VERSION.txt | 2 +- src/bin/sage-version.sh | 6 +++--- src/sage/version.py | 6 +++--- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.zenodo.json b/.zenodo.json index a9a5f57485d..b186023807f 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -1,10 +1,10 @@ { "description": "Mirror of the Sage https://sagemath.org/ source tree", "license": "other-open", - "title": "sagemath/sage: 9.6.rc0", - "version": "9.6.rc0", + "title": "sagemath/sage: 9.6.rc1", + "version": "9.6.rc1", "upload_type": "software", - "publication_date": "2022-04-10", + "publication_date": "2022-04-19", "creators": [ { "affiliation": "SageMath.org", @@ -15,7 +15,7 @@ "related_identifiers": [ { "scheme": "url", - "identifier": "https://github.com/sagemath/sage/tree/9.6.rc0", + "identifier": "https://github.com/sagemath/sage/tree/9.6.rc1", "relation": "isSupplementTo" }, { diff --git a/VERSION.txt b/VERSION.txt index 87e16176a2a..3723a0332a0 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -SageMath version 9.6.rc0, Release Date: 2022-04-10 +SageMath version 9.6.rc1, Release Date: 2022-04-19 diff --git a/build/pkgs/configure/checksums.ini b/build/pkgs/configure/checksums.ini index 8477e334015..6eb79408a29 100644 --- a/build/pkgs/configure/checksums.ini +++ b/build/pkgs/configure/checksums.ini @@ -1,4 +1,4 @@ tarball=configure-VERSION.tar.gz -sha1=b0bdee46694dcd644eb44afb88cc39200d9dd8d2 -md5=878189976be30e8e4079e5e2b1181f78 -cksum=311767680 +sha1=1524f97042a658d1c6b797ccaf9281ed32474930 +md5=b2db89f2ac4c76b3f6b30f57ee15171d +cksum=3697337668 diff --git a/build/pkgs/configure/package-version.txt b/build/pkgs/configure/package-version.txt index 2147688bc77..706836e510c 100644 --- a/build/pkgs/configure/package-version.txt +++ b/build/pkgs/configure/package-version.txt @@ -1 +1 @@ -d131751682b8901ecc10738b95c2470c2a21e7a9 +9da7c13c6970e13984373574ed04410134120370 diff --git a/build/pkgs/sagelib/package-version.txt b/build/pkgs/sagelib/package-version.txt index 0e45e9855af..491046ea819 100644 --- a/build/pkgs/sagelib/package-version.txt +++ b/build/pkgs/sagelib/package-version.txt @@ -1 +1 @@ -9.6.rc0 +9.6.rc1 diff --git a/src/VERSION.txt b/src/VERSION.txt index 0e45e9855af..491046ea819 100644 --- a/src/VERSION.txt +++ b/src/VERSION.txt @@ -1 +1 @@ -9.6.rc0 +9.6.rc1 diff --git a/src/bin/sage-version.sh b/src/bin/sage-version.sh index 12f6af6cbaf..fc988085ac7 100644 --- a/src/bin/sage-version.sh +++ b/src/bin/sage-version.sh @@ -1,5 +1,5 @@ # Sage version information for shell scripts # This file is auto-generated by the sage-update-version script, do not edit! -SAGE_VERSION='9.6.rc0' -SAGE_RELEASE_DATE='2022-04-10' -SAGE_VERSION_BANNER='SageMath version 9.6.rc0, Release Date: 2022-04-10' +SAGE_VERSION='9.6.rc1' +SAGE_RELEASE_DATE='2022-04-19' +SAGE_VERSION_BANNER='SageMath version 9.6.rc1, Release Date: 2022-04-19' diff --git a/src/sage/version.py b/src/sage/version.py index 91b2393d614..e00e4ce00ae 100644 --- a/src/sage/version.py +++ b/src/sage/version.py @@ -1,5 +1,5 @@ # Sage version information for Python scripts # This file is auto-generated by the sage-update-version script, do not edit! -version = '9.6.rc0' -date = '2022-04-10' -banner = 'SageMath version 9.6.rc0, Release Date: 2022-04-10' +version = '9.6.rc1' +date = '2022-04-19' +banner = 'SageMath version 9.6.rc1, Release Date: 2022-04-19'