From a3d267bc9a542554af547b53ddafbe5b312f33c6 Mon Sep 17 00:00:00 2001 From: Thomas Debesse Date: Tue, 20 Oct 2026 06:32:16 +0200 Subject: [PATCH 1/3] licence,src/third_party/curl: remove leftovers --- LICENSE | 34 ---------------------------------- src/third_party/curl/COPYING | 22 ---------------------- 2 files changed, 56 deletions(-) delete mode 100644 src/third_party/curl/COPYING diff --git a/LICENSE b/LICENSE index d6435f048..f74567a8b 100644 --- a/LICENSE +++ b/LICENSE @@ -389,40 +389,6 @@ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --------------------------------------------------------------------- -License for -src/third_party/curl/curl.h -src/third_party/curl/curlbuild.h -src/third_party/curl/curlrules.h -src/third_party/curl/curlver.h -src/third_party/curl/easy.h -src/third_party/curl/mprintf.h -src/third_party/curl/multi.h -src/third_party/curl/stdcheaders.h -src/third_party/curl/typecheck-gcc.h - -COPYRIGHT AND PERMISSION NOTICE - -Copyright (c) 1996 - 2011, Daniel Stenberg, . - -All rights reserved. - -Permission to use, copy, modify, and distribute this software for any purpose -with or without fee is hereby granted, provided that the above copyright -notice and this permission notice appear in all copies. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN -NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE -OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of a copyright holder shall not -be used in advertising or otherwise to promote the sale, use or other dealings -in this Software without prior written authorization of the copyright holder. - -------------------------------------------------------------------- License for src/common/mac/GTMDefines.h diff --git a/src/third_party/curl/COPYING b/src/third_party/curl/COPYING deleted file mode 100644 index 610fbdb07..000000000 --- a/src/third_party/curl/COPYING +++ /dev/null @@ -1,22 +0,0 @@ -COPYRIGHT AND PERMISSION NOTICE - -Copyright (c) 1996 - 2011, Daniel Stenberg, . - -All rights reserved. - -Permission to use, copy, modify, and distribute this software for any purpose -with or without fee is hereby granted, provided that the above copyright -notice and this permission notice appear in all copies. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN -NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE -OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of a copyright holder shall not -be used in advertising or otherwise to promote the sale, use or other dealings -in this Software without prior written authorization of the copyright holder. - From 40da957bef5f8d3e0472a24c8924b29620451114 Mon Sep 17 00:00:00 2001 From: Thomas Debesse Date: Tue, 20 Oct 2026 04:33:11 +0000 Subject: [PATCH 2/3] src/common/linux/http_upload: use system curl --- src/common/linux/http_upload.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/linux/http_upload.cc b/src/common/linux/http_upload.cc index fa652a5e5..454b7232a 100644 --- a/src/common/linux/http_upload.cc +++ b/src/common/linux/http_upload.cc @@ -34,7 +34,7 @@ #include #include -#include "third_party/curl/curl.h" +#include #include From b62cd339b4a3bffd2b91026ff21899a8305742c6 Mon Sep 17 00:00:00 2001 From: Thomas Debesse Date: Tue, 20 Oct 2026 05:49:22 +0200 Subject: [PATCH 3/3] configure,makefile: make possible to not build upload tools (requiring curl), only build them on Linux --- Makefile.am | 19 ++++++++++++++----- configure.ac | 7 +++++++ 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index aaa1701f0..d1f508d4d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -272,9 +272,11 @@ if LINUX_HOST lib_LIBRARIES += src/client/linux/libbreakpad_client.a pkgconfig_DATA += breakpad-client.pc +if ENABLE_UPLOAD_TOOLS check_PROGRAMS += \ src/client/linux/linux_client_unittest \ src/common/linux/google_crashdump_uploader_test +endif EXTRA_PROGRAMS += \ src/client/linux/linux_dumper_unittest_helper \ @@ -300,13 +302,14 @@ bin_PROGRAMS += \ check_PROGRAMS += \ src/common/dumper_unittest -# slipher: disabling these to avoid curl dependency -# bin_PROGRAMS += \ -# src/tools/linux/symupload/minidump_upload \ -# src/tools/linux/symupload/sym_upload - if LINUX_HOST +if ENABLE_UPLOAD_TOOLS +bin_PROGRAMS += \ + src/tools/linux/symupload/minidump_upload \ + src/tools/linux/symupload/sym_upload +endif + bin_PROGRAMS += \ src/tools/linux/core2md/core2md \ src/tools/linux/pid2md/pid2md \ @@ -733,6 +736,8 @@ src_tools_linux_md2core_minidump_2_core_SOURCES = \ src/tools/linux/md2core/minidump-2-core.cc \ src/tools/linux/md2core/minidump_memory_range.h +if LINUX_HOST +if ENABLE_UPLOAD_TOOLS src_tools_linux_symupload_minidump_upload_SOURCES = \ src/common/linux/http_upload.cc \ src/common/path_helper.cc \ @@ -751,6 +756,8 @@ src_tools_linux_symupload_sym_upload_SOURCES = \ src/common/path_helper.cc \ src/tools/linux/symupload/sym_upload.cc src_tools_linux_symupload_sym_upload_LDADD = -ldl -lcurl +endif +endif src_tools_mac_dump_syms_dump_syms_mac_SOURCES = \ src/common/dwarf_cfi_to_module.cc \ @@ -913,6 +920,7 @@ src_common_mac_macho_reader_unittest_LDADD = \ $(TEST_LIBS) \ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) +if ENABLE_UPLOAD_TOOLS src_common_linux_google_crashdump_uploader_test_SOURCES = \ src/common/linux/google_crashdump_uploader.cc \ src/common/linux/google_crashdump_uploader_test.cc \ @@ -923,6 +931,7 @@ src_common_linux_google_crashdump_uploader_test_LDADD = \ $(TEST_LIBS) \ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) \ -ldl +endif src_tools_linux_md2core_minidump_2_core_unittest_SOURCES = \ src/tools/linux/md2core/minidump_memory_range_unittest.cc diff --git a/configure.ac b/configure.ac index bf2eea14a..db62c8e4e 100644 --- a/configure.ac +++ b/configure.ac @@ -175,6 +175,13 @@ if test x$LINUX_HOST = xfalse -a "x$enable_processor" != xyes -a "x$enable_tools AC_MSG_ERROR([--disable-processor and --disable-tools were specified, and not building for Linux. Nothing to build!]) fi +AC_ARG_ENABLE([upload_tools], + [AS_HELP_STRING([--disable-upload-tools], [Do not build upload tools])], + [enable_upload_tools=$enableval], + [enable_upload_tools=yes]) + +AM_CONDITIONAL([ENABLE_UPLOAD_TOOLS], [test "x$enable_upload_tools" = "xyes"]) + AC_ARG_ENABLE(system-test-libs, AS_HELP_STRING([--enable-system-test-libs], [Use gtest/gmock/etc... from the system instead ]