[Pkg-ocaml-maint-commits] [ocaml-ssl] 01/04: Imported Upstream version 0.5.2
Mehdi Dogguy
mehdi at moszumanska.debian.org
Sun Jan 17 22:59:05 UTC 2016
This is an automated email from the git hooks/post-receive script.
mehdi pushed a commit to branch master
in repository ocaml-ssl.
commit 3d577ddb5cc213148848fbf5139defea3dba2d56
Author: Mehdi Dogguy <mehdi at debian.org>
Date: Sun Jan 17 23:51:38 2016 +0100
Imported Upstream version 0.5.2
---
CHANGES | 5 +++++
configure | 32 ++++++++++++++++++++++----------
configure.ac | 2 +-
doc/html/Ssl.html | 3 +++
examples/configure | 14 +++++++++++++-
src/ssl_stubs.c | 2 ++
6 files changed, 46 insertions(+), 12 deletions(-)
diff --git a/CHANGES b/CHANGES
index a170c75..7b619af 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+0.5.2 (2015-11-23)
+=====
+* Add OPENSSL_NO_SSL3 preprocessor flag to disable SSLv3 (thanks Jérémie
+ Courrèges-Anglas).
+
0.5.1 (2015-05-27)
=====
diff --git a/configure b/configure
index 6973fb3..c80f409 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for ocaml-ssl 0.5.1.
+# Generated by GNU Autoconf 2.69 for ocaml-ssl 0.5.2.
#
# Report bugs to <savonet-users at lists.sourceforge.net>.
#
@@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='ocaml-ssl'
PACKAGE_TARNAME='ocaml-ssl'
-PACKAGE_VERSION='0.5.1'
-PACKAGE_STRING='ocaml-ssl 0.5.1'
+PACKAGE_VERSION='0.5.2'
+PACKAGE_STRING='ocaml-ssl 0.5.2'
PACKAGE_BUGREPORT='savonet-users at lists.sourceforge.net'
PACKAGE_URL=''
@@ -675,6 +675,7 @@ infodir
docdir
oldincludedir
includedir
+runstatedir
localstatedir
sharedstatedir
sysconfdir
@@ -747,6 +748,7 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -999,6 +1001,15 @@ do
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
+ -runstatedir | --runstatedir | --runstatedi | --runstated \
+ | --runstate | --runstat | --runsta | --runst | --runs \
+ | --run | --ru | --r)
+ ac_prev=runstatedir ;;
+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+ | --run=* | --ru=* | --r=*)
+ runstatedir=$ac_optarg ;;
+
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1136,7 +1147,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
- libdir localedir mandir
+ libdir localedir mandir runstatedir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
@@ -1249,7 +1260,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures ocaml-ssl 0.5.1 to adapt to many kinds of systems.
+\`configure' configures ocaml-ssl 0.5.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1289,6 +1300,7 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
+ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -1310,7 +1322,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of ocaml-ssl 0.5.1:";;
+ short | recursive ) echo "Configuration of ocaml-ssl 0.5.2:";;
esac
cat <<\_ACEOF
@@ -1399,7 +1411,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-ocaml-ssl configure 0.5.1
+ocaml-ssl configure 0.5.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1747,7 +1759,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by ocaml-ssl $as_me 0.5.1, which was
+It was created by ocaml-ssl $as_me 0.5.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -5343,7 +5355,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by ocaml-ssl $as_me 0.5.1, which was
+This file was extended by ocaml-ssl $as_me 0.5.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5396,7 +5408,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-ocaml-ssl config.status 0.5.1
+ocaml-ssl config.status 0.5.2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 8a6b709..853e9a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([ocaml-ssl],[0.5.1],[savonet-users at lists.sourceforge.net])
+AC_INIT([ocaml-ssl],[0.5.2],[savonet-users at lists.sourceforge.net])
VERSION=$PACKAGE_VERSION
AC_MSG_RESULT([configuring $PACKAGE_STRING])
diff --git a/doc/html/Ssl.html b/doc/html/Ssl.html
index f1a3cd6..2ef6533 100644
--- a/doc/html/Ssl.html
+++ b/doc/html/Ssl.html
@@ -14,6 +14,7 @@
<link title="Ssl" rel="Chapter" href="Ssl.html"><link title="Exceptions and errors" rel="Section" href="#1_Exceptionsanderrors">
<link title="Communication" rel="Section" href="#1_Communication">
<link title="Threads" rel="Subsection" href="#2_Threads">
+<link title="Threads" rel="Subsection" href="#2_Threads">
<link title="Contexts" rel="Subsection" href="#2_Contexts">
<link title="Ciphers" rel="Subsection" href="#2_Ciphers">
<link title="Certificates" rel="Subsection" href="#2_Certificates">
@@ -636,6 +637,8 @@ An SSL abstract socket.<br>
<br>
<h2 id="2_Threads">Threads</h2><br>
<br>
+<h2 id="2_Threads">Threads</h2><br>
+<br>
You should not have to use those functions. They are only here for internal
use (they are needed to make the openssl library thread-safe, see the
<code class="code">Ssl_threads</code> module).<br>
diff --git a/examples/configure b/examples/configure
index 9be6083..9f2b5f7 100755
--- a/examples/configure
+++ b/examples/configure
@@ -627,6 +627,7 @@ infodir
docdir
oldincludedir
includedir
+runstatedir
localstatedir
sharedstatedir
sysconfdir
@@ -693,6 +694,7 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -945,6 +947,15 @@ do
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
+ -runstatedir | --runstatedir | --runstatedi | --runstated \
+ | --runstate | --runstat | --runsta | --runst | --runs \
+ | --run | --ru | --r)
+ ac_prev=runstatedir ;;
+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+ | --run=* | --ru=* | --r=*)
+ runstatedir=$ac_optarg ;;
+
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1082,7 +1093,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
- libdir localedir mandir
+ libdir localedir mandir runstatedir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
@@ -1235,6 +1246,7 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
+ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
diff --git a/src/ssl_stubs.c b/src/ssl_stubs.c
index 310826c..1b175fa 100644
--- a/src/ssl_stubs.c
+++ b/src/ssl_stubs.c
@@ -289,6 +289,7 @@ static const SSL_METHOD *get_method(int protocol, int type)
}
break;
+#ifndef OPENSSL_NO_SSL3
case 1:
switch (type)
{
@@ -305,6 +306,7 @@ static const SSL_METHOD *get_method(int protocol, int type)
break;
}
break;
+#endif
case 2:
switch (type)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-ssl.git
More information about the Pkg-ocaml-maint-commits
mailing list