summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2016-05-23 17:45:26 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-25 07:50:17 +0100
commit0b1a03e332aedb147cda28929db22ef2e4199209 (patch)
tree1b91b0b22cd4bb1458a6842a453f1535f364ea41 /meta/recipes-support
parent0a84108e0f70da4dce24d1eae05c0d3697e0dc92 (diff)
downloadpoky-0b1a03e332aedb147cda28929db22ef2e4199209.tar.gz
ca-certificates: Use c_rehash utility
As now the c_rehash utility is available, we can use it. This removes the patch to disable its usage allowing for a standard SSL behaviour. (From OE-Core rev: cea46e7b8d9463306779301fa97f651d750f380f) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-remove-c-rehash.patch46
-rw-r--r--meta/recipes-support/ca-certificates/ca-certificates_20160104.bb1
2 files changed, 0 insertions, 47 deletions
diff --git a/meta/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-remove-c-rehash.patch b/meta/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-remove-c-rehash.patch
deleted file mode 100644
index bf027233d1..0000000000
--- a/meta/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-remove-c-rehash.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1Upstream-Status: Pending
2
3From 111e905fe931da1a3800accfc675cc01c8ee080c Mon Sep 17 00:00:00 2001
4From: Ulf Samuelsson <ulf@emagii.com>
5Date: Tue, 28 Feb 2012 06:42:58 +0100
6Subject: [PATCH] update-ca-certificates: remove c rehash
7
8Updated earlier patch to apply clean on 2012-02-12
9Signed-off-by: Ulf Samuelsson <ulf@emagii.com>
10---
11 sbin/update-ca-certificates | 20 ++++++++++----------
12 1 files changed, 10 insertions(+), 10 deletions(-)
13
14diff --git a/sbin/update-ca-certificates b/sbin/update-ca-certificates
15index 5375950..c567e3d 100755
16--- a/sbin/update-ca-certificates
17+++ b/sbin/update-ca-certificates
18@@ -132,16 +132,16 @@ rm -f "$CERTBUNDLE"
19 ADDED_CNT=$(wc -l < "$ADDED")
20 REMOVED_CNT=$(wc -l < "$REMOVED")
21
22-if [ "$ADDED_CNT" -gt 0 ] || [ "$REMOVED_CNT" -gt 0 ]
23-then
24- # only run if set of files has changed
25- if [ "$verbose" = 0 ]
26- then
27- c_rehash . > /dev/null
28- else
29- c_rehash .
30- fi
31-fi
32+#if [ "$ADDED_CNT" -gt 0 ] || [ "$REMOVED_CNT" -gt 0 ]
33+#then
34+# # only run if set of files has changed
35+# if [ "$verbose" = 0 ]
36+# then
37+# c_rehash . > /dev/null
38+# else
39+# c_rehash .
40+# fi
41+#fi
42
43 chmod 0644 "$TEMPBUNDLE"
44 mv -f "$TEMPBUNDLE" "$CERTBUNDLE"
45--
461.7.4.1
diff --git a/meta/recipes-support/ca-certificates/ca-certificates_20160104.bb b/meta/recipes-support/ca-certificates/ca-certificates_20160104.bb
index e0f1939137..871bc2ef82 100644
--- a/meta/recipes-support/ca-certificates/ca-certificates_20160104.bb
+++ b/meta/recipes-support/ca-certificates/ca-certificates_20160104.bb
@@ -14,7 +14,6 @@ DEPENDS_class-native = ""
14SRCREV = "f54715702c5c0581c9461f78fd84e2c8d2ec243c" 14SRCREV = "f54715702c5c0581c9461f78fd84e2c8d2ec243c"
15 15
16SRC_URI = "git://anonscm.debian.org/collab-maint/ca-certificates.git \ 16SRC_URI = "git://anonscm.debian.org/collab-maint/ca-certificates.git \
17 file://0001-update-ca-certificates-remove-c-rehash.patch \
18 file://0002-update-ca-certificates-use-SYSROOT.patch \ 17 file://0002-update-ca-certificates-use-SYSROOT.patch \
19 file://0001-update-ca-certificates-don-t-use-Debianisms-in-run-p.patch \ 18 file://0001-update-ca-certificates-don-t-use-Debianisms-in-run-p.patch \
20 file://update-ca-certificates-support-Toybox.patch \ 19 file://update-ca-certificates-support-Toybox.patch \