Update to nginx 1.21.0

This commit is contained in:
DasSkelett 2021-05-26 12:16:03 +02:00
parent 8a10471899
commit 6dbf39804b
No known key found for this signature in database
GPG Key ID: CD4711E34050A172
2 changed files with 9 additions and 9 deletions

View File

@ -1,7 +1,7 @@
pkgbase = nginx-quic pkgbase = nginx-quic
pkgdesc = Lightweight HTTP server and IMAP/POP3 proxy server, HTTP/3 QUIC branch pkgdesc = Lightweight HTTP server and IMAP/POP3 proxy server, HTTP/3 QUIC branch
pkgver = 1.20.0 pkgver = 1.21.0
pkgrel = 2 pkgrel = 1
url = https://nginx.org url = https://nginx.org
install = nginx.install install = nginx.install
arch = i686 arch = i686
@ -27,8 +27,8 @@ pkgbase = nginx-quic
backup = etc/nginx/uwsgi_params backup = etc/nginx/uwsgi_params
backup = etc/nginx/win-utf backup = etc/nginx/win-utf
backup = etc/logrotate.d/nginx backup = etc/logrotate.d/nginx
source = hg+https://hg.nginx.org/nginx-quic#revision=225e9f1dfe7c source = hg+https://hg.nginx.org/nginx-quic#revision=60c6e8d8d3ae
source = git+https://boringssl.googlesource.com/boringssl#commit=68a799af7f6aed15dfeedc26e5ae43ebce873a6a source = git+https://boringssl.googlesource.com/boringssl#commit=3dd9864feace08641e1f856edd2bcca63ba7887f
source = service source = service
source = logrotate source = logrotate
sha256sums = SKIP sha256sums = SKIP

View File

@ -5,8 +5,8 @@
# Contributor: Drew DeVault # Contributor: Drew DeVault
pkgname=nginx-quic pkgname=nginx-quic
pkgver=1.20.0 pkgver=1.21.0
pkgrel=2 pkgrel=1
pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server, HTTP/3 QUIC branch' pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server, HTTP/3 QUIC branch'
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
url='https://nginx.org' url='https://nginx.org'
@ -25,8 +25,8 @@ backup=('etc/nginx/fastcgi.conf'
install=nginx.install install=nginx.install
provides=('nginx') provides=('nginx')
conflicts=('nginx') conflicts=('nginx')
source=("hg+https://hg.nginx.org/nginx-quic#revision=225e9f1dfe7c" source=("hg+https://hg.nginx.org/nginx-quic#revision=60c6e8d8d3ae"
"git+https://boringssl.googlesource.com/boringssl#commit=68a799af7f6aed15dfeedc26e5ae43ebce873a6a" "git+https://boringssl.googlesource.com/boringssl#commit=3dd9864feace08641e1f856edd2bcca63ba7887f"
"service" "service"
"logrotate") "logrotate")
sha256sums=('SKIP' sha256sums=('SKIP'
@ -76,7 +76,7 @@ prepare() {
# Upstream hasn't merged the 1.20.0 update into the nginx-quic branch yet; do it manually # Upstream hasn't merged the 1.20.0 update into the nginx-quic branch yet; do it manually
cd ${srcdir}/$pkgname cd ${srcdir}/$pkgname
hg pull https://hg.nginx.org/nginx hg pull https://hg.nginx.org/nginx
hg merge 3ebf8a5fb670 hg merge f5de03f308a6 # release-1.21.0 tag
hg commit -u aur -m "[automated aur commit] Merged with default branch" hg commit -u aur -m "[automated aur commit] Merged with default branch"
} }