diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2019-01-29 16:25:59 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-01-29 16:26:25 +0000 |
| commit | e52ca18af87015baba0756530ff0fd6b7b6ea081 (patch) | |
| tree | b91cfddd462b0d2f68ea8544964bdd075f91c876 /main/ca-certificates | |
| parent | 44b9028139227a4964e7a3457c82a5ce1cc8e68e (diff) | |
| download | aports-e52ca18af87015baba0756530ff0fd6b7b6ea081.tar.bz2 aports-e52ca18af87015baba0756530ff0fd6b7b6ea081.tar.xz | |
main/ca-certificates: upgrade to 20190108
fixes #9935
Diffstat (limited to 'main/ca-certificates')
| -rw-r--r-- | main/ca-certificates/0001-update-ca-fix-build-with-newer-musl.patch | 29 | ||||
| -rw-r--r-- | main/ca-certificates/APKBUILD | 10 |
2 files changed, 4 insertions, 35 deletions
diff --git a/main/ca-certificates/0001-update-ca-fix-build-with-newer-musl.patch b/main/ca-certificates/0001-update-ca-fix-build-with-newer-musl.patch deleted file mode 100644 index 9f03d5053a..0000000000 --- a/main/ca-certificates/0001-update-ca-fix-build-with-newer-musl.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 33042b0af9d4139959a1b9a7179dd3843ea00f0d Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Mon, 24 Sep 2018 17:18:26 +0200 -Subject: [PATCH] update-ca: fix build with newer musl - -musl removed SYMLINK_MAX define[1]. Use PATH_MAX instead for symlink -target. - -[1]: http://git.musl-libc.org/cgit/musl/commit/?id=767f7a1091af3a3dcee2f7a49d0713359a81961c ---- - update-ca.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/update-ca.c b/update-ca.c -index 641fd64..7bb4f1b 100644 ---- a/update-ca.c -+++ b/update-ca.c -@@ -196,7 +196,7 @@ static void proc_localglobaldir(const char *fullpath, struct hash *h, int tmpfil - - static void proc_etccertsdir(const char* fullpath, struct hash* h, int tmpfile_fd) - { -- char linktarget[SYMLINK_MAX]; -+ char linktarget[PATH_MAX]; - ssize_t linklen; - - linklen = readlink(fullpath, linktarget, sizeof(linktarget)-1); --- -2.19.0 - diff --git a/main/ca-certificates/APKBUILD b/main/ca-certificates/APKBUILD index 1294a075cc..a8a1b5456e 100644 --- a/main/ca-certificates/APKBUILD +++ b/main/ca-certificates/APKBUILD @@ -2,8 +2,8 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=ca-certificates -pkgver=20180924 -pkgrel=3 +pkgver=20190108 +pkgrel=0 pkgdesc="Common CA certificates PEM files" url="https://www.mozilla.org/en-US/about/governance/policies/security-group/certs/" arch="all" @@ -16,8 +16,7 @@ replaces="libcrypto1.0 openssl openssl1.0" options="!fhs !check" triggers="ca-certificates.trigger=/usr/share/ca-certificates:/usr/local/share/ca-certificates:/etc/ssl/certs:/etc/ca-certificates/update.d" install="$pkgname.post-deinstall" -source="https://git.alpinelinux.org/cgit/ca-certificates/snapshot/ca-certificates-$pkgver.tar.bz2 - 0001-update-ca-fix-build-with-newer-musl.patch" +source="https://git.alpinelinux.org/ca-certificates/snapshot/ca-certificates-$pkgver.tar.xz" builddir="$srcdir/ca-certificates-$pkgver" build() { @@ -59,5 +58,4 @@ cacert() { "$subpkgdir"/etc/ssl/cert.pem } -sha512sums="dbcd786a1c8d17132cceac8100ceac3902cd2360ba6773d0a65739da39a932f50e59d830b1060776ba89b778f451ab12bd879971e370a30b21e367951935ed3a ca-certificates-20180924.tar.bz2 -e0b7c0dafb5e9e5ff58c7db7a0c5805617197a549d7af1c117406eeda063aee7806000d686e15536c69e026d00fd3ca68dfc37a7dad839b90e754858ff6096dd 0001-update-ca-fix-build-with-newer-musl.patch" +sha512sums="7b022c3b3319ac4ebbf13f551626f3d60a5552014d564166165030ee799c2fd470c593fb7171732100089b17ad3d309abc73f2429967222676915cad46f95a8e ca-certificates-20190108.tar.xz" |