Merge branch 't/29124/script-packages-prereq-toolchain-bootstrap' int…

…o t/30944/tox__improve_local_sudo_ubuntu_standard

.github/workflows/ci-cygwin-standard.yml

@@ -43,7 +43,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES=$(sed 's/#.*//;' ./build/pkgs/cygwin.txt ./build/pkgs/cygwin-bootstrap.txt)
+        PACKAGES=$(sed 's/#.*//;' ./build/pkgs/_prereq/distros/cygwin.txt ./build/pkgs/_prereq/distros/cygwin-bootstrap.txt)
         choco install $PACKAGES --source cygwin
     - name: bootstrap
       run: |
@@ -113,7 +113,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES=$(sed 's/#.*//;' ./build/pkgs/cygwin.txt ./build/pkgs/cygwin-bootstrap.txt)
+        PACKAGES=$(sed 's/#.*//;' ./build/pkgs/_prereq/distros/cygwin.txt ./build/pkgs/_prereq/distros/cygwin-bootstrap.txt)
         choco install $PACKAGES --source cygwin
     - name: bootstrap
       run: |
@@ -188,7 +188,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES=$(sed 's/#.*//;' ./build/pkgs/cygwin.txt ./build/pkgs/cygwin-bootstrap.txt)
+        PACKAGES=$(sed 's/#.*//;' ./build/pkgs/_prereq/distros/cygwin.txt ./build/pkgs/_prereq/distros/cygwin-bootstrap.txt)
         choco install $PACKAGES --source cygwin
     - name: bootstrap
       run: |
@@ -268,7 +268,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES=$(sed 's/#.*//;' ./build/pkgs/cygwin.txt ./build/pkgs/cygwin-bootstrap.txt)
+        PACKAGES=$(sed 's/#.*//;' ./build/pkgs/_prereq/distros/cygwin.txt ./build/pkgs/_prereq/distros/cygwin-bootstrap.txt)
         choco install $PACKAGES --source cygwin
     - name: bootstrap
       run: |
@@ -346,7 +346,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES=$(sed 's/#.*//;' ./build/pkgs/cygwin.txt ./build/pkgs/cygwin-bootstrap.txt)
+        PACKAGES=$(sed 's/#.*//;' ./build/pkgs/_prereq/distros/cygwin.txt ./build/pkgs/_prereq/distros/cygwin-bootstrap.txt)
         choco install $PACKAGES --source cygwin
     - name: bootstrap
       run: |
@@ -424,7 +424,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES=$(sed 's/#.*//;' ./build/pkgs/cygwin.txt ./build/pkgs/cygwin-bootstrap.txt)
+        PACKAGES=$(sed 's/#.*//;' ./build/pkgs/_prereq/distros/cygwin.txt ./build/pkgs/_prereq/distros/cygwin-bootstrap.txt)
         choco install $PACKAGES --source cygwin
     - name: bootstrap
       run: |
@@ -502,7 +502,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES=$(sed 's/#.*//;' ./build/pkgs/cygwin.txt ./build/pkgs/cygwin-bootstrap.txt)
+        PACKAGES=$(sed 's/#.*//;' ./build/pkgs/_prereq/distros/cygwin.txt ./build/pkgs/_prereq/distros/cygwin-bootstrap.txt)
         choco install $PACKAGES --source cygwin
     - name: bootstrap
       run: |
@@ -582,7 +582,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES=$(sed 's/#.*//;' ./build/pkgs/cygwin.txt ./build/pkgs/cygwin-bootstrap.txt)
+        PACKAGES=$(sed 's/#.*//;' ./build/pkgs/_prereq/distros/cygwin.txt ./build/pkgs/_prereq/distros/cygwin-bootstrap.txt)
         choco install $PACKAGES --source cygwin
     - name: bootstrap
       run: |
@@ -662,7 +662,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES=$(sed 's/#.*//;' ./build/pkgs/cygwin.txt ./build/pkgs/cygwin-bootstrap.txt)
+        PACKAGES=$(sed 's/#.*//;' ./build/pkgs/_prereq/distros/cygwin.txt ./build/pkgs/_prereq/distros/cygwin-bootstrap.txt)
         choco install $PACKAGES --source cygwin
     - name: bootstrap
       run: |
@@ -740,7 +740,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES=$(sed 's/#.*//;' ./build/pkgs/cygwin.txt ./build/pkgs/cygwin-bootstrap.txt)
+        PACKAGES=$(sed 's/#.*//;' ./build/pkgs/_prereq/distros/cygwin.txt ./build/pkgs/_prereq/distros/cygwin-bootstrap.txt)
         choco install $PACKAGES --source cygwin
     - name: bootstrap
       run: |
