[arch-commits] Commit in nginx/repos/staging-x86_64 (8 files)
Giancarlo Razzolini
grazzolini at gemini.archlinux.org
Fri Jun 10 13:55:15 UTC 2022
Date: Friday, June 10, 2022 @ 13:55:14
Author: grazzolini
Revision: 448130
archrelease: copy trunk to staging-x86_64
Added:
nginx/repos/staging-x86_64/PKGBUILD
(from rev 448129, nginx/trunk/PKGBUILD)
nginx/repos/staging-x86_64/logrotate
(from rev 448129, nginx/trunk/logrotate)
nginx/repos/staging-x86_64/nginx.install
(from rev 448129, nginx/trunk/nginx.install)
nginx/repos/staging-x86_64/service
(from rev 448129, nginx/trunk/service)
Deleted:
nginx/repos/staging-x86_64/PKGBUILD
nginx/repos/staging-x86_64/logrotate
nginx/repos/staging-x86_64/nginx.install
nginx/repos/staging-x86_64/service
---------------+
PKGBUILD | 302 ++++++++++++++++++++++++++++----------------------------
logrotate | 20 +--
nginx.install | 54 +++++-----
service | 32 ++---
4 files changed, 204 insertions(+), 204 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-06-10 13:54:24 UTC (rev 448129)
+++ PKGBUILD 2022-06-10 13:55:14 UTC (rev 448130)
@@ -1,151 +0,0 @@
-# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-# Contributor: Sébastien Luttringer
-# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Miroslaw Szot <mss at czlug.icis.pcz.pl>
-# Contributor: Daniel Micay <danielmicay at gmail.com>
-
-pkgbase=nginx
-pkgname=(nginx nginx-src)
-pkgver=1.22.0
-pkgrel=1
-pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server'
-arch=(x86_64)
-url='https://nginx.org'
-license=(custom)
-depends=(pcre zlib openssl geoip mailcap libxcrypt)
-makedepends=(mercurial)
-checkdepends=(perl perl-gd perl-io-socket-ssl perl-fcgi perl-cache-memcached
- memcached ffmpeg)
-backup=(etc/nginx/fastcgi.conf
- etc/nginx/fastcgi_params
- etc/nginx/koi-win
- etc/nginx/koi-utf
- etc/nginx/nginx.conf
- etc/nginx/scgi_params
- etc/nginx/uwsgi_params
- etc/nginx/win-utf
- etc/logrotate.d/nginx)
-install=nginx.install
-source=($url/download/nginx-$pkgver.tar.gz{,.asc}
- hg+https://hg.nginx.org/nginx-tests#revision=34fc85598287
- service
- logrotate)
-validpgpkeys=('B0F4253373F8F6F510D42178520A9993A1C052F8' # Maxim Dounin <mdounin at mdounin.ru>
- '13C82A63B603576156E30A4EA0EA981B66B0D967') # Konstantin Pavlov <thresh at nginx.com>
-sha512sums=('074782dba9cd5f8f493fbb57e20bda6dc9171814d919a47ee9f825d93f12c9f9d496e25d063c983191b55ad6a236bcef252ce16ecc1d253dc8b23433557559b1'
- 'SKIP'
- 'SKIP'
- 'be2858613d9cca85d80e7b894e9d5fa7892cbddd7a677d2d2f68f419d75fdc1f6802de8014f43ce063b116afd4ff17369873a6adea2dd58ac6f94e617de66fec'
- '9232342c0914575ce438c5a8ee7e1c25b0befb457a2934e9cb77d1fe9a103634ea403b57bc0ef0cd6cf72248aee5e5584282cea611bc79198aeac9a65d8df5d7')
-
-_common_flags=(
- --with-compat
- --with-debug
- --with-file-aio
- --with-http_addition_module
- --with-http_auth_request_module
- --with-http_dav_module
- --with-http_degradation_module
- --with-http_flv_module
- --with-http_geoip_module
- --with-http_gunzip_module
- --with-http_gzip_static_module
- --with-http_mp4_module
- --with-http_realip_module
- --with-http_secure_link_module
- --with-http_slice_module
- --with-http_ssl_module
- --with-http_stub_status_module
- --with-http_sub_module
- --with-http_v2_module
- --with-mail
- --with-mail_ssl_module
- --with-pcre-jit
- --with-stream
- --with-stream_geoip_module
- --with-stream_realip_module
- --with-stream_ssl_module
- --with-stream_ssl_preread_module
- --with-threads
-)
-
-_stable_flags=(
-)
-
-prepare() {
- cp -r $pkgbase-$pkgver{,-src}
-}
-
-build() {
- cd $pkgbase-$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-cc-opt="$CFLAGS $CPPFLAGS" \
- --with-ld-opt="$LDFLAGS" \
- ${_common_flags[@]} \
- ${_stable_flags[@]}
-
- make
-}
-
-check() {
- cd nginx-tests
- TEST_NGINX_BINARY="$srcdir/$pkgbase-$pkgver/objs/nginx" prove .
-}
-
-package_nginx() {
- cd $pkgbase-$pkgver
- make DESTDIR="$pkgdir" install
-
- sed -e 's|\<user\s\+\w\+;|user http;|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
- rm "$pkgdir"/etc/nginx/mime.types # in mailcap
-
- install -d "$pkgdir"/var/lib/nginx
- install -dm700 "$pkgdir"/var/lib/nginx/proxy
-
- chmod 755 "$pkgdir"/var/log/nginx
- chown root:root "$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/$pkgname/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 ftplugin indent syntax; do
- install -Dm644 contrib/vim/$i/nginx.vim \
- "$pkgdir/usr/share/vim/vimfiles/$i/nginx.vim"
- done
-}
-
-package_nginx-src() {
- pkgdesc="Source code of nginx $pkgver, useful for building modules"
- depends=()
- install -d "$pkgdir/usr/src"
- cp -r $pkgbase-$pkgver-src "$pkgdir/usr/src/nginx"
-}
Copied: nginx/repos/staging-x86_64/PKGBUILD (from rev 448129, nginx/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-06-10 13:55:14 UTC (rev 448130)
@@ -0,0 +1,151 @@
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: Sébastien Luttringer
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Miroslaw Szot <mss at czlug.icis.pcz.pl>
+# Contributor: Daniel Micay <danielmicay at gmail.com>
+
+pkgbase=nginx
+pkgname=(nginx nginx-src)
+pkgver=1.22.0
+pkgrel=2
+pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server'
+arch=(x86_64)
+url='https://nginx.org'
+license=(custom)
+depends=(pcre2 zlib openssl geoip mailcap libxcrypt)
+makedepends=(mercurial)
+checkdepends=(perl perl-gd perl-io-socket-ssl perl-fcgi perl-cache-memcached
+ memcached ffmpeg)
+backup=(etc/nginx/fastcgi.conf
+ etc/nginx/fastcgi_params
+ etc/nginx/koi-win
+ etc/nginx/koi-utf
+ etc/nginx/nginx.conf
+ etc/nginx/scgi_params
+ etc/nginx/uwsgi_params
+ etc/nginx/win-utf
+ etc/logrotate.d/nginx)
+install=nginx.install
+source=($url/download/nginx-$pkgver.tar.gz{,.asc}
+ hg+https://hg.nginx.org/nginx-tests#revision=34fc85598287
+ service
+ logrotate)
+validpgpkeys=('B0F4253373F8F6F510D42178520A9993A1C052F8' # Maxim Dounin <mdounin at mdounin.ru>
+ '13C82A63B603576156E30A4EA0EA981B66B0D967') # Konstantin Pavlov <thresh at nginx.com>
+sha512sums=('074782dba9cd5f8f493fbb57e20bda6dc9171814d919a47ee9f825d93f12c9f9d496e25d063c983191b55ad6a236bcef252ce16ecc1d253dc8b23433557559b1'
+ 'SKIP'
+ 'SKIP'
+ 'be2858613d9cca85d80e7b894e9d5fa7892cbddd7a677d2d2f68f419d75fdc1f6802de8014f43ce063b116afd4ff17369873a6adea2dd58ac6f94e617de66fec'
+ '9232342c0914575ce438c5a8ee7e1c25b0befb457a2934e9cb77d1fe9a103634ea403b57bc0ef0cd6cf72248aee5e5584282cea611bc79198aeac9a65d8df5d7')
+
+_common_flags=(
+ --with-compat
+ --with-debug
+ --with-file-aio
+ --with-http_addition_module
+ --with-http_auth_request_module
+ --with-http_dav_module
+ --with-http_degradation_module
+ --with-http_flv_module
+ --with-http_geoip_module
+ --with-http_gunzip_module
+ --with-http_gzip_static_module
+ --with-http_mp4_module
+ --with-http_realip_module
+ --with-http_secure_link_module
+ --with-http_slice_module
+ --with-http_ssl_module
+ --with-http_stub_status_module
+ --with-http_sub_module
+ --with-http_v2_module
+ --with-mail
+ --with-mail_ssl_module
+ --with-pcre-jit
+ --with-stream
+ --with-stream_geoip_module
+ --with-stream_realip_module
+ --with-stream_ssl_module
+ --with-stream_ssl_preread_module
+ --with-threads
+)
+
+_stable_flags=(
+)
+
+prepare() {
+ cp -r $pkgbase-$pkgver{,-src}
+}
+
+build() {
+ cd $pkgbase-$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-cc-opt="$CFLAGS $CPPFLAGS" \
+ --with-ld-opt="$LDFLAGS" \
+ ${_common_flags[@]} \
+ ${_stable_flags[@]}
+
+ make
+}
+
+check() {
+ cd nginx-tests
+ TEST_NGINX_BINARY="$srcdir/$pkgbase-$pkgver/objs/nginx" prove .
+}
+
+package_nginx() {
+ cd $pkgbase-$pkgver
+ make DESTDIR="$pkgdir" install
+
+ sed -e 's|\<user\s\+\w\+;|user http;|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
+ rm "$pkgdir"/etc/nginx/mime.types # in mailcap
+
+ install -d "$pkgdir"/var/lib/nginx
+ install -dm700 "$pkgdir"/var/lib/nginx/proxy
+
+ chmod 755 "$pkgdir"/var/log/nginx
+ chown root:root "$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/$pkgname/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 ftplugin indent syntax; do
+ install -Dm644 contrib/vim/$i/nginx.vim \
+ "$pkgdir/usr/share/vim/vimfiles/$i/nginx.vim"
+ done
+}
+
+package_nginx-src() {
+ pkgdesc="Source code of nginx $pkgver, useful for building modules"
+ depends=()
+ install -d "$pkgdir/usr/src"
+ cp -r $pkgbase-$pkgver-src "$pkgdir/usr/src/nginx"
+}
Deleted: logrotate
===================================================================
--- logrotate 2022-06-10 13:54:24 UTC (rev 448129)
+++ logrotate 2022-06-10 13:55:14 UTC (rev 448130)
@@ -1,10 +0,0 @@
-/var/log/nginx/*log {
- missingok
- notifempty
- create 640 http log
- sharedscripts
- compress
- postrotate
- test ! -r /run/nginx.pid || kill -USR1 `cat /run/nginx.pid`
- endscript
-}
Copied: nginx/repos/staging-x86_64/logrotate (from rev 448129, nginx/trunk/logrotate)
===================================================================
--- logrotate (rev 0)
+++ logrotate 2022-06-10 13:55:14 UTC (rev 448130)
@@ -0,0 +1,10 @@
+/var/log/nginx/*log {
+ missingok
+ notifempty
+ create 640 http log
+ sharedscripts
+ compress
+ postrotate
+ test ! -r /run/nginx.pid || kill -USR1 `cat /run/nginx.pid`
+ endscript
+}
Deleted: nginx.install
===================================================================
--- nginx.install 2022-06-10 13:54:24 UTC (rev 448129)
+++ nginx.install 2022-06-10 13:55:14 UTC (rev 448130)
@@ -1,27 +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.10.2-3) < 0)); then
- chown root:root var/log/nginx
- fi
-
- if (( $(vercmp $2 1.10.3-2) < 0 )); then
- chmod 755 var/log/nginx
- echo ':: Security notice:'
- echo ' - When additional log directories are used in /var/log/nginx make sure they'
- echo ' are owned by root:root and have 755 set as permission to mitigate CVE-2016-1247'
- fi
-}
Copied: nginx/repos/staging-x86_64/nginx.install (from rev 448129, nginx/trunk/nginx.install)
===================================================================
--- nginx.install (rev 0)
+++ nginx.install 2022-06-10 13:55:14 UTC (rev 448130)
@@ -0,0 +1,27 @@
+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.10.2-3) < 0)); then
+ chown root:root var/log/nginx
+ fi
+
+ if (( $(vercmp $2 1.10.3-2) < 0 )); then
+ chmod 755 var/log/nginx
+ echo ':: Security notice:'
+ echo ' - When additional log directories are used in /var/log/nginx make sure they'
+ echo ' are owned by root:root and have 755 set as permission to mitigate CVE-2016-1247'
+ fi
+}
Deleted: service
===================================================================
--- service 2022-06-10 13:54:24 UTC (rev 448129)
+++ service 2022-06-10 13:55:14 UTC (rev 448130)
@@ -1,16 +0,0 @@
-[Unit]
-Description=A high performance web server and a reverse proxy server
-After=network.target network-online.target nss-lookup.target
-
-[Service]
-Type=forking
-PIDFile=/run/nginx.pid
-PrivateDevices=yes
-SyslogLevel=err
-
-ExecStart=/usr/bin/nginx -g 'pid /run/nginx.pid; error_log stderr;'
-ExecReload=/usr/bin/nginx -s reload
-KillMode=mixed
-
-[Install]
-WantedBy=multi-user.target
Copied: nginx/repos/staging-x86_64/service (from rev 448129, nginx/trunk/service)
===================================================================
--- service (rev 0)
+++ service 2022-06-10 13:55:14 UTC (rev 448130)
@@ -0,0 +1,16 @@
+[Unit]
+Description=A high performance web server and a reverse proxy server
+After=network.target network-online.target nss-lookup.target
+
+[Service]
+Type=forking
+PIDFile=/run/nginx.pid
+PrivateDevices=yes
+SyslogLevel=err
+
+ExecStart=/usr/bin/nginx -g 'pid /run/nginx.pid; error_log stderr;'
+ExecReload=/usr/bin/nginx -s reload
+KillMode=mixed
+
+[Install]
+WantedBy=multi-user.target
More information about the arch-commits
mailing list