diff --git a/build/pkgs/pyzmq/checksums.ini b/build/pkgs/pyzmq/checksums.ini index 3824fd2ce94..20509db618b 100644 --- a/build/pkgs/pyzmq/checksums.ini +++ b/build/pkgs/pyzmq/checksums.ini @@ -1,5 +1,5 @@ tarball=pyzmq-VERSION.tar.gz -sha1=50abf6482a6395f15dce0b2774021e12c9f4faad -md5=f261acf884460e93d30f7113c8e9242e -cksum=1661206741 +sha1=d8bb8cb345c0bfd9e67a95ac796bf4b10354dde6 +md5=ecf13c72fbea05ba5ddc771295409d48 +cksum=1680251717 upstream_url=https://pypi.io/packages/source/p/pyzmq/pyzmq-VERSION.tar.gz diff --git a/build/pkgs/pyzmq/package-version.txt b/build/pkgs/pyzmq/package-version.txt index 0398faf11c2..8326e27f9b6 100644 --- a/build/pkgs/pyzmq/package-version.txt +++ b/build/pkgs/pyzmq/package-version.txt @@ -1 +1 @@ -22.2.1 +22.3.0 diff --git a/build/pkgs/pyzmq/spkg-install.in b/build/pkgs/pyzmq/spkg-install.in index 0ce404ee5a0..069d87767f8 100644 --- a/build/pkgs/pyzmq/spkg-install.in +++ b/build/pkgs/pyzmq/spkg-install.in @@ -1,17 +1,11 @@ -# Since we use environment vars we have to generate setup.cfg - -echo "[build_ext]" > src/setup.cfg - -# (I tried putting quotes around $SAGE_LOCAL to allow for spaces in -# the path---which is never used but is a good habit to support---but -# that simply does not work. Sorry.) - -echo "library_dirs = $SAGE_LOCAL/lib/" >> src/setup.cfg -echo "include_dirs = $SAGE_LOCAL/include/" >> src/setup.cfg - -echo "[configure]" >> src/setup.cfg - cd src +# Generate setup.cfg +cat > setup.cfg < -Date: Wed May 9 10:41:20 2018 +0100 - - Problem: getrandom test does not check if it's working - - Solution: check return value in autoconf and CMake. On some platforms - the function is available but not implemented (eg: GNU/Hurd). - -diff -ru zeromq-4.2.5//builds/cmake/Modules/ZMQSourceRunChecks.cmake b/builds/cmake/Modules/ZMQSourceRunChecks.cmake ---- zeromq-4.2.5//builds/cmake/Modules/ZMQSourceRunChecks.cmake 2018-03-23 20:33:36.000000000 +0100 -+++ b/builds/cmake/Modules/ZMQSourceRunChecks.cmake 2018-07-24 12:39:23.340035053 +0200 -@@ -287,7 +287,8 @@ - int main (int argc, char *argv []) - { - char buf[4]; -- getrandom(buf, 4, 0); -+ int rc = getrandom(buf, 4, 0); -+ return rc == -1 ? 1 : 0; - } - " - ZMQ_HAVE_GETRANDOM) -diff -ru zeromq-4.2.5//configure b/configure ---- zeromq-4.2.5//configure 2018-03-23 20:34:18.000000000 +0100 -+++ b/configure 2018-07-24 12:39:49.018035120 +0200 -@@ -23315,7 +23315,8 @@ - int main (int argc, char *argv []) - { - char buf[4]; -- getrandom(buf, 4, 0); -+ int rc = getrandom(buf, 4, 0); -+ return rc == -1 ? 1 : 0; - } - - _ACEOF