@@ -818,7 +818,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES=$(sed 's/#.*//;' ./build/pkgs/cygwin.txt ./build/pkgs/cygwin-bootstrap.txt)
+        PACKAGES=$(sed 's/#.*//;' ./build/pkgs/_prereq/distros/cygwin.txt ./build/pkgs/_prereq/distros/cygwin-bootstrap.txt)
         choco install $PACKAGES --source cygwin
     - name: bootstrap
       run: |
@@ -896,7 +896,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES=$(sed 's/#.*//;' ./build/pkgs/cygwin.txt ./build/pkgs/cygwin-bootstrap.txt)
+        PACKAGES=$(sed 's/#.*//;' ./build/pkgs/_prereq/distros/cygwin.txt ./build/pkgs/_prereq/distros/cygwin-bootstrap.txt)
         choco install $PACKAGES --source cygwin
     - name: bootstrap
       run: |

.github/workflows/tox-experimental.yml

@@ -36,7 +36,7 @@ jobs:
       fail-fast: false
       max-parallel: 6
       matrix:
-        tox_system_factor: [ubuntu-trusty, ubuntu-xenial, ubuntu-bionic, ubuntu-eoan, ubuntu-focal, ubuntu-groovy, ubuntu-hirsute, debian-jessie, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, centos-7, centos-8, gentoo, archlinux-latest, slackware-14.2, conda-forge, ubuntu-bionic-i386, ubuntu-focal-i386, debian-buster-i386, centos-7-i386]
+        tox_system_factor: [ubuntu-trusty, ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-groovy, ubuntu-hirsute, debian-jessie, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, centos-7, centos-8, gentoo, archlinux-latest, slackware-14.2, conda-forge, ubuntu-bionic-i386, ubuntu-focal-i386, debian-buster-i386, centos-7-i386]
         tox_packages_factor: [maximal]
         targets_pattern: [0-g, h-o, p, q-z]
     env:

.github/workflows/tox-optional.yml

@@ -36,7 +36,7 @@ jobs:
       fail-fast: false
       max-parallel: 6
       matrix:
-        tox_system_factor: [ubuntu-trusty, ubuntu-xenial, ubuntu-bionic, ubuntu-eoan, ubuntu-focal, ubuntu-groovy, ubuntu-hirsute, debian-jessie, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, centos-7, centos-8, gentoo, archlinux-latest, slackware-14.2, conda-forge, ubuntu-bionic-i386, ubuntu-focal-i386, debian-buster-i386, centos-7-i386]
+        tox_system_factor: [ubuntu-trusty, ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-groovy, ubuntu-hirsute, debian-jessie, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, centos-7, centos-8, gentoo, archlinux-latest, slackware-14.2, conda-forge, ubuntu-bionic-i386, ubuntu-focal-i386, debian-buster-i386, centos-7-i386]
         tox_packages_factor: [maximal]
         targets_pattern: [0-g, h-o, p, q-z]
     env:

.github/workflows/tox.yml

@@ -36,7 +36,7 @@ jobs:
       fail-fast: false
       max-parallel: 20
       matrix:
-        tox_system_factor: [ubuntu-trusty, ubuntu-xenial, ubuntu-bionic, ubuntu-eoan, ubuntu-focal, ubuntu-groovy, ubuntu-hirsute, debian-jessie, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, centos-7, centos-8, gentoo, gentoo-python3.7, archlinux-latest, slackware-14.2, conda-forge, ubuntu-bionic-i386, ubuntu-focal-i386, debian-buster-i386, centos-7-i386]
+        tox_system_factor: [ubuntu-trusty, ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-groovy, ubuntu-hirsute, debian-jessie, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, centos-7, centos-8, gentoo, gentoo-python3.7, archlinux-latest, slackware-14.2, conda-forge, ubuntu-bionic-i386, ubuntu-focal-i386, debian-buster-i386, centos-7-i386]
         tox_packages_factor: [minimal, standard]
     env:
       TOX_ENV: docker-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}

.zenodo.json

