gentoo auto-resync : 12:07:2022 - 07:32:03

3 files changed, 13 insertions, 13 deletions

diff --git a/net-voip/Manifest.gz b/net-voip/Manifest.gz
index 315b34d19c13..2e586024d9cd 100644
--- a/net-voip/Manifest.gz
+++ b/net-voip/Manifest.gz
diff --git a/net-voip/telepathy-salut/Manifest b/net-voip/telepathy-salut/Manifest
index 834044fdc54e..658a8ac5ecaa 100644
--- a/net-voip/telepathy-salut/Manifest
+++ b/net-voip/telepathy-salut/Manifest
@@ -1,5 +1,5 @@
 AUX telepathy-salut-0.5.0-uninitialized.patch 496 BLAKE2B f697051628069c6a8c6339ddee37133eab9b90b4f43553b501c611d02de4c63c14d3e4e15896987acd6d4b275a6416a777fbbfac962f90e1dd55c10872ff3939 SHA512 a6365b18b5c1f876c990ec4bbf522b2c8708ca73c201e9bac9447e3fc8d8979b3882c977e9393e34031ca2659b0519c841645280a03d11b4bac8e907db816ce9
-AUX telepathy-salut-0.8.1-openssl-1.1.patch 7190 BLAKE2B f66a7a22ac36889aceca1ddcf8ae85438a6ae380f99f1cc068f9df34b7b6763bd773d0669b36f2ab8fc9557ce4d6ef71abd5f011f542b040114b70a909b40a15 SHA512 fa105e35ce369a35e844d7886c22d7c17433db482d0e5ac6156139ae6474dd91045cda7490d460a26adbd35f370aa98ea9c4a5ebdc81d627c022616a9de9c138
+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 48b8a7da8f2ea60d7bd9fdd0cd871961fb94089a9ece019a01b1af3b0dd696c33aa85e466c51108fc399952424d76345d56eeb700a6ebdc66fb00c67e0902d86 SHA512 ff5d106a36531ba8b58358445aa2d9d3cde046d40802afba796a2746ef1d63cc41645bb16f9b61c695d18bdd21631c9f2f7c9c1c5759ec8918c8611e81fa8cae
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 >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
 +	int r = 0;
 +#endif
  
  	if ((dh=DH_new()) == NULL) return(NULL);
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
++#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)
@@ -45,12 +45,12 @@ index c16deb7..d53ceda 100644
  		0x02,
  		};
  	DH *dh;
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
 +	int r = 0;
 +#endif
  
  	if ((dh=DH_new()) == NULL) return(NULL);
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
++#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)
@@ -71,12 +71,12 @@ index 2854385..93fa7e5 100644
  		0x02,
  		};
  	DH *dh;
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
 +	int r = 0;
 +#endif
  
  	if ((dh=DH_new()) == NULL) return(NULL);
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
++#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)
@@ -97,12 +97,12 @@ index 8e7a278..c2891cd 100644
  		0x02,
  		};
  	DH *dh;
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
 +	int r = 0;
 +#endif
  
  	if ((dh=DH_new()) == NULL) return(NULL);
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
++#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)
@@ -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 >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
++#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;
@@ -148,7 +148,7 @@ index 2201213..18f9981 100644
          long ni = OBJ_obj2nid (obj);
          const guchar *p;
          char *value = NULL;
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
 +        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 >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
 +        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 >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
 +      DEBUG ("initialising SSL library and error strings");
 +#else
        gint malloc_init_succeeded;