diff options
author | Matt Housh <jaeger@crux.ninja> | 2017-02-14 19:30:09 -0600 |
---|---|---|
committer | Matt Housh <jaeger@crux.ninja> | 2017-02-14 19:30:09 -0600 |
commit | d98caddce6f7dd60cf523e9e9e8fcf882b962689 (patch) | |
tree | f3b52b4ed6131f3825c5ed633a4f2923c8f7de79 /nginx | |
parent | 5748504cbd8b3f3fc83f038f6346aa19b1cbaaf7 (diff) | |
parent | 1618a379598fd1a0ff71713a3095af526c56b4d7 (diff) | |
download | contrib-d98caddce6f7dd60cf523e9e9e8fcf882b962689.tar.gz contrib-d98caddce6f7dd60cf523e9e9e8fcf882b962689.tar.xz |
Merge branch '3.2' into 3.3
Diffstat (limited to 'nginx')
-rw-r--r-- | nginx/.md5sum | 2 | ||||
-rw-r--r-- | nginx/Pkgfile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nginx/.md5sum b/nginx/.md5sum index 2e3c8ea5c..6e20b4d85 100644 --- a/nginx/.md5sum +++ b/nginx/.md5sum @@ -1,3 +1,3 @@ -7aeca793819c2b8df134c0b1cfe98361 nginx-1.11.9.tar.gz +6fb10f579055d27a2240d51c7d85c190 nginx-1.11.10.tar.gz 93b358681200fe294581cb559d529aee nginx.conf 06712aa2b72397850b0725f2e9d20627 nginx.rc diff --git a/nginx/Pkgfile b/nginx/Pkgfile index 63c8b4e02..1402cd87a 100644 --- a/nginx/Pkgfile +++ b/nginx/Pkgfile @@ -4,7 +4,7 @@ # Depends on: libpcre zlib openssl name=nginx -version=1.11.9 +version=1.11.10 release=1 source=(http://nginx.org/download/$name-$version.tar.gz \ $name.conf $name.rc) |