Update security/certificate-transparency to 20160102.

Sponsored by:	The FreeBSD Foundation

28 files changed, 157 insertions, 74 deletions

diff --git a/security/certificate-transparency/files/patch-Makefile.am b/security/certificate-transparency/files/patch-Makefile.am
index 2ed94722fb77..01a95272bdfa 100644
--- a/security/certificate-transparency/files/patch-Makefile.am
+++ b/security/certificate-transparency/files/patch-Makefile.am
@@ -1,6 +1,14 @@
---- Makefile.am.orig	2015-10-24 17:22:55.332874000 +0200
-+++ Makefile.am	2015-10-24 17:22:58.002519000 +0200
-@@ -9,8 +9,6 @@ AM_CXXFLAGS = \
+--- Makefile.am.orig	2016-02-02 11:35:23 UTC
++++ Makefile.am
+@@ -3,7 +3,6 @@ ACLOCAL_AMFLAGS = -Im4
+ AM_CPPFLAGS = \
+ 	-I$(GMOCK_DIR)/include \
+ 	-I$(GTEST_DIR)/include \
+-	-Ithird_party/objecthash \
+ 	$(evhtp_CFLAGS) \
+ 	$(icu_CFLAGS) \
+ 	$(json_c_CFLAGS)
+@@ -12,8 +11,6 @@ AM_CXXFLAGS = \
  	-fno-exceptions
  
  BUILT_SOURCES = \
@@ -9,7 +17,7 @@
  	cpp/monitoring/prometheus/metrics.pb.cc \
  	cpp/monitoring/prometheus/metrics.pb.h \
  	proto/ct.pb.cc \
-@@ -115,9 +113,6 @@ endif
+@@ -124,9 +121,6 @@ endif
  cpp/gtest-all.cc: $(GTEST_DIR)/src/gtest-all.cc
  	$(AM_V_at)cp $^ $@
  
@@ -19,7 +27,7 @@
  test/testdata/urlfetcher_test_certs/localhost-key.pem: test/create_url_fetcher_test_certs.sh
  	$(AM_V_GEN)test/create_url_fetcher_test_certs.sh
  
-@@ -186,8 +181,6 @@ cpp_libtest_a_CPPFLAGS = \
+@@ -215,8 +209,6 @@ cpp_libtest_a_CPPFLAGS = \
  	-I$(GTEST_DIR) \
  	$(AM_CPPFLAGS)
  cpp_libtest_a_SOURCES = \
@@ -28,3 +36,13 @@
  	cpp/util/testing.cc
  
  cpp_server_ct_mirror_LDADD = \
