diff options
| author | DasSkelett | 2022-05-29 13:58:16 +0200 |
|---|---|---|
| committer | DasSkelett | 2022-05-29 13:58:16 +0200 |
| commit | 0d40d5383c9c5209d1c1c0f5fbc10d2060995414 (patch) | |
| tree | 185e030f699579494f139e6fc077454977b69437 | |
| parent | 619a86a80c31a5e412055fdbc38dd740e6bd1df3 (diff) | |
| download | aur-0d40d5383c9c5209d1c1c0f5fbc10d2060995414.tar.gz | |
Revert "Update to nginx 1.22.0"
This reverts commit 619a86a80c31a5e412055fdbc38dd740e6bd1df3.
We are tracking mainline, not stable. Let's hope there will be a new mainline release soon as well.
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | PKGBUILD | 14 |
2 files changed, 9 insertions, 15 deletions
@@ -1,7 +1,7 @@ pkgbase = nginx-quic pkgdesc = Lightweight HTTP server and IMAP/POP3 proxy server, HTTP/3 QUIC branch - pkgver = 1.22.0 - pkgrel = 1 + pkgver = 1.21.6 + pkgrel = 3 url = https://nginx.org install = nginx.install arch = i686 @@ -28,8 +28,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=5b1011b5702b - source = git+https://boringssl.googlesource.com/boringssl#commit=701d8b28c8e49bdc2f90407864ba4f634cf345dd + source = hg+https://hg.nginx.org/nginx-quic#revision=7c2adf237091 + source = git+https://boringssl.googlesource.com/boringssl#commit=b90261a383352056a6a01296238499c063d265f0 source = service source = logrotate sha256sums = SKIP @@ -40,7 +40,7 @@ pkgbase = nginx-quic pkgname = nginx-quic pkgname = nginx-quic-src - pkgdesc = Source code of nginx-quic 1.22.0, useful for building modules + pkgdesc = Source code of nginx-quic 1.21.6, useful for building modules arch = any depends = provides = nginx-src @@ -7,8 +7,8 @@ _pkgbase=nginx pkgbase=nginx-quic pkgname=(nginx-quic nginx-quic-src) -pkgver=1.22.0 -pkgrel=1 +pkgver=1.21.6 +pkgrel=3 pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server, HTTP/3 QUIC branch' arch=('i686' 'x86_64') url='https://nginx.org' @@ -27,8 +27,8 @@ backup=('etc/nginx/fastcgi.conf' install=nginx.install provides=('nginx' 'nginx-mainline') conflicts=('nginx') -source=("hg+https://hg.nginx.org/nginx-quic#revision=5b1011b5702b" - "git+https://boringssl.googlesource.com/boringssl#commit=701d8b28c8e49bdc2f90407864ba4f634cf345dd" +source=("hg+https://hg.nginx.org/nginx-quic#revision=7c2adf237091" + "git+https://boringssl.googlesource.com/boringssl#commit=b90261a383352056a6a01296238499c063d265f0" "service" "logrotate") sha256sums=('SKIP' @@ -76,12 +76,6 @@ _quic_flags=( ) 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 2d3ed138ce65 || hg resolve -t internal:other --all - hg commit -u aur -m "[automated aur commit] Merged with default branch" - # Backup pristine version of nginx source for -src package test -d ${srcdir}/${pkgname}-src && rm -r ${srcdir}/${pkgname}-src cp -r ${srcdir}/${pkgname} ${srcdir}/${pkgname}-src |