[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/files/, net-analyzer/wireshark/

[Sam James]

commit:     727aed785bfa82cf4546f02e7d4f8a590c39f035
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 22 04:21:31 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 22 04:21:42 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=727aed78

net-analyzer/wireshark: fix build without zlib

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/wireshark-3.6.1-fix-build-no-zlib.patch  | 82 ++++++++++++++++++++++
 net-analyzer/wireshark/wireshark-3.6.1.ebuild      |  1 +
 2 files changed, 83 insertions(+)

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
new file mode 100644
index 000000000000..3a935ce89969
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-3.6.1-fix-build-no-zlib.patch
@@ -0,0 +1,82 @@
+https://gitlab.com/wireshark/wireshark/-/commit/5dc11653a364975e5cc9a4a994d9d88e138e8385.patch
+https://gitlab.com/wireshark/wireshark/-/issues/17899
+
+From: Guy Harris <gharris@×××××.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

diff --git a/net-analyzer/wireshark/wireshark-3.6.1.ebuild b/net-analyzer/wireshark/wireshark-3.6.1.ebuild
index c90b5a717962..a4fec6f5c579 100644
--- a/net-analyzer/wireshark/wireshark-3.6.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.1.ebuild
@@ -96,6 +96,7 @@ RDEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
 	"${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
+	"${FILESDIR}"/${P}-fix-build-no-zlib.patch
 )
 
 pkg_setup() {