diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-05 11:13:43 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-05 11:13:43 -0300 |
| commit | 58d6937e71aea203f6693a68146018f950922fbc (patch) | |
| tree | 3b53b76f930f60717debca5e0d612eeab0279b39 /community/nginx | |
| parent | d07d53d7af1e9694d9558783841bc2df3124a90f (diff) | |
| parent | f651180e6b1ac9508ec0d1d9b94972de776020a9 (diff) | |
I don't understand gcc/PKGBUILD.mips64el
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/addresses/PKGBUILD
community/chmsee/PKGBUILD
community/coin/PKGBUILD
community/critterding/PKGBUILD
community/distcc/PKGBUILD
community/djview4/PKGBUILD
community/freedroid/PKGBUILD
community/gnumail/PKGBUILD
community/gyachi/PKGBUILD
community/java-oracle/PKGBUILD
community/liboop/PKGBUILD
community/ltris/PKGBUILD
community/nepim/PKGBUILD
community/pantomime/PKGBUILD
community/pyxattr/PKGBUILD
community/soqt/PKGBUILD
community/tilda/PKGBUILD
community/unrealircd/PKGBUILD
community/uqm/PKGBUILD
core/dnsutils/PKGBUILD
core/gcc/PKGBUILD.mips64el
core/vpnc/PKGBUILD
extra/apache/PKGBUILD
extra/bind/PKGBUILD
extra/bzflag/PKGBUILD
extra/ccache/PKGBUILD
extra/claws-mail-extra-plugins/PKGBUILD
extra/clutter-gst/PKGBUILD
extra/cups/PKGBUILD
extra/doxygen/PKGBUILD
extra/fam/PKGBUILD
extra/fcitx/PKGBUILD
extra/gdk-pixbuf2/PKGBUILD
extra/geoip/PKGBUILD
extra/gtk2/PKGBUILD
extra/icedtea-web/PKGBUILD
extra/libffi/PKGBUILD
extra/libfwbuilder/PKGBUILD
extra/libmpd/PKGBUILD
extra/libreoffice/PKGBUILD
extra/mesa/PKGBUILD
extra/pygobject2/PKGBUILD
extra/qt/PKGBUILD
extra/samba/PKGBUILD
extra/wireshark/PKGBUILD
extra/xulrunner/PKGBUILD
multilib-testing/lib32-keyutils/PKGBUILD
multilib-testing/lib32-udev/PKGBUILD
multilib/lib32-gtk2/PKGBUILD
multilib/lib32-keyutils/PKGBUILD
multilib/lib32-libcups/PKGBUILD
multilib/lib32-qt/PKGBUILD
multilib/wine/PKGBUILD
multilib/wine_gecko/PKGBUILD
testing/dash/PKGBUILD
testing/libssh2/PKGBUILD
Diffstat (limited to 'community/nginx')
| -rw-r--r-- | community/nginx/PKGBUILD | 32 | ||||
| -rw-r--r-- | community/nginx/changelog | 4 | ||||
| -rw-r--r-- | community/nginx/nginx | 2 |
3 files changed, 25 insertions, 13 deletions
diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index 7ac0ed128..42d66e024 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 52187 2011-07-21 14:19:08Z spupykin $ +# $Id: PKGBUILD 55082 2011-09-02 09:21:05Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl> -_doc_root=/srv/http/nginx +_doc_root=/usr/share/nginx/http _server_root=/etc/nginx _conf_path=${_server_root}/conf _tmp_path=/var/spool/nginx @@ -11,24 +11,31 @@ _user=http _group=http pkgname=nginx -pkgver=1.0.5 -pkgrel=1 +pkgver=1.0.6 +pkgrel=3 pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server" arch=('i686' 'x86_64' 'mips64el') depends=('pcre' 'zlib' 'openssl') +makedepends=('passenger') +optdepends=('passenger') url="http://nginx.org" license=('custom') -backup=("etc/nginx/conf/nginx.conf" +backup=("etc/nginx/conf/fastcgi.conf" + "etc/nginx/conf/fastcgi_params" "etc/nginx/conf/koi-win" "etc/nginx/conf/koi-utf" - "etc/nginx/conf/win-utf" "etc/nginx/conf/mime.types" - "etc/nginx/conf/fastcgi_params" - "etc/logrotate.d/nginx") -source=(http://sysoev.ru/nginx/nginx-${pkgver}.tar.gz + "etc/nginx/conf/nginx.conf" + "etc/nginx/conf/scgi_params" + "etc/nginx/conf/uwsgi_params" + "etc/nginx/conf/win-utf" + "etc/logrotate.d/nginx" + "etc/conf.d/nginx") +changelog=changelog +source=(http://nginx.org/download/nginx-$pkgver.tar.gz nginx) -md5sums=('373c7761a7c682b92b164c8ee3d6d243' - '7e7cafa43a59762b81c4da64e49eca69') +md5sums=('bc98bac3f0b85da1045bc02e6d8fc80d' + '0e8032d3ba26c3276e8c7c30588d375f') build() { cd $srcdir/nginx-${pkgver} @@ -47,7 +54,8 @@ build() { --with-http_stub_status_module \ --with-http_dav_module \ --with-http_gzip_static_module \ - --with-ipv6 + --with-ipv6 \ + --add-module=/usr/lib/passenger/ext/nginx make } diff --git a/community/nginx/changelog b/community/nginx/changelog new file mode 100644 index 000000000..9f2ffcfc8 --- /dev/null +++ b/community/nginx/changelog @@ -0,0 +1,4 @@ +2011-08-29 Sergej Pupykin <sergej@p5n.pp.ru> + + * 1.0.6-1 : + move /srv/http to /usr/share/nginx/http diff --git a/community/nginx/nginx b/community/nginx/nginx index 811656eed..9de10e99a 100644 --- a/community/nginx/nginx +++ b/community/nginx/nginx @@ -41,7 +41,7 @@ case "$1" in ;; stop) stat_busy "Stopping Nginx" - NGINX_PID=`cat /var/run/nginx.pid` + NGINX_PID=`cat /var/run/nginx.pid 2>/dev/null` kill -QUIT $NGINX_PID &>/dev/null if [ $? -ne 0 ]; then stat_fail |