diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-05-12 16:42:50 +0300 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-05-12 16:42:50 +0300 |
commit | 752d6256e5204b958b0ef7905675a940b5e9172f (patch) | |
tree | 330d16e6362a49cbed8875a777fe641a43376cd3 /net-analyzer/wireshark/files | |
parent | 0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff) |
gentoo resync : 12.05.2022
Diffstat (limited to 'net-analyzer/wireshark/files')
-rw-r--r-- | net-analyzer/wireshark/files/wireshark-3.6.1-fix-build-no-zlib.patch | 82 |
1 files changed, 0 insertions, 82 deletions
diff --git a/net-analyzer/wireshark/files/wireshark-3.6.1-fix-build-no-zlib.patch b/net-analyzer/wireshark/files/wireshark-3.6.1-fix-build-no-zlib.patch deleted file mode 100644 index 3a935ce89969..000000000000 --- a/net-analyzer/wireshark/files/wireshark-3.6.1-fix-build-no-zlib.patch +++ /dev/null @@ -1,82 +0,0 @@ -https://gitlab.com/wireshark/wireshark/-/commit/5dc11653a364975e5cc9a4a994d9d88e138e8385.patch -https://gitlab.com/wireshark/wireshark/-/issues/17899 - -From: Guy Harris <gharris@sonic.net> -Date: Fri, 21 Jan 2022 15:04:28 -0800 -Subject: [PATCH] Fix no-ZLib builds. - -Don't use ZLib routines or data types if we're built without ZLib. - -Don't support --compress-type=gzip, or a gzip check box in the Output -pane of the Capture Options dialog, if we're built without ZLib. - -Fixes #17899. - - -(cherry picked from commit 125f5cbd881c2e1236d968a3e8fdcf5af2606e77) ---- a/capture_opts.c -+++ b/capture_opts.c -@@ -986,9 +986,18 @@ capture_opts_add_opt(capture_options *capture_opts, int opt, const char *optarg_ - if (strcmp(optarg_str_p, "none") == 0) { - ; - } else if (strcmp(optarg_str_p, "gzip") == 0) { -+#ifdef HAVE_ZLIB - ; -+#else -+ cmdarg_err("'gzip' compression is not supported"); -+ return 1; -+#endif - } else { -+#ifdef HAVE_ZLIB - cmdarg_err("parameter of --compress-type can be 'none' or 'gzip'"); -+#else -+ cmdarg_err("parameter of --compress-type can only be 'none'"); -+#endif - return 1; - } - capture_opts->compress_type = g_strdup(optarg_str_p); ---- a/ringbuffer.c -+++ b/ringbuffer.c -@@ -124,6 +124,7 @@ static void CleanupOldCap(gchar* name) - g_mutex_unlock(&rb_data.mutex); - } - -+#ifdef HAVE_ZLIB - /* - * compress capture file - */ -@@ -200,6 +201,7 @@ static int ringbuf_start_compress_file(rb_file* rfile) - g_thread_new("exec_compress", &exec_compress_thread, name); - return 0; - } -+#endif - - /* - * create the next filename and open a new binary file with that name -@@ -216,9 +218,11 @@ static int ringbuf_open_file(rb_file *rfile, int *err) - /* remove old file (if any, so ignore error) */ - ws_unlink(rfile->name); - } -+#ifdef HAVE_ZLIB - else if (rb_data.compress_type != NULL && strcmp(rb_data.compress_type, "gzip") == 0) { - ringbuf_start_compress_file(rfile); - } -+#endif - g_free(rfile->name); - } - ---- a/ui/qt/capture_options_dialog.cpp -+++ b/ui/qt/capture_options_dialog.cpp -@@ -486,7 +486,11 @@ void CaptureOptionsDialog::on_gbNewFileAuto_toggled(bool checked) - ui->stopMBComboBox->setEnabled(checked?false:true); - ui->gbCompression->setEnabled(checked); - ui->rbCompressionNone->setEnabled(checked); -+#ifdef HAVE_ZLIB - ui->rbCompressionGzip->setEnabled(checked); -+#else -+ ui->rbCompressionGzip->setEnabled(false); -+#endif - } - - void CaptureOptionsDialog::on_cbUpdatePacketsRT_toggled(bool checked) -GitLab |