[gentoo-commits] repo/gentoo:master commit in: net-voip/telepathy-salut/files/, net-voip/telepathy-salut/, profiles/

2024-05-08 Thread Michał Górny 
commit: 23315f44c549fb937c1d0f7349d252e7a0b9e3d9
Author: Michał Górny  gentoo  org>
AuthorDate: Wed May  8 09:37:00 2024 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed May  8 09:37:10 2024 +
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  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..
--- a/net-voip/telepathy-salut/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST telepathy-salut-0.8.1-python3.patch 5878 BLAKE2B 
db76eaf004418d48359c0ca710a59782fc1cda304825c75259daca41f3cd94ced207be06db7e5fd4d290b8021276077076eed330c20c2249b1577f0670697f93
 SHA512 
b924fae314d9efcc6415e5904521593821996cdef9e5149ebc5ee2ceb4c2c210c311aeed3a01e634cb6ddc8f36b83d1473d700a8a6d1171c934217ef4185
-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..
--- 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 (, , ) && 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..
--- 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 
-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 >= 0x1010L
-+  int r = 0;
-+#endif
- 
-   if ((dh=DH_new()) == NULL) return(NULL);
-+#if OPENSSL_VERSION_NUMBER >= 0x1010L
-+  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 >= 0x1010L
-+  int r = 0;
-+#endif
- 
-   if ((dh=DH_new()) == NULL) return(NULL);
-+#if OPENSSL_VERSION_NUMBER >= 0x1010L
-+  r = DH_set0_pqg(dh, BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL),
-+

[gentoo-commits] repo/gentoo:master commit in: net-voip/telepathy-salut/files/

2022-07-11 Thread Sam James 
commit: 6962ead796b6b4ad15a17feb7ea4448378622d73
Author: orbea  riseup  net>
AuthorDate: Mon Jul 11 00:26:18 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul 12 02:45:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6962ead7

net-voip/telepathy-salut: Remove libressl support

This fixes the build with libressl-3.5 from the libressl overlay.

Signed-off-by: orbea  riseup.net>
Signed-off-by: Sam James  gentoo.org>

 .../files/telepathy-salut-0.8.1-openssl-1.1.patch  | 24 +++---
 1 file changed, 12 insertions(+), 12 deletions(-)

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
index 2f4c74e24202..0088dc986c8b 100644
--- 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
@@ -19,12 +19,12 @@ index b77fb4c..bb50523 100644
0x02,
};
DH *dh;
-+#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER >= 0x1010L
 +  int r = 0;
 +#endif
  
if ((dh=DH_new()) == NULL) return(NULL);
-+#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER >= 0x1010L
 +  r = DH_set0_pqg(dh, BN_bin2bn(dh1024_p,sizeof(dh1024_p),NULL),
 +  NULL, 
BN_bin2bn(dh1024_g,sizeof(dh1024_g),NULL));
 +  if (!r)
@@ -45,12 +45,12 @@ index c16deb7..d53ceda 100644
0x02,
};
DH *dh;
-+#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER >= 0x1010L
 +  int r = 0;
 +#endif
  
if ((dh=DH_new()) == NULL) return(NULL);
-+#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER >= 0x1010L
 +  r = DH_set0_pqg(dh, BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL),
 +  NULL, 
BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL));
 +  if (!r)
@@ -71,12 +71,12 @@ index 2854385..93fa7e5 100644
0x02,
};
DH *dh;
-+#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER >= 0x1010L
 +  int r = 0;
 +#endif
  
if ((dh=DH_new()) == NULL) return(NULL);
-+#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER >= 0x1010L
 +  r = DH_set0_pqg(dh, BN_bin2bn(dh4096_p,sizeof(dh4096_p),NULL),
 +  NULL, 
BN_bin2bn(dh4096_g,sizeof(dh4096_g),NULL));
 +  if (!r)
@@ -97,12 +97,12 @@ index 8e7a278..c2891cd 100644
0x02,
};
DH *dh;
-+#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER >= 0x1010L
 +  int r = 0;
 +#endif
  
if ((dh=DH_new()) == NULL) return(NULL);
-+#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER >= 0x1010L
 +  r = DH_set0_pqg(dh, BN_bin2bn(dh512_p,sizeof(dh512_p),NULL),
 +  NULL, 
BN_bin2bn(dh512_g,sizeof(dh512_g),NULL));
 +  if (!r)
@@ -124,7 +124,7 @@ index 2201213..18f9981 100644
gboolean rval = FALSE;
X509_NAME *subject = X509_get_subject_name (cert);
 -  X509_CINF *ci = cert->cert_info;
