diff options
author | Will Drewry <wad@chromium.org> | 2014-09-16 10:20:23 -0500 |
---|---|---|
committer | Will Drewry <wad@chromium.org> | 2014-09-16 12:55:42 -0500 |
commit | 2d9fd234e2887fdb29c6c09f66ade0a8b32c3ba7 (patch) | |
tree | 7e66bbb3102e3ffd8e8e2fc86bd4e34bfed2b738 /man | |
parent | 7391dd2c62d3f53a175d31c13b9e6b4423d4c9d2 (diff) | |
parent | 3db1d4182ee5a1dc191453d0e019ef773bfaf28b (diff) | |
download | tlsdate-2d9fd234e2887fdb29c6c09f66ade0a8b32c3ba7.tar.gz |
Merge branch 'master' of https://chromium.googlesource.com/chromiumos/third_party/tlsdate into upstream
This is the initial merge of the Chromium OS fork of tlsdated.
It adds a dependency in libevent2 and removes the custom event
solution and adds a platform-specific hook for integrating with
platform signals (like network readiness).
Signed-off-by: <redpig@dataspill.org>
Conflicts:
Makefile.am
configure.ac
man/tlsdate-dbus-announce.1
man/tlsdated.8
src/Makefile.am
src/compat/clock-linux.c
src/compat/clock.h
src/conf-unittest.c
src/conf.c
src/include.am
src/proxy-bio.c
src/test/proxy-override.c
src/tlsdate-dbus-announce.c
src/tlsdate-helper.c
src/tlsdate.c
src/tlsdate.h
src/tlsdated-unittest.c
src/tlsdated.c
src/util.c
src/util.h
Diffstat (limited to 'man')
-rw-r--r-- | man/tlsdate-dbus-announce.1 | 24 | ||||
-rw-r--r-- | man/tlsdated.8 | 1 |
2 files changed, 0 insertions, 25 deletions
diff --git a/man/tlsdate-dbus-announce.1 b/man/tlsdate-dbus-announce.1 deleted file mode 100644 index a103fc1..0000000 --- a/man/tlsdate-dbus-announce.1 +++ /dev/null @@ -1,24 +0,0 @@ -.\" Process this file with -.\" groff -man -Tascii foo.1 -.\" -.TH TLSDATE-DBUS-ANNOUNCE 1 "JANUARY 2013" Linux "User Manuals" -.SH NAME -tlsdate-dbus-announce \- secure parasitic rdate replacement dbus announcer -.SH SYNOPSIS -.B tlsdate-dbus-announce -.SH DESCRIPTION -.B tlsdate-dbus-announce -is a tool for use with tlsdated. It is automatically launched by tlsdated to -announce that the system time has changed. -.SH BUGS -It's likely! Let us know by contacting jacob@appelbaum.net - -Note that -.B tlsdate(1) -is still in Alpha, and may not work as expected. -.SH AUTHOR -Jacob Appelbaum <jacob at appelbaum dot net> -.SH "SEE ALSO" -.B tlsdated(8), -.B tlsdate-helper(1) -.B tlsdate-routeup(1) diff --git a/man/tlsdated.8 b/man/tlsdated.8 index d4b1381..c32ff49 100644 --- a/man/tlsdated.8 +++ b/man/tlsdated.8 @@ -67,4 +67,3 @@ Jacob Appelbaum <jacob at appelbaum dot net> .B tlsdate(1), .B tlsdate-helper(1) .B tlsdate-routeup(1) -.B tlsdate-dbus-announce(1) |