[arch-commits] Commit in nginx/repos (16 files)

Bartłomiej Piotrowski bpiotrowski at nymeria.archlinux.org
Sun May 12 02:32:22 EDT 2013


    Date: Sunday, May 12, 2013 @ 08:32:22
  Author: bpiotrowski
Revision: 90389

archrelease: copy trunk to community-i686, community-x86_64

Added:
  nginx/repos/community-i686/PKGBUILD
    (from rev 90388, nginx/trunk/PKGBUILD)
  nginx/repos/community-i686/logrotate
    (from rev 90388, nginx/trunk/logrotate)
  nginx/repos/community-i686/nginx.install
    (from rev 90388, nginx/trunk/nginx.install)
  nginx/repos/community-i686/service
    (from rev 90388, nginx/trunk/service)
  nginx/repos/community-x86_64/PKGBUILD
    (from rev 90388, nginx/trunk/PKGBUILD)
  nginx/repos/community-x86_64/logrotate
    (from rev 90388, nginx/trunk/logrotate)
  nginx/repos/community-x86_64/nginx.install
    (from rev 90388, nginx/trunk/nginx.install)
  nginx/repos/community-x86_64/service
    (from rev 90388, nginx/trunk/service)
Deleted:
  nginx/repos/community-i686/PKGBUILD
  nginx/repos/community-i686/logrotate
  nginx/repos/community-i686/nginx.install
  nginx/repos/community-i686/service
  nginx/repos/community-x86_64/PKGBUILD
  nginx/repos/community-x86_64/logrotate
  nginx/repos/community-x86_64/nginx.install
  nginx/repos/community-x86_64/service

--------------------------------+
 /PKGBUILD                      |  204 +++++++++++++++++++++++++++++++++++++++
 /logrotate                     |   18 +++
 /nginx.install                 |   30 +++++
 /service                       |   28 +++++
 community-i686/PKGBUILD        |  102 -------------------
 community-i686/logrotate       |    9 -
 community-i686/nginx.install   |   15 --
 community-i686/service         |   14 --
 community-x86_64/PKGBUILD      |  102 -------------------
 community-x86_64/logrotate     |    9 -
 community-x86_64/nginx.install |   15 --
 community-x86_64/service       |   14 --
 12 files changed, 280 insertions(+), 280 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2013-05-12 06:32:07 UTC (rev 90388)
