1 |
commit: 9ea57f3f0febdefdbe0ae810169ed485b165808b |
2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Apr 30 16:02:11 2016 +0000 |
4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Apr 30 16:02:11 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ea57f3f |
7 |
|
8 |
dev-ml/opam: apply debian patch, backported from upstream, to check certicates when downloading. Bug #580586 |
9 |
|
10 |
Package-Manager: portage-2.2.28 |
11 |
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org> |
12 |
|
13 |
dev-ml/opam/files/no-insecure.patch | 25 ++++++++++++++++++++++ |
14 |
.../{opam-1.2.2.ebuild => opam-1.2.2-r1.ebuild} | 4 +++- |
15 |
2 files changed, 28 insertions(+), 1 deletion(-) |
16 |
|
17 |
diff --git a/dev-ml/opam/files/no-insecure.patch b/dev-ml/opam/files/no-insecure.patch |
18 |
new file mode 100644 |
19 |
index 0000000..aebd5b2 |
20 |
--- /dev/null |
21 |
+++ b/dev-ml/opam/files/no-insecure.patch |
22 |
@@ -0,0 +1,25 @@ |
23 |
+Description: remove insecure / no-check-certificate flags (see mail on opam-devel, #55 #2006) |
24 |
+Author: Hannes Mehnert <hannes@×××××××.org> |
25 |
+Applied-Upstream: 3d43295df3bb9e67e60801d319bf82c2c8a84d24 |
26 |
+--- |
27 |
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ |
28 |
+--- a/src/core/opamSystem.ml |
29 |
++++ b/src/core/opamSystem.ml |
30 |
+@@ -694,7 +694,7 @@ |
31 |
+ let retry = string_of_int OpamGlobals.download_retry in |
32 |
+ let wget ~compress:_ ?checksum:_ dir src = |
33 |
+ let wget_args = [ |
34 |
+- "--content-disposition"; "--no-check-certificate"; |
35 |
++ "--content-disposition"; |
36 |
+ "-t"; retry; |
37 |
+ src |
38 |
+ ] in |
39 |
+@@ -704,7 +704,7 @@ |
40 |
+ in |
41 |
+ let curl command ~compress ?checksum:_ dir src = |
42 |
+ let curl_args = [ |
43 |
+- "--write-out"; "%{http_code}\\n"; "--insecure"; |
44 |
++ "--write-out"; "%{http_code}\\n"; |
45 |
+ "--retry"; retry; "--retry-delay"; "2"; |
46 |
+ ] @ (if compress then ["--compressed"] else []) @ [ |
47 |
+ "-OL"; src |
48 |
|
49 |
diff --git a/dev-ml/opam/opam-1.2.2.ebuild b/dev-ml/opam/opam-1.2.2-r1.ebuild |
50 |
similarity index 91% |
51 |
rename from dev-ml/opam/opam-1.2.2.ebuild |
52 |
rename to dev-ml/opam/opam-1.2.2-r1.ebuild |
53 |
index d0e1cc3..2b94b7e 100644 |
54 |
--- a/dev-ml/opam/opam-1.2.2.ebuild |
55 |
+++ b/dev-ml/opam/opam-1.2.2-r1.ebuild |
56 |
@@ -36,7 +36,9 @@ RDEPEND="${DEPEND} |
57 |
" |
58 |
|
59 |
src_prepare() { |
60 |
- epatch "${FILESDIR}/0001-Port-to-Dose3-4.0.1.patch" |
61 |
+ epatch \ |
62 |
+ "${FILESDIR}/0001-Port-to-Dose3-4.0.1.patch" \ |
63 |
+ "${FILESDIR}/no-insecure.patch" |
64 |
} |
65 |
|
66 |
src_compile() { |