[arch-commits] Commit in nginx/trunk (PKGBUILD install nginx.install)
Bartłomiej Piotrowski
bpiotrowski at nymeria.archlinux.org
Tue Feb 11 17:09:24 UTC 2014
Date: Tuesday, February 11, 2014 @ 18:09:23
Author: bpiotrowski
Revision: 105602
upgpkg: nginx 1.4.5-1
new upstream release
Added:
nginx/trunk/nginx.install
(from rev 105601, nginx/trunk/install)
Modified:
nginx/trunk/PKGBUILD
Deleted:
nginx/trunk/install
---------------+
PKGBUILD | 129 ++++++++++++++++++++++++++++----------------------------
install | 21 ---------
nginx.install | 21 +++++++++
3 files changed, 87 insertions(+), 84 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-02-11 12:56:00 UTC (rev 105601)
+++ PKGBUILD 2014-02-11 17:09:23 UTC (rev 105602)
@@ -1,12 +1,12 @@
# $Id$
-# Maintainer: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
# Maintainer: Sébastien Luttringer
# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
# Contributor: Miroslaw Szot <mss at czlug.icis.pcz.pl>
pkgname=nginx
-pkgver=1.4.4
-pkgrel=2
+pkgver=1.4.5
+pkgrel=1
pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server'
arch=('i686' 'x86_64')
url='http://nginx.org'
@@ -22,75 +22,78 @@
'etc/nginx/uwsgi_params'
'etc/nginx/win-utf'
'etc/logrotate.d/nginx')
-install=install
-source=("http://nginx.org/download/nginx-$pkgver.tar.gz"
- 'service'
- 'logrotate')
-sha256sums=('7c989a58e5408c9593da0bebcd0e4ffc3d892d1316ba5042ddb0be5b0b4102b9'
- '05fdc0c0483410944b988d7f4beabb00bec4a44a41bd13ebc9b78585da7d3f9b'
- '272907d3213d69dac3bd6024d6d150caa23cb67d4f121e4171f34ba5581f9e98')
+install=nginx.install
+source=($url/download/nginx-$pkgver.tar.gz
+ service
+ logrotate)
+md5sums=('1a635e9543570f0c881b8ec9db0c6898'
+ 'ce9a06bcaf66ec4a3c4eb59b636e0dfd'
+ '3441ce77cdd1aab6f0ab7e212698a8a7')
build() {
- cd $pkgname-$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-imap \
- --with-imap_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_spdy_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
- make
+ cd $pkgname-$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-imap \
+ --with-imap_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_spdy_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
+
+ make
}
package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
+ cd $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
+ 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
- install -d "$pkgdir"/var/lib/nginx
- install -dm700 "$pkgdir"/var/lib/nginx/proxy
+ rm "$pkgdir"/etc/nginx/*.default
- chmod 750 "$pkgdir"/var/log/nginx
- chown http:log "$pkgdir"/var/log/nginx
+ install -d "$pkgdir"/var/lib/nginx
+ install -dm700 "$pkgdir"/var/lib/nginx/proxy
- install -d "$pkgdir"/usr/share/nginx
- mv "$pkgdir"/etc/nginx/html/ "$pkgdir"/usr/share/nginx
+ chmod 750 "$pkgdir"/var/log/nginx
+ chown http:log "$pkgdir"/var/log/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/$pkgname/LICENSE
- rmdir "$pkgdir/run"
+ 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/$pkgname/LICENSE
+
+ rmdir "$pkgdir/run"
}
-# vim:set ts=4 sw=4 et:
+# vim:set ts=2 sw=2 et:
Deleted: install
===================================================================
--- install 2014-02-11 12:56:00 UTC (rev 105601)
+++ install 2014-02-11 17:09:23 UTC (rev 105602)
@@ -1,21 +0,0 @@
-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/trunk/nginx.install (from rev 105601, nginx/trunk/install)
===================================================================
--- nginx.install (rev 0)
+++ nginx.install 2014-02-11 17:09:23 UTC (rev 105602)
@@ -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:
More information about the arch-commits
mailing list