[arch-commits] Commit in nginx-mainline/trunk (PKGBUILD nginx.install)

[Bartłomiej Piotrowski]

    Date: Sunday, January 15, 2017 @ 13:03:15
  Author: bpiotrowski
Revision: 286483

upgpkg: nginx-mainline 1.11.8-2

fix CVE-2016-1247

Modified:
  nginx-mainline/trunk/PKGBUILD
  nginx-mainline/trunk/nginx.install

---------------+
 PKGBUILD      |    4 ++--
 nginx.install |   22 +++-------------------
 2 files changed, 5 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-01-15 13:03:03 UTC (rev 286482)
+++ PKGBUILD	2017-01-15 13:03:15 UTC (rev 286483)
@@ -5,7 +5,7 @@
 
 pkgname=nginx-mainline
 pkgver=1.11.8
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server, mainline release'
 arch=('i686' 'x86_64')
 url='https://nginx.org'
@@ -104,7 +104,7 @@
   install -dm700 "$pkgdir"/var/lib/nginx/proxy
 
   chmod 750 "$pkgdir"/var/log/nginx
-  chown http:log "$pkgdir"/var/log/nginx
+  chown root:root "$pkgdir"/var/log/nginx
 
   install -d "$pkgdir"/usr/share/nginx
   mv "$pkgdir"/etc/nginx/html/ "$pkgdir"/usr/share/nginx

Modified: nginx.install
===================================================================
--- nginx.install	2017-01-15 13:03:03 UTC (rev 286482)
+++ nginx.install	2017-01-15 13:03:15 UTC (rev 286483)
@@ -1,21 +1,5 @@
 post_upgrade() {
-    if (( $(vercmp $2 1.2.7-4) <= 0 )); then
-        chmod 750 var/log/nginx
-        chown http:log var/log/nginx
-    fi
-    if (( $(vercmp $2 1.2.1-2) <= 0 )); then
-        echo ' >>> Since 1.2.1-2 several changes has been made in package:'
-        echo '      - *.conf files have been moved to /etc/nginx'
-        echo '      - /etc/conf.d/nginx has been removed'
-        echo '        Main configuration file is set to /etc/nginx/nginx.conf'
-        echo '      - access.log and error.log can be found in /var/log/nginx by default'
-        echo '      - bundled *.html files have been moved to /usr/share/nginx/html'
-        echo '      - /etc/nginx/{html,logs} symbolic links and *.default files have been removed'
-    fi
-    if (( $(vercmp $2 1.4.2-4) < 0 )); then
-        echo 'Nginx now includes only upstream bundled modules.'
-        echo 'Thus, passenger module support was dropped.'
-    fi
+  if (( $(vercmp $2 1.11.8-2) < 0)); then
+    chown root:root var/log/nginx
+  fi
 }
-
-# vim:set ts=4 sw=4 et: