mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-05-03 10:37:01 +00:00
Merge pull request #8985 from Beauhurst/newapaches
apache-httpd: update minor versions of both 2.2 and 2.4 for security-related fixes
This commit is contained in:
commit
277a85b15c
2 changed files with 4 additions and 4 deletions
|
@ -12,12 +12,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null;
|
||||||
assert mpm == "prefork" || mpm == "worker" || mpm == "event";
|
assert mpm == "prefork" || mpm == "worker" || mpm == "event";
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "2.2.29";
|
version = "2.2.31";
|
||||||
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 = "1d6a8fbc1391d358cc6fe430edc16222b97258d5";
|
sha256 = "1b165zi7jrrlz5wmyy3b34lcs3dl4g0dymfb0qxwdnimylcrsbzk";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [perl apr aprutil pcre] ++
|
buildInputs = [perl apr aprutil pcre] ++
|
||||||
|
|
|
@ -14,12 +14,12 @@ assert sslSupport -> aprutil.sslSupport && openssl != null;
|
||||||
assert ldapSupport -> aprutil.ldapSupport && openldap != null;
|
assert ldapSupport -> aprutil.ldapSupport && openldap != null;
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "2.4.12";
|
version = "2.4.16";
|
||||||
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";
|
||||||
sha256 = "1r7a63ka41vlswrqbb21vall6sc7svwgd497kb6dh8a6zvnkjvdd";
|
sha256 = "0hrpy6gjwma0kba7p7m61vwh82qcnkf08123lrwpg257m93hnrmc";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [perl] ++
|
buildInputs = [perl] ++
|
||||||
|
|
Loading…
Add table
Reference in a new issue