+@@ -297,8 +289,7 @@ cpp_server_xjson_server_SOURCES = \
+ 	cpp/server/server_helper.cc \
+ 	cpp/server/xjson-server.cc \
+ 	cpp/server/x_json_handler.cc \
+-	cpp/util/json_wrapper.cc \
+-	third_party/objecthash/objecthash.cc
++	cpp/util/json_wrapper.cc
+ 
+ cpp_tools_ct_clustertool_LDADD = \
+ 	cpp/libcore.a \
diff --git a/security/certificate-transparency/files/patch-configure.ac b/security/certificate-transparency/files/patch-configure.ac
index 45c7155df5d1..3e37c44b11b8 100644
--- a/security/certificate-transparency/files/patch-configure.ac
+++ b/security/certificate-transparency/files/patch-configure.ac
@@ -1,5 +1,5 @@
---- configure.ac.orig	2015-10-23 16:31:08.000000000 +0200
-+++ configure.ac	2015-11-23 19:43:54.895959000 +0100
+--- configure.ac.orig	2016-02-02 11:35:23 UTC
++++ configure.ac
 @@ -83,9 +83,7 @@ AC_CHECK_HEADER([gtest/gtest.h],, [missi
  AS_VAR_APPEND([CPPFLAGS], [" -I$GMOCK_DIR/include"])
  AC_CHECK_HEADER([gmock/gmock.h],, [missing_gmock=1])
diff --git a/security/certificate-transparency/files/patch-cpp-client-ct.cc b/security/certificate-transparency/files/patch-cpp-client-ct.cc
index 6621e0ecb9a9..8bf5e2344052 100644
--- a/security/certificate-transparency/files/patch-cpp-client-ct.cc
+++ b/security/certificate-transparency/files/patch-cpp-client-ct.cc
@@ -1,6 +1,6 @@
---- cpp/client/ct.cc.orig	2015-10-24 17:45:59.877372000 +0200
-+++ cpp/client/ct.cc	2015-10-24 17:47:35.728512000 +0200
-@@ -458,8 +458,8 @@ static void MakeCert() {
+--- cpp/client/ct.cc.orig	2016-02-02 11:35:23 UTC
++++ cpp/client/ct.cc
+@@ -461,8 +461,8 @@ static void MakeCert() {
  // (This means the relevant section should be last in the configuration.)
  // 1.2.3.1=DER:[raw encoding of proof]
  static void WriteProofToConfig() {
@@ -11,7 +11,7 @@
  
    string sct;
  
-@@ -486,8 +486,8 @@ static const char kPEMLabel[] = "SERVERI
+@@ -489,8 +489,8 @@ static const char kPEMLabel[] = "SERVERI
  // Wrap the proof in the format expected by the TLS extension,
  // so that we can feed it to OpenSSL.
  static void ProofToExtensionData() {
@@ -22,7 +22,7 @@
  
    string serialized_sct;
    PCHECK(util::ReadBinaryFile(FLAGS_sct_token, &serialized_sct))
-@@ -986,12 +986,12 @@ int Monitor() {
+@@ -990,12 +990,12 @@ int Monitor() {
  // Exit code upon abnormal exit (CHECK failures): != 0
  // (on UNIX, 134 is expected)
  int main(int argc, char** argv) {
@@ -37,7 +37,7 @@
      return 1;
    }
  
-@@ -1031,7 +1031,7 @@ int main(int argc, char** argv) {
+@@ -1035,7 +1035,7 @@ int main(int argc, char** argv) {
    } else if (cmd == "sth") {
      ret = GetSTH();
    } else {
diff --git a/security/certificate-transparency/files/patch-cpp-fetcher-remote_peer_test.cc b/security/certificate-transparency/files/patch-cpp-fetcher-remote_peer_test.cc
index 9280c3fc5817..d20d0b3631a7 100644
--- a/security/certificate-transparency/files/patch-cpp-fetcher-remote_peer_test.cc
+++ b/security/certificate-transparency/files/patch-cpp-fetcher-remote_peer_test.cc
@@ -1,5 +1,5 @@
---- cpp/fetcher/remote_peer_test.cc.orig	2015-11-20 15:20:24.460754000 +0100
-+++ cpp/fetcher/remote_peer_test.cc	2015-11-20 15:22:18.618590000 +0100
+--- cpp/fetcher/remote_peer_test.cc.orig	2016-02-02 11:35:23 UTC
++++ cpp/fetcher/remote_peer_test.cc
 @@ -1,5 +1,8 @@
  #include <gflags/gflags.h>
  #include <glog/logging.h>
@@ -8,4 +8,4 @@
 +#define GTEST_HAS_POSIX_RE 0
  #include <gmock/gmock.h>
  #include <gtest/gtest.h>
- #include "log/etcd_consistent_store.h"
+ #include <openssl/err.h>
diff --git a/security/certificate-transparency/files/patch-cpp-log-cluster_state_controller_test.cc b/security/certificate-transparency/files/patch-cpp-log-cluster_state_controller_test.cc
index ad17dadd00da..c49980c8a639 100644
--- a/security/certificate-transparency/files/patch-cpp-log-cluster_state_controller_test.cc
+++ b/security/certificate-transparency/files/patch-cpp-log-cluster_state_controller_test.cc
@@ -1,5 +1,5 @@
---- cpp/log/cluster_state_controller_test.cc.orig	2015-11-20 15:24:59.021489000 +0100
-+++ cpp/log/cluster_state_controller_test.cc	2015-11-20 15:25:23.094886000 +0100
+--- cpp/log/cluster_state_controller_test.cc.orig	2016-02-02 11:35:23 UTC
++++ cpp/log/cluster_state_controller_test.cc
 @@ -1,3 +1,6 @@
 +// Without this, build will fail due to clash between onigposix.h
 +// and regex.h; note it's only compiled with "make check".
diff --git a/security/certificate-transparency/files/patch-cpp-log-etcd_consistent_store_test.cc b/security/certificate-transparency/files/patch-cpp-log-etcd_consistent_store_test.cc
index 66a42331b4e5..ffbbe6b076aa 100644
--- a/security/certificate-transparency/files/patch-cpp-log-etcd_consistent_store_test.cc
+++ b/security/certificate-transparency/files/patch-cpp-log-etcd_consistent_store_test.cc
@@ -1,12 +1,12 @@
---- cpp/log/etcd_consistent_store_test.cc.orig	2015-11-20 15:30:32.679028000 +0100
-+++ cpp/log/etcd_consistent_store_test.cc	2015-11-20 15:30:49.997410000 +0100
-@@ -3,6 +3,9 @@
- #include <atomic>
- #include <functional>
+--- cpp/log/etcd_consistent_store_test.cc.orig	2016-02-02 11:35:23 UTC
++++ cpp/log/etcd_consistent_store_test.cc
+@@ -1,6 +1,9 @@
+ #include "log/etcd_consistent_store.h"
+ 
  #include <gflags/gflags.h>
 +// Without this, build will fail due to clash between onigposix.h
 +// and regex.h; note it's only compiled with "make check".
 +#define GTEST_HAS_POSIX_RE 0
  #include <gmock/gmock.h>
  #include <gtest/gtest.h>
- #include <map>
+ #include <atomic>
diff --git a/security/certificate-transparency/files/patch-cpp-log-frontend_signer_test.cc b/security/certificate-transparency/files/patch-cpp-log-frontend_signer_test.cc
index 8ab658c96888..e28b5b9acee5 100644
--- a/security/certificate-transparency/files/patch-cpp-log-frontend_signer_test.cc
+++ b/security/certificate-transparency/files/patch-cpp-log-frontend_signer_test.cc
@@ -1,5 +1,5 @@
---- cpp/log/frontend_signer_test.cc.orig	2015-11-20 15:32:59.815039000 +0100
-+++ cpp/log/frontend_signer_test.cc	2015-11-20 15:33:30.684240000 +0100
+--- cpp/log/frontend_signer_test.cc.orig	2016-02-02 11:35:23 UTC
++++ cpp/log/frontend_signer_test.cc
 @@ -1,5 +1,8 @@
  /* -*- indent-tabs-mode: nil -*- */
  #include <glog/logging.h>
diff --git a/security/certificate-transparency/files/patch-cpp-log-frontend_test.cc b/security/certificate-transparency/files/patch-cpp-log-frontend_test.cc
index e0d6c4b8a9aa..8d7910851556 100644
--- a/security/certificate-transparency/files/patch-cpp-log-frontend_test.cc
+++ b/security/certificate-transparency/files/patch-cpp-log-frontend_test.cc
@@ -1,5 +1,5 @@
---- cpp/log/frontend_test.cc.orig	2015-11-20 15:34:34.528539000 +0100
-+++ cpp/log/frontend_test.cc	2015-11-20 15:34:47.368662000 +0100
+--- cpp/log/frontend_test.cc.orig	2016-02-02 11:35:23 UTC
++++ cpp/log/frontend_test.cc
 @@ -1,5 +1,8 @@
  /* -*- indent-tabs-mode: nil -*- */
  #include <glog/logging.h>
@@ -8,4 +8,4 @@
 +#define GTEST_HAS_POSIX_RE 0
  #include <gmock/gmock.h>
  #include <gtest/gtest.h>
- #include <memory>
+ #include <openssl/err.h>
diff --git a/security/certificate-transparency/files/patch-cpp-log-log_lookup_test.cc b/security/certificate-transparency/files/patch-cpp-log-log_lookup_test.cc
index 39ccca929b28..de1ec8d75c68 100644
--- a/security/certificate-transparency/files/patch-cpp-log-log_lookup_test.cc
+++ b/security/certificate-transparency/files/patch-cpp-log-log_lookup_test.cc
@@ -1,5 +1,5 @@
---- cpp/log/log_lookup_test.cc.orig	2015-11-20 15:36:32.679863000 +0100
-+++ cpp/log/log_lookup_test.cc	2015-11-20 15:36:50.639269000 +0100
+--- cpp/log/log_lookup_test.cc.orig	2016-02-02 11:35:23 UTC
++++ cpp/log/log_lookup_test.cc
 @@ -1,4 +1,7 @@
  /* -*- indent-tabs-mode: nil -*- */
 +// Without this, build will fail due to clash between onigposix.h
diff --git a/security/certificate-transparency/files/patch-cpp-log-tree_signer_test.cc b/security/certificate-transparency/files/patch-cpp-log-tree_signer_test.cc
index 60f426d62e32..54e81ea47882 100644
--- a/security/certificate-transparency/files/patch-cpp-log-tree_signer_test.cc
+++ b/security/certificate-transparency/files/patch-cpp-log-tree_signer_test.cc
@@ -1,10 +1,10 @@
---- cpp/log/tree_signer_test.cc.orig	2015-11-20 15:50:58.101424000 +0100
-+++ cpp/log/tree_signer_test.cc	2015-11-20 15:51:15.216405000 +0100
+--- cpp/log/tree_signer_test.cc.orig	2016-02-02 11:35:23 UTC
++++ cpp/log/tree_signer_test.cc
 @@ -1,4 +1,7 @@
  /* -*- indent-tabs-mode: nil -*- */
 +// Without this, build will fail due to clash between onigposix.h
 +// and regex.h; note it's only compiled with "make check".
 +#define GTEST_HAS_POSIX_RE 0
  #include <gtest/gtest.h>
- #include <memory>
  #include <stdint.h>
+ #include <memory>
diff --git a/security/certificate-transparency/files/patch-cpp-net-url_fetcher_test.cc b/security/certificate-transparency/files/patch-cpp-net-url_fetcher_test.cc
index 46bb352bd837..3863e2c6e0b6 100644
--- a/security/certificate-transparency/files/patch-cpp-net-url_fetcher_test.cc
+++ b/security/certificate-transparency/files/patch-cpp-net-url_fetcher_test.cc
@@ -1,6 +1,6 @@
---- cpp/net/url_fetcher_test.cc.orig	2015-11-20 15:17:37.750964000 +0100
-+++ cpp/net/url_fetcher_test.cc	2015-11-20 15:18:12.043994000 +0100
-@@ -8,6 +8,9 @@
+--- cpp/net/url_fetcher_test.cc.orig	2016-02-02 11:35:23 UTC
++++ cpp/net/url_fetcher_test.cc
+@@ -7,6 +7,9 @@
  #include <fcntl.h>
  #include <gflags/gflags.h>
  #include <glog/logging.h>
@@ -8,5 +8,5 @@
 +// and regex.h; note it's only compiled with "make check".
 +#define GTEST_HAS_POSIX_RE 0
  #include <gtest/gtest.h>
+ #include <csignal>
  #ifdef HAVE_NETDB_H
- #  include <netdb.h>
diff --git a/security/certificate-transparency/files/patch-cpp-server-ct-mirror.cc b/security/certificate-transparency/files/patch-cpp-server-ct-mirror.cc
index c42e1394e9f2..80d8e91b98db 100644
--- a/security/certificate-transparency/files/patch-cpp-server-ct-mirror.cc
+++ b/security/certificate-transparency/files/patch-cpp-server-ct-mirror.cc
@@ -1,6 +1,6 @@
---- cpp/server/ct-mirror.cc.orig	2015-10-24 17:49:55.279261000 +0200
-+++ cpp/server/ct-mirror.cc	2015-10-24 17:50:05.284510000 +0200
-@@ -124,7 +124,7 @@ using cert_trans::Update;
+--- cpp/server/ct-mirror.cc.orig	2016-02-02 11:35:23 UTC
++++ cpp/server/ct-mirror.cc
+@@ -98,7 +98,7 @@ using cert_trans::Update;
  using cert_trans::UrlFetcher;
  using ct::ClusterNodeState;
  using ct::SignedTreeHead;
diff --git a/security/certificate-transparency/files/patch-cpp-server-ct-mirror_v2.cc b/security/certificate-transparency/files/patch-cpp-server-ct-mirror_v2.cc
new file mode 100644
index 000000000000..a8fac4657be6
--- /dev/null
+++ b/security/certificate-transparency/files/patch-cpp-server-ct-mirror_v2.cc
@@ -0,0 +1,11 @@
+--- cpp/server/ct-mirror_v2.cc.orig	2016-02-02 11:35:23 UTC
++++ cpp/server/ct-mirror_v2.cc
+@@ -91,7 +91,7 @@ using cert_trans::Update;
+ using cert_trans::UrlFetcher;
+ using ct::ClusterNodeState;
+ using ct::SignedTreeHead;
+-using google::RegisterFlagValidator;
++using gflags::RegisterFlagValidator;
+ using std::bind;
+ using std::chrono::duration;
+ using std::chrono::duration_cast;
diff --git a/security/certificate-transparency/files/patch-cpp-server-ct-server.cc b/security/certificate-transparency/files/patch-cpp-server-ct-server.cc
index b93862c1844f..e420a0e705b2 100644
--- a/security/certificate-transparency/files/patch-cpp-server-ct-server.cc
+++ b/security/certificate-transparency/files/patch-cpp-server-ct-server.cc
@@ -1,11 +1,11 @@
---- cpp/server/ct-server.cc.orig	2015-10-24 17:48:38.840376000 +0200
-+++ cpp/server/ct-server.cc	2015-10-24 17:49:03.684762000 +0200
-@@ -116,7 +116,7 @@ using cert_trans::Update;
+--- cpp/server/ct-server.cc.orig	2016-02-02 11:35:23 UTC
++++ cpp/server/ct-server.cc
+@@ -64,7 +64,7 @@ using cert_trans::TreeSigner;
  using cert_trans::UrlFetcher;
  using ct::ClusterNodeState;
  using ct::SignedTreeHead;
 -using google::RegisterFlagValidator;
 +using gflags::RegisterFlagValidator;
  using std::bind;
- using std::chrono::duration;
- using std::chrono::duration_cast;
+ using std::function;
+ using std::make_shared;
diff --git a/security/certificate-transparency/files/patch-cpp-server-ct-server_v2.cc b/security/certificate-transparency/files/patch-cpp-server-ct-server_v2.cc
new file mode 100644
index 000000000000..aa2681228cc2
--- /dev/null
+++ b/security/certificate-transparency/files/patch-cpp-server-ct-server_v2.cc
@@ -0,0 +1,11 @@
+--- cpp/server/ct-server_v2.cc.orig	2016-02-02 11:35:23 UTC
++++ cpp/server/ct-server_v2.cc
+@@ -66,7 +66,7 @@ using cert_trans::TreeSigner;
+ using cert_trans::UrlFetcher;
+ using ct::ClusterNodeState;
+ using ct::SignedTreeHead;
+-using google::RegisterFlagValidator;
++using gflags::RegisterFlagValidator;
+ using std::bind;
+ using std::function;
+ using std::make_shared;
diff --git a/security/certificate-transparency/files/patch-cpp-server-log_processes.cc b/security/certificate-transparency/files/patch-cpp-server-log_processes.cc
new file mode 100644
index 000000000000..396bde6fa467
--- /dev/null
+++ b/security/certificate-transparency/files/patch-cpp-server-log_processes.cc
@@ -0,0 +1,11 @@
+--- cpp/server/log_processes.cc.orig	2016-02-02 11:35:23 UTC
++++ cpp/server/log_processes.cc
+@@ -23,7 +23,7 @@ DEFINE_int32(cleanup_frequency_seconds, 
+ using cert_trans::Counter;
+ using cert_trans::Gauge;
+ using cert_trans::Latency;
+-using google::RegisterFlagValidator;
++using gflags::RegisterFlagValidator;
+ using ct::SignedTreeHead;
+ using std::function;
+ using std::chrono::milliseconds;
diff --git a/security/certificate-transparency/files/patch-cpp-server-server_helper.cc b/security/certificate-transparency/files/patch-cpp-server-server_helper.cc
new file mode 100644
index 000000000000..be39a37ecb1d
--- /dev/null
+++ b/security/certificate-transparency/files/patch-cpp-server-server_helper.cc
@@ -0,0 +1,11 @@
+--- cpp/server/server_helper.cc.orig	2016-02-02 11:35:23 UTC
++++ cpp/server/server_helper.cc
+@@ -4,7 +4,7 @@
+ #include "util/fake_etcd.h"
+ 
+ using cert_trans::Server;
+-using google::RegisterFlagValidator;
++using gflags::RegisterFlagValidator;
+ using std::string;
+ using std::unique_ptr;
+ 
diff --git a/security/certificate-transparency/files/patch-cpp-server-xjson-server.cc b/security/certificate-transparency/files/patch-cpp-server-xjson-server.cc
new file mode 100644
index 000000000000..08468cc2e84f
--- /dev/null
+++ b/security/certificate-transparency/files/patch-cpp-server-xjson-server.cc
@@ -0,0 +1,11 @@
+--- cpp/server/xjson-server.cc.orig	2016-02-02 11:35:23 UTC
++++ cpp/server/xjson-server.cc
+@@ -63,7 +63,7 @@ using cert_trans::UrlFetcher;
+ using cert_trans::XJsonHttpHandler;
+ using ct::ClusterNodeState;
+ using ct::SignedTreeHead;
+-using google::RegisterFlagValidator;
++using gflags::RegisterFlagValidator;
+ using std::bind;
+ using std::function;
+ using std::make_shared;
diff --git a/security/certificate-transparency/files/patch-cpp-tools-dump_sth.cc b/security/certificate-transparency/files/patch-cpp-tools-dump_sth.cc
index d4cc82fc5c8d..9b4565d7e10f 100644
--- a/security/certificate-transparency/files/patch-cpp-tools-dump_sth.cc
+++ b/security/certificate-transparency/files/patch-cpp-tools-dump_sth.cc
@@ -1,9 +1,9 @@
---- cpp/tools/dump_sth.cc.orig	2015-10-27 10:35:13.973569000 +0100
-+++ cpp/tools/dump_sth.cc	2015-10-27 10:35:44.745588000 +0100
-@@ -26,11 +26,11 @@ void DumpSth(const char *filename) {
+--- cpp/tools/dump_sth.cc.orig	2016-02-02 11:35:23 UTC
++++ cpp/tools/dump_sth.cc
+@@ -26,11 +26,11 @@ void DumpSth(const char* filename) {
  
  
- int main(int argc, char *argv[]) {
+ int main(int argc, char* argv[]) {
 -  google::SetVersionString(cert_trans::kBuildVersion);
 -  google::ParseCommandLineFlags(&argc, &argv, true);
 +  gflags::SetVersionString(cert_trans::kBuildVersion);
diff --git a/security/certificate-transparency/files/patch-cpp-util-bignum.h b/security/certificate-transparency/files/patch-cpp-util-bignum.h
new file mode 100644
index 000000000000..5ff4950859ad
--- /dev/null
+++ b/security/certificate-transparency/files/patch-cpp-util-bignum.h
@@ -0,0 +1,10 @@
+--- cpp/util/bignum.h.orig	2016-02-02 11:35:23 UTC
++++ cpp/util/bignum.h
+@@ -3,6 +3,7 @@
+ 
+ #include <openssl/bn.h>
+ #include <cassert>
++#include <stdint.h>
+ 
+ namespace cert_trans {
+ 
diff --git a/security/certificate-transparency/files/patch-cpp-util-etcd_masterelection.cc b/security/certificate-transparency/files/patch-cpp-util-etcd_masterelection.cc
index 19dfd913cc40..567370b5e3b4 100644
--- a/security/certificate-transparency/files/patch-cpp-util-etcd_masterelection.cc
+++ b/security/certificate-transparency/files/patch-cpp-util-etcd_masterelection.cc
@@ -1,5 +1,5 @@
---- cpp/util/etcd_masterelection.cc.orig	2015-10-27 10:32:35.670615000 +0100
-+++ cpp/util/etcd_masterelection.cc	2015-10-27 10:33:16.624128000 +0100
+--- cpp/util/etcd_masterelection.cc.orig	2016-02-02 11:35:23 UTC
++++ cpp/util/etcd_masterelection.cc
 @@ -24,7 +24,7 @@ DEFINE_string(node_id, "", "unique node 
  
  
diff --git a/security/certificate-transparency/files/patch-cpp-util-etcd_test.cc b/security/certificate-transparency/files/patch-cpp-util-etcd_test.cc
index 6d33d8ec3a09..92f4a642715e 100644
--- a/security/certificate-transparency/files/patch-cpp-util-etcd_test.cc
+++ b/security/certificate-transparency/files/patch-cpp-util-etcd_test.cc
@@ -1,5 +1,5 @@
---- cpp/util/etcd_test.cc.orig	2015-11-20 15:52:11.557932000 +0100
-+++ cpp/util/etcd_test.cc	2015-11-20 15:52:28.585505000 +0100
+--- cpp/util/etcd_test.cc.orig	2016-02-02 11:35:23 UTC
++++ cpp/util/etcd_test.cc
 @@ -1,3 +1,6 @@
 +// Without this, build will fail due to clash between onigposix.h
 +// and regex.h; note it's only compiled with "make check".
diff --git a/security/certificate-transparency/files/patch-cpp-util-fake_etcd_test.cc b/security/certificate-transparency/files/patch-cpp-util-fake_etcd_test.cc
index f451deee8675..dc30b260d8e0 100644
--- a/security/certificate-transparency/files/patch-cpp-util-fake_etcd_test.cc
+++ b/security/certificate-transparency/files/patch-cpp-util-fake_etcd_test.cc
@@ -1,7 +1,7 @@
---- cpp/util/fake_etcd_test.cc.orig	2015-11-20 15:53:01.290954000 +0100
-+++ cpp/util/fake_etcd_test.cc	2015-11-20 15:53:17.991665000 +0100
-@@ -4,6 +4,9 @@
- #include <functional>
+--- cpp/util/fake_etcd_test.cc.orig	2016-02-02 11:35:23 UTC
++++ cpp/util/fake_etcd_test.cc
+@@ -2,6 +2,9 @@
+ 
  #include <gflags/gflags.h>
  #include <glog/logging.h>
 +// Without this, build will fail due to clash between onigposix.h
@@ -9,4 +9,4 @@
 +#define GTEST_HAS_POSIX_RE 0
  #include <gmock/gmock.h>
  #include <gtest/gtest.h>
- #include <memory>
+ #include <atomic>
diff --git a/security/certificate-transparency/files/patch-cpp-util-init.cc b/security/certificate-transparency/files/patch-cpp-util-init.cc
index 8a9a3237cecc..c2a217e24685 100644
--- a/security/certificate-transparency/files/patch-cpp-util-init.cc
+++ b/security/certificate-transparency/files/patch-cpp-util-init.cc
@@ -1,6 +1,6 @@
---- cpp/util/init.cc.orig	2015-10-24 17:36:31.678280000 +0200
-+++ cpp/util/init.cc	2015-10-24 17:37:42.378343000 +0200
-@@ -48,8 +48,8 @@ void LibEventLog(int severity, const cha
+--- cpp/util/init.cc.orig	2016-02-02 11:35:23 UTC
++++ cpp/util/init.cc
+@@ -49,8 +49,8 @@ void LibEventLog(int severity, const cha
  
  
  void InitCT(int* argc, char** argv[]) {
@@ -11,7 +11,7 @@
    google::InitGoogleLogging(*argv[0]);
    google::InstallFailureSignalHandler();
  
-@@ -67,7 +67,7 @@ void InitCT(int* argc, char** argv[]) {
+@@ -68,7 +68,7 @@ void InitCT(int* argc, char** argv[]) {
  
    cert_trans::LoadCtExtensions();
  
diff --git a/security/certificate-transparency/files/patch-cpp-util-libevent_wrapper_test.cc b/security/certificate-transparency/files/patch-cpp-util-libevent_wrapper_test.cc
index 2ec750e1d0d0..9cfdfabd89df 100644
--- a/security/certificate-transparency/files/patch-cpp-util-libevent_wrapper_test.cc
+++ b/security/certificate-transparency/files/patch-cpp-util-libevent_wrapper_test.cc
@@ -1,5 +1,5 @@
---- cpp/util/libevent_wrapper_test.cc.orig	2015-11-20 15:53:58.271952000 +0100
-+++ cpp/util/libevent_wrapper_test.cc	2015-11-20 15:54:14.240116000 +0100
+--- cpp/util/libevent_wrapper_test.cc.orig	2016-02-02 11:35:23 UTC
++++ cpp/util/libevent_wrapper_test.cc
 @@ -1,5 +1,8 @@
  #include "util/libevent_wrapper.h"
  
diff --git a/security/certificate-transparency/files/patch-cpp-util-masterelection_test.cc b/security/certificate-transparency/files/patch-cpp-util-masterelection_test.cc
index ce1e48899ac5..d9b3359eccfd 100644
--- a/security/certificate-transparency/files/patch-cpp-util-masterelection_test.cc
+++ b/security/certificate-transparency/files/patch-cpp-util-masterelection_test.cc
@@ -1,7 +1,7 @@
---- cpp/util/masterelection_test.cc.orig	2015-11-20 15:54:47.351564000 +0100
-+++ cpp/util/masterelection_test.cc	2015-11-20 15:55:09.284855000 +0100
-@@ -6,6 +6,9 @@
- #include <string>
+--- cpp/util/masterelection_test.cc.orig	2016-02-02 11:35:23 UTC
++++ cpp/util/masterelection_test.cc
+@@ -3,6 +3,9 @@
+ #include <event2/thread.h>
  #include <gflags/gflags.h>
  #include <glog/logging.h>
 +// Without this, build will fail due to clash between onigposix.h
@@ -9,4 +9,4 @@
 +#define GTEST_HAS_POSIX_RE 0
  #include <gmock/gmock.h>
  #include <gtest/gtest.h>
- 
+ #include <atomic>
diff --git a/security/certificate-transparency/files/patch-cpp-util-testing.cc b/security/certificate-transparency/files/patch-cpp-util-testing.cc
index 1dfb9a9bdf3c..00f0df865454 100644
--- a/security/certificate-transparency/files/patch-cpp-util-testing.cc
+++ b/security/certificate-transparency/files/patch-cpp-util-testing.cc
@@ -1,5 +1,5 @@
---- cpp/util/testing.cc.orig	2015-10-23 16:31:08.000000000 +0200
-+++ cpp/util/testing.cc	2015-10-30 10:54:40.169083000 +0100
+--- cpp/util/testing.cc.orig	2016-02-02 11:35:23 UTC
++++ cpp/util/testing.cc
 @@ -3,6 +3,9 @@
  #include <event2/thread.h>
  #include <evhtp.h>
diff --git a/security/certificate-transparency/files/patch-cpp-util-bench_etcd.cc b/security/certificate-transparency/files/patch-cpp_util_bench__etcd.cc
index 959fda5331d3..1d886e185061 100644
--- a/security/certificate-transparency/files/patch-cpp-util-bench_etcd.cc
+++ b/security/certificate-transparency/files/patch-cpp_util_bench__etcd.cc
@@ -1,5 +1,5 @@
---- cpp/util/bench_etcd.cc	2015-10-27 10:34:16.495831000 +0100
-+++ cpp/util/bench_etcd.cc.orig	2015-10-27 10:33:58.482267000 +0100
+--- cpp/util/bench_etcd.cc.orig	2016-02-02 11:35:23 UTC
++++ cpp/util/bench_etcd.cc
 @@ -105,7 +105,7 @@ void test_etcd(int thread_num) {