From 36c29555083098a4442eb5b337e2922641f30d6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Fri, 13 Oct 2023 14:47:43 -0400
Subject: [PATCH] update asio to 1.28
Change-Id: I32c4f19a14f1f18b5bfb6e0975d5ca6964d7297f
---
...-Disable-building-tests-and-examples.patch | 56 +++++++++++++++++++
contrib/src/asio/SHA512SUMS | 2 +-
contrib/src/asio/no_tests_examples.patch | 50 -----------------
contrib/src/asio/package.json | 2 +-
contrib/src/asio/rules.mak | 4 +-
5 files changed, 60 insertions(+), 54 deletions(-)
create mode 100644 contrib/src/asio/0001-Disable-building-tests-and-examples.patch
delete mode 100755 contrib/src/asio/no_tests_examples.patch
diff --git a/contrib/src/asio/0001-Disable-building-tests-and-examples.patch b/contrib/src/asio/0001-Disable-building-tests-and-examples.patch
new file mode 100644
index 0000000000..38566e3481
--- /dev/null
+++ b/contrib/src/asio/0001-Disable-building-tests-and-examples.patch
@@ -0,0 +1,56 @@
+From 5d891ca55161aea53852ef70707d39133925dbe3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
+Date: Fri, 13 Oct 2023 14:44:13 -0400
+Subject: [PATCH] Disable building tests and examples
+
+---
+ asio/src/Makefile.am | 36 ------------------------------------
+ 1 file changed, 36 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 0345f094..f2fbcefe 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,39 +1,3 @@
+-if !STANDALONE
+-EXAMPLES_CPP03 = examples/cpp03
+-endif
+-
+-if HAVE_CXX11
+-EXAMPLES_CPP11 = examples/cpp11
+-endif
+-
+-if HAVE_CXX14
+-EXAMPLES_CPP14 = examples/cpp14
+-endif
+-
+-if HAVE_CXX17
+-EXAMPLES_CPP17 = examples/cpp17
+-endif
+-
+-if HAVE_CXX20
+-EXAMPLES_CPP20 = examples/cpp20
+-endif
+-
+-SUBDIRS = \
+- $(EXAMPLES_CPP03) \
+- $(EXAMPLES_CPP11) \
+- $(EXAMPLES_CPP14) \
+- $(EXAMPLES_CPP17) \
+- $(EXAMPLES_CPP20) \
+- tests
+-
+-DIST_SUBDIRS = \
+- examples/cpp03 \
+- examples/cpp11 \
+- examples/cpp14 \
+- examples/cpp17 \
+- examples/cpp20 \
+- tests
+-
+ EXTRA_DIST = \
+ Makefile.mgw \
+ Makefile.msc \
+--
+2.39.3 (Apple Git-145)
+
diff --git a/contrib/src/asio/SHA512SUMS b/contrib/src/asio/SHA512SUMS
index 7b0a00214f..025f8f5cbd 100644
--- a/contrib/src/asio/SHA512SUMS
+++ b/contrib/src/asio/SHA512SUMS
@@ -1 +1 @@
-7658293f2be1f5ea659a424614b2f3092954df45802fbb0031b7983d11762f4f68d18eab076e14954df3a24ce89ff26bd4bebea88b9a3dc680387252efec8398 asio-asio-1-22-1.tar.gz
\ No newline at end of file
+4ba0944b203e18524016de2e21ffa0fa6325414af5f6cff6d02450c15e0d7111cec91f7f125ae78d3b3a6f76c6b2c7155738d1830b3250e98c68b5304328f345 asio-asio-1-28-1.tar.gz
diff --git a/contrib/src/asio/no_tests_examples.patch b/contrib/src/asio/no_tests_examples.patch
deleted file mode 100755
index 391ffdaecf..0000000000
--- a/contrib/src/asio/no_tests_examples.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 1ba8c0b03426b88e00dab833dd6e54cc91f595ec Mon Sep 17 00:00:00 2001
-From: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
-Date: Tue, 6 Oct 2020 09:42:45 -0400
-Subject: Disable building tests and examples
-
----
- src/Makefile.am | 20 --------------------
- 1 file changed, 20 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index e9b20e60..f2fbcefe 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1,33 +1,3 @@
--if !STANDALONE
--EXAMPLES_CPP03 = examples/cpp03
--endif
--
--if HAVE_CXX11
--EXAMPLES_CPP11 = examples/cpp11
--endif
--
--if HAVE_CXX14
--EXAMPLES_CPP14 = examples/cpp14
--endif
--
--if HAVE_CXX17
--EXAMPLES_CPP17 = examples/cpp17
--endif
--
--if HAVE_CXX20
--EXAMPLES_CPP20 = examples/cpp20
--endif
--
--SUBDIRS = \
-- $(EXAMPLES_CPP03) \
-- $(EXAMPLES_CPP11) \
-- $(EXAMPLES_CPP14) \
-- $(EXAMPLES_CPP17) \
-- $(EXAMPLES_CPP20) \
-- tests
--
--DIST_SUBDIRS = examples/cpp03 examples/cpp11 examples/cpp14 examples/cpp17 tests
--
- EXTRA_DIST = \
- Makefile.mgw \
- Makefile.msc \
---
-2.26.2
-
diff --git a/contrib/src/asio/package.json b/contrib/src/asio/package.json
index c81580b6b3..3e9c594e56 100644
--- a/contrib/src/asio/package.json
+++ b/contrib/src/asio/package.json
@@ -1,6 +1,6 @@
{
"name": "asio",
- "version": "asio-1-22-2",
+ "version": "asio-1-28-1",
"url": "https://github.com/chriskohlhoff/asio/archive/__VERSION__.tar.gz",
"deps": ["openssl"],
"patches": [],
diff --git a/contrib/src/asio/rules.mak b/contrib/src/asio/rules.mak
index 0f6180ac8b..38e9b7ded0 100644
--- a/contrib/src/asio/rules.mak
+++ b/contrib/src/asio/rules.mak
@@ -18,7 +18,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
-ASIO_VERSION := asio-1-22-1
+ASIO_VERSION := asio-1-28-1
ASIO_URL := https://github.com/chriskohlhoff/asio/archive/$(ASIO_VERSION).tar.gz
# Pure dependency of restinio: do not add to PKGS.
@@ -29,7 +29,7 @@ $(TARBALLS)/asio-$(ASIO_VERSION).tar.gz:
asio: asio-$(ASIO_VERSION).tar.gz
$(UNPACK)
mv asio-$(ASIO_VERSION)/asio/* asio-$(ASIO_VERSION)/ && rm -rf asio-$(ASIO_VERSION)/asio
- $(APPLY) $(SRC)/asio/no_tests_examples.patch
+ $(APPLY) $(SRC)/asio/0001-Disable-building-tests-and-examples.patch
$(MOVE)
.asio: asio .sum-asio
--
GitLab