update pcr/nginx-passenger

2 files changed, 30 insertions, 17 deletions

diff --git a/pcr/nginx-passenger/PKGBUILD b/pcr/nginx-passenger/PKGBUILD
index e6bfaa447..bbc8ecb04 100644
--- a/pcr/nginx-passenger/PKGBUILD
+++ b/pcr/nginx-passenger/PKGBUILD
@@ -1,15 +1,17 @@
 # $Id$
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
 # Maintainer (AUR): Tom Richards <tom@tomrichards.net>
-# Maintainer (Arch): Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
-# Maintainer (Arch): Sébastien Luttringer
-# Contributor (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor (Arch): Miroslaw Szot <mss@czlug.icis.pcz.pl>
-# Contributor (Arch): Daniel Micay <danielmicay@gmail.com>
+
+# Maintainer (Arch:nginx): Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
+# Maintainer (Arch:nginx): Sébastien Luttringer
+# Contributor (Arch:nginx): Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor (Arch:nginx): Miroslaw Szot <mss@czlug.icis.pcz.pl>
+# Contributor (Arch:nginx): Daniel Micay <danielmicay@gmail.com>
 
 pkgname=nginx-passenger
-_nginxver=1.8.1
-_passengerver=5.0.27
+_nginxver=1.10.2
+_passengerver=5.0.30
 pkgver=$_nginxver.passenger.$_passengerver
 pkgrel=1
 pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server'
@@ -17,7 +19,7 @@ pkgdesc+=" (with Passenger module)"
 conflicts=('nginx')
 provides=("nginx=$_nginxver")
 arch=('i686' 'x86_64')
-url='http://nginx.org'
+url='https://nginx.org'
 license=('custom')
 depends=('pcre' 'zlib' 'openssl' 'geoip')
 depends+=("passenger=$_passengerver")
@@ -34,14 +36,18 @@ backup=('etc/nginx/fastcgi.conf'
         'etc/nginx/win-utf'
         'etc/logrotate.d/nginx')
 install=nginx.install
-source=($url/download/nginx-$_nginxver.tar.gz
-        passenger-$_passengerver.tar.gz::https://github.com/phusion/passenger/archive/release-$_passengerver.tar.gz
+source=($url/download/nginx-$_nginxver.tar.gz{,.asc}
+        https://s3.amazonaws.com/phusion-passenger/releases/passenger-$_passengerver.tar.gz{,.asc}
         service
         logrotate)
-md5sums=('2e91695074dbdfbf1bcec0ada9fda462'
-         '58e204f52260d3c4afd8c81f252cefe7'
+validpgpkeys=('B0F4253373F8F6F510D42178520A9993A1C052F8') # Maxim Dounin <mdounin@mdounin.ru>
+validpgpkeys+=('D5F0851426939232F437AB722AC745A50A212A8C')
+md5sums=('e8f5f4beed041e63eb97f9f4f55f3085'
+         'SKIP'
+         '7ed9ebc8996368176789d92c1805fd1e'
+         'SKIP'
          '5dd4d09914a4403b9df778ec1d66167c'
-         '19a26a61c8afe78defb8b4544f79a9a0')
+         '83ffd315fed235b8fff40a7cfa23a16d')
 
 _common_flags=(
   --with-ipv6
@@ -58,19 +64,23 @@ _common_flags=(
   --with-http_mp4_module
   --with-http_realip_module
   --with-http_secure_link_module
+  --with-http_slice_module
   --with-http_ssl_module
   --with-http_stub_status_module
   --with-http_sub_module
+  --with-http_v2_module
+  --with-mail
+  --with-mail_ssl_module
+  --with-stream
+  --with-stream_ssl_module
+  --with-threads
 )
 
 _stable_flags=(
-  --with-http_spdy_module
-  --with-imap
-  --with-imap_ssl_module
 )
 
 build() {
-  cd "$srcdir/passenger-release-$_passengerver"
+  cd "$srcdir/passenger-$_passengerver"
   _nginx_addon_dir=$(bin/passenger-config --nginx-addon-dir)
 
   cd "$srcdir/nginx-$_nginxver"
@@ -130,3 +140,5 @@ package() {
       "${pkgdir}/usr/share/vim/vimfiles/${i}/nginx.vim"
   done
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/nginx-passenger/logrotate b/pcr/nginx-passenger/logrotate
index 61237601f..03812b688 100644
--- a/pcr/nginx-passenger/logrotate
+++ b/pcr/nginx-passenger/logrotate
@@ -1,5 +1,6 @@
 /var/log/nginx/*log {
 	missingok
+	notifempty
 	create 640 http log
 	su http log
 	sharedscripts