diff options
author | Thomas Gerbet <thomas@gerbet.me> | 2021-08-04 22:01:07 +0200 |
---|---|---|
committer | Thomas Gerbet <thomas@gerbet.me> | 2021-08-10 15:20:33 +0200 |
commit | ded0f0ede6c5ebda4eb88e8158a4115b2780a9fe (patch) | |
tree | eaa8a475d84b29298765dcec1d9a3194e6b8a0aa /pkgs/servers/mqtt | |
parent | 952e464bbf242da3b4b49fe97a4022dad589321b (diff) | |
download | nixpkgs-ded0f0ede6c5ebda4eb88e8158a4115b2780a9fe.tar nixpkgs-ded0f0ede6c5ebda4eb88e8158a4115b2780a9fe.tar.gz nixpkgs-ded0f0ede6c5ebda4eb88e8158a4115b2780a9fe.tar.bz2 nixpkgs-ded0f0ede6c5ebda4eb88e8158a4115b2780a9fe.tar.lz nixpkgs-ded0f0ede6c5ebda4eb88e8158a4115b2780a9fe.tar.xz nixpkgs-ded0f0ede6c5ebda4eb88e8158a4115b2780a9fe.tar.zst nixpkgs-ded0f0ede6c5ebda4eb88e8158a4115b2780a9fe.zip |
mosquitto: 2.0.10 -> 2.0.11
Fixes CVE-2021-34431. https://github.com/eclipse/mosquitto/blob/v2.0.11/ChangeLog.txt
Diffstat (limited to 'pkgs/servers/mqtt')
-rw-r--r-- | pkgs/servers/mqtt/mosquitto/default.nix | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix index 9e251e1bc22..984d2115598 100644 --- a/pkgs/servers/mqtt/mosquitto/default.nix +++ b/pkgs/servers/mqtt/mosquitto/default.nix @@ -12,19 +12,29 @@ , openssl , withSystemd ? stdenv.isLinux , systemd +, fetchpatch }: stdenv.mkDerivation rec { pname = "mosquitto"; - version = "2.0.10"; + version = "2.0.11"; src = fetchFromGitHub { owner = "eclipse"; repo = pname; rev = "v${version}"; - sha256 = "144vw7b9ja4lci4mplbxs048x9aixd9c3s7rg6wc1k31w099rb12"; + sha256 = "1i0kkqhjxqahkhsl60s46zlywa87jakv7h4sr3fhi1v53vwpb9mg"; }; + patches = lib.optionals stdenv.isDarwin [ + (fetchpatch { + name = "revert-cmake-shared-to-module.patch"; # See https://github.com/eclipse/mosquitto/issues/2277 + url = "https://github.com/eclipse/mosquitto/commit/e21eaeca37196439b3e89bb8fd2eb1903ef94845.patch"; + sha256 = "14syi2c1rks8sl2aw09my276w45yq1iasvzkqcrqwy4drdqrf069"; + revert = true; + }) + ]; + postPatch = '' for f in html manpage ; do substituteInPlace man/$f.xsl \ |