Skip to content

Commit

Permalink
Bump PCRE2, include SLJIT mprotect() patch
Browse files Browse the repository at this point in the history
  • Loading branch information
@staticfloat
staticfloat committed Feb 22, 2021
1 parent f02e5be commit bca401c
Show file tree
Hide file tree
Showing 4 changed files with 58 additions and 35 deletions.
66 changes: 34 additions & 32 deletions deps/checksums/pcre
View file
Original file line number Diff line number Diff line change
@@ -1,32 +1,34 @@
PCRE2.v10.36.0+1.aarch64-apple-darwin.tar.gz/md5/8e444cfd2fabc5767b3b6d4b53a6cdbe
PCRE2.v10.36.0+1.aarch64-apple-darwin.tar.gz/sha512/6a34b6152f9e23e1841afbc3e96e55a391bf9f389ca5cfb1819b2bba16428abd1e964ff83fc79d604fc9b15a6b04d5c07307ad6b7ec1064960d0ed55cf08422a
PCRE2.v10.36.0+1.aarch64-linux-gnu.tar.gz/md5/464f810433626099a1279d1d7b2924a5
PCRE2.v10.36.0+1.aarch64-linux-gnu.tar.gz/sha512/874977219823c26695741ef318dd3e4ef29ecc8e10dccf514a09b0517ade83bd3d3ed823d501fa9b954e48b2d317f8b911a9866df919cbcf8db75ebd537ad482
PCRE2.v10.36.0+1.aarch64-linux-musl.tar.gz/md5/2200c2a8b2795f380133963b40429a50
PCRE2.v10.36.0+1.aarch64-linux-musl.tar.gz/sha512/f450a2dede9c3487040fee9b310e93379edce6f91f1e22f39d751f5e49b8dc4f16dee3e3294ec0b499e3adb5955b84e0613a708ef13aca1c83b674d801673c2c
PCRE2.v10.36.0+1.armv6l-linux-gnueabihf.tar.gz/md5/2a98461d904501dd6d71a8627c10ed41
PCRE2.v10.36.0+1.armv6l-linux-gnueabihf.tar.gz/sha512/6ae2a0bb00d508b6c034f05c6d017043070a15f804ccab0aeb588252a65e2b2eed7a7c7773d33b3371c7d6992a86a1ceed95a926d871e1aded9781f3e4eff30d
PCRE2.v10.36.0+1.armv6l-linux-musleabihf.tar.gz/md5/06b5de0241a7f1ef1d10bd472fd9e941
PCRE2.v10.36.0+1.armv6l-linux-musleabihf.tar.gz/sha512/5470a7f4511c3a6d738717367c573728da558ace096cc2b27cb7d801a1baccda8ca45b21d608a1bef2b808c57b953d5e9d3298efbf5e27ded982167d8d724564
PCRE2.v10.36.0+1.armv7l-linux-gnueabihf.tar.gz/md5/e3f1a84014005598be84eb2f40dbbf0a
PCRE2.v10.36.0+1.armv7l-linux-gnueabihf.tar.gz/sha512/e2b90467dbfb0c673f93bffb92a0545b29ee3107a0157b295f0d7381549e81a4751e273f3d79c024213773581f0303bd167c186e9aac4a0e35cdc7cbe8967a73
PCRE2.v10.36.0+1.armv7l-linux-musleabihf.tar.gz/md5/7f6de9c9ad65086076fec2fa8be3e559
PCRE2.v10.36.0+1.armv7l-linux-musleabihf.tar.gz/sha512/f7797ccb80f06eaedc8d7009a9540971abd6a8d1db37b3357cdbd92c31b86d2cfd92dde541849844047966588490d5f3c31be6b4963bc95aaddac36160ba4e16
PCRE2.v10.36.0+1.i686-linux-gnu.tar.gz/md5/d1035aa17ccb71f1bbcab485a4c16e2d
PCRE2.v10.36.0+1.i686-linux-gnu.tar.gz/sha512/083db33f1ddeaea467471c66a45b3a3d9c63ca2fc1047a79c53dc2246121e94c1ccbd42cf7cc11988d3faf590f63f7caff53e5bbce861c200e637d179dd7fab9
PCRE2.v10.36.0+1.i686-linux-musl.tar.gz/md5/78a86def0a8c07d7283a842eb32b39e9
PCRE2.v10.36.0+1.i686-linux-musl.tar.gz/sha512/8579f493e2cfa5aa92b5160d34a2ad66cdc4a289a5b8fd343fc1362d4181daebd431e17a75aabb785f3b239701ed80db29b92a0444dabfaa0a6668c750d8e07b
PCRE2.v10.36.0+1.i686-w64-mingw32.tar.gz/md5/a83d5ccb4e756df409e61a6da2c6abc4
PCRE2.v10.36.0+1.i686-w64-mingw32.tar.gz/sha512/d4fff10aaf29ac30e5742d8836c40db50571f8c30ad8d14d1debab4bacdca4f820ea8349e79d89715f41428aaca64e876a9c2548b3a6d9c5aca36c10155a61ba
PCRE2.v10.36.0+1.powerpc64le-linux-gnu.tar.gz/md5/860d51e8b1b122a12a6ea84653c0642b
PCRE2.v10.36.0+1.powerpc64le-linux-gnu.tar.gz/sha512/da2b7abff6030b8801647eeecd0b844b08a9917dcbca0e140bbe3b70af26454b23d338bae6b3a77fdb0e59744ad0b3e2f36b1214a29255fa696da1f9981297a6
PCRE2.v10.36.0+1.x86_64-apple-darwin.tar.gz/md5/a466afd318b7c3a04d0c67aa53b340d4
PCRE2.v10.36.0+1.x86_64-apple-darwin.tar.gz/sha512/d7492b1e0ed3b47c9e37cdb97b3fd3e3d90ef2883f225bd8e9c486f7c8d31325a51839f1502d4d94a6a43701ccecccd19e4cd219c8a257f657c205b36d36aa2a
PCRE2.v10.36.0+1.x86_64-linux-gnu.tar.gz/md5/5e18369315cd651a7cbbd64530759ba5
PCRE2.v10.36.0+1.x86_64-linux-gnu.tar.gz/sha512/fd96b61ece384fdd2a58b25b0b005fe4f926a23ea54dd0383e0c8c060dd83766518901425c2dabc6f91e0d28e76697cab46e27ee47c2f88abeab107f25e1d4a6
PCRE2.v10.36.0+1.x86_64-linux-musl.tar.gz/md5/2e794cf8bdfcc098e0355c9991c7875f
PCRE2.v10.36.0+1.x86_64-linux-musl.tar.gz/sha512/bcce45bcb0f31e3ade751f7de56df6b76d446a4bfde6927c38566b2a20fe6a4faf9472f45f9ae4ee06062c0b3561259789cd7517d9a133d2fb6952ba9d3f790b
PCRE2.v10.36.0+1.x86_64-unknown-freebsd.tar.gz/md5/067bf04dd77a502802ee7affe597c2b2
PCRE2.v10.36.0+1.x86_64-unknown-freebsd.tar.gz/sha512/8500280e3448041ac739cb282134a809c13305502def948d53a2d5a11c9845714dbd61dd670548e2736add6c7d525fe3fdc0718797a42db5a74e82b333670f1e
PCRE2.v10.36.0+1.x86_64-w64-mingw32.tar.gz/md5/1b49c23010b85756d7047861bcb261a2
PCRE2.v10.36.0+1.x86_64-w64-mingw32.tar.gz/sha512/7859dec59c4bd970d4298c178e7f1454c32c0b9f0a1ef8f5f8b12e3a167a9419b6461f23d6c3c9da43a1be921c7d3e0f31bbd5162ab2914d8b2abc5de347da3a
PCRE2.v10.36.0+2.aarch64-apple-darwin.tar.gz/md5/12ac3bee39df3a79f868f6463964953b
PCRE2.v10.36.0+2.aarch64-apple-darwin.tar.gz/sha512/a1a1312931deb7f742f80886188babcf9c179ed3f156626fb23d92633fde896d1ee9b2d72cd99ae4a1f8048971b6d939e9b0b10c455d4eeec24b265968593486
PCRE2.v10.36.0+2.aarch64-linux-gnu.tar.gz/md5/32240ccddee3040aeedcbe69ea52fcad
PCRE2.v10.36.0+2.aarch64-linux-gnu.tar.gz/sha512/86fb9febd186fcaeec83d2ed336fb060d7e49c7b7efe1bd8a6d2d74023ddbcce04eed5cf0e5d15348313eb2b51cd6b27763c08f7b9cf4eaf9df22d88f9405ef8
PCRE2.v10.36.0+2.aarch64-linux-musl.tar.gz/md5/06abf8210e597a8669fb371da73865ce
PCRE2.v10.36.0+2.aarch64-linux-musl.tar.gz/sha512/063edaa92e36468a8cf70ca9e25d9004586400a5304c0e91b067788825cbf5354e0190cad951f163e318b65d0f3f915f1944d03de61a5627ead2ead2674d3279
PCRE2.v10.36.0+2.armv6l-linux-gnueabihf.tar.gz/md5/70ca2acdd5b1524141f15d02d26c3b1c
PCRE2.v10.36.0+2.armv6l-linux-gnueabihf.tar.gz/sha512/377fdc5fd8b771027ffe8c0871e1688f8d991caf930b26b397eae01504af2fad5bdfbe2b3af33f25cf4b5c7bfd73dc77b16b65882a7846803a00edc0968ccef2
PCRE2.v10.36.0+2.armv6l-linux-musleabihf.tar.gz/md5/860180f0a15ad38fac20590fab177718
PCRE2.v10.36.0+2.armv6l-linux-musleabihf.tar.gz/sha512/412e7b0355a7bcdecca4ff5f85a1c6af1eeb094a9f07c2e90de105a0e0e6acedcbca146b5c136509ef8b38666f645b0c06fc68676dd8b1b70e2c7af4b070eb3d
PCRE2.v10.36.0+2.armv7l-linux-gnueabihf.tar.gz/md5/12fd561c00fc7fca14e577ed54525740
PCRE2.v10.36.0+2.armv7l-linux-gnueabihf.tar.gz/sha512/e5655e5c3f96a3a95699be534acbd399bc29873fa1064f50c2d78c43ad8e85a1fbf9039bcb674a88ecdb9bf5b468f9ecdf9a79f0dce5d95996f99d6c700da79a
PCRE2.v10.36.0+2.armv7l-linux-musleabihf.tar.gz/md5/97d5eab8806a1920e6fd30f82db1b754
PCRE2.v10.36.0+2.armv7l-linux-musleabihf.tar.gz/sha512/827fc45049a4b3adb6de2ab0569e45dd5e8749c09c42e57c579d3d6350f0953f6ad4fae1ba71af7347c9271ffff805a0200b5c9418e7f1894a6bc17a4fe0071c
PCRE2.v10.36.0+2.i686-linux-gnu.tar.gz/md5/d7c9fdbcf3055c4745ea93a9274e16d1
PCRE2.v10.36.0+2.i686-linux-gnu.tar.gz/sha512/ac0edd5d5910e7948a65c2a5c9fb05d2a6beb3f9bd875ea87433b910444bcba617ac5bc215fa0f101cbd7c5556966de7593080674cfaf28fdc8784e2485cf71b
PCRE2.v10.36.0+2.i686-linux-musl.tar.gz/md5/05ef7559eba68cecbad0f2c75c017640
PCRE2.v10.36.0+2.i686-linux-musl.tar.gz/sha512/91603d596a1b70bc4a933f9151fc791e09a167e4ad2de442a7ff9c355a329353cc9fb3148cf75639eaef0de3cf4f71212525f1040b0eff63c5d884892814b7af
PCRE2.v10.36.0+2.i686-w64-mingw32.tar.gz/md5/8015e6633bf0f4c359f85445d4a98a9a
PCRE2.v10.36.0+2.i686-w64-mingw32.tar.gz/sha512/527183fcc473c8e3f04622701cf73a55c5df132713e8230cd0bfd484023da594a9e29f5745d384f1e1015b8efac96e88bd985b06af5901b0d3052f90af8d89d6
PCRE2.v10.36.0+2.powerpc64le-linux-gnu.tar.gz/md5/2ece20fa11fdbae393fb85a41ee1e17d
PCRE2.v10.36.0+2.powerpc64le-linux-gnu.tar.gz/sha512/e6fbc03efed53da43b3b15b31cc0fbd85aaf5cc65564392b8c7bc02695d3a32fe832880d547c37b3a508197a4d4023be0aef910cd36da69a54ee184880cc0438
PCRE2.v10.36.0+2.x86_64-apple-darwin.tar.gz/md5/26c560dd16b460a1ac7c81807edbacc6
PCRE2.v10.36.0+2.x86_64-apple-darwin.tar.gz/sha512/ce56bc399e204e4b437d3f398b4e68c33d9c55ec990126523f3be0b14571603eea3b3104e1909deb22eab3f5302da72fcc690d1a279cb85ef598c42a5ef9a8a9
PCRE2.v10.36.0+2.x86_64-linux-gnu.tar.gz/md5/474dec882abefcb56febddc309ed4682
PCRE2.v10.36.0+2.x86_64-linux-gnu.tar.gz/sha512/882898c2d6cab8cd5ecf1027388bd08ddd1fec2339b45388786f98c53518bf7ca56f9e2cccb4a5ede953cc85e6c1cc54a5a00f80ece4cbfdc17e5f6116a9976a
PCRE2.v10.36.0+2.x86_64-linux-musl.tar.gz/md5/af6d90c071437c5529306a5bafe6f6aa
PCRE2.v10.36.0+2.x86_64-linux-musl.tar.gz/sha512/92a16960d7514c829a5f372a40472c87c717d49e9694030ae0cb39106d6530f5bb169155a74a416bf340139f9dea231ddc2b7ae6e54fcb935f6a9bf672b5e0c1
PCRE2.v10.36.0+2.x86_64-unknown-freebsd.tar.gz/md5/97410029c0b6ed5f7fb0d14e1f1215ea
PCRE2.v10.36.0+2.x86_64-unknown-freebsd.tar.gz/sha512/229e910759da2959ddef83ca89e05a050c266b8e755c85dfce6a786658be541911c3b78a0fca7dfdee1b41fbbdccf57da75cf9fe45fd2821dba8d2aaeabfd538
PCRE2.v10.36.0+2.x86_64-w64-mingw32.tar.gz/md5/39827564bca329768e0380bd79b869fe
PCRE2.v10.36.0+2.x86_64-w64-mingw32.tar.gz/sha512/4579049b99fca3334d726b0ca1f07524d1643a758e375b5b02b8f294ba7d9c2a4130da1a1523de29033233a8848105b3cb660e15bb4a759593405d805ee99883
pcre2-10.36.tar.bz2/md5/bd7e7421ff3fa2e2d5429229ecfad095
pcre2-10.36.tar.bz2/sha512/fc2a920562c80c3d31cedd94028fab55314ae0fb168cac7178f286c344a11fc514939edc3b83b8e0b57c872db4e595fd5530fd1d4b8c779be629553e9ec965a3
17 changes: 17 additions & 0 deletions deps/patches/pcre2-sljit-nomprotect.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
diff --git a/sljit_src/sljitExecAllocator.c b/sljit_src/sljitExecAllocator.c
index 2e1c138..bae8cd6 100644
--- a/sljit_src/sljitExecAllocator.c
+++ b/sljit_src/sljitExecAllocator.c
@@ -182,10 +182,12 @@ static SLJIT_INLINE void* alloc_chunk(sljit_uw size)
if (retval == MAP_FAILED)
return NULL;

