Update to nginx 1.22.0
This commit is contained in:
parent
809d821dfa
commit
619a86a80c
10
.SRCINFO
10
.SRCINFO
|
@ -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.21.6
|
pkgver = 1.22.0
|
||||||
pkgrel = 3
|
pkgrel = 1
|
||||||
url = https://nginx.org
|
url = https://nginx.org
|
||||||
install = nginx.install
|
install = nginx.install
|
||||||
arch = i686
|
arch = i686
|
||||||
|
@ -28,8 +28,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=7c2adf237091
|
source = hg+https://hg.nginx.org/nginx-quic#revision=5b1011b5702b
|
||||||
source = git+https://boringssl.googlesource.com/boringssl#commit=b90261a383352056a6a01296238499c063d265f0
|
source = git+https://boringssl.googlesource.com/boringssl#commit=701d8b28c8e49bdc2f90407864ba4f634cf345dd
|
||||||
source = service
|
source = service
|
||||||
source = logrotate
|
source = logrotate
|
||||||
sha256sums = SKIP
|
sha256sums = SKIP
|
||||||
|
@ -40,7 +40,7 @@ pkgbase = nginx-quic
|
||||||
pkgname = nginx-quic
|
pkgname = nginx-quic
|
||||||
|
|
||||||
pkgname = nginx-quic-src
|
pkgname = nginx-quic-src
|
||||||
pkgdesc = Source code of nginx-quic 1.21.6, useful for building modules
|
pkgdesc = Source code of nginx-quic 1.22.0, useful for building modules
|
||||||
arch = any
|
arch = any
|
||||||
depends =
|
depends =
|
||||||
provides = nginx-src
|
provides = nginx-src
|
||||||
|
|
14
PKGBUILD
14
PKGBUILD
|
@ -7,8 +7,8 @@
|
||||||
_pkgbase=nginx
|
_pkgbase=nginx
|
||||||
pkgbase=nginx-quic
|
pkgbase=nginx-quic
|
||||||
pkgname=(nginx-quic nginx-quic-src)
|
pkgname=(nginx-quic nginx-quic-src)
|
||||||
pkgver=1.21.6
|
pkgver=1.22.0
|
||||||
pkgrel=3
|
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'
|
||||||
|
@ -27,8 +27,8 @@ backup=('etc/nginx/fastcgi.conf'
|
||||||
install=nginx.install
|
install=nginx.install
|
||||||
provides=('nginx' 'nginx-mainline')
|
provides=('nginx' 'nginx-mainline')
|
||||||
conflicts=('nginx')
|
conflicts=('nginx')
|
||||||
source=("hg+https://hg.nginx.org/nginx-quic#revision=7c2adf237091"
|
source=("hg+https://hg.nginx.org/nginx-quic#revision=5b1011b5702b"
|
||||||
"git+https://boringssl.googlesource.com/boringssl#commit=b90261a383352056a6a01296238499c063d265f0"
|
"git+https://boringssl.googlesource.com/boringssl#commit=701d8b28c8e49bdc2f90407864ba4f634cf345dd"
|
||||||
"service"
|
"service"
|
||||||
"logrotate")
|
"logrotate")
|
||||||
sha256sums=('SKIP'
|
sha256sums=('SKIP'
|
||||||
|
@ -76,6 +76,12 @@ _quic_flags=(
|
||||||
)
|
)
|
||||||
|
|
||||||
prepare() {
|
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
|
# Backup pristine version of nginx source for -src package
|
||||||
test -d ${srcdir}/${pkgname}-src && rm -r ${srcdir}/${pkgname}-src
|
test -d ${srcdir}/${pkgname}-src && rm -r ${srcdir}/${pkgname}-src
|
||||||
cp -r ${srcdir}/${pkgname} ${srcdir}/${pkgname}-src
|
cp -r ${srcdir}/${pkgname} ${srcdir}/${pkgname}-src
|
||||||
|
|
Loading…
Reference in New Issue