Attachment #161215 for bug #202844

Lines 2-8 Link Here

(-)devel/ace/Makefile (-1 / +1 lines)
2	# $FreeBSD: head/devel/ace/Makefile 377650 2015-01-22 12:01:05Z vanilla $	2	# $FreeBSD: head/devel/ace/Makefile 377650 2015-01-22 12:01:05Z vanilla $
3		3
4	PORTNAME= ace	4	PORTNAME= ace
5	PORTVERSION= 6.3.1	5	PORTVERSION= 6.3.3
6	CATEGORIES= devel	6	CATEGORIES= devel
7	MASTER_SITES= ftp://download.dre.vanderbilt.edu/previous_versions/ \	7	MASTER_SITES= ftp://download.dre.vanderbilt.edu/previous_versions/ \
8	http://download.dre.vanderbilt.edu/previous_versions/	8	http://download.dre.vanderbilt.edu/previous_versions/

Lines 1-2 Link Here

(-)devel/ace/distinfo (-2 / +2 lines)
1	SHA256 (ACE-6.3.1.tar.bz2) = 7a453ed93a5c1d0c07e2200c6c4ea47b99b218dc2fc5b543ed4c99f498824dad	1	SHA256 (ACE-6.3.3.tar.bz2) = f362e45f624db3343db529654b601d5df69b5f56fa4597cf453da35d80989888
2	SIZE (ACE-6.3.1.tar.bz2) = 8719870	2	SIZE (ACE-6.3.3.tar.bz2) = 8753296

Lines 1-6 Link Here

(-)devel/ace/files/patch-ace-os_include-os_pthread.h (-3 / +3 lines)
1	--- ace/os_include/os_pthread.h.orig 2010-11-27 02:39:33.000000000 +0900	1	--- ace/os_include/os_pthread.h.orig 2015-09-17 06:55:18 UTC
2	+++ ace/os_include/os_pthread.h 2011-11-27 05:58:00.000000000 +0900	2	+++ ace/os_include/os_pthread.h
3	@@ -283,7 +283,11 @@	3	@@ -277,7 +277,11 @@
4	# undef THR_DAEMON	4	# undef THR_DAEMON
5		5
6	# define THR_BOUND 0x00000001	6	# define THR_BOUND 0x00000001

Lines 1-8 Link Here

(-)devel/ace/files/patch-ace__OS_NS_Thread.h (-5 / +5 lines)
1	--- ace/OS_NS_Thread.h.orig 2011-04-07 20:48:50.000000000 +0900	1	--- ace/OS_NS_Thread.h.orig 2015-09-17 06:55:18 UTC
2	+++ ace/OS_NS_Thread.h 2011-11-27 05:38:21.000000000 +0900	2	+++ ace/OS_NS_Thread.h
3	@@ -38,6 +38,12 @@	3	@@ -42,6 +42,12 @@
4	# include "ace/ACE_export.h"	4	# endif /* VxWorks and ! SMP */
5	# include "ace/Object_Manager_Base.h"	5	#endif
6		6
7	+# include <sys/param.h>	7	+# include <sys/param.h>
8	+#if (defined(__FreeBSD__) && ((__FreeBSD_version >= 700110 && __FreeBSD_version < 800000) \|\| __FreeBSD_version >= 800024))	8	+#if (defined(__FreeBSD__) && ((__FreeBSD_version >= 700110 && __FreeBSD_version < 800000) \|\| __FreeBSD_version >= 800024))




--- ace/OS_NS_netdb.inl.orig	2015-09-17 06:55:18 UTC
+++ ace/OS_NS_netdb.inl
@@ -3,6 +3,8 @@
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_errno.h"
 
+#include <sys/param.h>
+
 #if defined (ACE_LACKS_NETDB_REENTRANT_FUNCTIONS)
 # if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) && !defined (HPUX_11)
 #   define ACE_NETDBCALL_RETURN(OP,TYPE,FAILVALUE,TARGET,SIZE) \
@@ -116,7 +118,7 @@ ACE_OS::gethostbyaddr_r (const char *add
       *h_errnop = h_errno;
       return (struct hostent *) 0;
     }

   // GNU C library has a different signature
   ACE_OS::memset (buffer, 0, sizeof (ACE_HOSTENT_DATA));
 
@@ -301,7 +303,7 @@ ACE_OS::gethostbyname_r (const char *nam
       *h_errnop = h_errno;
       return (struct hostent *) 0;
     }

   // GNU C library has a different signature
   ACE_OS::memset (buffer, 0, sizeof (ACE_HOSTENT_DATA));
 
