Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=boost14.git;a=commitdiff;h=59ef55f1f74cbcc46cd74fbcff307b4b6e2c9abf
commit 59ef55f1f74cbcc46cd74fbcff307b4b6e2c9abf Author: Elentir <elen...@frugalware.org> Date: Thu Mar 24 16:13:57 2011 +0100 boost-1.46.1-1-x86_64 * version bump * remove non-multithread support since it can't built both * add mpi support * change m8r diff --git a/source/devel-extra/boost/FrugalBuild b/source/devel-extra/boost/FrugalBuild index 978c121..1b1507f 100644 --- a/source/devel-extra/boost/FrugalBuild +++ b/source/devel-extra/boost/FrugalBuild @@ -1,36 +1,28 @@ # Compiling Time: 2.33 SBU -# Maintainer: crazy <cr...@frugalware.org> +# Maintainer: Elentir <elen...@frugalware.org> # Contributor: Christian Hamar alias krix <kr...@linuxforum.hu> pkgname=boost -pkgver=1.39.0 -pkgrel=6 +pkgver=1.46.1 +pkgrel=1 pkgdesc="Boost header files , examples and tools" _F_sourceforge_ext=".tar.bz2" Finclude sourceforge python url="http://boost.org/"; depends=() up2date="lynx -dump http://www.boost.org/users/download/|grep 'Current Release'|sed 's/.*]\(.*\) -.*/\1/'" -makedepends=('boost-jam>=3.1.17' 'python>=2.7' 'icu4c>=4.2' 'bzip2' 'zlib' 'openssl>=1.0.0') +makedepends=('boost-jam>=3.1.19' 'python>=2.7' 'icu4c>=4.2' 'bzip2' 'zlib' 'openssl>=1.0.0') groups=('devel-extra') archs=('i686' 'x86_64' 'ppc') -source=(${source/-$pkgver/_${pkgver//./_}} boost-mt.patch \ - boost-fs_gcc44.patch boost-function_template.patch \ - openssl-1.0.diff boost-template_arity-gcc45.patch) +source=(${source/-$pkgver/_${pkgver//./_}}) _F_cd_path="${pkgname}_`echo $pkgver|tr . _`" -sha1sums=('6af42f74ab24ccc51589a025593bad298c8adde8' \ - 'b96f45451173a01e276427d21aa2a584b2bb2dd1' \ - '84bacf10dd215637282982f4480589ef276f6af9' \ - 'f43601261c66704638ff66347fd2741211edd864' \ - '56221640abcaa0b10000f391695f4cf1a47fea16' \ - '1a5239bb29888004f348af3ea875c63b52baaf90') +sha1sums=('3ca6e173ec805e5126868d8a03618e587aa26aef') -subpkgs=("libboost" "libboost-mt" "libboost-static" "libboost-mt-static") -subdescs=('Boost libraries.' 'Boost libraries with multithreading support.' \ - 'Boost libraries statically linked.' 'Boost libraries with multithreading support statically linked.') -subdepends=('icu4c>=4.2 libgcc bzip2 zlib' 'icu4c>=4.2 libgcc bzip2 zlib' '' '') -subgroups=('devel-extra' 'lib' 'devel-extra' 'devel-extra') -subarchs=('i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 pcc' 'i686 x86_64 pcc') +subpkgs=("libboost" "libboost-static" "libboost-mpi") +subdescs=('Boost libraries.' 'Boost libraries statically linked.' 'Boost MPI Interface.') +subdepends=('icu4c>=4.2 libgcc bzip2 zlib' '' 'libboost openmpi') +subgroups=('lib' 'devel-extra' 'lib-extra') +subarchs=('i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc') build() { @@ -40,29 +32,15 @@ build() export CXXFLAGS="$CXXFLAGS -fPIC -DPIC" fi Fsed "-O3" "$CXXFLAGS -Wno-deprecated" tools/build/v2/tools/gcc.jam + echo "using mpi ;" >> tools/build/v2/user-config.jam || Fdie + BOOSTJAM="/usr/bin/bjam" - OPTIONS="variant=release debug-symbols=off optimization=speed threading=single,multi -d2" JOBS="$MAKEFLAGS" ${BOOSTJAM} \ - ${JOBS} \ - -sHAVE_ICU=1 -sICU_PATH=/usr \ - -sBOOST_ROOT="$Fsrcdir" \ - -sPYTHON_ROOT=/usr \ - -sPYTHON_VERSION="$_F_python_ver" \ - -sEXPAT_INCLUDE=/usr/include \ - -sEXPAT_LIBPATH=/usr/lib \ - ${OPTIONS} \ - --prefix="$Fdestdir/usr" \ - --exec-prefix="$Fdestdir/usr" \ - --includedir="$Fdestdir/usr/include" \ - --libdir="$Fdestdir/usr/lib" \ - --without-mpi \ - --toolset=gcc \ - --layout=system || Fdie - ## TODO: mpi support - - ${BOOSTJAM} \ + release debug-symbols=off threading=multi \ + runtime-link=shared link=shared,static \ + cflags=-fno-strict-aliasing optimization=speed \ ${JOBS} \ -sHAVE_ICU=1 -sICU_PATH=/usr \ -sBOOST_ROOT="$Fsrcdir" \ @@ -70,12 +48,10 @@ build() -sPYTHON_VERSION="$_F_python_ver" \ -sEXPAT_INCLUDE=/usr/include \ -sEXPAT_LIBPATH=/usr/lib \ - ${OPTIONS} \ --prefix="$Fdestdir/usr" \ --exec-prefix="$Fdestdir/usr" \ --includedir="$Fdestdir/usr/include" \ --libdir="$Fdestdir/usr/lib" \ - --without-mpi \ --toolset=gcc \ --layout=system install || Fdie @@ -84,16 +60,10 @@ build() rm -rf v2/debian || Fdie cp -a b* index.html v2/ $Fdestdir/usr/share/boost/ || Fdie - ## remove usr/lib/libboost_wave.so that links on -mt libs so it should not be build - ## like this at all and only the -mt one should be used , like for thread one etc -# Frm usr/lib/libboost_wave.so - ## not needed -# Frm usr/lib/libboost_test_exec_monitor*.a - - Fsplit libboost-mt usr/lib/libboost_*-mt.so* - Fsplit libboost-mt-static usr/lib/libboost_*-mt.a + Fsplit libboost-mpi usr/lib/libboost_graph_parallel* + Fsplit libboost-mpi usr/lib/libboost_mpi* Fsplit libboost usr/lib/libboost_*.so* - Fsplit libboost-static usr/lib/libboost_*.a + Fsplit libboost-static usr/lib/libboost_*.a } # optimization OK diff --git a/source/devel-extra/boost/boost-fs_gcc44.patch b/source/devel-extra/boost/boost-fs_gcc44.patch deleted file mode 100644 index ef02b85..0000000 --- a/source/devel-extra/boost/boost-fs_gcc44.patch +++ /dev/null @@ -1,163 +0,0 @@ -Index: boost/filesystem/operations.hpp -=================================================================== ---- boost/filesystem/operations.hpp (revision 52859) -+++ boost/filesystem/operations.hpp (working copy) -@@ -659,9 +659,9 @@ - { return is_symlink<wpath>( ph ); } - - inline bool is_empty( const path & ph ) -- { return is_empty<path>( ph ); } -+ { return boost::filesystem::is_empty<path>( ph ); } - inline bool is_empty( const wpath & ph ) -- { return is_empty<wpath>( ph ); } -+ { return boost::filesystem::is_empty<wpath>( ph ); } - - inline bool equivalent( const path & ph1, const path & ph2 ) - { return equivalent<path>( ph1, ph2 ); } -Index: libs/filesystem/test/path_test.cpp -=================================================================== ---- libs/filesystem/test/path_test.cpp (revision 52859) -+++ libs/filesystem/test/path_test.cpp (working copy) -@@ -27,9 +27,8 @@ - - namespace fs = boost::filesystem; - using boost::filesystem::path; --using boost::next; --using boost::prior; - -+ - #include <boost/detail/lightweight_test.hpp> - - #define PATH_CHECK( a, b ) check( a, b, __LINE__ ) -@@ -480,18 +479,18 @@ - - itr_ck = "foo"; - BOOST_TEST( *itr_ck.begin() == std::string( "foo" ) ); -- BOOST_TEST( next( itr_ck.begin() ) == itr_ck.end() ); -- BOOST_TEST( *prior( itr_ck.end() ) == std::string( "foo" ) ); -- BOOST_TEST( prior( itr_ck.end() ) == itr_ck.begin() ); -+ BOOST_TEST( boost::next( itr_ck.begin() ) == itr_ck.end() ); -+ BOOST_TEST( *boost::prior( itr_ck.end() ) == std::string( "foo" ) ); -+ BOOST_TEST( boost::prior( itr_ck.end() ) == itr_ck.begin() ); - - itr_ck = path( "/foo" ); - BOOST_TEST( *itr_ck.begin() == std::string( "/" ) ); -- BOOST_TEST( *next( itr_ck.begin() ) == std::string( "foo" ) ); -- BOOST_TEST( next(next( itr_ck.begin() )) == itr_ck.end() ); -- BOOST_TEST( next( itr_ck.begin() ) == prior( itr_ck.end() ) ); -- BOOST_TEST( *prior( itr_ck.end() ) == std::string( "foo" ) ); -- BOOST_TEST( *prior(prior( itr_ck.end() )) == std::string( "/" ) ); -- BOOST_TEST( prior(prior( itr_ck.end() )) == itr_ck.begin() ); -+ BOOST_TEST( *boost::next( itr_ck.begin() ) == std::string( "foo" ) ); -+ BOOST_TEST( boost::next(boost::next( itr_ck.begin() )) == itr_ck.end() ); -+ BOOST_TEST( boost::next( itr_ck.begin() ) == boost::prior( itr_ck.end() ) ); -+ BOOST_TEST( *boost::prior( itr_ck.end() ) == std::string( "foo" ) ); -+ BOOST_TEST( *boost::prior(boost::prior( itr_ck.end() )) == std::string( "/" ) ); -+ BOOST_TEST( boost::prior(boost::prior( itr_ck.end() )) == itr_ck.begin() ); - - itr_ck = "/foo/bar"; - itr = itr_ck.begin(); -@@ -1106,65 +1105,65 @@ - - itr_ck = path( "c:" ); - BOOST_TEST( *itr_ck.begin() == std::string( "c:" ) ); -- BOOST_TEST( next( itr_ck.begin() ) == itr_ck.end() ); -- BOOST_TEST( prior( itr_ck.end() ) == itr_ck.begin() ); -- BOOST_TEST( *prior( itr_ck.end() ) == std::string( "c:" ) ); -+ BOOST_TEST( boost::next( itr_ck.begin() ) == itr_ck.end() ); -+ BOOST_TEST( boost::prior( itr_ck.end() ) == itr_ck.begin() ); -+ BOOST_TEST( *boost::prior( itr_ck.end() ) == std::string( "c:" ) ); - - itr_ck = path( "c:/" ); - BOOST_TEST( *itr_ck.begin() == std::string( "c:" ) ); -- BOOST_TEST( *next( itr_ck.begin() ) == std::string( "/" ) ); -- BOOST_TEST( next( next( itr_ck.begin() )) == itr_ck.end() ); -- BOOST_TEST( prior( prior( itr_ck.end() )) == itr_ck.begin() ); -- BOOST_TEST( *prior( itr_ck.end() ) == std::string( "/" ) ); -- BOOST_TEST( *prior( prior( itr_ck.end() )) == std::string( "c:" ) ); -+ BOOST_TEST( *boost::next( itr_ck.begin() ) == std::string( "/" ) ); -+ BOOST_TEST( boost::next( boost::next( itr_ck.begin() )) == itr_ck.end() ); -+ BOOST_TEST( boost::prior( boost::prior( itr_ck.end() )) == itr_ck.begin() ); -+ BOOST_TEST( *boost::prior( itr_ck.end() ) == std::string( "/" ) ); -+ BOOST_TEST( *boost::prior( boost::prior( itr_ck.end() )) == std::string( "c:" ) ); - - itr_ck = path( "c:foo" ); - BOOST_TEST( *itr_ck.begin() == std::string( "c:" ) ); -- BOOST_TEST( *next( itr_ck.begin() ) == std::string( "foo" ) ); -- BOOST_TEST( next(next( itr_ck.begin() )) == itr_ck.end() ); -- BOOST_TEST( prior(prior( itr_ck.end() )) == itr_ck.begin() ); -- BOOST_TEST( *prior( itr_ck.end() ) == std::string( "foo" ) ); -- BOOST_TEST( *prior(prior( itr_ck.end() )) == std::string( "c:" ) ); -+ BOOST_TEST( *boost::next( itr_ck.begin() ) == std::string( "foo" ) ); -+ BOOST_TEST( boost::next(boost::next( itr_ck.begin() )) == itr_ck.end() ); -+ BOOST_TEST( boost::prior(boost::prior( itr_ck.end() )) == itr_ck.begin() ); -+ BOOST_TEST( *boost::prior( itr_ck.end() ) == std::string( "foo" ) ); -+ BOOST_TEST( *boost::prior(boost::prior( itr_ck.end() )) == std::string( "c:" ) ); - - itr_ck = path( "c:/foo" ); - BOOST_TEST( *itr_ck.begin() == std::string( "c:" ) ); -- BOOST_TEST( *next( itr_ck.begin() ) == std::string( "/" ) ); -- BOOST_TEST( *next( next( itr_ck.begin() )) == std::string( "foo" ) ); -- BOOST_TEST( next( next( next( itr_ck.begin() ))) == itr_ck.end() ); -- BOOST_TEST( prior( prior( prior( itr_ck.end() ))) == itr_ck.begin() ); -- BOOST_TEST( *prior( itr_ck.end() ) == std::string( "foo" ) ); -- BOOST_TEST( *prior( prior( itr_ck.end() )) == std::string( "/" ) ); -- BOOST_TEST( *prior( prior( prior( itr_ck.end() ))) == std::string( "c:" ) ); -+ BOOST_TEST( *boost::next( itr_ck.begin() ) == std::string( "/" ) ); -+ BOOST_TEST( *boost::next( boost::next( itr_ck.begin() )) == std::string( "foo" ) ); -+ BOOST_TEST( boost::next( boost::next( boost::next( itr_ck.begin() ))) == itr_ck.end() ); -+ BOOST_TEST( boost::prior( boost::prior( boost::prior( itr_ck.end() ))) == itr_ck.begin() ); -+ BOOST_TEST( *boost::prior( itr_ck.end() ) == std::string( "foo" ) ); -+ BOOST_TEST( *boost::prior( boost::prior( itr_ck.end() )) == std::string( "/" ) ); -+ BOOST_TEST( *boost::prior( boost::prior( boost::prior( itr_ck.end() ))) == std::string( "c:" ) ); - - itr_ck = path( "//net" ); - BOOST_TEST( *itr_ck.begin() == std::string( "//net" ) ); -- BOOST_TEST( next( itr_ck.begin() ) == itr_ck.end() ); -- BOOST_TEST( prior( itr_ck.end() ) == itr_ck.begin() ); -- BOOST_TEST( *prior( itr_ck.end() ) == std::string( "//net" ) ); -+ BOOST_TEST( boost::next( itr_ck.begin() ) == itr_ck.end() ); -+ BOOST_TEST( boost::prior( itr_ck.end() ) == itr_ck.begin() ); -+ BOOST_TEST( *boost::prior( itr_ck.end() ) == std::string( "//net" ) ); - - itr_ck = path( "//net/" ); - CHECK_EQUAL( *itr_ck.begin(), "//net" ); -- CHECK_EQUAL( *next( itr_ck.begin() ), "/" ); -- BOOST_TEST( next(next( itr_ck.begin() )) == itr_ck.end() ); -- BOOST_TEST( prior(prior( itr_ck.end() )) == itr_ck.begin() ); -- CHECK_EQUAL( *prior( itr_ck.end() ), "/" ); -- CHECK_EQUAL( *prior(prior( itr_ck.end() )), "//net" ); -+ CHECK_EQUAL( *boost::next( itr_ck.begin() ), "/" ); -+ BOOST_TEST( boost::next(boost::next( itr_ck.begin() )) == itr_ck.end() ); -+ BOOST_TEST( boost::prior(boost::prior( itr_ck.end() )) == itr_ck.begin() ); -+ CHECK_EQUAL( *boost::prior( itr_ck.end() ), "/" ); -+ CHECK_EQUAL( *boost::prior(boost::prior( itr_ck.end() )), "//net" ); - - itr_ck = path( "//net/foo" ); - BOOST_TEST( *itr_ck.begin() == std::string( "//net" ) ); -- BOOST_TEST( *next( itr_ck.begin() ) == std::string( "/" ) ); -- BOOST_TEST( *next(next( itr_ck.begin() )) == std::string( "foo" ) ); -- BOOST_TEST( next(next(next( itr_ck.begin() ))) == itr_ck.end() ); -- BOOST_TEST( prior(prior(prior( itr_ck.end() ))) == itr_ck.begin() ); -- BOOST_TEST( *prior( itr_ck.end() ) == std::string( "foo" ) ); -- BOOST_TEST( *prior(prior( itr_ck.end() )) == std::string( "/" ) ); -- BOOST_TEST( *prior(prior(prior( itr_ck.end() ))) == std::string( "//net" ) ); -+ BOOST_TEST( *boost::next( itr_ck.begin() ) == std::string( "/" ) ); -+ BOOST_TEST( *boost::next(boost::next( itr_ck.begin() )) == std::string( "foo" ) ); -+ BOOST_TEST( boost::next(boost::next(boost::next( itr_ck.begin() ))) == itr_ck.end() ); -+ BOOST_TEST( boost::prior(boost::prior(boost::prior( itr_ck.end() ))) == itr_ck.begin() ); -+ BOOST_TEST( *boost::prior( itr_ck.end() ) == std::string( "foo" ) ); -+ BOOST_TEST( *boost::prior(boost::prior( itr_ck.end() )) == std::string( "/" ) ); -+ BOOST_TEST( *boost::prior(boost::prior(boost::prior( itr_ck.end() ))) == std::string( "//net" ) ); - - itr_ck = path( "prn:" ); - BOOST_TEST( *itr_ck.begin() == std::string( "prn:" ) ); -- BOOST_TEST( next( itr_ck.begin() ) == itr_ck.end() ); -- BOOST_TEST( prior( itr_ck.end() ) == itr_ck.begin() ); -- BOOST_TEST( *prior( itr_ck.end() ) == std::string( "prn:" ) ); -+ BOOST_TEST( boost::next( itr_ck.begin() ) == itr_ck.end() ); -+ BOOST_TEST( boost::prior( itr_ck.end() ) == itr_ck.begin() ); -+ BOOST_TEST( *boost::prior( itr_ck.end() ) == std::string( "prn:" ) ); - } // Windows - - else diff --git a/source/devel-extra/boost/boost-function_template.patch b/source/devel-extra/boost/boost-function_template.patch deleted file mode 100644 index c8178ea..0000000 --- a/source/devel-extra/boost/boost-function_template.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -ru boost/function/function_template.hpp boost/function/function_template.hpp ---- boost/function/function_template.hpp 2009-05-10 10:31:29.000000000 +0100 -+++ boost/function/function_template.hpp 2009-05-10 10:49:46.000000000 +0100 -@@ -950,10 +950,10 @@ - f.vtable->manager(f.functor, this->functor, - boost::detail::function::move_functor_tag); - f.vtable = 0; --#if !defined(BOOST_NO_EXCEPTIONS) - } else { - clear(); - } -+#if !defined(BOOST_NO_EXCEPTIONS) - } catch (...) { - vtable = 0; - throw; diff --git a/source/devel-extra/boost/boost-mt.patch b/source/devel-extra/boost/boost-mt.patch deleted file mode 100644 index 0c5e7dd..0000000 --- a/source/devel-extra/boost/boost-mt.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur boost_1_39_0.orig/Jamroot boost_1_39_0/Jamroot ---- boost_1_39_0.orig/Jamroot 2009-04-14 11:00:59.000000000 +0200 -+++ boost_1_39_0/Jamroot 2009-06-28 22:55:02.000000000 +0200 -@@ -344,7 +344,7 @@ - else - { - local result = [ common.format-name -- <base> -+ <base> <threading> - -$(BUILD_ID) - : $(name) : $(type) : $(property-set) ] ; - -@@ -359,7 +359,7 @@ - ( ! ( [ $(property-set).get <target-os> ] in windows cygwin darwin aix ) && - ! ( [ $(property-set).get <toolset> ] in pgi ) ) - { -- result = $(result).$(BOOST_VERSION) ; -+# result = $(result).$(BOOST_VERSION) ; - } - - return $(result) ; diff --git a/source/devel-extra/boost/boost-template_arity-gcc45.patch b/source/devel-extra/boost/boost-template_arity-gcc45.patch deleted file mode 100644 index c6cd990..0000000 --- a/source/devel-extra/boost/boost-template_arity-gcc45.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/boost/mpl/aux_/preprocessed/gcc/template_arity.hpp b/boost/mpl/aux_/preprocessed/gcc/template_arity.hpp -index 3e7bfba..daec4b8 100644 ---- a/boost/mpl/aux_/preprocessed/gcc/template_arity.hpp -+++ b/boost/mpl/aux_/preprocessed/gcc/template_arity.hpp -@@ -83,7 +81,7 @@ template< typename F, int N > - struct template_arity_impl - { - BOOST_STATIC_CONSTANT(int, value = -- sizeof(arity_helper(type_wrapper<F>(), arity_tag<N>())) - 1 -+ sizeof(::boost::mpl::aux::arity_helper(type_wrapper<F>(), arity_tag<N>())) - 1 - ); - }; - -diff --git a/boost/mpl/aux_/template_arity.hpp b/boost/mpl/aux_/template_arity.hpp -index 47e4eeb..e0cc59d 100644 ---- a/boost/mpl/aux_/template_arity.hpp -+++ b/boost/mpl/aux_/template_arity.hpp -@@ -98,7 +98,7 @@ template< typename F, BOOST_MPL_AUX_NTTP_DECL(int, N) > - struct template_arity_impl - { - BOOST_STATIC_CONSTANT(int, value = -- sizeof(arity_helper(type_wrapper<F>(),arity_tag<N>())) - 1 -+ sizeof(::boost::mpl::aux::arity_helper(type_wrapper<F>(),arity_tag<N>())) - 1 - ); - }; - diff --git a/source/devel-extra/boost/openssl-1.0.diff b/source/devel-extra/boost/openssl-1.0.diff deleted file mode 100644 index e30c472..0000000 --- a/source/devel-extra/boost/openssl-1.0.diff +++ /dev/null @@ -1,67 +0,0 @@ -Index: trunk/boost/asio/ssl/detail/openssl_context_service.hpp -=================================================================== ---- trunk/boost/asio/ssl/detail/openssl_context_service.hpp (revision 48032) -+++ trunk/boost/asio/ssl/detail/openssl_context_service.hpp (revision 54907) -@@ -68,47 +68,46 @@ - void create(impl_type& impl, context_base::method m) - { -- ::SSL_METHOD* ssl_method = 0; - switch (m) - { - case context_base::sslv2: -- ssl_method = ::SSLv2_method(); -+ impl = ::SSL_CTX_new(::SSLv2_method()); - break; - case context_base::sslv2_client: -- ssl_method = ::SSLv2_client_method(); -+ impl = ::SSL_CTX_new(::SSLv2_client_method()); - break; - case context_base::sslv2_server: -- ssl_method = ::SSLv2_server_method(); -+ impl = ::SSL_CTX_new(::SSLv2_server_method()); - break; - case context_base::sslv3: -- ssl_method = ::SSLv3_method(); -+ impl = ::SSL_CTX_new(::SSLv3_method()); - break; - case context_base::sslv3_client: -- ssl_method = ::SSLv3_client_method(); -+ impl = ::SSL_CTX_new(::SSLv3_client_method()); - break; - case context_base::sslv3_server: -- ssl_method = ::SSLv3_server_method(); -+ impl = ::SSL_CTX_new(::SSLv3_server_method()); - break; - case context_base::tlsv1: -- ssl_method = ::TLSv1_method(); -+ impl = ::SSL_CTX_new(::TLSv1_method()); - break; - case context_base::tlsv1_client: -- ssl_method = ::TLSv1_client_method(); -+ impl = ::SSL_CTX_new(::TLSv1_client_method()); - break; - case context_base::tlsv1_server: -- ssl_method = ::TLSv1_server_method(); -+ impl = ::SSL_CTX_new(::TLSv1_server_method()); - break; - case context_base::sslv23: -- ssl_method = ::SSLv23_method(); -+ impl = ::SSL_CTX_new(::SSLv23_method()); - break; - case context_base::sslv23_client: -- ssl_method = ::SSLv23_client_method(); -+ impl = ::SSL_CTX_new(::SSLv23_client_method()); - break; - case context_base::sslv23_server: -- ssl_method = ::SSLv23_server_method(); -+ impl = ::SSL_CTX_new(::SSLv23_server_method()); - break; - default: -- break; -- } -- impl = ::SSL_CTX_new(ssl_method); -+ impl = ::SSL_CTX_new(0); -+ break; -+ } - } - _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
