[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 (&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..
--- 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/

2022-11-24 Thread Matt Turner 
commit: 591b23d0a828f931b09d377808d5d386634472f5
Author: Matt Turner  gentoo  org>
AuthorDate: Sat Nov 12 14:34:56 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Nov 25 03:07:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=591b23d0

net-voip/telepathy-salut: Drop gnome@ as a maintainer

Signed-off-by: Matt Turner  gentoo.org>

 net-voip/telepathy-salut/metadata.xml | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/net-voip/telepathy-salut/metadata.xml 
b/net-voip/telepathy-salut/metadata.xml
index d04ce07aef49..d1df78f4a1c0 100644
--- a/net-voip/telepathy-salut/metadata.xml
+++ b/net-voip/telepathy-salut/metadata.xml
@@ -1,10 +1,7 @@
 
 https://www.gentoo.org/dtd/metadata.dtd";>
 
-  
-gn...@gentoo.org
-Gentoo GNOME Desktop
-  
+  
   
 telepathy/telepathy-salut

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

2022-10-29 Thread Matt Turner 
commit: 1f5294c05cc6ef884cdb19ac39b5f3af14af4fc6
Author: Matt Turner  gentoo  org>
AuthorDate: Sat Oct 29 17:34:30 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sat Oct 29 17:44:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f5294c0

net-voip/telepathy-salut: Add Python 3.11 compatibility

Signed-off-by: Matt Turner  gentoo.org>

 net-voip/telepathy-salut/telepathy-salut-0.8.1-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index 3c3c4b35aee3..a2682a79550d 100644
--- a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r5.ebuild
+++ b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit python-any-r1
 
 DESCRIPTION="A link-local XMPP connection manager for Telepathy"

[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 (&initialised))
  {
-+#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_succe

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

2022-05-20 Thread Pacho Ramos 
commit: 81a9fd51a3e6aeae42f0ba07e88f53167a3c3825
Author: Pacho Ramos  gentoo  org>
AuthorDate: Fri May 20 18:57:54 2022 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Fri May 20 19:09:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81a9fd51

net-voip/telepathy-salut: enable py3.10 and disable py3.7

Closes: https://bugs.gentoo.org/846179
Signed-off-by: Pacho Ramos  gentoo.org>

 net-voip/telepathy-salut/telepathy-salut-0.8.1-r5.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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
index 465a3f4426fb..3c3c4b35aee3 100644
--- a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r5.ebuild
+++ b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit python-any-r1
 
 DESCRIPTION="A link-local XMPP connection manager for Telepathy"

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

2021-06-22 Thread Sam James 
commit: f388068791e2ef24a7230b0a441ea3ed70095a72
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Jun 21 23:17:40 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun 22 18:18:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3880687

net-voip/telepathy-salut: use binding := for dev-libs/openssl

Needed for upcoming upgrade to OpenSSL 3.0.0 which has changed ABI.

Acked-by: David Seifert  gentoo.org>
Signed-off-by: Ionen Wolkens  gentoo.org>
Signed-off-by: Sam James  gentoo.org>

 ...{telepathy-salut-0.8.1-r4.ebuild => telepathy-salut-0.8.1-r5.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r4.ebuild 
b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r5.ebuild
similarity index 96%
rename from net-voip/telepathy-salut/telepathy-salut-0.8.1-r4.ebuild
rename to net-voip/telepathy-salut/telepathy-salut-0.8.1-r5.ebuild
index 8f7164df8cb..465a3f4426f 100644
--- a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r4.ebuild
+++ b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r5.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
sys-apps/util-linux
dev-db/sqlite:3
gnutls? ( >=net-libs/gnutls-2.10.2 )
-   !gnutls? ( >=dev-libs/openssl-0.9.8g:0[-bindist(-)] )
+   !gnutls? ( >=dev-libs/openssl-0.9.8g:0=[-bindist(-)] )
 "
 DEPEND="${RDEPEND}
${PYTHON_DEPS}

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

2021-06-17 Thread Thomas Deutschmann 
commit: f623444254dbdd1be61207a347fbf93dcf2aa5f2
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Jun 17 22:03:14 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Jun 17 22:18:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6234442

net-voip/telepathy-salut: rev bump for commit 59f2b43f3

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann  gentoo.org>

 .../{telepathy-salut-0.8.1-r3.ebuild => telepathy-salut-0.8.1-r4.ebuild}  | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r3.ebuild 
b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r4.ebuild
similarity index 100%
rename from net-voip/telepathy-salut/telepathy-salut-0.8.1-r3.ebuild
rename to net-voip/telepathy-salut/telepathy-salut-0.8.1-r4.ebuild

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

2021-06-17 Thread Thomas Deutschmann 
commit: 59f2b43f36254c6b8b1c8978364ad18a61591842
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Jun 17 20:14:35 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Jun 17 20:32:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59f2b43f

net-voip/telepathy-salut: Fix MissingUseDepDefault for dev-libs/openssl[bindist]

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann  gentoo.org>

 net-voip/telepathy-salut/telepathy-salut-0.8.1-r3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r3.ebuild 
b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r3.ebuild
index 25de246938e..8f7164df8cb 100644
--- a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r3.ebuild
+++ b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -28,7 +28,7 @@ RDEPEND="
sys-apps/util-linux
dev-db/sqlite:3
gnutls? ( >=net-libs/gnutls-2.10.2 )
-   !gnutls? ( >=dev-libs/openssl-0.9.8g:0[-bindist] )
+   !gnutls? ( >=dev-libs/openssl-0.9.8g:0[-bindist(-)] )
 "
 DEPEND="${RDEPEND}
${PYTHON_DEPS}

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

2020-09-26 Thread Michał Górny 
commit: bb0ee0073efe96e5bf0ae44507c5add30550c891
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Sep 27 04:31:37 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Sep 27 06:17:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb0ee007

net-voip/telepathy-salut: Port to py3

Closes: https://bugs.gentoo.org/735436
Signed-off-by: Michał Górny  gentoo.org>

 net-voip/telepathy-salut/Manifest |  1 +
 ...ut-0.8.1-r2.ebuild => telepathy-salut-0.8.1-r3.ebuild} | 15 +--
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/net-voip/telepathy-salut/Manifest 
b/net-voip/telepathy-salut/Manifest
index 377336256ee..80560322485 100644
--- a/net-voip/telepathy-salut/Manifest
+++ b/net-voip/telepathy-salut/Manifest
@@ -1 +1,2 @@
+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/telepathy-salut-0.8.1-r2.ebuild 
b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r3.ebuild
similarity index 88%
rename from net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild
rename to net-voip/telepathy-salut/telepathy-salut-0.8.1-r3.ebuild
index 910016e3338..11d873b5e9a 100644
--- a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild
+++ b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r3.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6..9} )
 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";
+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"
@@ -36,7 +37,6 @@ DEPEND="${RDEPEND}
test? (
>=dev-libs/check-0.9.4
net-libs/libgsasl
-   $(python_gen_any_dep 'dev-python/twisted[${PYTHON_USEDEP}]')
)
 "
 # FIXME: needs xmppstream python module
@@ -45,14 +45,9 @@ DEPEND="${RDEPEND}
 PATCHES=(
"${FILESDIR}"/${PN}-0.5.0-uninitialized.patch # upstream bug #37701
"${FILESDIR}"/${P}-openssl-1.1.patch # bug #663994
+   "${DISTDIR}"/${P}-python3.patch
 )
 
-python_check_deps() {
-   if use test ; then
-has_version "dev-python/twisted[${PYTHON_USEDEP}]"
-   fi
-}
-
 pkg_setup() {
python-any-r1_pkg_setup
 }

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

2020-03-26 Thread Michał Górny 
commit: 5c5feb5e66de675d85c642a136a63bb11c1aef4d
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Mar 26 17:29:45 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Mar 26 17:36:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c5feb5e

net-voip/telepathy-salut: Flatten twisted dep

Signed-off-by: Michał Górny  gentoo.org>

 net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild | 8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild 
b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild
index 3f568babb3e..910016e3338 100644
--- a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild
+++ b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild
@@ -36,10 +36,7 @@ DEPEND="${RDEPEND}
test? (
>=dev-libs/check-0.9.4
net-libs/libgsasl
-   || (
-   $(python_gen_any_dep 
'dev-python/twisted[${PYTHON_USEDEP}]')
-   $(python_gen_any_dep 
'dev-python/twisted-words[${PYTHON_USEDEP}]')
-   )
+   $(python_gen_any_dep 'dev-python/twisted[${PYTHON_USEDEP}]')
)
 "
 # FIXME: needs xmppstream python module
@@ -52,8 +49,7 @@ PATCHES=(
 
 python_check_deps() {
if use test ; then
-has_version "dev-python/twisted[${PYTHON_USEDEP}]" \
-   || has_version 
"dev-python/twisted-words[${PYTHON_USEDEP}]"
+has_version "dev-python/twisted[${PYTHON_USEDEP}]"
fi
 }

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

2019-07-28 Thread Aaron Bauman 
commit: d27f2ccc06e6e951dde90a173bdfa81448555f90
Author: Aaron Bauman  gentoo  org>
AuthorDate: Sun Jul 28 16:51:43 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Sun Jul 28 17:02:00 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d27f2ccc

net-voip/telepathy-salut: arm64 stable

Signed-off-by: Aaron Bauman  gentoo.org>
Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="arm64"

 net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild 
b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild
index fadc677f607..c767e8bbcd9 100644
--- a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild
+++ b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz";
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 sparc x86 ~x86-linux"
+KEYWORDS="alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 sparc x86 ~x86-linux"
 IUSE="gnutls test"
 
 RDEPEND="

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

2019-04-24 Thread Andreas Sturmlechner 
commit: dc45d2b9aa251039008c54a8190c0f5937512283
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Apr 23 21:22:48 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Apr 24 19:38:18 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc45d2b9

net-voip/telepathy-salut: Drop 0.8.1-r1

De-stabilising ia64 without stable revdeps.

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

 .../telepathy-salut-0.8.1-r1.ebuild| 78 --
 1 file changed, 78 deletions(-)

diff --git a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r1.ebuild 
b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r1.ebuild
deleted file mode 100644
index 497b7f32bbb..000
--- a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-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";
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ppc ~ppc64 sparc x86 ~x86-linux"
-IUSE="gnutls 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
-   || (
-   $(python_gen_any_dep 
'dev-python/twisted[${PYTHON_USEDEP}]')
-   $(python_gen_any_dep 
'dev-python/twisted-words[${PYTHON_USEDEP}]')
-   )
-   )
-"
-# FIXME: needs xmppstream python module
-#   >=net-dns/avahi-0.6.22[python]
-
-PATCHES=(
-   # Fix uninitialized variable, upstream bug #37701
-   "${FILESDIR}"/${PN}-0.5.0-uninitialized.patch
-)
-
-python_check_deps() {
-   if use test ; then
-has_version "dev-python/twisted[${PYTHON_USEDEP}]" \
-   || has_version 
"dev-python/twisted-words[${PYTHON_USEDEP}]"
-   fi
-}
-
-pkg_setup() {
-   python-any-r1_pkg_setup
-}
-
-src_configure() {
-   econf \
-   --disable-coding-style-checks \
-   --disable-plugins \
-   --disable-Werror \
-   --disable-static \
-   --disable-avahi-tests \
-   --docdir=/usr/share/doc/${PF} \
-   --with-tls=$(usex gnutls gnutls openssl)
-   #$(use_enable test avahi-tests)
-}
-
-src_install() {
-   MAKEOPTS+=" -j1" default # bug 413581
-   find "${D}" -name '*.la' -delete || die
-}

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

2019-02-19 Thread Andreas Sturmlechner 
commit: 8e16fae4f3b80210678fad01bbee574a1fa54ee4
Author: Roy Bamford  gentoo  org>
AuthorDate: Sun Feb 17 22:55:53 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Feb 19 18:04:44 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e16fae4

net-voip/telepathy-salut: added ~arm64

Package-Manager: Portage-2.3.60, Repoman-2.3.12

Signed-off-by: Roy Bamford  gentoo.org>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild 
b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild
index 39a70d6ae77..fadc677f607 100644
--- a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild
+++ b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz";
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~ia64 ppc ~ppc64 sparc x86 ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 sparc x86 ~x86-linux"
 IUSE="gnutls test"
 
 RDEPEND="

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

2019-02-07 Thread Mikle Kolyada 
commit: 9742c2bdb232989f7d3d4884b89a4482bb3d3daf
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Thu Feb  7 13:32:03 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Thu Feb  7 13:33:06 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9742c2bd

net-voip/telepathy-salut: amd64 stable wrt bug #674978

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild 
b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild
index 53befd2ecc4..39a70d6ae77 100644
--- a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild
+++ b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz";
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~ia64 ppc ~ppc64 sparc x86 ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~ia64 ppc ~ppc64 sparc x86 ~x86-linux"
 IUSE="gnutls test"
 
 RDEPEND="

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

2019-02-02 Thread Sergei Trofimovich 
commit: 53709483cf6af68c404c672dcf71a80e7650828a
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Sat Feb  2 09:03:49 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Feb  2 10:10:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53709483

net-voip/telepathy-salut: stable 0.8.1-r2 for sparc, bug #674978

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild 
b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild
index 6b10a1c13db..cf1587174a4 100644
--- a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild
+++ b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz";
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
+KEYWORDS="alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 sparc x86 ~x86-linux"
 IUSE="gnutls test"
 
 RDEPEND="

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

2019-02-01 Thread Tobias Klausmann 
commit: c48706234e6f85f1fc171f9263c0587648249df7
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Fri Feb  1 20:00:10 2019 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Fri Feb  1 20:00:19 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4870623

net-voip/telepathy-salut-0.8.1-r2: alpha stable

Bug: http://bugs.gentoo.org/674978
Signed-off-by: Tobias Klausmann  gentoo.org>

 net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild 
b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild
index fa05e221e91..6b10a1c13db 100644
--- a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild
+++ b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz";
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
+KEYWORDS="alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
 IUSE="gnutls test"
 
 RDEPEND="

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

2019-01-31 Thread Thomas Deutschmann 
commit: 872fbd8e9a991a4a98be3619353b78438bcc39df
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Jan 31 22:05:27 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Jan 31 22:10:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=872fbd8e

net-voip/telepathy-salut: x86 stable (bug #674978)

Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann  gentoo.org>

 net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild 
b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild
index 21535ca1b82..fa05e221e91 100644
--- a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild
+++ b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ 
SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz";
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
 IUSE="gnutls test"
 
 RDEPEND="

[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/

2018-02-03 Thread Mart Raudsepp 
commit: 8f84218348358769a0d450f91ab7c219fd5b6af8
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sat Feb  3 23:12:36 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat Feb  3 23:12:36 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f842183

net-voip/telepathy-salut: remove old

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 .../telepathy-salut/telepathy-salut-0.8.1.ebuild   | 62 --
 1 file changed, 62 deletions(-)

diff --git a/net-voip/telepathy-salut/telepathy-salut-0.8.1.ebuild 
b/net-voip/telepathy-salut/telepathy-salut-0.8.1.ebuild
deleted file mode 100644
index 99d3cba79ec..000
--- a/net-voip/telepathy-salut/telepathy-salut-0.8.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-any-r1
-
-DESCRIPTION="A link-local XMPP connection manager for Telepathy"
-HOMEPAGE="https://telepathy.freedesktop.org/wiki/CategorySalut";
-SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz";
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ppc ~ppc64 sparc x86 ~x86-linux"
-IUSE="gnutls 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
-   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
-   dev-python/twisted-words )
-"
-# FIXME: needs xmppstream python module
-#   >=net-dns/avahi-0.6.22[python]
-
-src_prepare() {
-   # Fix uninitialized variable, upstream bug #37701
-   epatch "${FILESDIR}/${PN}-0.5.0-uninitialized.patch"
-}
-
-src_configure() {
-   econf \
-   --disable-coding-style-checks \
-   --disable-plugins \
-   --disable-Werror \
-   --disable-static \
-   --disable-avahi-tests \
-   --docdir=/usr/share/doc/${PF} \
-   --with-tls=$(usex gnutls gnutls openssl)
-   #$(use_enable test avahi-tests)
-}
-
-src_install() {
-   MAKEOPTS+=" -j1" default # bug 413581
-   prune_libtool_files
-}

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

2018-01-27 Thread Sergei Trofimovich 
commit: 631b4cec04fc75c96acdf9de0056384d733c23e4
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Sat Jan 27 22:24:38 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jan 27 22:31:17 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=631b4cec

net-voip/telepathy-salut: stable 0.8.1-r1 for sparc, bug #631656

Package-Manager: Portage-2.3.19, Repoman-2.3.6
RepoMan-Options: --include-arches="sparc"

 net-voip/telepathy-salut/telepathy-salut-0.8.1-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r1.ebuild 
b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r1.ebuild
index c09ca321302..497b7f32bbb 100644
--- a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r1.ebuild
+++ b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ 
SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz";
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ppc ~ppc64 ~sparc x86 ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ia64 ppc ~ppc64 sparc x86 ~x86-linux"
 IUSE="gnutls test"
 
 RDEPEND="

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

2017-12-19 Thread Thomas Deutschmann 
commit: 475e537aa07914a2346f6316aae6c70c672be284
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Dec 19 18:48:00 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Dec 19 19:12:47 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=475e537a

net-voip/telepathy-salut: x86 stable (bug #635938)

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 net-voip/telepathy-salut/telepathy-salut-0.8.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r1.ebuild 
b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r1.ebuild
index 41f61df4938..c09ca321302 100644
--- a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r1.ebuild
+++ b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r1.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz";
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ia64 ppc ~ppc64 ~sparc x86 ~x86-linux"
 IUSE="gnutls test"
 
 RDEPEND="

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

2017-12-16 Thread Tobias Klausmann 
commit: 8dcc011b41257441f68807ddb7d7e845f68f5c87
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Sat Dec 16 14:02:41 2017 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Sat Dec 16 14:03:46 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dcc011b

net-voip/telepathy-salut-0.8.1-r1: amd64 stable

Gentoo-Bug: http://bugs.gentoo.org/635938

 net-voip/telepathy-salut/telepathy-salut-0.8.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r1.ebuild 
b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r1.ebuild
index 5fbd1b9472c..41f61df4938 100644
--- a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r1.ebuild
+++ b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r1.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz";
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ia64 ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ia64 ppc ~ppc64 ~sparc ~x86 ~x86-linux"
 IUSE="gnutls test"
 
 RDEPEND="

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

2017-11-06 Thread Tobias Klausmann 
commit: 31fd0dc20ea5e54ab92faed8c84fce56227b20e8
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Mon Nov  6 20:49:27 2017 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Mon Nov  6 20:49:27 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31fd0dc2

net-voip/telepathy-salut-0.8.1-r1: alpha stable

Gentoo-Bug: http://bugs.gentoo.org/635938

 net-voip/telepathy-salut/telepathy-salut-0.8.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r1.ebuild 
b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r1.ebuild
index 1e3e30fb98d..c5cd5c8f3d6 100644
--- a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r1.ebuild
+++ b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r1.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz";
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+KEYWORDS="alpha ~amd64 ~arm ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
 IUSE="gnutls test"
 
 RDEPEND="

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

2017-11-04 Thread Sergei Trofimovich 
commit: c4de45e15beb09175ec8d52141d4b0f98fae8d79
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Nov  4 12:48:28 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Nov  4 13:04:35 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4de45e1

net-voip/telepathy-salut: stable 0.8.1-r1 for ia64, bug #635938

Package-Manager: Portage-2.3.13, Repoman-2.3.4
RepoMan-Options: --include-arches="ia64"

 net-voip/telepathy-salut/telepathy-salut-0.8.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r1.ebuild 
b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r1.ebuild
index 10baef9097d..1e3e30fb98d 100644
--- a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r1.ebuild
+++ b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r1.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz";
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
 IUSE="gnutls test"
 
 RDEPEND="

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

2017-08-24 Thread Gilles Dartiguelongue 
commit: 92cd1e59e3197f22618fb68be9efb0eb736e5960
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Thu Aug 24 22:04:29 2017 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Thu Aug 24 22:47:41 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92cd1e59

net-voip/telepathy-salut: fix python_check_deps, bug #628486

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 net-voip/telepathy-salut/telepathy-salut-0.8.1-r1.ebuild | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r1.ebuild 
b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r1.ebuild
index f5766fe7ad3..10baef9097d 100644
--- a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r1.ebuild
+++ b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r1.ebuild
@@ -50,9 +50,10 @@ PATCHES=(
 )
 
 python_check_deps() {
-   use test \
-   && { has_version "dev-python/twisted[${PYTHON_USEDEP}]" \
-   || has_version 
"dev-python/twisted-words[${PYTHON_USEDEP}]"; }
+   if use test ; then
+has_version "dev-python/twisted[${PYTHON_USEDEP}]" \
+   || has_version 
"dev-python/twisted-words[${PYTHON_USEDEP}]"
+   fi
 }
 
 pkg_setup() {

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

2017-08-20 Thread Gilles Dartiguelongue 
commit: 7bed5b288edd71eb9a4b761d3d2539383e3d233d
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Sun Aug 20 21:54:36 2017 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Sun Aug 20 22:47:41 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bed5b28

net-voip/telepathy-salut: port to unsplit twisted dependencies, bug #605084

Bump to EAPI=6. Fix python-any-r1 usage for unittests. Update homepage.
Add missing sqlite:3 dependency.

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 .../telepathy-salut-0.8.1-r1.ebuild| 77 ++
 1 file changed, 77 insertions(+)

diff --git a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r1.ebuild 
b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r1.ebuild
new file mode 100644
index 000..f5766fe7ad3
--- /dev/null
+++ b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+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";
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+IUSE="gnutls 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
+   || (
+   $(python_gen_any_dep 
'dev-python/twisted[${PYTHON_USEDEP}]')
+   $(python_gen_any_dep 
'dev-python/twisted-words[${PYTHON_USEDEP}]')
+   )
+   )
+"
+# FIXME: needs xmppstream python module
+#   >=net-dns/avahi-0.6.22[python]
+
+PATCHES=(
+   # Fix uninitialized variable, upstream bug #37701
+   "${FILESDIR}"/${PN}-0.5.0-uninitialized.patch
+)
+
+python_check_deps() {
+   use test \
+   && { has_version "dev-python/twisted[${PYTHON_USEDEP}]" \
+   || has_version 
"dev-python/twisted-words[${PYTHON_USEDEP}]"; }
+}
+
+pkg_setup() {
+   python-any-r1_pkg_setup
+}
+
+src_configure() {
+   econf \
+   --disable-coding-style-checks \
+   --disable-plugins \
+   --disable-Werror \
+   --disable-static \
+   --disable-avahi-tests \
+   --docdir=/usr/share/doc/${PF} \
+   --with-tls=$(usex gnutls gnutls openssl)
+   #$(use_enable test avahi-tests)
+}
+
+src_install() {
+   MAKEOPTS+=" -j1" default # bug 413581
+   find "${D}" -name '*.la' -delete || die
+}

[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