@@ -1,10 +1,10 @@
 {
     "description": "Mirror of the Sage https://sagemath.org/ source tree", 
     "license": "other-open", 
-    "title": "sagemath/sage: 9.3.beta4", 
-    "version": "9.3.beta4", 
+    "title": "sagemath/sage: 9.3.beta5", 
+    "version": "9.3.beta5", 
     "upload_type": "software", 
-    "publication_date": "2020-12-14", 
+    "publication_date": "2020-12-27", 
     "creators": [
         {
             "affiliation": "SageMath.org", 
@@ -15,7 +15,7 @@
     "related_identifiers": [
         {
             "scheme": "url", 
-            "identifier": "https://github.com/sagemath/sage/tree/9.3.beta4", 
+            "identifier": "https://github.com/sagemath/sage/tree/9.3.beta5", 
             "relation": "isSupplementTo"
         }, 
         {

VERSION.txt

@@ -1 +1 @@
-SageMath version 9.3.beta4, Release Date: 2020-12-14
+SageMath version 9.3.beta5, Release Date: 2020-12-27

build/bin/sage-build-env

@@ -49,44 +49,60 @@ fi
 if [ "x$ORIGINAL_CFLAGS" == "x" ]; then
     # Evaluate SAGE_DEBUG:
     if [ "x$SAGE_DEBUG" == "xyes" ]; then
-        export CFLAGS="-Og -g"
-        export CFLAGS_O3="-Og -g"
+        export CFLAGS_NON_NATIVE="-Og -g"
+        export CFLAGS_O3_NON_NATIVE="-Og -g"
     elif [ "x$SAGE_DEBUG" == "xno" ]; then
-        export CFLAGS="-O2"
-        export CFLAGS_O3="-O3"
+        export CFLAGS_NON_NATIVE="-O2"
+        export CFLAGS_O3_NON_NATIVE="-O3"
     else
-        export CFLAGS="-O2 -g"
-        export CFLAGS_O3="-O3 -g"
+        export CFLAGS_NON_NATIVE="-O2 -g"
+        export CFLAGS_O3_NON_NATIVE="-O3 -g"
     fi
+    export CFLAGS="$CFLAGS_NON_NATIVE $CFLAGS_MARCH"
+    export CFLAGS_O3="$CFLAGS_O3_NON_NATIVE $CFLAGS_MARCH"
 else
     # Respect user environment variable.
     export CFLAGS="$ORIGINAL_CFLAGS"
     export CFLAGS_O3="$ORIGINAL_CFLAGS"
+    export CFLAGS_NON_NATIVE="$ORIGINAL_CFLAGS"
+    export CFLAGS_O3_NON_NATIVE="$ORIGINAL_CFLAGS"
 fi
 
 # Copy to CXXFLAGS if this is not set.
 if [ "x$ORIGINAL_CXXFLAGS" == "x" ]; then
     export CXXFLAGS="$CFLAGS"
     export CXXFLAGS_O3="$CFLAGS_O3"
+    export CXXFLAGS_NON_NATIVE="$CFLAGS_NON_NATIVE"
+    export CXXFLAGS_O3_NON_NATIVE="$CFLAGS_O3_NON_NATIVE"
 else
     export CXXFLAGS="$ORIGINAL_CXXFLAGS"
     export CXXFLAGS_O3="$ORIGINAL_CXXFLAGS"
+    export CXXFLAGS_NON_NATIVE="$ORIGINAL_CXXFLAGS"
+    export CXXFLAGS_O3_NON_NATIVE="$ORIGINAL_CXXFLAGS"
 fi
 
 # Copy CFLAGS to FCFLAGS if this is not set.
 if [ "x$ORIGINAL_FCFLAGS" == "x" ]; then
     export FCFLAGS="$CFLAGS"
     export FCFLAGS_O3="$CFLAGS_O3"
+    export FCFLAGS_NON_NATIVE="$CFLAGS_NON_NATIVE"
+    export FCFLAGS_O3_NON_NATIVE="$CFLAGS_O3_NON_NATIVE"
 else
     export FCFLAGS="$ORIGINAL_FCFLAGS"
     export FCFLAGS_O3="$ORIGINAL_FCFLAGS"
+    export FCFLAGS_NON_NATIVE="$ORIGINAL_FCFLAGS"
+    export FCFLAGS_O3_NON_NATIVE="$ORIGINAL_FCFLAGS"
 fi
 
 # Copy FCFLAGS to F77FLAGS if this is not set.
 if [ "x$ORIGINAL_F77FLAGS" == "x" ]; then
     export F77FLAGS="$FCFLAGS"
     export F77FLAGS_O3="$FCFLAGS_O3"
+    export F77FLAGS_NON_NATIVE="$FCFLAGS_NON_NATIVE"
+    export F77FLAGS_O3_NON_NATIVE="$FCFLAGS_O3_NON_NATIVE"
 else
     export F77FLAGS="$ORIGINAL_F77FLAGS"
     export F77FLAGS_O3="$ORIGINAL_F77FLAGS"
+    export F77FLAGS_NON_NATIVE="$ORIGINAL_F77FLAGS"
+    export F77FLAGS_O3_NON_NATIVE="$ORIGINAL_F77FLAGS"
 fi

build/bin/sage-build-env-config.in

@@ -36,6 +36,7 @@ export CONFIGURED_CFLAGS="@CFLAGS@"
 export CONFIGURED_CXXFLAGS="@CXXFLAGS@"
 export CONFIGURED_FCFLAGS="@FCFLAGS@"
 export CONFIGURED_F77FLAGS="@F77FLAGS@"
+export CFLAGS_MARCH="@CFLAGS_MARCH@"
 
 # This is usually blank if the system GMP is used, or $SAGE_LOCAL otherwise
 export SAGE_GMP_PREFIX="@SAGE_GMP_PREFIX@"

build/bin/sage-site

@@ -128,16 +128,6 @@ if [ "$1" = '-standard' -o "$1" = "--standard" ]; then
     exec sage-list-packages standard $@
 fi
 
-if [ "$1" = '-installed' -o "$1" = "--installed" ]; then
-    shift
-    exec sage-list-packages all --installed-only $@
-fi
-
-if [ "$1" = '-p' ]; then
-    echo "Error: Installing old-style SPKGs is no longer supported."
-    exit 1
-fi
-
 if [ "$1" = '-info' -o "$1" = '--info' ]; then
     shift
     for PKG in "$@"

build/pkgs/_recommended/distros/debian.txt

@@ -7,7 +7,7 @@ texlive-xetex
 # to generate pdf documentation
 latexmk
 # to convert Jupyter notebooks to pdf
-pandoc
+# pandoc -- this is a separate script package
 # to render text with LaTeX in Matplotlib
 dvipng
 # to run the Jmol 3D viewer from the console and generate images for 3D plots in the documentation

build/pkgs/_recommended/distros/homebrew.txt

@@ -1,5 +1,5 @@
 # To convert Jupyter notebooks to pdf:
-pandoc
+# pandoc -- this is a separate script package
 # To produce animations:
 ffmpeg
 imagemagick

build/pkgs/configure/checksums.ini

@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=bd555cd949f9c99a9d99902c577e13345f5fbc01
-md5=a39377025f0bae6d2f026d48ae9b564b
-cksum=3175310020
+sha1=8ee84baf7b35d5f9969564496caef1d82ac39d58
+md5=9b0c40d1b588ebd7b2fc026ed083e8fe
+cksum=597282646

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-2fc350e432bf89430424a9db1b5e0f4cc88b75e8
+0c355ddc523129acf154e6f361a6366058591105

build/pkgs/cycler/SPKG.rst

@@ -4,7 +4,7 @@ cycler
 Description
 -----------
 
-Cycler is a small break of of matplotlib to deal with "composable
+Cycler is a small break-off of matplotlib to deal with "composable
 cycles". It is a required dependency of matplotlib 1.5.0.
 
 License

build/pkgs/eclib/spkg-install.in

@@ -1,5 +1,5 @@
-CFLAGS="$CFLAGS_O3"
-CXXFLAGS="$CXXFLAGS_O3"
+CFLAGS="$CFLAGS_O3_NON_NATIVE"
+CXXFLAGS="$CXXFLAGS_O3_NON_NATIVE"
 
 export CFLAGS CXXFLAGS
 

build/pkgs/fplll/checksums.ini

@@ -1,5 +1,5 @@
 tarball=fplll-VERSION.tar.gz
-sha1=3ab5e269fdf73b6f933b24db656e5c55d83aa690
-md5=31f0f5d2045802d0beb8945dd0fa07f0
-cksum=2692708834
-upstream_url=https://github.com/fplll/fplll/releases/download/VERSION/fplll-VERSION.tar.gz
+sha1=a62fc9aa2a4736e9680a336b092f432c31ddac43
+md5=db2f0f46d4de3e8ab8ed73a79d19ffc3
+cksum=1237963825
+upstream_url=https://github.com/fplll/fplll/releases/download/VERSION/fplll-VERSION.tar.gz

build/pkgs/fplll/package-version.txt

@@ -1 +1 @@
-5.3.3
+5.4.0

build/pkgs/fplll/spkg-configure.m4

@@ -4,8 +4,11 @@ SAGE_SPKG_CONFIGURE([fplll], [
     dnl if there's a usable system copy of fplll. Unless there's
     dnl a system that ships fplll without fplll.pc file, falling
     dnl back to a manual header/library search is pointless.
+    dnl
+    dnl Trac #31025: FPLLL/FPyLLL make no guarantee regarding compatibility
+    dnl other than "whatever versions were released at the same time should work together"
     PKG_CHECK_MODULES([FPLLL],
-                      [fplll >= 5.3],
+                      [fplll == 5.4],
                       [sage_spkg_install_fplll=no],
                       [sage_spkg_install_fplll=yes])
   ])

build/pkgs/fpylll/checksums.ini

@@ -1,4 +1,5 @@
 tarball=fpylll-VERSION.tar.gz
-sha1=b1f2d6eae30ce083c4282384049989fe45bd33cd
-md5=95ad1823e15031f12603c8f38acb1477
-cksum=2108756831
+sha1=4f54d882d2163c54c48a91ea49f9a938227b71c2
+md5=c4131f71e72d5ee6d5eec9d77e438c8d
+cksum=4098460220
+upstream_url=https://github.com/fplll/fpylll/releases/download/VERSION/fpylll-VERSION.tar.gz

build/pkgs/fpylll/install-requires.txt

@@ -1 +1 @@
-fpylll >=0.5.1dev
+fpylll ==0.5.4

build/pkgs/fpylll/package-version.txt

@@ -1 +1 @@
-0.5.2dev
+0.5.4

build/pkgs/gap/spkg-install.in

@@ -4,6 +4,9 @@
 
 cd src
 
+export CFLAGS=$CFLAGS_NON_NATIVE
+export CXXFLAGS=$CXXFLAGS_NON_NATIVE
+
 GAP_BUILD_ROOT="$(pwd)"
 GAP_ROOT="$SAGE_LOCAL/share/gap"
 DESTDIR_GAP_ROOT="$SAGE_DESTDIR$GAP_ROOT"

build/pkgs/gcc/spkg-configure.m4

@@ -151,6 +151,10 @@ SAGE_SPKG_CONFIGURE_BASE([gcc], [
                     # Install our own GCC if the system-provided one is newer than 10.x.
                     # See https://trac.sagemath.org/ticket/29456
                     SAGE_SHOULD_INSTALL_GCC([$CXX is g++ version $GXX_VERSION, which is too recent for this version of Sage])
+                ],
+                [4.[[8-9]].*|5.[[0-1]].*], [
+                    # GCC less than 5.1 is not ready for AVX512.
+                    sage_use_march_native=no
                 ])
         fi
 
@@ -201,6 +205,19 @@ SAGE_SPKG_CONFIGURE_BASE([gcc], [
             SAGE_SRC="$SAGE_SRC"
         ])
     fi
+
+    # Determine which compiler flags should be set.
+    if test x$sage_use_march_native = xno; then
+        CFLAGS_MARCH=""
+    elif test x$SAGE_FAT_BINARY = xyes; then
+        CFLAGS_MARCH=""
+    elif test x$sage_spkg_install_gcc = xyes; then
+        CFLAGS_MARCH="-march=native"
+    else
+        AX_CHECK_COMPILE_FLAG("-march=native", [CFLAGS_MARCH="-march=native"], [CFLAGS_MARCH=""], [], [])
+    fi
+    AC_SUBST(CFLAGS_MARCH)
+
 ], , , [
     # Trac #27907: Find location of crti.o from the system CC, in case we build our own gcc
     AC_MSG_CHECKING([for the location of crti.o])

build/pkgs/gcc/spkg-install.in

@@ -1,3 +1,7 @@
+# If we are building gcc ourselves, usually the system compiler isn't suitable.
+export CFLAGS=$CFLAGS_NON_NATIVE
+export CXXFLAGS=$CXXFLAGS_NON_NATIVE
+
 # First, install any custom binaries or headers we created for macOS
 # workarounds
 for dir in bin include; do

build/pkgs/glpk/checksums.ini

@@ -1,4 +1,5 @@
 tarball=glpk-VERSION.tar.bz2
-sha1=3509165dd737168250168e8323c91e2a8df67f9d
-md5=788f23a0981f3a6dc82fde82f146dd1f
-cksum=3267474902
+sha1=3a85b1e4c806b91deebfcf9a845b9308cd785d64
+md5=91499dc0c139b221846cae60e5c7d222
+cksum=1522314071
+upstream_url=https://ftp.gnu.org/gnu/glpk/glpk-VERSION.tar.gz

build/pkgs/glpk/package-version.txt

@@ -1 +1 @@
-4.65.p0
+5.0.p0