Date: Tuesday, March 26, 2019 @ 14:55:06 Author: grazzolini Revision: 443563
archrelease: copy trunk to community-x86_64 Added: nginx-mainline/repos/community-x86_64/PKGBUILD (from rev 443562, nginx-mainline/trunk/PKGBUILD) nginx-mainline/repos/community-x86_64/logrotate (from rev 443562, nginx-mainline/trunk/logrotate) nginx-mainline/repos/community-x86_64/nginx.install (from rev 443562, nginx-mainline/trunk/nginx.install) nginx-mainline/repos/community-x86_64/service (from rev 443562, nginx-mainline/trunk/service) Deleted: nginx-mainline/repos/community-x86_64/PKGBUILD nginx-mainline/repos/community-x86_64/logrotate nginx-mainline/repos/community-x86_64/nginx.install nginx-mainline/repos/community-x86_64/service ---------------+ PKGBUILD | 264 ++++++++++++++++++++++++++++---------------------------- logrotate | 20 ++-- nginx.install | 24 ++--- service | 34 +++---- 4 files changed, 171 insertions(+), 171 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2019-03-26 14:54:08 UTC (rev 443562) +++ PKGBUILD 2019-03-26 14:55:06 UTC (rev 443563) @@ -1,132 +0,0 @@ -# Maintainer: Giancarlo Razzolini <grazzol...@archlinux.org> -# Contributor: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> -# Contributor: Sébastien Luttringer -# Contributor: Drew DeVault - -pkgname=nginx-mainline -pkgver=1.15.9 -pkgrel=1 -pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server, mainline release' -arch=('x86_64') -url='https://nginx.org' -license=('custom') -depends=('pcre' 'zlib' 'openssl' 'geoip' 'mailcap') -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 -provides=('nginx') -conflicts=('nginx') -source=($url/download/nginx-$pkgver.tar.gz{,.asc} - service - logrotate) -validpgpkeys=('B0F4253373F8F6F510D42178520A9993A1C052F8') # Maxim Dounin <mdou...@mdounin.ru> -md5sums=('00dde20d4d2cc65bdaf8950a5bd3e14b' - 'SKIP' - 'ef491e760e7c1ffec9ca25441a150c83' - '6a01fb17af86f03707c8ae60f98a2dc2') -sha512sums=('24dcd5b9bae966244663ff71a625ca90fbe1b29b5717e88aca96ac0c4772108a234647a8c7456154f34ef34d27ebffdce82ad30d2900f24ef5536af6080a6ba8' - 'SKIP' - '4f90db6b8b5c13762b96ddff9ca4e846762d46b90be27c7c9d54cec6f7f12fc95585f8455919296edb0255405dd80af8ee86780b805631b72eb74ee59f359715' - '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 -) - -_mainline_flags=( -) - -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-cc-opt="$CFLAGS $CPPFLAGS" \ - --with-ld-opt="$LDFLAGS" \ - ${_common_flags[@]} \ - ${_mainline_flags[@]} - - 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 - 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/$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 -} Copied: nginx-mainline/repos/community-x86_64/PKGBUILD (from rev 443562, nginx-mainline/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2019-03-26 14:55:06 UTC (rev 443563) @@ -0,0 +1,132 @@ +# Maintainer: Giancarlo Razzolini <grazzol...@archlinux.org> +# Contributor: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> +# Contributor: Sébastien Luttringer +# Contributor: Drew DeVault + +pkgname=nginx-mainline +pkgver=1.15.10 +pkgrel=1 +pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server, mainline release' +arch=('x86_64') +url='https://nginx.org' +license=('custom') +depends=('pcre' 'zlib' 'openssl' 'geoip' 'mailcap') +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 +provides=('nginx') +conflicts=('nginx') +source=($url/download/nginx-$pkgver.tar.gz{,.asc} + service + logrotate) +validpgpkeys=('B0F4253373F8F6F510D42178520A9993A1C052F8') # Maxim Dounin <mdou...@mdounin.ru> +md5sums=('de4e6a52aef45cbcb20b0590cb3e9f66' + 'SKIP' + 'ef491e760e7c1ffec9ca25441a150c83' + '6a01fb17af86f03707c8ae60f98a2dc2') +sha512sums=('16be3b6a095c045543050ec07fef8170a123738892a077003f7fb0428af9a94e9fe560a20ed68606f34145f088b1b656fe72e72d9d65d51c052f06b89d5244ff' + 'SKIP' + '4f90db6b8b5c13762b96ddff9ca4e846762d46b90be27c7c9d54cec6f7f12fc95585f8455919296edb0255405dd80af8ee86780b805631b72eb74ee59f359715' + '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 +) + +_mainline_flags=( +) + +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-cc-opt="$CFLAGS $CPPFLAGS" \ + --with-ld-opt="$LDFLAGS" \ + ${_common_flags[@]} \ + ${_mainline_flags[@]} + + 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 + 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/$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 +} Deleted: logrotate =================================================================== --- logrotate 2019-03-26 14:54:08 UTC (rev 443562) +++ logrotate 2019-03-26 14:55:06 UTC (rev 443563) @@ -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-mainline/repos/community-x86_64/logrotate (from rev 443562, nginx-mainline/trunk/logrotate) =================================================================== --- logrotate (rev 0) +++ logrotate 2019-03-26 14:55:06 UTC (rev 443563) @@ -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 2019-03-26 14:54:08 UTC (rev 443562) +++ nginx.install 2019-03-26 14:55:06 UTC (rev 443563) @@ -1,12 +0,0 @@ -post_upgrade() { - if (( $(vercmp $2 1.11.8-2) < 0)); then - chown root:root var/log/nginx - fi - - if (( $(vercmp $2 1.11.9-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-mainline/repos/community-x86_64/nginx.install (from rev 443562, nginx-mainline/trunk/nginx.install) =================================================================== --- nginx.install (rev 0) +++ nginx.install 2019-03-26 14:55:06 UTC (rev 443563) @@ -0,0 +1,12 @@ +post_upgrade() { + if (( $(vercmp $2 1.11.8-2) < 0)); then + chown root:root var/log/nginx + fi + + if (( $(vercmp $2 1.11.9-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 2019-03-26 14:54:08 UTC (rev 443562) +++ service 2019-03-26 14:55:06 UTC (rev 443563) @@ -1,17 +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 -KillSignal=SIGQUIT -KillMode=mixed - -[Install] -WantedBy=multi-user.target Copied: nginx-mainline/repos/community-x86_64/service (from rev 443562, nginx-mainline/trunk/service) =================================================================== --- service (rev 0) +++ service 2019-03-26 14:55:06 UTC (rev 443563) @@ -0,0 +1,17 @@ +[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 +KillSignal=SIGQUIT +KillMode=mixed + +[Install] +WantedBy=multi-user.target