upg pcre2 libnghttp2
This commit is contained in:
parent
4d95e25db7
commit
be7efd5fdf
|
|
@ -6,8 +6,8 @@
|
|||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=libnghttp2
|
||||
_tag='69148c95ea5980b52c669135e45bf8204421aa9c' # git rev-parse v${pkgver}
|
||||
pkgver=1.60.0
|
||||
#_tag='69148c95ea5980b52c669135e45bf8204421aa9c' # git rev-parse v${pkgver}
|
||||
pkgver=1.61.0
|
||||
pkgrel=01
|
||||
pkgdesc='Framing layer of HTTP/2 is implemented as a reusable C library'
|
||||
url='https://nghttp2.org/'
|
||||
|
|
@ -16,7 +16,8 @@ makedepends=('automake' 'autoconf' 'git')
|
|||
conflicts=('nghttp2<1.20.0-2')
|
||||
provides=('libnghttp2.so')
|
||||
#source=(https://github.com/nghttp2/nghttp2/releases/download/v$pkgver/nghttp2-$pkgver.tar.xz)
|
||||
source=("git+https://github.com/nghttp2/nghttp2.git#tag=${_tag}?signed"
|
||||
#source=("git+https://github.com/nghttp2/nghttp2.git#tag=${_tag}?signed"
|
||||
source=("git+https://github.com/nghttp2/nghttp2.git#tag=v${pkgver}?signed"
|
||||
'git+https://github.com/ngtcp2/munit.git'
|
||||
'git+https://github.com/mruby/mruby.git'
|
||||
'git+https://github.com/tatsuhiro-t/neverbleed.git')
|
||||
|
|
@ -67,10 +68,13 @@ license=(MIT)
|
|||
|
||||
validpgpkeys=('F4F3B91474D1EB29889BD0EF7E8403D5D673C366') # Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
|
||||
|
||||
sha512sums=('a347249408552b1928ca42955a094be9c69a56fe9eb4a21ec8ac62c8c99ce8fa13a3fb2b1ba6363c75ac73a169ac62cbd954cfad607e872e821a6348817027e4'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'SKIP')
|
||||
sha256sums=(SKIP
|
||||
SKIP
|
||||
SKIP
|
||||
SKIP)
|
||||
|
||||
## b5901b82aa68cda26e006d3f06eadcea2472ac9d7948bb3a3e301f7e34bc9595 libnghttp2-1.60.0-01-x86_64.pkg.tar.lz
|
||||
|
||||
## 647b5c2059001ede03ab893e4f116a0d44ab083b01f33be53e2b4af4b4b1851c libnghttp2-1.61.0-01-x86_64.pkg.tar.lz
|
||||
|
|
|
|||
|
|
@ -2,8 +2,7 @@
|
|||
# Contributor: Zhuoyun Wei <wzyboy@wzyboy.org>
|
||||
|
||||
pkgname=libnghttp2
|
||||
_tag='69148c95ea5980b52c669135e45bf8204421aa9c' # git rev-parse v${pkgver}
|
||||
pkgver=1.60.0
|
||||
pkgver=1.61.0
|
||||
pkgrel=1
|
||||
pkgdesc='Framing layer of HTTP/2 is implemented as a reusable C library'
|
||||
arch=('x86_64')
|
||||
|
|
@ -14,11 +13,11 @@ provides=('libnghttp2.so')
|
|||
makedepends=('git')
|
||||
conflicts=('nghttp2<1.20.0-2')
|
||||
validpgpkeys=('F4F3B91474D1EB29889BD0EF7E8403D5D673C366') # Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
|
||||
source=("git+https://github.com/nghttp2/nghttp2.git#tag=${_tag}?signed"
|
||||
source=("git+https://github.com/nghttp2/nghttp2.git#tag=v${pkgver}?signed"
|
||||
'git+https://github.com/ngtcp2/munit.git'
|
||||
'git+https://github.com/mruby/mruby.git'
|
||||
'git+https://github.com/tatsuhiro-t/neverbleed.git')
|
||||
sha512sums=('SKIP'
|
||||
sha512sums=('a347249408552b1928ca42955a094be9c69a56fe9eb4a21ec8ac62c8c99ce8fa13a3fb2b1ba6363c75ac73a169ac62cbd954cfad607e872e821a6348817027e4'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'SKIP')
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
pkgname=pcre2
|
||||
pkgver=10.43
|
||||
pkgrel=02
|
||||
pkgrel=03
|
||||
pkgdesc='A library that implements Perl 5-style regular expressions. 2nd version'
|
||||
url='https://github.com/PCRE2Project/pcre2'
|
||||
depends=('bzip2' 'glibc' 'readline' 'zlib')
|
||||
|
|
@ -17,7 +17,8 @@ options=(staticlibs)
|
|||
#options=(debug staticlibs) ### uncomment this to have the corresponding debug pkg produced
|
||||
#source=("https://github.com/PhilipHazel/pcre2/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2"{,.sig})
|
||||
source=("$url/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2"{,.sig}
|
||||
fix-avx-detection.patch::"https://github.com/zherczeg/sljit/commit/56dbde07b05252f0b304b04040a86cfb9f109ae9.patch")
|
||||
fix-avx-detection.patch::"https://github.com/zherczeg/sljit/commit/56dbde07b05252f0b304b04040a86cfb9f109ae9.patch"
|
||||
fix-thread-safety.patch::"https://github.com/zherczeg/sljit/commit/ad89dd8ecd25589d236bd20b36f2abf69f938fd1.patch")
|
||||
|
||||
prepare() {
|
||||
cd $pkgname-$pkgver
|
||||
|
|
@ -25,10 +26,12 @@ prepare() {
|
|||
# Fix AVX detection
|
||||
# [PATCH] Add xgetbv feature detection support on x86
|
||||
patch -Np2 -i "$srcdir"/fix-avx-detection.patch -d src/sljit
|
||||
# Fix thread-safety issue in sljit's allocator
|
||||
# [PATCH] Fix locking region in sjlit_malloc_exec
|
||||
patch -Np2 -i "$srcdir"/fix-thread-safety.patch -d src/sljit
|
||||
|
||||
}
|
||||
|
||||
|
||||
build() {
|
||||
cd $pkgname-$pkgver
|
||||
|
||||
|
|
@ -70,14 +73,17 @@ validpgpkeys=('45F68D54BBE23FB3039B46E59766E084FB0F43D8') # Philip Hazel <ph10@
|
|||
|
||||
sha512sums=('8ac1520c32e9e5672404aaf6104e23c9ee5c3c28ad28ff101435599d813cbb20e0491a3fd34e012b4411b3e0366a4c6dfa3f02d093acaa6ff0ab25478bb7ade9'
|
||||
'SKIP'
|
||||
'4379a06a142a9c9dc61298e86c722f1f2b6d83493acda8e472c866093b3e2192d315998c5a87dfd231739394d5c809c05415126084b18f80a002ee8861c0ed4f')
|
||||
'4379a06a142a9c9dc61298e86c722f1f2b6d83493acda8e472c866093b3e2192d315998c5a87dfd231739394d5c809c05415126084b18f80a002ee8861c0ed4f'
|
||||
'9548da45cb030f53b634a9ba340687d04bd6c5b88ffd78932f231a4092e5cc99b0698941fbd4f88d9a905bed0d0a85c5da697da9a531c4c4efc8f7578d0ffefe')
|
||||
b2sums=('f87f9f36dd6a806cdba1f077f51b53da2583f1898f83e41d594622b28ac8efbc1b2d122b752a9d6cd461fe0e3c7c85ee93358443df518a336da4ee9d72cca808'
|
||||
'SKIP'
|
||||
'736aa7eaa2ed571117f545ae78151fda6a5ef5935bf70f132b1d20d0ff6e46543194f409a02eac727a8209fb0d25e6870705e8a95b3feb07e799d288fd852822')
|
||||
'736aa7eaa2ed571117f545ae78151fda6a5ef5935bf70f132b1d20d0ff6e46543194f409a02eac727a8209fb0d25e6870705e8a95b3feb07e799d288fd852822'
|
||||
'9ad1b0dca06cf3620158458e26c2007fb46990bdf178a75a621be5c665e8726990789510827829e9c480cbebee0b3b5da27f9857e3b19019307e4959671dfbac')
|
||||
|
||||
sha256sums=(e2a53984ff0b07dfdb5ae4486bbb9b21cca8e7df2434096cc9bf1b728c350bcb # pcre2-10.43.tar.bz2
|
||||
fe7a0bcafa5f4ee6d38b0a8c76a13c994e7effa19ef985bdf2c557e7362ab411 # pcre2-10.43.tar.bz2.sig
|
||||
edda6691b7d59cce485c099b48e8fa8fef0bf3ea2676cc7278181959edbdc83a) # fix-avx-detection.patch
|
||||
edda6691b7d59cce485c099b48e8fa8fef0bf3ea2676cc7278181959edbdc83a # fix-avx-detection.patch
|
||||
ffe871ac795b15d3b8a9ae21624744535e8a6429958b9a784018226a08229f0e) # fix-thread-safety.patch
|
||||
|
||||
## d48e1dc37692f09ccb1abdf86795e2ede73e8e97c1f81fb3d022148874e2a905 pcre2-10.43-02-x86_64.pkg.tar.lz
|
||||
## 034f540b114a751080aa1939bd38a9f81d4408674dddfc21f47b15773d72470f pcre2-10.43-03-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
pkgname=pcre2
|
||||
pkgver=10.43
|
||||
pkgrel=2
|
||||
pkgrel=3
|
||||
pkgdesc='A library that implements Perl 5-style regular expressions. 2nd version'
|
||||
arch=('x86_64')
|
||||
url='https://github.com/PCRE2Project/pcre2'
|
||||
|
|
@ -17,13 +17,16 @@ optdepends=('sh: for pcre2-config')
|
|||
provides=(libpcre2-{8,16,32,posix}.so)
|
||||
options=(staticlibs)
|
||||
source=("$url/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2"{,.sig}
|
||||
https://github.com/zherczeg/sljit/commit/56dbde07b05252f0b304b04040a86cfb9f109ae9.patch)
|
||||
https://github.com/zherczeg/sljit/commit/56dbde07b05252f0b304b04040a86cfb9f109ae9.patch
|
||||
https://github.com/zherczeg/sljit/commit/ad89dd8ecd25589d236bd20b36f2abf69f938fd1.patch)
|
||||
sha512sums=('8ac1520c32e9e5672404aaf6104e23c9ee5c3c28ad28ff101435599d813cbb20e0491a3fd34e012b4411b3e0366a4c6dfa3f02d093acaa6ff0ab25478bb7ade9'
|
||||
'SKIP'
|
||||
'4379a06a142a9c9dc61298e86c722f1f2b6d83493acda8e472c866093b3e2192d315998c5a87dfd231739394d5c809c05415126084b18f80a002ee8861c0ed4f')
|
||||
'4379a06a142a9c9dc61298e86c722f1f2b6d83493acda8e472c866093b3e2192d315998c5a87dfd231739394d5c809c05415126084b18f80a002ee8861c0ed4f'
|
||||
'9548da45cb030f53b634a9ba340687d04bd6c5b88ffd78932f231a4092e5cc99b0698941fbd4f88d9a905bed0d0a85c5da697da9a531c4c4efc8f7578d0ffefe')
|
||||
b2sums=('f87f9f36dd6a806cdba1f077f51b53da2583f1898f83e41d594622b28ac8efbc1b2d122b752a9d6cd461fe0e3c7c85ee93358443df518a336da4ee9d72cca808'
|
||||
'SKIP'
|
||||
'736aa7eaa2ed571117f545ae78151fda6a5ef5935bf70f132b1d20d0ff6e46543194f409a02eac727a8209fb0d25e6870705e8a95b3feb07e799d288fd852822')
|
||||
'736aa7eaa2ed571117f545ae78151fda6a5ef5935bf70f132b1d20d0ff6e46543194f409a02eac727a8209fb0d25e6870705e8a95b3feb07e799d288fd852822'
|
||||
'9ad1b0dca06cf3620158458e26c2007fb46990bdf178a75a621be5c665e8726990789510827829e9c480cbebee0b3b5da27f9857e3b19019307e4959671dfbac')
|
||||
validpgpkeys=('45F68D54BBE23FB3039B46E59766E084FB0F43D8') # Philip Hazel <ph10@hermes.cam.ac.uk>
|
||||
|
||||
build() {
|
||||
|
|
@ -32,6 +35,10 @@ build() {
|
|||
# [PATCH] Add xgetbv feature detection support on x86
|
||||
patch -Np2 -i "$srcdir"/56dbde07b05252f0b304b04040a86cfb9f109ae9.patch -d src/sljit
|
||||
|
||||
# Fix thread-safety issue in sljit's allocator
|
||||
# [PATCH] Fix locking region in sjlit_malloc_exec
|
||||
patch -Np2 -i "$srcdir"/ad89dd8ecd25589d236bd20b36f2abf69f938fd1.patch -d src/sljit
|
||||
|
||||
# use fat LTO objects for static libraries
|
||||
CFLAGS+=" -ffat-lto-objects"
|
||||
CXXFLAGS+=" -ffat-lto-objects"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,32 @@
|
|||
From ad89dd8ecd25589d236bd20b36f2abf69f938fd1 Mon Sep 17 00:00:00 2001
|
||||
From: lbonn <lbonn@users.noreply.github.com>
|
||||
Date: Tue, 2 Apr 2024 12:55:33 +0200
|
||||
Subject: [PATCH] Fix locking region in sjlit_malloc_exec (#244)
|
||||
|
||||
The locked section needs to extend until we are done modifying internal
|
||||
block offsets and sizes, otherwise we risk running into data corruption
|
||||
in a multi-threaded context.
|
||||
|
||||
This bug was introduced in 7de0fee9a7376b33e31a3903487cd9933da3a606
|
||||
---
|
||||
sljit_src/allocator_src/sljitExecAllocatorCore.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/sljit_src/allocator_src/sljitExecAllocatorCore.c b/sljit_src/allocator_src/sljitExecAllocatorCore.c
|
||||
index 32c29fb6..4e1119bc 100644
|
||||
--- a/sljit_src/allocator_src/sljitExecAllocatorCore.c
|
||||
+++ b/sljit_src/allocator_src/sljitExecAllocatorCore.c
|
||||
@@ -235,12 +235,12 @@ SLJIT_API_FUNC_ATTRIBUTE void* sljit_malloc_exec(sljit_uw size)
|
||||
header->size = chunk_size;
|
||||
next_header = AS_BLOCK_HEADER(header, chunk_size);
|
||||
}
|
||||
- SLJIT_ALLOCATOR_UNLOCK();
|
||||
next_header->size = 1;
|
||||
next_header->prev_size = chunk_size;
|
||||
#ifdef SLJIT_HAS_EXECUTABLE_OFFSET
|
||||
next_header->executable_offset = executable_offset;
|
||||
#endif /* SLJIT_HAS_EXECUTABLE_OFFSET */
|
||||
+ SLJIT_ALLOCATOR_UNLOCK();
|
||||
return MEM_START(header);
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue