commit ff753e123cb6dd70cc0ca21f1fc8a4d412ac8add Merge: 815fc35 7976210 Author: Jacob Appelbaum jacob@appelbaum.net Date: Thu Oct 31 11:45:39 2013 +0100

Merge branch 'master' into debian-master

.gitignore | 1 + CHANGELOG | 5 + Makefile.am | 2 +- README | 8 + apparmor-profile | 5 + configure.ac | 17 ++ etc/tlsdated.conf | 3 +- man/tlsdate-helper.1 | 2 +- man/tlsdate.1 | 11 +- man/tlsdated.conf.5 | 6 +- run-tests | 40 +++++ src/event-unittest.c | 48 +++++ src/event.c | 295 +++++++++++++++++++++++++++++++ src/event.h | 21 +++ src/include.am | 10 +- src/tlsdate-helper.c | 221 +++++++++++++++++++++-- src/tlsdate-helper.h | 15 +- src/tlsdate.c | 18 +- src/tlsdate.h | 11 +- src/tlsdated-unittest.c | 94 +++++++++- src/tlsdated.c | 377 ++++++++++++++++++++-------------------- src/util.c | 228 ++++++++++++++++++++++++ src/util.h | 23 +++ test.conf | 2 + tests/README | 1 + tests/common.sh | 32 ++++ tests/run-idle/output | 1 + tests/run-idle/runs | 1 + tests/run-idle/setup | 4 + tests/run-idle/subproc.sh | 6 + tests/run-idle/teardown | 4 + tests/run-idle/test.conf | 2 + tests/run-once/output | 1 + tests/run-once/run-error | 1 + tests/run-once/subproc.sh | 5 + tests/run-routeup/input | 1 + tests/run-routeup/output | 1 + tests/run-routeup/runs | 1 + tests/run-routeup/setup | 4 + tests/run-routeup/subproc.sh | 6 + tests/run-routeup/teardown | 4 + tests/subproc-retry/input | 1 + tests/subproc-retry/output | 3 + tests/subproc-retry/runs | 1 + tests/subproc-retry/setup | 4 + tests/subproc-retry/subproc.sh | 10 ++ tests/subproc-retry/teardown | 4 + tests/wait-idle/subproc.sh | 7 + tlsdate.service | 6 + 49 files changed, 1339 insertions(+), 235 deletions(-)