commit: 23315f44c549fb937c1d0f7349d252e7a0b9e3d9 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Wed May 8 09:37:00 2024 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Wed May 8 09:37:10 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23315f44
net-voip/telepathy-salut: Remove last-rited pkg Bug: https://bugs.gentoo.org/926193 Bug: https://bugs.gentoo.org/891791 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> net-voip/telepathy-salut/Manifest | 2 - .../telepathy-salut-0.5.0-uninitialized.patch | 13 -- .../files/telepathy-salut-0.8.1-openssl-1.1.patch | 188 --------------------- net-voip/telepathy-salut/metadata.xml | 8 - .../telepathy-salut-0.8.1-r5.ebuild | 72 -------- profiles/package.mask | 1 - 6 files changed, 284 deletions(-) diff --git a/net-voip/telepathy-salut/Manifest b/net-voip/telepathy-salut/Manifest deleted file mode 100644 index 805603224856..000000000000 --- a/net-voip/telepathy-salut/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST telepathy-salut-0.8.1-python3.patch 5878 BLAKE2B db76eaf004418d48359c0ca710a59782fc1cda304825c75259daca41f3cd94ced207be06db7e5fd4d290b8021276077076eed330c20c2249b1577f0670697f93 SHA512 b924fae314d9efcc22226415e5904521593821996cdef9e5149ebc5ee2ceb4c2c210c311aeed3a01e634cb6ddc8f36b83d1473d700a8a6d1171c934217ef4185 -DIST telepathy-salut-0.8.1.tar.gz 1823482 BLAKE2B 22f93d48cc749ed74ac1ee4103ea0bf5b1f93b2d14c95a4bd2edde977a5c43db5d5fe54dd246c561ee94f13b4030ab42c011f537a0e6688e8be3ac0aa0f1ca67 SHA512 34537ac9ce0b78015e184963ea79beaa7332ac11803f9683ff34577d9f0a14f7ed287aacb2c00059f2ff2f300c325a09a78a320e83d0a0031ad976da2c197a90 diff --git a/net-voip/telepathy-salut/files/telepathy-salut-0.5.0-uninitialized.patch b/net-voip/telepathy-salut/files/telepathy-salut-0.5.0-uninitialized.patch deleted file mode 100644 index 83723612dfc4..000000000000 --- a/net-voip/telepathy-salut/files/telepathy-salut-0.5.0-uninitialized.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lib/ext/wocky/wocky/wocky-sasl-scram.c b/lib/ext/wocky/wocky/wocky-sasl-scram.c -index 7261956..c508196 100644 ---- a/lib/ext/wocky/wocky/wocky-sasl-scram.c -+++ b/lib/ext/wocky/wocky/wocky-sasl-scram.c -@@ -523,7 +523,7 @@ scram_handle_server_final_message (WockySaslScram *self, - gchar *message, - GError **error) - { -- gchar attr, *value = NULL; -+ gchar attr = 0, *value = NULL; - - if (!scram_get_next_attr_value (&message, &attr, &value) && attr != 'v') - goto invalid; diff --git a/net-voip/telepathy-salut/files/telepathy-salut-0.8.1-openssl-1.1.patch b/net-voip/telepathy-salut/files/telepathy-salut-0.8.1-openssl-1.1.patch deleted file mode 100644 index 0088dc986c8b..000000000000 --- a/net-voip/telepathy-salut/files/telepathy-salut-0.8.1-openssl-1.1.patch +++ /dev/null @@ -1,188 +0,0 @@ -From 68e7fb2f17dd9348e586ef676d8138c4b849a1ce Mon Sep 17 00:00:00 2001 -From: Roel Aaij <roel.a...@nikhef.nl> -Date: Fri, 26 Oct 2018 15:01:37 +0200 -Subject: [PATCH] openssl: fix build with openssl >= 1.1.0 - ---- - wocky/wocky-openssl-dh1024.c | 10 ++++++++++ - wocky/wocky-openssl-dh2048.c | 10 ++++++++++ - wocky/wocky-openssl-dh4096.c | 10 ++++++++++ - wocky/wocky-openssl-dh512.c | 10 ++++++++++ - wocky/wocky-openssl.c | 38 ++++++++++++++++++++++++++++++++---- - 5 files changed, 74 insertions(+), 4 deletions(-) - -diff --git a/lib/ext/wocky/wocky/wocky-openssl-dh1024.c b/lib/ext/wocky/wocky/wocky-openssl-dh1024.c -index b77fb4c..bb50523 100644 ---- a/lib/ext/wocky/wocky/wocky-openssl-dh1024.c -+++ b/lib/ext/wocky/wocky/wocky-openssl-dh1024.c -@@ -25,11 +25,21 @@ DH *get_dh1024(void) - 0x02, - }; - DH *dh; -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+ int r = 0; -+#endif - - if ((dh=DH_new()) == NULL) return(NULL); -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+ r = DH_set0_pqg(dh, BN_bin2bn(dh1024_p,sizeof(dh1024_p),NULL), -+ NULL, BN_bin2bn(dh1024_g,sizeof(dh1024_g),NULL)); -+ if (!r) -+ { DH_free(dh); return(NULL); } -+#else - dh->p=BN_bin2bn(dh1024_p,sizeof(dh1024_p),NULL); - dh->g=BN_bin2bn(dh1024_g,sizeof(dh1024_g),NULL); - if ((dh->p == NULL) || (dh->g == NULL)) - { DH_free(dh); return(NULL); } -+#endif - return(dh); - } -diff --git a/lib/ext/wocky/wocky/wocky-openssl-dh2048.c b/lib/ext/wocky/wocky/wocky-openssl-dh2048.c -index c16deb7..d53ceda 100644 ---- a/lib/ext/wocky/wocky/wocky-openssl-dh2048.c -+++ b/lib/ext/wocky/wocky/wocky-openssl-dh2048.c -@@ -36,11 +36,21 @@ DH *get_dh2048(void) - 0x02, - }; - DH *dh; -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+ int r = 0; -+#endif - - if ((dh=DH_new()) == NULL) return(NULL); -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+ r = DH_set0_pqg(dh, BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL), -+ NULL, BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL)); -+ if (!r) -+ { DH_free(dh); return(NULL); } -+#else - dh->p=BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL); - dh->g=BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL); - if ((dh->p == NULL) || (dh->g == NULL)) - { DH_free(dh); return(NULL); } -+#endif - return(dh); - } -diff --git a/lib/ext/wocky/wocky/wocky-openssl-dh4096.c b/lib/ext/wocky/wocky/wocky-openssl-dh4096.c -index 2854385..93fa7e5 100644 ---- a/lib/ext/wocky/wocky/wocky-openssl-dh4096.c -+++ b/lib/ext/wocky/wocky/wocky-openssl-dh4096.c -@@ -57,11 +57,21 @@ DH *get_dh4096(void) - 0x02, - }; - DH *dh; -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+ int r = 0; -+#endif - - if ((dh=DH_new()) == NULL) return(NULL); -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+ r = DH_set0_pqg(dh, BN_bin2bn(dh4096_p,sizeof(dh4096_p),NULL), -+ NULL, BN_bin2bn(dh4096_g,sizeof(dh4096_g),NULL)); -+ if (!r) -+ { DH_free(dh); return(NULL); } -+#else - dh->p=BN_bin2bn(dh4096_p,sizeof(dh4096_p),NULL); - dh->g=BN_bin2bn(dh4096_g,sizeof(dh4096_g),NULL); - if ((dh->p == NULL) || (dh->g == NULL)) - { DH_free(dh); return(NULL); } -+#endif - return(dh); - } -diff --git a/lib/ext/wocky/wocky/wocky-openssl-dh512.c b/lib/ext/wocky/wocky/wocky-openssl-dh512.c -index 8e7a278..c2891cd 100644 ---- a/lib/ext/wocky/wocky/wocky-openssl-dh512.c -+++ b/lib/ext/wocky/wocky/wocky-openssl-dh512.c -@@ -20,11 +20,21 @@ DH *get_dh512(void) - 0x02, - }; - DH *dh; -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+ int r = 0; -+#endif - - if ((dh=DH_new()) == NULL) return(NULL); -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+ r = DH_set0_pqg(dh, BN_bin2bn(dh512_p,sizeof(dh512_p),NULL), -+ NULL, BN_bin2bn(dh512_g,sizeof(dh512_g),NULL)); -+ if (!r) -+ { DH_free(dh); return(NULL); } -+#else - dh->p=BN_bin2bn(dh512_p,sizeof(dh512_p),NULL); - dh->g=BN_bin2bn(dh512_g,sizeof(dh512_g),NULL); - if ((dh->p == NULL) || (dh->g == NULL)) - { DH_free(dh); return(NULL); } -+#endif - return(dh); - } -diff --git a/lib/ext/wocky/wocky/wocky-openssl.c b/lib/ext/wocky/wocky/wocky-openssl.c -index 2201213..18f9981 100644 ---- a/lib/ext/wocky/wocky/wocky-openssl.c -+++ b/lib/ext/wocky/wocky/wocky-openssl.c -@@ -885,7 +885,11 @@ check_peer_name (const char *target, X509 *cert) - int i; - gboolean rval = FALSE; - X509_NAME *subject = X509_get_subject_name (cert); -- X509_CINF *ci = cert->cert_info; -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+ const STACK_OF(X509_EXTENSION)* extensions = X509_get0_extensions(cert); -+#else -+ const STACK_OF(X509_EXTENSION)* extensions = cert->cert_info->extensions; -+#endif - static const long nid[] = { NID_commonName, NID_subject_alt_name, NID_undef }; - - /* first, see if the x509 name contains the info we want: */ -@@ -906,16 +910,21 @@ check_peer_name (const char *target, X509 *cert) - * and extract the subject_alt_name from the x509 v3 extensions: if that * - * extension is present, and a string, use that. If it is present, and * - * a multi-value stack, trawl it for the "DNS" entry and use that */ -- if (!rval && (ci->extensions != NULL)) -- for (i = 0; i < sk_X509_EXTENSION_num(ci->extensions) && !rval; i++) -+ if (!rval && (extensions != NULL)) -+ for (i = 0; i < sk_X509_EXTENSION_num(extensions) && !rval; i++) - { -- X509_EXTENSION *ext = sk_X509_EXTENSION_value (ci->extensions, i); -+ X509_EXTENSION *ext = sk_X509_EXTENSION_value (extensions, i); - ASN1_OBJECT *obj = X509_EXTENSION_get_object (ext); - X509V3_EXT_METHOD *convert = NULL; - long ni = OBJ_obj2nid (obj); - const guchar *p; - char *value = NULL; -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+ const ASN1_OCTET_STRING* ext_value = X509_EXTENSION_get_data(ext); -+ int len = ASN1_STRING_length(ext_value); -+#else - int len = ext->value->length; -+#endif - void *ext_str = NULL; - - if (ni != NID_subject_alt_name) -@@ -927,7 +936,11 @@ check_peer_name (const char *target, X509 *cert) - if ((convert = (X509V3_EXT_METHOD *) X509V3_EXT_get (ext)) == NULL) - continue; - -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+ p = ASN1_STRING_get0_data(ext_value); -+#else - p = ext->value->data; -+#endif - ext_str = ((convert->it != NULL) ? - ASN1_item_d2i (NULL, &p, len, ASN1_ITEM_ptr(convert->it)) : - convert->d2i (NULL, &p, len) ); -@@ -1675,12 +1701,16 @@ wocky_tls_session_init (WockyTLSSession *session) - - if G_UNLIKELY (g_once_init_enter (&initialised)) - { -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+ DEBUG ("initialising SSL library and error strings"); -+#else - gint malloc_init_succeeded; - - DEBUG ("initialising SSL library and error strings"); - - malloc_init_succeeded = CRYPTO_malloc_init (); - g_warn_if_fail (malloc_init_succeeded); -+#endif - - SSL_library_init (); - SSL_load_error_strings (); diff --git a/net-voip/telepathy-salut/metadata.xml b/net-voip/telepathy-salut/metadata.xml deleted file mode 100644 index d1df78f4a1c0..000000000000 --- a/net-voip/telepathy-salut/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="freedesktop-gitlab">telepathy/telepathy-salut</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r5.ebuild b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r5.ebuild deleted file mode 100644 index 285620545f52..000000000000 --- a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r5.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{9..11} ) -inherit python-any-r1 - -DESCRIPTION="A link-local XMPP connection manager for Telepathy" -HOMEPAGE="https://telepathy.freedesktop.org/"; -SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz - https://src.fedoraproject.org/rpms/telepathy-salut/raw/master/f/${P}-python3.patch"; - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 sparc x86 ~x86-linux" -IUSE="gnutls test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/dbus-glib-0.61 - dev-libs/libxml2 - >=dev-libs/glib-2.28:2 - >=sys-apps/dbus-1.1.0 - >=net-libs/telepathy-glib-0.17.1 - >=net-dns/avahi-0.6.22[dbus] - net-libs/libsoup:2.4 - sys-apps/util-linux - dev-db/sqlite:3 - gnutls? ( >=net-libs/gnutls-2.10.2 ) - !gnutls? ( >=dev-libs/openssl-0.9.8g:0=[-bindist(-)] ) -" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - dev-libs/libxslt - virtual/pkgconfig - test? ( - >=dev-libs/check-0.9.4 - net-libs/libgsasl - ) -" -# FIXME: needs xmppstream python module -# >=net-dns/avahi-0.6.22[python] - -PATCHES=( - "${FILESDIR}"/${PN}-0.5.0-uninitialized.patch # upstream bug #37701 - "${FILESDIR}"/${P}-openssl-1.1.patch # bug #663994 - "${DISTDIR}"/${P}-python3.patch -) - -pkg_setup() { - python-any-r1_pkg_setup -} - -src_configure() { - econf \ - --disable-coding-style-checks \ - --disable-plugins \ - --disable-Werror \ - --disable-static \ - --disable-avahi-tests \ - --with-tls=$(usex gnutls gnutls openssl) - #$(use_enable test avahi-tests) - - # false positives according to bug #413581: - # unrecognized options: --disable-plugins, --disable-avahi-tests -} - -src_install() { - MAKEOPTS+=" -j1" default # bug 413581 - find "${D}" -name '*.la' -delete || die -} diff --git a/profiles/package.mask b/profiles/package.mask index c33cef4a8c67..d8493046929e 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -341,7 +341,6 @@ net-libs/telepathy-farstream net-libs/telepathy-qt net-voip/telepathy-gabble net-voip/telepathy-rakia -net-voip/telepathy-salut # Sam James <s...@gentoo.org> (2024-03-28) # Newer 5.4.x releases were signed by a potentially compromised upstream maintainer.
