From ba4f0f250014e49b536303ca5d061de923d98068 Mon Sep 17 00:00:00 2001 From: Ella-0 <23418164+Ella-0@users.noreply.github.com> Date: Wed, 3 Feb 2021 13:41:01 +0000 Subject: [PATCH] Fixed ca-certificates package --- pkgs/ca-certificates/build.sh | 37 +++++++++++-------- .../libressl-update-rehash.patch | 14 +++++++ 2 files changed, 36 insertions(+), 15 deletions(-) create mode 100644 pkgs/ca-certificates/libressl-update-rehash.patch diff --git a/pkgs/ca-certificates/build.sh b/pkgs/ca-certificates/build.sh index 31c9805..bd4d799 100644 --- a/pkgs/ca-certificates/build.sh +++ b/pkgs/ca-certificates/build.sh @@ -5,22 +5,26 @@ pkgrel=2 fetch(){ curl http://ftp.debian.org/debian/pool/main/c/ca-certificates/ca-certificates_20200601~deb10u2.tar.xz -o $pkgname-$pkgver.tar.gz tar -xf $pkgname-$pkgver.tar.gz + mv work $pkgname-$pkgver + cd $pkgname-$pkgver + patch -p1 < ../../libressl-update-rehash.patch } build() { - cd work - make + cd $pkgname-$pkgver + gmake } package() { - mkdir build - mkdir -p build/usr/bin - mkdir -p build/usr/sbin - mkdir -p build/etc/ssl/ - mkdir -p build/usr/share/ca-certificates + cd $pkgname-$pkgver + mkdir -p $pkgdir/usr/bin + mkdir -p $pkgdir/usr/sbin + mkdir -p $pkgdir/etc/ssl/ + mkdir -p $pkgdir/etc/ca-certificates/update.d + mkdir -p $pkgdir/usr/share/ca-certificates/ - make install DESTDIR="$pkgdir/build" + gmake install DESTDIR="$pkgdir" ( echo "# Automatically generated by ${pkgname}-${pkgver}-${pkgrel}" @@ -28,15 +32,18 @@ package() { echo "# Do not edit." cd "$pkgdir"/usr/share/ca-certificates find . -name '*.crt' | sort | cut -b3- - ) > "$pkgdir/build"/etc/ca-certificates.conf + ) > "$pkgdir"/etc/ca-certificates.conf - cat > "$pkgdir/build"/etc/ca-certificates/update.d/certhash <<-EOF + cat > "$pkgdir"/etc/ca-certificates/update.d/certhash <<-EOF #!/bin/sh - exec /usr/bin/c_rehash /etc/ssl/certs + exec openssl certhash /etc/ssl/certs EOF - cat "$pkgdir/build"/usr/share/ca-certificates/mozilla/*.crt > $pkgdir/build/etc/ssl/cert.pem - chmod +x "$pkgdir/build"/etc/ca-certificates/update.d/certhash - mv -v ${pkgdir}/build/usr/sbin/* ${pkgdir}/build/usr/bin/ - rm -rf ${pkgdir}/build/usr/sbin + cat "$pkgdir"/usr/share/ca-certificates/mozilla/*.crt > $pkgdir/etc/ssl/cert.pem + chmod +x "$pkgdir"/etc/ca-certificates/update.d/certhash +} + +license() { + cd $pkgname-$pkgver + cat debian/copyright } diff --git a/pkgs/ca-certificates/libressl-update-rehash.patch b/pkgs/ca-certificates/libressl-update-rehash.patch new file mode 100644 index 0000000..566deb6 --- /dev/null +++ b/pkgs/ca-certificates/libressl-update-rehash.patch @@ -0,0 +1,14 @@ +--- a/sbin/update-ca-certificates ++++ b/sbin/update-ca-certificates +@@ -183,9 +183,9 @@ + done + if [ "$verbose" = 0 ] + then +- openssl rehash . > /dev/null ++ openssl certhash . > /dev/null + else +- openssl rehash -v . ++ openssl certhash -v . + fi + fi +