Index: head/security/certificate-transparency/Makefile =================================================================== --- head/security/certificate-transparency/Makefile (revision 424044) +++ head/security/certificate-transparency/Makefile (revision 424045) @@ -1,41 +1,40 @@ # Created by: Edward Tomasz Napierala # $FreeBSD$ PORTNAME= certificate-transparency -PORTVERSION= 20160102 -PORTREVISION= 1 +PORTVERSION= 20161015 CATEGORIES= security MAINTAINER= ports@FreeBSD.org COMMENT= Open framework for monitoring and auditing SSL certificates LICENSE= APACHE20 LIB_DEPENDS?= libevent.so:devel/libevent2 \ libevhtp.so:www/libevhtp \ libgtest.so:devel/googletest \ libgflags.so:devel/gflags \ libglog.so:devel/glog \ libgmock.so:devel/googlemock \ libjson-c.so:devel/json-c \ libleveldb.so:databases/leveldb \ libobjecthash.so:devel/objecthash \ libprotobuf.so:devel/protobuf \ libsqlite3.so:databases/sqlite3 \ libtcmalloc.so:devel/google-perftools BROKEN_FreeBSD_9= does not build on FreeBSD < 10.x USES= autoreconf compiler:c++11-lib gmake pkgconfig GNU_CONFIGURE= yes CONFIGURE_ENV+= "CFLAGS+=-I${LOCALBASE}/include CXXFLAGS+=-lgtest CXXFLAGS+=-lgmock" MAKE_FLAGS+= "V=1" USE_GITHUB= yes GH_ACCOUNT= google -GH_TAGNAME= 1cdd6b5 +GH_TAGNAME= 28478cb CPPFLAGS+= "-I${LOCALBASE}/include" CPPFLAGS+= "-I${LOCALBASE}/include/evhtp" LDFLAGS+= "-L${LOCALBASE}/lib" .include Index: head/security/certificate-transparency/distinfo =================================================================== --- head/security/certificate-transparency/distinfo (revision 424044) +++ head/security/certificate-transparency/distinfo (revision 424045) @@ -1,2 +1,3 @@ -SHA256 (google-certificate-transparency-20160102-1cdd6b5_GH0.tar.gz) = 7d84ffb97bf35729715aef8de5d471f4e83d3a48dbf5cec27a75bc03f0db5bce -SIZE (google-certificate-transparency-20160102-1cdd6b5_GH0.tar.gz) = 10441387 +TIMESTAMP = 1476535326 +SHA256 (google-certificate-transparency-20161015-28478cb_GH0.tar.gz) = 5dac966842538c4af8f99c721ad8aa4ef5921f67d91ce02b482f30883e3468bd +SIZE (google-certificate-transparency-20161015-28478cb_GH0.tar.gz) = 10509723 Index: head/security/certificate-transparency/files/patch-Makefile.am =================================================================== --- head/security/certificate-transparency/files/patch-Makefile.am (revision 424044) +++ head/security/certificate-transparency/files/patch-Makefile.am (revision 424045) @@ -1,48 +1,30 @@ ---- Makefile.am.orig 2016-02-02 11:35:23 UTC +--- Makefile.am.orig 2016-10-14 17:11:57 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 = \ +@@ -11,8 +11,6 @@ AM_CXXFLAGS = \ -fno-exceptions BUILT_SOURCES = \ - cpp/gmock-all.cc \ - cpp/gtest-all.cc \ cpp/monitoring/prometheus/metrics.pb.cc \ cpp/monitoring/prometheus/metrics.pb.h \ proto/ct.pb.cc \ -@@ -124,9 +121,6 @@ endif +@@ -131,9 +129,6 @@ endif cpp/gtest-all.cc: $(GTEST_DIR)/src/gtest-all.cc $(AM_V_at)cp $^ $@ -cpp/gmock-all.cc: $(GMOCK_DIR)/src/gmock-all.cc - $(AM_V_at)cp $^ $@ - 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 -@@ -215,8 +209,6 @@ cpp_libtest_a_CPPFLAGS = \ +@@ -226,8 +221,6 @@ cpp_libtest_a_CPPFLAGS = \ -I$(GTEST_DIR) \ $(AM_CPPFLAGS) cpp_libtest_a_SOURCES = \ - cpp/gmock-all.cc \ - cpp/gtest-all.cc \ 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 \ Index: head/security/certificate-transparency/files/patch-configure.ac =================================================================== --- head/security/certificate-transparency/files/patch-configure.ac (revision 424044) +++ head/security/certificate-transparency/files/patch-configure.ac (revision 424045) @@ -1,31 +1,31 @@ ---- configure.ac.orig 2016-02-02 11:35:23 UTC +--- configure.ac.orig 2016-10-14 17:11:57 UTC +++ configure.ac -@@ -83,9 +83,7 @@ AC_CHECK_HEADER([gtest/gtest.h],, [missi +@@ -84,9 +84,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]) AS_VAR_APPEND([CPPFLAGS], [" -I$GTEST_DIR"]) -AC_CHECK_HEADER([$GTEST_DIR/src/gtest-all.cc],, [missing_gtest=1]) AS_VAR_APPEND([CPPFLAGS], [" -I$GMOCK_DIR"]) -AC_CHECK_HEADER([$GMOCK_DIR/src/gmock-all.cc],, [missing_gmock=1]) CPPFLAGS="$saved_CPPFLAGS" AS_IF([test -n "$missing_gtest"], [AC_MSG_ERROR([could not find a working Google Test])]) -@@ -105,7 +103,7 @@ AC_SEARCH_LIBS([clock_gettime], [rt],,, +@@ -106,7 +104,7 @@ AC_SEARCH_LIBS([clock_gettime], [rt],,, AC_MSG_CHECKING([checking for gflags library]) LIBS="-lgflags $LIBS" --AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ], [google::ParseCommandLineFlags(NULL, NULL, true)])], [have_gflags=yes], [have_gflags=no]) -+AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ], [gflags::ParseCommandLineFlags(NULL, NULL, true)])], [have_gflags=yes], [have_gflags=no]) +-AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[google::ParseCommandLineFlags(NULL, NULL, true)]])], [have_gflags=yes], [have_gflags=no]) ++AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[gflags::ParseCommandLineFlags(NULL, NULL, true)]])], [have_gflags=yes], [have_gflags=no]) AC_MSG_RESULT([$have_gflags]) AS_IF([test "x$have_gflags" = "xno"], [AC_MSG_ERROR([gflags library could not be found])]) -@@ -117,6 +115,9 @@ AC_MSG_RESULT([$have_glog]) +@@ -118,6 +116,9 @@ AC_MSG_RESULT([$have_glog]) AS_IF([test "x$have_glog" = "xno"], [AC_MSG_ERROR([glog library could not be found])]) +# Required for "make check" to build. +LIBS="$LIBS -lgtest -lgmock" + save_LIBS="$LIBS" AS_UNSET([LIBS]) AC_SEARCH_LIBS([snappy_compress], [snappy],,, [$save_LIBS]) Index: head/security/certificate-transparency/files/patch-cpp-client-ct.cc =================================================================== --- head/security/certificate-transparency/files/patch-cpp-client-ct.cc (revision 424044) +++ head/security/certificate-transparency/files/patch-cpp-client-ct.cc (revision 424045) @@ -1,48 +1,49 @@ ---- cpp/client/ct.cc.orig 2016-02-02 11:35:23 UTC +--- cpp/client/ct.cc.orig 2016-10-14 17:11:57 UTC +++ cpp/client/ct.cc -@@ -461,8 +461,8 @@ static void MakeCert() { +@@ -451,8 +451,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() { - CHECK(!FLAGS_sct_token.empty()) << google::ProgramUsage(); - CHECK(!FLAGS_extensions_config_out.empty()) << google::ProgramUsage(); + CHECK(!FLAGS_sct_token.empty()) << gflags::ProgramUsage(); + CHECK(!FLAGS_extensions_config_out.empty()) << gflags::ProgramUsage(); string sct; -@@ -489,8 +489,8 @@ static const char kPEMLabel[] = "SERVERI +@@ -479,8 +479,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() { - CHECK(!FLAGS_sct_token.empty()) << google::ProgramUsage(); - CHECK(!FLAGS_tls_extension_data_out.empty()) << google::ProgramUsage(); + CHECK(!FLAGS_sct_token.empty()) << gflags::ProgramUsage(); + CHECK(!FLAGS_tls_extension_data_out.empty()) << gflags::ProgramUsage(); string serialized_sct; PCHECK(util::ReadBinaryFile(FLAGS_sct_token, &serialized_sct)) -@@ -990,12 +990,12 @@ int Monitor() { +@@ -939,13 +939,13 @@ int GetSTH() { // Exit code upon abnormal exit (CHECK failures): != 0 // (on UNIX, 134 is expected) int main(int argc, char** argv) { - google::SetUsageMessage(argv[0] + string(kUsage)); + gflags::SetUsageMessage(argv[0] + string(kUsage)); util::InitCT(&argc, &argv); + ConfigureSerializerForV1CT(); const string main_command(argv[0]); if (argc < 2) { - std::cout << google::ProgramUsage(); + std::cout << gflags::ProgramUsage(); return 1; } -@@ -1035,7 +1035,7 @@ int main(int argc, char** argv) { +@@ -983,7 +983,7 @@ int main(int argc, char** argv) { } else if (cmd == "sth") { ret = GetSTH(); } else { - std::cout << google::ProgramUsage(); + std::cout << gflags::ProgramUsage(); ret = 1; } Index: head/security/certificate-transparency/files/patch-cpp-fetcher-remote_peer_test.cc =================================================================== --- head/security/certificate-transparency/files/patch-cpp-fetcher-remote_peer_test.cc (revision 424044) +++ head/security/certificate-transparency/files/patch-cpp-fetcher-remote_peer_test.cc (revision 424045) @@ -1,11 +1,11 @@ ---- cpp/fetcher/remote_peer_test.cc.orig 2016-02-02 11:35:23 UTC +--- cpp/fetcher/remote_peer_test.cc.orig 2016-10-14 17:11:57 UTC +++ cpp/fetcher/remote_peer_test.cc @@ -1,5 +1,8 @@ #include #include +// 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 #include #include Index: head/security/certificate-transparency/files/patch-cpp-log-cluster_state_controller_test.cc =================================================================== --- head/security/certificate-transparency/files/patch-cpp-log-cluster_state_controller_test.cc (revision 424044) +++ head/security/certificate-transparency/files/patch-cpp-log-cluster_state_controller_test.cc (revision 424045) @@ -1,9 +1,9 @@ ---- cpp/log/cluster_state_controller_test.cc.orig 2016-02-02 11:35:23 UTC +--- cpp/log/cluster_state_controller_test.cc.orig 2016-10-14 17:11:57 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". +#define GTEST_HAS_POSIX_RE 0 #include #include #include Index: head/security/certificate-transparency/files/patch-cpp-log-etcd_consistent_store_test.cc =================================================================== --- head/security/certificate-transparency/files/patch-cpp-log-etcd_consistent_store_test.cc (revision 424044) +++ head/security/certificate-transparency/files/patch-cpp-log-etcd_consistent_store_test.cc (revision 424045) @@ -1,12 +1,12 @@ ---- cpp/log/etcd_consistent_store_test.cc.orig 2016-02-02 11:35:23 UTC +--- cpp/log/etcd_consistent_store_test.cc.orig 2016-10-14 17:11:57 UTC +++ cpp/log/etcd_consistent_store_test.cc @@ -1,6 +1,9 @@ #include "log/etcd_consistent_store.h" #include +// 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 #include #include Index: head/security/certificate-transparency/files/patch-cpp-log-frontend_signer_test.cc =================================================================== --- head/security/certificate-transparency/files/patch-cpp-log-frontend_signer_test.cc (revision 424044) +++ head/security/certificate-transparency/files/patch-cpp-log-frontend_signer_test.cc (revision 424045) @@ -1,11 +1,11 @@ ---- cpp/log/frontend_signer_test.cc.orig 2016-02-02 11:35:23 UTC +--- cpp/log/frontend_signer_test.cc.orig 2016-10-14 17:11:57 UTC +++ cpp/log/frontend_signer_test.cc @@ -1,5 +1,8 @@ /* -*- indent-tabs-mode: nil -*- */ #include +// 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 #include #include Index: head/security/certificate-transparency/files/patch-cpp-log-frontend_test.cc =================================================================== --- head/security/certificate-transparency/files/patch-cpp-log-frontend_test.cc (revision 424044) +++ head/security/certificate-transparency/files/patch-cpp-log-frontend_test.cc (revision 424045) @@ -1,11 +1,11 @@ ---- cpp/log/frontend_test.cc.orig 2016-02-02 11:35:23 UTC +--- cpp/log/frontend_test.cc.orig 2016-10-14 17:11:57 UTC +++ cpp/log/frontend_test.cc @@ -1,5 +1,8 @@ /* -*- indent-tabs-mode: nil -*- */ #include +// 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 #include #include Index: head/security/certificate-transparency/files/patch-cpp-log-log_lookup_test.cc =================================================================== --- head/security/certificate-transparency/files/patch-cpp-log-log_lookup_test.cc (revision 424044) +++ head/security/certificate-transparency/files/patch-cpp-log-log_lookup_test.cc (revision 424045) @@ -1,10 +1,10 @@ ---- cpp/log/log_lookup_test.cc.orig 2016-02-02 11:35:23 UTC +--- cpp/log/log_lookup_test.cc.orig 2016-10-14 17:11:57 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 +// and regex.h; note it's only compiled with "make check". +#define GTEST_HAS_POSIX_RE 0 #include #include #include Index: head/security/certificate-transparency/files/patch-cpp-log-tree_signer_test.cc =================================================================== --- head/security/certificate-transparency/files/patch-cpp-log-tree_signer_test.cc (revision 424044) +++ head/security/certificate-transparency/files/patch-cpp-log-tree_signer_test.cc (revision 424045) @@ -1,10 +1,10 @@ ---- cpp/log/tree_signer_test.cc.orig 2016-02-02 11:35:23 UTC +--- cpp/log/tree_signer_test.cc.orig 2016-10-14 17:11:57 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 #include #include Index: head/security/certificate-transparency/files/patch-cpp-net-url_fetcher_test.cc =================================================================== --- head/security/certificate-transparency/files/patch-cpp-net-url_fetcher_test.cc (revision 424044) +++ head/security/certificate-transparency/files/patch-cpp-net-url_fetcher_test.cc (revision 424045) @@ -1,12 +1,12 @@ ---- cpp/net/url_fetcher_test.cc.orig 2016-02-02 11:35:23 UTC +--- cpp/net/url_fetcher_test.cc.orig 2016-10-14 17:11:57 UTC +++ cpp/net/url_fetcher_test.cc @@ -7,6 +7,9 @@ #include #include #include +// 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 #include #ifdef HAVE_NETDB_H Index: head/security/certificate-transparency/files/patch-cpp-server-ct-mirror.cc =================================================================== --- head/security/certificate-transparency/files/patch-cpp-server-ct-mirror.cc (revision 424044) +++ head/security/certificate-transparency/files/patch-cpp-server-ct-mirror.cc (revision 424045) @@ -1,11 +1,11 @@ ---- cpp/server/ct-mirror.cc.orig 2016-02-02 11:35:23 UTC +--- cpp/server/ct-mirror.cc.orig 2016-10-14 17:11:57 UTC +++ cpp/server/ct-mirror.cc @@ -98,7 +98,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; Index: head/security/certificate-transparency/files/patch-cpp-server-ct-mirror_v2.cc =================================================================== --- head/security/certificate-transparency/files/patch-cpp-server-ct-mirror_v2.cc (revision 424044) +++ head/security/certificate-transparency/files/patch-cpp-server-ct-mirror_v2.cc (revision 424045) @@ -1,11 +1,11 @@ ---- cpp/server/ct-mirror_v2.cc.orig 2016-02-02 11:35:23 UTC +--- cpp/server/ct-mirror_v2.cc.orig 2016-10-14 17:11:57 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; Index: head/security/certificate-transparency/files/patch-cpp-server-ct-server.cc =================================================================== --- head/security/certificate-transparency/files/patch-cpp-server-ct-server.cc (revision 424044) +++ head/security/certificate-transparency/files/patch-cpp-server-ct-server.cc (revision 424045) @@ -1,11 +1,11 @@ ---- cpp/server/ct-server.cc.orig 2016-02-02 11:35:23 UTC +--- cpp/server/ct-server.cc.orig 2016-10-14 17:11:57 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::function; using std::make_shared; Index: head/security/certificate-transparency/files/patch-cpp-server-ct-server_v2.cc =================================================================== --- head/security/certificate-transparency/files/patch-cpp-server-ct-server_v2.cc (revision 424044) +++ head/security/certificate-transparency/files/patch-cpp-server-ct-server_v2.cc (revision 424045) @@ -1,11 +1,11 @@ ---- cpp/server/ct-server_v2.cc.orig 2016-02-02 11:35:23 UTC +--- cpp/server/ct-server_v2.cc.orig 2016-10-14 17:11:57 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; Index: head/security/certificate-transparency/files/patch-cpp-server-log_processes.cc =================================================================== --- head/security/certificate-transparency/files/patch-cpp-server-log_processes.cc (revision 424044) +++ head/security/certificate-transparency/files/patch-cpp-server-log_processes.cc (revision 424045) @@ -1,11 +1,11 @@ ---- cpp/server/log_processes.cc.orig 2016-02-02 11:35:23 UTC +--- cpp/server/log_processes.cc.orig 2016-10-14 17:11:57 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; Index: head/security/certificate-transparency/files/patch-cpp-server-server_helper.cc =================================================================== --- head/security/certificate-transparency/files/patch-cpp-server-server_helper.cc (revision 424044) +++ head/security/certificate-transparency/files/patch-cpp-server-server_helper.cc (revision 424045) @@ -1,11 +1,11 @@ ---- cpp/server/server_helper.cc.orig 2016-02-02 11:35:23 UTC +--- cpp/server/server_helper.cc.orig 2016-10-14 17:11:57 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; Index: head/security/certificate-transparency/files/patch-cpp-server-xjson-server.cc =================================================================== --- head/security/certificate-transparency/files/patch-cpp-server-xjson-server.cc (revision 424044) +++ head/security/certificate-transparency/files/patch-cpp-server-xjson-server.cc (revision 424045) @@ -1,11 +1,11 @@ ---- cpp/server/xjson-server.cc.orig 2016-02-02 11:35:23 UTC +--- cpp/server/xjson-server.cc.orig 2016-10-14 17:11:57 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; Index: head/security/certificate-transparency/files/patch-cpp-tools-dump_sth.cc =================================================================== --- head/security/certificate-transparency/files/patch-cpp-tools-dump_sth.cc (revision 424044) +++ head/security/certificate-transparency/files/patch-cpp-tools-dump_sth.cc (revision 424045) @@ -1,17 +1,17 @@ ---- cpp/tools/dump_sth.cc.orig 2016-02-02 11:35:23 UTC +--- cpp/tools/dump_sth.cc.orig 2016-10-14 17:11:57 UTC +++ cpp/tools/dump_sth.cc @@ -26,11 +26,11 @@ void DumpSth(const char* filename) { int main(int argc, char* argv[]) { - google::SetVersionString(cert_trans::kBuildVersion); - google::ParseCommandLineFlags(&argc, &argv, true); + gflags::SetVersionString(cert_trans::kBuildVersion); + gflags::ParseCommandLineFlags(&argc, &argv, true); google::InitGoogleLogging(argv[0]); - LOG(INFO) << "Build version: " << google::VersionString(); + LOG(INFO) << "Build version: " << gflags::VersionString(); for (int i = 1; i < argc; ++i) DumpSth(argv[i]); Index: head/security/certificate-transparency/files/patch-cpp-util-bignum.h =================================================================== --- head/security/certificate-transparency/files/patch-cpp-util-bignum.h (revision 424044) +++ head/security/certificate-transparency/files/patch-cpp-util-bignum.h (revision 424045) @@ -1,10 +1,10 @@ ---- cpp/util/bignum.h.orig 2016-02-02 11:35:23 UTC +--- cpp/util/bignum.h.orig 2016-10-14 17:11:57 UTC +++ cpp/util/bignum.h @@ -3,6 +3,7 @@ #include #include +#include namespace cert_trans { Index: head/security/certificate-transparency/files/patch-cpp-util-etcd_masterelection.cc =================================================================== --- head/security/certificate-transparency/files/patch-cpp-util-etcd_masterelection.cc (revision 424044) +++ head/security/certificate-transparency/files/patch-cpp-util-etcd_masterelection.cc (revision 424045) @@ -1,11 +1,11 @@ ---- cpp/util/etcd_masterelection.cc.orig 2016-02-02 11:35:23 UTC +--- cpp/util/etcd_masterelection.cc.orig 2016-10-14 17:11:57 UTC +++ cpp/util/etcd_masterelection.cc @@ -24,7 +24,7 @@ DEFINE_string(node_id, "", "unique node int main(int argc, char* argv[]) { - google::ParseCommandLineFlags(&argc, &argv, true); + gflags::ParseCommandLineFlags(&argc, &argv, true); google::InitGoogleLogging(argv[0]); evthread_use_pthreads(); CHECK(!FLAGS_node_id.empty()) << "Must set --node_id"; Index: head/security/certificate-transparency/files/patch-cpp-util-etcd_test.cc =================================================================== --- head/security/certificate-transparency/files/patch-cpp-util-etcd_test.cc (revision 424044) +++ head/security/certificate-transparency/files/patch-cpp-util-etcd_test.cc (revision 424045) @@ -1,9 +1,9 @@ ---- cpp/util/etcd_test.cc.orig 2016-02-02 11:35:23 UTC +--- cpp/util/etcd_test.cc.orig 2016-10-14 17:11:57 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". +#define GTEST_HAS_POSIX_RE 0 #include #include #include Index: head/security/certificate-transparency/files/patch-cpp-util-fake_etcd_test.cc =================================================================== --- head/security/certificate-transparency/files/patch-cpp-util-fake_etcd_test.cc (revision 424044) +++ head/security/certificate-transparency/files/patch-cpp-util-fake_etcd_test.cc (revision 424045) @@ -1,12 +1,12 @@ ---- cpp/util/fake_etcd_test.cc.orig 2016-02-02 11:35:23 UTC +--- cpp/util/fake_etcd_test.cc.orig 2016-10-14 17:11:57 UTC +++ cpp/util/fake_etcd_test.cc @@ -2,6 +2,9 @@ #include #include +// 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 #include #include Index: head/security/certificate-transparency/files/patch-cpp-util-init.cc =================================================================== --- head/security/certificate-transparency/files/patch-cpp-util-init.cc (revision 424044) +++ head/security/certificate-transparency/files/patch-cpp-util-init.cc (revision 424045) @@ -1,22 +1,22 @@ ---- cpp/util/init.cc.orig 2016-02-02 11:35:23 UTC +--- cpp/util/init.cc.orig 2016-10-14 17:11:57 UTC +++ cpp/util/init.cc @@ -49,8 +49,8 @@ void LibEventLog(int severity, const cha void InitCT(int* argc, char** argv[]) { - google::SetVersionString(cert_trans::kBuildVersion); - google::ParseCommandLineFlags(argc, argv, true); + gflags::SetVersionString(cert_trans::kBuildVersion); + gflags::ParseCommandLineFlags(argc, argv, true); google::InitGoogleLogging(*argv[0]); google::InstallFailureSignalHandler(); @@ -68,7 +68,7 @@ void InitCT(int* argc, char** argv[]) { cert_trans::LoadCtExtensions(); - LOG(INFO) << "Build version: " << google::VersionString(); + LOG(INFO) << "Build version: " << gflags::VersionString(); #ifdef ENABLE_HARDENING LOG(INFO) << "Binary built with hardening enabled."; #else Index: head/security/certificate-transparency/files/patch-cpp-util-libevent_wrapper_test.cc =================================================================== --- head/security/certificate-transparency/files/patch-cpp-util-libevent_wrapper_test.cc (revision 424044) +++ head/security/certificate-transparency/files/patch-cpp-util-libevent_wrapper_test.cc (revision 424045) @@ -1,11 +1,11 @@ ---- cpp/util/libevent_wrapper_test.cc.orig 2016-02-02 11:35:23 UTC +--- cpp/util/libevent_wrapper_test.cc.orig 2016-10-14 17:11:57 UTC +++ cpp/util/libevent_wrapper_test.cc @@ -1,5 +1,8 @@ #include "util/libevent_wrapper.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 #include "util/testing.h" Index: head/security/certificate-transparency/files/patch-cpp-util-masterelection_test.cc =================================================================== --- head/security/certificate-transparency/files/patch-cpp-util-masterelection_test.cc (revision 424044) +++ head/security/certificate-transparency/files/patch-cpp-util-masterelection_test.cc (revision 424045) @@ -1,12 +1,12 @@ ---- cpp/util/masterelection_test.cc.orig 2016-02-02 11:35:23 UTC +--- cpp/util/masterelection_test.cc.orig 2016-10-14 17:11:57 UTC +++ cpp/util/masterelection_test.cc @@ -3,6 +3,9 @@ #include #include #include +// 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 #include #include Index: head/security/certificate-transparency/files/patch-cpp-util-testing.cc =================================================================== --- head/security/certificate-transparency/files/patch-cpp-util-testing.cc (revision 424044) +++ head/security/certificate-transparency/files/patch-cpp-util-testing.cc (revision 424045) @@ -1,21 +1,21 @@ ---- cpp/util/testing.cc.orig 2016-02-02 11:35:23 UTC +--- cpp/util/testing.cc.orig 2016-10-14 17:11:57 UTC +++ cpp/util/testing.cc @@ -3,6 +3,9 @@ #include #include #include +// Without this, build will fail due to clash between onigposix.h +// and regex.h. +#define GTEST_HAS_POSIX_RE 0 #include #include "config.h" @@ -15,7 +18,7 @@ namespace test { void InitTesting(const char* name, int* argc, char*** argv, bool remove_flags) { ::testing::InitGoogleTest(argc, *argv); - google::ParseCommandLineFlags(argc, argv, remove_flags); + gflags::ParseCommandLineFlags(argc, argv, remove_flags); google::InitGoogleLogging(name); google::InstallFailureSignalHandler(); evthread_use_pthreads(); Index: head/security/certificate-transparency/files/patch-cpp_util_bench__etcd.cc =================================================================== --- head/security/certificate-transparency/files/patch-cpp_util_bench__etcd.cc (revision 424044) +++ head/security/certificate-transparency/files/patch-cpp_util_bench__etcd.cc (revision 424045) @@ -1,11 +1,11 @@ ---- cpp/util/bench_etcd.cc.orig 2016-02-02 11:35:23 UTC +--- cpp/util/bench_etcd.cc.orig 2016-10-14 17:11:57 UTC +++ cpp/util/bench_etcd.cc @@ -105,7 +105,7 @@ void test_etcd(int thread_num) { int main(int argc, char* argv[]) { - google::ParseCommandLineFlags(&argc, &argv, true); + gflags::ParseCommandLineFlags(&argc, &argv, true); google::InitGoogleLogging(argv[0]); evthread_use_pthreads();