updpkg: tengine-extra 2.2.2-1

3 files changed, 18 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 710c7158cc43..195ba9e37536 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Thu Sep 28 05:38:15 UTC 2017
+# Sat Jan 27 17:32:12 UTC 2018
 pkgbase = tengine-extra
 	pkgdesc = A web server based on Nginx and has many advanced features, originated by Taobao. Some extra modules enabled.
-	pkgver = 2.2.1
+	pkgver = 2.2.2
 	pkgrel = 1
 	url = http://tengine.taobao.org
 	install = tengine.install
@@ -13,9 +13,10 @@ pkgbase = tengine-extra
 	makedepends = git
 	depends = pcre
 	depends = zlib
-	depends = openssl-1.0
+	depends = openssl
 	depends = gperftools
 	depends = geoip
+	depends = mailcap
 	optdepends = lua51: needed by http_lua_module
 	optdepends = memcached: needed by http_memcached_module
 	provides = nginx
@@ -25,17 +26,16 @@ pkgbase = tengine-extra
 	backup = etc/tengine/fastcgi_params
 	backup = etc/tengine/koi-win
 	backup = etc/tengine/koi-utf
-	backup = etc/tengine/mime.types
 	backup = etc/tengine/tengine.conf
 	backup = etc/tengine/scgi_params
 	backup = etc/tengine/uwsgi_params
 	backup = etc/tengine/win-utf
 	backup = etc/logrotate.d/tengine
-	source = http://tengine.taobao.org/download/tengine-2.2.1.tar.gz
+	source = http://tengine.taobao.org/download/tengine-2.2.2.tar.gz
 	source = service
 	source = logrotate
-	sha256sums = 1d164fdbc4d460cce5f202de332447556ec9439016fa33ceddc736acfaa53be2
-	sha256sums = 7abffe0f1ba1ea4d6bd316350a03257cc840a9fbb2e1b640c11e0eb9351a9044
+	sha256sums = f27e9891d4f37d265648963e3af9a78d10f143fa92453263bc533cadf4b2d846
+	sha256sums = bbc2a744fcc65b496549a312a19aba2ee87840ad36a523c2e6bc2a585861bbcd
 	sha256sums = 7d4bd60b9210e1dfb46bc52c344b069d5639e1ba08cd9951c0563360af238f97
 
 pkgname = tengine-extra
diff --git a/PKGBUILD b/PKGBUILD
index bffdaac9453c..918537bfbad5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,19 +7,18 @@
 
 _tcp_module_gitname=nginx_tcp_proxy_module
 pkgname=tengine-extra
-pkgver=2.2.1
+pkgver=2.2.2
 pkgrel=1
 pkgdesc='A web server based on Nginx and has many advanced features, originated by Taobao. Some extra modules enabled.'
 arch=('i686' 'x86_64')
 url='http://tengine.taobao.org'
 license=('custom')
-depends=('pcre' 'zlib' 'openssl-1.0' 'gperftools' 'geoip')
+depends=('pcre' 'zlib' 'openssl' 'gperftools' 'geoip' 'mailcap')
 makedepends=('lua51' 'git')
 backup=('etc/tengine/fastcgi.conf'
         'etc/tengine/fastcgi_params'
         'etc/tengine/koi-win'
         'etc/tengine/koi-utf'
-        'etc/tengine/mime.types'
         'etc/tengine/tengine.conf'
         'etc/tengine/scgi_params'
         'etc/tengine/uwsgi_params'
@@ -35,8 +34,8 @@ source=($url/download/tengine-$pkgver.tar.gz
         service
         logrotate
         )
-sha256sums=('1d164fdbc4d460cce5f202de332447556ec9439016fa33ceddc736acfaa53be2'
-            '7abffe0f1ba1ea4d6bd316350a03257cc840a9fbb2e1b640c11e0eb9351a9044'
+sha256sums=('f27e9891d4f37d265648963e3af9a78d10f143fa92453263bc533cadf4b2d846'
+            'bbc2a744fcc65b496549a312a19aba2ee87840ad36a523c2e6bc2a585861bbcd'
             '7d4bd60b9210e1dfb46bc52c344b069d5639e1ba08cd9951c0563360af238f97')
 
 prepare() {
@@ -66,8 +65,6 @@ build() {
         --dso-tool-path=/usr/bin/dso_tool \
         --pid-path=/run/tengine.pid \
         --lock-path=/run/lock/tengine.lock \
-        --with-cc-opt="-I/usr/include/openssl-1.0" \
-        --with-ld-opt="-L/usr/lib/openssl-1.0" \
         --user=http \
         --group=http \
         --http-log-path=/var/log/tengine/access.log \
@@ -112,17 +109,19 @@ package() {
     make DESTDIR="$pkgdir" dso_install
 
     install -Dm644 contrib/vim/ftdetect/nginx.vim \
-      "$pkgdir"/usr/share/vim/vimfiles/ftdetect/nginx.vim
+      "$pkgdir"/usr/share/vim/vimfiles/ftdetect/tengine.vim
     install -Dm644 contrib/vim/syntax/nginx.vim \
-      "$pkgdir"/usr/share/vim/vimfiles/syntax/nginx.vim
+      "$pkgdir"/usr/share/vim/vimfiles/syntax/tengine.vim
     install -Dm644 contrib/vim/indent/nginx.vim \
-      "$pkgdir"/usr/share/vim/vimfiles/indent/nginx.vim
+      "$pkgdir"/usr/share/vim/vimfiles/indent/tengine.vim
 
     sed -e 's|\<user\s\+\w\+;|user html;|g' \
         -e '44s|html|/usr/share/tengine/html|' \
         -e '54s|html|/usr/share/tengine/html|' \
         -i "$pkgdir"/etc/tengine/tengine.conf
     rm "$pkgdir"/etc/tengine/*.default
+    rm "$pkgdir"/etc/tengine/mime.types # in mailcap
+    ln -s /etc/nginx/mime.types "$pkgdir"/etc/tengine/mime.types # from mailcap
 
     install -d "$pkgdir"/var/lib/tengine
     install -dm700 "$pkgdir"/var/lib/tengine/proxy
diff --git a/service b/service
index eee303472933..90210a2b2489 100644
--- a/service
+++ b/service
@@ -1,6 +1,6 @@
 [Unit]
 Description=A web server based on Nginx and has many advanced features
-After=network.target
+After=network.target network-online.target nss-lookup.target
 
 [Service]
 Type=forking
@@ -9,8 +9,7 @@ PrivateDevices=yes
 SyslogLevel=err
 
 ExecStart=/usr/bin/tengine -g 'pid /run/tengine.pid;'
-ExecReload=/usr/bin/kill -HUP $MAINPID
-KillSignal=SIGQUIT
+ExecReload=/usr/bin/tengine -s reload
 KillMode=mixed
 
 [Install]