@@ -514,7 +516,7 @@ ACE_OS::getprotobyname_r (const char *na
   else
     return 0;
   //FUZZ: enable check_for_lack_ACE_OS

   // GNU C library has a different signature
   //FUZZ: disable check_for_lack_ACE_OS
   if (::getprotobyname_r (name,
@@ -595,7 +597,7 @@ ACE_OS::getprotobynumber_r (int proto,
   //FUZZ: enable check_for_lack_ACE_OS
   else
     return 0;

   // GNU C library has a different signature
   //FUZZ: disable check_for_lack_ACE_OS
   if (::getprotobynumber_r (proto,
@@ -681,7 +683,7 @@ ACE_OS::getservbyname_r (const char *svc
   //FUZZ: enable check_for_lack_ACE_OS
   else
     return (struct servent *) 0;

Lines 1-6 Link Here

(-)devel/ace/files/patch-ace__OS_NS_signal.h (-3 / +3 lines)
1	--- ace/OS_NS_signal.h.orig 2011-03-04 23:59:09.000000000 +0900	1	--- ace/OS_NS_signal.h.orig 2015-09-17 06:55:18 UTC
2	+++ ace/OS_NS_signal.h 2011-11-27 07:50:01.000000000 +0900	2	+++ ace/OS_NS_signal.h
3	@@ -33,10 +33,10 @@	3	@@ -31,10 +31,10 @@
4	#endif	4	#endif
5	#define ACE_EXPORT_MACRO ACE_Export	5	#define ACE_EXPORT_MACRO ACE_Export
6		6




--- ace/SSL/SSL_Context.cpp.orig	2015-09-17 06:55:18 UTC
+++ ace/SSL/SSL_Context.cpp
@@ -683,7 +683,7 @@ ACE_SSL_Context::random_seed (const char
     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)
 {




include/ace/config-linux.h
include/ace/config-lite.h
include/ace/config-lynxos.h
include/ace/config-macosx-elcapitan.h
include/ace/config-macosx-iOS-hardware.h
include/ace/config-macosx-iOS-simulator.h
include/ace/config-macosx-leopard.h

include/ace/config-vxworks6.7.h
include/ace/config-vxworks6.8.h
include/ace/config-vxworks6.9.h
include/ace/config-vxworks7.0.h
include/ace/config-win32-borland.h
include/ace/config-win32-cegcc.h
include/ace/config-win32-common.h

%%DATADIR%%/include/makeinclude/platform_lynxos.GNU
%%DATADIR%%/include/makeinclude/platform_macosx.GNU
%%DATADIR%%/include/makeinclude/platform_macosx_common.GNU
%%DATADIR%%/include/makeinclude/platform_macosx_elcapitan.GNU
%%DATADIR%%/include/makeinclude/platform_macosx_iOS.GNU
%%DATADIR%%/include/makeinclude/platform_macosx_icc.GNU
%%DATADIR%%/include/makeinclude/platform_macosx_leopard.GNU

%%DATADIR%%/include/makeinclude/platform_vxworks6.7.GNU
%%DATADIR%%/include/makeinclude/platform_vxworks6.8.GNU
%%DATADIR%%/include/makeinclude/platform_vxworks6.9.GNU
%%DATADIR%%/include/makeinclude/platform_vxworks7.0.GNU
%%DATADIR%%/include/makeinclude/platform_win32_dmc.GNU
%%DATADIR%%/include/makeinclude/platform_win32_icc.GNU
%%DATADIR%%/include/makeinclude/platform_win32_interix.GNU

Return to bug 202844

Lines 1-15 Link Here

(-)devel/ace/files/patch-ace__OS_NS_netdb.inl (-9 / +9 lines)
1	--- ace/OS_NS_netdb.inl.orig 2011-03-21 21:54:52.000000000 +0900	1	--- ace/OS_NS_netdb.inl.orig 2015-09-17 06:55:18 UTC
2	+++ ace/OS_NS_netdb.inl 2011-11-27 07:46:06.000000000 +0900	2	+++ ace/OS_NS_netdb.inl
3	@@ -6,6 +6,8 @@	3	@@ -3,6 +3,8 @@
4	#include "ace/OS_NS_string.h"	4	#include "ace/OS_NS_string.h"
5	#include "ace/OS_NS_errno.h"	5	#include "ace/OS_NS_errno.h"
6		6
7	+#include <sys/param.h>	7	+#include <sys/param.h>
8	+	8	+
9	#if defined (ACE_LACKS_NETDB_REENTRANT_FUNCTIONS)	9	#if defined (ACE_LACKS_NETDB_REENTRANT_FUNCTIONS)
10	# if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)	10	# if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) && !defined (HPUX_11)
11	# define ACE_NETDBCALL_RETURN(OP,TYPE,FAILVALUE,TARGET,SIZE) \	11	# define ACE_NETDBCALL_RETURN(OP,TYPE,FAILVALUE,TARGET,SIZE) \
12	@@ -119,7 +121,7 @@	12	@@ -116,7 +118,7 @@ ACE_OS::gethostbyaddr_r (const char *add
13	*h_errnop = h_errno;	13	*h_errnop = h_errno;
14	return (struct hostent *) 0;	14	return (struct hostent *) 0;
15	}	15	}
Lines 18-24 Link Here
18	// GNU C library has a different signature	18	// GNU C library has a different signature
19	ACE_OS::memset (buffer, 0, sizeof (ACE_HOSTENT_DATA));	19	ACE_OS::memset (buffer, 0, sizeof (ACE_HOSTENT_DATA));
20		20
21	@@ -304,7 +306,7 @@	21	@@ -301,7 +303,7 @@ ACE_OS::gethostbyname_r (const char *nam
22	*h_errnop = h_errno;	22	*h_errnop = h_errno;
23	return (struct hostent *) 0;	23	return (struct hostent *) 0;
24	}	24	}
Lines 27-33 Link Here
27	// GNU C library has a different signature	27	// GNU C library has a different signature
28	ACE_OS::memset (buffer, 0, sizeof (ACE_HOSTENT_DATA));	28	ACE_OS::memset (buffer, 0, sizeof (ACE_HOSTENT_DATA));
29		29
30	@@ -517,7 +519,7 @@	30	@@ -514,7 +516,7 @@ ACE_OS::getprotobyname_r (const char *na
31	else	31	else
32	return 0;	32	return 0;
33	//FUZZ: enable check_for_lack_ACE_OS	33	//FUZZ: enable check_for_lack_ACE_OS
Lines 36-42 Link Here
36	// GNU C library has a different signature	36	// GNU C library has a different signature
37	//FUZZ: disable check_for_lack_ACE_OS	37	//FUZZ: disable check_for_lack_ACE_OS
38	if (::getprotobyname_r (name,	38	if (::getprotobyname_r (name,
39	@@ -598,7 +600,7 @@	39	@@ -595,7 +597,7 @@ ACE_OS::getprotobynumber_r (int proto,
40	//FUZZ: enable check_for_lack_ACE_OS	40	//FUZZ: enable check_for_lack_ACE_OS
41	else	41	else
42	return 0;	42	return 0;
Lines 45-51 Link Here
45	// GNU C library has a different signature	45	// GNU C library has a different signature
46	//FUZZ: disable check_for_lack_ACE_OS	46	//FUZZ: disable check_for_lack_ACE_OS
47	if (::getprotobynumber_r (proto,	47	if (::getprotobynumber_r (proto,
48	@@ -684,7 +686,7 @@	48	@@ -681,7 +683,7 @@ ACE_OS::getservbyname_r (const char *svc
49	//FUZZ: enable check_for_lack_ACE_OS	49	//FUZZ: enable check_for_lack_ACE_OS
50	else	50	else
51	return (struct servent *) 0;	51	return (struct servent *) 0;

Lines 1-24 Link Here

(-)devel/ace/files/patch-ace__SSL__SSL_Context.cpp (-20 / +2 lines)
1	--- ace/SSL/SSL_Context.cpp.orig 2014-12-29 10:41:20 UTC	1	--- ace/SSL/SSL_Context.cpp.orig 2015-09-17 06:55:18 UTC
2	+++ ace/SSL/SSL_Context.cpp	2	+++ ace/SSL/SSL_Context.cpp
3	@@ -274,7 +274,7 @@ ACE_SSL_Context::set_mode (int mode)	3	@@ -683,7 +683,7 @@ ACE_SSL_Context::random_seed (const char
4	case ACE_SSL_Context::TLSv1:
5	method = ::TLSv1_method ();
6	break;
7	-#ifdef TLS1_1_VERSION
8	+#if defined(TLS1_1_VERSION) && (TLS_MAX_VERSION >= TLS1_1_VERSION)
9	case ACE_SSL_Context::TLSv1_1_client:
10	method = ::TLSv1_1_client_method ();
11	break;
12	@@ -285,7 +285,7 @@ ACE_SSL_Context::set_mode (int mode)
13	method = ::TLSv1_1_method ();
14	break;
15	#endif
16	-#ifdef TLS1_2_VERSION
17	+#if defined(TLS1_2_VERSION) && (TLS_MAX_VERSION >= TLS1_2_VERSION)
18	case ACE_SSL_Context::TLSv1_2_client:
19	method = ::TLSv1_2_client_method ();
20	break;
21	@@ -556,7 +556,7 @@ ACE_SSL_Context::random_seed (const char
22	int	4	int
23	ACE_SSL_Context::egd_file (const char * socket_file)	5	ACE_SSL_Context::egd_file (const char * socket_file)
24	{	6	{

Lines 1098-1103 Link Here

(-)devel/ace/pkg-plist (+4 lines)
1098	include/ace/config-linux.h	1098	include/ace/config-linux.h
1099	include/ace/config-lite.h	1099	include/ace/config-lite.h
1100	include/ace/config-lynxos.h	1100	include/ace/config-lynxos.h
		1101	include/ace/config-macosx-elcapitan.h
1101	include/ace/config-macosx-iOS-hardware.h	1102	include/ace/config-macosx-iOS-hardware.h
1102	include/ace/config-macosx-iOS-simulator.h	1103	include/ace/config-macosx-iOS-simulator.h
1103	include/ace/config-macosx-leopard.h	1104	include/ace/config-macosx-leopard.h
Lines 1135-1140 Link Here
1135	include/ace/config-vxworks6.7.h	1136	include/ace/config-vxworks6.7.h
1136	include/ace/config-vxworks6.8.h	1137	include/ace/config-vxworks6.8.h
1137	include/ace/config-vxworks6.9.h	1138	include/ace/config-vxworks6.9.h
		1139	include/ace/config-vxworks7.0.h
1138	include/ace/config-win32-borland.h	1140	include/ace/config-win32-borland.h
1139	include/ace/config-win32-cegcc.h	1141	include/ace/config-win32-cegcc.h
1140	include/ace/config-win32-common.h	1142	include/ace/config-win32-common.h
Lines 1509-1514 Link Here
1509	%%DATADIR%%/include/makeinclude/platform_lynxos.GNU	1511	%%DATADIR%%/include/makeinclude/platform_lynxos.GNU
1510	%%DATADIR%%/include/makeinclude/platform_macosx.GNU	1512	%%DATADIR%%/include/makeinclude/platform_macosx.GNU
1511	%%DATADIR%%/include/makeinclude/platform_macosx_common.GNU	1513	%%DATADIR%%/include/makeinclude/platform_macosx_common.GNU
		1514	%%DATADIR%%/include/makeinclude/platform_macosx_elcapitan.GNU
1512	%%DATADIR%%/include/makeinclude/platform_macosx_iOS.GNU	1515	%%DATADIR%%/include/makeinclude/platform_macosx_iOS.GNU
1513	%%DATADIR%%/include/makeinclude/platform_macosx_icc.GNU	1516	%%DATADIR%%/include/makeinclude/platform_macosx_icc.GNU
1514	%%DATADIR%%/include/makeinclude/platform_macosx_leopard.GNU	1517	%%DATADIR%%/include/makeinclude/platform_macosx_leopard.GNU
Lines 1539-1544 Link Here
1539	%%DATADIR%%/include/makeinclude/platform_vxworks6.7.GNU	1542	%%DATADIR%%/include/makeinclude/platform_vxworks6.7.GNU
1540	%%DATADIR%%/include/makeinclude/platform_vxworks6.8.GNU	1543	%%DATADIR%%/include/makeinclude/platform_vxworks6.8.GNU
1541	%%DATADIR%%/include/makeinclude/platform_vxworks6.9.GNU	1544	%%DATADIR%%/include/makeinclude/platform_vxworks6.9.GNU
		1545	%%DATADIR%%/include/makeinclude/platform_vxworks7.0.GNU
1542	%%DATADIR%%/include/makeinclude/platform_win32_dmc.GNU	1546	%%DATADIR%%/include/makeinclude/platform_win32_dmc.GNU
1543	%%DATADIR%%/include/makeinclude/platform_win32_icc.GNU	1547	%%DATADIR%%/include/makeinclude/platform_win32_icc.GNU
1544	%%DATADIR%%/include/makeinclude/platform_win32_interix.GNU	1548	%%DATADIR%%/include/makeinclude/platform_win32_interix.GNU