[arch-commits] Commit in nginx-mainline/repos (10 files)
Bartłomiej Piotrowski
bpiotrowski at archlinux.org
Wed Feb 10 13:07:57 UTC 2016
Date: Wednesday, February 10, 2016 @ 14:07:57
Author: bpiotrowski
Revision: 259031
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
nginx-mainline/repos/extra-i686/
nginx-mainline/repos/extra-i686/PKGBUILD
(from rev 259030, nginx-mainline/trunk/PKGBUILD)
nginx-mainline/repos/extra-i686/logrotate
(from rev 259030, nginx-mainline/trunk/logrotate)
nginx-mainline/repos/extra-i686/nginx.install
(from rev 259030, nginx-mainline/trunk/nginx.install)
nginx-mainline/repos/extra-i686/service
(from rev 259030, nginx-mainline/trunk/service)
nginx-mainline/repos/extra-x86_64/
nginx-mainline/repos/extra-x86_64/PKGBUILD
(from rev 259030, nginx-mainline/trunk/PKGBUILD)
nginx-mainline/repos/extra-x86_64/logrotate
(from rev 259030, nginx-mainline/trunk/logrotate)
nginx-mainline/repos/extra-x86_64/nginx.install
(from rev 259030, nginx-mainline/trunk/nginx.install)
nginx-mainline/repos/extra-x86_64/service
(from rev 259030, nginx-mainline/trunk/service)
----------------------------+
extra-i686/PKGBUILD | 111 +++++++++++++++++++++++++++++++++++++++++++
extra-i686/logrotate | 9 +++
extra-i686/nginx.install | 21 ++++++++
extra-i686/service | 14 +++++
extra-x86_64/PKGBUILD | 111 +++++++++++++++++++++++++++++++++++++++++++
extra-x86_64/logrotate | 9 +++
extra-x86_64/nginx.install | 21 ++++++++
extra-x86_64/service | 14 +++++
8 files changed, 310 insertions(+)
Copied: nginx-mainline/repos/extra-i686/PKGBUILD (from rev 259030, nginx-mainline/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2016-02-10 13:07:57 UTC (rev 259031)
@@ -0,0 +1,111 @@
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Maintainer: Sébastien Luttringer
+# Contributor: Drew DeVault
+
+pkgname=nginx-mainline
+pkgver=1.9.11
+pkgrel=3
+pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server, mainline release'
+arch=('i686' 'x86_64')
+url='http://nginx.org'
+license=('custom')
+depends=('pcre' 'zlib' 'openssl')
+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')
+install=nginx.install
+provides=('nginx')
+conflicts=('nginx')
+source=($url/download/nginx-$pkgver.tar.gz
+ service
+ logrotate)
+md5sums=('76eb5853a1190e0cfc691aa21c545de3'
+ 'ce9a06bcaf66ec4a3c4eb59b636e0dfd'
+ '3441ce77cdd1aab6f0ab7e212698a8a7')
+
+build() {
+ cd $provides-$pkgver
+ ./configure \
+ --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 \
+ --user=http \
+ --group=http \
+ --http-log-path=/var/log/nginx/access.log \
+ --error-log-path=stderr \
+ --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-mail \
+ --with-mail_ssl_module \
+ --with-ipv6 \
+ --with-pcre-jit \
+ --with-file-aio \
+ --with-http_dav_module \
+ --with-http_gunzip_module \
+ --with-http_gzip_static_module \
+ --with-http_realip_module \
+ --with-http_v2_module \
+ --with-http_ssl_module \
+ --with-http_stub_status_module \
+ --with-http_addition_module \
+ --with-http_degradation_module \
+ --with-http_flv_module \
+ --with-http_mp4_module \
+ --with-http_secure_link_module \
+ --with-http_sub_module \
+ --with-threads \
+ --with-stream
+
+ make
+}
+
+package() {
+ cd $provides-$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"/var/lib/nginx
+ install -dm700 "$pkgdir"/var/lib/nginx/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 ../logrotate "$pkgdir"/etc/logrotate.d/nginx
+ install -Dm644 ../service "$pkgdir"/usr/lib/systemd/system/nginx.service
+ install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$provides/LICENSE
+
+ rmdir "$pkgdir"/run
+
+ install -d "$pkgdir"/usr/share/man/man8/
+ 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"
+ done
+
+}
+
+# vim:set ts=2 sw=2 et:
Copied: nginx-mainline/repos/extra-i686/logrotate (from rev 259030, nginx-mainline/trunk/logrotate)
===================================================================
--- extra-i686/logrotate (rev 0)
+++ extra-i686/logrotate 2016-02-10 13:07:57 UTC (rev 259031)
@@ -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
+}
Copied: nginx-mainline/repos/extra-i686/nginx.install (from rev 259030, nginx-mainline/trunk/nginx.install)
===================================================================
--- extra-i686/nginx.install (rev 0)
+++ extra-i686/nginx.install 2016-02-10 13:07:57 UTC (rev 259031)
@@ -0,0 +1,21 @@
+post_upgrade() {
+ if (( $(vercmp $2 1.2.7-4) <= 0 )); then
+ chmod 750 var/log/nginx
+ chown http:log var/log/nginx
+ fi
+ if (( $(vercmp $2 1.2.1-2) <= 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
+ if (( $(vercmp $2 1.4.2-4) < 0 )); then
+ echo 'Nginx now includes only upstream bundled modules.'
+ echo 'Thus, passenger module support was dropped.'
+ fi
+}
+
+# vim:set ts=4 sw=4 et:
Copied: nginx-mainline/repos/extra-i686/service (from rev 259030, nginx-mainline/trunk/service)
===================================================================
--- extra-i686/service (rev 0)
+++ extra-i686/service 2016-02-10 13:07:57 UTC (rev 259031)
@@ -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
Copied: nginx-mainline/repos/extra-x86_64/PKGBUILD (from rev 259030, nginx-mainline/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2016-02-10 13:07:57 UTC (rev 259031)
@@ -0,0 +1,111 @@
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Maintainer: Sébastien Luttringer
+# Contributor: Drew DeVault
+
+pkgname=nginx-mainline
+pkgver=1.9.11
+pkgrel=3
+pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server, mainline release'
+arch=('i686' 'x86_64')
+url='http://nginx.org'
+license=('custom')
+depends=('pcre' 'zlib' 'openssl')
+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')
+install=nginx.install
+provides=('nginx')
+conflicts=('nginx')
+source=($url/download/nginx-$pkgver.tar.gz
+ service
+ logrotate)
+md5sums=('76eb5853a1190e0cfc691aa21c545de3'
+ 'ce9a06bcaf66ec4a3c4eb59b636e0dfd'
+ '3441ce77cdd1aab6f0ab7e212698a8a7')
+
+build() {
+ cd $provides-$pkgver
+ ./configure \
+ --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 \
+ --user=http \
+ --group=http \
+ --http-log-path=/var/log/nginx/access.log \
+ --error-log-path=stderr \
+ --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-mail \
+ --with-mail_ssl_module \
+ --with-ipv6 \
+ --with-pcre-jit \
+ --with-file-aio \
+ --with-http_dav_module \
+ --with-http_gunzip_module \
+ --with-http_gzip_static_module \
+ --with-http_realip_module \
+ --with-http_v2_module \
+ --with-http_ssl_module \
+ --with-http_stub_status_module \
+ --with-http_addition_module \
+ --with-http_degradation_module \
+ --with-http_flv_module \
+ --with-http_mp4_module \
+ --with-http_secure_link_module \
+ --with-http_sub_module \
+ --with-threads \
+ --with-stream
+
+ make
+}
+
+package() {
+ cd $provides-$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"/var/lib/nginx
+ install -dm700 "$pkgdir"/var/lib/nginx/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 ../logrotate "$pkgdir"/etc/logrotate.d/nginx
+ install -Dm644 ../service "$pkgdir"/usr/lib/systemd/system/nginx.service
+ install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$provides/LICENSE
+
+ rmdir "$pkgdir"/run
+
+ install -d "$pkgdir"/usr/share/man/man8/
+ 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"
+ done
+
+}
+
+# vim:set ts=2 sw=2 et:
Copied: nginx-mainline/repos/extra-x86_64/logrotate (from rev 259030, nginx-mainline/trunk/logrotate)
===================================================================
--- extra-x86_64/logrotate (rev 0)
+++ extra-x86_64/logrotate 2016-02-10 13:07:57 UTC (rev 259031)
@@ -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
+}
Copied: nginx-mainline/repos/extra-x86_64/nginx.install (from rev 259030, nginx-mainline/trunk/nginx.install)
===================================================================
--- extra-x86_64/nginx.install (rev 0)
+++ extra-x86_64/nginx.install 2016-02-10 13:07:57 UTC (rev 259031)
@@ -0,0 +1,21 @@
+post_upgrade() {
+ if (( $(vercmp $2 1.2.7-4) <= 0 )); then
+ chmod 750 var/log/nginx
+ chown http:log var/log/nginx
+ fi
+ if (( $(vercmp $2 1.2.1-2) <= 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
+ if (( $(vercmp $2 1.4.2-4) < 0 )); then
+ echo 'Nginx now includes only upstream bundled modules.'
+ echo 'Thus, passenger module support was dropped.'
+ fi
+}
+
+# vim:set ts=4 sw=4 et:
Copied: nginx-mainline/repos/extra-x86_64/service (from rev 259030, nginx-mainline/trunk/service)
===================================================================
--- extra-x86_64/service (rev 0)
+++ extra-x86_64/service 2016-02-10 13:07:57 UTC (rev 259031)
@@ -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