public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

apacheHttpd: 2.4.27 -> 2.4.28

Browse Source
This commit is contained in:
Franz Pletz 2017-10-07 01:06:34 +02:00
parent 241cb4ed03
commit 0a9825a7f5
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/servers/http/apache-httpd/2.4.nix
View File

@ -5,7 +5,6 @@
, ldapSupport ? true, openldap , ldapSupport ? true, openldap
, libxml2Support ? true, libxml2 , libxml2Support ? true, libxml2
, luaSupport ? false, lua5 , luaSupport ? false, lua5
, fetchpatch
}: }:
let optional = stdenv.lib.optional; let optional = stdenv.lib.optional;
@ -17,12 +16,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null;
assert http2Support -> nghttp2 != null; assert http2Support -> nghttp2 != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.4.27"; version = "2.4.28";
name = "apache-httpd-${version}"; name = "apache-httpd-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
sha1 = "699e4e917e8fb5fd7d0ce7e009f8256ed02ec6fc"; sha256 = "c1197a3a62a4ab5c584ab89b249af38cf28b4adee9c0106b62999fd29f920666";
}; };
# FIXME: -dev depends on -doc # FIXME: -dev depends on -doc
@ -40,15 +39,6 @@ stdenv.mkDerivation rec {
sed -i config.layout -e "s|installbuilddir:.*|installbuilddir: $dev/share/build|" sed -i config.layout -e "s|installbuilddir:.*|installbuilddir: $dev/share/build|"
''; '';
patches = [
(fetchpatch {
name = "CVE-2017-9798.patch";
url = "https://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/core.c?r1=1805223&r2=1807754&pathrev=1807754&view=patch";
sha256 = "00hbq5szgav91kwsc30jdjvgd3vbgm8n198yna8bcs33p434v25k";
stripLen = 3;
})
];
# Required for ‘pthread_cancel’. # Required for ‘pthread_cancel’.
NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";