* [gentoo-commits] repo/gentoo:master commit in: net-voip/telepathy-gabble/files/, net-voip/telepathy-gabble/, profiles/
@ 2024-05-08 9:41 Michał Górny
0 siblings, 0 replies; only message in thread
From: Michał Górny @ 2024-05-08 9:41 UTC (permalink / raw
To: gentoo-commits
commit: f08e06c21690ad0cf43d042e3211f3eafd25d8c2
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed May 8 09:37:53 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed May 8 09:37:53 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f08e06c2
net-voip/telepathy-gabble: 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-gabble/Manifest | 2 -
...lepathy-gabble-0.18.4-build-fix-no-jingle.patch | 29 ---
.../telepathy-gabble-0.18.4-openssl-1.1.patch | 223 ---------------------
net-voip/telepathy-gabble/metadata.xml | 12 --
.../telepathy-gabble-0.18.4-r5.ebuild | 86 --------
profiles/package.mask | 1 -
6 files changed, 353 deletions(-)
diff --git a/net-voip/telepathy-gabble/Manifest b/net-voip/telepathy-gabble/Manifest
deleted file mode 100644
index b3a49460075e..000000000000
--- a/net-voip/telepathy-gabble/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST telepathy-gabble-0.18.4-python3.patch 16302 BLAKE2B 6cbd6469febe4acc6d8d07c0c209b47fbf79990601f41c4715f13944d81165df6dccfc344b3cc674fa131fc383a609ae628d8508ff96b05ef63634af6c32b638 SHA512 3b8ea10b5330c5d02d4bc4508a7d9a348bb4c9a93a92419fb66668e06f461097fb16a1a4b956c327740cf6dc77693b921a63f37a6095c21fcab6d1169e62a2f4
-DIST telepathy-gabble-0.18.4.tar.gz 2584311 BLAKE2B c1708be2ebe0b7dd06b53af1087c349e1a1f0b83dfffe463c72e31e459d2efd4db5bad7ade7a478bd4b91948aade822bfa6c13fe175863759cc98c44beca8178 SHA512 4303f1da7eeadf1f0e69fa881cd8b08dc41f4fd061df3f2ecdc80735d8be3e8cf24d8482f265f1858d8dfed71f62e8bc02c13f9525db8d21c9d927e25fa66218
diff --git a/net-voip/telepathy-gabble/files/telepathy-gabble-0.18.4-build-fix-no-jingle.patch b/net-voip/telepathy-gabble/files/telepathy-gabble-0.18.4-build-fix-no-jingle.patch
deleted file mode 100644
index 6d25cde8f527..000000000000
--- a/net-voip/telepathy-gabble/files/telepathy-gabble-0.18.4-build-fix-no-jingle.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 8801beb5b64952fad15ff0c316bf1eddbde20ba9 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sat, 2 Sep 2017 18:23:10 +0200
-Subject: [PATCH] Add missing VOIP ifdef guards
-
-Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=523230
----
- src/muc-channel.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/muc-channel.c b/src/muc-channel.c
-index c0a27a490..9f6e01167 100644
---- a/src/muc-channel.c
-+++ b/src/muc-channel.c
-@@ -1647,9 +1647,11 @@ gabble_muc_channel_can_be_closed (GabbleMucChannel *chan)
- if (g_hash_table_size (priv->tubes) > 0)
- return FALSE;
-
-+#ifdef ENABLE_VOIP
- if (priv->calls != NULL || priv->call_requests != NULL
- || priv->call_initiating)
- return FALSE;
-+#endif
-
- return TRUE;
- }
---
-2.14.1
-
diff --git a/net-voip/telepathy-gabble/files/telepathy-gabble-0.18.4-openssl-1.1.patch b/net-voip/telepathy-gabble/files/telepathy-gabble-0.18.4-openssl-1.1.patch
deleted file mode 100644
index c4707e849384..000000000000
--- a/net-voip/telepathy-gabble/files/telepathy-gabble-0.18.4-openssl-1.1.patch
+++ /dev/null
@@ -1,223 +0,0 @@
-From 68e7fb2f17dd9348e586ef676d8138c4b849a1ce Mon Sep 17 00:00:00 2001
-From: Roel Aaij <roel.aaij@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) );
-@@ -1120,13 +1133,22 @@ _cert_status (WockyTLSSession *session,
- X509_STORE *store = SSL_CTX_get_cert_store(session->ctx);
- X509 *cert = SSL_get_peer_certificate (session->ssl);
- STACK_OF(X509) *chain = SSL_get_peer_cert_chain (session->ssl);
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+ X509_VERIFY_PARAM* param = X509_STORE_get0_param(store);
-+ long old_flags = X509_VERIFY_PARAM_get_flags(param);
-+#else
- long old_flags = store->param->flags;
-+#endif
- long new_flags = old_flags;
- DEBUG("No CRL available, but not in strict mode - re-verifying");
-
- new_flags &= ~(X509_V_FLAG_CRL_CHECK|X509_V_FLAG_CRL_CHECK_ALL);
-
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+ X509_VERIFY_PARAM_set_flags(param, new_flags);
-+#else
- store->param->flags = new_flags;
-+#endif
- X509_STORE_CTX_init (xctx, store, cert, chain);
- X509_STORE_CTX_set_flags (xctx, new_flags);
-
-@@ -1136,7 +1158,11 @@ _cert_status (WockyTLSSession *session,
- status = _cert_status (session, new_code, level, ssl_code);
- }
-
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+ X509_VERIFY_PARAM_set_flags(param, old_flags);
-+#else
- store->param->flags = old_flags;
-+#endif
- X509_STORE_CTX_free (xctx);
- X509_free (cert);
-
-@@ -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-gabble/metadata.xml b/net-voip/telepathy-gabble/metadata.xml
deleted file mode 100644
index fe353eca32fa..000000000000
--- a/net-voip/telepathy-gabble/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <use>
- <flag name="jingle">Enable voice calls for jabber</flag>
- <flag name="plugins">Enable plugin loader</flag>
- </use>
- <upstream>
- <remote-id type="freedesktop-gitlab">telepathy/telepathy-gabble</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/net-voip/telepathy-gabble/telepathy-gabble-0.18.4-r5.ebuild b/net-voip/telepathy-gabble/telepathy-gabble-0.18.4-r5.ebuild
deleted file mode 100644
index f9871fb0a116..000000000000
--- a/net-voip/telepathy-gabble/telepathy-gabble-0.18.4-r5.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Python is used during build for some scripted source files generation (and twisted tests)
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit gnome2 python-any-r1
-
-DESCRIPTION="A XMPP connection manager, handles single and multi user chats and voice calls"
-HOMEPAGE="https://telepathy.freedesktop.org/"
-SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz
- https://src.fedoraproject.org/rpms/telepathy-gabble/raw/95adf4063c2456139dcc5d991ba6d012be850794/f/${P}-python3.patch"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
-IUSE="gnutls +jingle plugins test"
-RESTRICT="!test? ( test )"
-
-# Prevent false positives due nested configure
-QA_CONFIGURE_OPTIONS=".*"
-
-# FIXME: missing sasl-2 for tests ? (automagic)
-# missing libiphb for wocky ?
-# x11-libs/gtksourceview:3.0 needed by telepathy-gabble-xmpp-console, bug #495184
-# Keep in mind some deps or higher minimum versions are in ext/wocky/configure.ac
-RDEPEND="
- >=dev-libs/glib-2.44:2
- >=sys-apps/dbus-1.1.0
- >=dev-libs/dbus-glib-0.82
- >=net-libs/telepathy-glib-0.19.9
-
- dev-libs/libxml2
- dev-db/sqlite:3
-
- gnutls? ( >=net-libs/gnutls-2.10.2 )
- !gnutls? (
- >=dev-libs/openssl-0.9.8g:0=[-bindist(-)]
- )
- jingle? (
- >=net-libs/libsoup-2.42:2.4
- >=net-libs/libnice-0.0.11 )
- plugins? ( x11-libs/gtksourceview:3.0[introspection] )
-
- !<net-im/telepathy-mission-control-5.5.0
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- ${PYTHON_DEPS}
- dev-util/glib-utils
- >=dev-build/gtk-doc-am-1.17
- dev-libs/libxslt
- virtual/pkgconfig
-"
-# Twisted tests fail if bad ipv6 setup, upstream bug #30565
-# Random twisted tests fail with org.freedesktop.DBus.Error.NoReply for some reason
-# pygobject:2 is needed by twisted-17 for gtk2reactor usage by gabble
-#test? (
-# dev-python/pygobject:2
-# >=dev-python/twisted-16.0.0
-#)
-
-PATCHES=(
- "${FILESDIR}"/${P}-build-fix-no-jingle.patch # build with USE=-jingle, bug #523230
- "${FILESDIR}"/${P}-openssl-1.1.patch # bug #658902
- "${DISTDIR}"/${P}-python3.patch
-)
-
-src_configure() {
- gnome2_src_configure \
- --disable-coding-style-checks \
- --disable-static \
- --disable-Werror \
- --enable-file-transfer \
- $(use_enable jingle voip) \
- $(use_enable jingle google-relay) \
- $(use_enable plugins) \
- --with-tls=$(usex gnutls gnutls openssl)
-}
-
-src_test() {
- # This runs only C tests (see tests/README):
- emake -C tests check-TESTS
-}
diff --git a/profiles/package.mask b/profiles/package.mask
index 5cdf2f7ae9ad..029e0ed1d2f0 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -339,7 +339,6 @@ net-libs/sofia-sip
net-libs/telepathy-accounts-signon
net-libs/telepathy-farstream
net-libs/telepathy-qt
-net-voip/telepathy-gabble
# Sam James <sam@gentoo.org> (2024-03-28)
# Newer 5.4.x releases were signed by a potentially compromised upstream maintainer.
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2024-05-08 9:41 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-05-08 9:41 [gentoo-commits] repo/gentoo:master commit in: net-voip/telepathy-gabble/files/, net-voip/telepathy-gabble/, profiles/ Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox