cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to glib-openssl-2.50.3.

Browse Source
This commit is contained in:
ajacoutot 2017-06-17 11:28:07 +00:00
parent ff303eb214
commit c1eaef56d0
5 changed files with 4 additions and 227 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
security/glib-openssl/Makefile
View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.3 2017/04/30 10:36:43 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.4 2017/06/17 11:28:07 ajacoutot Exp $
COMMENT= network-related giomodule for GLib using openssl
GNOME_VERSION= 2.50.2
GNOME_VERSION= 2.50.3
GNOME_PROJECT= glib-openssl
REVISION= 1
CATEGORIES= security net

4
security/glib-openssl/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (glib-openssl-2.50.2.tar.xz) = GjgfzjqTL2b/PWrKtAthU/j+Tbc3GDT64YKux8yLYq4=
SIZE (glib-openssl-2.50.2.tar.xz) = 409612
SHA256 (glib-openssl-2.50.3.tar.xz) = AhHBGLhq7CKNK30mBrupY31btdYGlMx8y20pIPAoZrw=
SIZE (glib-openssl-2.50.3.tar.xz) = 410980

161
security/glib-openssl/patches/patch-tls_openssl_gtlsbio_c
View File

@ -1,161 +0,0 @@
$OpenBSD: patch-tls_openssl_gtlsbio_c,v 1.4 2017/04/30 11:55:52 ajacoutot Exp $
From c7eb9a88a2c3d89140d772c7891955a4db2749a8 Mon Sep 17 00:00:00 2001
From: Antoine Jacoutot <ajacoutot@gnome.org>
Date: Sun, 30 Apr 2017 12:52:00 +0200
Subject: Fix the build with libressl.
--- tls/openssl/gtlsbio.c.orig
+++ tls/openssl/gtlsbio.c
@@ -48,7 +48,7 @@ free_gbio (gpointer user_data)
static int
gtls_bio_create (BIO *bio)
{
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER)
bio->init = 0;
bio->num = 0;
bio->ptr = NULL;
@@ -67,7 +67,7 @@ gtls_bio_destroy (BIO *bio)
if (bio == NULL)
return 0;
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER)
if (bio->shutdown)
{
if (bio->ptr != NULL)
@@ -105,14 +105,14 @@ gtls_bio_ctrl (BIO *b,
switch (cmd)
{
case BIO_CTRL_GET_CLOSE:
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER)
ret = b->shutdown;
#else
ret = BIO_get_shutdown (b);
#endif
break;
case BIO_CTRL_SET_CLOSE:
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER)
b->shutdown = (int)num;
#else
BIO_set_shutdown (b, (int)num);
@@ -145,7 +145,7 @@ gtls_bio_write (BIO *bio,
GError *error = NULL;
if (
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER)
!bio->init ||
#else
!BIO_get_init (bio) ||
@@ -153,7 +153,7 @@ gtls_bio_write (BIO *bio,
in == NULL || inl == 0)
return 0;
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER)
gbio = (GTlsBio *)bio->ptr;
#else
gbio = BIO_get_data (bio);
@@ -187,7 +187,7 @@ gtls_bio_read (BIO *bio,
GError *error = NULL;
if (
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER)
!bio->init ||
#else
!BIO_get_init (bio) ||
@@ -195,7 +195,7 @@ gtls_bio_read (BIO *bio,
out == NULL || outl == 0)
return 0;
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER)
gbio = (GTlsBio *)bio->ptr;
#else
gbio = BIO_get_data (bio);
@@ -234,7 +234,7 @@ gtls_bio_gets(BIO *bio,
return -1;
}
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER)
static BIO_METHOD methods_gtls = {
BIO_TYPE_SOURCE_SINK,
"gtls",
@@ -250,7 +250,7 @@ static BIO_METHOD methods_gtls = {
static BIO_METHOD *methods_gtls = NULL;
#endif
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER)
static BIO_METHOD *
BIO_s_gtls (void)
{
@@ -290,7 +290,7 @@ g_tls_bio_new (GIOStream *io_stream)
gbio = g_new0 (GTlsBio, 1);
gbio->io_stream = g_object_ref (io_stream);
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER)
ret->ptr = gbio;
ret->init = 1;
#else
@@ -309,7 +309,7 @@ g_tls_bio_set_read_cancellable (BIO *bio,
g_return_if_fail (bio != NULL);
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER)
gbio = (GTlsBio *)bio->ptr;
#else
gbio = BIO_get_data (bio);
@@ -325,7 +325,7 @@ g_tls_bio_set_read_blocking (BIO *bio,
g_return_if_fail (bio != NULL);
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER)
gbio = (GTlsBio *)bio->ptr;
#else
gbio = BIO_get_data (bio);
@@ -341,7 +341,7 @@ g_tls_bio_set_read_error (BIO *bio,
g_return_if_fail (bio != NULL);
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER)
gbio = (GTlsBio *)bio->ptr;
#else
gbio = BIO_get_data (bio);
@@ -357,7 +357,7 @@ g_tls_bio_set_write_cancellable (BIO *bio,
g_return_if_fail (bio != NULL);
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER)
gbio = (GTlsBio *)bio->ptr;
#else
gbio = BIO_get_data (bio);
@@ -373,7 +373,7 @@ g_tls_bio_set_write_blocking (BIO *bio,
g_return_if_fail (bio != NULL);
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER)
gbio = (GTlsBio *)bio->ptr;
#else
gbio = BIO_get_data (bio);
@@ -389,7 +389,7 @@ g_tls_bio_set_write_error (BIO *bio,
g_return_if_fail (bio != NULL);
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER)
gbio = (GTlsBio *)bio->ptr;
#else
gbio = BIO_get_data (bio);

41
security/glib-openssl/patches/patch-tls_openssl_gtlsclientconnection-openssl_c
View File

@ -1,41 +0,0 @@
$OpenBSD: patch-tls_openssl_gtlsclientconnection-openssl_c,v 1.4 2017/04/30 11:55:52 ajacoutot Exp $
From c7eb9a88a2c3d89140d772c7891955a4db2749a8 Mon Sep 17 00:00:00 2001
From: Antoine Jacoutot <ajacoutot@gnome.org>
Date: Sun, 30 Apr 2017 12:52:00 +0200
Subject: Fix the build with libressl.
From b8d66d389cc7817691a5b39dd1eaa10907453223 Mon Sep 17 00:00:00 2001
From: Ignacio Casal Quinteiro <qignacio@amazon.com>
Date: Sun, 16 Apr 2017 18:59:15 +0200
Subject: Fix warnings pointed out by the new flags added to meson
--- tls/openssl/gtlsclientconnection-openssl.c.orig
+++ tls/openssl/gtlsclientconnection-openssl.c
@@ -381,7 +381,7 @@ retrieve_certificate (SSL *ssl,
key = g_tls_certificate_openssl_get_key (G_TLS_CERTIFICATE_OPENSSL (cert));
/* increase ref count */
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER)
CRYPTO_add (&key->references, 1, CRYPTO_LOCK_EVP_PKEY);
#else
EVP_PKEY_up_ref (key);
@@ -443,7 +443,7 @@ g_tls_client_connection_openssl_initable_init (GInitab
/* Only TLS 1.2 or higher */
SSL_CTX_set_options (priv->ssl_ctx, options);
-#if OPENSSL_VERSION_NUMBER >= 0x10200000L
+#if OPENSSL_VERSION_NUMBER >= 0x10200000L && !defined (LIBRESSL_VERSION_NUMBER)
if (hostname)
{
X509_VERIFY_PARAM *param;
@@ -471,7 +471,7 @@ g_tls_client_connection_openssl_initable_init (GInitab
return FALSE;
}
- data_index = SSL_get_ex_new_index (0, "gtlsclientconnection", NULL, NULL, NULL);
+ data_index = SSL_get_ex_new_index (0, (void *)"gtlsclientconnection", NULL, NULL, NULL);
SSL_set_ex_data (priv->ssl, data_index, client);
#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME

20
security/glib-openssl/patches/patch-tls_openssl_openssl-module_c
View File

@ -1,20 +0,0 @@
$OpenBSD: patch-tls_openssl_openssl-module_c,v 1.1 2017/04/30 10:36:43 ajacoutot Exp $
From b8d66d389cc7817691a5b39dd1eaa10907453223 Mon Sep 17 00:00:00 2001
From: Ignacio Casal Quinteiro <qignacio@amazon.com>
Date: Sun, 16 Apr 2017 18:59:15 +0200
Subject: Fix warnings pointed out by the new flags added to meson
--- tls/openssl/openssl-module.c.orig
+++ tls/openssl/openssl-module.c
@@ -61,9 +61,5 @@ g_io_module_unload (GIOModule *module)
gchar **
g_io_module_query (void)
{
- gchar *eps[] = {
- G_TLS_BACKEND_EXTENSION_POINT_NAME,
- NULL
- };
- return g_strdupv (eps);
+ return g_strsplit (G_TLS_BACKEND_EXTENSION_POINT_NAME, "!", -1);
}