diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-14 00:05:25 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-14 00:05:25 -0300 |
| commit | 598db82f25ffe3557e395a11f379de65af9e1ac1 (patch) | |
| tree | 25c3a9daab9b120705adf30fc5924b69538f7184 /community/nginx | |
| parent | 460c42fc8cd82ed4a7dda7031254c845cec5a9c3 (diff) | |
| parent | 29657877f6a02dbba1bd58b417b4ccd211939690 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/kdegraphics/PKGBUILD
extra/kdelibs/PKGBUILD
extra/kdemultimedia/PKGBUILD
kde-unstable/kdeaccessibility/PKGBUILD
kde-unstable/kdeadmin/PKGBUILD
kde-unstable/kdeartwork/PKGBUILD
kde-unstable/kdebase-konsole/PKGBUILD
kde-unstable/kdebase-runtime/PKGBUILD
kde-unstable/kdebase-workspace/PKGBUILD
kde-unstable/kdebase/PKGBUILD
kde-unstable/kdebindings-kimono/PKGBUILD
kde-unstable/kdebindings-korundum/PKGBUILD
kde-unstable/kdebindings-kross/PKGBUILD
kde-unstable/kdebindings-perlkde/PKGBUILD
kde-unstable/kdebindings-perlqt/PKGBUILD
kde-unstable/kdebindings-python/PKGBUILD
kde-unstable/kdebindings-qtruby/PKGBUILD
kde-unstable/kdebindings-qyoto/PKGBUILD
kde-unstable/kdebindings-smokegen/PKGBUILD
kde-unstable/kdebindings-smokekde/PKGBUILD
kde-unstable/kdebindings-smokeqt/PKGBUILD
kde-unstable/kdeedu-blinken/PKGBUILD
kde-unstable/kdeedu-cantor/PKGBUILD
kde-unstable/kdeedu-kalgebra/PKGBUILD
kde-unstable/kdeedu-kalzium/PKGBUILD
kde-unstable/kdeedu-kanagram/PKGBUILD
kde-unstable/kdeedu-kbruch/PKGBUILD
kde-unstable/kdeedu-kgeography/PKGBUILD
kde-unstable/kdeedu-khangman/PKGBUILD
kde-unstable/kdeedu-kig/PKGBUILD
kde-unstable/kdeedu-kiten/PKGBUILD
kde-unstable/kdeedu-klettres/PKGBUILD
kde-unstable/kdeedu-kmplot/PKGBUILD
kde-unstable/kdeedu-kstars/PKGBUILD
kde-unstable/kdeedu-ktouch/PKGBUILD
kde-unstable/kdeedu-kturtle/PKGBUILD
kde-unstable/kdeedu-kwordquiz/PKGBUILD
kde-unstable/kdeedu-marble/PKGBUILD
kde-unstable/kdeedu-parley/PKGBUILD
kde-unstable/kdeedu-rocs/PKGBUILD
kde-unstable/kdeedu-step/PKGBUILD
kde-unstable/kdegames/PKGBUILD
kde-unstable/kdegraphics-gwenview/PKGBUILD
kde-unstable/kdegraphics-kamera/PKGBUILD
kde-unstable/kdegraphics-kcolorchooser/PKGBUILD
kde-unstable/kdegraphics-kgamma/PKGBUILD
kde-unstable/kdegraphics-kolourpaint/PKGBUILD
kde-unstable/kdegraphics-kruler/PKGBUILD
kde-unstable/kdegraphics-ksaneplugin/PKGBUILD
kde-unstable/kdegraphics-ksnapshot/PKGBUILD
kde-unstable/kdegraphics-okular/PKGBUILD
kde-unstable/kdegraphics-strigi-analyzer/PKGBUILD
kde-unstable/kdegraphics-svgpart/PKGBUILD
kde-unstable/kdegraphics-thumbnailers/PKGBUILD
kde-unstable/kdelibs/PKGBUILD
kde-unstable/kdemultimedia/PKGBUILD
kde-unstable/kdenetwork/PKGBUILD
kde-unstable/kdepim-runtime/PKGBUILD
kde-unstable/kdepim/PKGBUILD
kde-unstable/kdepimlibs/PKGBUILD
kde-unstable/kdeplasma-addons/PKGBUILD
kde-unstable/kdesdk-kate/PKGBUILD
kde-unstable/kdesdk/PKGBUILD
kde-unstable/kdetoys/PKGBUILD
kde-unstable/kdeutils/PKGBUILD
kde-unstable/kdewebdev/PKGBUILD
kde-unstable/libkdcraw/PKGBUILD
kde-unstable/libkdeedu/PKGBUILD
kde-unstable/libkexiv2/PKGBUILD
kde-unstable/libkipi/PKGBUILD
kde-unstable/libksane/PKGBUILD
Diffstat (limited to 'community/nginx')
| -rw-r--r-- | community/nginx/PKGBUILD | 6 | ||||
| -rw-r--r-- | community/nginx/nginx | 10 |
2 files changed, 10 insertions, 6 deletions
diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index e998b7606..2d70d9449 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 48812 2011-06-06 11:51:15Z spupykin $ +# $Id: PKGBUILD 51647 2011-07-12 14:13:55Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl> @@ -12,7 +12,7 @@ _group=http pkgname=nginx pkgver=1.0.4 -pkgrel=1 +pkgrel=2 pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server" arch=('i686' 'x86_64' 'mips64el') depends=('pcre' 'zlib' 'openssl') @@ -28,7 +28,7 @@ backup=("etc/nginx/conf/nginx.conf" source=(http://sysoev.ru/nginx/nginx-${pkgver}.tar.gz nginx) md5sums=('d23f6e6b07b57ac061e790b1ed64bb98' - '837b010afcbdfe82d8e65ef00c4e14ba') + '7e7cafa43a59762b81c4da64e49eca69') build() { cd $srcdir/nginx-${pkgver} diff --git a/community/nginx/nginx b/community/nginx/nginx index 2d5a02a47..811656eed 100644 --- a/community/nginx/nginx +++ b/community/nginx/nginx @@ -41,12 +41,16 @@ case "$1" in ;; stop) stat_busy "Stopping Nginx" - kill -QUIT `cat /var/run/nginx.pid` &>/dev/null + NGINX_PID=`cat /var/run/nginx.pid` + kill -QUIT $NGINX_PID &>/dev/null if [ $? -ne 0 ]; then stat_fail else - rm_daemon nginx - stat_done + for i in `seq 1 10`; do + [ -d /proc/$NGINX_PID ] || { stat_done; rm_daemon nginx; exit 0; } + sleep 1 + done + stat_fail fi ;; restart) |