From 7a570cdebfba2524b0ba70ce3ba61e09a617b93d Mon Sep 17 00:00:00 2001
From: Josh Berdine <jjb@fb.com>
Date: Tue, 27 Jun 2017 18:07:07 -0700
Subject: [PATCH] Require ocaml 4.04.2

Summary: Tests rely on at least 4.04.1, and no harm in avoiding CVE-2017-9772.

Reviewed By: jeremydubreil

Differential Revision: D5334702

fbshipit-source-id: 2b9b7f1
---
 .travis.yml       | 2 +-
 configure.ac      | 2 +-
 docker/Dockerfile | 2 +-
 opam              | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c8fad64b4..6fd2858f8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ before_install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install opam; fi
 install:
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then travis_wait 60 ./build-infer.sh --yes java --opam-switch 4.04.0 --only-setup-opam; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then travis_wait 60 ./build-infer.sh --yes java --opam-switch 4.04.2 --only-setup-opam; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then eval `opam config env`; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then opam pin add -y --no-action -k git infer .; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then opam install -y infer; fi
diff --git a/configure.ac b/configure.ac
index 293d5689a..f81283841 100644
--- a/configure.ac
+++ b/configure.ac
@@ -173,7 +173,7 @@ fi
 AC_PROG_OCAML
 AC_ASSERT_PROG([ocamlc], [$OCAMLC])
 # check the version of OCaml
-AC_ASSERT_OCAML_MIN_VERSION([4.04.0])
+AC_ASSERT_OCAML_MIN_VERSION([4.04.2])
 AC_ASSERT_PROG([ocamlopt], [$OCAMLOPT])
 AC_ASSERT_PROG([ocamlbuild], [$OCAMLBUILD])
 AC_PROG_FINDLIB
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 8bd23d086..c04c672dd 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -40,7 +40,7 @@ RUN INFER_VERSION=v0.12.0; \
     ln -s ${PWD}/infer-linux64-$INFER_VERSION /infer
 
 # Compile Infer
-RUN OCAML_VERSION=4.04.0; \
+RUN OCAML_VERSION=4.04.2; \
     opam init --compiler=$OCAML_VERSION -j $(getconf _NPROCESSORS_ONLN || echo 1) --yes && \
     cd /infer && \
     ./build-infer.sh --opam-switch $OCAML_VERSION && \
diff --git a/opam b/opam
index 5aafea567..8832af775 100644
--- a/opam
+++ b/opam
@@ -24,7 +24,7 @@ remove: [
      "--prefix=%{prefix}%"]
   ["make" "uninstall"]
 ]
-ocaml-version: [ >= "4.04.0" ]
+ocaml-version: [ >= "4.04.2" ]
 depends: [
   "ANSITerminal" {>="0.7"}
   "atdgen" {>="1.6.0"}