upgpkg: tengine-extra 2.0.3-5

- Remove error_log option from daemon script to avoid duplication with conf file
+ Add http_sysguard_module as shared
* Adjust post install script to fix errors

3 files changed, 13 insertions, 5 deletions

diff --git a/PKGBUILD b/PKGBUILD
index d0a8cb20485b..607d4f3498d4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=tengine-extra
 pkgver=2.0.3
-pkgrel=4
+pkgrel=5
 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'
@@ -34,7 +34,7 @@ source=($url/download/tengine-$pkgver.tar.gz
         service
         logrotate)
 sha256sums=('ed024b6040e8f03df575fe7d7a9d274159e2543cd6854d89e173935e930fdfdb'
-            'acbd46c74a4caa55635855a033c0a37e0452194335259e7f827b24208199ad6a'
+            '7abffe0f1ba1ea4d6bd316350a03257cc840a9fbb2e1b640c11e0eb9351a9044'
             '245c23906db2a9642fed996ff969e127989a6dcae865c1dd8b422e23ebc94f42')
 
 build() {
@@ -79,7 +79,8 @@ build() {
         --with-http_flv_module=shared \
         --with-http_mp4_module=shared\
         --with-http_secure_link_module \
-        --with-http_sub_module=shared
+        --with-http_sub_module=shared \
+        --with-http_sysguard_module=shared
 
     make
 }
diff --git a/service b/service
index 4640c0548c3b..eee303472933 100644
--- a/service
+++ b/service
@@ -8,7 +8,7 @@ PIDFile=/run/tengine.pid
 PrivateDevices=yes
 SyslogLevel=err
 
-ExecStart=/usr/bin/tengine -g 'pid /run/tengine.pid; error_log stderr;'
+ExecStart=/usr/bin/tengine -g 'pid /run/tengine.pid;'
 ExecReload=/usr/bin/kill -HUP $MAINPID
 KillSignal=SIGQUIT
 KillMode=mixed
diff --git a/tengine.install b/tengine.install
index 61d05279315e..0e32ebaf1dd1 100644
--- a/tengine.install
+++ b/tengine.install
@@ -1,5 +1,12 @@
 post_upgrade() {
+    if [[ $(vercmp $2 1.4.3-3) -le 0 ]]; then
+        chmod 750 var/log/tengine
+        chown http:log var/log/tengine
+    fi
+
     if [[ $(vercmp $2 2.0.3-3) -le 0 ]]; then
-        rm /etc/tengine/sbin
+        if [ -f /etc/tengine/sbin ]; then
+            rm -rf /etc/tengine/sbin
+        fi
     fi
 }