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: 0afec75e0cdf
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: 08e503bac6de
Choose a head ref
  • 5 commits
  • 3 files changed
  • 3 contributors

Commits on Nov 19, 2019

  1. samba: 4.10.8 -> 4.10.10 - security 

    Addresses issue: NixOS/nixpkgs#73682
Samba fixes overview for reference:
https://www.samba.org/samba/history/security.html

(cherry picked from commit 0de2c30)
    @d-goldin
    d-goldin committed Nov 19, 2019
    Copy the full SHA
    cad09e9 View commit details

  2. libextractor: add patch for CVE-2019-15531 

     (#73728)
(cherry picked from commit 593def2)
    @risicle @c0bw3b
    risicle authored and c0bw3b committed Nov 19, 2019
    Copy the full SHA
    3bccd38 View commit details

  3. Merge pull request #73761 from d-goldin/backport_samba 

    [r19.09] samba: 4.10.8 -> 4.10.10 - security
    @grahamc
    grahamc authored Nov 19, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6554f69 View commit details

  4. skypeforlinux: Adding archive.org mirror 

    Adding an additional web-archive url to avoid breakage when
old versions disappear from upstream. Still keeping original location
to not needlessly hit archive.org (it's also slower).

(cherry picked from commit ad8c170) and
resolved conflicts.
    @d-goldin
    d-goldin committed Nov 19, 2019
    Copy the full SHA
    0c0da42 View commit details

  5. Merge pull request #73775 from d-goldin/skype_archiveorg_mirror_1909 

    [r19.09]: skypeforlinux: Adding archive.org mirror
    @grahamc
    grahamc authored Nov 19, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    08e503b View commit details
5 changes: 4 additions & 1 deletion pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
View file
Original file line number Diff line number Diff line change
@@ -59,7 +59,10 @@ let
src =
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb";
urls = [
"https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
"https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
];
sha256 = "11x13c7z70iaq86pyy5nqc0mcfdr7vjpjkxw6kdyjhqyxs6q6ipf";
}
else
6 changes: 6 additions & 0 deletions pkgs/development/libraries/libextractor/default.nix
View file
Original file line number Diff line number Diff line change
@@ -22,6 +22,12 @@ stdenv.mkDerivation rec {
url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/libextractor-exiv2-0.27.patch?h=packages/libextractor&id=4dc53f7fc69210ae571285dface108ed65d8ee53";
sha256 = "0w4gc1q1m1yxsd4hv105nblmif465nw3g5nxzldy0x2rl9mdncg6";
})
(fetchpatch {
name = "CVE-2019-15531.patch";
url = "https://git.gnunet.org/libextractor.git/patch/?id=d2b032452241708bee68d02aa02092cfbfba951a";
sha256 = "01xhcjbzv6p53wz7y2ii76kb8m9iwvnm4ip9w4a0bpgaxqz4b9fw";
excludes = [ "ChangeLog" ];
})
];

preConfigure =
4 changes: 2 additions & 2 deletions pkgs/servers/samba/4.x.nix
View file
Original file line number Diff line number Diff line change
@@ -20,11 +20,11 @@ with lib;

stdenv.mkDerivation rec {
pname = "samba";
version = "4.10.8";
version = "4.10.10";

src = fetchurl {
url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz";
sha256 = "1x0hlhb674fndfkmimjicnzs543n3i8465a5ifcmjwvzavxha7y4";
sha256 = "19b653rr2i9snvapik58phbqj38cxjdlyx6nl3m2y3k1a55p633h";
};

outputs = [ "out" "dev" "man" ];