diff options
author | Ulf Samuelsson <ulf@emagii.com> | 2012-02-28 06:03:21 +0000 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2012-03-08 18:57:22 -0800 |
commit | 8a728abad7307e968a03b333811fc1f816ba18b4 (patch) | |
tree | fec107d4ca6182517a4b213c7ca579d558b64310 /meta-oe/recipes-support | |
parent | 5b3974ed483418b206678acca7414b81bcf749a7 (diff) | |
download | meta-openembedded-contrib-8a728abad7307e968a03b333811fc1f816ba18b4.tar.gz |
ca-certificates: Bump version to 20120212
20111211 has disappeared from the server
Signed-off-by: Ulf Samuelsson <ulf@emagii.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support')
-rw-r--r-- | meta-oe/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-remove-c-rehash.patch | 45 | ||||
-rw-r--r-- | meta-oe/recipes-support/ca-certificates/ca-certificates/remove-c-rehash.patch | 29 | ||||
-rw-r--r-- | meta-oe/recipes-support/ca-certificates/ca-certificates_20120212.bb (renamed from meta-oe/recipes-support/ca-certificates/ca-certificates_20111211.bb) | 6 |
3 files changed, 48 insertions, 32 deletions
diff --git a/meta-oe/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-remove-c-rehash.patch b/meta-oe/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-remove-c-rehash.patch new file mode 100644 index 0000000000..ccb0efcc6c --- /dev/null +++ b/meta-oe/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-remove-c-rehash.patch @@ -0,0 +1,45 @@ +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-oe/recipes-support/ca-certificates/ca-certificates/remove-c-rehash.patch b/meta-oe/recipes-support/ca-certificates/ca-certificates/remove-c-rehash.patch deleted file mode 100644 index 9d9b8ade3a..0000000000 --- a/meta-oe/recipes-support/ca-certificates/ca-certificates/remove-c-rehash.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- ca-certificates-20090814/sbin/update-ca-certificates.orig 2010-02-25 19:25:08.272807308 +0100 -+++ ca-certificates-20090814/sbin/update-ca-certificates 2010-02-25 19:25:33.962806273 +0100 -@@ -133,16 +133,16 @@ - 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 - - echo "$ADDED_CNT added, $REMOVED_CNT removed; done." - diff --git a/meta-oe/recipes-support/ca-certificates/ca-certificates_20111211.bb b/meta-oe/recipes-support/ca-certificates/ca-certificates_20120212.bb index b79f5b11a8..b3d7b9c286 100644 --- a/meta-oe/recipes-support/ca-certificates/ca-certificates_20111211.bb +++ b/meta-oe/recipes-support/ca-certificates/ca-certificates_20120212.bb @@ -5,10 +5,10 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://debian/copyright;md5=6275b491c91b57d92ebe11205ebf4dfe" SRC_URI = "${DEBIAN_MIRROR}/main/c/ca-certificates/ca-certificates_${PV}.tar.gz \ - file://remove-c-rehash.patch" + file://0001-update-ca-certificates-remove-c-rehash.patch" -SRC_URI[md5sum] = "f99a90a91b23338b4df765c0d18eba73" -SRC_URI[sha256sum] = "6f0633136d17ffef3ed0adfb171a00136a320f0fd79c9c75733ac02662a754a7" +SRC_URI[md5sum] = "391dea8d827db935ca0d0d1e6641bf23" +SRC_URI[sha256sum] = "95f3eac93dad4433b5731bc9e106a26e2ccf210acace1927e597477b24187dce" inherit autotools allarch |