pkg: openresty: update to 1.9.7.4

prologin · Apr 9, 2016 · 294220d · 294220d
1 parent bf2baa4
commit 294220d
Showing 4 changed files with 43 additions and 38 deletions.
diff --git a/pkg/openresty/.gitignore b/pkg/openresty/.gitignore
@@ -0,0 +1,2 @@
+*.tar.gz
+*.tar.xz
diff --git a/pkg/openresty/Makefile b/pkg/openresty/Makefile
@@ -4,9 +4,9 @@ lua-resty-extra-lib.tar.gz:
 	make -C lua-resty-extra-lib clean all
 
 package: lua-resty-extra-lib.tar.gz
-	makepkg --clean
+	makepkg
 
 clean:
-	$(RM) -r src/ pkg/ ngx_openresty-*.tar.gz openresty-*.tar.gz openresty-*.tar.xz
+	$(RM) -r src/ pkg/ openresty-*.tar.gz openresty-*.tar.xz
 
-.PHONY: all package clean
+.PHONY: all package clean
diff --git a/pkg/openresty/PKGBUILD b/pkg/openresty/PKGBUILD
@@ -2,49 +2,49 @@
 # Contributor: James Cleveland <jc@blackflags.co.uk>
 # Contributor: Eimantas Bunevičius <eimantaster@gmail.com>
 
+_cfgdir=/etc/nginx
 pkgname=openresty
-_pkgname=ngx_openresty
-pkgver=1.7.10.1
-pkgrel=2
+pkgver=1.9.7.4
+pkgrel=1
 pkgdesc='A powerful web app server, extending nginx with lua scripting'
 arch=('i686' 'x86_64')
-url='http://openresty.org/'
+url='https://openresty.org/'
 license=('BSD')
-depends=('perl>=5.6.1' 'readline' 'zlib' 'openssl')
+depends=('perl>=5.6.1' 'readline' 'zlib' 'pcre' 'openssl')
 conflicts=('nginx')
-source=(http://openresty.org/download/$_pkgname-$pkgver.tar.gz
+source=(https://openresty.org/download/$pkgname-$pkgver.tar.gz
         lua-resty-extra-lib.tar.gz
         configure-add-lua-packages.patch
         service
         logrotate)
-md5sums=('1093b89459922634a818e05f80c1e18a'
+md5sums=('6e2d4a39c530524111ea50e3de67043a'
          'SKIP' # lua-resty-extra-lib.tar.gz is built at make time
          '58ae70888954db2c699b9be8caaedd19'
          'c2a322f02abade747228f4dd14b40f60'
          '19a26a61c8afe78defb8b4544f79a9a0')
-backup=('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'
+backup=('${_cfgdir:1}/fastcgi.conf'
+        '${_cfgdir:1}/fastcgi_params'
+        '${_cfgdir:1}/koi-win'
+        '${_cfgdir:1}/koi-utf'
+        '${_cfgdir:1}/mime.types'
+        '${_cfgdir:1}/nginx.conf'
+        '${_cfgdir:1}/scgi_params'
+        '${_cfgdir:1}/uwsgi_params'
+        '${_cfgdir:1}/win-utf'
         'etc/logrotate.d/nginx')
 
 prepare() {
-  cd "$srcdir/$_pkgname-$pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
   # patch configure to include lua_packages.tar.gz packages
   patch -Np1 -i "$srcdir"/configure-add-lua-packages.patch
 }
 
 build() {
-  cd "$srcdir/$_pkgname-$pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
 
   ./configure \
-    --prefix=/etc/nginx \
-    --conf-path=/etc/nginx/nginx.conf \
+    --prefix=${_cfgdir} \
+    --conf-path=${_cfgdir}/nginx.conf \
     --sbin-path=/usr/bin/nginx \
     --pid-path=/run/nginx.pid \
     --lock-path=/run/lock/nginx.lock \
@@ -57,31 +57,34 @@ build() {
     --http-fastcgi-temp-path=/var/lib/nginx/fastcgi \
     --http-scgi-temp-path=/var/lib/nginx/scgi \
     --http-uwsgi-temp-path=/var/lib/nginx/uwsgi \
-    --with-imap \
-    --with-imap_ssl_module \
-    --with-ipv6 \
-    --with-luajit \
-    --with-pcre-jit \
     --with-file-aio \
+    --with-http_addition_module \
     --with-http_dav_module \
+    --with-http_degradation_module \
+    --with-http_flv_module \
     --with-http_gunzip_module \
     --with-http_gzip_static_module \
+    --with-http_iconv_module \
+    --with-http_mp4_module \
     --with-http_realip_module \
-    --with-http_spdy_module \
+    --with-http_secure_link_module \
     --with-http_ssl_module \
     --with-http_stub_status_module \
-    --with-http_addition_module \
-    --with-http_degradation_module \
-    --with-http_flv_module \
-    --with-http_mp4_module \
-    --with-http_secure_link_module \
-    --with-http_sub_module
+    --with-http_sub_module \
+    --with-http_v2_module \
+    --with-imap \
+    --with-imap_ssl_module \
+    --with-ipv6 \
+    --with-luajit \
+    --with-pcre-jit \
+    --with-stream \
+    --with-stream_ssl_module \
 
   make -j$(nproc)
 }
 
 package() {
-  cd "$srcdir/$_pkgname-$pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
 
   rm "$pkgdir"/etc/nginx/*.default

diff --git a/pkg/openresty/lua-resty-extra-lib/Makefile b/pkg/openresty/lua-resty-extra-lib/Makefile
@@ -1,6 +1,6 @@
 LIBS_NAMES = cookie hmac http-simple
-PKGNAME = ngx_openresty
-PKGVER = 1.7.10.1
+PKGNAME = openresty
+PKGVER = 1.9.7.4
 DEST = ../lua-resty-extra-lib.tar.gz