commit 76d4bddfe4ad18902916ccbea2faab65659d913a parent 2be386cd27e1df6a69f37018a19ad7393f42d381 Author: Hiltjo Posthuma <hiltjo@codemadness.org> Date: Sat, 7 Jun 2014 15:57:15 +0200 fix cacertificates Signed-off-by: Hiltjo Posthuma <hiltjo@codemadness.org> Diffstat:
| M | cacertificates/cacertificates.mk | | | 11 | +++-------- |
| M | cacertificates/mkfile | | | 3 | +++ |
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/cacertificates/cacertificates.mk b/cacertificates/cacertificates.mk @@ -4,18 +4,13 @@ TARG = cacertificates <$mkbuild/mk.common-noinst cacertificates:QV: - # patch all the things. - patch -p1 -N --silent --dry-run < ../ca-certificates.patch && - patch -p1 -N < ../ca-certificates.patch + cp ../certdata2pem.c mozilla/ make -j$nprocs install:QV: - # patch all the things. - patch -p1 -N --silent --dry-run < ../ca-certificates.patch && - patch -p1 -N < ../ca-certificates.patch - make -j$nprocs DESTDIR="$ROOT" install + make -j$nprocs install DESTDIR="$ROOT" mkdir -p "$ROOT/etc/ssl/certs" - ( cd "$ROOT/share/ca-certificates/" + ( cd "$ROOT/share/ca-certificates/"; \ find . -name '*.crt' | sort | cut -b3- > "$ROOT/etc/ca-certificates.conf" ) cp sbin/update-ca-certificates . sed -e 's#=/etc/#=${DESTDIR}/etc/#' -i update-ca-certificates diff --git a/cacertificates/mkfile b/cacertificates/mkfile @@ -4,3 +4,6 @@ src = ca-certificates url = http://ftp.debian.org/debian/pool/main/c/ca-certificates/ca-certificates_$v.tar.xz mkfile = ../cacertificates.mk + +patches = \ + ../ca-certificates.patch