[Pkg-ocaml-maint-commits] [opam] 01/02: Stop using insecure and no-check-certificate flags

[Mehdi Dogguy]

This is an automated email from the git hooks/post-receive script.

mehdi pushed a commit to branch master
in repository opam.

commit 60915a9ef43c55889a90fb99f2d646d6549a4de2
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Sat Mar 19 08:44:09 2016 +0100

    Stop using insecure and no-check-certificate flags
---
 debian/changelog                                   |  8 +++++
 ...emove-insecure-no-check-certificate-flags.patch | 34 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 43 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6935b5b..ced0b9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+opam (1.2.2-5) UNRELEASED; urgency=medium
+
+  * Stop using insecure and no-check-certificate flags (Closes: #818081).
+    - add patch 0003-remove-insecure-no-check-certificate-flags.patch
+    Thanks to Ximin Luo for submitting the bug and providing the patch.
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Sat, 19 Mar 2016 08:42:28 +0100
+
 opam (1.2.2-4) unstable; urgency=medium
 
   * Fix integration with fish shell (Closes: #805270)
diff --git a/debian/patches/0003-remove-insecure-no-check-certificate-flags.patch b/debian/patches/0003-remove-insecure-no-check-certificate-flags.patch
new file mode 100644
index 0000000..4f38679
--- /dev/null
+++ b/debian/patches/0003-remove-insecure-no-check-certificate-flags.patch
@@ -0,0 +1,34 @@
+From: Mehdi Dogguy <mehdi at debian.org>
+Date: Sat, 19 Mar 2016 08:41:27 +0100
+Subject: remove insecure / no-check-certificate flags
+
+See mail on opam-devel, #55 #2006
+
+Author: Hannes Mehnert <hannes at mehnert.org>
+Applied-Upstream: 3d43295df3bb9e67e60801d319bf82c2c8a84d24
+---
+ src/core/opamSystem.ml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/core/opamSystem.ml b/src/core/opamSystem.ml
+index d46cbde..60c8a7f 100644
+--- a/src/core/opamSystem.ml
++++ b/src/core/opamSystem.ml
+@@ -694,7 +694,7 @@ let download_command =
+   let retry = string_of_int OpamGlobals.download_retry in
+   let wget ~compress:_ ?checksum:_ dir src =
+     let wget_args = [
+-      "--content-disposition"; "--no-check-certificate";
++      "--content-disposition";
+       "-t"; retry;
+       src
+     ] in
+@@ -704,7 +704,7 @@ let download_command =
+   in
+   let curl command ~compress ?checksum:_ dir src =
+     let curl_args = [
+-      "--write-out"; "%{http_code}\\n"; "--insecure";
++      "--write-out"; "%{http_code}\\n";
+       "--retry"; retry; "--retry-delay"; "2";
+     ] @ (if compress then ["--compressed"] else []) @ [
+         "-OL"; src
diff --git a/debian/patches/series b/debian/patches/series
index 7d537d8..c2b1bc3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Port-to-Dose3-4.0.1.patch
 0002-Fix-integration-with-fish-shell.patch
+0003-remove-insecure-no-check-certificate-flags.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/opam.git