+++ community-i686/PKGBUILD	2013-05-12 06:32:22 UTC (rev 90389)
@@ -1,102 +0,0 @@
-# $Id$
-# Maintainer:  Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Maintainer:  Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
-# Contributor: Miroslaw Szot <mss at czlug.icis.pcz.pl>
-
-_cfgdir=/etc/nginx
-_tmpdir=/var/lib/nginx
-
-pkgname=nginx
-pkgver=1.4.1
-pkgrel=1
-pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server'
-arch=('i686' 'x86_64')
-depends=('pcre' 'zlib' 'openssl' 'geoip')
-makedepends=('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)
-source=(http://nginx.org/download/nginx-$pkgver.tar.gz
-		service
-		logrotate)
-sha256sums=('bca5d1e89751ba29406185e1736c390412603a7e6b604f5b4575281f6565d119'
-            '77da8ce4d8378048606a25e09270ee187d6b226ee750b6cb4313af5549f5156a'
-            '9523a1fdd5eb61bf62f3049f6ee088b198e36d5edcce2d9b08bbeb2930aa5a16')
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-
-	./configure \
-        --prefix=$_cfgdir \
-        --conf-path=$_cfgdir/nginx.conf \
-        --sbin-path=/usr/sbin/nginx \
-        --pid-path=/var/run/nginx.pid \
-        --lock-path=/var/lock/nginx.lock \
-        --user=http --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 \
-        --with-imap --with-imap_ssl_module \
-        --with-ipv6 --with-pcre-jit \
-        --with-file-aio \
-        --with-http_dav_module \
-        --with-http_geoip_module \
-        --with-http_gunzip_module \
-        --with-http_gzip_static_module \
-        --with-http_realip_module \
-        --with-http_spdy_module \
-        --with-http_ssl_module \
-        --with-http_stub_status_module \
-        --add-module=/usr/lib/passenger/ext/nginx \
-        #--with-http_mp4_module \
-        #--with-http_addition_module \
-        #--with-http_xslt_module \
-        #--with-http_image_filter_module \
-        #--with-http_sub_module \
-        #--with-http_flv_module \
-        #--with-http_random_index_module \
-        #--with-http_secure_link_module \
-        #--with-http_degradation_module \
-        #--with-http_perl_module \
-
-	make
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install
-
-	sed -e 's|\<user\s\+\w\+;|user html;|g' \
-		-e '44s|html|/usr/share/nginx/html|' \
-		-e '54s|html|/usr/share/nginx/html|' \
-		-i "$pkgdir"/etc/nginx/nginx.conf
-	rm "$pkgdir"/etc/nginx/*.default
-
-	install -d "$pkgdir"/$_tmpdir
-	install -dm700 "$pkgdir"/$_tmpdir/proxy
-
-	chmod 750 "$pkgdir"/var/log/nginx
-	chown http:log "$pkgdir"/var/log/nginx
-
-	install -d "$pkgdir"/usr/share/nginx
-	mv "$pkgdir"/etc/nginx/html/ "$pkgdir"/usr/share/nginx
-
-	install -Dm644 "$srcdir"/logrotate "$pkgdir"/etc/logrotate.d/nginx
-	install -Dm644 "$srcdir"/service "$pkgdir"/usr/lib/systemd/system/nginx.service
-	install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/nginx/LICENSE
-	rm -rf "$pkgdir"/var/run
-}

Copied: nginx/repos/community-i686/PKGBUILD (from rev 90388, nginx/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2013-05-12 06:32:22 UTC (rev 90389)
@@ -0,0 +1,102 @@
+# $Id$
+# Maintainer:  Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer:  Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
+# Contributor: Miroslaw Szot <mss at czlug.icis.pcz.pl>
+
+_cfgdir=/etc/nginx
+_tmpdir=/var/lib/nginx
+
+pkgname=nginx
+pkgver=1.4.1
+pkgrel=2
+pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server'
+arch=('i686' 'x86_64')
+depends=('pcre' 'zlib' 'openssl' 'geoip')
+makedepends=('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)
+source=(http://nginx.org/download/nginx-$pkgver.tar.gz
+		service
+		logrotate)
+sha256sums=('bca5d1e89751ba29406185e1736c390412603a7e6b604f5b4575281f6565d119'
+            '05fdc0c0483410944b988d7f4beabb00bec4a44a41bd13ebc9b78585da7d3f9b'
+            '9523a1fdd5eb61bf62f3049f6ee088b198e36d5edcce2d9b08bbeb2930aa5a16')
+
+build() {
+	cd "$srcdir"/$pkgname-$pkgver
+
+	./configure \
+        --prefix=$_cfgdir \
+        --conf-path=$_cfgdir/nginx.conf \
+        --sbin-path=/usr/bin/nginx \
+        --pid-path=/var/run/nginx.pid \
+        --lock-path=/var/lock/nginx.lock \
+        --user=http --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 \
+        --with-imap --with-imap_ssl_module \
+        --with-ipv6 --with-pcre-jit \
+        --with-file-aio \
+        --with-http_dav_module \
+        --with-http_geoip_module \
+        --with-http_gunzip_module \
+        --with-http_gzip_static_module \
+        --with-http_realip_module \
+        --with-http_spdy_module \
+        --with-http_ssl_module \
+        --with-http_stub_status_module \
+        --add-module=/usr/lib/passenger/ext/nginx \
+        #--with-http_mp4_module \
+        #--with-http_addition_module \
+        #--with-http_xslt_module \
+        #--with-http_image_filter_module \
+        #--with-http_sub_module \
+        #--with-http_flv_module \
+        #--with-http_random_index_module \
+        #--with-http_secure_link_module \
+        #--with-http_degradation_module \
+        #--with-http_perl_module \
+
+	make
+}
+
+package() {
+	cd "$srcdir"/$pkgname-$pkgver
+	make DESTDIR="$pkgdir" install
+
+	sed -e 's|\<user\s\+\w\+;|user html;|g' \
+		-e '44s|html|/usr/share/nginx/html|' \
+		-e '54s|html|/usr/share/nginx/html|' \
+		-i "$pkgdir"/etc/nginx/nginx.conf
+	rm "$pkgdir"/etc/nginx/*.default
+
+	install -d "$pkgdir"/$_tmpdir
+	install -dm700 "$pkgdir"/$_tmpdir/proxy
+
+	chmod 750 "$pkgdir"/var/log/nginx
+	chown http:log "$pkgdir"/var/log/nginx
+
+	install -d "$pkgdir"/usr/share/nginx
+	mv "$pkgdir"/etc/nginx/html/ "$pkgdir"/usr/share/nginx
+
+	install -Dm644 "$srcdir"/logrotate "$pkgdir"/etc/logrotate.d/nginx
+	install -Dm644 "$srcdir"/service "$pkgdir"/usr/lib/systemd/system/nginx.service
+	install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/nginx/LICENSE
+	rm -rf "$pkgdir"/var/run
+}

Deleted: community-i686/logrotate
===================================================================
--- community-i686/logrotate	2013-05-12 06:32:07 UTC (rev 90388)
+++ community-i686/logrotate	2013-05-12 06:32:22 UTC (rev 90389)
@@ -1,9 +0,0 @@
-/var/log/nginx/*log {
-	missingok
-	create 640 http log
-	sharedscripts
-	compress
-	postrotate
-		test -r /var/run/nginx.pid && kill -USR1 `cat /var/run/nginx.pid`
-	endscript
-}

Copied: nginx/repos/community-i686/logrotate (from rev 90388, nginx/trunk/logrotate)
===================================================================
--- community-i686/logrotate	                        (rev 0)
+++ community-i686/logrotate	2013-05-12 06:32:22 UTC (rev 90389)
@@ -0,0 +1,9 @@
+/var/log/nginx/*log {
+	missingok
+	create 640 http log
+	sharedscripts
+	compress
+	postrotate
+		test -r /var/run/nginx.pid && kill -USR1 `cat /var/run/nginx.pid`
+	endscript
+}

Deleted: community-i686/nginx.install
===================================================================
--- community-i686/nginx.install	2013-05-12 06:32:07 UTC (rev 90388)
+++ community-i686/nginx.install	2013-05-12 06:32:22 UTC (rev 90389)
@@ -1,15 +0,0 @@
-post_upgrade() {
-    if [[ $(vercmp $2 1.2.7-4) -le 0 ]]; then
-        chmod 750 var/log/nginx
-        chown http:log var/log/nginx
-    fi
-    if [[ $(vercmp $2 1.2.1-2) -le 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
-}

Copied: nginx/repos/community-i686/nginx.install (from rev 90388, nginx/trunk/nginx.install)
===================================================================
--- community-i686/nginx.install	                        (rev 0)
+++ community-i686/nginx.install	2013-05-12 06:32:22 UTC (rev 90389)
@@ -0,0 +1,15 @@
+post_upgrade() {
+    if [[ $(vercmp $2 1.2.7-4) -le 0 ]]; then
+        chmod 750 var/log/nginx
+        chown http:log var/log/nginx
+    fi
+    if [[ $(vercmp $2 1.2.1-2) -le 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
+}

Deleted: community-i686/service
===================================================================
--- community-i686/service	2013-05-12 06:32:07 UTC (rev 90388)
+++ community-i686/service	2013-05-12 06:32:22 UTC (rev 90389)
@@ -1,14 +0,0 @@
-[Unit]
-Description=A high performance web server and a reverse proxy server
-After=syslog.target network.target
-
-[Service]
-Type=forking
-PIDFile=/run/nginx.pid
-ExecStartPre=/usr/sbin/nginx -t -q -g 'pid /run/nginx.pid; daemon on; master_process on;'
-ExecStart=/usr/sbin/nginx -g 'pid /run/nginx.pid; daemon on; master_process on;'
-ExecReload=/usr/sbin/nginx -g 'pid /run/nginx.pid; daemon on; master_process on;' -s reload
-ExecStop=/usr/sbin/nginx -g 'pid /run/nginx.pid;' -s quit
-
-[Install]
-WantedBy=multi-user.target

Copied: nginx/repos/community-i686/service (from rev 90388, nginx/trunk/service)
===================================================================
--- community-i686/service	                        (rev 0)
+++ community-i686/service	2013-05-12 06:32:22 UTC (rev 90389)
@@ -0,0 +1,14 @@
+[Unit]
+Description=A high performance web server and a reverse proxy server
+After=syslog.target 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
+
+[Install]
+WantedBy=multi-user.target

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2013-05-12 06:32:07 UTC (rev 90388)
+++ community-x86_64/PKGBUILD	2013-05-12 06:32:22 UTC (rev 90389)
@@ -1,102 +0,0 @@
-# $Id$
-# Maintainer:  Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Maintainer:  Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
-# Contributor: Miroslaw Szot <mss at czlug.icis.pcz.pl>
-
-_cfgdir=/etc/nginx
-_tmpdir=/var/lib/nginx
-
-pkgname=nginx
-pkgver=1.4.1
-pkgrel=1
-pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server'
-arch=('i686' 'x86_64')
-depends=('pcre' 'zlib' 'openssl' 'geoip')
-makedepends=('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)
-source=(http://nginx.org/download/nginx-$pkgver.tar.gz
-		service
-		logrotate)
-sha256sums=('bca5d1e89751ba29406185e1736c390412603a7e6b604f5b4575281f6565d119'
-            '77da8ce4d8378048606a25e09270ee187d6b226ee750b6cb4313af5549f5156a'
-            '9523a1fdd5eb61bf62f3049f6ee088b198e36d5edcce2d9b08bbeb2930aa5a16')
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-
-	./configure \
-        --prefix=$_cfgdir \
-        --conf-path=$_cfgdir/nginx.conf \
-        --sbin-path=/usr/sbin/nginx \
-        --pid-path=/var/run/nginx.pid \
-        --lock-path=/var/lock/nginx.lock \
-        --user=http --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 \
-        --with-imap --with-imap_ssl_module \
-        --with-ipv6 --with-pcre-jit \
-        --with-file-aio \
-        --with-http_dav_module \
-        --with-http_geoip_module \
-        --with-http_gunzip_module \
-        --with-http_gzip_static_module \
-        --with-http_realip_module \
-        --with-http_spdy_module \
-        --with-http_ssl_module \
-        --with-http_stub_status_module \
-        --add-module=/usr/lib/passenger/ext/nginx \
-        #--with-http_mp4_module \
-        #--with-http_addition_module \
-        #--with-http_xslt_module \
-        #--with-http_image_filter_module \
-        #--with-http_sub_module \
-        #--with-http_flv_module \
-        #--with-http_random_index_module \
-        #--with-http_secure_link_module \
-        #--with-http_degradation_module \
-        #--with-http_perl_module \
-
-	make
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install
-
-	sed -e 's|\<user\s\+\w\+;|user html;|g' \
-		-e '44s|html|/usr/share/nginx/html|' \
-		-e '54s|html|/usr/share/nginx/html|' \
-		-i "$pkgdir"/etc/nginx/nginx.conf
-	rm "$pkgdir"/etc/nginx/*.default
-
-	install -d "$pkgdir"/$_tmpdir
-	install -dm700 "$pkgdir"/$_tmpdir/proxy
-
-	chmod 750 "$pkgdir"/var/log/nginx
-	chown http:log "$pkgdir"/var/log/nginx
-
-	install -d "$pkgdir"/usr/share/nginx
-	mv "$pkgdir"/etc/nginx/html/ "$pkgdir"/usr/share/nginx
-
-	install -Dm644 "$srcdir"/logrotate "$pkgdir"/etc/logrotate.d/nginx
-	install -Dm644 "$srcdir"/service "$pkgdir"/usr/lib/systemd/system/nginx.service
-	install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/nginx/LICENSE
-	rm -rf "$pkgdir"/var/run
-}

Copied: nginx/repos/community-x86_64/PKGBUILD (from rev 90388, nginx/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2013-05-12 06:32:22 UTC (rev 90389)
@@ -0,0 +1,102 @@
+# $Id$
+# Maintainer:  Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer:  Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
+# Contributor: Miroslaw Szot <mss at czlug.icis.pcz.pl>
+
+_cfgdir=/etc/nginx
+_tmpdir=/var/lib/nginx
+
+pkgname=nginx
+pkgver=1.4.1
+pkgrel=2
+pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server'
+arch=('i686' 'x86_64')
+depends=('pcre' 'zlib' 'openssl' 'geoip')
+makedepends=('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)
+source=(http://nginx.org/download/nginx-$pkgver.tar.gz
+		service
+		logrotate)
+sha256sums=('bca5d1e89751ba29406185e1736c390412603a7e6b604f5b4575281f6565d119'
+            '05fdc0c0483410944b988d7f4beabb00bec4a44a41bd13ebc9b78585da7d3f9b'
+            '9523a1fdd5eb61bf62f3049f6ee088b198e36d5edcce2d9b08bbeb2930aa5a16')
+
+build() {
+	cd "$srcdir"/$pkgname-$pkgver
+
+	./configure \
+        --prefix=$_cfgdir \
+        --conf-path=$_cfgdir/nginx.conf \
+        --sbin-path=/usr/bin/nginx \
+        --pid-path=/var/run/nginx.pid \
+        --lock-path=/var/lock/nginx.lock \
+        --user=http --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 \
+        --with-imap --with-imap_ssl_module \
+        --with-ipv6 --with-pcre-jit \
+        --with-file-aio \
+        --with-http_dav_module \
+        --with-http_geoip_module \
+        --with-http_gunzip_module \
+        --with-http_gzip_static_module \
+        --with-http_realip_module \
+        --with-http_spdy_module \
+        --with-http_ssl_module \
+        --with-http_stub_status_module \
+        --add-module=/usr/lib/passenger/ext/nginx \
+        #--with-http_mp4_module \
+        #--with-http_addition_module \
+        #--with-http_xslt_module \
+        #--with-http_image_filter_module \
+        #--with-http_sub_module \
+        #--with-http_flv_module \
+        #--with-http_random_index_module \
+        #--with-http_secure_link_module \
+        #--with-http_degradation_module \
+        #--with-http_perl_module \
+
+	make
+}
+
+package() {
+	cd "$srcdir"/$pkgname-$pkgver
+	make DESTDIR="$pkgdir" install
+
+	sed -e 's|\<user\s\+\w\+;|user html;|g' \
+		-e '44s|html|/usr/share/nginx/html|' \
+		-e '54s|html|/usr/share/nginx/html|' \
+		-i "$pkgdir"/etc/nginx/nginx.conf
+	rm "$pkgdir"/etc/nginx/*.default
+
+	install -d "$pkgdir"/$_tmpdir
+	install -dm700 "$pkgdir"/$_tmpdir/proxy
+
+	chmod 750 "$pkgdir"/var/log/nginx
+	chown http:log "$pkgdir"/var/log/nginx
+
+	install -d "$pkgdir"/usr/share/nginx
+	mv "$pkgdir"/etc/nginx/html/ "$pkgdir"/usr/share/nginx
+
+	install -Dm644 "$srcdir"/logrotate "$pkgdir"/etc/logrotate.d/nginx
+	install -Dm644 "$srcdir"/service "$pkgdir"/usr/lib/systemd/system/nginx.service
+	install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/nginx/LICENSE
+	rm -rf "$pkgdir"/var/run
+}

Deleted: community-x86_64/logrotate
===================================================================
--- community-x86_64/logrotate	2013-05-12 06:32:07 UTC (rev 90388)
+++ community-x86_64/logrotate	2013-05-12 06:32:22 UTC (rev 90389)
@@ -1,9 +0,0 @@
-/var/log/nginx/*log {
-	missingok
-	create 640 http log
-	sharedscripts
-	compress
-	postrotate
-		test -r /var/run/nginx.pid && kill -USR1 `cat /var/run/nginx.pid`
-	endscript
-}

Copied: nginx/repos/community-x86_64/logrotate (from rev 90388, nginx/trunk/logrotate)
===================================================================
--- community-x86_64/logrotate	                        (rev 0)
+++ community-x86_64/logrotate	2013-05-12 06:32:22 UTC (rev 90389)
@@ -0,0 +1,9 @@
+/var/log/nginx/*log {
+	missingok
+	create 640 http log
+	sharedscripts
+	compress
+	postrotate
+		test -r /var/run/nginx.pid && kill -USR1 `cat /var/run/nginx.pid`
+	endscript
+}

Deleted: community-x86_64/nginx.install
===================================================================
--- community-x86_64/nginx.install	2013-05-12 06:32:07 UTC (rev 90388)
+++ community-x86_64/nginx.install	2013-05-12 06:32:22 UTC (rev 90389)
@@ -1,15 +0,0 @@
-post_upgrade() {
-    if [[ $(vercmp $2 1.2.7-4) -le 0 ]]; then
-        chmod 750 var/log/nginx
-        chown http:log var/log/nginx
-    fi
-    if [[ $(vercmp $2 1.2.1-2) -le 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
-}

Copied: nginx/repos/community-x86_64/nginx.install (from rev 90388, nginx/trunk/nginx.install)
===================================================================
--- community-x86_64/nginx.install	                        (rev 0)
+++ community-x86_64/nginx.install	2013-05-12 06:32:22 UTC (rev 90389)
@@ -0,0 +1,15 @@
+post_upgrade() {
+    if [[ $(vercmp $2 1.2.7-4) -le 0 ]]; then
+        chmod 750 var/log/nginx
+        chown http:log var/log/nginx
+    fi
+    if [[ $(vercmp $2 1.2.1-2) -le 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
+}

Deleted: community-x86_64/service
===================================================================
--- community-x86_64/service	2013-05-12 06:32:07 UTC (rev 90388)
+++ community-x86_64/service	2013-05-12 06:32:22 UTC (rev 90389)
@@ -1,14 +0,0 @@
-[Unit]
-Description=A high performance web server and a reverse proxy server
-After=syslog.target network.target
-
-[Service]
-Type=forking
-PIDFile=/run/nginx.pid
-ExecStartPre=/usr/sbin/nginx -t -q -g 'pid /run/nginx.pid; daemon on; master_process on;'
-ExecStart=/usr/sbin/nginx -g 'pid /run/nginx.pid; daemon on; master_process on;'
-ExecReload=/usr/sbin/nginx -g 'pid /run/nginx.pid; daemon on; master_process on;' -s reload
-ExecStop=/usr/sbin/nginx -g 'pid /run/nginx.pid;' -s quit
-
-[Install]
-WantedBy=multi-user.target

Copied: nginx/repos/community-x86_64/service (from rev 90388, nginx/trunk/service)
===================================================================
--- community-x86_64/service	                        (rev 0)
+++ community-x86_64/service	2013-05-12 06:32:22 UTC (rev 90389)
@@ -0,0 +1,14 @@
+[Unit]
+Description=A high performance web server and a reverse proxy server
+After=syslog.target 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
+
+[Install]
+WantedBy=multi-user.target



More information about the arch-commits mailing list