X-Original-To: alpine-aports@mail.alpinelinux.org Delivered-To: alpine-aports@mail.alpinelinux.org Received: from mail.alpinelinux.org (dallas-a1.alpinelinux.org [127.0.0.1]) by mail.alpinelinux.org (Postfix) with ESMTP id 90AC7DCEFC0 for ; Mon, 29 Feb 2016 10:20:02 +0000 (UTC) Received: from mail-lf0-f45.google.com (mail-lf0-f45.google.com [209.85.215.45]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id 069F2DC042F for ; Mon, 29 Feb 2016 10:20:01 +0000 (UTC) Received: by mail-lf0-f45.google.com with SMTP id j186so13712227lfg.2 for ; Mon, 29 Feb 2016 02:20:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc; bh=qZZbNMbYf82IO+hvoxt5kKROiardzFRQv8hZsQVA5A4=; b=MSAmHdwbUGnNiLhh1KyhahxB1VlPQiQMxN89c+O991VbUoepiTik6JWrTRTPzsPK5v ShIRcZMI4TwYyN4XHA0KBQBSPZfeXIbHyRDrVAas8mBuOkV8toZ03O8tga9uVRJiIUrF 7u1dDzJXOcJYH3Px6yrwLJXfQZ9OXtX9bC73zkjDZ6G09x0vHtDVYXC9LaJCVkoExNoR 1kTXhOg5OUs4GsVV0KbI6OMcy6m6wrugb/2AN9z9H/HXCoufdHNcTixFNmsDRA8Rh6J1 IgfqeQSWmYhhr7jXHQQMfTQ6QcojhlxL+NptDgjW0Gu8Nd23n3mLDU0h32FFAG3FaIik jJvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc; bh=qZZbNMbYf82IO+hvoxt5kKROiardzFRQv8hZsQVA5A4=; b=e/olepEpArpbR14WjBdyRjP3GSEf6NyHx2qr6ipcXhyjGgj0+XeOrN5GlHifRSVYOw Z9MarfclL8FYNRPvzUtQjVS5zdw0z+M7Be6qbA19CpmZhESEMGet6RywdALWY6lRNxxC eTwoCsb0XE1Y1ToMcn+HgFCr0bvjUU+1M4xtTFkWHTt8BiP4XA0ELBEgbsanamBl45TP fdgdZo21mua2aO/Mh5HZrEuGaE+Vz2UtJtX3nPhouUbd02Om5PydDaDfMmBroONUt7dv Aa5X6VT/GPkgdhuunvn+kzhxVA3L9wZPwHUz+d07ed2BeM3T+bB2ZOJEqjzKNLjQiyjY bJ/Q== X-Gm-Message-State: AD7BkJICVL3jYDC/I8xofnpo/PzS1hyuGXwbXE5Xtqx5H7btpLJFgqmxiTSPxTRgvZbNlDkXNiXkxzCSDSQ5+w== X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: MIME-Version: 1.0 X-Received: by 10.25.26.205 with SMTP id a196mr5226664lfa.125.1456741199989; Mon, 29 Feb 2016 02:19:59 -0800 (PST) Received: by 10.25.19.169 with HTTP; Mon, 29 Feb 2016 02:19:59 -0800 (PST) In-Reply-To: <56D40D98.8060403@bpiotrowski.pl> References: <1456495775-3660-1-git-send-email-valery.kartel@gmail.com> <56D40D98.8060403@bpiotrowski.pl> Date: Mon, 29 Feb 2016 12:19:59 +0200 Message-ID: Subject: Re: [alpine-aports] [PATCH] main/nginx: upgrade to 1.9.12, lua module upgrade to 0.10.1rc1, dynamic modules From: Valery Kartel To: =?UTF-8?Q?Bart=C5=82omiej_Piotrowski?= Cc: alpine-aports@lists.alpinelinux.org Content-Type: multipart/alternative; boundary=001a11401c06c154b6052ce5fd6a X-Virus-Scanned: ClamAV using ClamSMTP --001a11401c06c154b6052ce5fd6a Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable I know that, but a short time ago 1.8 branch somehow was bumped to 1.9. So for now I just upgrade it and added use of 1.9 new features. I think it's a good idea to downgrade main/nginx to stable 1.8 and make something like testing/nginx9 with all this changes. 2016-02-29 11:21 GMT+02:00 Bart=C5=82omiej Piotrowski : > On 2016-02-26 15:09, Valery Kartel wrote: > > - devkit static module removed, because it is not used by lua module > anymore > > - nginx-lua, nginx-rtmp static binaries stayed for compatibility > > > > - new static modules compiled in binary: > > poll select http_sub http_flv http_mp4http_slice http_realip > http_addition > > http_gunzip http_random_index http_secure_link http_degradation > > > > - new dynamic modules in subpackages: > > http_xslt_filter http_image_filter http_geoip http_lua stream mai= l > > --- > > main/nginx/APKBUILD | 96 > +++++++++++++++++++++++++++++++++++++---------------- > > 1 file changed, 68 insertions(+), 28 deletions(-) > > > > diff --git a/main/nginx/APKBUILD b/main/nginx/APKBUILD > > index 8960c30..107e8ad 100644 > > --- a/main/nginx/APKBUILD > > +++ b/main/nginx/APKBUILD > > @@ -3,7 +3,7 @@ > > # Contributor: Bart=C5=82omiej Piotrowski > > > > pkgname=3Dnginx > > -pkgver=3D1.9.11 > > +pkgver=3D1.9.12 > > pkgrel=3D0 > > pkgdesc=3D"HTTP and reverse proxy server" > > url=3D"http://www.nginx.org/en" > > @@ -19,23 +19,25 @@ depends=3D"$pkgname-common !$pkgname-rtmp > !$pkgname-lua" > > # Modules > > _lua_mod=3Dlua-nginx-module > > _lua_dir=3D$_lua_mod > > -_lua_ver=3D0.10.1rc0 > > +_lua_ver=3D0.10.1rc1 > > > > _rtmp_mod=3Dnginx-rtmp-module > > _rtmp_dir=3D$_rtmp_mod > > _rtmp_ver=3D1.1.7 > > > > -_devkit_mod=3Dnginx-devel-kit > > -_devkit_dir=3Dngx_devel_kit > > -_devkit_ver=3D0.2.19 > > - > > -makedepends=3D"perl-dev pcre-dev openssl-dev zlib-dev luajit-dev paxma= rk > linux-headers" > > -subpackages=3D"$pkgname-doc $pkgname-common $pkgname-vim $pkgname-rtmp > $pkgname-lua" > > +makedepends=3D"perl-dev pcre-dev openssl-dev zlib-dev luajit-dev > linux-headers gd-dev geoip-dev" > > +subpackages=3D"$pkgname-doc $pkgname-common $pkgname-vim $pkgname-rtmp > $pkgname-lua > > + $pkgname-http_xslt_filter > > + $pkgname-http_image_filter > > + $pkgname-http_geoip > > + $pkgname-http_lua > > + $pkgname-stream > > + $pkgname-mail > > + " > > > > source=3D"http://nginx.org/download/$pkgname-$pkgver.tar.gz > > $_lua_mod-$_lua_ver.tar.gz:: > https://github.com/openresty/$_lua_mod/archive/v$_lua_ver.tar.gz > > $_rtmp_mod-$_rtmp_ver.tar.gz:: > https://github.com/arut/$_rtmp_mod/archive/v$_rtmp_ver.tar.gz > > - $_devkit_mod-$_devkit_ver.tar.gz:: > https://github.com/simpl/$_devkit_dir/archive/v$_devkit_ver.tar.gz > > $pkgname.logrotate > > $pkgname.initd > > ipv6.patch > > @@ -60,6 +62,7 @@ _build() { > > --conf-path=3D/etc/$pkgname/$pkgname.conf \ > > --pid-path=3D/run/$pkgname/$pkgname.pid \ > > --lock-path=3D/run/$pkgname/$pkgname.lock \ > > + --modules-path=3D/usr/lib/$pkgname \ > > > --http-client-body-temp-path=3D/var/lib/$pkgname/tmp/client_body \ > > --http-proxy-temp-path=3D/var/lib/$pkgname/tmp/proxy \ > > --http-fastcgi-temp-path=3D/var/lib/$pkgname/tmp/fastcgi = \ > > @@ -68,16 +71,34 @@ _build() { > > --user=3D$pkgusers \ > > --group=3D$_grp_ngx \ > > --with-ipv6 \ > > + --with-threads \ > > --with-file-aio \ > > --with-pcre-jit \ > > + --with-poll_module \ > > + --with-select_module \ > > + --with-http_sub_module \ > > --with-http_dav_module \ > > + --with-http_flv_module \ > > + --with-http_mp4_module \ > > --with-http_ssl_module \ > > + --with-http_slice_module \ > > + --with-http_realip_module \ > > + --with-http_addition_module \ > > --with-http_stub_status_module \ > > + --with-http_gunzip_module \ > > --with-http_gzip_static_module \ > > --with-http_v2_module \ > > --with-http_auth_request_module \ > > - --with-mail \ > > + --with-http_random_index_module \ > > + --with-http_secure_link_module \ > > + --with-http_degradation_module \ > > + --with-http_xslt_module=3Ddynamic \ > > + --with-http_image_filter_module=3Ddynamic \ > > + --with-http_geoip_module=3Ddynamic \ > > + --with-mail=3Ddynamic \ > > --with-mail_ssl_module \ > > + --with-stream=3Ddynamic \ > > + --with-stream_ssl_module \ > > $@ || return 1 > > make || return 1 > > mv objs/$pkgname objs/$binary > > @@ -86,17 +107,20 @@ _build() { > > build() { > > cd "$_builddir" > > > > - _build $pkgname-lua --build=3D"rtmp,lua" \ > > - --add-module=3D"$srcdir/$_devkit_dir-$_devkit_ver" \ > > - --add-module=3D"$srcdir/$_rtmp_dir-$_rtmp_ver" \ > > +## static lua > > + _build $pkgname-lua --build=3D"lua" \ > > --add-module=3D"$srcdir/$_lua_dir-$_lua_ver" \ > > || return 1 > > > > +## static rtmp > > _build $pkgname-rtmp --build=3D"rtmp" \ > > --add-module=3D"$srcdir/$_rtmp_dir-$_rtmp_ver" \ > > || return 1 > > > > - _build $pkgname || return 1 > > +## no external static modules > > + _build $pkgname \ > > + --add-dynamic-module=3D"$srcdir/$_lua_dir-$_lua_ver" \ > > + || return 1 > > } > > > > package() { > > @@ -108,8 +132,7 @@ package() { > > > > install -Dm644 README "$pkgdir"/usr/share/doc/$pkgname/README > > cp -r "$srcdir"/$_lua_dir-$_lua_ver/doc > "$pkgdir"/usr/share/doc/$pkgname/$_lua_mod || return 1 > > - cp -r "$srcdir"/$_rtmp_dir-$_rtmp_ver/doc > "$pkgdir"/usr/share/doc/$pkgname/$_rtmp_mod > > - cp -r "$srcdir"/$_devkit_dir-$_devkit_ver/docs > "$pkgdir"/usr/share/doc/$pkgname/$_devkit_mod > > + cp -r "$srcdir"/$_rtmp_dir-$_rtmp_ver/doc > "$pkgdir"/usr/share/doc/$pkgname/$_rtmp_mod || return 1 > > > > install -Dm755 "$srcdir"/$pkgname.initd > "$pkgdir"/etc/init.d/$pkgname > > install -Dm644 "$srcdir"/$pkgname.logrotate > "$pkgdir"/etc/logrotate.d/$pkgname > > @@ -123,10 +146,13 @@ package() { > > > > install -dm755 "$pkgdir"/var/log > > mv "$pkgdir"/var/lib/$pkgname/logs "$pkgdir"/var/log/$pkgname > > + ln -sf /usr/lib/$pkgname "$pkgdir"/var/lib/$pkgname/modules > > ln -sf /var/log/$pkgname "$pkgdir"/var/lib/$pkgname/logs > > ln -sf /run/$pkgname "$pkgdir"/var/lib/$pkgname/run > > > > - sed -i -E "s~logs(/nginx.pid.*$)~run\1~" > "$pkgdir"/etc/$pkgname/$pkgname.conf > > + sed -i -E "s~logs(/nginx.pid.*$)~run\1~" \ > > + -e "1 i include conf.d/*.conf" \ > > + "$pkgdir"/etc/$pkgname/$pkgname.conf > > > > rm -rf "$pkgdir"/run "$pkgdir"/etc/$pkgname/*.default > > } > > @@ -148,35 +174,49 @@ vim() { > > } > > > > rtmp() { > > - pkgdesc=3D"$pkgdesc (rtmp support)" > > + pkgdesc=3D"$pkgdesc (static rtmp support)" > > depends=3D"$pkgname-common !$pkgname !$pkgname-lua" > > install -Dm755 "$_builddir"/objs/$pkgname-rtmp > "$subpkgdir"/usr/sbin/$pkgname > > } > > > > lua() { > > - pkgdesc=3D"$pkgdesc (rtmp & lua support)" > > + pkgdesc=3D"$pkgdesc (static lua support) - deprecated, use > nginx-http_lua" > > depends=3D"$pkgname-common !$pkgname !$pkgname-rtmp" > > install -Dm755 "$_builddir"/objs/$pkgname-lua > "$subpkgdir"/usr/sbin/$pkgname > > } > > > > -md5sums=3D"76eb5853a1190e0cfc691aa21c545de3 nginx-1.9.11.tar.gz > > -60145f9ffb9ebf455a800046d27b2ebf lua-nginx-module-0.10.1rc0.tar.gz > > +_ngx_mod() { > > + local _name=3D$1 _file=3D"ngx_${1}_module.so" > > + depends=3D"$pkgname" > > + pkgdesc=3D"NGINX module: $_name" > > + mkdir -p "$subpkgdir"/usr/lib/$pkgname > "$subpkgdir"/etc/$pkgname/conf.d > > + mv "$pkgdir"/usr/lib/$pkgname/$_file \ > > + "$subpkgdir"/usr/lib/$pkgname || return 1 > > + echo "load_module modules/$_file" > > "$subpkgdir"/etc/$pkgname/conf.d/$_name.conf > > +} > > + > > +http_xslt_filter() { _ngx_mod http_xslt_filter; } > > +http_image_filter() { _ngx_mod http_image_filter; } > > +http_geoip() { _ngx_mod http_geoip; } > > +http_lua() { _ngx_mod http_lua; } > > +stream() { _ngx_mod stream; } > > +mail() { _ngx_mod mail; } > > + > > +md5sums=3D"0afe4a7e589a0de43b7b54aa055a4351 nginx-1.9.12.tar.gz > > +86a82453e38c9320d736ecd5dba2e9c3 lua-nginx-module-0.10.1rc1.tar.gz > > 8006de2560db3e55bb15d110220076ac nginx-rtmp-module-1.1.7.tar.gz > > -09a18178adca7b5674129d8100ce4f68 nginx-devel-kit-0.2.19.tar.gz > > db194cf3c6c4be12c70c757e0c9ad995 nginx.logrotate > > 16dcac0d7a2b406807d3377841d9b480 nginx.initd > > 801a87f7f9d27f8ad85b41a78b4c4461 ipv6.patch" > > > -sha256sums=3D"6a5c72f4afaf57a6db064bba0965d72335f127481c5d4e64ee8714e7b3= 68a51f > nginx-1.9.11.tar.gz > > -1bae94d2a0fd4fad39f2544a2f8eaf71335ea512a6f0027af190b46562224c68 > lua-nginx-module-0.10.1rc0.tar.gz > > > +sha256sums=3D"1af2eb956910ed4b11aaf525a81bc37e135907e7127948f9179f541033= 7da042 > nginx-1.9.12.tar.gz > > +7b741a45ba8c66972fc7261cd191bdc89179ad9cebbc5af59c899c56811b8838 > lua-nginx-module-0.10.1rc1.tar.gz > > 7922b0e3d5f3d9c4b275e4908cfb8f5fb1bfb3ac2df77f4c262cda56df21aab3 > nginx-rtmp-module-1.1.7.tar.gz > > -501f299abdb81b992a980bda182e5de5a4b2b3e275fbf72ee34dd7ae84c4b679 > nginx-devel-kit-0.2.19.tar.gz > > b063611c6cb2d33bd43c4b17bf4135dda25f209bb77e4e66d1b156cffc37fbe6 > nginx.logrotate > > 3d8a90d2f75b7f24c4d74722b5b3ac11d85f416c2d7641b4280d7c126bfe8395 > nginx.initd > > a24ef5843ae0afa538b00c37eb7da7870f9d7f146f52a9668678f7296cf71d9b > ipv6.patch" > > > -sha512sums=3D"1ea79b8ade066faa4facdb13631b97c3228cc91f512dc98c7b1b153a48= 9936f2bc13017ea67097cd303581720fd9bc3a212744ac0a03a1ea514e56321b407caa > nginx-1.9.11.tar.gz > > > -c57e7b5c8c29f17c3fdf0fadbcfa5732b77ee22b4e0eff346828a22fa0e862c11f9414f7= fed39937dd5051bbd093f97c35bf3bf84e75d66ea67b0feb19f8dbcb > lua-nginx-module-0.10.1rc0.tar.gz > > > +sha512sums=3D"b5f4cae48c85cdc9a95006b6a321834de9d18981cb1a25670c9fc948d8= 6b9a8906d25a1ca174626eb418b0afdb3f2e1df3cbb6f5a48bd781e39e2470a4d52520 > nginx-1.9.12.tar.gz > > > +6d9ab941bd89b6a4effb6ccec8aca7058ae4d0f1baa712616222f2fc7d60d78c76c33113= a04c5ef71d28cfe55b6247720bd902726f8e93ed64ae50a84f653c0f > lua-nginx-module-0.10.1rc1.tar.gz > > > 9883462a04683f1e7af175da04b86d259ff6d677864667588fb073143f7130969eb2a5a5a= 48ddceda7a555b908580f179bdcacb7f0111413d51db5bfe43b396e > nginx-rtmp-module-1.1.7.tar.gz > > > -915954acf16a27fbd3c93c154012d38e864f1d8dfd51cde401bba26e46eb3e3c778ec4c9= 2f4f8ed83ac001e96cee72765554d0e4da06acf6a4be5184b23b3657 > nginx-devel-kit-0.2.19.tar.gz > > > 09b110693e3f4377349ccea3c43cb8199c8579ee351eae34283299be99fdf764b0c1bddd5= 52e13e4d671b194501618b29c822e1ad53b34101a73a63954363dbb > nginx.logrotate > > > 1ea032cf88021ec8aa1401d284ea738364511cdb9f8c01670deb8e59aae570f5bbe17f0cb= ab73c0e08d6b342a621b6a9c014832168ed41f6028ecfa4211b60cf > nginx.initd > > > 68d64a84568ec2df0366925ab282a05ebe21a85044b6c7844a47573cfd8cc8ed119cc7723= 58bc3fff36e2d4fdf583a730592825f5f98632993ca86d1f8438d5f > ipv6.patch" > > > > -1. 1.9.x is mainline release, and we should track only stable branch. > > Bart=C5=82omiej > > --001a11401c06c154b6052ce5fd6a Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
I know that, but a short time ago 1.8 branch somehow = was bumped to 1.9.

So for now I just upgrade it and added use of 1.9= new features.

I think it's a good idea to downgrade main/= nginx to stable 1.8 and make something like testing/nginx9 with all this ch= anges.


2016-02-29 11:21 GMT+02:00 Bart=C5=82omiej Piotrowski = <b@bpiotrowski.pl<= /a>>:
On 2016-02-26 15:09, Valery Kartel wrote:
> - devkit static module removed, because it is not used by lua module a= nymore
> - nginx-lua, nginx-rtmp static binaries stayed for compatibility
>
> - new static modules compiled in binary:
>=C2=A0 =C2=A0 =C2=A0 =C2=A0poll select http_sub http_flv http_mp4http_s= lice http_realip http_addition
>=C2=A0 =C2=A0 =C2=A0 =C2=A0http_gunzip http_random_index http_secure_li= nk http_degradation
>
> - new dynamic modules in subpackages:
>=C2=A0 =C2=A0 =C2=A0 =C2=A0http_xslt_filter http_image_filter http_geoi= p http_lua stream mail
> ---
>=C2=A0 main/nginx/APKBUILD | 96 +++++++++++++++++++++++++++++++++++++--= --------------
>=C2=A0 1 file changed, 68 insertions(+), 28 deletions(-)
>
> diff --git a/main/nginx/APKBUILD b/main/nginx/APKBUILD
> index 8960c30..107e8ad 100644
> --- a/main/nginx/APKBUILD
> +++ b/main/nginx/APKBUILD
> @@ -3,7 +3,7 @@
>=C2=A0 # Contributor: Bart=C5=82omiej Piotrowski <nospam@bpiotrowski.pl>
>
>=C2=A0 pkgname=3Dnginx
> -pkgver=3D1.9.11
> +pkgver=3D1.9.12
>=C2=A0 pkgrel=3D0
>=C2=A0 pkgdesc=3D"HTTP and reverse proxy server"
>=C2=A0 url=3D"http://www.nginx.org/en"
> @@ -19,23 +19,25 @@ depends=3D"$pkgname-common !$pkgname-rtmp !$p= kgname-lua"
>=C2=A0 # Modules
>=C2=A0 _lua_mod=3Dlua-nginx-module
>=C2=A0 _lua_dir=3D$_lua_mod
> -_lua_ver=3D0.10.1rc0
> +_lua_ver=3D0.10.1rc1
>
>=C2=A0 _rtmp_mod=3Dnginx-rtmp-module
>=C2=A0 _rtmp_dir=3D$_rtmp_mod
>=C2=A0 _rtmp_ver=3D1.1.7
>
> -_devkit_mod=3Dnginx-devel-kit
> -_devkit_dir=3Dngx_devel_kit
> -_devkit_ver=3D0.2.19
> -
> -makedepends=3D"perl-dev pcre-dev openssl-dev zlib-dev luajit-dev= paxmark linux-headers"
> -subpackages=3D"$pkgname-doc $pkgname-common $pkgname-vim $pkgnam= e-rtmp $pkgname-lua"
> +makedepends=3D"perl-dev pcre-dev openssl-dev zlib-dev luajit-dev= linux-headers gd-dev geoip-dev"
> +subpackages=3D"$pkgname-doc $pkgname-common $pkgname-vim $pkgnam= e-rtmp $pkgname-lua
> +=C2=A0 =C2=A0 =C2=A0$pkgname-http_xslt_filter
> +=C2=A0 =C2=A0 =C2=A0$pkgname-http_image_filter
> +=C2=A0 =C2=A0 =C2=A0$pkgname-http_geoip
> +=C2=A0 =C2=A0 =C2=A0$pkgname-http_lua
> +=C2=A0 =C2=A0 =C2=A0$pkgname-stream
> +=C2=A0 =C2=A0 =C2=A0$pkgname-mail
> +=C2=A0 =C2=A0 =C2=A0"
>
>=C2=A0 source=3D"http://nginx.org/download= /$pkgname-$pkgver.tar.gz
>=C2=A0 =C2=A0 =C2=A0 =C2=A0$_lua_mod-$_lua_ver.tar.gz::https://github.com/openresty/$_lua_mod/archive/v$_lu= a_ver.tar.gz
>=C2=A0 =C2=A0 =C2=A0 =C2=A0$_rtmp_mod-$_rtmp_ver.tar.gz::https://github.com/arut/$_rtmp_mod/archive/v$_rtmp_ve= r.tar.gz
> -=C2=A0 =C2=A0 =C2=A0$_devkit_mod-$_devkit_ver.tar.gz::https://github.com/simpl/$_devkit_dir/archive/v$_= devkit_ver.tar.gz
>=C2=A0 =C2=A0 =C2=A0 =C2=A0$pkgname.logrotate
>=C2=A0 =C2=A0 =C2=A0 =C2=A0$pkgname.initd
>=C2=A0 =C2=A0 =C2=A0 =C2=A0ipv6.patch
> @@ -60,6 +62,7 @@ _build() {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--conf-path=3D/e= tc/$pkgname/$pkgname.conf \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--pid-path=3D/ru= n/$pkgname/$pkgname.pid \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--lock-path=3D/r= un/$pkgname/$pkgname.lock \
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--modules-path=3D/usr= /lib/$pkgname \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--http-client-bo= dy-temp-path=3D/var/lib/$pkgname/tmp/client_body \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--http-proxy-tem= p-path=3D/var/lib/$pkgname/tmp/proxy \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--http-fastcgi-t= emp-path=3D/var/lib/$pkgname/tmp/fastcgi \
> @@ -68,16 +71,34 @@ _build() {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--user=3D$pkguse= rs \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--group=3D$_grp_= ngx \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--with-ipv6 \ > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--with-threads \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--with-file-aio = \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--with-pcre-jit = \
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--with-poll_module \<= br> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--with-select_module = \
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--with-http_sub_modul= e \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--with-http_dav_= module \
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--with-http_flv_modul= e \
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--with-http_mp4_modul= e \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--with-http_ssl_= module \
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--with-http_slice_mod= ule \
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--with-http_realip_mo= dule \
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--with-http_addition_= module \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--with-http_stub= _status_module \
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--with-http_gunzip_mo= dule \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--with-http_gzip= _static_module \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--with-http_v2_m= odule \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--with-http_auth= _request_module \
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--with-mail \
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--with-http_random_in= dex_module \
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--with-http_secure_li= nk_module \
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--with-http_degradati= on_module \
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--with-http_xslt_modu= le=3Ddynamic \
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--with-http_image_fil= ter_module=3Ddynamic \
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--with-http_geoip_mod= ule=3Ddynamic \
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--with-mail=3Ddynamic= \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--with-mail_ssl_= module \
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--with-stream=3Ddynam= ic \
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--with-stream_ssl_mod= ule \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0$@ || return 1 >=C2=A0 =C2=A0 =C2=A0 =C2=A0make || return 1
>=C2=A0 =C2=A0 =C2=A0 =C2=A0mv objs/$pkgname objs/$binary
> @@ -86,17 +107,20 @@ _build() {
>=C2=A0 build() {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0cd "$_builddir"
>
> -=C2=A0 =C2=A0 =C2=A0_build $pkgname-lua --build=3D"rtmp,lua"= ; \
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--add-module=3D"= $srcdir/$_devkit_dir-$_devkit_ver" \
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--add-module=3D"= $srcdir/$_rtmp_dir-$_rtmp_ver" \
> +## static lua
> +=C2=A0 =C2=A0 =C2=A0_build $pkgname-lua --build=3D"lua" \ >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--add-module=3D&= quot;$srcdir/$_lua_dir-$_lua_ver" \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0|| return 1
>
> +## static rtmp
>=C2=A0 =C2=A0 =C2=A0 =C2=A0_build $pkgname-rtmp --build=3D"rtmp&qu= ot; \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--add-module=3D&= quot;$srcdir/$_rtmp_dir-$_rtmp_ver" \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0|| return 1
>
> -=C2=A0 =C2=A0 =C2=A0_build $pkgname || return 1
> +## no external static modules
> +=C2=A0 =C2=A0 =C2=A0_build $pkgname \
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--add-dynamic-module= =3D"$srcdir/$_lua_dir-$_lua_ver" \
> +=C2=A0 =C2=A0 =C2=A0|| return 1
>=C2=A0 }
>
>=C2=A0 package() {
> @@ -108,8 +132,7 @@ package() {
>
>=C2=A0 =C2=A0 =C2=A0 =C2=A0install -Dm644 README "$pkgdir"/us= r/share/doc/$pkgname/README
>=C2=A0 =C2=A0 =C2=A0 =C2=A0cp -r "$srcdir"/$_lua_dir-$_lua_ve= r/doc "$pkgdir"/usr/share/doc/$pkgname/$_lua_mod || return 1
> -=C2=A0 =C2=A0 =C2=A0cp -r "$srcdir"/$_rtmp_dir-$_rtmp_ver/d= oc "$pkgdir"/usr/share/doc/$pkgname/$_rtmp_mod
> -=C2=A0 =C2=A0 =C2=A0cp -r "$srcdir"/$_devkit_dir-$_devkit_v= er/docs "$pkgdir"/usr/share/doc/$pkgname/$_devkit_mod
> +=C2=A0 =C2=A0 =C2=A0cp -r "$srcdir"/$_rtmp_dir-$_rtmp_ver/d= oc "$pkgdir"/usr/share/doc/$pkgname/$_rtmp_mod || return 1
>
>=C2=A0 =C2=A0 =C2=A0 =C2=A0install -Dm755 "$srcdir"/$pkgname.= initd "$pkgdir"/etc/init.d/$pkgname
>=C2=A0 =C2=A0 =C2=A0 =C2=A0install -Dm644 "$srcdir"/$pkgname.= logrotate "$pkgdir"/etc/logrotate.d/$pkgname
> @@ -123,10 +146,13 @@ package() {
>
>=C2=A0 =C2=A0 =C2=A0 =C2=A0install -dm755 "$pkgdir"/var/log >=C2=A0 =C2=A0 =C2=A0 =C2=A0mv "$pkgdir"/var/lib/$pkgname/logs= "$pkgdir"/var/log/$pkgname
> +=C2=A0 =C2=A0 =C2=A0ln -sf /usr/lib/$pkgname "$pkgdir"/var/= lib/$pkgname/modules
>=C2=A0 =C2=A0 =C2=A0 =C2=A0ln -sf /var/log/$pkgname "$pkgdir"= /var/lib/$pkgname/logs
>=C2=A0 =C2=A0 =C2=A0 =C2=A0ln -sf /run/$pkgname "$pkgdir"/var= /lib/$pkgname/run
>
> -=C2=A0 =C2=A0 =C2=A0sed -i -E "s~logs(/nginx.pid.*$)~run\1~"= ; "$pkgdir"/etc/$pkgname/$pkgname.conf
> +=C2=A0 =C2=A0 =C2=A0sed -i -E "s~logs(/nginx.pid.*$)~run\1~"= ; \
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -e "1 i include= conf.d/*.conf" \
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 "$pkgdir"/= etc/$pkgname/$pkgname.conf
>
>=C2=A0 =C2=A0 =C2=A0 =C2=A0rm -rf "$pkgdir"/run "$pkgdir= "/etc/$pkgname/*.default
>=C2=A0 }
> @@ -148,35 +174,49 @@ vim() {
>=C2=A0 }
>
>=C2=A0 rtmp() {
> -=C2=A0 =C2=A0 =C2=A0pkgdesc=3D"$pkgdesc (rtmp support)"
> +=C2=A0 =C2=A0 =C2=A0pkgdesc=3D"$pkgdesc (static rtmp support)&qu= ot;
>=C2=A0 =C2=A0 =C2=A0 =C2=A0depends=3D"$pkgname-common !$pkgname !$= pkgname-lua"
>=C2=A0 =C2=A0 =C2=A0 =C2=A0install -Dm755 "$_builddir"/objs/$= pkgname-rtmp "$subpkgdir"/usr/sbin/$pkgname
>=C2=A0 }
>
>=C2=A0 lua() {
> -=C2=A0 =C2=A0 =C2=A0pkgdesc=3D"$pkgdesc (rtmp & lua support)= "
> +=C2=A0 =C2=A0 =C2=A0pkgdesc=3D"$pkgdesc (static lua support) - d= eprecated, use nginx-http_lua"
>=C2=A0 =C2=A0 =C2=A0 =C2=A0depends=3D"$pkgname-common !$pkgname !$= pkgname-rtmp"
>=C2=A0 =C2=A0 =C2=A0 =C2=A0install -Dm755 "$_builddir"/objs/$= pkgname-lua "$subpkgdir"/usr/sbin/$pkgname
>=C2=A0 }
>
> -md5sums=3D"76eb5853a1190e0cfc691aa21c545de3=C2=A0 nginx-1.9.11.t= ar.gz
> -60145f9ffb9ebf455a800046d27b2ebf=C2=A0 lua-nginx-module-0.10.1rc0.tar= .gz
> +_ngx_mod() {
> +=C2=A0 =C2=A0 =C2=A0local _name=3D$1 _file=3D"ngx_${1}_module.so= "
> +=C2=A0 =C2=A0 =C2=A0depends=3D"$pkgname"
> +=C2=A0 =C2=A0 =C2=A0pkgdesc=3D"NGINX module: $_name"
> +=C2=A0 =C2=A0 =C2=A0mkdir -p "$subpkgdir"/usr/lib/$pkgname = "$subpkgdir"/etc/$pkgname/conf.d
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 mv "$pkgdir"/usr/lib/$pkgname/$= _file \
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 "$subpkg= dir"/usr/lib/$pkgname || return 1
> +=C2=A0 =C2=A0 =C2=A0echo "load_module modules/$_file" > = "$subpkgdir"/etc/$pkgname/conf.d/$_name.conf
> +}
> +
> +http_xslt_filter() { _ngx_mod http_xslt_filter; }
> +http_image_filter() { _ngx_mod http_image_filter; }
> +http_geoip() { _ngx_mod http_geoip; }
> +http_lua() { _ngx_mod http_lua; }
> +stream() { _ngx_mod stream; }
> +mail() { _ngx_mod mail; }
> +
> +md5sums=3D"0afe4a7e589a0de43b7b54aa055a4351=C2=A0 nginx-1.9.12.t= ar.gz
> +86a82453e38c9320d736ecd5dba2e9c3=C2=A0 lua-nginx-module-0.10.1rc1.tar= .gz
>=C2=A0 8006de2560db3e55bb15d110220076ac=C2=A0 nginx-rtmp-module-1.1.7.t= ar.gz
> -09a18178adca7b5674129d8100ce4f68=C2=A0 nginx-devel-kit-0.2.19.tar.gz<= br> >=C2=A0 db194cf3c6c4be12c70c757e0c9ad995=C2=A0 nginx.logrotate
>=C2=A0 16dcac0d7a2b406807d3377841d9b480=C2=A0 nginx.initd
>=C2=A0 801a87f7f9d27f8ad85b41a78b4c4461=C2=A0 ipv6.patch"
> -sha256sums=3D"6a5c72f4afaf57a6db064bba0965d72335f127481c5d4e64ee= 8714e7b368a51f=C2=A0 nginx-1.9.11.tar.gz
> -1bae94d2a0fd4fad39f2544a2f8eaf71335ea512a6f0027af190b46562224c68=C2= =A0 lua-nginx-module-0.10.1rc0.tar.gz
> +sha256sums=3D"1af2eb956910ed4b11aaf525a81bc37e135907e7127948f917= 9f5410337da042=C2=A0 nginx-1.9.12.tar.gz
> +7b741a45ba8c66972fc7261cd191bdc89179ad9cebbc5af59c899c56811b8838=C2= =A0 lua-nginx-module-0.10.1rc1.tar.gz
>=C2=A0 7922b0e3d5f3d9c4b275e4908cfb8f5fb1bfb3ac2df77f4c262cda56df21aab3= =C2=A0 nginx-rtmp-module-1.1.7.tar.gz
> -501f299abdb81b992a980bda182e5de5a4b2b3e275fbf72ee34dd7ae84c4b679=C2= =A0 nginx-devel-kit-0.2.19.tar.gz
>=C2=A0 b063611c6cb2d33bd43c4b17bf4135dda25f209bb77e4e66d1b156cffc37fbe6= =C2=A0 nginx.logrotate
>=C2=A0 3d8a90d2f75b7f24c4d74722b5b3ac11d85f416c2d7641b4280d7c126bfe8395= =C2=A0 nginx.initd
>=C2=A0 a24ef5843ae0afa538b00c37eb7da7870f9d7f146f52a9668678f7296cf71d9b= =C2=A0 ipv6.patch"
> -sha512sums=3D"1ea79b8ade066faa4facdb13631b97c3228cc91f512dc98c7b= 1b153a489936f2bc13017ea67097cd303581720fd9bc3a212744ac0a03a1ea514e56321b407= caa=C2=A0 nginx-1.9.11.tar.gz
> -c57e7b5c8c29f17c3fdf0fadbcfa5732b77ee22b4e0eff346828a22fa0e862c11f941= 4f7fed39937dd5051bbd093f97c35bf3bf84e75d66ea67b0feb19f8dbcb=C2=A0 lua-nginx= -module-0.10.1rc0.tar.gz
> +sha512sums=3D"b5f4cae48c85cdc9a95006b6a321834de9d18981cb1a25670c= 9fc948d86b9a8906d25a1ca174626eb418b0afdb3f2e1df3cbb6f5a48bd781e39e2470a4d52= 520=C2=A0 nginx-1.9.12.tar.gz
> +6d9ab941bd89b6a4effb6ccec8aca7058ae4d0f1baa712616222f2fc7d60d78c76c33= 113a04c5ef71d28cfe55b6247720bd902726f8e93ed64ae50a84f653c0f=C2=A0 lua-nginx= -module-0.10.1rc1.tar.gz
>=C2=A0 9883462a04683f1e7af175da04b86d259ff6d677864667588fb073143f713096= 9eb2a5a5a48ddceda7a555b908580f179bdcacb7f0111413d51db5bfe43b396e=C2=A0 ngin= x-rtmp-module-1.1.7.tar.gz
> -915954acf16a27fbd3c93c154012d38e864f1d8dfd51cde401bba26e46eb3e3c778ec= 4c92f4f8ed83ac001e96cee72765554d0e4da06acf6a4be5184b23b3657=C2=A0 nginx-dev= el-kit-0.2.19.tar.gz
>=C2=A0 09b110693e3f4377349ccea3c43cb8199c8579ee351eae34283299be99fdf764= b0c1bddd552e13e4d671b194501618b29c822e1ad53b34101a73a63954363dbb=C2=A0 ngin= x.logrotate
>=C2=A0 1ea032cf88021ec8aa1401d284ea738364511cdb9f8c01670deb8e59aae570f5= bbe17f0cbab73c0e08d6b342a621b6a9c014832168ed41f6028ecfa4211b60cf=C2=A0 ngin= x.initd
>=C2=A0 68d64a84568ec2df0366925ab282a05ebe21a85044b6c7844a47573cfd8cc8ed= 119cc772358bc3fff36e2d4fdf583a730592825f5f98632993ca86d1f8438d5f=C2=A0 ipv6= .patch"
>

-1. 1.9.x is mainline release, and we should track only stable = branch.

Bart=C5=82omiej


--001a11401c06c154b6052ce5fd6a-- --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---