summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDasSkelett2021-05-26 12:16:03 +0200
committerDasSkelett2021-05-26 12:16:03 +0200
commit6dbf39804b0ef2ea8fae86ba00e7ca132869bc13 (patch)
tree829ed4aabc949fa1ad12c4677c0f584631fd8567
parent8a10471899373ffda54b3ff06eca89c57fac5065 (diff)
downloadaur-6dbf39804b0ef2ea8fae86ba00e7ca132869bc13.tar.gz
Update to nginx 1.21.0
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD10
2 files changed, 9 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e47a6cb147d1..8fc0d4a74b43 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = nginx-quic
pkgdesc = Lightweight HTTP server and IMAP/POP3 proxy server, HTTP/3 QUIC branch
- pkgver = 1.20.0
- pkgrel = 2
+ pkgver = 1.21.0
+ pkgrel = 1
url = https://nginx.org
install = nginx.install
arch = i686
@@ -27,8 +27,8 @@ pkgbase = nginx-quic
backup = etc/nginx/uwsgi_params
backup = etc/nginx/win-utf
backup = etc/logrotate.d/nginx
- source = hg+https://hg.nginx.org/nginx-quic#revision=225e9f1dfe7c
- source = git+https://boringssl.googlesource.com/boringssl#commit=68a799af7f6aed15dfeedc26e5ae43ebce873a6a
+ source = hg+https://hg.nginx.org/nginx-quic#revision=60c6e8d8d3ae
+ source = git+https://boringssl.googlesource.com/boringssl#commit=3dd9864feace08641e1f856edd2bcca63ba7887f
source = service
source = logrotate
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 5e4631ed29a2..94f1c35d6000 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,8 @@
# Contributor: Drew DeVault
pkgname=nginx-quic
-pkgver=1.20.0
-pkgrel=2
+pkgver=1.21.0
+pkgrel=1
pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server, HTTP/3 QUIC branch'
arch=('i686' 'x86_64')
url='https://nginx.org'
@@ -25,8 +25,8 @@ backup=('etc/nginx/fastcgi.conf'
install=nginx.install
provides=('nginx')
conflicts=('nginx')
-source=("hg+https://hg.nginx.org/nginx-quic#revision=225e9f1dfe7c"
- "git+https://boringssl.googlesource.com/boringssl#commit=68a799af7f6aed15dfeedc26e5ae43ebce873a6a"
+source=("hg+https://hg.nginx.org/nginx-quic#revision=60c6e8d8d3ae"
+ "git+https://boringssl.googlesource.com/boringssl#commit=3dd9864feace08641e1f856edd2bcca63ba7887f"
"service"
"logrotate")
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
cd ${srcdir}/$pkgname
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"
}