Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

zlib: 1.2.13 -> 1.3 #250131

Merged
merged 1 commit into from Sep 7, 2023
Merged

zlib: 1.2.13 -> 1.3 #250131

merged 1 commit into from Sep 7, 2023

Conversation

trofi
Copy link
Contributor

@trofi trofi commented Aug 19, 2023

Changes: https://github.com/madler/zlib/releases/tag/v1.3

Description of changes

Pending fixes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.11 Release Notes (or backporting 23.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@trofi
Copy link
Contributor Author

trofi commented Aug 19, 2023

Version change itself broke openssh:

       > configure: error: *** zlib too old - check config.log ***
       > Your reported zlib version has known security problems.  It's possible your
       > vendor has fixed these problems without changing the version number.  If you
       > are sure this is the case, you can disable the check by running
       > "./configure --without-zlib-version-check".
       > If you are in doubt, upgrade zlib to version 1.2.3 or greater.
       > See http://www.gzip.org/zlib/ for details.
       For full logs, run 'nix log /nix/store/r2bivy4mdyrzxjs76k7pxim50a0xi69d-openssh-9.4p1.drv'.

@trofi
Copy link
Contributor Author

trofi commented Aug 19, 2023

openssh was fixed upstream with openssh/openssh-portable@cb4ed12

@trofi
Copy link
Contributor Author

trofi commented Aug 19, 2023

Another casualty is python3Packages.pillow, also checks for version specifics:

    def test_sanity(self, tmp_path):
        # internal version number
>       assert re.search(r"\d+\.\d+\.\d+(\.\d+)?$", features.version_codec("zlib"))
E       AssertionError: assert None
E        +  where None = <function search at 0x7ffff74c5c60>('\\d+\\.\\d+\\.\\d+(\\.\\d+)?$', '1.3')
E        +    where <function search at 0x7ffff74c5c60> = re.search
E        +    and   '1.3' = <function version_codec at 0x7ffff6896680>('zlib')
E        +      where <function version_codec at 0x7ffff6896680> = features.version_codec

@trofi
Copy link
Contributor Author

trofi commented Aug 19, 2023

pillow has a fix pending upstream inclusion: python-pillow/Pillow#7344

@risicle
Copy link
Contributor

risicle commented Aug 20, 2023

Tried finding another package on macos 10.15 that this caused problems with, failed to do so after ~10h building.

@trofi
Copy link
Contributor Author

trofi commented Aug 22, 2023

Both fixes reached staging. Rebased the branch against staging.

I tried to build a few thousands of packages with direct zlib dependency and saw no failures so far.

We could do one of two things:

  1. just merge it to staging (ready)
  2. have a hydra jobset (should wait for fixes to reach master and then rebase again)

@trofi trofi marked this pull request as ready for review August 22, 2023 07:42
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/2612

@trofi
Copy link
Contributor Author

trofi commented Sep 2, 2023

pigz will also need an update. Proposed as #252892

@vcunat vcunat merged commit a714112 into NixOS:staging Sep 7, 2023
5 of 7 checks passed
@trofi trofi deleted the zlib-update branch September 7, 2023 12:04
@radarhere
Copy link

pillow has a fix pending upstream inclusion: python-pillow/Pillow#7344

Pillow 10.0.1 has now been released with this fix.

@trofi
Copy link
Contributor Author

trofi commented Sep 18, 2023

Thank you! Proposed pillow update to 10.0.1 as #255858

@trofi
Copy link
Contributor Author

trofi commented Oct 25, 2023

zsnes failed zlib version check. Proposed the fix as #263444

@pbsds
Copy link
Contributor

pbsds commented Nov 2, 2023

this seems to have turned into a tracking issue, and the osl failure seems related. For the interested: #262633 (comment)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants