diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2015-09-26 12:23:19 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-09-26 13:45:28 -0400 |
| commit | 26c99295c5d5ed67f6be2a04445d36be70f18ce3 (patch) | |
| tree | 09abde13185cc1c0900c8308e5050aa1e31d57c5 /app-misc/ca-certificates/files | |
| parent | app-misc/ca-certificates: delete old (diff) | |
| download | gentoo-26c99295c5d5ed67f6be2a04445d36be70f18ce3.tar.gz gentoo-26c99295c5d5ed67f6be2a04445d36be70f18ce3.tar.bz2 gentoo-26c99295c5d5ed67f6be2a04445d36be70f18ce3.zip | |
app-misc/ca-certificates: version bump to 20150426.3.20
Diffstat (limited to 'app-misc/ca-certificates/files')
| -rw-r--r-- | app-misc/ca-certificates/files/ca-certificates-20150426-root.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/app-misc/ca-certificates/files/ca-certificates-20150426-root.patch b/app-misc/ca-certificates/files/ca-certificates-20150426-root.patch new file mode 100644 index 000000000000..6e41ac39e874 --- /dev/null +++ b/app-misc/ca-certificates/files/ca-certificates-20150426-root.patch @@ -0,0 +1,49 @@ +add a --root option so we can generate with DESTDIR installs + +--- a/image/usr/sbin/update-ca-certificates ++++ b/image/usr/sbin/update-ca-certificates +@@ -30,6 +30,8 @@ LOCALCERTSDIR=/usr/local/share/ca-certificates + CERTBUNDLE=ca-certificates.crt + ETCCERTSDIR=/etc/ssl/certs + HOOKSDIR=/etc/ca-certificates/update.d ++ROOT="" ++RELPATH="" + + while [ $# -gt 0 ]; + do +@@ -59,13 +61,25 @@ do + --hooksdir) + shift + HOOKSDIR="$1";; ++ --root|-r) ++ shift ++ # Needed as c_rehash wants to read the files directly. ++ # This gets us from $CERTSCONF to $CERTSDIR. ++ RELPATH="../../.." ++ ROOT=$(readlink -f "$1");; + --help|-h|*) +- echo "$0: [--verbose] [--fresh]" ++ echo "$0: [--verbose] [--fresh] [--root <dir>]" + exit;; + esac + shift + done + ++CERTSCONF="$ROOT$CERTSCONF" ++CERTSDIR="$ROOT$CERTSDIR" ++LOCALCERTSDIR="$ROOT$LOCALCERTSDIR" ++ETCCERTSDIR="$ROOT$ETCCERTSDIR" ++HOOKSDIR="$ROOT$HOOKSDIR" ++ + if [ ! -s "$CERTSCONF" ] + then + fresh=1 +@@ -94,7 +107,7 @@ add() { + -e 's/,/_/g').pem" + if ! test -e "$PEM" || [ "$(readlink "$PEM")" != "$CERT" ] + then +- ln -sf "$CERT" "$PEM" ++ ln -sf "${RELPATH}${CERT#$ROOT}" "$PEM" + echo "+$PEM" >> "$ADDED" + fi + # Add trailing newline to certificate, if it is missing (#635570) |