Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b47b4f3dd3c9
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8e5814bea974
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on Mar 13, 2018

  1. samba: apply patch mailinglist, which fixes #ifdef boundaries 

    http://samba.2283325.n4.nabble.com/Fix-compilation-of-Samba-4-7-4-with-disabled-ADS-td4728041.html
(cherry picked from commit 49aa580)
    @ikervagyok @fpletz
    ikervagyok authored and fpletz committed Mar 13, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    infinisil Silvan Mosberger
    GPG key ID: 9424360B4B85C9E7
    Verified
    Learn about vigilant mode
    Copy the full SHA
    12010f6 View commit details

  2. fetchurl: remove broken samba mirror 

    (cherry picked from commit 4f17851)
    @fpletz
    fpletz committed Mar 13, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    joachifm Joachim F.
    GPG key ID: 66EAB6B14F6B6E0D
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f5eea91 View commit details

  3. samba: 4.6.11 -> 4.6.14 for multiple CVEs 

    Fixes at least CVE-2018-1050, CVE-2018-1057.
    @fpletz
    fpletz committed Mar 13, 2018
    Copy the full SHA
    8e5814b View commit details
Showing with 24 additions and 3 deletions.
  1. +1 −1 pkgs/build-support/fetchurl/mirrors.nix
  2. +3 −2 pkgs/servers/samba/4.x.nix
  3. +20 −0 pkgs/servers/samba/patch-source3__libads__kerberos_keytab.c.patch
2 changes: 1 addition & 1 deletion pkgs/build-support/fetchurl/mirrors.nix
View file
Original file line number Diff line number Diff line change
@@ -129,7 +129,7 @@ rec {

samba = [
https://www.samba.org/ftp/
http://ftp.riken.jp/net/samba
http://www.samba.org/ftp/
];

# BitlBee mirrors, see https://www.bitlbee.org/main.php/mirrors.html .
5 changes: 3 additions & 2 deletions pkgs/servers/samba/4.x.nix
View file
Original file line number Diff line number Diff line change
@@ -19,17 +19,18 @@ with lib;

stdenv.mkDerivation rec {
name = "samba-${version}";
version = "4.6.11";
version = "4.6.14";

src = fetchurl {
url = "mirror://samba/pub/samba/stable/${name}.tar.gz";
sha256 = "07gd41y4ajdiansfqa8c5wvrincgddfzyfgh1pf7g388zaq7l6q5";
sha256 = "0iyyp02wrzfg1w1zwjf9f5sxar8yvx1n7j0pn29khgs2ksglagv7";
};

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

patches =
[ ./4.x-no-persistent-install.patch
./patch-source3__libads__kerberos_keytab.c.patch
];

buildInputs =
20 changes: 20 additions & 0 deletions pkgs/servers/samba/patch-source3__libads__kerberos_keytab.c.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
--- old/source3/libads/kerberos_keytab.c 2017-12-23 14:23:53.247467000 +0100
+++ new/source3/libads/kerberos_keytab.c 2017-12-23 18:57:07.135340000 +0100
@@ -32,8 +32,6 @@

#ifdef HAVE_KRB5

-#ifdef HAVE_ADS
-
/* This MAX_NAME_LEN is a constant defined in krb5.h */
#ifndef MAX_KEYTAB_NAME_LEN
#define MAX_KEYTAB_NAME_LEN 1100
@@ -85,6 +83,8 @@
return ret;
}

+#ifdef HAVE_ADS
+
/**********************************************************************
Adds a single service principal, i.e. 'host' to the system keytab
***********************************************************************/