Date: Wednesday, August 28, 2013 @ 20:00:49 Author: seblu Revision: 96430
archrelease: copy trunk to community-testing-i686, community-testing-x86_64 Added: nginx/repos/community-testing-i686/ nginx/repos/community-testing-i686/PKGBUILD (from rev 96429, nginx/trunk/PKGBUILD) nginx/repos/community-testing-i686/logrotate (from rev 96429, nginx/trunk/logrotate) nginx/repos/community-testing-i686/nginx.install (from rev 96429, nginx/trunk/nginx.install) nginx/repos/community-testing-i686/service (from rev 96429, nginx/trunk/service) nginx/repos/community-testing-x86_64/ nginx/repos/community-testing-x86_64/PKGBUILD (from rev 96429, nginx/trunk/PKGBUILD) nginx/repos/community-testing-x86_64/logrotate (from rev 96429, nginx/trunk/logrotate) nginx/repos/community-testing-x86_64/nginx.install (from rev 96429, nginx/trunk/nginx.install) nginx/repos/community-testing-x86_64/service (from rev 96429, nginx/trunk/service) ----------------------------------------+ community-testing-i686/PKGBUILD | 128 +++++++++++++++++++++++++++++++ community-testing-i686/logrotate | 9 ++ community-testing-i686/nginx.install | 22 +++++ community-testing-i686/service | 14 +++ community-testing-x86_64/PKGBUILD | 128 +++++++++++++++++++++++++++++++ community-testing-x86_64/logrotate | 9 ++ community-testing-x86_64/nginx.install | 22 +++++ community-testing-x86_64/service | 14 +++ 8 files changed, 346 insertions(+) Copied: nginx/repos/community-testing-i686/PKGBUILD (from rev 96429, nginx/trunk/PKGBUILD) =================================================================== --- community-testing-i686/PKGBUILD (rev 0) +++ community-testing-i686/PKGBUILD 2013-08-28 18:00:49 UTC (rev 96430) @@ -0,0 +1,128 @@ +# $Id$ +# Maintainer: Bartłomiej Piotrowski <nos...@bpiotrowski.pl> +# Maintainer: Sébastien Luttringer +# Contributor: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Contributor: Miroslaw Szot <m...@czlug.icis.pcz.pl> + +pkgbase=nginx +pkgname=(nginx nginx-extra) +pkgver=1.5.4 +pkgrel=1 +arch=('i686' 'x86_64') +makedepends=('pcre' 'zlib' 'openssl' 'gd' 'geoip' 'passenger') +url='http://nginx.org' +license=('custom') +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') +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=('ad21d7ee5146d5c571917574b8a8bbab658faff6ffbff7cab2e69a3afadd65dc' + '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[@]}" \ + --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 + make +} + +package_nginx() { + pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server' + conflicts=('nginx-extra') + depends=('pcre' 'zlib' 'openssl') + install=$pkgname.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 + + 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 "$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" +} + +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/repos/community-testing-i686/logrotate (from rev 96429, nginx/trunk/logrotate) =================================================================== --- community-testing-i686/logrotate (rev 0) +++ community-testing-i686/logrotate 2013-08-28 18:00:49 UTC (rev 96430) @@ -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/repos/community-testing-i686/nginx.install (from rev 96429, nginx/trunk/nginx.install) =================================================================== --- community-testing-i686/nginx.install (rev 0) +++ community-testing-i686/nginx.install 2013-08-28 18:00:49 UTC (rev 96430) @@ -0,0 +1,22 @@ +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.5.4-1) < 0 )); then + echo 'nginx have been splited into 2 packages: nginx and nginx-extra.' + echo 'nginx include only upstream bundled modules' + echo 'nginx-extra currently include passenger and auth-pam' + fi +} + +# vim:set ts=4 sw=4 et: Copied: nginx/repos/community-testing-i686/service (from rev 96429, nginx/trunk/service) =================================================================== --- community-testing-i686/service (rev 0) +++ community-testing-i686/service 2013-08-28 18:00:49 UTC (rev 96430) @@ -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/repos/community-testing-x86_64/PKGBUILD (from rev 96429, nginx/trunk/PKGBUILD) =================================================================== --- community-testing-x86_64/PKGBUILD (rev 0) +++ community-testing-x86_64/PKGBUILD 2013-08-28 18:00:49 UTC (rev 96430) @@ -0,0 +1,128 @@ +# $Id$ +# Maintainer: Bartłomiej Piotrowski <nos...@bpiotrowski.pl> +# Maintainer: Sébastien Luttringer +# Contributor: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Contributor: Miroslaw Szot <m...@czlug.icis.pcz.pl> + +pkgbase=nginx +pkgname=(nginx nginx-extra) +pkgver=1.5.4 +pkgrel=1 +arch=('i686' 'x86_64') +makedepends=('pcre' 'zlib' 'openssl' 'gd' 'geoip' 'passenger') +url='http://nginx.org' +license=('custom') +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') +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=('ad21d7ee5146d5c571917574b8a8bbab658faff6ffbff7cab2e69a3afadd65dc' + '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[@]}" \ + --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 + make +} + +package_nginx() { + pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server' + conflicts=('nginx-extra') + depends=('pcre' 'zlib' 'openssl') + install=$pkgname.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 + + 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 "$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" +} + +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/repos/community-testing-x86_64/logrotate (from rev 96429, nginx/trunk/logrotate) =================================================================== --- community-testing-x86_64/logrotate (rev 0) +++ community-testing-x86_64/logrotate 2013-08-28 18:00:49 UTC (rev 96430) @@ -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/repos/community-testing-x86_64/nginx.install (from rev 96429, nginx/trunk/nginx.install) =================================================================== --- community-testing-x86_64/nginx.install (rev 0) +++ community-testing-x86_64/nginx.install 2013-08-28 18:00:49 UTC (rev 96430) @@ -0,0 +1,22 @@ +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.5.4-1) < 0 )); then + echo 'nginx have been splited into 2 packages: nginx and nginx-extra.' + echo 'nginx include only upstream bundled modules' + echo 'nginx-extra currently include passenger and auth-pam' + fi +} + +# vim:set ts=4 sw=4 et: Copied: nginx/repos/community-testing-x86_64/service (from rev 96429, nginx/trunk/service) =================================================================== --- community-testing-x86_64/service (rev 0) +++ community-testing-x86_64/service 2013-08-28 18:00:49 UTC (rev 96430) @@ -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