From 548b7e724df5bf93b8640ebd5d80a5bd7e5fa288 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= Date: Thu, 20 Feb 2025 09:15:45 +0100 Subject: [PATCH] net-analyzer/wireshark: remove obsolete kerberos workaround MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: https://bugs.gentoo.org/673076 Signed-off-by: Holger Hoffstätte Signed-off-by: Sam James --- net-analyzer/wireshark/wireshark-4.4.4.ebuild | 13 ------------- net-analyzer/wireshark/wireshark-9999.ebuild | 13 ------------- 2 files changed, 26 deletions(-) diff --git a/net-analyzer/wireshark/wireshark-4.4.4.ebuild b/net-analyzer/wireshark/wireshark-4.4.4.ebuild index 475ae8d5d1a7d..902df8230a39c 100644 --- a/net-analyzer/wireshark/wireshark-4.4.4.ebuild +++ b/net-analyzer/wireshark/wireshark-4.4.4.ebuild @@ -154,19 +154,6 @@ src_configure() { python_setup - # Workaround bug #213705. If krb5-config --libs has -lcrypto then pass - # --with-ssl to ./configure. (Mimics code from acinclude.m4). - if use kerberos ; then - case $(krb5-config --libs) in - *-lcrypto*) - ewarn "Kerberos was built with ssl support: linkage with openssl is enabled." - ewarn "Note there are annoying license incompatibilities between the OpenSSL" - ewarn "license and the GPL, so do your check before distributing such package." - mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) ) - ;; - esac - fi - if use gui ; then append-cxxflags -fPIC -DPIC fi diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild b/net-analyzer/wireshark/wireshark-9999.ebuild index 475ae8d5d1a7d..902df8230a39c 100644 --- a/net-analyzer/wireshark/wireshark-9999.ebuild +++ b/net-analyzer/wireshark/wireshark-9999.ebuild @@ -154,19 +154,6 @@ src_configure() { python_setup - # Workaround bug #213705. If krb5-config --libs has -lcrypto then pass - # --with-ssl to ./configure. (Mimics code from acinclude.m4). - if use kerberos ; then - case $(krb5-config --libs) in - *-lcrypto*) - ewarn "Kerberos was built with ssl support: linkage with openssl is enabled." - ewarn "Note there are annoying license incompatibilities between the OpenSSL" - ewarn "license and the GPL, so do your check before distributing such package." - mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) ) - ;; - esac - fi - if use gui ; then append-cxxflags -fPIC -DPIC fi