From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 124841582EF for ; Thu, 20 Feb 2025 08:42:39 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id E9F3C3430DE for ; Thu, 20 Feb 2025 08:42:38 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id E4BC71102A2; Thu, 20 Feb 2025 08:42:37 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id D6E2E1102A2 for ; Thu, 20 Feb 2025 08:42:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7E8BE3430DE for ; Thu, 20 Feb 2025 08:42:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D1B521596 for ; Thu, 20 Feb 2025 08:42:35 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1740040923.548b7e724df5bf93b8640ebd5d80a5bd7e5fa288.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/wireshark/wireshark-4.4.4.ebuild net-analyzer/wireshark/wireshark-9999.ebuild X-VCS-Directories: net-analyzer/wireshark/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 548b7e724df5bf93b8640ebd5d80a5bd7e5fa288 X-VCS-Branch: master Date: Thu, 20 Feb 2025 08:42:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c3e53750-b73d-490f-aab1-c20796394eb8 X-Archives-Hash: a81a2400c6ddba459876ccd03ba2fe67 commit: 548b7e724df5bf93b8640ebd5d80a5bd7e5fa288 Author: Holger Hoffstätte applied-asynchrony com> AuthorDate: Thu Feb 20 08:15:45 2025 +0000 Commit: Sam James gentoo 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 applied-asynchrony.com> Signed-off-by: Sam James 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