From 2ebf4e66350074a47bf45f2f778b127ab599a9f3 Mon Sep 17 00:00:00 2001 From: Magnus Kessler Date: Tue, 29 Aug 2023 15:06:25 +0200 Subject: [PATCH] sentinel-*: Patches to fix compilation with OpenWRT main / 23.05 Recent versions of the msgpack C-library are installed as msgpack-c. Signed-of-by: Magnus Kessler --- ...ompilation-with-OpenWRT-master-23.05.patch | 28 +++++++++++++++++++ ...ompilation-with-OpenWRT-master-23.05.patch | 28 +++++++++++++++++++ ...ompilation-with-OpenWRT-master-23.05.patch | 28 +++++++++++++++++++ 3 files changed, 84 insertions(+) create mode 100644 collect/sentinel/sentinel-fwlogs/patches/0001-Fix-compilation-with-OpenWRT-master-23.05.patch create mode 100644 collect/sentinel/sentinel-minipot/patches/0001-Fix-compilation-with-OpenWRT-master-23.05.patch create mode 100644 collect/sentinel/sentinel-proxy/patches/0001-Fix-compilation-with-OpenWRT-master-23.05.patch diff --git a/collect/sentinel/sentinel-fwlogs/patches/0001-Fix-compilation-with-OpenWRT-master-23.05.patch b/collect/sentinel/sentinel-fwlogs/patches/0001-Fix-compilation-with-OpenWRT-master-23.05.patch new file mode 100644 index 000000000..31f26b557 --- /dev/null +++ b/collect/sentinel/sentinel-fwlogs/patches/0001-Fix-compilation-with-OpenWRT-master-23.05.patch @@ -0,0 +1,28 @@ +From cc5b3fe680a35b144e64cf8c1814cd0e0fabb955 Mon Sep 17 00:00:00 2001 +From: Magnus Kessler +Date: Wed, 2 Aug 2023 17:00:25 +0200 +Subject: [PATCH] Fix compilation with OpenWRT master / 23.05 + +Recent versions of the msgpack C-library are installed as msgpack-c. + +Signed-of-by: Magnus Kessler +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index d873c68..daa2f1b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -13,7 +13,7 @@ AC_PROG_CC + AC_GNU_SOURCE + + PKG_CHECK_MODULES([czmq], [libczmq]) +-PKG_CHECK_MODULES([msgpack], [msgpack]) ++PKG_CHECK_MODULES([msgpack], [msgpack-c],,[PKG_CHECK_MODULES([msgpack], [msgpack])]) + PKG_CHECK_MODULES([logc], [logc >= 0.2.0 logc_argp]) + PKG_CHECK_MODULES([logc_czmq], [libczmq_logc]) + PKG_CHECK_MODULES([libconfig], [libconfig]) +-- +2.34.1 + diff --git a/collect/sentinel/sentinel-minipot/patches/0001-Fix-compilation-with-OpenWRT-master-23.05.patch b/collect/sentinel/sentinel-minipot/patches/0001-Fix-compilation-with-OpenWRT-master-23.05.patch new file mode 100644 index 000000000..b856a0938 --- /dev/null +++ b/collect/sentinel/sentinel-minipot/patches/0001-Fix-compilation-with-OpenWRT-master-23.05.patch @@ -0,0 +1,28 @@ +From 55b5e06368b1f1b4f0e957941e80a8797a6a1e37 Mon Sep 17 00:00:00 2001 +From: Magnus Kessler +Date: Wed, 2 Aug 2023 17:01:00 +0200 +Subject: [PATCH] Fix compilation with OpenWRT master / 23.05 + +Recent versions of the msgpack C-library are installed as msgpack-c. + +Signed-of-by: Magnus Kessler +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 1ac00b9..36fcb90 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -14,7 +14,7 @@ AC_GNU_SOURCE + + dnl Libraries + PKG_CHECK_MODULES([czmq], [libczmq]) +-PKG_CHECK_MODULES([msgpack], [msgpack]) ++PKG_CHECK_MODULES([msgpack], [msgpack-c],,[PKG_CHECK_MODULES([msgpack], [msgpack])]) + PKG_CHECK_MODULES([libevent], [libevent]) + PKG_CHECK_MODULES([base64c], [base64c]) + PKG_CHECK_MODULES([logc], [logc >= 0.2.0 logc_argp]) +-- +2.34.1 + diff --git a/collect/sentinel/sentinel-proxy/patches/0001-Fix-compilation-with-OpenWRT-master-23.05.patch b/collect/sentinel/sentinel-proxy/patches/0001-Fix-compilation-with-OpenWRT-master-23.05.patch new file mode 100644 index 000000000..31a15b18f --- /dev/null +++ b/collect/sentinel/sentinel-proxy/patches/0001-Fix-compilation-with-OpenWRT-master-23.05.patch @@ -0,0 +1,28 @@ +From 5da0dfe0b3a7ad0488ddf8550f15e6b0832fba59 Mon Sep 17 00:00:00 2001 +From: Magnus Kessler +Date: Wed, 2 Aug 2023 14:39:47 +0200 +Subject: [PATCH] Fix compilation with OpenWRT master / 23.05 + +Recent versions of the msgpack C-library are installed as msgpack-c. + +Signed-of-by: Magnus Kessler +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index a72921e..fea58a1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -22,7 +22,7 @@ PKG_CHECK_MODULES([libcrypto], [libcrypto]) + PKG_CHECK_MODULES([zlib], [zlib]) + PKG_CHECK_MODULES([libczmq], [libczmq]) + PKG_CHECK_MODULES([libconfig], [libconfig]) +-PKG_CHECK_MODULES([msgpack], [msgpack]) ++PKG_CHECK_MODULES([msgpack], [msgpack-c],,[PKG_CHECK_MODULES([msgpack], [msgpack])]) + PKG_CHECK_MODULES([logc], [logc >= 0.3.0 logc_argp]) + PKG_CHECK_MODULES([logc_czmq], [libczmq_logc]) + PKG_CHECK_MODULES([openssl], [openssl]) +-- +2.34.1 +