Update to nginx 1.21.3
This commit is contained in:
parent
d840ff7548
commit
06b7001f7c
11
.SRCINFO
11
.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.2
|
pkgver = 1.21.3
|
||||||
pkgrel = 2
|
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=fac88e160653
|
source = hg+https://hg.nginx.org/nginx-quic#revision=4ca8035c19a4
|
||||||
source = git+https://boringssl.googlesource.com/boringssl#commit=dddb60eb9700110835ff6e2b429de40a17006429
|
source = git+https://boringssl.googlesource.com/boringssl#commit=0446b59427f82d0138abe87fee05b10c696ab621
|
||||||
source = service
|
source = service
|
||||||
source = logrotate
|
source = logrotate
|
||||||
sha256sums = SKIP
|
sha256sums = SKIP
|
||||||
|
@ -40,8 +40,9 @@ 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.2, useful for building modules
|
pkgdesc = Source code of nginx-quic 1.21.3, useful for building modules
|
||||||
depends =
|
depends =
|
||||||
provides = nginx-src
|
provides = nginx-src
|
||||||
provides = nginx-mainline-src
|
provides = nginx-mainline-src
|
||||||
conflicts = nginx-src
|
conflicts = nginx-src
|
||||||
|
backup =
|
||||||
|
|
16
PKGBUILD
16
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.2
|
pkgver=1.21.3
|
||||||
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'
|
||||||
|
@ -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=fac88e160653"
|
source=("hg+https://hg.nginx.org/nginx-quic#revision=4ca8035c19a4"
|
||||||
"git+https://boringssl.googlesource.com/boringssl#commit=dddb60eb9700110835ff6e2b429de40a17006429"
|
"git+https://boringssl.googlesource.com/boringssl#commit=0446b59427f82d0138abe87fee05b10c696ab621"
|
||||||
"service"
|
"service"
|
||||||
"logrotate")
|
"logrotate")
|
||||||
sha256sums=('SKIP'
|
sha256sums=('SKIP'
|
||||||
|
@ -82,13 +82,8 @@ prepare() {
|
||||||
}
|
}
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
# Clear -D_FORTIFY_SOURCE from build flags, it causes Boringssl tests to fail to compile
|
|
||||||
export CPPFLAGS=${CPPFLAGS/-D_FORTIFY_SOURCE=[1-9]/-D_FORTIFY_SOURCE=0}
|
|
||||||
export CXXFLAGS=${CXXFLAGS/-D_FORTIFY_SOURCE=[1-9]/-D_FORTIFY_SOURCE=0}
|
|
||||||
|
|
||||||
export CXXFLAGS="$CXXFLAGS -fPIC"
|
export CXXFLAGS="$CXXFLAGS -fPIC"
|
||||||
# Disable some warnings that make Boringssl fail to compile due to a forced -Werror in CMakeLists.txt
|
export CFLAGS="$CFLAGS -fPIC"
|
||||||
export CFLAGS="$CFLAGS -fPIC -Wno-stringop-overflow -Wno-array-parameter"
|
|
||||||
|
|
||||||
cd ${srcdir}/boringssl
|
cd ${srcdir}/boringssl
|
||||||
mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release ../ && make
|
mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release ../ && make
|
||||||
|
@ -166,6 +161,7 @@ package_nginx-quic-src() {
|
||||||
provides=('nginx-src' 'nginx-mainline-src')
|
provides=('nginx-src' 'nginx-mainline-src')
|
||||||
conflicts=($_pkgbase-src)
|
conflicts=($_pkgbase-src)
|
||||||
depends=()
|
depends=()
|
||||||
|
backup=()
|
||||||
install -d "$pkgdir/usr/src"
|
install -d "$pkgdir/usr/src"
|
||||||
cp -r ${srcdir}/${pkgname} "$pkgdir/usr/src/nginx"
|
cp -r ${srcdir}/${pkgname} "$pkgdir/usr/src/nginx"
|
||||||
# Link the 'configure' script to its location in release tarballs,
|
# Link the 'configure' script to its location in release tarballs,
|
||||||
|
|
Loading…
Reference in New Issue