summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support
diff options
context:
space:
mode:
authorUlf Samuelsson <ulf@emagii.com>2012-02-28 06:03:21 +0000
committerKhem Raj <raj.khem@gmail.com>2012-03-08 18:57:22 -0800
commit8a728abad7307e968a03b333811fc1f816ba18b4 (patch)
treefec107d4ca6182517a4b213c7ca579d558b64310 /meta-oe/recipes-support
parent5b3974ed483418b206678acca7414b81bcf749a7 (diff)
downloadmeta-openembedded-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.patch45
-rw-r--r--meta-oe/recipes-support/ca-certificates/ca-certificates/remove-c-rehash.patch29
-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 000000000..ccb0efcc6
--- /dev/null
+++ b/meta-oe/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-remove-c-rehash.patch
@@ -0,0 +1,45 @@
1From 111e905fe931da1a3800accfc675cc01c8ee080c Mon Sep 17 00:00:00 2001
2From: Ulf Samuelsson <ulf@emagii.com>
3Date: Tue, 28 Feb 2012 06:42:58 +0100
4Subject: [PATCH] update-ca-certificates: remove c rehash
5
6Updated earlier patch to apply clean on 2012-02-12
7Signed-off-by: Ulf Samuelsson <ulf@emagii.com>
8---
9 sbin/update-ca-certificates | 20 ++++++++++----------
10 1 files changed, 10 insertions(+), 10 deletions(-)
11
12diff --git a/sbin/update-ca-certificates b/sbin/update-ca-certificates
13index 5375950..c567e3d 100755
14--- a/sbin/update-ca-certificates
15+++ b/sbin/update-ca-certificates
16@@ -132,16 +132,16 @@ rm -f "$CERTBUNDLE"
17 ADDED_CNT=$(wc -l < "$ADDED")
18 REMOVED_CNT=$(wc -l < "$REMOVED")
19
20-if [ "$ADDED_CNT" -gt 0 ] || [ "$REMOVED_CNT" -gt 0 ]
21-then
22- # only run if set of files has changed
23- if [ "$verbose" = 0 ]
24- then
25- c_rehash . > /dev/null
26- else
27- c_rehash .
28- fi
29-fi
30+#if [ "$ADDED_CNT" -gt 0 ] || [ "$REMOVED_CNT" -gt 0 ]
31+#then
32+# # only run if set of files has changed
33+# if [ "$verbose" = 0 ]
34+# then
35+# c_rehash . > /dev/null
36+# else
37+# c_rehash .
38+# fi
39+#fi
40
41 chmod 0644 "$TEMPBUNDLE"
42 mv -f "$TEMPBUNDLE" "$CERTBUNDLE"
43--
441.7.4.1
45
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 9d9b8ade3..000000000
--- a/meta-oe/recipes-support/ca-certificates/ca-certificates/remove-c-rehash.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1--- ca-certificates-20090814/sbin/update-ca-certificates.orig 2010-02-25 19:25:08.272807308 +0100
2+++ ca-certificates-20090814/sbin/update-ca-certificates 2010-02-25 19:25:33.962806273 +0100
3@@ -133,16 +133,16 @@
4 ADDED_CNT=$(wc -l < "$ADDED")
5 REMOVED_CNT=$(wc -l < "$REMOVED")
6
7-if [ "$ADDED_CNT" -gt 0 ] || [ "$REMOVED_CNT" -gt 0 ]
8-then
9- # only run if set of files has changed
10- if [ "$verbose" = 0 ]
11- then
12- c_rehash . > /dev/null
13- else
14- c_rehash .
15- fi
16-fi
17+#if [ "$ADDED_CNT" -gt 0 ] || [ "$REMOVED_CNT" -gt 0 ]
18+#then
19+# # only run if set of files has changed
20+# if [ "$verbose" = 0 ]
21+# then
22+# c_rehash . > /dev/null
23+# else
24+# c_rehash .
25+# fi
26+#fi
27
28 echo "$ADDED_CNT added, $REMOVED_CNT removed; done."
29
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 b79f5b11a..b3d7b9c28 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+"
5LIC_FILES_CHKSUM = "file://debian/copyright;md5=6275b491c91b57d92ebe11205ebf4dfe" 5LIC_FILES_CHKSUM = "file://debian/copyright;md5=6275b491c91b57d92ebe11205ebf4dfe"
6 6
7SRC_URI = "${DEBIAN_MIRROR}/main/c/ca-certificates/ca-certificates_${PV}.tar.gz \ 7SRC_URI = "${DEBIAN_MIRROR}/main/c/ca-certificates/ca-certificates_${PV}.tar.gz \
8 file://remove-c-rehash.patch" 8 file://0001-update-ca-certificates-remove-c-rehash.patch"
9 9
10SRC_URI[md5sum] = "f99a90a91b23338b4df765c0d18eba73" 10SRC_URI[md5sum] = "391dea8d827db935ca0d0d1e6641bf23"
11SRC_URI[sha256sum] = "6f0633136d17ffef3ed0adfb171a00136a320f0fd79c9c75733ac02662a754a7" 11SRC_URI[sha256sum] = "95f3eac93dad4433b5731bc9e106a26e2ccf210acace1927e597477b24187dce"
12 12
13inherit autotools allarch 13inherit autotools allarch
14 14