diff options
Diffstat (limited to 'net-voip')
| -rw-r--r-- | net-voip/Manifest.gz | bin | 1557 -> 1045 bytes | |||
| -rw-r--r-- | net-voip/telepathy-gabble/Manifest | 6 | ||||
| -rw-r--r-- | net-voip/telepathy-gabble/files/telepathy-gabble-0.18.4-build-fix-no-jingle.patch | 29 | ||||
| -rw-r--r-- | net-voip/telepathy-gabble/files/telepathy-gabble-0.18.4-openssl-1.1.patch | 223 | ||||
| -rw-r--r-- | net-voip/telepathy-gabble/metadata.xml | 12 | ||||
| -rw-r--r-- | net-voip/telepathy-gabble/telepathy-gabble-0.18.4-r5.ebuild | 86 | ||||
| -rw-r--r-- | net-voip/telepathy-rakia/Manifest | 4 | ||||
| -rw-r--r-- | net-voip/telepathy-rakia/metadata.xml | 8 | ||||
| -rw-r--r-- | net-voip/telepathy-rakia/telepathy-rakia-0.8.0-r1.ebuild | 44 | ||||
| -rw-r--r-- | net-voip/telepathy-salut/Manifest | 6 | ||||
| -rw-r--r-- | net-voip/telepathy-salut/files/telepathy-salut-0.5.0-uninitialized.patch | 13 | ||||
| -rw-r--r-- | net-voip/telepathy-salut/files/telepathy-salut-0.8.1-openssl-1.1.patch | 188 | ||||
| -rw-r--r-- | net-voip/telepathy-salut/metadata.xml | 8 | ||||
| -rw-r--r-- | net-voip/telepathy-salut/telepathy-salut-0.8.1-r5.ebuild | 72 |
14 files changed, 0 insertions, 699 deletions
diff --git a/net-voip/Manifest.gz b/net-voip/Manifest.gz Binary files differindex b681af8f09c7..9bce77c3d5c0 100644 --- a/net-voip/Manifest.gz +++ b/net-voip/Manifest.gz diff --git a/net-voip/telepathy-gabble/Manifest b/net-voip/telepathy-gabble/Manifest deleted file mode 100644 index 7dd834a1d9de..000000000000 --- a/net-voip/telepathy-gabble/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX telepathy-gabble-0.18.4-build-fix-no-jingle.patch 774 BLAKE2B 3a861c8f32d0900003b7553f70144f261bf45f33dd2cfffb54d1a0bbc00a1f99961180d8f848d4e1cf70deee46e9a66fd56af6cc6196787fa4265bbd46034a35 SHA512 e1d2dc3b13ebfb24dab5c73ba9dd930f1ff61a443311dbfb3526a3474bfba96934b24e48c8b098216e8c205c4835143c891697c23b328a6541a72683d4864e11 -AUX telepathy-gabble-0.18.4-openssl-1.1.patch 8115 BLAKE2B 155503c50aa76003c202b1244bbba321aa4e4060074a5d298e24989597f70fadf712b42203aba65742bc8550292eceeff940b9628bbdced012b3f3697eba5b7e SHA512 07384272d1aa91cbb821080146841aae9fa8ca25d6a91bd5cd2d93a3ebc06cafd1f7272bbed28c1191b32cc5692d3d6f69186914865eafdfaa52bf6a821d7b19 -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 -EBUILD telepathy-gabble-0.18.4-r5.ebuild 2480 BLAKE2B a35a747a6f7fbe0c77c6286c51f76f8bf77b443ce7ea32f105d8d862530b457035c713f0ed9dbff874130c0ee6d203c66fb9d4361720a1306e82f3db0c2f39e0 SHA512 25c18533b2d07f40c5b4b5c40940b3c1328f8a613c969b5fd97189c40ae2415be74656f2b238ed735d5f0f7603084c3044e1d4343a18c2e73d8ef350ecf3d5df -MISC metadata.xml 407 BLAKE2B b98f1d7ec12aa895354e550243f203a46208a97cee2a3aa22e3406ca84f061da8905a63dead15729119305162d8bddcd3c970c47c3fc9827bb684442ce4f245c SHA512 bc016579ae294a6990e2af143793305b93dd01305a16195e94a42029107f8ef5171ebc40d63f04b5842bc79d32d05ba4db0327cc64a6c8b96cd1a86def65305c 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/net-voip/telepathy-rakia/Manifest b/net-voip/telepathy-rakia/Manifest deleted file mode 100644 index 67f8b4a707d5..000000000000 --- a/net-voip/telepathy-rakia/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST telepathy-rakia-0.8.0-py3.patch 4472 BLAKE2B 6eb45f91f351ba6ee0afa16022921efaa764168acf9a0891b57cba4ab90c5f2f3f58c7704ecc7224d9aa1a9559a6be7b96cb8ab3c5382552fe2d640ecfd94ab5 SHA512 cf76d730001da55e1bececbfab9810c83643c6b4cabc6c92c106fafae8a64d75b2eaa455599d70a0e40f13ea6d293f0621948e3a3d047d4002ce3b08b58858f0 -DIST telepathy-rakia-0.8.0.tar.gz 659116 BLAKE2B b940d28828220f83c3408aeb9effc26f17d62729f01073539ca4381604bc762b411064d6de92a557ff0f7a8a1920799163f6ede2dba6cfec01967145501a1da2 SHA512 5378e1a2909c4218cc9c6fecf0b01beff0b52fd40cc040a601090dbaae330b3506fc74dc5ae86e5f0c954dd3c41fd7ba4e5a294f8fc11d74aa6eb9025097e9ae -EBUILD telepathy-rakia-0.8.0-r1.ebuild 1067 BLAKE2B 0516c20e09785ad03bb4175ab3f45df40f182643723de6f1527b3236378901e034994f68c43261baf956337a8c2d304e4356528cc8cadcd168fb1d42e14b8ca5 SHA512 e26c0d4862f8c5aae4e47093b71cb0f52f047dfa94825cd300dc1a12a20f86cec83fde8de187f9cea51a6ecd2dbf350cf26abd742c682eef5f96cba36e177629 -MISC metadata.xml 275 BLAKE2B 8ac34193b9ee5d6f4f268ca684b6da042b388003a8c4015b7b420024bd9c8a86f97d9ac4bb813a6d7549de74557512eb66e2138187454374fe857a22a7bc20eb SHA512 d111e2b5407985a7ad2d8013565354cfa0a199b035a199910095885f5c60c6412115432dfb180d5fc0efaf09273d07d6ecd26ba9f2288c9e7914cb7f806cf50f diff --git a/net-voip/telepathy-rakia/metadata.xml b/net-voip/telepathy-rakia/metadata.xml deleted file mode 100644 index 4a90b623babc..000000000000 --- a/net-voip/telepathy-rakia/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-rakia</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-voip/telepathy-rakia/telepathy-rakia-0.8.0-r1.ebuild b/net-voip/telepathy-rakia/telepathy-rakia-0.8.0-r1.ebuild deleted file mode 100644 index 3f52dd81f556..000000000000 --- a/net-voip/telepathy-rakia/telepathy-rakia-0.8.0-r1.ebuild +++ /dev/null @@ -1,44 +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 SIP connection manager for Telepathy based around the Sofia-SIP library" -HOMEPAGE="https://telepathy.freedesktop.org/" -SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz - https://patch-diff.githubusercontent.com/raw/TelepathyIM/telepathy-rakia/pull/1.patch - -> ${P}-py3.patch" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux" -RESTRICT="test" - -COMMON_DEPEND=" - >=dev-libs/dbus-glib-0.60 - >=dev-libs/glib-2.30:2 - >=net-libs/sofia-sip-1.12.11 - >=net-libs/telepathy-glib-0.17.6 - >=sys-apps/dbus-0.60 -" -RDEPEND="${COMMON_DEPEND} - !net-voip/telepathy-sofiasip -" -# telepathy-rakia was formerly known as telepathy-sofiasip -DEPEND="${COMMON_DEPEND} - ${PYTHON_DEPS} - dev-libs/libxslt -" -# eautoreconf requires: gtk-doc-am - -PATCHES=( - "${DISTDIR}"/${P}-py3.patch -) - -src_configure() { - econf --disable-fatal-warnings -} diff --git a/net-voip/telepathy-salut/Manifest b/net-voip/telepathy-salut/Manifest deleted file mode 100644 index e7f06d0340ae..000000000000 --- a/net-voip/telepathy-salut/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX telepathy-salut-0.5.0-uninitialized.patch 496 BLAKE2B f697051628069c6a8c6339ddee37133eab9b90b4f43553b501c611d02de4c63c14d3e4e15896987acd6d4b275a6416a777fbbfac962f90e1dd55c10872ff3939 SHA512 a6365b18b5c1f876c990ec4bbf522b2c8708ca73c201e9bac9447e3fc8d8979b3882c977e9393e34031ca2659b0519c841645280a03d11b4bac8e907db816ce9 -AUX telepathy-salut-0.8.1-openssl-1.1.patch 6746 BLAKE2B 81e67ee46317f5abf9c1a6fc1ea48dcf39fa8d6a8dccdc1e6531ca46ab5398cfdfdc052b4721acbfffd8a0f6139911a031ed258a1981a5acf6af3d3370706632 SHA512 5327cf25b2e148c30679695fb0123eedf148cf1f09760bc2c1319783b7fb144e344360b1e6da1c4cbfe9191c973a471aca03a7890be0ef5690026d6abcc08bf6 -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 -EBUILD telepathy-salut-0.8.1-r5.ebuild 1776 BLAKE2B 9496d9283f9ee2aae7dd0f23c4481ff2e7cfdc8a17fdd8069593fcb0a7cbba80ef5736041567e487af48d402baf0df29922c91fedb5b26833bc9dc6cd51c93cb SHA512 4bf404991c7c9c582b4bf1936959c377edd014aa0ea4dfeb418e4f05f37614c63783a663a372a1de628b09beacb0dd69e3728cbbf51411872ba3a0c8f5913f84 -MISC metadata.xml 275 BLAKE2B 879e55a9d8329717ac32d8c64a081a7e45b550a8c8099d6c194eadb3381718e78ecd0435ff678587b2cb45372ac2df4170b4490a401d7762b784041afc09379e SHA512 d1467495fb97ab64feb84bc1490b642a204ee40207341839c071fe30246d6a911443645e0b754602c61c70886ca3b45a2722cece8588c1b9c3252d1ca19358a8 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.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) ); -@@ -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 -} |