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

[20.09] ant: 1.10.8 -> 1.10.9 #102835

Merged
merged 1 commit into from Nov 7, 2020

Conversation

redvers
Copy link
Member

@redvers redvers commented Nov 4, 2020

Motivation for this change

Addresses #101143 - CVE-2020-11979

See also #102827 for PR for master.

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.

@ofborg ofborg bot requested a review from edolstra November 4, 2020 23:20
@mweinelt mweinelt changed the title ant: 1.10.8 -> 1.10.9 [20.09] ant: 1.10.8 -> 1.10.9 Nov 4, 2020
Copy link
Member

@mweinelt mweinelt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Stable ports need to be cherry-picked from master. Please read up on https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md#backporting-changes.

(cherry picked from commit 9d1977e45ecbafe85a8fec2768a071f9ef5222dc)
@redvers
Copy link
Member Author

redvers commented Nov 5, 2020

Stable ports need to be cherry-picked from master. Please read up on https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md#backporting-changes.

Completed

@redvers
Copy link
Member Author

redvers commented Nov 6, 2020

@andir

Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

failures are broken on target branch

https://github.com/NixOS/nixpkgs/pull/102835
2 packages marked as broken and skipped:
junit junixsocket

1 package failed to build:
processing

87 packages built:
DisnixWebService abcl adapta-gtk-theme ant arduino arduino-core areca asciidoc-full asciidoc-full-with-plugins atlassian-confluence axis2 axoloti baresip btrbk buck ccache ccacheStdenv ccacheWrapper chrome-gnome-shell clevis disorderfs fop freemind freenet freetts gcs gephi gnome3.gnome-control-center gnome3.gnome-session gnome3.gnome-shell gnome3.gnome-terminal gnome3.gnome-tweaks gnome3.pomodoro gnomeExtensions.gsconnect gnomeExtensions.night-theme-switcher hdfview herbstluftwm hydraAntLogger i2p ili2c ino jameica jasmin java-service-wrapper javaCup javaPackages.jogl_2_3_2 jboss_mysql_jdbc jdepend jedit jing jitsi jugglinglab knightos-kimg knightos-mkrom libreoffice libreoffice-fresh libreoffice-fresh-unwrapped libreoffice-qt libreoffice-unwrapped liquibase luksmeta martyr mkgmap mysql_jdbc odpdown pantheon.elementary-session-settings polymake projectlibre rabbitmq-java-client rhino rstudio rstudioWrapper squirrel-sql sweethome3d.application sweethome3d.furniture-editor sweethome3d.textures-editor tang teensyduino tlaplus tomcat_mysql_jdbc udiskie unoconv vuze webbrowser xmloscopy xtreemfs zap

@jonringer jonringer merged commit 2c11f75 into NixOS:release-20.09 Nov 7, 2020
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

3 participants