diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2018-09-24 15:22:27 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-09-25 08:02:08 +0000 |
| commit | c476e2578cbd871b35ab35f5f284f2f331a3211d (patch) | |
| tree | 19c07b1e288c00d62693e40bf30daacff16b6051 /main/ca-certificates | |
| parent | 57403156da5feefd6c4bbd27054179895d61392c (diff) | |
| download | aports-c476e2578cbd871b35ab35f5f284f2f331a3211d.tar.bz2 aports-c476e2578cbd871b35ab35f5f284f2f331a3211d.tar.xz | |
main/ca-certificates: upgrade to 20180924
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, 35 insertions, 4 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 new file mode 100644 index 0000000000..9f03d5053a --- /dev/null +++ b/main/ca-certificates/0001-update-ca-fix-build-with-newer-musl.patch @@ -0,0 +1,29 @@ +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 775f3e32ca..8e7a5d7db2 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=20171114 -pkgrel=4 +pkgver=20180924 +pkgrel=0 pkgdesc="Common CA certificates PEM files" url="https://www.mozilla.org/en-US/about/governance/policies/security-group/certs/" arch="all" @@ -16,7 +16,8 @@ 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" +source="https://git.alpinelinux.org/cgit/ca-certificates/snapshot/ca-certificates-$pkgver.tar.bz2 + 0001-update-ca-fix-build-with-newer-musl.patch" builddir="$srcdir/ca-certificates-$pkgver" build() { @@ -50,4 +51,5 @@ package() { chmod +x "$pkgdir"/etc/ca-certificates/update.d/certhash } -sha512sums="bbb05049fb01be101ec9959504b90add1a034e8b0485901828b535e56cef6cbb50d4aa4649fc4c46b9869a21d3f77f6aa210e947a29c4ba36fc1d552125a248e ca-certificates-20171114.tar.bz2" +sha512sums="dbcd786a1c8d17132cceac8100ceac3902cd2360ba6773d0a65739da39a932f50e59d830b1060776ba89b778f451ab12bd879971e370a30b21e367951935ed3a ca-certificates-20180924.tar.bz2 +e0b7c0dafb5e9e5ff58c7db7a0c5805617197a549d7af1c117406eeda063aee7806000d686e15536c69e026d00fd3ca68dfc37a7dad839b90e754858ff6096dd 0001-update-ca-fix-build-with-newer-musl.patch" |