+#ifdef SLIJT_WX_OS_NEEDSCHEK
if (mprotect(retval, size, prot) < 0) {
munmap(retval, size);
return NULL;
}
+#endif

SLJIT_UPDATE_WX_FLAGS(retval, (uint8_t *)retval + size, 0);

8 changes: 6 additions & 2 deletions deps/pcre.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,14 @@ $(SRCCACHE)/pcre2-$(PCRE_VER)/pcre2-sljit-apple-silicon-support.patch-applied: $
cd $(SRCCACHE)/pcre2-$(PCRE_VER) && patch -d src/sljit -p2 -f < $(SRCDIR)/patches/pcre2-sljit-apple-silicon-support.patch
echo 1 > $@

$(BUILDDIR)/pcre2-$(PCRE_VER)/build-configured: $(SRCCACHE)/pcre2-$(PCRE_VER)/source-extracted $(SRCCACHE)/pcre2-$(PCRE_VER)/pcre2-sljit-apple-silicon-support.patch-applied
$(SRCCACHE)/pcre2-$(PCRE_VER)/pcre2-sljit-nomprotect.patch-applied: $(SRCCACHE)/pcre2-$(PCRE_VER)/pcre2-sljit-apple-silicon-support.patch-applied
cd $(SRCCACHE)/pcre2-$(PCRE_VER) && patch -d src/sljit -p2 -f < $(SRCDIR)/patches/pcre2-sljit-nomprotect.patch
echo 1 > $@

