This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch master in repository ocamlbricks.
commit b968a5442161a221c2971beed593f1e53f115ac8 Author: Stephane Glondu <st...@glondu.net> Date: Thu Apr 20 11:01:50 2017 +0200 Fix a call to Obj.magic that caused segfaults (Closes: #860405) --- ...GETTEXT-fix-f_-to-avoid-call-to-Obj.magic.patch | 23 ++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 24 insertions(+) diff --git a/debian/patches/0004-In-GETTEXT-fix-f_-to-avoid-call-to-Obj.magic.patch b/debian/patches/0004-In-GETTEXT-fix-f_-to-avoid-call-to-Obj.magic.patch new file mode 100644 index 0000000..cefc1c7 --- /dev/null +++ b/debian/patches/0004-In-GETTEXT-fix-f_-to-avoid-call-to-Obj.magic.patch @@ -0,0 +1,23 @@ +From: Stephane Glondu <st...@glondu.net> +Date: Thu, 20 Apr 2017 11:00:36 +0200 +Subject: In GETTEXT, fix f_ to avoid call to Obj.magic + +Bug: https://bugs.launchpad.net/ocamlbricks/+bug/1684507 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=860405 +--- + GETTEXT/gettext_builder.ml | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/GETTEXT/gettext_builder.ml b/GETTEXT/gettext_builder.ml +index 4805e95..0741cb2 100644 +--- a/GETTEXT/gettext_builder.ml ++++ b/GETTEXT/gettext_builder.ml +@@ -58,5 +58,7 @@ module Make (TheTextDomainAndDirectory : TextDomainAndDirectory) : Gettext = str + + (* Public versions for format strings, with the type we like: *) + let f_ english_format_string = +- (Obj.magic dgettext TheTextDomainAndDirectory.text_domain ((Obj.magic english_format_string) : string));; ++ let english_string = string_of_format english_format_string in ++ let foreign_string = dgettext TheTextDomainAndDirectory.text_domain english_string in ++ Scanf.format_from_string foreign_string english_format_string;; + end;; diff --git a/debian/patches/series b/debian/patches/series index ef23491..be79e19 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 0002-Use-the-Debian-prefix-for-building.patch 0003-Fix-the-build-on-non-native-architectures.patch 0004-install-stublibs.patch +0004-In-GETTEXT-fix-f_-to-avoid-call-to-Obj.magic.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlbricks.git _______________________________________________ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits