[Pkg-corba-commits] r211 - in /trunk/omniorb: configure configure.ac include/omniORB4/sslContext.h mk/beforeauto.mk.in mk/version.mk src/appl/ src/lib/omniORB/orbcore/ssl/sslContext.cc
tgg at users.alioth.debian.org
tgg at users.alioth.debian.org
Fri May 14 18:56:40 UTC 2010
Author: tgg
Date: Fri May 14 18:56:39 2010
New Revision: 211
URL: http://svn.debian.org/wsvn/pkg-corba/?sc=1&rev=211
Log:
Integrate changes for omniORB 4.1.4
Removed:
trunk/omniorb/configure
trunk/omniorb/configure.ac
trunk/omniorb/mk/version.mk
trunk/omniorb/src/appl/
Modified:
trunk/omniorb/include/omniORB4/sslContext.h
trunk/omniorb/mk/beforeauto.mk.in
trunk/omniorb/src/lib/omniORB/orbcore/ssl/sslContext.cc
Modified: trunk/omniorb/include/omniORB4/sslContext.h
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/include/omniORB4/sslContext.h?rev=211&op=diff
==============================================================================
--- trunk/omniorb/include/omniORB4/sslContext.h (original)
+++ trunk/omniorb/include/omniORB4/sslContext.h Fri May 14 18:56:39 2010
@@ -3,7 +3,8 @@
// sslContext.h Created on: 29 May 2001
// Author : Sai Lai Lo (sll)
//
-// Copyright (C) 2001 AT&T Laboratories Cambridge
+// Copyright (C) 2005-2008 Apasphere Ltd
+// Copyright (C) 2001 AT&T Laboratories Cambridge
//
// This file is part of the omniORB library
//
@@ -29,6 +30,9 @@
/*
$Log: sslContext.h,v $
+ Revision 1.1.4.6 2009/05/06 16:16:12 dgrisby
+ Update lots of copyright notices.
+
Revision 1.1.4.5 2008/02/14 13:50:03 dgrisby
Initialise openssl only if necessary. Thanks Teemu Torma.
Modified: trunk/omniorb/mk/beforeauto.mk.in
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/mk/beforeauto.mk.in?rev=211&op=diff
==============================================================================
--- trunk/omniorb/mk/beforeauto.mk.in (original)
+++ trunk/omniorb/mk/beforeauto.mk.in Fri May 14 18:56:39 2010
@@ -85,7 +85,7 @@
-I$(TOP)/include -I$(BASE_OMNI_TREE)/include \
-D__OSVERSION__=@OSVERSION@
-CPPFLAGS = $(DIR_CPPFLAGS) $(IMPORT_CPPFLAGS)
+CPPFLAGS = @CPPFLAGS@ $(DIR_CPPFLAGS) $(IMPORT_CPPFLAGS)
CFLAGS = $(CDEBUGFLAGS) $(COPTIONS) $(CPPFLAGS)
@@ -722,12 +722,12 @@
#
# Default compiler rules
#
-CDEBUGFLAGS = -g
+CDEBUGFLAGS = @CFLAGS@
CLINK = $(CC)
-CLINKOPTIONS = $(CDEBUGFLAGS) $(COPTIONS)
-CXXDEBUGFLAGS = -g
+CLINKOPTIONS = @LDFLAGS@ $(CDEBUGFLAGS) $(COPTIONS)
+CXXDEBUGFLAGS = @CXXFLAGS@
CXXLINK = $(CXX)
-CXXLINKOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS)
+CXXLINKOPTIONS = @LDFLAGS@ $(CXXDEBUGFLAGS) $(CXXOPTIONS)
###########################################################################
@@ -855,9 +855,6 @@
OMNITHREAD_LIB += -ldce -lcma
else
OMNITHREAD_POSIX_CPPFLAGS = -DPthreadDraftVersion=10
-OMNITHREAD_CPPFLAGS += -D_HPUX_SOURCE \
- -D_POSIX_C_SOURCE=199506L
-OMNITHREAD_LIB += -lpthread
endif
define StaticLinkLibrary
@@ -898,14 +895,11 @@
ifdef Compiler_aCC
CXXDEBUGFLAGS = -O
-CXXOPTIONS += -w +inst_v -mt
-CXXLINKOPTIONS += -Wl,+s
+CXXOPTIONS += -AA -w -mt
CDEBUGFLAGS = -O
-COPTIONS = -w -Aa -D_HPUX_SOURCE
-CLINKOPTIONS = -Wl,+s
-
-SHAREDLIB_CPPFLAGS += +Z
-SharedLibraryPlatformLinkFlagsTemplate = -b -Wl,+h$$soname -Wl,+s -lstd -lCsup
+COPTIONS = -w -mt
+
+SharedLibraryPlatformLinkFlagsTemplate = -b -Wl,+h$$soname -lCsup
endif
endif
@@ -946,7 +940,7 @@
###################
ifdef AIX
-ifndef Compiler_GCC
+ifndef Compiler_GCC # Assuming XlC compiler
IMPORT_CPPFLAGS += -D__aix__
@@ -971,7 +965,48 @@
SharedLibraryPlatformLinkFlagsTemplate = -G -qmkshrobj \
-bnoipath -blibpath:/usr/lib:$(prefix)/lib
-endif # compiler not gcc
+endif
+
+ifdef Compiler_GCC
+# A lot of this is stolen from the mk/platform/powerpc_aix4.3_gcc
+# platform file, some of it is made up. This is tested on AIX 5.3
+# with gcc 4.2.0 (as included in the AIX Toolbox for Linux
+# Applications 4/2008 (they really mean GNU applications!)).
+
+IMPORT_CPPFLAGS += -D__aix__
+CMAKEDEPEND += -D_AIX
+CXXMAKEDEPEND += -D_AIX
+CXXLINKOPTIONS += -Wl,-brtl -Wl,-blibpath:/lib:/usr/lib:$(prefix)/lib
+CLINKOPTIONS += -Wl,-brtl -Wl,-blibpath:/lib:/usr/lib:$(prefix)/lib
+
+# Name all static libraries with -ar.a suffix.
+LibPattern = lib%-ar.a
+LibDebugPattern = lib%-ar.a
+LibNoDebugPattern = lib%-ar.a
+LibSuffixPattern = %-ar.a
+LibSearchPattern = -l%-ar
+
+# Name all shared libraries with .a suffix
+LibSharedPattern = lib%.a
+LibSharedSuffixPattern = %.a
+LibSharedSearchPattern = -l%
+
+# OMNI thread stuff
+ThreadSystem = Posix
+OMNITHREAD_POSIX_CPPFLAGS = -DNoNanoSleep -DPthreadDraftVersion=10
+OMNITHREAD_CPPFLAGS = -D_REENTRANT -D_THREAD_SAFE
+OMNITHREAD_PLATFORM_LIB = -lpthreads
+OMNITHREAD_LIB = -lomnithread$(OMNITHREAD_MAJOR_VERSION)$(OMNITHREAD_MINOR_VERSION) $(OMNITHREAD_PLATFORM_LIB)
+
+# Shared library support stuff
+SHAREDLIB_SUFFIX = a
+PythonSHAREDLIB_SUFFIX = so
+SharedLibraryFullNameTemplate = lib$$1$$2$$3$$4.$(SHAREDLIB_SUFFIX)
+SharedLibrarySoNameTemplate = lib$$1$$2.$(SHAREDLIB_SUFFIX).$$3
+SharedLibraryLibNameTemplate = lib$$1$$2$$3.$(SHAREDLIB_SUFFIX)
+SharedLibraryPlatformLinkFlagsTemplate = -shared -fPIC -Wl,-brtl -Wl,-bexpfull -Wl,-blibpath:/lib:/usr/lib:$(prefix)/lib
+
+endif # Compiler_GCC
endif # AIX
###################
Modified: trunk/omniorb/src/lib/omniORB/orbcore/ssl/sslContext.cc
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/src/lib/omniORB/orbcore/ssl/sslContext.cc?rev=211&op=diff
==============================================================================
--- trunk/omniorb/src/lib/omniORB/orbcore/ssl/sslContext.cc (original)
+++ trunk/omniorb/src/lib/omniORB/orbcore/ssl/sslContext.cc Fri May 14 18:56:39 2010
@@ -3,6 +3,7 @@
// sslContext.cc Created on: 29 May 2001
// Author : Sai Lai Lo (sll)
//
+// Copyright (C) 2003-2009 Apasphere Ltd
// Copyright (C) 2001 AT&T Laboratories Cambridge
//
// This file is part of the omniORB library
@@ -29,6 +30,12 @@
/*
$Log: sslContext.cc,v $
+ Revision 1.1.4.7 2009/05/28 09:51:45 dgrisby
+ Set SSL session id context. Thanks Jiang Wei.
+
+ Revision 1.1.4.6 2009/05/06 16:14:51 dgrisby
+ Update lots of copyright notices.
+
Revision 1.1.4.5 2008/02/14 13:50:03 dgrisby
Initialise openssl only if necessary. Thanks Teemu Torma.
@@ -177,6 +184,19 @@
OMNIORB_THROW(INITIALIZE,INITIALIZE_TransportError,
CORBA::COMPLETED_NO);
}
+
+ static const unsigned char session_id_context[] = "omniORB";
+ size_t session_id_len =
+ (sizeof(session_id_context) >= SSL_MAX_SSL_SESSION_ID_LENGTH ?
+ SSL_MAX_SSL_SESSION_ID_LENGTH : sizeof(session_id_context));
+
+ if (SSL_CTX_set_session_id_context(pd_ctx,
+ session_id_context, session_id_len) != 1) {
+ report_error();
+ OMNIORB_THROW(INITIALIZE,INITIALIZE_TransportError,
+ CORBA::COMPLETED_NO);
+ }
+
set_supported_versions();
seed_PRNG();
set_certificate();
More information about the Pkg-corba-commits
mailing list