Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b97b32cf1d72
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3cff2fbc0a37
Choose a head ref
  • 3 commits
  • 2 files changed
  • 3 contributors

Commits on Oct 11, 2018

  1. apacheHttpd: 2.4.34 -> 2.4.35 

    Picked from master since it fixes CVE-2018-11763 which allows a remote
DoS against a server with HTTP/2 enabled.

Reference: https://lists.apache.org/thread.html/d435b0267a76501b9e06c552b20c887171064cde38e46d678da4d3dd@%3Cannounce.httpd.apache.org%3E

(cherry picked from commit 524c212)
    @r-ryantm @andir
    r-ryantm authored and andir committed Oct 11, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    Mic92 Jörg Thalheim
    GPG key ID: CA4106B8D7CC79FA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d720d5f View commit details

  2. Merge pull request #48237 from andir/18.09/apacheHttpd 

    [18.09] apacheHttpd: 2.4.34 -> 2.4.35
    @fpletz
    fpletz authored Oct 11, 2018
    Copy the full SHA
    e6630c9 View commit details

  3. oraclejdk: deprecate oraclejdk 10 

    (cherry picked from commit 628fa1d)
    @taku0 @fpletz
    taku0 authored and fpletz committed Oct 11, 2018
    Copy the full SHA
    3cff2fb View commit details
Showing with 3 additions and 2 deletions.
  1. +1 −0 pkgs/development/compilers/oraclejdk/jdk10-linux.nix
  2. +2 −2 pkgs/servers/http/apache-httpd/2.4.nix
1 change: 1 addition & 0 deletions pkgs/development/compilers/oraclejdk/jdk10-linux.nix
View file
Original file line number Diff line number Diff line change
@@ -150,6 +150,7 @@ let result = stdenv.mkDerivation rec {
meta = with stdenv.lib; {
license = licenses.unfree;
platforms = [ "x86_64-linux" ]; # some inherit jre.meta.platforms
knownVulnerabilities = [ "Support ended in September 2018. Use OpenJDK or JDK 8." ];
};

}; in result
4 changes: 2 additions & 2 deletions pkgs/servers/http/apache-httpd/2.4.nix
View file
Original file line number Diff line number Diff line change
@@ -16,12 +16,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null;
assert http2Support -> nghttp2 != null;

stdenv.mkDerivation rec {
version = "2.4.34";
version = "2.4.35";
name = "apache-httpd-${version}";

src = fetchurl {
url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
sha256 = "1w1q2smdgf6ln0x741lk5pv5r0gzrxj2iza1vslhifzy65bcjlzs";
sha256 = "0mlvwsm7hmpc7db6lfc2nx3v4cll3qljjxhjhgsw6aniskywc1r6";
};

# FIXME: -dev depends on -doc