diff --git a/Makefile b/Makefile index efa409c..5280fb2 100644 --- a/Makefile +++ b/Makefile @@ -17,8 +17,7 @@ certdata2pem_host: certdata2pem.c # touch $@ install: all - install -d -m755 ${DESTDIR}/etc/ca-certificates/update.d \ - ${DESTDIR}/usr/bin \ + install -d -m755 ${DESTDIR}/usr/bin \ ${DESTDIR}/usr/sbin \ ${DESTDIR}/usr/share/ca-certificates \ ${DESTDIR}/usr/local/share/ca-certificates \ @@ -32,7 +31,6 @@ install: all install -m755 update-ca-certificates ${DESTDIR}/usr/sbin install -m755 c_rehash ${DESTDIR}/usr/bin install -m755 certdata2pem ${DESTDIR}/usr/bin - install -m755 certhash ${DESTDIR}/etc/ca-certificates/update.d clean: rm -rf update-ca-certificates c_rehash certdata2pem certdata2pem_host certdata.stamp *.crt diff --git a/certhash b/certhash deleted file mode 100644 index 8943cd5..0000000 --- a/certhash +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec /usr/bin/c_rehash /etc/ssl/certs diff --git a/update-ca.c b/update-ca.c index f90c782..f6e8d6a 100644 --- a/update-ca.c +++ b/update-ca.c @@ -25,7 +25,6 @@ #define CERTSDIR "/usr/share/ca-certificates/" #define LOCALCERTSDIR "/usr/local/share/ca-certificates/" #define ETCCERTSDIR "/etc/ssl/certs/" -#define RUNPARTSDIR "/etc/ca-certificates/update.d/" #define CERTBUNDLE "ca-certificates.crt" #define CERTSCONF "/etc/ca-certificates.conf" @@ -344,11 +343,11 @@ int main(void) free(tmpfile); - /* Execute run-parts */ - static char *const run_parts_args[] = { "run-parts", RUNPARTSDIR, 0 }; - execv("/usr/bin/run-parts", run_parts_args); - execv("/bin/run-parts", run_parts_args); - perror("run-parts"); + /* Execute c_rehash */ + static char *const exec_args[] = {"c_rehash", ETCCERTSDIR, 0}; + execv("/usr/bin/c_rehash", exec_args); + execv("/bin/c_rehash", exec_args); + perror("c_rehash"); return 1; }