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> sbin/update-ca-certificates | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) -diff --git a/sbin/update-ca-certificates b/sbin/update-ca-certificates -index c567e3d..923b68a 100755 ---- a/sbin/update-ca-certificates -+++ b/sbin/update-ca-certificates -@@ -37,11 +37,11 @@ do - shift - done - +Index: git/sbin/update-ca-certificates +=================================================================== +--- git.orig/sbin/update-ca-certificates ++++ git/sbin/update-ca-certificates +@@ -24,12 +24,12 @@ + verbose=0 + fresh=0 + default=0 -CERTSCONF=/etc/ca-certificates.conf -CERTSDIR=/usr/share/ca-certificates -LOCALCERTSDIR=/usr/local/share/ca-certificates @@ -26,11 +26,13 @@ index c567e3d..923b68a 100755 +LOCALCERTSDIR=$SYSROOT/usr/local/share/ca-certificates CERTBUNDLE=ca-certificates.crt -ETCCERTSDIR=/etc/ssl/certs +-HOOKSDIR=/etc/ca-certificates/update.d +ETCCERTSDIR=$SYSROOT/etc/ssl/certs - - cleanup() { - rm -f "$TEMPBUNDLE" -@@ -64,9 +64,9 @@ add() { ++HOOKSDIR=$SYSROOT/etc/ca-certificates/update.d + + while [ $# -gt 0 ]; + do +@@ -92,9 +92,9 @@ add() { PEM="$ETCCERTSDIR/$(basename "$CERT" .crt | sed -e 's/ /_/g' \ -e 's/[()]/=/g' \ -e 's/,/_/g').pem" @@ -39,17 +41,6 @@ index c567e3d..923b68a 100755 then - ln -sf "$CERT" "$PEM" + ln -sf "${CERT##$SYSROOT}" "$PEM" - echo +$PEM >> "$ADDED" + echo "+$PEM" >> "$ADDED" fi - cat "$CERT" >> "$TEMPBUNDLE" -@@ -148,7 +148,7 @@ mv -f "$TEMPBUNDLE" "$CERTBUNDLE" - - echo "$ADDED_CNT added, $REMOVED_CNT removed; done." - --HOOKSDIR=/etc/ca-certificates/update.d -+HOOKSDIR=$SYSROOT/etc/ca-certificates/update.d - echo -n "Running hooks in $HOOKSDIR...." - VERBOSE_ARG= - [ "$verbose" = 0 ] || VERBOSE_ARG=--verbose --- -1.7.10.4 + # Add trailing newline to certificate, if it is missing (#635570) |