$(BUILDDIR)/pcre2-$(PCRE_VER)/build-configured: $(SRCCACHE)/pcre2-$(PCRE_VER)/source-extracted $(SRCCACHE)/pcre2-$(PCRE_VER)/pcre2-sljit-apple-silicon-support.patch-applied $(SRCCACHE)/pcre2-$(PCRE_VER)/pcre2-sljit-nomprotect.patch-applied
mkdir -p $(dir $@)
cd $(dir $@) && \
$(dir $<)/configure $(CONFIGURE_COMMON) --enable-jit --includedir=$(build_includedir) CFLAGS="$(CFLAGS) $(PCRE_CFLAGS)" LDFLAGS="$(LDFLAGS) $(PCRE_LDFLAGS)"
$(dir $<)/configure $(CONFIGURE_COMMON) --enable-jit --includedir=$(build_includedir) CFLAGS="$(CFLAGS) $(PCRE_CFLAGS) -g -O0" LDFLAGS="$(LDFLAGS) $(PCRE_LDFLAGS)"
echo 1 > $@

$(BUILDDIR)/pcre2-$(PCRE_VER)/build-compiled: $(BUILDDIR)/pcre2-$(PCRE_VER)/build-configured
Expand Down
2 changes: 1 addition & 1 deletion stdlib/PCRE2_jll/Project.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "PCRE2_jll"
uuid = "efcefdf7-47ab-520b-bdef-62a2eaa19f15"
version = "10.36.0+1"
version = "10.36.0+2"

[deps]
Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
Expand Down

0 comments on commit bca401c

Please sign in to comment.