diff options
Diffstat (limited to 'meta/recipes-support/ca-certificates/ca-certificates/0002-update-ca-certificates-use-SYSROOT.patch')
-rw-r--r-- | meta/recipes-support/ca-certificates/ca-certificates/0002-update-ca-certificates-use-SYSROOT.patch | 41 |
1 files changed, 16 insertions, 25 deletions
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 | ||
13 | diff --git a/sbin/update-ca-certificates b/sbin/update-ca-certificates | 13 | Index: git/sbin/update-ca-certificates |
14 | index 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 | -- | ||
55 | 1.7.10.4 | ||