Opened 2 years ago

Closed 2 years ago

#22917 closed defect (fixed)

update zlib to 1.2.11

Reported by: dimpase Owned by:
Priority: major Milestone: sage-8.0
Component: packages: standard Keywords:
Cc: fbissey, embray Merged in:
Authors: Dima Pasechnik Reviewers: François Bissey, Jean-Pierre Flori
Report Upstream: N/A Work issues:
Branch: b0bd679 (Commits) Commit: b0bd679bac601a58a56ea781ae5f3ec61180d3a0
Dependencies: #22582 Stopgaps:

Description

time to update and to fix weirdness in handling CC=cc, cf this comment on #12426.

tarball here

Change History (12)

comment:1 Changed 2 years ago by dimpase

  • Branch set to u/dimpase/zlib112
  • Commit set to f3295dcfd12e2bc972202166a75de6621f9cc1b2

Last 10 new commits:

10374c1Merge tag '8.0.beta2' into t/22582/install_python_packages_into_2_and_3
dc46ea2trac 22582: fix merge conflicts
bc4c2f5trac 22582: rename build/bin/sage-python to sage-python23
0d30e20trac 22582: use sage-python23 to build the Sage library
7e7b5bctrac 22582: build and test packages using sage-python23 instead of python
b954864trac 22582: no need to make python2 a dependency for python3
2dad104trac 22582: a little documentation
5a645fdMerge branch 'public/22582' of trac.sagemath.org:sage into t/22582/public/22582
2179ac8Merge branch 8.0.beta3 into t/22582/public/22582
f3295dcMerge branch 'public/22582' of trac.sagemath.org:sage into zlibupdate

comment:2 Changed 2 years ago by dimpase

  • Authors set to Dima Pasechnik
  • Cc fbissey embray added
  • Status changed from new to needs_review

OK, this is the update. Note that it needed an update of the Cygwin patch, thus a review on Cygwin is most appreciated.

comment:3 Changed 2 years ago by fbissey

I am OK with this if the cygwin patch is appropriate.

comment:4 Changed 2 years ago by jpflori

The cygwin patch update looks ok form a functional point of view but looses a tiny piece of info stuffed into the patch.

comment:5 Changed 2 years ago by jpflori

  • Status changed from needs_review to needs_work

In fact the patch should not be necessary anymore:

Please remove it.

It should still be nice to test it on Cygwin, @eric: can you do it?

comment:6 Changed 2 years ago by git

  • Commit changed from f3295dcfd12e2bc972202166a75de6621f9cc1b2 to c17bc1a2be26a9641fde6837f148d9c6a9da7c80

Branch pushed to git repo; I updated commit sha1. New commits:

55751d0Merge branch 'u/dimpase/zlib112' of trac.sagemath.org:sage into zlupd
c17bc1aobsoleted by github.com/madler/zlib/issues/45

comment:7 Changed 2 years ago by git

  • Commit changed from c17bc1a2be26a9641fde6837f148d9c6a9da7c80 to b0bd679bac601a58a56ea781ae5f3ec61180d3a0

Branch pushed to git repo; I updated commit sha1. This was a forced push. New commits:

b0bd679obsoleted by github.com/madler/zlib/issues/45

comment:8 Changed 2 years ago by dimpase

  • Status changed from needs_work to needs_review

OK, done.

comment:9 Changed 2 years ago by jpflori

  • Reviewers set to François Bissey, Jean-Pierre Flori
  • Status changed from needs_review to positive_review

Good, let's merge it then.

comment:10 Changed 2 years ago by embray

I haven't tested it yet, but I don't imagine it will be a problem. It would be nicer though if we could use the system zlib. I'm working up a proposal for how to enable that more generally...

comment:11 Changed 2 years ago by jpflori

Sure but as you say, it's a wider and different issue.

comment:12 Changed 2 years ago by vbraun

  • Branch changed from u/dimpase/zlib112 to b0bd679bac601a58a56ea781ae5f3ec61180d3a0
  • Resolution set to fixed
  • Status changed from positive_review to closed
Note: See TracTickets for help on using tickets.