Skip to content

Commit 9d6c9bd

Browse files
authored
Update to latest curl, mbedtls, and pcre (#23498)
* Update to latest curl, mbedtls, and pcre * reason for the pcre patch was solved differently upstream
1 parent 7e35ac6 commit 9d6c9bd

File tree

19 files changed

+12
-30
lines changed

19 files changed

+12
-30
lines changed

deps/Versions.make

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
LLVM_VER = 3.9.1
2-
PCRE_VER = 10.23
2+
PCRE_VER = 10.30
33
DSFMT_VER = 2.2.3
44
LAPACK_VER = 3.5.0
55
ARPACK_VER = 3.3.0
@@ -9,5 +9,5 @@ OSXUNWIND_VER = 0.0.3
99
GMP_VER = 6.1.2
1010
MPFR_VER = 3.1.5
1111
PATCHELF_VER = 0.9
12-
MBEDTLS_VER = 2.5.1
13-
CURL_VER = 7.54.1
12+
MBEDTLS_VER = 2.6.0
13+
CURL_VER = 7.55.1

deps/checksums/curl-7.54.1.tar.bz2/md5

Lines changed: 0 additions & 1 deletion
This file was deleted.

deps/checksums/curl-7.54.1.tar.bz2/sha512

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
8c153f282bbe482495214654cdcd4182
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
bfeb39e94b8378519b2efba0a476636b80dbee3434104b98464ee81ce3871eb134e065f52abe8bedb69681b43576cb30655c8be0be6115386859d0cb426d745b

deps/checksums/mbedtls-2.5.1-apache.tgz/md5

Lines changed: 0 additions & 1 deletion
This file was deleted.

deps/checksums/mbedtls-2.5.1-apache.tgz/sha512

Lines changed: 0 additions & 1 deletion
This file was deleted.

deps/checksums/mbedtls-2.5.1-gpl.tgz/md5

Lines changed: 0 additions & 1 deletion
This file was deleted.

deps/checksums/mbedtls-2.5.1-gpl.tgz/sha512

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
01ede06f7d00dd8a6626494d95a63f6b
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
5eb47d95a31c63e43074a115d141dedae869c43cbe62d5cf7bde11440e14fb8879ac6ed204d0d741b3501b8ba551019a5d47cbdf6673d18b61296be4463e9ffd
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
f03b8cf455f246e70e83662d534e156f
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ed0765a476bf8a318fac1389b49d2b42e1a4ac5d4df749d241b24b8c8acea59c62fbb17e4b14057203f16ba7c58b8723ececf74d8a6b065a233a87696155076a

deps/checksums/pcre2-10.23.tar.bz2/md5

Lines changed: 0 additions & 1 deletion
This file was deleted.

deps/checksums/pcre2-10.23.tar.bz2/sha512

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
d3adf4b130eed854a530390f00020a65
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
f247a9f917c75920793b9919a45bb1426d126246e7a5d04e39d9407e44b5781f894a90cd3d232b385436b2f22be391335ab782664dd3a28c79058a2fcc74dc3e

deps/patches/pcre-mingw.patch

Lines changed: 0 additions & 13 deletions
This file was deleted.

deps/pcre.mk

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,7 @@ $(SRCCACHE)/pcre2-$(PCRE_VER)/source-extracted: $(SRCCACHE)/pcre2-$(PCRE_VER).ta
1313
touch -c $(SRCCACHE)/pcre2-$(PCRE_VER)/configure # old target
1414
echo $1 > $@
1515

16-
# patch for mingw build https://bugs.exim.org/show_bug.cgi?id=2067
17-
$(SRCCACHE)/pcre2-$(PCRE_VER)/pcre-mingw.patch-applied: $(SRCCACHE)/pcre2-$(PCRE_VER)/source-extracted
18-
cd $(dir $@) && patch -p1 < $(SRCDIR)/patches/pcre-mingw.patch
19-
echo 1 > $@
20-
21-
$(BUILDDIR)/pcre2-$(PCRE_VER)/build-configured: $(SRCCACHE)/pcre2-$(PCRE_VER)/source-extracted $(SRCCACHE)/pcre2-$(PCRE_VER)/pcre-mingw.patch-applied
16+
$(BUILDDIR)/pcre2-$(PCRE_VER)/build-configured: $(SRCCACHE)/pcre2-$(PCRE_VER)/source-extracted
2217
mkdir -p $(dir $@)
2318
cd $(dir $@) && \
2419
$(dir $<)/configure $(CONFIGURE_COMMON) --enable-jit --includedir=$(build_includedir) CFLAGS="$(CFLAGS) $(PCRE_CFLAGS)" LDFLAGS="$(LDFLAGS) $(PCRE_LDFLAGS)"

0 commit comments

Comments
 (0)