[arch-commits] Commit in nginx/trunk (PKGBUILD install nginx.install)
Sébastien Luttringer
seblu at nymeria.archlinux.org
Sat Aug 31 01:00:22 UTC 2013
Date: Saturday, August 31, 2013 @ 03:00:22
Author: seblu
Revision: 96523
upgpkg: nginx 1.4.2-4
https://mailman.archlinux.org/pipermail/arch-dev-public/2013-August/025278.html
Added:
nginx/trunk/install
(from rev 96522, nginx/trunk/nginx.install)
Modified:
nginx/trunk/PKGBUILD
Deleted:
nginx/trunk/nginx.install
---------------+
PKGBUILD | 102 +++++++++++++++++++-------------------------------------
install | 21 +++++++++++
nginx.install | 22 ------------
3 files changed, 56 insertions(+), 89 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-08-30 23:26:51 UTC (rev 96522)
+++ PKGBUILD 2013-08-31 01:00:22 UTC (rev 96523)
@@ -4,14 +4,14 @@
# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
# Contributor: Miroslaw Szot <mss at czlug.icis.pcz.pl>
-pkgbase=nginx
-pkgname=(nginx nginx-extra)
+pkgname=nginx
pkgver=1.4.2
-pkgrel=3
+pkgrel=4
+pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server'
arch=('i686' 'x86_64')
-makedepends=('pcre' 'zlib' 'openssl' 'gd' 'geoip' 'passenger')
url='http://nginx.org'
license=('custom')
+depends=('pcre' 'zlib' 'openssl')
backup=('etc/nginx/fastcgi.conf'
'etc/nginx/fastcgi_params'
'etc/nginx/koi-win'
@@ -22,76 +22,53 @@
'etc/nginx/uwsgi_params'
'etc/nginx/win-utf'
'etc/logrotate.d/nginx')
+install=install
source=("http://nginx.org/download/nginx-$pkgver.tar.gz"
- 'http://web.iti.upv.es/~sto/nginx/ngx_http_auth_pam_module-1.2.tar.gz'
'service'
'logrotate')
sha256sums=('5361ffb7b0ebf8b1a04369bc3d1295eaed091680c1c58115f88d56c8e51f3611'
- '5a85970ba61a99f55a26d2536a11d512b39bbd622f5737d25a9a8c10db81efa9'
'05fdc0c0483410944b988d7f4beabb00bec4a44a41bd13ebc9b78585da7d3f9b'
'272907d3213d69dac3bd6024d6d150caa23cb67d4f121e4171f34ba5581f9e98')
-_base_options=(
- '--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=/var/log/nginx/error.log'
- '--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'
-)
-
-prepare() {
- cp -a $pkgname-$pkgver $pkgname-extra-$pkgver
-}
-
build() {
- msg2 'Build standard version'
- cd "$srcdir/$pkgname-$pkgver"
- ./configure "${_base_options[@]}"
- make
-
- msg2 'Build extra version'
- cd "$srcdir/$pkgname-extra-$pkgver"
- ./configure "${_base_options[@]}" \
+ 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=/var/log/nginx/error.log \
+ --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_geoip_module \
- --with-http_image_filter_module \
--with-http_mp4_module \
--with-http_secure_link_module \
- --with-http_sub_module \
- --add-module=/usr/lib/passenger/ext/nginx \
- --add-module=../ngx_http_auth_pam_module-1.2
+ --with-http_sub_module
make
}
-package_nginx() {
- pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server'
- conflicts=('nginx-extra')
- depends=('pcre' 'zlib' 'openssl')
- install=$pkgname.install
-
+package() {
cd $pkgname-$pkgver
make DESTDIR="$pkgdir" install
@@ -116,13 +93,4 @@
rmdir "$pkgdir/run"
}
-package_nginx-extra() {
- package_nginx
-
- pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server with extra modules'
- conflicts=('nginx')
- provides=("nginx=$pkgver")
- depends=('pcre' 'zlib' 'openssl' 'gd' 'geoip')
-}
-
# vim:set ts=4 sw=4 et:
Copied: nginx/trunk/install (from rev 96522, nginx/trunk/nginx.install)
===================================================================
--- install (rev 0)
+++ install 2013-08-31 01:00:22 UTC (rev 96523)
@@ -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:
Deleted: nginx.install
===================================================================
--- nginx.install 2013-08-30 23:26:51 UTC (rev 96522)
+++ nginx.install 2013-08-31 01:00:22 UTC (rev 96523)
@@ -1,22 +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-2) <= 0 )); then
- echo 'nginx has been split into two packages: nginx and nginx-extra.'
- echo 'nginx includes only upstream bundled modules'
- echo 'nginx-extra currently includes passenger and auth-pam modules'
- fi
-}
-
-# vim:set ts=4 sw=4 et:
More information about the arch-commits
mailing list