commit: 548b7e724df5bf93b8640ebd5d80a5bd7e5fa288 Author: Holger Hoffstätte <holger <AT> applied-asynchrony <DOT> com> AuthorDate: Thu Feb 20 08:15:45 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Feb 20 08:42:03 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=548b7e72
net-analyzer/wireshark: remove obsolete kerberos workaround Closes: https://bugs.gentoo.org/673076 Signed-off-by: Holger Hoffstätte <holger <AT> applied-asynchrony.com> Signed-off-by: Sam James <sam <AT> gentoo.org> 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 475ae8d5d1a7..902df8230a39 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 475ae8d5d1a7..902df8230a39 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
