From 198443cbf8e1b16371673a0ba04bb036b09b88ca Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 17 Apr 2018 18:12:51 -0300 Subject: [PATCH] nginx: update to 1.14.0. Closes: #13563 [via git-merge-pr] --- srcpkgs/nginx/template | 53 ++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template index 48ee63003f9..8ce0c519505 100644 --- a/srcpkgs/nginx/template +++ b/srcpkgs/nginx/template @@ -1,34 +1,37 @@ # Template file for 'nginx' pkgname=nginx -version=1.12.2 -revision=2 -makedepends="pcre-devel libressl-devel $(vopt_if geoip geoip-devel)" +version=1.14.0 +revision=1 +makedepends="libressl-devel pcre-devel $(vopt_if geoip 'geoip-devel')" +short_desc="A high performance web and reverse proxy server" +maintainer="Juan RP " +license="BSD-2-Clause" +homepage="https://nginx.org" +distfiles="https://nginx.org/download/nginx-${version}.tar.gz" +checksum=5d15becbf69aba1fe33f8d416d97edd95ea8919ea9ac519eff9bafebb6022cb5 if [ "$CROSS_BUILD" ]; then # fake configure run on host hostmakedepends=$makedepends fi -conf_files=" - /etc/nginx/fastcgi.conf - /etc/nginx/fastcgi_params - /etc/nginx/koi-win - /etc/nginx/koi-utf - /etc/nginx/mime.types - /etc/nginx/nginx.conf - /etc/nginx/scgi_params - /etc/nginx/uwsgi_params - /etc/nginx/win-utf" +conf_files="/etc/nginx/fastcgi.conf + /etc/nginx/fastcgi_params + /etc/nginx/koi-win + /etc/nginx/koi-utf + /etc/nginx/mime.types + /etc/nginx/nginx.conf + /etc/nginx/scgi_params + /etc/nginx/uwsgi_params + /etc/nginx/win-utf" system_accounts="nginx" nginx_homedir="/var/tmp/nginx" -make_dirs=" - /var/log/nginx 0750 root root - /var/tmp 1777 root root - /var/tmp/nginx 0750 nginx root" -short_desc="A high performance web and reverse proxy server" -maintainer="Juan RP " -license="Simplified BSD" -homepage="https://nginx.org" -distfiles="https://nginx.org/download/nginx-$version.tar.gz" -checksum=305f379da1d5fb5aefa79e45c829852ca6983c7cd2a79328f8e084a324cf0416 +make_dirs="/var/log/nginx 0750 root root + /var/tmp 1777 root root + /var/tmp/nginx 0750 nginx root" + +if [ "$CROSS_BUILD" ]; then + # fake configure run on host + hostmakedepends+=" $makedepends" +fi build_options="geoip" build_options_default="geoip" @@ -56,8 +59,7 @@ do_configure() { --http-scgi-temp-path=${tmpdir}/scgi \ --http-uwsgi-temp-path=${tmpdir}/uwsgi \ --with-mail --with-mail_ssl_module \ - --with-ipv6 --with-pcre-jit \ - --with-file-aio \ + --with-pcre-jit --with-file-aio \ --with-http_gunzip_module \ --with-http_v2_module \ --with-http_dav_module \ @@ -79,6 +81,7 @@ do_configure() { do_build() { make ${makejobs} CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" } + do_install() { make DESTDIR=$DESTDIR install