[arch-commits] Commit in nginx-mainline/trunk (PKGBUILD logrotate service)

Bartłomiej Piotrowski bpiotrowski at archlinux.org
Mon Mar 27 11:00:35 UTC 2017


    Date: Monday, March 27, 2017 @ 11:00:34
  Author: bpiotrowski
Revision: 291722

upgpkg: nginx-mainline 1.11.12-1

- new upstream release
- add --with-compat to mainline flags
- sync service and logrotate with extra/nginx

Modified:
  nginx-mainline/trunk/PKGBUILD
  nginx-mainline/trunk/logrotate
  nginx-mainline/trunk/service

-----------+
 PKGBUILD  |   17 ++++++++---------
 logrotate |    2 +-
 service   |   13 ++++++++-----
 3 files changed, 17 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-03-27 10:47:28 UTC (rev 291721)
+++ PKGBUILD	2017-03-27 11:00:34 UTC (rev 291722)
@@ -4,8 +4,8 @@
 # Contributor: Drew DeVault
 
 pkgname=nginx-mainline
-pkgver=1.11.10
-pkgrel=2
+pkgver=1.11.12
+pkgrel=1
 pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server, mainline release'
 arch=('i686' 'x86_64')
 url='https://nginx.org'
@@ -29,10 +29,10 @@
         service
         logrotate)
 validpgpkeys=('B0F4253373F8F6F510D42178520A9993A1C052F8') # Maxim Dounin <mdounin at mdounin.ru>
-md5sums=('6fb10f579055d27a2240d51c7d85c190'
+md5sums=('c5ffbd7107c34bff4ac9446b59468e6a'
          'SKIP'
-         'ce9a06bcaf66ec4a3c4eb59b636e0dfd'
-         'd6a6d4d819f03a675bacdfabd25aa37e')
+         '09862c34cd9593bc40da81f88c5fc4b2'
+         '6a01fb17af86f03707c8ae60f98a2dc2')
 
 _common_flags=(
   --with-pcre-jit
@@ -61,6 +61,7 @@
 )
 
 _mainline_flags=(
+  --with-compat
   --with-stream_ssl_preread_module
   --with-stream_geoip_module
   --with-stream_realip_module
@@ -119,9 +120,7 @@
   gzip -9c man/nginx.8 > "$pkgdir"/usr/share/man/man8/nginx.8.gz
 
   for i in ftdetect indent syntax; do
-    install -Dm644 contrib/vim/${i}/nginx.vim \
-      "${pkgdir}/usr/share/vim/vimfiles/${i}/nginx.vim"
+    install -Dm644 contrib/vim/$i/nginx.vim \
+      "$pkgdir/usr/share/vim/vimfiles/$i/nginx.vim"
   done
 }
-
-# vim:set ts=2 sw=2 et:

Modified: logrotate
===================================================================
--- logrotate	2017-03-27 10:47:28 UTC (rev 291721)
+++ logrotate	2017-03-27 11:00:34 UTC (rev 291722)
@@ -5,6 +5,6 @@
 	sharedscripts
 	compress
 	postrotate
-		test ! -r /var/run/nginx.pid || kill -USR1 `cat /var/run/nginx.pid`
+		test ! -r /run/nginx.pid || kill -USR1 `cat /run/nginx.pid`
 	endscript
 }

Modified: service
===================================================================
--- service	2017-03-27 10:47:28 UTC (rev 291721)
+++ service	2017-03-27 11:00:34 UTC (rev 291722)
@@ -1,14 +1,17 @@
 [Unit]
 Description=A high performance web server and a reverse proxy server
-After=syslog.target network.target
+After=network.target
 
 [Service]
 Type=forking
 PIDFile=/run/nginx.pid
-ExecStartPre=/usr/bin/nginx -t -q -g 'pid /run/nginx.pid; daemon on; master_process on;'
-ExecStart=/usr/bin/nginx -g 'pid /run/nginx.pid; daemon on; master_process on;'
-ExecReload=/usr/bin/nginx -g 'pid /run/nginx.pid; daemon on; master_process on;' -s reload
-ExecStop=/usr/bin/nginx -g 'pid /run/nginx.pid;' -s quit
+PrivateDevices=yes
+SyslogLevel=err
 
+ExecStart=/usr/bin/nginx -g 'pid /run/nginx.pid; error_log stderr;'
+ExecReload=/usr/bin/nginx -s reload
+KillSignal=SIGQUIT
+KillMode=mixed
+
 [Install]
 WantedBy=multi-user.target


More information about the arch-commits mailing list