diff options
| author | Bartłomiej Piotrowski <bpiotrowski@alpinelinux.org> | 2015-04-25 18:09:12 +0200 |
|---|---|---|
| committer | Bartłomiej Piotrowski <bpiotrowski@alpinelinux.org> | 2015-04-25 18:09:12 +0200 |
| commit | 881715a627e02c68c68e39b48b9a3b9e708e7a40 (patch) | |
| tree | b003f0426d55b478a17dbb88853395b706386739 /main | |
| parent | 5e36a851493d68114d1763799f77a0b7a55b4b2e (diff) | |
| download | aports-881715a627e02c68c68e39b48b9a3b9e708e7a40.tar.bz2 aports-881715a627e02c68c68e39b48b9a3b9e708e7a40.tar.xz | |
main/nginx: upgrade to 1.8.0
Diffstat (limited to 'main')
| -rw-r--r-- | main/nginx/APKBUILD | 20 | ||||
| -rw-r--r-- | main/nginx/musl-crypt-fix.patch | 13 |
2 files changed, 8 insertions, 25 deletions
diff --git a/main/nginx/APKBUILD b/main/nginx/APKBUILD index 3a62af968a..539d42d5bc 100644 --- a/main/nginx/APKBUILD +++ b/main/nginx/APKBUILD @@ -3,8 +3,8 @@ # Contributor: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> pkgname=nginx -pkgver=1.6.3 -_nginxrtmpver=1.1.6 +pkgver=1.8.0 +_nginxrtmpver=1.1.7 pkgrel=0 pkgdesc="lightweight HTTP and reverse proxy server" url="http://www.nginx.org" @@ -17,7 +17,6 @@ makedepends="pcre-dev openssl-dev zlib-dev" subpackages="$pkgname-doc $pkgname-vim:vim" source="http://nginx.org/download/$pkgname-$pkgver.tar.gz nginx-rtmp-module-$_nginxrtmpver.tar.gz::https://github.com/arut/nginx-rtmp-module/archive/v$_nginxrtmpver.tar.gz - musl-crypt-fix.patch ipv6.patch nginx.initd @@ -105,21 +104,18 @@ vim() { done } -md5sums="ea813aee2c344c2f5b66cdb24a472738 nginx-1.6.3.tar.gz -ceca9874cd89e6027fae8178f5c3af86 nginx-rtmp-module-1.1.6.tar.gz -3aeb488921109e60d02ed64d36790aeb musl-crypt-fix.patch +md5sums="3ca4a37931e9fa301964b8ce889da8cb nginx-1.8.0.tar.gz +8006de2560db3e55bb15d110220076ac nginx-rtmp-module-1.1.7.tar.gz 801a87f7f9d27f8ad85b41a78b4c4461 ipv6.patch 8c586f7a2fdce37e16717b76acccf471 nginx.initd d3f30c25c84c55252a6babd9e9b0325b nginx.logrotate" -sha256sums="0a98e95b366e4d6042f331e1fa4d70e18fd1e49d8993e589008e70e742b7e757 nginx-1.6.3.tar.gz -4039d1e7febd93188f729b594772d04d8a1137b2e90b12fa53bb061f200add87 nginx-rtmp-module-1.1.6.tar.gz -8c398640bd379c1c6a2fafcd2b3848a72902e47924e8e2490b312c141eec5d70 musl-crypt-fix.patch +sha256sums="23cca1239990c818d8f6da118320c4979aadf5386deda691b1b7c2c96b9df3d5 nginx-1.8.0.tar.gz +7922b0e3d5f3d9c4b275e4908cfb8f5fb1bfb3ac2df77f4c262cda56df21aab3 nginx-rtmp-module-1.1.7.tar.gz a24ef5843ae0afa538b00c37eb7da7870f9d7f146f52a9668678f7296cf71d9b ipv6.patch d358482795e5f550852652ad246c4e1c8253355fdb26cc58f6d849a2a507f6c2 nginx.initd 6b89872994508cc7b4b225bca3301d7942767f37b8b691134141d95995740890 nginx.logrotate" -sha512sums="b6e59a8379ab8bcd999611808c431045553a3a45e9c67490a79c75ab753216c3c4f469968dd05d7b6404b3d976905f013435e908f324ac5e0d24ab0ff418cb2f nginx-1.6.3.tar.gz -6db0cc5a3cff600a836483f9cc4ff76860e9c893167561ad818cb41e2eb4fa31af8a4213e42c7c5766e389aed0ad713cffe776aa4bc4ebf279dd63eb65d4162c nginx-rtmp-module-1.1.6.tar.gz -21114c775e4bdd1f7b8b9abc143284945e96ed1d8c49904ddf918abad87b16253f918ba47976cd2df32f0fdb8a7dad399d4200e879db2da6cf93a28aab236a75 musl-crypt-fix.patch +sha512sums="3e5d7e1b01839b2638251c47046149450b9b65985e611ef55e5953846e9eb0128c3708c695540ad4dfd0ce5e3060dfecb51213403048fab1a99dd5cea94f0038 nginx-1.8.0.tar.gz +9883462a04683f1e7af175da04b86d259ff6d677864667588fb073143f7130969eb2a5a5a48ddceda7a555b908580f179bdcacb7f0111413d51db5bfe43b396e nginx-rtmp-module-1.1.7.tar.gz 68d64a84568ec2df0366925ab282a05ebe21a85044b6c7844a47573cfd8cc8ed119cc772358bc3fff36e2d4fdf583a730592825f5f98632993ca86d1f8438d5f ipv6.patch fd7ceddee6e75e6c799fe9ec14e2ef7295f93b5c511f8f79a9f5fda9eaf0677d66d26184eea32f12479c620d8956cd657670c67e04d2d014447b441990996412 nginx.initd fda91710185d6b801dd746c8c3678b5719b408de0b715bef7b1985f1ee17db1e8378d440759ea6234b1f70454a35870a2917bd1d6cd309ddc70e1c066fc8d4b8 nginx.logrotate" diff --git a/main/nginx/musl-crypt-fix.patch b/main/nginx/musl-crypt-fix.patch deleted file mode 100644 index 2f11fe2e9d..0000000000 --- a/main/nginx/musl-crypt-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- nginx-1.4.4/src/os/unix/ngx_user.c.orig -+++ nginx-1.4.4/src/os/unix/ngx_user.c -@@ -31,8 +31,10 @@ - struct crypt_data cd; - - cd.initialized = 0; -+#ifdef __GLIBC__ - /* work around the glibc bug */ - cd.current_salt[0] = ~salt[0]; -+#endif - - value = crypt_r((char *) key, (char *) salt, &cd); - |