Date: Monday, August 5, 2013 @ 22:01:16 Author: seblu Revision: 95117
- fix FS#36239 - update maintainers - comestics Modified: nginx/trunk/PKGBUILD nginx/trunk/logrotate -----------+ PKGBUILD | 51 ++++++++++++++++++++++++--------------------------- logrotate | 2 +- 2 files changed, 25 insertions(+), 28 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-08-05 19:08:49 UTC (rev 95116) +++ PKGBUILD 2013-08-05 20:01:16 UTC (rev 95117) @@ -1,31 +1,28 @@ # $Id$ -# Maintainer: Sergej Pupykin <[email protected]> -# Maintainer: Bartłomiej Piotrowski <[email protected]> +# Maintainer: Bartłomiej Piotrowski <[email protected]> +# Maintainer: Sébastien Luttringer +# Contributor: Sergej Pupykin <[email protected]> # Contributor: Miroslaw Szot <[email protected]> -# Contributor: Sébastien Luttringer -_cfgdir=/etc/nginx -_tmpdir=/var/lib/nginx - pkgbase=nginx pkgname=(nginx nginx-extra) pkgver=1.4.2 -pkgrel=1.1 +pkgrel=1.2 arch=('i686' 'x86_64') makedepends=('pcre' 'zlib' 'openssl' 'gd' 'geoip' 'passenger') url='http://nginx.org' license=('custom') install=nginx.install -backup=(${_cfgdir:1}/fastcgi.conf - ${_cfgdir:1}/fastcgi_params - ${_cfgdir:1}/koi-win - ${_cfgdir:1}/koi-utf - ${_cfgdir:1}/mime.types - ${_cfgdir:1}/nginx.conf - ${_cfgdir:1}/scgi_params - ${_cfgdir:1}/uwsgi_params - ${_cfgdir:1}/win-utf - etc/logrotate.d/nginx) +backup=('etc/nginx/fastcgi.conf' + 'etc/nginx/fastcgi_params' + 'etc/nginx/koi-win' + 'etc/nginx/koi-utf' + 'etc/nginx/mime.types' + 'etc/nginx/nginx.conf' + 'etc/nginx/scgi_params' + 'etc/nginx/uwsgi_params' + 'etc/nginx/win-utf' + 'etc/logrotate.d/nginx') source=("http://nginx.org/download/nginx-$pkgver.tar.gz"; 'http://web.iti.upv.es/~sto/nginx/ngx_http_auth_pam_module-1.2.tar.gz' 'service' @@ -33,11 +30,11 @@ sha256sums=('5361ffb7b0ebf8b1a04369bc3d1295eaed091680c1c58115f88d56c8e51f3611' '5a85970ba61a99f55a26d2536a11d512b39bbd622f5737d25a9a8c10db81efa9' '05fdc0c0483410944b988d7f4beabb00bec4a44a41bd13ebc9b78585da7d3f9b' - '9523a1fdd5eb61bf62f3049f6ee088b198e36d5edcce2d9b08bbeb2930aa5a16') + '272907d3213d69dac3bd6024d6d150caa23cb67d4f121e4171f34ba5581f9e98') _base_options=( - "--prefix=$_cfgdir" - "--conf-path=$_cfgdir/nginx.conf" + '--prefix=/etc/nginx' + '--conf-path=/etc/nginx/nginx.conf' '--sbin-path=/usr/bin/nginx' '--pid-path=/run/nginx.pid' '--lock-path=/run/lock/nginx.lock' @@ -45,11 +42,11 @@ '--group=http' '--http-log-path=/var/log/nginx/access.log' '--error-log-path=/var/log/nginx/error.log' - "--http-client-body-temp-path=$_tmpdir/client-body" - "--http-proxy-temp-path=$_tmpdir/proxy" - "--http-fastcgi-temp-path=$_tmpdir/fastcgi" - "--http-scgi-temp-path=$_tmpdir/scgi" - "--http-uwsgi-temp-path=$_tmpdir/uwsgi" + '--http-client-body-temp-path=/var/lib/nginx/client-body' + '--http-proxy-temp-path=/var/lib/nginx/proxy' + '--http-fastcgi-temp-path=/var/lib/nginx/fastcgi' + '--http-scgi-temp-path=/var/lib/nginx/scgi' + '--http-uwsgi-temp-path=/var/lib/nginx/uwsgi' '--with-imap' '--with-imap_ssl_module' '--with-ipv6' @@ -104,8 +101,8 @@ -i "$pkgdir"/etc/nginx/nginx.conf rm "$pkgdir"/etc/nginx/*.default - install -d "$pkgdir"/$_tmpdir - install -dm700 "$pkgdir"/$_tmpdir/proxy + install -d "$pkgdir"/var/lib/nginx + install -dm700 "$pkgdir"/var/lib/nginx/proxy chmod 750 "$pkgdir"/var/log/nginx chown http:log "$pkgdir"/var/log/nginx Modified: logrotate =================================================================== --- logrotate 2013-08-05 19:08:49 UTC (rev 95116) +++ logrotate 2013-08-05 20:01:16 UTC (rev 95117) @@ -4,6 +4,6 @@ sharedscripts compress postrotate - test -r /var/run/nginx.pid && kill -USR1 `cat /var/run/nginx.pid` + test ! -r /var/run/nginx.pid || kill -USR1 `cat /var/run/nginx.pid` endscript }
