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

Jump to bottom

php: 7.2.29 -> 7.2.31, 7.3.16 -> 7.3.19, 7.4.6 -> 7.4.7 #91495

Merged
merged 2 commits into from Jun 25, 2020
Merged

php: 7.2.29 -> 7.2.31, 7.3.16 -> 7.3.19, 7.4.6 -> 7.4.7 #91495

merged 2 commits into from Jun 25, 2020

Conversation

ckauhaus
Copy link
Contributor

Motivation for this change

Point releases contain several security updates and bugfixes.

Changelog: https://www.php.net/ChangeLog-7.php#7.4.7

Re #90939, #90924, #90921

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

php: 7.2.29 -> 7.2.31, 7.3.16 -> 7.3.19, 7.4.6 -> 7.4.7
1d805c9 
Point releases contain several security updates and bugfixes.

Changelog: https://www.php.net/ChangeLog-7.php#7.4.7

Fixes NixOS#88381
ckauhaus pushed a commit to ckauhaus/nixpkgs that referenced this pull request Jun 25, 2020
php: 7.2.29 -> 7.2.31, 7.3.16 -> 7.3.19, 7.4.6 -> 7.4.7
6da23f1 
Security and bugfix updates for PHP.

Fixes NixOS#88380, NixOS#88379, NixOS#90939, NixOS#90921, NixOS#90924, NixOS#88382

See NixOS#91495 for PR against master.
@ofborg ofborg bot requested review from Ma27, globin, aanderse, talyz and etu June 25, 2020 14:29
@Ma27
Copy link
Member

Ma27 commented Jun 25, 2020

@GrahamcOfBorg build php72 php73 php74

@ckauhaus ckauhaus mentioned this pull request Jun 25, 2020
Merged
10 tasks
@Ma27
Copy link
Member

Ma27 commented Jun 25, 2020 •
edited

hmm, so the aarch64-issue doesn't exist on 20.03 where we don't have the refactorings? Seems like a packaging bug to me then. Will take a look at this.

EDIT: my bad, only php is built there, sorry.

@Ma27
Copy link
Member

Ma27 commented Jun 25, 2020

I assume I found the culprit: php/php-src@93a9b56

Let's hope that this commit applies to 7.2 and 7.3 and we can merge.

@Ma27 Ma27 added the 8.has: port to stable A PR already has a backport to the stable release. label Jun 25, 2020
This was referenced Jun 25, 2020
Closed
Closed
@Ma27
Copy link
Member

Ma27 commented Jun 25, 2020

@GrahamcOfBorg build php72 php73 php74

@Ma27
Copy link
Member

Ma27 commented Jun 25, 2020

Darwin fails like this:

checking for xml2-config path... /usr/bin/xml2-config
/usr/bin/xml2-config: line 3: xcrun: command not found
/usr/bin/xml2-config: line 3: xcrun: command not found
/usr/bin/xml2-config: line 3: xcrun: command not found

This is definetely a packaging-bug on our side. However we should really get those updates to master IMHO. Will merge for now. Unless someone's faster, I can fix this issue later.

@Ma27 Ma27 merged commit 860c5ca into NixOS:master Jun 25, 2020
@Ma27
Copy link
Member

Ma27 commented Jun 25, 2020

Darwin fixed in #91511

@ckauhaus ckauhaus deleted the secfix-php branch June 30, 2020 09:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ma27 Ma27 Ma27 approved these changes

@globin globin Awaiting requested review from globin globin is a code owner

@aanderse aanderse Awaiting requested review from aanderse aanderse is a code owner

@talyz talyz Awaiting requested review from talyz talyz is a code owner

@etu etu Awaiting requested review from etu

Assignees
No one assigned
Labels
8.has: port to stable A PR already has a backport to the stable release. 10.rebuild-darwin: 11-100 10.rebuild-linux: 101-500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@ckauhaus @Ma27