Attachment 160646 Details for Bug 202844 – devel_ace.diff

[patch] devel_ace.diff

devel_ace.diff (text/plain), 2.32 KB, created by tkato432 on 2015-09-02 18:32:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2015-09-02 18:32:05 UTC

Size: 2.32 KB

patch

obsolete

>diff -urN /usr/ports/devel/ace/Makefile devel/ace/Makefile
>--- /usr/ports/devel/ace/Makefile	2015-08-24 03:52:28.312195000 +0900
>+++ devel/ace/Makefile	2015-09-03 00:00:00.000000000 +0900
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/devel/ace/Makefile 377650 2015-01-22 12:01:05Z vanilla $
> 
> PORTNAME=	ace
>-PORTVERSION=	6.3.1
>+PORTVERSION=	6.3.2
> CATEGORIES=	devel
> MASTER_SITES=	ftp://download.dre.vanderbilt.edu/previous_versions/ \
> 		http://download.dre.vanderbilt.edu/previous_versions/
>diff -urN /usr/ports/devel/ace/distinfo devel/ace/distinfo
>--- /usr/ports/devel/ace/distinfo	2015-08-24 03:52:28.312615000 +0900
>+++ devel/ace/distinfo	2015-09-03 00:00:00.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (ACE-6.3.1.tar.bz2) = 7a453ed93a5c1d0c07e2200c6c4ea47b99b218dc2fc5b543ed4c99f498824dad
>-SIZE (ACE-6.3.1.tar.bz2) = 8719870
>+SHA256 (ACE-6.3.2.tar.bz2) = d8e5ad92eab743936fb8921301e7df09a4d331270be2b7b3dec7f47b8ba2ce5f
>+SIZE (ACE-6.3.2.tar.bz2) = 8741018
>diff -urN /usr/ports/devel/ace/files/patch-ace__SSL__SSL_Context.cpp devel/ace/files/patch-ace__SSL__SSL_Context.cpp
>--- /usr/ports/devel/ace/files/patch-ace__SSL__SSL_Context.cpp	2015-08-24 03:52:28.300784000 +0900
>+++ devel/ace/files/patch-ace__SSL__SSL_Context.cpp	1970-01-01 09:00:00.000000000 +0900
>@@ -1,29 +0,0 @@
>---- ace/SSL/SSL_Context.cpp.orig	2014-12-29 10:41:20 UTC
>-+++ ace/SSL/SSL_Context.cpp
>-@@ -274,7 +274,7 @@ ACE_SSL_Context::set_mode (int mode)
>-     case ACE_SSL_Context::TLSv1:
>-       method = ::TLSv1_method ();
>-       break;
>--#ifdef TLS1_1_VERSION
>-+#if defined(TLS1_1_VERSION) && (TLS_MAX_VERSION >= TLS1_1_VERSION)
>-     case ACE_SSL_Context::TLSv1_1_client:
>-       method = ::TLSv1_1_client_method ();
>-       break;
>-@@ -285,7 +285,7 @@ ACE_SSL_Context::set_mode (int mode)
>-       method = ::TLSv1_1_method ();
>-       break;
>- #endif
>--#ifdef TLS1_2_VERSION
>-+#if defined(TLS1_2_VERSION) && (TLS_MAX_VERSION >= TLS1_2_VERSION)
>-     case ACE_SSL_Context::TLSv1_2_client:
>-       method = ::TLSv1_2_client_method ();
>-       break;
>-@@ -556,7 +556,7 @@ ACE_SSL_Context::random_seed (const char
>- int
>- ACE_SSL_Context::egd_file (const char * socket_file)
>- {
>--#if OPENSSL_VERSION_NUMBER < 0x00905100L
>-+#if OPENSSL_VERSION_NUMBER < 0x00905100L || defined(LIBRESSL_VERSION_NUMBER)
>-   // OpenSSL < 0.9.5 doesn't have EGD support.
>-   ACE_UNUSED_ARG (socket_file);
>-   ACE_NOTSUP_RETURN (-1);

Actions: View | Diff

Attachments on bug 202844: 160646 | 161215