[Pkg-ocaml-maint-commits] [ocurl] 03/07: New upstream version 0.7.9
Mehdi Dogguy
mehdi at moszumanska.debian.org
Fri Aug 11 19:15:02 UTC 2017
This is an automated email from the git hooks/post-receive script.
mehdi pushed a commit to branch master
in repository ocurl.
commit f3febe80835c20a5daf4f54328f0849c55902695
Author: Mehdi Dogguy <mehdi at debian.org>
Date: Fri Aug 11 14:54:49 2017 -0400
New upstream version 0.7.9
---
.travis.yml | 13 +++++++++++++
CHANGES.txt | 4 ++++
README => README.md | 2 ++
appveyor.yml | 13 +++++++++++++
configure | 18 +++++++++---------
configure.in | 2 +-
curl-helper.c | 16 ++++++++++++++--
curl.mli | 6 +++---
opam | 26 ++++++++++++++++++++++++++
9 files changed, 85 insertions(+), 15 deletions(-)
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..ded0286
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,13 @@
+language: c
+sudo: required
+install: wget https://raw.githubusercontent.com/ocaml/ocaml-ci-scripts/master/.travis-opam.sh
+script: bash -ex .travis-opam.sh
+env:
+ - OCAML_VERSION=4.00
+ - OCAML_VERSION=4.01
+ - OCAML_VERSION=4.02
+ - OCAML_VERSION=4.03
+ - OCAML_VERSION=4.04
+os:
+ - linux
+ - osx
diff --git a/CHANGES.txt b/CHANGES.txt
index d64ae40..4240f2d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,7 @@
+0.7.9 - 3 Oct 2016
+
+ * fix build with older libcurl
+
0.7.8 - 6 Sep 2016
+ CURLOPT_PIPEWAIT
diff --git a/README b/README.md
similarity index 81%
rename from README
rename to README.md
index 53f8e58..485cfd8 100644
--- a/README
+++ b/README.md
@@ -2,6 +2,8 @@
ocurl - OCaml libcurl bindings
==============================
+[](https://travis-ci.org/ygrek/ocurl) [](https://ci.appveyor.com/project/ygrek/ocurl/branch/master)
+
Homepage: http://ocurl.forge.ocamlcore.org
OCaml bindings to libcurl - client-side URL transfer library,
diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 0000000..e684aae
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,13 @@
+platform:
+ - x86
+
+environment:
+ CYG_ROOT: "C:\\cygwin"
+ CYG_BASH: "%CYG_ROOT%\\bin\\bash -lc"
+
+install:
+ - appveyor DownloadFile https://raw.githubusercontent.com/ocaml/ocaml-ci-scripts/master/appveyor-opam.sh
+ - "%CYG_ROOT%\\setup-x86.exe -qnNdO -R %CYG_ROOT% -s http://cygwin.mirror.constant.com -l C:/cygwin/var/cache/setup -P rsync -P patch -P diffutils -P make -P unzip -P git -P m4 -P perl -P mingw64-x86_64-gcc-core"
+
+build_script:
+ - "%CYG_BASH% '${APPVEYOR_BUILD_FOLDER}/appveyor-opam.sh'"
diff --git a/configure b/configure
index 334fc33..6900c44 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 ocurl 0.7.8.
+# Generated by GNU Autoconf 2.69 for ocurl 0.7.9.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='ocurl'
PACKAGE_TARNAME='ocurl'
-PACKAGE_VERSION='0.7.8'
-PACKAGE_STRING='ocurl 0.7.8'
+PACKAGE_VERSION='0.7.9'
+PACKAGE_STRING='ocurl 0.7.9'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1258,7 +1258,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 ocurl 0.7.8 to adapt to many kinds of systems.
+\`configure' configures ocurl 0.7.9 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1320,7 +1320,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of ocurl 0.7.8:";;
+ short | recursive ) echo "Configuration of ocurl 0.7.9:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-ocurl configure 0.7.8
+ocurl configure 0.7.9
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1698,7 +1698,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 ocurl $as_me 0.7.8, which was
+It was created by ocurl $as_me 0.7.9, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -8795,7 +8795,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 ocurl $as_me 0.7.8, which was
+This file was extended by ocurl $as_me 0.7.9, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -8857,7 +8857,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="\\
-ocurl config.status 0.7.8
+ocurl config.status 0.7.9
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.in b/configure.in
index 4d47af8..1a1e294 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ dnl
dnl ocurl autoconf input
dnl
-AC_INIT(ocurl,0.7.8)
+AC_INIT(ocurl,0.7.9)
AC_PROG_CC()
diff --git a/curl-helper.c b/curl-helper.c
index 3b14892..a1ce142 100644
--- a/curl-helper.c
+++ b/curl-helper.c
@@ -1840,6 +1840,18 @@ SETOPT_STRING( COOKIEFILE)
SETOPT_BOOL( CERTINFO)
#endif
+#if !defined(CURL_SSLVERSION_TLSv1_0)
+#define CURL_SSLVERSION_TLSv1_0 CURL_SSLVERSION_TLSv1
+#endif
+
+#if !defined(CURL_SSLVERSION_TLSv1_1)
+#define CURL_SSLVERSION_TLSv1_1 CURL_SSLVERSION_TLSv1
+#endif
+
+#if !defined(CURL_SSLVERSION_TLSv1_2)
+#define CURL_SSLVERSION_TLSv1_2 CURL_SSLVERSION_TLSv1
+#endif
+
static void handle_SSLVERSION(Connection *conn, value option)
{
CAMLparam1(option);
@@ -4350,7 +4362,7 @@ CAMLprim value caml_curl_multi_timeout(value v_multi)
static void func_name(CURLM *handle, value option) \
{ \
CAMLparam1(option); \
- CURLcode result = CURLM_OK; \
+ CURLMcode result = CURLM_OK; \
\
result = curl_multi_setopt(handle, curl_option, conv_val(option)); \
\
@@ -4374,7 +4386,7 @@ long pipeliningMap[] =
static void handle_multi_PIPELINING(CURLM* handle, value option)
{
CAMLparam1(option);
- CURLcode result = CURLM_OK;
+ CURLMcode result = CURLM_OK;
long bits = convert_bit_list(pipeliningMap, sizeof(pipeliningMap) / sizeof(pipeliningMap[0]), option);
diff --git a/curl.mli b/curl.mli
index 73b3d0e..2175a07 100644
--- a/curl.mli
+++ b/curl.mli
@@ -140,9 +140,9 @@ type curlSSLVersion =
| SSLVERSION_TLSv1 (** TLSv1.x *)
| SSLVERSION_SSLv2 (** SSLv2 *)
| SSLVERSION_SSLv3 (** SSLv3 *)
- | SSLVERSION_TLSv1_0 (** Added in 7.34.0 *)
- | SSLVERSION_TLSv1_1 (** Added in 7.34.0 *)
- | SSLVERSION_TLSv1_2 (** Added in 7.34.0 *)
+ | SSLVERSION_TLSv1_0 (** Added in libcurl 7.34.0, will request TLSv1 in previous versions *)
+ | SSLVERSION_TLSv1_1 (** Added in libcurl 7.34.0, will request TLSv1 in previous versions *)
+ | SSLVERSION_TLSv1_2 (** Added in libcurl 7.34.0, will request TLSv1 in previous versions *)
type curlTimeCondition =
| TIMECOND_NONE (** since 0.6.1 *)
diff --git a/opam b/opam
new file mode 100644
index 0000000..2e892fa
--- /dev/null
+++ b/opam
@@ -0,0 +1,26 @@
+opam-version: "1.2"
+maintainer: "ygrek at autistici.org"
+homepage: "http://ocurl.forge.ocamlcore.org"
+license: "MIT"
+authors: [ "Lars Nilsson" "ygrek" ]
+doc: ["http://ocurl.forge.ocamlcore.org/api/index.html"]
+dev-repo: "git://github.com/ygrek/ocurl.git"
+bug-reports: "https://github.com/ygrek/ocurl/issues"
+build: [
+ ["./configure"]
+ [make]
+]
+install: [
+ [make "install"]
+]
+build-test: [
+ [make "test"]
+]
+build-doc: [[make "doc"]]
+remove: [["ocamlfind" "remove" "curl"]]
+depends: [
+ "ocamlfind" {build}
+ "base-unix"
+ "conf-libcurl"
+]
+depopts: ["lwt"]
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocurl.git
More information about the Pkg-ocaml-maint-commits
mailing list