-+#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER >= 0x1010L
 +  const STACK_OF(X509_EXTENSION)* extensions = X509_get0_extensions(cert);
 +#else
 +  const STACK_OF(X509_EXTENSION)* extensions = cert->cert_info->extensions;
@@ -148,7 +148,7 @@ index 2201213..18f9981 100644
  long ni = OBJ_obj2nid (obj);
  const guchar *p;
  char *value = NULL;
-+#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER >= 0x1010L
 +const ASN1_OCTET_STRING* ext_value = X509_EXTENSION_get_data(ext);
 +int len = ASN1_STRING_length(ext_value);
 +#else
@@ -161,7 +161,7 @@ index 2201213..18f9981 100644
  if ((convert = (X509V3_EXT_METHOD *) X509V3_EXT_get (ext)) == NULL)
continue;
  
-+#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER >= 0x1010L
 +p = ASN1_STRING_get0_data(ext_value);
 +#else
  p = ext->value->data;
@@ -173,7 +173,7 @@ index 2201213..18f9981 100644
  
if G_UNLIKELY (g_once_init_enter ())
  {
-+#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER >= 0x1010L
 +  DEBUG ("initialising SSL library and error strings");
 +#else
gint malloc_init_succeeded;

[gentoo-commits] repo/gentoo:master commit in: net-voip/telepathy-salut/files/, net-voip/telepathy-salut/

2018-12-02 Thread Andreas Sturmlechner 
commit: b87bd835aaa06a7d303fd513de972bf8660ca0f0
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Dec  2 20:32:18 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec  2 20:40:50 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b87bd835

net-voip/telepathy-salut: Fix build with openssl-1.1

Closes: https://bugs.gentoo.org/663994
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/telepathy-salut-0.8.1-openssl-1.1.patch  | 188 +
 .../telepathy-salut-0.8.1-r2.ebuild|  81 +
 2 files changed, 269 insertions(+)

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
new file mode 100644
index 000..2f4c74e2420
--- /dev/null
+++ b/net-voip/telepathy-salut/files/telepathy-salut-0.8.1-openssl-1.1.patch
@@ -0,0 +1,188 @@
+From 68e7fb2f17dd9348e586ef676d8138c4b849a1ce Mon Sep 17 00:00:00 2001
+From: Roel Aaij 
+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 >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
++  int r = 0;
++#endif
+ 
+   if ((dh=DH_new()) == NULL) return(NULL);
++#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
++  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 >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
++  int r = 0;
++#endif
+ 
+   if ((dh=DH_new()) == NULL) return(NULL);
++#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
++  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 >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
++  int r = 0;
++#endif
+ 
+   if ((dh=DH_new()) == NULL) return(NULL);
++#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
++  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,
+

[gentoo-commits] repo/gentoo:master commit in: net-voip/telepathy-salut/files/

2017-02-08 Thread Patrice Clement 
commit: 4ce6ee379c937d80c8075def50dc8a3029391c74
Author: Patrice Clement  gentoo  org>
AuthorDate: Wed Feb  8 23:59:19 2017 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Thu Feb  9 00:00:34 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ce6ee37

net-voip/telepathy-salut: remove unused patch.

Package-Manager: portage-2.3.3

 .../telepathy-salut-0.6.0-glib-gtypes.h.patch  | 22 --
 1 file changed, 22 deletions(-)

diff --git 
a/net-voip/telepathy-salut/files/telepathy-salut-0.6.0-glib-gtypes.h.patch 
b/net-voip/telepathy-salut/files/telepathy-salut-0.6.0-glib-gtypes.h.patch
deleted file mode 100644
index 9488f68e10..00
--- a/net-voip/telepathy-salut/files/telepathy-salut-0.6.0-glib-gtypes.h.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 3c43751dc90e4cdb08f57f48e2a8e6adf715ed8e Mon Sep 17 00:00:00 2001
-From: Cosimo Cecchi 
-Date: Wed, 12 Oct 2011 16:45:49 +
-Subject: test-resolver: don't include glib/types.h directly
-
-Use the glib.h header instead.

-diff --git a/lib/ext/wocky/tests/test-resolver.h 
b/lib/ext/wocky/tests/test-resolver.h
-index 7823ee6..3948fdc 100644
 a/lib/ext/wocky/tests/test-resolver.h
-+++ b/lib/ext/wocky/tests/test-resolver.h
-@@ -22,7 +22,7 @@
- #define __TEST_RESOLVER_H__
- 
- #include 
--#include 
-+#include 
- 
- G_BEGIN_DECLS
- 
---
-cgit v0.9.0.2-2-gbebe