[Pkg-ocaml-maint-commits] [pcre-ocaml] 09/18: Imported Upstream version 7.2.1
Stéphane Glondu
glondu at moszumanska.debian.org
Wed Aug 3 11:58:36 UTC 2016
This is an automated email from the git hooks/post-receive script.
glondu pushed a commit to branch master
in repository pcre-ocaml.
commit b1a3040dbc54d18e8519b6e104d988d71e860838
Author: Stephane Glondu <steph at glondu.net>
Date: Wed Aug 3 13:44:43 2016 +0200
Imported Upstream version 7.2.1
---
CHANGES.txt | 2 ++
_oasis | 2 +-
_tags | 2 +-
lib/META | 4 ++--
lib/pcre_stubs.c | 7 ++++++-
setup.ml | 6 +++---
6 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index 21b00c2..baf93e4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,5 @@
+2016-02-23: Fixed linking problem with old versions of PCRE (< 8.20).
+
2016-02-22: Fixed a subgroup matching bug.
Thanks to Cheng Lou for the bug report!
diff --git a/_oasis b/_oasis
index 6d6758d..7888da6 100644
--- a/_oasis
+++ b/_oasis
@@ -1,6 +1,6 @@
OASISFormat: 0.4
Name: pcre
-Version: 7.2.0
+Version: 7.2.1
Synopsis: pcre-ocaml - bindings to the Perl Compatibility Regular Expressions library
Description: pcre-ocaml offers library functions for string pattern matching and substitution, similar to the functionality offered by the Perl language.
Authors: Markus Mottl <markus.mottl at gmail.com>
diff --git a/_tags b/_tags
index 6d8e4b3..40715cc 100644
--- a/_tags
+++ b/_tags
@@ -46,7 +46,7 @@ true: annot, bin_annot
true: -traverse
<{lib,examples}/**>: traverse
-<**/*.ml{,i}>: warn(Aer-44), strict_sequence, safe_string, annot
+<**/*.ml{,i}>: warn(Aer-44-50), strict_sequence, safe_string, annot
<lib/pcre.{cma,cmxa}>: oasis_library_pcre_cclib
"lib/libpcre_stubs.lib": oasis_library_pcre_cclib
diff --git a/lib/META b/lib/META
index ba54349..ea9bdb5 100644
--- a/lib/META
+++ b/lib/META
@@ -1,6 +1,6 @@
# OASIS_START
-# DO NOT EDIT (digest: 093107e478c4b229806291bc9be362f2)
-version = "7.2.0"
+# DO NOT EDIT (digest: f00cd2da6b8e481dd3713e7a8f1c4b71)
+version = "7.2.1"
description =
"pcre-ocaml - bindings to the Perl Compatibility Regular Expressions library"
requires = "bytes"
diff --git a/lib/pcre_stubs.c b/lib/pcre_stubs.c
index dbee6f6..225113d 100644
--- a/lib/pcre_stubs.c
+++ b/lib/pcre_stubs.c
@@ -187,7 +187,12 @@ static void pcre_dealloc_regexp(value v_rex)
{
void *extra = (void *) Field(v_rex, 2);
(pcre_free)((void *) Field(v_rex, 1));
- if (extra != NULL) pcre_free_study(extra);
+ if (extra != NULL)
+#ifdef PCRE_STUDY_JIT_COMPILE
+ pcre_free_study(extra);
+#else
+ pcre_free(extra);
+#endif
}
/* Makes OCaml-string from PCRE-version */
diff --git a/setup.ml b/setup.ml
index 4f5840e..8d329a1 100644
--- a/setup.ml
+++ b/setup.ml
@@ -1,7 +1,7 @@
(* setup.ml generated for the first time by OASIS v0.3.0 *)
(* OASIS_START *)
-(* DO NOT EDIT (digest: 60f0fcaadee205d5fbe6f170edbc241e) *)
+(* DO NOT EDIT (digest: 93051cc4261da4a968322a5c488fc0e8) *)
(*
Regenerated by OASIS v0.4.5
Visit http://oasis.forge.ocamlcore.org for more information and
@@ -6683,7 +6683,7 @@ let setup_t =
alpha_features = [];
beta_features = [];
name = "pcre";
- version = "7.2.0";
+ version = "7.2.1";
license =
OASISLicense.DEP5License
(OASISLicense.DEP5Unit
@@ -6983,7 +6983,7 @@ let setup_t =
};
oasis_fn = Some "_oasis";
oasis_version = "0.4.5";
- oasis_digest = Some "X\138�7\133-\026��z�\016E�\137�";
+ oasis_digest = Some "_\141i��\017u��M��~\024}k";
oasis_exec = None;
oasis_setup_args = [];
setup_update = false
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/pcre-ocaml.git
More information about the Pkg-ocaml-maint-commits
mailing list