summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-08-05 16:08:38 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-10 12:40:28 -0700
commit101fac5815015311088cb83a98c56673e52cbb3d (patch)
treebc5905c469e582f7c3b5cfd16b364f0d1e25640b /meta
parent7137a31245fef41cc51cb819852f8acbed5e2c22 (diff)
downloadpoky-101fac5815015311088cb83a98c56673e52cbb3d.tar.gz
ca-certificates: Update 20141019 -> 20150426
Older SRCREV was not fetchable which triggered this upgrade Change-Id: I85d028294ff0018f4c81c6bb81ae262b18af7a87 (From OE-Core rev: 39c759cd43f4e4371ef9654bf4d821436a5eaebf) Signed-off-by: Khem Raj <raj.khem@gmail.com> 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-don-t-use-Debianisms-in-run-p.patch31
-rw-r--r--meta/recipes-support/ca-certificates/ca-certificates/0002-update-ca-certificates-use-SYSROOT.patch41
-rw-r--r--meta/recipes-support/ca-certificates/ca-certificates/default-sysroot.patch10
-rw-r--r--meta/recipes-support/ca-certificates/ca-certificates_20150426.bb (renamed from meta/recipes-support/ca-certificates/ca-certificates_20141019.bb)4
4 files changed, 37 insertions, 49 deletions
diff --git a/meta/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-don-t-use-Debianisms-in-run-p.patch b/meta/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-don-t-use-Debianisms-in-run-p.patch
index d7d487e676..4b4b287d4e 100644
--- a/meta/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-don-t-use-Debianisms-in-run-p.patch
+++ b/meta/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-don-t-use-Debianisms-in-run-p.patch
@@ -13,21 +13,18 @@ Signed-off-by: Ross Burton <ross.burton@intel.com>
13 sbin/update-ca-certificates | 4 +--- 13 sbin/update-ca-certificates | 4 +---
14 1 file changed, 1 insertion(+), 3 deletions(-) 14 1 file changed, 1 insertion(+), 3 deletions(-)
15 15
16diff --git a/sbin/update-ca-certificates b/sbin/update-ca-certificates 16Index: git/sbin/update-ca-certificates
17index fed9c25..29ecc69 100755 17===================================================================
18--- a/sbin/update-ca-certificates 18--- git.orig/sbin/update-ca-certificates
19+++ b/sbin/update-ca-certificates 19+++ git/sbin/update-ca-certificates
20@@ -186,9 +186,7 @@ echo "$ADDED_CNT added, $REMOVED_CNT removed; done." 20@@ -191,9 +191,7 @@ if [ -d "$HOOKSDIR" ]
21 then
21 22
22 HOOKSDIR=$SYSROOT/etc/ca-certificates/update.d 23 echo "Running hooks in $HOOKSDIR..."
23 echo -n "Running hooks in $HOOKSDIR...." 24- VERBOSE_ARG=
24-VERBOSE_ARG= 25- [ "$verbose" = 0 ] || VERBOSE_ARG="--verbose"
25-[ "$verbose" = 0 ] || VERBOSE_ARG=--verbose 26- eval run-parts "$VERBOSE_ARG" --test -- "$HOOKSDIR" | while read hook
26-eval run-parts $VERBOSE_ARG --test -- $HOOKSDIR | while read hook 27+ eval run-parts --test -- "$HOOKSDIR" | while read hook
27+eval run-parts --test $HOOKSDIR | while read hook 28 do
28 do 29 ( cat "$ADDED"
29 ( cat $ADDED 30 cat "$REMOVED" ) | "$hook" || echo "E: $hook exited with code $?."
30 cat $REMOVED ) | $hook || echo E: $hook exited with code $?.
31--
322.1.4
33
diff --git a/meta/recipes-support/ca-certificates/ca-certificates/0002-update-ca-certificates-use-SYSROOT.patch b/meta/recipes-support/ca-certificates/ca-certificates/0002-update-ca-certificates-use-SYSROOT.patch
index f4c84fea44..792b4030b2 100644
--- a/meta/recipes-support/ca-certificates/ca-certificates/0002-update-ca-certificates-use-SYSROOT.patch
+++ b/meta/recipes-support/ca-certificates/ca-certificates/0002-update-ca-certificates-use-SYSROOT.patch
@@ -10,14 +10,14 @@ Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
10 sbin/update-ca-certificates | 14 +++++++------- 10 sbin/update-ca-certificates | 14 +++++++-------
11 1 file changed, 7 insertions(+), 7 deletions(-) 11 1 file changed, 7 insertions(+), 7 deletions(-)
12 12
13diff --git a/sbin/update-ca-certificates b/sbin/update-ca-certificates 13Index: git/sbin/update-ca-certificates
14index c567e3d..923b68a 100755 14===================================================================
15--- a/sbin/update-ca-certificates 15--- git.orig/sbin/update-ca-certificates
16+++ b/sbin/update-ca-certificates 16+++ git/sbin/update-ca-certificates
17@@ -37,11 +37,11 @@ do 17@@ -24,12 +24,12 @@
18 shift 18 verbose=0
19 done 19 fresh=0
20 20 default=0
21-CERTSCONF=/etc/ca-certificates.conf 21-CERTSCONF=/etc/ca-certificates.conf
22-CERTSDIR=/usr/share/ca-certificates 22-CERTSDIR=/usr/share/ca-certificates
23-LOCALCERTSDIR=/usr/local/share/ca-certificates 23-LOCALCERTSDIR=/usr/local/share/ca-certificates
@@ -26,11 +26,13 @@ index c567e3d..923b68a 100755
26+LOCALCERTSDIR=$SYSROOT/usr/local/share/ca-certificates 26+LOCALCERTSDIR=$SYSROOT/usr/local/share/ca-certificates
27 CERTBUNDLE=ca-certificates.crt 27 CERTBUNDLE=ca-certificates.crt
28-ETCCERTSDIR=/etc/ssl/certs 28-ETCCERTSDIR=/etc/ssl/certs
29-HOOKSDIR=/etc/ca-certificates/update.d
29+ETCCERTSDIR=$SYSROOT/etc/ssl/certs 30+ETCCERTSDIR=$SYSROOT/etc/ssl/certs
30 31+HOOKSDIR=$SYSROOT/etc/ca-certificates/update.d
31 cleanup() { 32
32 rm -f "$TEMPBUNDLE" 33 while [ $# -gt 0 ];
33@@ -64,9 +64,9 @@ add() { 34 do
35@@ -92,9 +92,9 @@ add() {
34 PEM="$ETCCERTSDIR/$(basename "$CERT" .crt | sed -e 's/ /_/g' \ 36 PEM="$ETCCERTSDIR/$(basename "$CERT" .crt | sed -e 's/ /_/g' \
35 -e 's/[()]/=/g' \ 37 -e 's/[()]/=/g' \
36 -e 's/,/_/g').pem" 38 -e 's/,/_/g').pem"
@@ -39,17 +41,6 @@ index c567e3d..923b68a 100755
39 then 41 then
40- ln -sf "$CERT" "$PEM" 42- ln -sf "$CERT" "$PEM"
41+ ln -sf "${CERT##$SYSROOT}" "$PEM" 43+ ln -sf "${CERT##$SYSROOT}" "$PEM"
42 echo +$PEM >> "$ADDED" 44 echo "+$PEM" >> "$ADDED"
43 fi 45 fi
44 cat "$CERT" >> "$TEMPBUNDLE" 46 # Add trailing newline to certificate, if it is missing (#635570)
45@@ -148,7 +148,7 @@ mv -f "$TEMPBUNDLE" "$CERTBUNDLE"
46
47 echo "$ADDED_CNT added, $REMOVED_CNT removed; done."
48
49-HOOKSDIR=/etc/ca-certificates/update.d
50+HOOKSDIR=$SYSROOT/etc/ca-certificates/update.d
51 echo -n "Running hooks in $HOOKSDIR...."
52 VERBOSE_ARG=
53 [ "$verbose" = 0 ] || VERBOSE_ARG=--verbose
54--
551.7.10.4
diff --git a/meta/recipes-support/ca-certificates/ca-certificates/default-sysroot.patch b/meta/recipes-support/ca-certificates/ca-certificates/default-sysroot.patch
index 6a5d6da676..f8b0791bea 100644
--- a/meta/recipes-support/ca-certificates/ca-certificates/default-sysroot.patch
+++ b/meta/recipes-support/ca-certificates/ca-certificates/default-sysroot.patch
@@ -8,11 +8,10 @@ Index: git/sbin/update-ca-certificates
8=================================================================== 8===================================================================
9--- git.orig/sbin/update-ca-certificates 9--- git.orig/sbin/update-ca-certificates
10+++ git/sbin/update-ca-certificates 10+++ git/sbin/update-ca-certificates
11@@ -37,6 +37,39 @@ do 11@@ -66,6 +66,39 @@ do
12 shift 12 shift
13 done 13 done
14 14
15+
16+if [ -z "$SYSROOT" ]; then 15+if [ -z "$SYSROOT" ]; then
17+ local_which () { 16+ local_which () {
18+ if [ $# -lt 1 ]; then 17+ if [ $# -lt 1 ]; then
@@ -45,6 +44,7 @@ Index: git/sbin/update-ca-certificates
45+ SYSROOT= 44+ SYSROOT=
46+ fi 45+ fi
47+fi 46+fi
48 CERTSCONF=$SYSROOT/etc/ca-certificates.conf 47+
49 CERTSDIR=$SYSROOT/usr/share/ca-certificates 48 if [ ! -s "$CERTSCONF" ]
50 LOCALCERTSDIR=$SYSROOT/usr/local/share/ca-certificates 49 then
50 fresh=1
diff --git a/meta/recipes-support/ca-certificates/ca-certificates_20141019.bb b/meta/recipes-support/ca-certificates/ca-certificates_20150426.bb
index cc58e4d60b..716e3dfca5 100644
--- a/meta/recipes-support/ca-certificates/ca-certificates_20141019.bb
+++ b/meta/recipes-support/ca-certificates/ca-certificates_20150426.bb
@@ -11,8 +11,8 @@ LIC_FILES_CHKSUM = "file://debian/copyright;md5=48d2baf97986999e776b43c8dd9e0c5a
11DEPENDS = "ca-certificates-native" 11DEPENDS = "ca-certificates-native"
12DEPENDS_class-native = "" 12DEPENDS_class-native = ""
13 13
14# tag: debian/20140325 + 2 14# tag: debian/20150426 + 2
15SRCREV = "2b8a047c78aadbecd90bf8e49ccf68898a211610" 15SRCREV = "d4790d2832aaac9152f450e06661511067592227"
16 16
17SRC_URI = "git://anonscm.debian.org/collab-maint/ca-certificates.git \ 17SRC_URI = "git://anonscm.debian.org/collab-maint/ca-certificates.git \
18 file://0001-update-ca-certificates-remove-c-rehash.patch \ 18 file://0001-update-ca-certificates-remove-c-rehash.patch \