diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2015-10-16 16:43:10 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2015-10-16 16:43:10 +0300 |
| commit | 41dd189f59da7ad463ccb31a402e1b7ac95a18bb (patch) | |
| tree | d32a834b552eafce366070aa069ebdd2b4eda1e8 /main | |
| parent | 9293ea17c3e01f06b92a2cb1e43f46c1c9a5e269 (diff) | |
| download | aports-41dd189f59da7ad463ccb31a402e1b7ac95a18bb.tar.bz2 aports-41dd189f59da7ad463ccb31a402e1b7ac95a18bb.tar.xz | |
main/ca-certificates: fix update-ca.c
- fix permissions for the .crt bundle
- fix exec of c_rehash
Diffstat (limited to 'main')
| -rw-r--r-- | main/ca-certificates/APKBUILD | 8 | ||||
| -rw-r--r-- | main/ca-certificates/update-ca.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/main/ca-certificates/APKBUILD b/main/ca-certificates/APKBUILD index af08b7ca9..6b5ee01c0 100644 --- a/main/ca-certificates/APKBUILD +++ b/main/ca-certificates/APKBUILD @@ -7,7 +7,7 @@ _nmu="+nmu${pkgver#*_p}" [ "$_nmu" = "+nmu${pkgver}" ] && _nmu="" _ver=${pkgver} -pkgrel=1 +pkgrel=2 pkgdesc="Common CA certificates PEM files" url="http://packages.debian.org/sid/ca-certificates" arch="all" @@ -65,8 +65,8 @@ EOF } md5sums="717455f13fb31fd014a11a468ea3895d ca-certificates_20150426.tar.xz -10414777ecc6ee6c542e6389179eaa00 update-ca.c" +0fb7db0c3c2fb694ad80b71a3093f57d update-ca.c" sha256sums="37dbaa93ed64cc4ae93ac295f9248fbc741bd51376438cfb1257f17efab5494f ca-certificates_20150426.tar.xz -ad8fda22d18ad57a1b8c7e8fb204fc74966c7908bda00e3465ad9cd306ec4df1 update-ca.c" +2bf5b1455e95026cf0a946526b398fc4512e7a9f1daeb7b949c8c0ce12d54761 update-ca.c" sha512sums="920dfc512c018c5338bf07b6a6afcb664d9bfba659d4233ca9e87471d5e0ed05de054c96f3d7e6091549aa6deb46106a79f7f982696081f9b2164e18133eb34d ca-certificates_20150426.tar.xz -32f823236d665fd0bfd9f2afb387527036275047b7003fb82c9fa654e40616e967ed3a1eb2c850844c88efb835c1454112b5b1d10d2c3bc82c85c96563223790 update-ca.c" +8c9cfad84039f089f990862cf1b7624a73ec0f600707834e0c05a6d1910a4779ecd7c685884d25fc8597563539ea8860235784f1d6878be0e2393ba02b2e04ed update-ca.c" diff --git a/main/ca-certificates/update-ca.c b/main/ca-certificates/update-ca.c index 4a2f8fc0b..c58d16c83 100644 --- a/main/ca-certificates/update-ca.c +++ b/main/ca-certificates/update-ca.c @@ -283,6 +283,7 @@ int main(int a, char **v) printf("Failed to open temporary file %s for ca bundle\n", tmpfile); exit(0); } + fchmod(fd, 0644); /* Handle global CA certs from config file */ file_readline(CERTSCONF, calinks, fd); @@ -324,11 +325,10 @@ int main(int a, char **v) int nullfd = open("/dev/null", O_WRONLY); if (nullfd == -1) return 0; - if (dup2(nullfd, STDOUT_FILENO) == -1) return 0; - char* c_rehash_args[] = { "/usr/bin/c_rehash", ETCCERTSDIR, ">", "/dev/null", 0 }; + char* c_rehash_args[] = { "/usr/bin/c_rehash", ETCCERTSDIR, 0 }; execve(c_rehash_args[0], c_rehash_args, NULL); return 0; |