Skip to content
This repository has been 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
base: a05357f9442c
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: 580f1e44ba7c
Choose a head ref
  • 6 commits
  • 7 files changed
  • 4 contributors

Commits on Mar 28, 2019

  1. gnutls: 3.6.6 -> 3.6.7, security! 

    https://lists.gnupg.org/pipermail/gnutls-help/2019-March/004497.html
Close #58437.

(cherry picked from commit 225b164)
    @dtzWill @vcunat
    dtzWill authored and vcunat committed Mar 28, 2019
    Copy the full SHA
    2755e61 View commit details
    Browse the repository at this point in the history

  2. python2Packages.nevow: fix build 

    (cherry picked from commit 128e6c5)
    @xeji
    xeji authored and Robert Schütz committed Mar 28, 2019
    Copy the full SHA
    f7ef8ac View commit details
    Browse the repository at this point in the history

  3. tahoe-lafs: fix build 

    (cherry picked from commit ea5f098)
    @xeji
    xeji authored and Robert Schütz committed Mar 28, 2019
    Copy the full SHA
    8706f44 View commit details
    Browse the repository at this point in the history

  4. nixos/ldap: rename password file options properly 

    users.ldap.daemon.rootpwmodpw -> users.ldap.daemon.rootpwmodpwFile
users.ldap.bind.password -> users.ldap.bind.passwordFile

as users.ldap.daemon.rootpwmodpw never was part of a release, no
mkRenamedOptionModule is introduced.

(cherry picked from commit 0a1451a)
    @flokli
    flokli committed Mar 28, 2019
    Copy the full SHA
    9eafdb4 View commit details
    Browse the repository at this point in the history

  5. nixos/ldap: set proper User= and Group= for nslcd service 

    eb90d97 broke nslcd, as /run/nslcd was
created/chowned as root user, while nslcd wants to do parts as nslcd
user.

This commit changes the nslcd to run with the proper uid/gid from the
start (through User= and Group=), so the RuntimeDirectory has proper
permissions, too.

In some cases, secrets are baked into nslcd's config file during startup
(so we don't want to provide it from the store).

This config file is normally hard-wired to /etc/nslcd.conf, but we don't
want to use PermissionsStartOnly anymore (#56265), and activation
scripts are ugly, so redirect /etc/nslcd.conf to /run/nslcd/nslcd.conf,
which now gets provisioned inside ExecStartPre=.

This change requires the files referenced to in
users.ldap.bind.passwordFile and users.ldap.daemon.rootpwmodpwFile to be
readable by the nslcd user (in the non-nslcd case, this was already the
case for users.ldap.bind.passwordFile)

fixes #57783

(cherry picked from commit 8817bbe)
    @flokli
    flokli committed Mar 28, 2019
    Copy the full SHA
    8ae24ed View commit details
    Browse the repository at this point in the history

  6. kubernetes: 1.13.4 -> 1.13.5 

    Backport of #58477
(cherry picked from commit e76f30e)
    @srhb
    Johan Thomsen authored and srhb committed Mar 28, 2019
    Copy the full SHA
    580f1e4 View commit details
    Browse the repository at this point in the history