diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2016-08-05 07:15:18 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-08-05 07:16:45 +0000 |
| commit | d8206ed74a4e40a92216ab8e125ec13faa782232 (patch) | |
| tree | 827acad011a3b2f7fdd433783c72e76dab8b38b6 /main/ca-certificates | |
| parent | 5ddb7c952fe6e059a75a2abd20e9f7955ec76e79 (diff) | |
| download | aports-d8206ed74a4e40a92216ab8e125ec13faa782232.tar.bz2 aports-d8206ed74a4e40a92216ab8e125ec13faa782232.tar.xz | |
main/ca-certificates: fix fallback for sendfile(2)
fix return value and errno check
Diffstat (limited to 'main/ca-certificates')
| -rw-r--r-- | main/ca-certificates/APKBUILD | 8 | ||||
| -rw-r--r-- | main/ca-certificates/update-ca.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/main/ca-certificates/APKBUILD b/main/ca-certificates/APKBUILD index a839d5ce69..b2d8694840 100644 --- a/main/ca-certificates/APKBUILD +++ b/main/ca-certificates/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=ca-certificates pkgver=20160104 -pkgrel=4 +pkgrel=5 pkgdesc="Common CA certificates PEM files" url="http://packages.debian.org/sid/ca-certificates" arch="all" @@ -79,10 +79,10 @@ EOF md5sums="d9665a83d0d3ef8176a38e6aa20458e9 ca-certificates_20160104.tar.xz 0c3d9f5d795c7475b997e18498b7aec8 fix-manpage.patch -1fd207560aa262721892abac1b88e497 update-ca.c" +6b1767474cc5a1358de33774cb5a73ca update-ca.c" sha256sums="09eb770122e23260316120c0cbbddc8a1d33e7147210ce44e146084d5d5abcdd ca-certificates_20160104.tar.xz 60b36c4881bb367891df038a0736456c2d170496de8c339026671008b1caa09b fix-manpage.patch -39648ec37f7d282050a5ce2b942fa6d4eb6abd20723be773f61f95f518318343 update-ca.c" +5fa0d5c58fa20176bc97faec161fc532f956370ee6c650cbfb6039c4e6b12c24 update-ca.c" sha512sums="4291ba58057b66d56853162b71862832135eab6f444a5e2cf3dd1089495d44624246dc0c540871851fe9aaceb42054516309402525c8f16a88911d3af9c3518a ca-certificates_20160104.tar.xz 690d6bb434fb3ccce931d7ee6a167124f9c2d2e7e7a016d85f7b72a5f7f7c34db8c6133f3575e962a91981a32a88f8961776fe5fd907e57f59c03a32f2fcced3 fix-manpage.patch -4459e7596a8c2b815fcd2fbdd8eee9a2a626932a0295340554c7bbdfddf43c074a6eefab8dd6198d82e1d766a985623f4204a7488a157d8e62876a55749aaaca update-ca.c" +e5a74e35368c8334b51de182ab921c4b1e243df3c35bfe4bbd4e0c8d742d0ca34e274b68c1b9854ed38add680a29cb6027677fa337017ef7a0eca78922c3a22e update-ca.c" diff --git a/main/ca-certificates/update-ca.c b/main/ca-certificates/update-ca.c index 4451217e7a..034ce6feb1 100644 --- a/main/ca-certificates/update-ca.c +++ b/main/ca-certificates/update-ca.c @@ -144,7 +144,7 @@ copyfile(const char* source, int output) } result = sendfile(output, in_fd, &bytes, fileinfo.st_size); - if (result == EINVAL || result == ENOSYS) + if ((result == -1) && (errno == EINVAL || errno == ENOSYS)) result = buffered_copyfd(in_fd, output, fileinfo.st_size); close(in_fd); |