diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-01-24 14:17:49 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-01-24 14:17:49 +0100 |
commit | 769342b37b6aef3b4d947fd1ebc7cf6c856bf948 (patch) | |
tree | bd7713697b9d39e969409911adaf24d72641a6f5 /pkgs/servers | |
parent | 9f22de722766c5e164936c1ecfbb602214c9c302 (diff) | |
parent | 9ffaa69da4673c12d730a6a9c2ab0eb1b0dab559 (diff) | |
download | nixlib-769342b37b6aef3b4d947fd1ebc7cf6c856bf948.tar nixlib-769342b37b6aef3b4d947fd1ebc7cf6c856bf948.tar.gz nixlib-769342b37b6aef3b4d947fd1ebc7cf6c856bf948.tar.bz2 nixlib-769342b37b6aef3b4d947fd1ebc7cf6c856bf948.tar.lz nixlib-769342b37b6aef3b4d947fd1ebc7cf6c856bf948.tar.xz nixlib-769342b37b6aef3b4d947fd1ebc7cf6c856bf948.tar.zst nixlib-769342b37b6aef3b4d947fd1ebc7cf6c856bf948.zip |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/atlassian/confluence.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/atlassian/jira.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/dns/knot-resolver/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/osrm-backend/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/samba/4.x.nix | 5 | ||||
-rw-r--r-- | pkgs/servers/samba/patch-source3__libads__kerberos_keytab.c.patch | 20 |
6 files changed, 31 insertions, 10 deletions
diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index aad2f69bfa6a..a5d89b493e82 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "atlassian-confluence-${version}"; - version = "6.5.0"; + version = "6.6.1"; src = fetchurl { url = "https://www.atlassian.com/software/confluence/downloads/binary/${name}.tar.gz"; - sha256 = "1prac65yczrarb38vvlp7srrhd4gb1zi5v88myfkp6rhwfrdxd0n"; + sha256 = "0nb8rjzfd0fqd9k1yxa3dj7kxgh84dgbg9l8jyj59g74ym77qmw0"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" ]; diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix index b99cf57e08bd..b90e68ed3bcb 100644 --- a/pkgs/servers/atlassian/jira.nix +++ b/pkgs/servers/atlassian/jira.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "atlassian-jira-${version}"; - version = "7.5.2"; + version = "7.7.0"; src = fetchurl { url = "https://downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz"; - sha256 = "00x00q6k4sb89aipqd28lgn8l7k7w33dpg18r1dn6l7rws1mazfx"; + sha256 = "1np1zf6yxras15ambf92g8snnvph9pp2dk4yw6w58yfil5kzp70l"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ]; diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 8e1f93ff1301..7a5aa8da550a 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -10,11 +10,11 @@ let in stdenv.mkDerivation rec { name = "knot-resolver-${version}"; - version = "1.5.2"; + version = "1.5.3"; src = fetchurl { url = "http://secure.nic.cz/files/knot-resolver/${name}.tar.xz"; - sha256 = "0y2z5hia4pr1rsyqhf4dmyc7mvhsbc298pg4j1iqikpvx9b5iwrr"; + sha256 = "03sb05zz6qn966apcprdqhmirkz7kjdbx8hswbvgamk1s2xd7v6f"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix index fa8e7d087cca..14f422f9610e 100644 --- a/pkgs/servers/osrm-backend/default.nix +++ b/pkgs/servers/osrm-backend/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "osrm-backend-${version}"; - version = "5.14.3"; + version = "5.15.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "Project-OSRM"; repo = "osrm-backend"; - sha256 = "1ajgybjx7g6qzddavab8bj7il7wn5wy24nivjj5rk84mfbi71s5v"; + sha256 = "1vdy7j1k1brgd5jgvi5pm3flfw70v48d4rwfq404iiyipkjdy3kz"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 7e1ae7f60326..fa910e80dab2 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -19,17 +19,18 @@ with lib; stdenv.mkDerivation rec { name = "samba-${version}"; - version = "4.6.11"; + version = "4.7.4"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${name}.tar.gz"; - sha256 = "07gd41y4ajdiansfqa8c5wvrincgddfzyfgh1pf7g388zaq7l6q5"; + sha256 = "0iw290n0q4l5s92d0f9yz27yp3rdfr6bvsmvg1xvd19g8p2d04pv"; }; outputs = [ "out" "dev" "man" ]; patches = [ ./4.x-no-persistent-install.patch + ./patch-source3__libads__kerberos_keytab.c.patch ]; buildInputs = diff --git a/pkgs/servers/samba/patch-source3__libads__kerberos_keytab.c.patch b/pkgs/servers/samba/patch-source3__libads__kerberos_keytab.c.patch new file mode 100644 index 000000000000..9f6577c65c14 --- /dev/null +++ b/pkgs/servers/samba/patch-source3__libads__kerberos_keytab.c.patch @@ -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 + ***********************************************************************/ |