Index: Mk/bsd.openssl.mk =================================================================== --- Mk/bsd.openssl.mk +++ Mk/bsd.openssl.mk @@ -107,7 +107,7 @@ # try to guess SHLIBVER for libressl .if defined(OPENSSL_PORT) && ${OPENSSL_PORT} == security/libressl -OPENSSL_SHLIBVER?= 32 +OPENSSL_SHLIBVER?= 33 .endif # default Index: databases/mariadb100-server/Makefile =================================================================== --- databases/mariadb100-server/Makefile +++ databases/mariadb100-server/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.0.17 +PORTVERSION= 10.0.19 CATEGORIES= databases ipv6 MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \ http://mirrors.supportex.net/${SITESDIR}/ \ @@ -13,7 +13,7 @@ http://mirror.switch.ch/mirror/${SITESDIR}/ PKGNAMESUFFIX?= 100-server -MAINTAINER= spil.oss@gmail.com +MAINTAINER= brnrd@freesd.org COMMENT?= Multithreaded SQL database (server) LICENSE= GPLv2 @@ -23,6 +23,7 @@ SLAVEDIRS= databases/mariadb100-client USES= bison:build cmake execinfo gmake shebangfix cpe +USE_LDCONFIG= lib/mysql SHEBANG_FILES= scripts/*.sh SITESDIR= mariadb/mariadb-${PORTVERSION}/source @@ -104,10 +105,11 @@ -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 INNODB_CMAKE_OFF= -DWITHOUT_INNOBASE=1 -MAXKEY_EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include_my_compare.h +MAXKEY_EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include_my__compare.h MROONGA_CMAKE_OFF= -DWITHOUT_MROONGA=1 OQGRAPH_CMAKE_OFF= -DWITHOUT_OQGRAPH=1 -OQGRAPH_LIB_DEPENDS= libboost_system.so:${PORTSDIR}/devel/boost-libs +OQGRAPH_LIB_DEPENDS= libboost_system.so:${PORTSDIR}/devel/boost-libs \ + libJudy.so:${PORTSDIR}/devel/judy post-install: # Remove programs to avoid conflict with mariadb100-client @@ -132,6 +134,11 @@ USE_GCC= yes .endif +.if ${PORT_OPTIONS:MOQGRPAH} +IGNORE= currently MariaDB doesn't build correctly with OQGraph \ + See https://mariadb.atlassian.net/browse/MDEV-8128. +.endif + post-patch: @${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/my_default.c Index: databases/mariadb100-server/distinfo =================================================================== --- databases/mariadb100-server/distinfo +++ databases/mariadb100-server/distinfo @@ -1,2 +1,2 @@ -SHA256 (mariadb-10.0.17.tar.gz) = 9cd394e99942c3700b13f2bf126895fe587e668bfcaffcfd81f0cd878fc19311 -SIZE (mariadb-10.0.17.tar.gz) = 55989700 +SHA256 (mariadb-10.0.19.tar.gz) = 2fbf5e5d7d8094691601ece8ae60b941478d73c98a58a960aeebfa021091a132 +SIZE (mariadb-10.0.19.tar.gz) = 56224123 Index: databases/mariadb100-server/files/extra-patch-include_my__compare.h =================================================================== --- /dev/null +++ databases/mariadb100-server/files/extra-patch-include_my__compare.h @@ -0,0 +1,11 @@ +--- include/my_compare.h.orig 2012-11-28 17:49:43.000000000 +0200 ++++ include/my_compare.h 2012-12-23 02:45:51.000000000 +0200 +@@ -40,7 +40,7 @@ + But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH. + */ + +-#define HA_MAX_KEY_LENGTH 1000 /* Max length in bytes */ ++#define HA_MAX_KEY_LENGTH 4000 /* Max length in bytes */ + #define HA_MAX_KEY_SEG 32 /* Max segments for key */ + + #define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24+ 6+6) Index: databases/mariadb100-server/files/extra-patch-include_my_compare.h =================================================================== --- databases/mariadb100-server/files/extra-patch-include_my_compare.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/my_compare.h.orig 2012-11-28 17:49:43.000000000 +0200 -+++ include/my_compare.h 2012-12-23 02:45:51.000000000 +0200 -@@ -40,7 +40,7 @@ - But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH. - */ - --#define HA_MAX_KEY_LENGTH 1000 /* Max length in bytes */ -+#define HA_MAX_KEY_LENGTH 4000 /* Max length in bytes */ - #define HA_MAX_KEY_SEG 32 /* Max segments for key */ - - #define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24+ 6+6) Index: databases/mariadb100-server/files/patch-CMakeLists.txt =================================================================== --- databases/mariadb100-server/files/patch-CMakeLists.txt +++ databases/mariadb100-server/files/patch-CMakeLists.txt @@ -1,22 +1,22 @@ --- CMakeLists.txt.orig 2014-08-09 00:13:37.000000000 +0200 +++ CMakeLists.txt 2014-09-05 18:22:34.646409575 +0200 -@@ -463,7 +463,6 @@ +@@ -438,7 +438,6 @@ IF(WIN32) ADD_SUBDIRECTORY(win/upgrade_wizard) ADD_SUBDIRECTORY(win/packaging) ENDIF() -ADD_SUBDIRECTORY(packaging/solaris) IF(NOT CMAKE_CROSSCOMPILING) - SET(EXPORTED comp_err comp_sql factorial gen_lex_hash) -@@ -503,6 +502,7 @@ + SET(EXPORTED comp_err comp_sql factorial) +@@ -482,6 +481,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) +IF(FALSE) INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.LESSER EXCEPTIONS-CLIENT COMPONENT Readme) - INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC -@@ -511,6 +511,7 @@ + +@@ -492,6 +492,7 @@ INSTALL_DOCUMENTATION(README CREDITS COP IF(UNIX) INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme) ENDIF() Index: databases/mariadb100-server/files/patch-client_CMakeLists.txt =================================================================== --- databases/mariadb100-server/files/patch-client_CMakeLists.txt +++ databases/mariadb100-server/files/patch-client_CMakeLists.txt @@ -1,6 +1,6 @@ --- client/CMakeLists.txt.orig 2014-08-09 00:13:48.000000000 +0200 +++ client/CMakeLists.txt 2014-09-07 21:19:33.000000000 +0200 -@@ -30,6 +30,7 @@ +@@ -30,6 +30,7 @@ INCLUDE_DIRECTORIES( COPY_OPENSSL_DLLS(copy_openssl_client) ADD_DEFINITIONS(${SSL_DEFINES}) @@ -8,7 +8,7 @@ MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc ${CMAKE_SOURCE_DIR}/sql/sql_string.cc) TARGET_LINK_LIBRARIES(mysql mysqlclient) -@@ -37,6 +38,7 @@ +@@ -37,6 +38,7 @@ IF(UNIX) TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_LIBRARY}) SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE) ENDIF(UNIX) @@ -16,7 +16,7 @@ MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") -@@ -44,6 +46,7 @@ +@@ -44,6 +46,7 @@ TARGET_LINK_LIBRARIES(mysqltest mysqlcli SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE) @@ -24,7 +24,7 @@ MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) -@@ -52,17 +55,21 @@ +@@ -52,17 +55,21 @@ TARGET_LINK_LIBRARIES(mysqldump mysqlcli MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) @@ -46,7 +46,7 @@ MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) -@@ -72,17 +79,20 @@ +@@ -72,17 +79,20 @@ TARGET_LINK_LIBRARIES(mysqladmin mysqlcl MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c) SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS") TARGET_LINK_LIBRARIES(mysqlslap mysqlclient) Index: databases/mariadb100-server/files/patch-cmake__jemalloc.cmake =================================================================== --- databases/mariadb100-server/files/patch-cmake__jemalloc.cmake +++ databases/mariadb100-server/files/patch-cmake__jemalloc.cmake @@ -1,6 +1,6 @@ --- cmake/jemalloc.cmake.orig 2014-09-25 00:29:47.000000000 +0200 +++ cmake/jemalloc.cmake 2014-09-27 10:05:48.000000000 +0200 -@@ -24,12 +24,12 @@ +@@ -24,12 +24,12 @@ MACRO (CHECK_JEMALLOC) SET(what system) ENDIF() Index: databases/mariadb100-server/files/patch-extra_CMakeLists.txt =================================================================== --- databases/mariadb100-server/files/patch-extra_CMakeLists.txt +++ databases/mariadb100-server/files/patch-extra_CMakeLists.txt @@ -1,6 +1,6 @@ --- extra/CMakeLists.txt.orig 2014-08-09 00:13:40.000000000 +0200 +++ extra/CMakeLists.txt 2014-09-05 18:32:20.555373233 +0200 -@@ -80,6 +80,8 @@ +@@ -78,9 +78,11 @@ IF(UNIX) MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c) TARGET_LINK_LIBRARIES(resolve_stack_dump mysys) @@ -9,3 +9,6 @@ TARGET_LINK_LIBRARIES(mysql_waitpid mysys) ENDIF() +ENDIF() + + + # Add path to the InnoDB headers Index: databases/mariadb100-server/files/patch-extra_yassl_taocrypt_src_integer.cpp =================================================================== --- databases/mariadb100-server/files/patch-extra_yassl_taocrypt_src_integer.cpp +++ databases/mariadb100-server/files/patch-extra_yassl_taocrypt_src_integer.cpp @@ -1,6 +1,6 @@ --- extra/yassl/taocrypt/src/integer.cpp.orig 2014-04-15 14:02:39.000000000 +0300 +++ extra/yassl/taocrypt/src/integer.cpp 2014-05-16 17:00:15.000000000 +0300 -@@ -75,7 +75,7 @@ +@@ -74,7 +74,7 @@ template CPP_TYPENAME AlignedAllocator::pointer AlignedAllocator::allocate( size_type n, const void *) { Index: databases/mariadb100-server/files/patch-include_CMakeLists.txt =================================================================== --- databases/mariadb100-server/files/patch-include_CMakeLists.txt +++ databases/mariadb100-server/files/patch-include_CMakeLists.txt @@ -1,6 +1,6 @@ --- include/CMakeLists.txt.orig 2014-08-09 00:13:38.000000000 +0200 +++ include/CMakeLists.txt 2014-09-05 18:38:18.461346954 +0200 -@@ -62,17 +62,21 @@ +@@ -62,17 +62,21 @@ SET(HEADERS handler_ername.h ) Index: databases/mariadb100-server/files/patch-libmysql_CMakeLists.txt =================================================================== --- databases/mariadb100-server/files/patch-libmysql_CMakeLists.txt +++ databases/mariadb100-server/files/patch-libmysql_CMakeLists.txt @@ -1,6 +1,6 @@ --- libmysql/CMakeLists.txt.orig 2014-08-09 00:13:37.000000000 +0200 +++ libmysql/CMakeLists.txt 2014-09-05 18:46:34.420323119 +0200 -@@ -403,7 +403,7 @@ +@@ -410,7 +410,7 @@ SET(LIBS clientlib dbug strings vio mysy # Merge several convenience libraries into one big mysqlclient # and link them together into shared library. @@ -9,7 +9,7 @@ # Visual Studio users need debug static library for debug projects IF(MSVC) -@@ -411,6 +411,7 @@ +@@ -418,6 +418,7 @@ IF(MSVC) INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug) ENDIF() @@ -17,7 +17,7 @@ IF(UNIX) MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME) SET(DOT_VERSION ".${VERSION}") -@@ -425,11 +426,13 @@ +@@ -432,11 +433,13 @@ IF(UNIX) ENDMACRO() INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development) ENDIF() @@ -32,7 +32,7 @@ IF(UNIX) # libtool compatability IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) -@@ -477,3 +480,4 @@ +@@ -484,3 +487,4 @@ IF(NOT DISABLE_SHARED) ENDFOREACH() ENDIF() ENDIF() Index: databases/mariadb100-server/files/patch-libservices_CMakeLists.txt =================================================================== --- databases/mariadb100-server/files/patch-libservices_CMakeLists.txt +++ databases/mariadb100-server/files/patch-libservices_CMakeLists.txt @@ -1,6 +1,6 @@ --- libservices/CMakeLists.txt.orig 2014-08-09 00:13:47.000000000 +0200 +++ libservices/CMakeLists.txt 2014-09-05 18:48:40.074297131 +0200 -@@ -29,4 +29,6 @@ +@@ -29,4 +29,6 @@ SET(MYSQLSERVICES_SOURCES logger_service.c) ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES}) Index: databases/mariadb100-server/files/patch-man_CMakeLists.txt =================================================================== --- databases/mariadb100-server/files/patch-man_CMakeLists.txt +++ databases/mariadb100-server/files/patch-man_CMakeLists.txt @@ -1,6 +1,6 @@ --- man/CMakeLists.txt.orig 2014-06-13 13:58:21.397251542 +0300 +++ man/CMakeLists.txt 2014-06-13 14:00:24.132245109 +0300 -@@ -33,7 +33,8 @@ +@@ -34,7 +34,8 @@ SET(MAN1_TEST mysql-stress-test.pl.1 mys INSTALL(FILES ${MAN1_SERVER} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesServer) INSTALL(FILES ${MAN8_SERVER} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPagesServer) Index: databases/mariadb100-server/files/patch-mysys_my__default.c =================================================================== --- /dev/null +++ databases/mariadb100-server/files/patch-mysys_my__default.c @@ -0,0 +1,61 @@ +--- mysys/my_default.c.orig 2014-08-09 00:13:39.000000000 +0200 ++++ mysys/my_default.c 2014-09-05 19:56:48.006019959 +0200 +@@ -90,7 +90,7 @@ static my_bool defaults_already_read= FA + + /* Which directories are searched for options (and in which order) */ + +-#define MAX_DEFAULT_DIRS 6 ++#define MAX_DEFAULT_DIRS 7 + #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */ + static const char **default_directories = NULL; + +@@ -785,7 +785,7 @@ static int search_default_file_with_ext( + { + MY_STAT stat_info; + if (!my_stat(name,&stat_info,MYF(0))) +- return 1; ++ return 0; + /* + Ignore world-writable regular files. + This is mainly done to protect us to not read a file created by +@@ -803,6 +803,14 @@ static int search_default_file_with_ext( + if (!(fp= mysql_file_fopen(key_file_cnf, name, O_RDONLY, MYF(0)))) + return 1; /* Ignore wrong files */ + ++ if (strstr(name, "/etc") == name) ++ { ++ fprintf(stderr, ++ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n", ++ name,name); ++ goto err; ++ } ++ + while (mysql_file_fgets(buff, sizeof(buff) - 1, fp)) + { + line++; +@@ -1067,7 +1075,8 @@ void my_print_default_files(const char * + if (name[0] == FN_HOMELIB) /* Add . to filenames in home */ + *end++= '.'; + strxmov(end, conf_file, *ext, " ", NullS); +- fputs(name, stdout); ++ if (strstr(name, "/etc") != name) ++ fputs(name, stdout); + } + } + } +@@ -1223,13 +1232,10 @@ static const char **init_default_directo + + #else + +-#if defined(DEFAULT_SYSCONFDIR) +- if (DEFAULT_SYSCONFDIR[0]) +- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); +-#else + errors += add_directory(alloc, "/etc/", dirs); + errors += add_directory(alloc, "/etc/mysql/", dirs); +-#endif /* DEFAULT_SYSCONFDIR */ ++ errors += add_directory(alloc, "/usr/local/etc/", dirs); ++ errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs); + + #endif + Index: databases/mariadb100-server/files/patch-mysys_my_default.c =================================================================== --- databases/mariadb100-server/files/patch-mysys_my_default.c +++ /dev/null @@ -1,61 +0,0 @@ ---- mysys/my_default.c.orig 2014-08-09 00:13:39.000000000 +0200 -+++ mysys/my_default.c 2014-09-05 19:56:48.006019959 +0200 -@@ -90,7 +90,7 @@ - - /* Which directories are searched for options (and in which order) */ - --#define MAX_DEFAULT_DIRS 6 -+#define MAX_DEFAULT_DIRS 7 - #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */ - static const char **default_directories = NULL; - -@@ -785,7 +785,7 @@ - { - MY_STAT stat_info; - if (!my_stat(name,&stat_info,MYF(0))) -- return 1; -+ return 0; - /* - Ignore world-writable regular files. - This is mainly done to protect us to not read a file created by -@@ -803,6 +803,14 @@ - if (!(fp= mysql_file_fopen(key_file_cnf, name, O_RDONLY, MYF(0)))) - return 1; /* Ignore wrong files */ - -+ if (strstr(name, "/etc") == name) -+ { -+ fprintf(stderr, -+ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n", -+ name,name); -+ goto err; -+ } -+ - while (mysql_file_fgets(buff, sizeof(buff) - 1, fp)) - { - line++; -@@ -1067,7 +1075,8 @@ - if (name[0] == FN_HOMELIB) /* Add . to filenames in home */ - *end++= '.'; - strxmov(end, conf_file, *ext, " ", NullS); -- fputs(name, stdout); -+ if (strstr(name, "/etc") != name) -+ fputs(name, stdout); - } - } - } -@@ -1223,13 +1232,10 @@ - - #else - --#if defined(DEFAULT_SYSCONFDIR) -- if (DEFAULT_SYSCONFDIR[0]) -- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); --#else - errors += add_directory(alloc, "/etc/", dirs); - errors += add_directory(alloc, "/etc/mysql/", dirs); --#endif /* DEFAULT_SYSCONFDIR */ -+ errors += add_directory(alloc, "/usr/local/etc/", dirs); -+ errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs); - - #endif - Index: databases/mariadb100-server/files/patch-pcre_CMakeLists.txt =================================================================== --- databases/mariadb100-server/files/patch-pcre_CMakeLists.txt +++ databases/mariadb100-server/files/patch-pcre_CMakeLists.txt @@ -1,6 +1,6 @@ --- pcre/CMakeLists.txt.orig 2014-08-09 00:13:36.000000000 +0200 +++ pcre/CMakeLists.txt 2014-09-05 20:08:49.090972949 +0200 -@@ -513,6 +513,8 @@ +@@ -513,6 +513,8 @@ IF(PCRE_SHOW_REPORT) MESSAGE(STATUS "") ENDIF(PCRE_SHOW_REPORT) Index: databases/mariadb100-server/files/patch-scripts_CMakeLists.txt =================================================================== --- databases/mariadb100-server/files/patch-scripts_CMakeLists.txt +++ databases/mariadb100-server/files/patch-scripts_CMakeLists.txt @@ -1,6 +1,6 @@ ---- scripts/CMakeLists.txt.orig 2014-08-09 00:13:37.000000000 +0200 -+++ scripts/CMakeLists.txt 2014-09-05 19:06:46.206250221 +0200 -@@ -281,6 +281,8 @@ +--- scripts/CMakeLists.txt.orig 2014-04-15 14:02:39.000000000 +0300 ++++ scripts/CMakeLists.txt 2014-05-16 19:08:41.000000000 +0300 +@@ -275,6 +275,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) STRING(REGEX REPLACE "^lib" "" lib "${lib}") SET(${var} "${${var}}-l${lib} " ) ENDIF() Index: databases/mariadb100-server/files/patch-scripts_mysql__config.sh =================================================================== --- /dev/null +++ databases/mariadb100-server/files/patch-scripts_mysql__config.sh @@ -0,0 +1,14 @@ +--- scripts/mysql_config.sh.orig 2015-05-18 18:46:28 UTC ++++ scripts/mysql_config.sh +@@ -109,8 +109,11 @@ fi + # We intentionally add a space to the beginning and end of lib strings, simplifies replace later + libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@" + libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ " ++libs="$libs -L/usr/local/lib " + libs_r=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ " ++libs_r="$libs_r -L/usr/local/lib " + embedded_libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ " ++embedded_libs="$embedded_libs -L/usr/local/lib " + + if [ -r "$pkglibdir/libmygcc.a" ]; then + # When linking against the static library with a different version of GCC Index: databases/mariadb100-server/files/patch-scripts_mysql_config.sh =================================================================== --- databases/mariadb100-server/files/patch-scripts_mysql_config.sh +++ /dev/null @@ -1,14 +0,0 @@ ---- scripts/mysql_config.sh.orig 2014-04-15 14:02:39.000000000 +0300 -+++ scripts/mysql_config.sh 2014-05-16 19:08:41.000000000 +0300 -@@ -108,8 +108,11 @@ - # We intentionally add a space to the beginning and end of lib strings, simplifies replace later - libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@" - libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ " -+libs="$libs -L%%LOCALBASE%%/lib " - libs_r=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ " -+libs_r="$libs_r -L%%LOCALBASE%%/lib " - embedded_libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ " -+embedded_libs="$embedded_libs -L%%LOCALBASE%%/lib " - - if [ -r "$pkglibdir/libmygcc.a" ]; then - # When linking against the static library with a different version of GCC Index: databases/mariadb100-server/files/patch-scripts_mysqld__safe.sh =================================================================== --- /dev/null +++ databases/mariadb100-server/files/patch-scripts_mysqld__safe.sh @@ -0,0 +1,24 @@ +--- scripts/mysqld_safe.sh.orig 2007-10-08 10:39:23.000000000 +0200 ++++ scripts/mysqld_safe.sh 2007-10-08 10:40:52.000000000 +0200 +@@ -445,10 +445,10 @@ fi + + if test -z "$MYSQL_HOME" + then +- if test -r "$MY_BASEDIR_VERSION/my.cnf" && test -r "$DATADIR/my.cnf" ++ if test -r "$MY_BASEDIR_VERSION/etc/my.cnf" && test -r "$DATADIR/my.cnf" + then + log_error "WARNING: Found two instances of my.cnf - +-$MY_BASEDIR_VERSION/my.cnf and ++$MY_BASEDIR_VERSION/etc/my.cnf and + $DATADIR/my.cnf + IGNORING $DATADIR/my.cnf" + +@@ -457,7 +457,7 @@ IGNORING $DATADIR/my.cnf" + then + log_error "WARNING: Found $DATADIR/my.cnf + The data directory is a deprecated location for my.cnf, please move it to +-$MY_BASEDIR_VERSION/my.cnf" ++$MY_BASEDIR_VERSION/etc/my.cnf" + MYSQL_HOME=$DATADIR + else + MYSQL_HOME=$MY_BASEDIR_VERSION Index: databases/mariadb100-server/files/patch-scripts_mysqld_safe.sh =================================================================== --- databases/mariadb100-server/files/patch-scripts_mysqld_safe.sh +++ /dev/null @@ -1,24 +0,0 @@ ---- scripts/mysqld_safe.sh.orig 2007-10-08 10:39:23.000000000 +0200 -+++ scripts/mysqld_safe.sh 2007-10-08 10:40:52.000000000 +0200 -@@ -235,10 +235,10 @@ - - if test -z "$MYSQL_HOME" - then -- if test -r "$MY_BASEDIR_VERSION/my.cnf" && test -r "$DATADIR/my.cnf" -+ if test -r "$MY_BASEDIR_VERSION/etc/my.cnf" && test -r "$DATADIR/my.cnf" - then - log_error "WARNING: Found two instances of my.cnf - --$MY_BASEDIR_VERSION/my.cnf and -+$MY_BASEDIR_VERSION/etc/my.cnf and - $DATADIR/my.cnf - IGNORING $DATADIR/my.cnf" - -@@ -247,7 +247,7 @@ - then - log_error "WARNING: Found $DATADIR/my.cnf - The data directory is a deprecated location for my.cnf, please move it to --$MY_BASEDIR_VERSION/my.cnf" -+$MY_BASEDIR_VERSION/etc/my.cnf" - MYSQL_HOME=$DATADIR - else - MYSQL_HOME=$MY_BASEDIR_VERSION Index: databases/mariadb100-server/files/patch-sql_CMakeLists.txt =================================================================== --- databases/mariadb100-server/files/patch-sql_CMakeLists.txt +++ databases/mariadb100-server/files/patch-sql_CMakeLists.txt @@ -1,6 +1,6 @@ --- sql/CMakeLists.txt.orig 2013-05-22 01:09:51.000000000 +0300 +++ sql/CMakeLists.txt 2013-06-08 14:13:06.000000000 +0300 -@@ -278,6 +278,7 @@ +@@ -312,6 +312,7 @@ ADD_CUSTOM_TARGET(distclean VERBATIM ) @@ -8,7 +8,7 @@ IF(INSTALL_LAYOUT STREQUAL "STANDALONE") # Copy db.opt into data/test/ -@@ -321,6 +322,7 @@ +@@ -355,6 +356,7 @@ ELSE() INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles) ENDIF(WIN32 AND MYSQLD_EXECUTABLE) ENDIF(INSTALL_LAYOUT STREQUAL "STANDALONE") @@ -16,7 +16,7 @@ IF(WIN32) SET(my_bootstrap_sql ${CMAKE_CURRENT_BINARY_DIR}/my_bootstrap.sql) -@@ -363,8 +365,10 @@ +@@ -397,8 +399,10 @@ IF(WIN32) TARGET_LINK_LIBRARIES(mysql_upgrade_service mysys winservice) ENDIF(WIN32) Index: databases/mariadb100-server/files/patch-sql_sql__trigger.cc =================================================================== --- /dev/null +++ databases/mariadb100-server/files/patch-sql_sql__trigger.cc @@ -0,0 +1,50 @@ +--- sql/sql_trigger.cc.orig 2013-05-21 22:09:51.000000000 +0000 ++++ sql/sql_trigger.cc 2013-09-26 13:15:55.450195525 +0000 +@@ -192,32 +192,32 @@ static File_option triggers_file_paramet + { + { + { C_STRING_WITH_LEN("triggers") }, +- my_offsetof(class Table_triggers_list, definitions_list), ++ static_cast(my_offsetof(class Table_triggers_list, definitions_list)), + FILE_OPTIONS_STRLIST + }, + { + { C_STRING_WITH_LEN("sql_modes") }, +- my_offsetof(class Table_triggers_list, definition_modes_list), ++ static_cast(my_offsetof(class Table_triggers_list, definition_modes_list)), + FILE_OPTIONS_ULLLIST + }, + { + { C_STRING_WITH_LEN("definers") }, +- my_offsetof(class Table_triggers_list, definers_list), ++ static_cast(my_offsetof(class Table_triggers_list, definers_list)), + FILE_OPTIONS_STRLIST + }, + { + { C_STRING_WITH_LEN("client_cs_names") }, +- my_offsetof(class Table_triggers_list, client_cs_names), ++ static_cast(my_offsetof(class Table_triggers_list, client_cs_names)), + FILE_OPTIONS_STRLIST + }, + { + { C_STRING_WITH_LEN("connection_cl_names") }, +- my_offsetof(class Table_triggers_list, connection_cl_names), ++ static_cast(my_offsetof(class Table_triggers_list, connection_cl_names)), + FILE_OPTIONS_STRLIST + }, + { + { C_STRING_WITH_LEN("db_cl_names") }, +- my_offsetof(class Table_triggers_list, db_cl_names), ++ static_cast(my_offsetof(class Table_triggers_list, db_cl_names)), + FILE_OPTIONS_STRLIST + }, + { { 0, 0 }, 0, FILE_OPTIONS_STRING } +@@ -226,7 +226,7 @@ static File_option triggers_file_paramet + File_option sql_modes_parameters= + { + { C_STRING_WITH_LEN("sql_modes") }, +- my_offsetof(class Table_triggers_list, definition_modes_list), ++ static_cast(my_offsetof(class Table_triggers_list, definition_modes_list)), + FILE_OPTIONS_ULLLIST + }; + Index: databases/mariadb100-server/files/patch-sql_sql__view.cc =================================================================== --- /dev/null +++ databases/mariadb100-server/files/patch-sql_sql__view.cc @@ -0,0 +1,63 @@ +--- sql/sql_view.cc.orig 2013-05-21 22:09:51.000000000 +0000 ++++ sql/sql_view.cc 2013-09-26 13:16:16.065195172 +0000 +@@ -716,46 +716,46 @@ static const int required_view_parameter + */ + static File_option view_parameters[]= + {{{ C_STRING_WITH_LEN("query")}, +- my_offsetof(TABLE_LIST, select_stmt), ++ static_cast(my_offsetof(TABLE_LIST, select_stmt)), + FILE_OPTIONS_ESTRING}, + {{ C_STRING_WITH_LEN("md5")}, +- my_offsetof(TABLE_LIST, md5), ++ static_cast(my_offsetof(TABLE_LIST, md5)), + FILE_OPTIONS_STRING}, + {{ C_STRING_WITH_LEN("updatable")}, +- my_offsetof(TABLE_LIST, updatable_view), ++ static_cast(my_offsetof(TABLE_LIST, updatable_view)), + FILE_OPTIONS_ULONGLONG}, + {{ C_STRING_WITH_LEN("algorithm")}, +- my_offsetof(TABLE_LIST, algorithm), ++ static_cast(my_offsetof(TABLE_LIST, algorithm)), + FILE_OPTIONS_VIEW_ALGO}, + {{ C_STRING_WITH_LEN("definer_user")}, +- my_offsetof(TABLE_LIST, definer.user), ++ static_cast(my_offsetof(TABLE_LIST, definer.user)), + FILE_OPTIONS_STRING}, + {{ C_STRING_WITH_LEN("definer_host")}, +- my_offsetof(TABLE_LIST, definer.host), ++ static_cast(my_offsetof(TABLE_LIST, definer.host)), + FILE_OPTIONS_STRING}, + {{ C_STRING_WITH_LEN("suid")}, +- my_offsetof(TABLE_LIST, view_suid), ++ static_cast(my_offsetof(TABLE_LIST, view_suid)), + FILE_OPTIONS_ULONGLONG}, + {{ C_STRING_WITH_LEN("with_check_option")}, +- my_offsetof(TABLE_LIST, with_check), ++ static_cast(my_offsetof(TABLE_LIST, with_check)), + FILE_OPTIONS_ULONGLONG}, + {{ C_STRING_WITH_LEN("timestamp")}, +- my_offsetof(TABLE_LIST, timestamp), ++ static_cast(my_offsetof(TABLE_LIST, timestamp)), + FILE_OPTIONS_TIMESTAMP}, + {{ C_STRING_WITH_LEN("create-version")}, +- my_offsetof(TABLE_LIST, file_version), ++ static_cast(my_offsetof(TABLE_LIST, file_version)), + FILE_OPTIONS_ULONGLONG}, + {{ C_STRING_WITH_LEN("source")}, +- my_offsetof(TABLE_LIST, source), ++ static_cast(my_offsetof(TABLE_LIST, source)), + FILE_OPTIONS_ESTRING}, + {{(char*) STRING_WITH_LEN("client_cs_name")}, +- my_offsetof(TABLE_LIST, view_client_cs_name), ++ static_cast(my_offsetof(TABLE_LIST, view_client_cs_name)), + FILE_OPTIONS_STRING}, + {{(char*) STRING_WITH_LEN("connection_cl_name")}, +- my_offsetof(TABLE_LIST, view_connection_cl_name), ++ static_cast(my_offsetof(TABLE_LIST, view_connection_cl_name)), + FILE_OPTIONS_STRING}, + {{(char*) STRING_WITH_LEN("view_body_utf8")}, +- my_offsetof(TABLE_LIST, view_body_utf8), ++ static_cast(my_offsetof(TABLE_LIST, view_body_utf8)), + FILE_OPTIONS_ESTRING}, + {{ C_STRING_WITH_LEN("mariadb-version")}, + my_offsetof(TABLE_LIST, mariadb_version), Index: databases/mariadb100-server/files/patch-sql_sql_trigger.cc =================================================================== --- databases/mariadb100-server/files/patch-sql_sql_trigger.cc +++ /dev/null @@ -1,50 +0,0 @@ ---- sql/sql_trigger.cc.orig 2013-05-21 22:09:51.000000000 +0000 -+++ sql/sql_trigger.cc 2013-09-26 13:15:55.450195525 +0000 -@@ -192,32 +192,32 @@ - { - { - { C_STRING_WITH_LEN("triggers") }, -- my_offsetof(class Table_triggers_list, definitions_list), -+ static_cast(my_offsetof(class Table_triggers_list, definitions_list)), - FILE_OPTIONS_STRLIST - }, - { - { C_STRING_WITH_LEN("sql_modes") }, -- my_offsetof(class Table_triggers_list, definition_modes_list), -+ static_cast(my_offsetof(class Table_triggers_list, definition_modes_list)), - FILE_OPTIONS_ULLLIST - }, - { - { C_STRING_WITH_LEN("definers") }, -- my_offsetof(class Table_triggers_list, definers_list), -+ static_cast(my_offsetof(class Table_triggers_list, definers_list)), - FILE_OPTIONS_STRLIST - }, - { - { C_STRING_WITH_LEN("client_cs_names") }, -- my_offsetof(class Table_triggers_list, client_cs_names), -+ static_cast(my_offsetof(class Table_triggers_list, client_cs_names)), - FILE_OPTIONS_STRLIST - }, - { - { C_STRING_WITH_LEN("connection_cl_names") }, -- my_offsetof(class Table_triggers_list, connection_cl_names), -+ static_cast(my_offsetof(class Table_triggers_list, connection_cl_names)), - FILE_OPTIONS_STRLIST - }, - { - { C_STRING_WITH_LEN("db_cl_names") }, -- my_offsetof(class Table_triggers_list, db_cl_names), -+ static_cast(my_offsetof(class Table_triggers_list, db_cl_names)), - FILE_OPTIONS_STRLIST - }, - { { 0, 0 }, 0, FILE_OPTIONS_STRING } -@@ -226,7 +226,7 @@ - File_option sql_modes_parameters= - { - { C_STRING_WITH_LEN("sql_modes") }, -- my_offsetof(class Table_triggers_list, definition_modes_list), -+ static_cast(my_offsetof(class Table_triggers_list, definition_modes_list)), - FILE_OPTIONS_ULLLIST - }; - Index: databases/mariadb100-server/files/patch-sql_sql_view.cc =================================================================== --- databases/mariadb100-server/files/patch-sql_sql_view.cc +++ /dev/null @@ -1,63 +0,0 @@ ---- sql/sql_view.cc.orig 2013-05-21 22:09:51.000000000 +0000 -+++ sql/sql_view.cc 2013-09-26 13:16:16.065195172 +0000 -@@ -742,46 +742,46 @@ - */ - static File_option view_parameters[]= - {{{ C_STRING_WITH_LEN("query")}, -- my_offsetof(TABLE_LIST, select_stmt), -+ static_cast(my_offsetof(TABLE_LIST, select_stmt)), - FILE_OPTIONS_ESTRING}, - {{ C_STRING_WITH_LEN("md5")}, -- my_offsetof(TABLE_LIST, md5), -+ static_cast(my_offsetof(TABLE_LIST, md5)), - FILE_OPTIONS_STRING}, - {{ C_STRING_WITH_LEN("updatable")}, -- my_offsetof(TABLE_LIST, updatable_view), -+ static_cast(my_offsetof(TABLE_LIST, updatable_view)), - FILE_OPTIONS_ULONGLONG}, - {{ C_STRING_WITH_LEN("algorithm")}, -- my_offsetof(TABLE_LIST, algorithm), -+ static_cast(my_offsetof(TABLE_LIST, algorithm)), - FILE_OPTIONS_VIEW_ALGO}, - {{ C_STRING_WITH_LEN("definer_user")}, -- my_offsetof(TABLE_LIST, definer.user), -+ static_cast(my_offsetof(TABLE_LIST, definer.user)), - FILE_OPTIONS_STRING}, - {{ C_STRING_WITH_LEN("definer_host")}, -- my_offsetof(TABLE_LIST, definer.host), -+ static_cast(my_offsetof(TABLE_LIST, definer.host)), - FILE_OPTIONS_STRING}, - {{ C_STRING_WITH_LEN("suid")}, -- my_offsetof(TABLE_LIST, view_suid), -+ static_cast(my_offsetof(TABLE_LIST, view_suid)), - FILE_OPTIONS_ULONGLONG}, - {{ C_STRING_WITH_LEN("with_check_option")}, -- my_offsetof(TABLE_LIST, with_check), -+ static_cast(my_offsetof(TABLE_LIST, with_check)), - FILE_OPTIONS_ULONGLONG}, - {{ C_STRING_WITH_LEN("timestamp")}, -- my_offsetof(TABLE_LIST, timestamp), -+ static_cast(my_offsetof(TABLE_LIST, timestamp)), - FILE_OPTIONS_TIMESTAMP}, - {{ C_STRING_WITH_LEN("create-version")}, -- my_offsetof(TABLE_LIST, file_version), -+ static_cast(my_offsetof(TABLE_LIST, file_version)), - FILE_OPTIONS_ULONGLONG}, - {{ C_STRING_WITH_LEN("source")}, -- my_offsetof(TABLE_LIST, source), -+ static_cast(my_offsetof(TABLE_LIST, source)), - FILE_OPTIONS_ESTRING}, - {{(char*) STRING_WITH_LEN("client_cs_name")}, -- my_offsetof(TABLE_LIST, view_client_cs_name), -+ static_cast(my_offsetof(TABLE_LIST, view_client_cs_name)), - FILE_OPTIONS_STRING}, - {{(char*) STRING_WITH_LEN("connection_cl_name")}, -- my_offsetof(TABLE_LIST, view_connection_cl_name), -+ static_cast(my_offsetof(TABLE_LIST, view_connection_cl_name)), - FILE_OPTIONS_STRING}, - {{(char*) STRING_WITH_LEN("view_body_utf8")}, -- my_offsetof(TABLE_LIST, view_body_utf8), -+ static_cast(my_offsetof(TABLE_LIST, view_body_utf8)), - FILE_OPTIONS_ESTRING}, - {{NullS, 0}, 0, - FILE_OPTIONS_STRING} Index: databases/mariadb100-server/files/patch-sql_sys__vars.cc =================================================================== --- /dev/null +++ databases/mariadb100-server/files/patch-sql_sys__vars.cc @@ -0,0 +1,38 @@ +--- sql/sys_vars.cc.orig 2014-08-09 00:13:37.000000000 +0200 ++++ sql/sys_vars.cc 2014-09-05 19:30:55.609134039 +0200 +@@ -1012,7 +1012,7 @@ static Sys_var_ulong Sys_interactive_tim + "connection before closing it", + SESSION_VAR(net_interactive_timeout), + CMD_LINE(REQUIRED_ARG), +- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); ++ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); + + static Sys_var_ulonglong Sys_join_buffer_size( + "join_buffer_size", +@@ -2046,7 +2046,7 @@ static Sys_var_ulong Sys_net_read_timeou + "Number of seconds to wait for more data from a connection before " + "aborting the read", + SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG), +- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1), ++ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1), + NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), + ON_UPDATE(fix_net_read_timeout)); + +@@ -2061,7 +2061,7 @@ static Sys_var_ulong Sys_net_write_timeo + "Number of seconds to wait for a block to be written to a connection " + "before aborting the write", + SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG), +- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1), ++ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1), + NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), + ON_UPDATE(fix_net_write_timeout)); + +@@ -3291,7 +3291,7 @@ static Sys_var_ulong Sys_net_wait_timeou + "The number of seconds the server waits for activity on a " + "connection before closing it", + SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG), +- VALID_RANGE(1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT)), ++ VALID_RANGE(1, INT_MAX32/1000), + DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); + + static Sys_var_plugin Sys_default_storage_engine( Index: databases/mariadb100-server/files/patch-sql_sys_vars.cc =================================================================== --- databases/mariadb100-server/files/patch-sql_sys_vars.cc +++ /dev/null @@ -1,38 +0,0 @@ ---- sql/sys_vars.cc.orig 2014-08-09 00:13:37.000000000 +0200 -+++ sql/sys_vars.cc 2014-09-05 19:30:55.609134039 +0200 -@@ -1012,7 +1012,7 @@ - "connection before closing it", - SESSION_VAR(net_interactive_timeout), - CMD_LINE(REQUIRED_ARG), -- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); -+ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); - - static Sys_var_ulonglong Sys_join_buffer_size( - "join_buffer_size", -@@ -2044,7 +2044,7 @@ - "Number of seconds to wait for more data from a connection before " - "aborting the read", - SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG), -- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1), -+ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1), - NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), - ON_UPDATE(fix_net_read_timeout)); - -@@ -2059,7 +2059,7 @@ - "Number of seconds to wait for a block to be written to a connection " - "before aborting the write", - SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG), -- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1), -+ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1), - NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), - ON_UPDATE(fix_net_write_timeout)); - -@@ -3288,7 +3288,7 @@ - "The number of seconds the server waits for activity on a " - "connection before closing it", - SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG), -- VALID_RANGE(1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT)), -+ VALID_RANGE(1, INT_MAX32/1000), - DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); - - static Sys_var_plugin Sys_default_storage_engine( Index: databases/mariadb100-server/files/patch-storage_oqgraph_CMakeLists.txt =================================================================== --- /dev/null +++ databases/mariadb100-server/files/patch-storage_oqgraph_CMakeLists.txt @@ -0,0 +1,19 @@ +--- storage/oqgraph/CMakeLists.txt.orig 2015-05-08 14:37:46 UTC ++++ storage/oqgraph/CMakeLists.txt +@@ -24,6 +24,8 @@ IF(MSVC) + # ENDIF() + ELSE() + # See if that works. On old gcc it'll fail because of -fno-rtti ++SET(CMAKE_REQUIRED_INCLUDES_SAVE ${CMAKE_REQUIRED_INCLUDES}) ++SET(CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES};${Boost_INCLUDES_DIRS}") + CHECK_CXX_SOURCE_COMPILES( + " + #define BOOST_NO_RTTI 1 +@@ -32,6 +34,7 @@ CHECK_CXX_SOURCE_COMPILES( + #include + int main() { return 0; } + " BOOST_OK) ++SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES_SAVE}) + ENDIF() + + IF(BOOST_OK) Index: databases/mariadb100-server/files/patch-storage_tokudb_ft-index_cmake__modules_TokuFeatureDetection.cmake =================================================================== --- databases/mariadb100-server/files/patch-storage_tokudb_ft-index_cmake__modules_TokuFeatureDetection.cmake +++ databases/mariadb100-server/files/patch-storage_tokudb_ft-index_cmake__modules_TokuFeatureDetection.cmake @@ -1,4 +1,4 @@ ---- storage/tokudb/ft-index/cmake_modules/TokuFeatureDetection.cmake.orig 2014-09-24 22:29:47 UTC +--- storage/tokudb/ft-index/cmake_modules/TokuFeatureDetection.cmake.orig 2015-05-08 14:37:46 UTC +++ storage/tokudb/ft-index/cmake_modules/TokuFeatureDetection.cmake @@ -87,13 +87,7 @@ if (NOT HAVE_DLSYM_WITHOUT_DL) endif () Index: databases/mariadb100-server/files/patch-storage_tokudb_ft-index_portability_memory.cc =================================================================== --- databases/mariadb100-server/files/patch-storage_tokudb_ft-index_portability_memory.cc +++ databases/mariadb100-server/files/patch-storage_tokudb_ft-index_portability_memory.cc @@ -1,4 +1,4 @@ ---- storage/tokudb/ft-index/portability/memory.cc.orig 2014-09-24 22:29:47 UTC +--- storage/tokudb/ft-index/portability/memory.cc.orig 2015-05-08 14:37:47 UTC +++ storage/tokudb/ft-index/portability/memory.cc @@ -94,11 +94,6 @@ PATENT RIGHTS GRANT: #include Index: databases/mariadb100-server/files/patch-support-files_CMakeLists.txt =================================================================== --- databases/mariadb100-server/files/patch-support-files_CMakeLists.txt +++ databases/mariadb100-server/files/patch-support-files_CMakeLists.txt @@ -1,6 +1,6 @@ ---- support-files/CMakeLists.txt.orig 2012-11-28 17:49:47.000000000 +0200 -+++ support-files/CMakeLists.txt 2012-12-23 05:40:39.000000000 +0200 -@@ -66,10 +66,11 @@ +--- support-files/CMakeLists.txt.orig 2015-05-08 14:37:48 UTC ++++ support-files/CMakeLists.txt +@@ -67,10 +67,11 @@ IF(UNIX) ENDFOREACH() IF(INSTALL_SUPPORTFILESDIR) INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) Index: databases/mariadb100-server/files/pkg-message.in =================================================================== --- databases/mariadb100-server/files/pkg-message.in +++ databases/mariadb100-server/files/pkg-message.in @@ -6,7 +6,7 @@ MariaDB respects hier(7) and doesn't check /etc and /etc/mysql for my.cnf. Please move existing my.cnf files from those paths to -%%PREFIX%%/etc and %%PREFIX%%/etc/mysql. +${LOCALBASE}/etc and ${LOCALBASE}/etc/mysql. This port does NOT include the mytop perl script, this is included in the MariaDB tarball but the most recent version can be found in the Index: databases/mariadb100-server/pkg-plist =================================================================== --- databases/mariadb100-server/pkg-plist +++ databases/mariadb100-server/pkg-plist @@ -1,4 +1,3 @@ -@stopdaemon mysql-server bin/aria_chk bin/aria_dump_log bin/aria_ftdump Index: lang/python27/Makefile =================================================================== --- lang/python27/Makefile +++ lang/python27/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= python27 -PORTVERSION= 2.7.9 -PORTREVISION= 1 +PORTVERSION= 2.7.10 CATEGORIES= lang python ipv6 MASTER_SITES= PYTHON/ftp/python/${PORTVERSION} DISTNAME= Python-${PORTVERSION} @@ -104,6 +103,11 @@ PLIST_SUB+= NO_NIS="" .endif +.if defined(WITH_OPENSSL_PORT) +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib +.endif + post-patch: @${REINPLACE_CMD} -e \ 's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \ Index: lang/python27/distinfo =================================================================== --- lang/python27/distinfo +++ lang/python27/distinfo @@ -1,2 +1,2 @@ -SHA256 (python/Python-2.7.9.tar.xz) = 90d27e14ea7e03570026850e2e50ba71ad20b7eb31035aada1cf3def8f8d4916 -SIZE (python/Python-2.7.9.tar.xz) = 12164712 +SHA256 (python/Python-2.7.10.tar.xz) = 1cd3730781b91caf0fa1c4d472dc29274186480161a150294c42ce9b5c5effc0 +SIZE (python/Python-2.7.10.tar.xz) = 12250696 Index: lang/python27/files/patch-Doc__library__fcntl.rst =================================================================== --- lang/python27/files/patch-Doc__library__fcntl.rst +++ lang/python27/files/patch-Doc__library__fcntl.rst @@ -1,6 +1,6 @@ --- ./Doc/library/fcntl.rst.orig 2014-07-03 21:53:41.473098625 +1000 +++ ./Doc/library/fcntl.rst 2014-07-03 21:54:04.342833056 +1000 -@@ -50,7 +50,6 @@ +@@ -50,7 +50,6 @@ The module defines the following functio operations are typically defined in the library module :mod:`termios` and the argument handling is even more complicated. Index: lang/python27/files/patch-Lib__distutils__unixccompiler.py =================================================================== --- lang/python27/files/patch-Lib__distutils__unixccompiler.py +++ lang/python27/files/patch-Lib__distutils__unixccompiler.py @@ -4,7 +4,7 @@ --- ./Lib/distutils/unixccompiler.py.orig 2013-11-10 07:36:40.000000000 +0000 +++ ./Lib/distutils/unixccompiler.py 2014-02-19 15:41:48.000000000 +0000 -@@ -228,6 +228,8 @@ +@@ -228,6 +228,8 @@ class UnixCCompiler(CCompiler): if sys.platform[:6] == "darwin": # MacOSX's linker doesn't understand the -R flag at all return "-L" + dir Index: lang/python27/files/patch-Lib_distutils_command_build__scripts.py =================================================================== --- /dev/null +++ lang/python27/files/patch-Lib_distutils_command_build__scripts.py @@ -0,0 +1,17 @@ +# Description: A non-invasive partial backport of the Python3 distutils behaviour. +# This allows Python's scripts to be properly suffixed (similar to Python 3.x) on +# installation. +# Submitted by: mva + +--- Lib/distutils/command/build_scripts.py.orig 2014-07-26 11:52:20.000000000 +0200 ++++ Lib/distutils/command/build_scripts.py 2014-07-26 11:52:56.000000000 +0200 +@@ -126,6 +126,9 @@ class build_scripts (Command): + file, oldmode, newmode) + os.chmod(file, newmode) + ++ # XXX should we modify self.outfiles? ++ return outfiles ++ + # copy_scripts () + + # class build_scripts Index: lang/python27/files/patch-Lib_distutils_command_build_scripts.py =================================================================== --- lang/python27/files/patch-Lib_distutils_command_build_scripts.py +++ /dev/null @@ -1,17 +0,0 @@ -# Description: A non-invasive partial backport of the Python3 distutils behaviour. -# This allows Python's scripts to be properly suffixed (similar to Python 3.x) on -# installation. -# Submitted by: mva - ---- Lib/distutils/command/build_scripts.py.orig 2014-07-26 11:52:20.000000000 +0200 -+++ Lib/distutils/command/build_scripts.py 2014-07-26 11:52:56.000000000 +0200 -@@ -126,6 +126,9 @@ - file, oldmode, newmode) - os.chmod(file, newmode) - -+ # XXX should we modify self.outfiles? -+ return outfiles -+ - # copy_scripts () - - # class build_scripts Index: lang/python27/files/patch-Makefile.pre.in =================================================================== --- lang/python27/files/patch-Makefile.pre.in +++ lang/python27/files/patch-Makefile.pre.in @@ -3,10 +3,10 @@ --- Makefile.pre.in.orig 2014-06-30 04:05:39.000000000 +0200 +++ Makefile.pre.in 2014-07-26 11:09:46.000000000 +0200 -@@ -868,6 +868,12 @@ - (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python2.pc) - -rm -f $(DESTDIR)$(LIBPC)/python.pc - (cd $(DESTDIR)$(LIBPC); $(LN) -s python2.pc python.pc) +@@ -900,6 +900,12 @@ bininstall: altbininstall + (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python2.pc) + -rm -f $(DESTDIR)$(LIBPC)/python.pc + (cd $(DESTDIR)$(LIBPC); $(LN) -s python2.pc python.pc) + -rm -f $(DESTDIR)$(BINDIR)/idle + (cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle2) + -rm -f $(DESTDIR)$(BINDIR)/pydoc Index: lang/python27/files/patch-Modules-_ctypes-libffi-configure =================================================================== --- lang/python27/files/patch-Modules-_ctypes-libffi-configure +++ lang/python27/files/patch-Modules-_ctypes-libffi-configure @@ -1,6 +1,6 @@ --- Modules/_ctypes/libffi/configure.orig 2014-12-16 08:10:12.000000000 +0100 +++ Modules/_ctypes/libffi/configure 2014-12-16 08:10:40.000000000 +0100 -@@ -7526,7 +7526,7 @@ +@@ -7526,7 +7526,7 @@ mips64*-*linux*) rm -rf conftest* ;; Index: lang/python27/files/patch-Modules___ctypes__libffi__src__arm__ffi.c =================================================================== --- lang/python27/files/patch-Modules___ctypes__libffi__src__arm__ffi.c +++ lang/python27/files/patch-Modules___ctypes__libffi__src__arm__ffi.c @@ -17,7 +17,7 @@ /* Forward declares. */ static int vfp_type_p (ffi_type *); static void layout_vfp_args (ffi_cif *); -@@ -582,6 +587,16 @@ +@@ -751,6 +756,16 @@ ffi_closure_free (void *ptr) #else Index: lang/python27/files/patch-Modules__fcntlmodule.c =================================================================== --- lang/python27/files/patch-Modules__fcntlmodule.c +++ lang/python27/files/patch-Modules__fcntlmodule.c @@ -1,6 +1,6 @@ --- ./Modules/fcntlmodule.c.orig 2014-07-03 21:57:10.429953240 +1000 +++ ./Modules/fcntlmodule.c 2014-07-03 21:59:36.517210444 +1000 -@@ -98,20 +98,15 @@ +@@ -98,20 +98,15 @@ fcntl_ioctl(PyObject *self, PyObject *ar { #define IOCTL_BUFSZ 1024 int fd; @@ -24,7 +24,7 @@ int arg; int ret; char *str; -@@ -119,7 +114,7 @@ +@@ -119,7 +114,7 @@ fcntl_ioctl(PyObject *self, PyObject *ar int mutate_arg = 1; char buf[IOCTL_BUFSZ+1]; /* argument plus NUL byte */ @@ -33,7 +33,7 @@ conv_descriptor, &fd, &code, &str, &len, &mutate_arg)) { char *arg; -@@ -170,7 +165,7 @@ +@@ -170,7 +165,7 @@ fcntl_ioctl(PyObject *self, PyObject *ar } PyErr_Clear(); @@ -42,7 +42,7 @@ conv_descriptor, &fd, &code, &str, &len)) { if (len > IOCTL_BUFSZ) { PyErr_SetString(PyExc_ValueError, -@@ -192,7 +187,7 @@ +@@ -192,7 +187,7 @@ fcntl_ioctl(PyObject *self, PyObject *ar PyErr_Clear(); arg = 0; if (!PyArg_ParseTuple(args, Index: lang/python27/files/patch-setup.py =================================================================== --- lang/python27/files/patch-setup.py +++ lang/python27/files/patch-setup.py @@ -7,7 +7,7 @@ --- setup.py.orig 2014-06-30 04:05:48.000000000 +0200 +++ setup.py 2014-07-26 14:51:29.000000000 +0200 -@@ -15,6 +15,7 @@ +@@ -15,6 +15,7 @@ from distutils.core import Extension, se from distutils.command.build_ext import build_ext from distutils.command.install import install from distutils.command.install_lib import install_lib @@ -15,7 +15,7 @@ from distutils.spawn import find_executable cross_compiling = "_PYTHON_HOST_PLATFORM" in os.environ -@@ -33,7 +34,7 @@ +@@ -33,7 +34,7 @@ host_platform = get_platform() COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS")) # This global variable is used to hold the list of modules to be disabled. @@ -24,7 +24,7 @@ def add_dir_to_list(dirlist, dir): """Add the directory 'dir' to the list 'dirlist' (at the front) if -@@ -1212,7 +1213,7 @@ +@@ -1214,7 +1215,7 @@ class PyBuildExt(build_ext): sysroot = macosx_sdk_root() f = os.path.join(sysroot, f[1:]) @@ -33,7 +33,7 @@ data = open(f).read() m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data) if m is not None: -@@ -1551,7 +1552,7 @@ +@@ -1553,7 +1554,7 @@ class PyBuildExt(build_ext): macros = dict() libraries = [] @@ -42,7 +42,7 @@ # FreeBSD's P1003.1b semaphore support is very experimental # and has many known problems. (as of June 2008) macros = dict() -@@ -1602,9 +1603,10 @@ +@@ -1604,9 +1605,10 @@ class PyBuildExt(build_ext): else: missing.append('linuxaudiodev') @@ -56,7 +56,7 @@ exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) ) else: missing.append('ossaudiodev') -@@ -2176,6 +2178,22 @@ +@@ -2178,6 +2180,22 @@ class PyBuildInstallLib(install_lib): def is_chmod_supported(self): return hasattr(os, 'chmod') @@ -79,7 +79,7 @@ SUMMARY = """ Python is an interpreted, interactive, object-oriented programming language. It is often compared to Tcl, Perl, Scheme or Java. -@@ -2221,7 +2239,9 @@ +@@ -2223,7 +2241,9 @@ def main(): platforms = ["Many"], # Build info @@ -90,7 +90,7 @@ 'install_lib':PyBuildInstallLib}, # The struct module is defined here, because build_ext won't be # called unless there's at least one extension module defined. -@@ -2229,8 +2249,7 @@ +@@ -2231,8 +2251,7 @@ def main(): # Scripts to install scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle', Index: lang/python27/pkg-plist =================================================================== --- lang/python27/pkg-plist +++ lang/python27/pkg-plist @@ -1436,8 +1436,8 @@ lib/python2.7/ensurepip/__main__.py lib/python2.7/ensurepip/__main__.pyc lib/python2.7/ensurepip/__main__.pyo -lib/python2.7/ensurepip/_bundled/pip-1.5.6-py2.py3-none-any.whl -lib/python2.7/ensurepip/_bundled/setuptools-7.0-py2.py3-none-any.whl +lib/python2.7/ensurepip/_bundled/pip-6.1.1-py2.py3-none-any.whl +lib/python2.7/ensurepip/_bundled/setuptools-15.2-py2.py3-none-any.whl lib/python2.7/ensurepip/_uninstall.py lib/python2.7/ensurepip/_uninstall.pyc lib/python2.7/ensurepip/_uninstall.pyo @@ -1782,9 +1782,9 @@ lib/python2.7/idlelib/tabbedpages.py lib/python2.7/idlelib/tabbedpages.pyo lib/python2.7/idlelib/tabbedpages.pyc -lib/python2.7/idlelib/testcode.py -lib/python2.7/idlelib/testcode.pyo -lib/python2.7/idlelib/testcode.pyc +lib/python2.7/idlelib/idle_test/test_io.py +lib/python2.7/idlelib/idle_test/test_io.pyo +lib/python2.7/idlelib/idle_test/test_io.pyc lib/python2.7/idlelib/textView.py lib/python2.7/idlelib/textView.pyo lib/python2.7/idlelib/textView.pyc @@ -2907,7 +2907,7 @@ lib/python2.7/test/decimaltestdata/tointegral.decTest lib/python2.7/test/decimaltestdata/tointegralx.decTest lib/python2.7/test/decimaltestdata/xor.decTest -lib/python2.7/test/dh512.pem +lib/python2.7/test/dh1024.pem lib/python2.7/test/doctest_aliases.py lib/python2.7/test/doctest_aliases.pyo lib/python2.7/test/doctest_aliases.pyc @@ -4090,6 +4090,9 @@ lib/python2.7/test/test_time.py lib/python2.7/test/test_time.pyo lib/python2.7/test/test_time.pyc +lib/python2.7/test/test_timeit.py +lib/python2.7/test/test_timeit.pyo +lib/python2.7/test/test_timeit.pyc lib/python2.7/test/test_timeout.py lib/python2.7/test/test_timeout.pyo lib/python2.7/test/test_timeout.pyc Index: net/socat/Makefile =================================================================== --- net/socat/Makefile +++ net/socat/Makefile @@ -13,11 +13,13 @@ LICENSE= GPLv2 -USES= compiler tar:bzip2 cpe +USES= compiler cpe tar:bzip2 GNU_CONFIGURE= yes USE_RC_SUBR= socat USE_OPENSSL= yes +CPE_VENDOR= dest-unreach + PORTSCOUT= skipv:2.0.0-b2 PLIST_FILES= bin/filan bin/procan bin/socat man/man1/socat.1.gz Index: net/socat/files/patch-sslcls.h =================================================================== --- /dev/null +++ net/socat/files/patch-sslcls.h @@ -0,0 +1,11 @@ +--- sslcls.h.orig 2015-01-24 10:15:22 UTC ++++ sslcls.h +@@ -55,7 +55,7 @@ BIO *sycBIO_new_file(const char *filenam + + int sycFIPS_mode_set(int onoff); + +-#if OPENSSL_VERSION_NUMBER >= 0x00908000L ++#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP) + const COMP_METHOD *sycSSL_get_current_compression(SSL *ssl); + const COMP_METHOD *sycSSL_get_current_expansion(SSL *ssl); + const char *sycSSL_COMP_get_name(const COMP_METHOD *comp); Index: net/socat/files/patch-sslcls.c =================================================================== --- /dev/null +++ net/socat/files/patch-sslcls.c @@ -0,0 +1,27 @@ +--- sslcls.c.orig 2015-01-24 10:15:22 UTC ++++ sslcls.c +@@ -331,6 +331,7 @@ void sycSSL_free(SSL *ssl) { + return; + } + ++#ifndef OPENSSL_NO_EGD + int sycRAND_egd(const char *path) { + int result; + Debug1("RAND_egd(\"%s\")", path); +@@ -338,6 +339,7 @@ int sycRAND_egd(const char *path) { + Debug1("RAND_egd() -> %d", result); + return result; + } ++#endif + + DH *sycPEM_read_bio_DHparams(BIO *bp, DH **x, pem_password_cb *cb, void *u) { + DH *result; +@@ -375,7 +377,7 @@ int sycFIPS_mode_set(int onoff) { + } + #endif /* WITH_FIPS */ + +-#if OPENSSL_VERSION_NUMBER >= 0x00908000L ++#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP) + const COMP_METHOD *sycSSL_get_current_compression(SSL *ssl) { + const COMP_METHOD *result; + Debug1("SSL_get_current_compression(%p)", ssl); Index: net/socat/files/patch-xio-openssl.c =================================================================== --- /dev/null +++ net/socat/files/patch-xio-openssl.c @@ -0,0 +1,30 @@ +--- xio-openssl.c.orig 2015-01-24 14:33:42 UTC ++++ xio-openssl.c +@@ -110,7 +110,7 @@ const struct optdesc opt_openssl_cafile + const struct optdesc opt_openssl_capath = { "openssl-capath", "capath", OPT_OPENSSL_CAPATH, GROUP_OPENSSL, PH_SPEC, TYPE_FILENAME, OFUNC_SPEC }; + const struct optdesc opt_openssl_egd = { "openssl-egd", "egd", OPT_OPENSSL_EGD, GROUP_OPENSSL, PH_SPEC, TYPE_FILENAME, OFUNC_SPEC }; + const struct optdesc opt_openssl_pseudo = { "openssl-pseudo", "pseudo", OPT_OPENSSL_PSEUDO, GROUP_OPENSSL, PH_SPEC, TYPE_BOOL, OFUNC_SPEC }; +-#if OPENSSL_VERSION_NUMBER >= 0x00908000L ++#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP) + const struct optdesc opt_openssl_compress = { "openssl-compress", "compress", OPT_OPENSSL_COMPRESS, GROUP_OPENSSL, PH_SPEC, TYPE_STRING, OFUNC_SPEC }; + #endif + #if WITH_FIPS +@@ -147,7 +147,7 @@ int xio_reset_fips_mode(void) { + static void openssl_conn_loginfo(SSL *ssl) { + Notice1("SSL connection using %s", SSL_get_cipher(ssl)); + +-#if OPENSSL_VERSION_NUMBER >= 0x00908000L ++#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP) + { + const COMP_METHOD *comp, *expansion; + +@@ -878,7 +878,9 @@ int + } + + if (opt_egd) { ++#ifndef OPENSSL_NO_EGD + sycRAND_egd(opt_egd); ++#endif + } + + if (opt_pseudo) { Index: net/socat/files/patch-xioopts.c =================================================================== --- net/socat/files/patch-xioopts.c +++ net/socat/files/patch-xioopts.c @@ -1,5 +1,23 @@ --- xioopts.c.orig 2015-01-24 10:15:22 UTC +++ xioopts.c +@@ -296,7 +296,7 @@ const struct optname optionnames[] = { + #if WITH_EXT2 && defined(EXT2_COMPR_FL) + IF_ANY ("compr", &opt_ext2_compr) + #endif +-#if OPENSSL_VERSION_NUMBER >= 0x00908000L ++#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP) + IF_OPENSSL("compress", &opt_openssl_compress) + #endif + #ifdef TCP_CONN_ABORT_THRESHOLD /* HP_UX */ +@@ -1098,7 +1098,7 @@ const struct optname optionnames[] = { + IF_OPENSSL("openssl-certificate", &opt_openssl_certificate) + IF_OPENSSL("openssl-cipherlist", &opt_openssl_cipherlist) + IF_OPENSSL("openssl-commonname", &opt_openssl_commonname) +-#if OPENSSL_VERSION_NUMBER >= 0x00908000L ++#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP) + IF_OPENSSL("openssl-compress", &opt_openssl_compress) + #endif + IF_OPENSSL("openssl-dhparam", &opt_openssl_dhparam) @@ -2971,6 +2971,25 @@ int retropt_bind(struct opt *opts, OFUNC_TERMIOS_FLAG, OFUNC_TERMIOS_PATTERN, and some OFUNC_SPEC */ int applyopts(int fd, struct opt *opts, enum e_phase phase) { Index: security/libressl/Makefile =================================================================== --- security/libressl/Makefile +++ security/libressl/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= libressl -PORTVERSION= 2.1.6 -PORTREVISION= 1 +PORTVERSION= 2.2.0 CATEGORIES= security devel MASTER_SITES= OPENBSD/LibreSSL Index: security/libressl/distinfo =================================================================== --- security/libressl/distinfo +++ security/libressl/distinfo @@ -1,2 +1,2 @@ -SHA256 (libressl-2.1.6.tar.gz) = 4f826dd97b3b8001707073bde8401493f9cd4668465b481c042d28e3973653a8 -SIZE (libressl-2.1.6.tar.gz) = 2865936 +SHA256 (libressl-2.2.0.tar.gz) = 0f48472c623099e05c64a19fbc6acd83226e2a2859a1ed2a1213077b205fbbda +SIZE (libressl-2.2.0.tar.gz) = 2861927 Index: security/libressl/files/patch-include_openssl_opensslfeatures.h =================================================================== --- security/libressl/files/patch-include_openssl_opensslfeatures.h +++ /dev/null @@ -1,10 +0,0 @@ ---- include/openssl/opensslfeatures.h.orig 2014-12-06 23:15:50 UTC -+++ include/openssl/opensslfeatures.h -@@ -1,6 +1,7 @@ - # define OPENSSL_NO_EC_NISTP_64_GCC_128 - # define OPENSSL_NO_CMS - # define OPENSSL_NO_COMP -+# define OPENSSL_NO_EGD - # define OPENSSL_NO_GMP - # define OPENSSL_NO_JPAKE - # define OPENSSL_NO_KRB5 Index: security/libressl/files/patch-include_openssl_opensslv.h =================================================================== --- security/libressl/files/patch-include_openssl_opensslv.h +++ security/libressl/files/patch-include_openssl_opensslv.h @@ -1,11 +1,11 @@ ---- include/openssl/opensslv.h.orig 2015-03-08 23:21:45 UTC +--- include/openssl/opensslv.h.orig 2015-05-23 21:50:16 UTC +++ include/openssl/opensslv.h @@ -3,7 +3,7 @@ #define HEADER_OPENSSLV_H #define LIBRESSL_VERSION_NUMBER 0x20000000L -#define OPENSSL_VERSION_NUMBER 0x20000000L -+#define OPENSSL_VERSION_NUMBER 0x1000107fL - #define OPENSSL_VERSION_TEXT "LibreSSL 2.1.6" ++#define OPENSSL_VERSION_NUMBER 0x1000107fL + #define OPENSSL_VERSION_TEXT "LibreSSL 2.2.0" #define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT Index: security/libressl/pkg-plist =================================================================== --- security/libressl/pkg-plist +++ security/libressl/pkg-plist @@ -62,7 +62,6 @@ include/openssl/ssl23.h include/openssl/ssl3.h include/openssl/stack.h -include/tls.h include/openssl/tls1.h include/openssl/ts.h include/openssl/txt_db.h @@ -72,10 +71,11 @@ include/openssl/x509.h include/openssl/x509_vfy.h include/openssl/x509v3.h +include/tls.h lib/libcrypto.a lib/libcrypto.so -lib/libcrypto.so.32 -lib/libcrypto.so.32.0.0 +lib/libcrypto.so.33 +lib/libcrypto.so.33.0.0 lib/libssl.a lib/libssl.so lib/libssl.so.32 @@ -83,7 +83,7 @@ lib/libtls.a lib/libtls.so lib/libtls.so.3 -lib/libtls.so.3.0.0 +lib/libtls.so.3.0.1 libdata/pkgconfig/libcrypto.pc libdata/pkgconfig/libssl.pc libdata/pkgconfig/libtls.pc @@ -96,6 +96,7 @@ man/man3/ASN1_STRING_dup.3.gz man/man3/ASN1_STRING_free.3.gz man/man3/ASN1_STRING_length.3.gz +man/man3/ASN1_STRING_length_set.3.gz man/man3/ASN1_STRING_new.3.gz man/man3/ASN1_STRING_print.3.gz man/man3/ASN1_STRING_print_ex.3.gz @@ -241,6 +242,7 @@ man/man3/BIO_ssl_shutdown.3.gz man/man3/BIO_tell.3.gz man/man3/BIO_vfree.3.gz +man/man3/BIO_wpending.3.gz man/man3/BIO_write.3.gz man/man3/BIO_write_filename.3.gz man/man3/BN_BLINDING_convert.3.gz @@ -296,6 +298,7 @@ man/man3/BN_from_montgomery.3.gz man/man3/BN_gcd.3.gz man/man3/BN_generate_prime.3.gz +man/man3/BN_generate_prime_ex.3.gz man/man3/BN_get_word.3.gz man/man3/BN_hex2bn.3.gz man/man3/BN_init.3.gz @@ -312,16 +315,20 @@ man/man3/BN_lshift1.3.gz man/man3/BN_mask_bits.3.gz man/man3/BN_mod.3.gz +man/man3/BN_mod_add.3.gz man/man3/BN_mod_exp.3.gz man/man3/BN_mod_inverse.3.gz man/man3/BN_mod_mul.3.gz man/man3/BN_mod_mul_montgomery.3.gz man/man3/BN_mod_mul_reciprocal.3.gz +man/man3/BN_mod_sqr.3.gz +man/man3/BN_mod_sub.3.gz man/man3/BN_mod_word.3.gz man/man3/BN_mpi2bn.3.gz man/man3/BN_mul.3.gz man/man3/BN_mul_word.3.gz man/man3/BN_new.3.gz +man/man3/BN_nnmod.3.gz man/man3/BN_num_bits.3.gz man/man3/BN_num_bits_word.3.gz man/man3/BN_num_bytes.3.gz @@ -369,6 +376,12 @@ man/man3/CONF_modules_load.3.gz man/man3/CONF_modules_load_file.3.gz man/man3/CONF_modules_unload.3.gz +man/man3/CRYPTO_THREADID_cmp.3.gz +man/man3/CRYPTO_THREADID_cpy.3.gz +man/man3/CRYPTO_THREADID_current.3.gz +man/man3/CRYPTO_THREADID_get_callback.3.gz +man/man3/CRYPTO_THREADID_hash.3.gz +man/man3/CRYPTO_THREADID_set_callback.3.gz man/man3/CRYPTO_add.3.gz man/man3/CRYPTO_add_lock.3.gz man/man3/CRYPTO_destroy_dynlockid.3.gz @@ -386,7 +399,38 @@ man/man3/CRYPTO_set_locking_callback.3.gz man/man3/CRYPTO_w_lock.3.gz man/man3/CRYPTO_w_unlock.3.gz +man/man3/DES_cbc_cksum.3.gz +man/man3/DES_cfb64_encrypt.3.gz +man/man3/DES_cfb_encrypt.3.gz +man/man3/DES_crypt.3.gz +man/man3/DES_ecb2_encrypt.3.gz +man/man3/DES_ecb3_encrypt.3.gz +man/man3/DES_ecb_encrypt.3.gz +man/man3/DES_ede2_cbc_encrypt.3.gz +man/man3/DES_ede2_cfb64_encrypt.3.gz +man/man3/DES_ede2_ofb64_encrypt.3.gz +man/man3/DES_ede3_cbc_encrypt.3.gz +man/man3/DES_ede3_cbcm_encrypt.3.gz +man/man3/DES_ede3_cfb64_encrypt.3.gz +man/man3/DES_ede3_ofb64_encrypt.3.gz +man/man3/DES_enc_read.3.gz +man/man3/DES_enc_write.3.gz +man/man3/DES_fcrypt.3.gz +man/man3/DES_is_weak_key.3.gz +man/man3/DES_key_sched.3.gz +man/man3/DES_ncbc_encrypt.3.gz +man/man3/DES_ofb64_encrypt.3.gz +man/man3/DES_ofb_encrypt.3.gz +man/man3/DES_pcbc_encrypt.3.gz +man/man3/DES_quad_cksum.3.gz +man/man3/DES_random_key.3.gz man/man3/DES_set_key.3.gz +man/man3/DES_set_key_checked.3.gz +man/man3/DES_set_key_unchecked.3.gz +man/man3/DES_set_odd_parity.3.gz +man/man3/DES_string_to_2keys.3.gz +man/man3/DES_string_to_key.3.gz +man/man3/DES_xcbc_encrypt.3.gz man/man3/DH_OpenSSL.3.gz man/man3/DH_check.3.gz man/man3/DH_compute_key.3.gz @@ -408,8 +452,10 @@ man/man3/DHparams_print.3.gz man/man3/DHparams_print_fp.3.gz man/man3/DSA_OpenSSL.3.gz +man/man3/DSA_SIG_free.3.gz man/man3/DSA_SIG_new.3.gz man/man3/DSA_do_sign.3.gz +man/man3/DSA_do_verify.3.gz man/man3/DSA_dup_DH.3.gz man/man3/DSA_free.3.gz man/man3/DSA_generate_key.3.gz @@ -417,6 +463,7 @@ man/man3/DSA_generate_parameters_ex.3.gz man/man3/DSA_get_default_method.3.gz man/man3/DSA_get_default_openssl_method.3.gz +man/man3/DSA_get_ex_data.3.gz man/man3/DSA_get_ex_new_index.3.gz man/man3/DSA_new.3.gz man/man3/DSA_new_method.3.gz @@ -424,6 +471,7 @@ man/man3/DSA_print_fp.3.gz man/man3/DSA_set_default_method.3.gz man/man3/DSA_set_default_openssl_method.3.gz +man/man3/DSA_set_ex_data.3.gz man/man3/DSA_set_method.3.gz man/man3/DSA_sign.3.gz man/man3/DSA_sign_setup.3.gz @@ -446,6 +494,7 @@ man/man3/ECDSA_sign.3.gz man/man3/ECDSA_sign_ex.3.gz man/man3/ECDSA_sign_setup.3.gz +man/man3/ECDSA_size.3.gz man/man3/ECDSA_verify.3.gz man/man3/ECPKParameters_print.3.gz man/man3/ECPKParameters_print_fp.3.gz @@ -577,11 +626,15 @@ man/man3/ERR_get_error_line_data.3.gz man/man3/ERR_get_next_error_library.3.gz man/man3/ERR_lib_error_string.3.gz +man/man3/ERR_load_UI_strings.3.gz man/man3/ERR_load_crypto_strings.3.gz man/man3/ERR_load_strings.3.gz man/man3/ERR_peek_error.3.gz man/man3/ERR_peek_error_line.3.gz man/man3/ERR_peek_error_line_data.3.gz +man/man3/ERR_peek_last_error.3.gz +man/man3/ERR_peek_last_error_line.3.gz +man/man3/ERR_peek_last_error_line_data.3.gz man/man3/ERR_pop_to_mark.3.gz man/man3/ERR_print_errors.3.gz man/man3/ERR_print_errors_fp.3.gz @@ -595,15 +648,23 @@ man/man3/EVP_CIPHER_CTX_cipher.3.gz man/man3/EVP_CIPHER_CTX_cleanup.3.gz man/man3/EVP_CIPHER_CTX_ctrl.3.gz +man/man3/EVP_CIPHER_CTX_flags.3.gz +man/man3/EVP_CIPHER_CTX_get_app_data.3.gz +man/man3/EVP_CIPHER_CTX_init.3.gz man/man3/EVP_CIPHER_CTX_iv_length.3.gz man/man3/EVP_CIPHER_CTX_key_length.3.gz +man/man3/EVP_CIPHER_CTX_mode.3.gz man/man3/EVP_CIPHER_CTX_nid.3.gz +man/man3/EVP_CIPHER_CTX_set_app_data.3.gz man/man3/EVP_CIPHER_CTX_set_key_length.3.gz +man/man3/EVP_CIPHER_CTX_set_padding.3.gz man/man3/EVP_CIPHER_CTX_type.3.gz man/man3/EVP_CIPHER_asn1_to_param.3.gz man/man3/EVP_CIPHER_block_size.3.gz +man/man3/EVP_CIPHER_flags.3.gz man/man3/EVP_CIPHER_iv_length.3.gz man/man3/EVP_CIPHER_key_length.3.gz +man/man3/EVP_CIPHER_mode.3.gz man/man3/EVP_CIPHER_nid.3.gz man/man3/EVP_CIPHER_param_to_asn1.3.gz man/man3/EVP_CIPHER_type.3.gz @@ -618,7 +679,9 @@ man/man3/EVP_DecryptInit_ex.3.gz man/man3/EVP_DecryptUpdate.3.gz man/man3/EVP_DigestFinal.3.gz +man/man3/EVP_DigestFinal_ex.3.gz man/man3/EVP_DigestInit.3.gz +man/man3/EVP_DigestInit_ex.3.gz man/man3/EVP_DigestSignFinal.3.gz man/man3/EVP_DigestSignInit.3.gz man/man3/EVP_DigestSignUpdate.3.gz @@ -631,8 +694,14 @@ man/man3/EVP_EncryptInit.3.gz man/man3/EVP_EncryptInit_ex.3.gz man/man3/EVP_EncryptUpdate.3.gz +man/man3/EVP_MAX_MD_SIZE.3.gz man/man3/EVP_MD_CTX_block_size.3.gz +man/man3/EVP_MD_CTX_cleanup.3.gz man/man3/EVP_MD_CTX_copy.3.gz +man/man3/EVP_MD_CTX_copy_ex.3.gz +man/man3/EVP_MD_CTX_create.3.gz +man/man3/EVP_MD_CTX_destroy.3.gz +man/man3/EVP_MD_CTX_init.3.gz man/man3/EVP_MD_CTX_md.3.gz man/man3/EVP_MD_CTX_size.3.gz man/man3/EVP_MD_CTX_type.3.gz @@ -643,7 +712,9 @@ man/man3/EVP_OpenFinal.3.gz man/man3/EVP_OpenInit.3.gz man/man3/EVP_OpenUpdate.3.gz +man/man3/EVP_PKEVP_PKEY_CTX_set_app_data.3.gz man/man3/EVP_PKEY_CTX_ctrl.3.gz +man/man3/EVP_PKEY_CTX_ctrl_str.3.gz man/man3/EVP_PKEY_CTX_dup.3.gz man/man3/EVP_PKEY_CTX_free.3.gz man/man3/EVP_PKEY_CTX_get_app_data.3.gz @@ -774,6 +845,10 @@ man/man3/EVP_ripemd160.3.gz man/man3/EVP_sha.3.gz man/man3/EVP_sha1.3.gz +man/man3/EVP_sha224.3.gz +man/man3/EVP_sha256.3.gz +man/man3/EVP_sha384.3.gz +man/man3/EVP_sha512.3.gz man/man3/HMAC.3.gz man/man3/HMAC_Final.3.gz man/man3/HMAC_Init.3.gz @@ -812,6 +887,7 @@ man/man3/OpenSSL_add_all_ciphers.3.gz man/man3/OpenSSL_add_all_digests.3.gz man/man3/OpenSSL_add_ssl_algorithms.3.gz +man/man3/PEM.3.gz man/man3/PEM_read_DHparams.3.gz man/man3/PEM_read_DSAPrivateKey.3.gz man/man3/PEM_read_DSA_PUBKEY.3.gz @@ -969,13 +1045,16 @@ man/man3/SSL_CTX_add_session.3.gz man/man3/SSL_CTX_callback_ctrl.3.gz man/man3/SSL_CTX_check_private_key.3.gz +man/man3/SSL_CTX_clear_options.3.gz man/man3/SSL_CTX_ctrl.3.gz man/man3/SSL_CTX_flush_sessions.3.gz man/man3/SSL_CTX_free.3.gz man/man3/SSL_CTX_get_cert_store.3.gz man/man3/SSL_CTX_get_client_CA_list.3.gz +man/man3/SSL_CTX_get_client_cert_cb.3.gz man/man3/SSL_CTX_get_ex_data.3.gz man/man3/SSL_CTX_get_ex_new_index.3.gz +man/man3/SSL_CTX_get_info_callback.3.gz man/man3/SSL_CTX_get_max_cert_list.3.gz man/man3/SSL_CTX_get_mode.3.gz man/man3/SSL_CTX_get_options.3.gz @@ -1008,6 +1087,7 @@ man/man3/SSL_CTX_sess_set_get_cb.3.gz man/man3/SSL_CTX_sess_set_new_cb.3.gz man/man3/SSL_CTX_sess_set_remove.3.gz +man/man3/SSL_CTX_sess_set_remove_cb.3.gz man/man3/SSL_CTX_sess_timeouts.3.gz man/man3/SSL_CTX_sessions.3.gz man/man3/SSL_CTX_set_cert_store.3.gz @@ -1068,6 +1148,7 @@ man/man3/SSL_callback_ctrl.3.gz man/man3/SSL_check_private_key.3.gz man/man3/SSL_clear.3.gz +man/man3/SSL_clear_options.3.gz man/man3/SSL_connect.3.gz man/man3/SSL_ctrl.3.gz man/man3/SSL_do_handshake.3.gz @@ -1076,6 +1157,7 @@ man/man3/SSL_get0_session.3.gz man/man3/SSL_get1_session.3.gz man/man3/SSL_get_SSL_CTX.3.gz +man/man3/SSL_get_accept_state.3.gz man/man3/SSL_get_cipher.3.gz man/man3/SSL_get_cipher_bits.3.gz man/man3/SSL_get_cipher_list.3.gz @@ -1090,8 +1172,10 @@ man/man3/SSL_get_ex_data_X509_STORE_CTX_idx.3.gz man/man3/SSL_get_ex_new_index.3.gz man/man3/SSL_get_fd.3.gz +man/man3/SSL_get_info_callback.3.gz man/man3/SSL_get_max_cert_list.3.gz man/man3/SSL_get_mode.3.gz +man/man3/SSL_get_msg_callback_arg.3.gz man/man3/SSL_get_options.3.gz man/man3/SSL_get_peer_cert_chain.3.gz man/man3/SSL_get_peer_certificate.3.gz @@ -1100,6 +1184,7 @@ man/man3/SSL_get_quiet_shutdown.3.gz man/man3/SSL_get_rbio.3.gz man/man3/SSL_get_rfd.3.gz +man/man3/SSL_get_secure_renegotiation_support.3.gz man/man3/SSL_get_session.3.gz man/man3/SSL_get_shutdown.3.gz man/man3/SSL_get_ssl_method.3.gz @@ -1112,6 +1197,7 @@ man/man3/SSL_get_version.3.gz man/man3/SSL_get_wbio.3.gz man/man3/SSL_get_wfd.3.gz +man/man3/SSL_has_matching_session_id.3.gz man/man3/SSL_library_init.3.gz man/man3/SSL_load_client_CA_file.3.gz man/man3/SSL_load_error_strings.3.gz @@ -1130,6 +1216,8 @@ man/man3/SSL_set_connect_state.3.gz man/man3/SSL_set_ex_data.3.gz man/man3/SSL_set_fd.3.gz +man/man3/SSL_set_generate_session_id.3.gz +man/man3/SSL_set_info_callback.3.gz man/man3/SSL_set_max_cert_list.3.gz man/man3/SSL_set_mode.3.gz man/man3/SSL_set_msg_callback.3.gz @@ -1223,8 +1311,16 @@ man/man3/X509_NAME_add_entry_by_OBJ.3.gz man/man3/X509_NAME_add_entry_by_txt.3.gz man/man3/X509_NAME_delete_entry.3.gz +man/man3/X509_NAME_entry_count.3.gz +man/man3/X509_NAME_get_entry.3.gz man/man3/X509_NAME_get_index_by_NID.3.gz +man/man3/X509_NAME_get_index_by_OBJ.3.gz +man/man3/X509_NAME_get_text_by_NID.3.gz +man/man3/X509_NAME_get_text_by_OBJ.3.gz +man/man3/X509_NAME_oneline.3.gz +man/man3/X509_NAME_print.3.gz man/man3/X509_NAME_print_ex.3.gz +man/man3/X509_NAME_print_ex_fp.3.gz man/man3/X509_STORE_CTX_cleanup.3.gz man/man3/X509_STORE_CTX_free.3.gz man/man3/X509_STORE_CTX_get0_param.3.gz @@ -1261,6 +1357,7 @@ man/man3/X509_new.3.gz man/man3/X509_verify_cert.3.gz man/man3/X509_verify_cert_error_string.3.gz +man/man3/bio_info_cb.3.gz man/man3/bn.3.gz man/man3/bn_add_words.3.gz man/man3/bn_check_top.3.gz @@ -1292,7 +1389,18 @@ man/man3/bn_sqr_words.3.gz man/man3/bn_sub_words.3.gz man/man3/bn_wexpand.3.gz +man/man3/callback.3.gz +man/man3/client_cert_cb.3.gz man/man3/crypto.3.gz +man/man3/crypto_dispatch.3.gz +man/man3/crypto_done.3.gz +man/man3/crypto_freereq.3.gz +man/man3/crypto_freesession.3.gz +man/man3/crypto_get_driverid.3.gz +man/man3/crypto_getreq.3.gz +man/man3/crypto_newsession.3.gz +man/man3/crypto_register.3.gz +man/man3/crypto_unregister.3.gz man/man3/d2i_ASN1_OBJECT.3.gz man/man3/d2i_DHparams.3.gz man/man3/d2i_DSAPrivateKey.3.gz @@ -1310,6 +1418,7 @@ man/man3/d2i_PKCS8PrivateKey_fp.3.gz man/man3/d2i_RSAPrivateKey.3.gz man/man3/d2i_RSAPublicKey.3.gz +man/man3/d2i_RSA_PUBKEY.3.gz man/man3/d2i_SSL_SESSION.3.gz man/man3/d2i_X509.3.gz man/man3/d2i_X509_ALGOR.3.gz @@ -1333,6 +1442,7 @@ man/man3/ecdsa.3.gz man/man3/engine.3.gz man/man3/evp.3.gz +man/man3/get_session_cb.3.gz man/man3/i2d_ASN1_OBJECT.3.gz man/man3/i2d_CMS_bio_stream.3.gz man/man3/i2d_DHparams.3.gz @@ -1353,6 +1463,7 @@ man/man3/i2d_PKCS8PrivateKey_nid_fp.3.gz man/man3/i2d_RSAPrivateKey.3.gz man/man3/i2d_RSAPublicKey.3.gz +man/man3/i2d_RSA_PUBKEY.3.gz man/man3/i2d_SSL_SESSION.3.gz man/man3/i2d_X509.3.gz man/man3/i2d_X509_ALGOR.3.gz @@ -1363,6 +1474,7 @@ man/man3/i2d_X509_REQ.3.gz man/man3/i2d_X509_REQ_bio.3.gz man/man3/i2d_X509_REQ_fp.3.gz +man/man3/i2d_X509_SIG.3.gz man/man3/i2d_X509_bio.3.gz man/man3/i2d_X509_fp.3.gz man/man3/lh_delete.3.gz @@ -1382,9 +1494,13 @@ man/man3/lhash.3.gz man/man3/mul.3.gz man/man3/mul_add.3.gz +man/man3/new_session_cb.3.gz +man/man3/pem_passwd_cb.3.gz +man/man3/remove_session_cb.3.gz man/man3/rsa.3.gz man/man3/sqr.3.gz man/man3/ssl.3.gz +man/man3/tls_accept_fds.3.gz man/man3/tls_accept_socket.3.gz man/man3/tls_client.3.gz man/man3/tls_close.3.gz @@ -1420,7 +1536,9 @@ man/man3/tls_reset.3.gz man/man3/tls_server.3.gz man/man3/tls_write.3.gz +man/man3/tmp_rsa_callback.3.gz man/man3/ui.3.gz man/man3/ui_compat.3.gz +man/man3/verify_callback.3.gz man/man3/x509.3.gz @dir include/openssl Index: security/openssl/Makefile =================================================================== --- security/openssl/Makefile +++ security/openssl/Makefile @@ -18,7 +18,7 @@ .error You have `USE_OPENSSL' variable defined either in environment or in make(1) arguments. Please undefine and try again. .endif -CONFLICTS?= libressl-* +# CONFLICTS?= libressl-* OPTIONS_DEFINE= SHARED THREADS I386 SSE2 ASM PADLOCK ZLIB GMP SCTP SSL2 SSL3 RFC3779 MD2 RC5 EXPCIPHERS DOCS OPTIONS_DEFAULT=SHARED THREADS SSE2 SCTP SSL2 SSL3 MD2 Index: security/stunnel/files/patch-src_ssl.c =================================================================== --- /dev/null +++ security/stunnel/files/patch-src_ssl.c @@ -0,0 +1,19 @@ +--- src/ssl.c.orig 2015-04-02 18:05:33 UTC ++++ src/ssl.c +@@ -189,7 +189,7 @@ NOEXPORT int prng_init(GLOBAL_OPTIONS *g + return 0; /* success */ + } + s_log(LOG_DEBUG, "RAND_screen failed to sufficiently seed PRNG"); +-#else ++#elif !defined(OPENSSL_NO_EGD) + if(global->egd_sock) { + if((bytes=RAND_egd(global->egd_sock))==-1) { + s_log(LOG_WARNING, "EGD Socket %s failed", global->egd_sock); +@@ -202,6 +202,7 @@ NOEXPORT int prng_init(GLOBAL_OPTIONS *g + so no need to check if seeded sufficiently */ + } + } ++#else + /* try the good-old default /dev/urandom, if available */ + totbytes+=add_rand_file(global, "/dev/urandom"); + if(RAND_status())