diff options
| author |   Otavio Salvador <otavio@ossystems.com.br> | 2016-05-23 17:45:26 -0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-25 07:49:53 +0100 |
| commit | cea46e7b8d9463306779301fa97f651d750f380f (patch) | |
| tree | 8236452deae88676542f93e0d822f52fae3a3114 /meta | |
| parent | cb6150f1a779e356f120d5e45c91fda75789970a (diff) | |
| download | openembedded-core-cea46e7b8d9463306779301fa97f651d750f380f.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.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-remove-c-rehash.patch | 46 | ||||
| -rw-r--r-- | meta/recipes-support/ca-certificates/ca-certificates_20160104.bb | 1 |
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 @@ -Upstream-Status: Pending - -From 111e905fe931da1a3800accfc675cc01c8ee080c Mon Sep 17 00:00:00 2001 -From: Ulf Samuelsson <ulf@emagii.com> -Date: Tue, 28 Feb 2012 06:42:58 +0100 -Subject: [PATCH] update-ca-certificates: remove c rehash - -Updated earlier patch to apply clean on 2012-02-12 -Signed-off-by: Ulf Samuelsson <ulf@emagii.com> ---- - sbin/update-ca-certificates | 20 ++++++++++---------- - 1 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/sbin/update-ca-certificates b/sbin/update-ca-certificates -index 5375950..c567e3d 100755 ---- a/sbin/update-ca-certificates -+++ b/sbin/update-ca-certificates -@@ -132,16 +132,16 @@ rm -f "$CERTBUNDLE" - ADDED_CNT=$(wc -l < "$ADDED") - REMOVED_CNT=$(wc -l < "$REMOVED") - --if [ "$ADDED_CNT" -gt 0 ] || [ "$REMOVED_CNT" -gt 0 ] --then -- # only run if set of files has changed -- if [ "$verbose" = 0 ] -- then -- c_rehash . > /dev/null -- else -- c_rehash . -- fi --fi -+#if [ "$ADDED_CNT" -gt 0 ] || [ "$REMOVED_CNT" -gt 0 ] -+#then -+# # only run if set of files has changed -+# if [ "$verbose" = 0 ] -+# then -+# c_rehash . > /dev/null -+# else -+# c_rehash . -+# fi -+#fi - - chmod 0644 "$TEMPBUNDLE" - mv -f "$TEMPBUNDLE" "$CERTBUNDLE" --- -1.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 = "" SRCREV = "f54715702c5c0581c9461f78fd84e2c8d2ec243c" SRC_URI = "git://anonscm.debian.org/collab-maint/ca-certificates.git \ - file://0001-update-ca-certificates-remove-c-rehash.patch \ file://0002-update-ca-certificates-use-SYSROOT.patch \ file://0001-update-ca-certificates-don-t-use-Debianisms-in-run-p.patch \ file://update-ca-certificates-support-Toybox.patch \ |