From owner-svn-ports-head@freebsd.org Sun Jan 10 10:20:55 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9DC92A69FD7; Sun, 10 Jan 2016 10:20:55 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3D4441AA8; Sun, 10 Jan 2016 10:20:55 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0AAKsF5058998; Sun, 10 Jan 2016 10:20:54 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0AAKpn2058969; Sun, 10 Jan 2016 10:20:51 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201601101020.u0AAKpn2058969@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Sun, 10 Jan 2016 10:20:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r405691 - in head/security: . certificate-transparency certificate-transparency/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jan 2016 10:20:55 -0000 Author: trasz Date: Sun Jan 10 10:20:51 2016 New Revision: 405691 URL: https://svnweb.freebsd.org/changeset/ports/405691 Log: Google's Certificate Transparency project is an open framework for monitoring and auditing SSL certificates in nearly real time. It makes it possible to detect SSL certificates that have been mistakenly issued by a certificate authority or maliciously acquired from an otherwise unimpeachable certificate authority. It also makes it possible to identify certificate authorities that have gone rogue and are maliciously issuing certificates. WWW: https://www.certificate-transparency.org/ Sponsored by: The FreeBSD Foundation Added: head/security/certificate-transparency/ head/security/certificate-transparency/Makefile (contents, props changed) head/security/certificate-transparency/distinfo (contents, props changed) head/security/certificate-transparency/files/ head/security/certificate-transparency/files/patch-Makefile.am (contents, props changed) head/security/certificate-transparency/files/patch-configure.ac (contents, props changed) head/security/certificate-transparency/files/patch-cpp-client-ct.cc (contents, props changed) head/security/certificate-transparency/files/patch-cpp-fetcher-remote_peer_test.cc (contents, props changed) head/security/certificate-transparency/files/patch-cpp-log-cluster_state_controller_test.cc (contents, props changed) head/security/certificate-transparency/files/patch-cpp-log-etcd_consistent_store_test.cc (contents, props changed) head/security/certificate-transparency/files/patch-cpp-log-frontend_signer_test.cc (contents, props changed) head/security/certificate-transparency/files/patch-cpp-log-frontend_test.cc (contents, props changed) head/security/certificate-transparency/files/patch-cpp-log-log_lookup_test.cc (contents, props changed) head/security/certificate-transparency/files/patch-cpp-log-tree_signer_test.cc (contents, props changed) head/security/certificate-transparency/files/patch-cpp-net-url_fetcher_test.cc (contents, props changed) head/security/certificate-transparency/files/patch-cpp-server-ct-mirror.cc (contents, props changed) head/security/certificate-transparency/files/patch-cpp-server-ct-server.cc (contents, props changed) head/security/certificate-transparency/files/patch-cpp-tools-dump_sth.cc (contents, props changed) head/security/certificate-transparency/files/patch-cpp-util-bench_etcd.cc (contents, props changed) head/security/certificate-transparency/files/patch-cpp-util-etcd_masterelection.cc (contents, props changed) head/security/certificate-transparency/files/patch-cpp-util-etcd_test.cc (contents, props changed) head/security/certificate-transparency/files/patch-cpp-util-fake_etcd_test.cc (contents, props changed) head/security/certificate-transparency/files/patch-cpp-util-init.cc (contents, props changed) head/security/certificate-transparency/files/patch-cpp-util-libevent_wrapper_test.cc (contents, props changed) head/security/certificate-transparency/files/patch-cpp-util-masterelection_test.cc (contents, props changed) head/security/certificate-transparency/files/patch-cpp-util-testing.cc (contents, props changed) head/security/certificate-transparency/pkg-descr (contents, props changed) head/security/certificate-transparency/pkg-plist (contents, props changed) Modified: head/security/Makefile Modified: head/security/Makefile ============================================================================== --- head/security/Makefile Sun Jan 10 10:18:13 2016 (r405690) +++ head/security/Makefile Sun Jan 10 10:20:51 2016 (r405691) @@ -50,6 +50,7 @@ SUBDIR += calife SUBDIR += ccrypt SUBDIR += ccsrch + SUBDIR += certificate-transparency SUBDIR += cfs SUBDIR += cfv SUBDIR += chaosreader Added: head/security/certificate-transparency/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/certificate-transparency/Makefile Sun Jan 10 10:20:51 2016 (r405691) @@ -0,0 +1,40 @@ +# Created by: Edward Tomasz Napierala +# $FreeBSD$ + +PORTNAME= certificate-transparency +PORTVERSION= 20151025 +CATEGORIES= security + +MAINTAINER= trasz@FreeBSD.org +COMMENT= Open framework for monitoring and auditing SSL certificates + +LICENSE= APACHE20 + +LIB_DEPENDS?= libevent.so:${PORTSDIR}/devel/libevent2 \ + libevhtp.so:${PORTSDIR}/www/libevhtp \ + libgtest.so:${PORTSDIR}/devel/googletest \ + libgflags.so:${PORTSDIR}/devel/gflags \ + libglog.so:${PORTSDIR}/devel/glog \ + libgmock.so:${PORTSDIR}/devel/googlemock \ + libjson-c.so:${PORTSDIR}/devel/json-c \ + libleveldb.so:${PORTSDIR}/databases/leveldb \ + libprotobuf.so:${PORTSDIR}/devel/protobuf \ + libsqlite3.so:${PORTSDIR}/databases/sqlite3 \ + libtcmalloc.so:${PORTSDIR}/devel/google-perftools + +BROKEN_FreeBSD_8= does not build on FreeBSD < 10.x +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_PROJECT= certificate-transparency +GH_TAGNAME= 7e1cf3b + +CPPFLAGS+= "-I${LOCALBASE}/include" +LDFLAGS+= "-L${LOCALBASE}/lib" + +.include Added: head/security/certificate-transparency/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/certificate-transparency/distinfo Sun Jan 10 10:20:51 2016 (r405691) @@ -0,0 +1,2 @@ +SHA256 (google-certificate-transparency-20151025-7e1cf3b_GH0.tar.gz) = d8f4beac5a9d0b8248c9d3c4c318160937b6a26e84401fb262c326c5bc57fd9c +SIZE (google-certificate-transparency-20151025-7e1cf3b_GH0.tar.gz) = 10404561 Added: head/security/certificate-transparency/files/patch-Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/certificate-transparency/files/patch-Makefile.am Sun Jan 10 10:20:51 2016 (r405691) @@ -0,0 +1,30 @@ +--- 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 = \ + -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 \ +@@ -115,9 +113,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 + +@@ -186,8 +181,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 = \ Added: head/security/certificate-transparency/files/patch-configure.ac ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/certificate-transparency/files/patch-configure.ac Sun Jan 10 10:20:51 2016 (r405691) @@ -0,0 +1,31 @@ +--- configure.ac.orig 2015-10-23 16:31:08.000000000 +0200 ++++ configure.ac 2015-11-23 19:43:54.895959000 +0100 +@@ -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]) + 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],,, + + 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_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]) + 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]) Added: head/security/certificate-transparency/files/patch-cpp-client-ct.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/certificate-transparency/files/patch-cpp-client-ct.cc Sun Jan 10 10:20:51 2016 (r405691) @@ -0,0 +1,48 @@ +--- 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() { + // (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; + +@@ -486,8 +486,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)) +@@ -986,12 +986,12 @@ int Monitor() { + // 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); + + const string main_command(argv[0]); + if (argc < 2) { +- std::cout << google::ProgramUsage(); ++ std::cout << gflags::ProgramUsage(); + return 1; + } + +@@ -1031,7 +1031,7 @@ int main(int argc, char** argv) { + } else if (cmd == "sth") { + ret = GetSTH(); + } else { +- std::cout << google::ProgramUsage(); ++ std::cout << gflags::ProgramUsage(); + ret = 1; + } + Added: head/security/certificate-transparency/files/patch-cpp-fetcher-remote_peer_test.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/certificate-transparency/files/patch-cpp-fetcher-remote_peer_test.cc Sun Jan 10 10:20:51 2016 (r405691) @@ -0,0 +1,11 @@ +--- 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 +@@ -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 "log/etcd_consistent_store.h" Added: head/security/certificate-transparency/files/patch-cpp-log-cluster_state_controller_test.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/certificate-transparency/files/patch-cpp-log-cluster_state_controller_test.cc Sun Jan 10 10:20:51 2016 (r405691) @@ -0,0 +1,9 @@ +--- 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 +@@ -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 Added: head/security/certificate-transparency/files/patch-cpp-log-etcd_consistent_store_test.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/certificate-transparency/files/patch-cpp-log-etcd_consistent_store_test.cc Sun Jan 10 10:20:51 2016 (r405691) @@ -0,0 +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 + #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 Added: head/security/certificate-transparency/files/patch-cpp-log-frontend_signer_test.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/certificate-transparency/files/patch-cpp-log-frontend_signer_test.cc Sun Jan 10 10:20:51 2016 (r405691) @@ -0,0 +1,11 @@ +--- 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 +@@ -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 Added: head/security/certificate-transparency/files/patch-cpp-log-frontend_test.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/certificate-transparency/files/patch-cpp-log-frontend_test.cc Sun Jan 10 10:20:51 2016 (r405691) @@ -0,0 +1,11 @@ +--- 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 +@@ -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 Added: head/security/certificate-transparency/files/patch-cpp-log-log_lookup_test.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/certificate-transparency/files/patch-cpp-log-log_lookup_test.cc Sun Jan 10 10:20:51 2016 (r405691) @@ -0,0 +1,10 @@ +--- 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 +@@ -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 Added: head/security/certificate-transparency/files/patch-cpp-log-tree_signer_test.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/certificate-transparency/files/patch-cpp-log-tree_signer_test.cc Sun Jan 10 10:20:51 2016 (r405691) @@ -0,0 +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 +@@ -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 Added: head/security/certificate-transparency/files/patch-cpp-net-url_fetcher_test.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/certificate-transparency/files/patch-cpp-net-url_fetcher_test.cc Sun Jan 10 10:20:51 2016 (r405691) @@ -0,0 +1,12 @@ +--- 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 @@ + #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 + #ifdef HAVE_NETDB_H + # include Added: head/security/certificate-transparency/files/patch-cpp-server-ct-mirror.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/certificate-transparency/files/patch-cpp-server-ct-mirror.cc Sun Jan 10 10:20:51 2016 (r405691) @@ -0,0 +1,11 @@ +--- 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; + 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; Added: head/security/certificate-transparency/files/patch-cpp-server-ct-server.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/certificate-transparency/files/patch-cpp-server-ct-server.cc Sun Jan 10 10:20:51 2016 (r405691) @@ -0,0 +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; + 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; Added: head/security/certificate-transparency/files/patch-cpp-tools-dump_sth.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/certificate-transparency/files/patch-cpp-tools-dump_sth.cc Sun Jan 10 10:20:51 2016 (r405691) @@ -0,0 +1,17 @@ +--- 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) { + + + 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]); Added: head/security/certificate-transparency/files/patch-cpp-util-bench_etcd.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/certificate-transparency/files/patch-cpp-util-bench_etcd.cc Sun Jan 10 10:20:51 2016 (r405691) @@ -0,0 +1,11 @@ +--- 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 +@@ -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(); + Added: head/security/certificate-transparency/files/patch-cpp-util-etcd_masterelection.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/certificate-transparency/files/patch-cpp-util-etcd_masterelection.cc Sun Jan 10 10:20:51 2016 (r405691) @@ -0,0 +1,11 @@ +--- 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 +@@ -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"; Added: head/security/certificate-transparency/files/patch-cpp-util-etcd_test.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/certificate-transparency/files/patch-cpp-util-etcd_test.cc Sun Jan 10 10:20:51 2016 (r405691) @@ -0,0 +1,9 @@ +--- 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 +@@ -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 Added: head/security/certificate-transparency/files/patch-cpp-util-fake_etcd_test.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/certificate-transparency/files/patch-cpp-util-fake_etcd_test.cc Sun Jan 10 10:20:51 2016 (r405691) @@ -0,0 +1,12 @@ +--- 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 + #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 Added: head/security/certificate-transparency/files/patch-cpp-util-init.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/certificate-transparency/files/patch-cpp-util-init.cc Sun Jan 10 10:20:51 2016 (r405691) @@ -0,0 +1,22 @@ +--- 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 + + + 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(); + +@@ -67,7 +67,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 Added: head/security/certificate-transparency/files/patch-cpp-util-libevent_wrapper_test.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/certificate-transparency/files/patch-cpp-util-libevent_wrapper_test.cc Sun Jan 10 10:20:51 2016 (r405691) @@ -0,0 +1,11 @@ +--- 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 +@@ -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" Added: head/security/certificate-transparency/files/patch-cpp-util-masterelection_test.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/certificate-transparency/files/patch-cpp-util-masterelection_test.cc Sun Jan 10 10:20:51 2016 (r405691) @@ -0,0 +1,12 @@ +--- 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 + #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 + Added: head/security/certificate-transparency/files/patch-cpp-util-testing.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/certificate-transparency/files/patch-cpp-util-testing.cc Sun Jan 10 10:20:51 2016 (r405691) @@ -0,0 +1,21 @@ +--- 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 +@@ -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(); Added: head/security/certificate-transparency/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/certificate-transparency/pkg-descr Sun Jan 10 10:20:51 2016 (r405691) @@ -0,0 +1,8 @@ +Google's Certificate Transparency project is an open framework for monitoring +and auditing SSL certificates in nearly real time. It makes it possible +to detect SSL certificates that have been mistakenly issued by a certificate +authority or maliciously acquired from an otherwise unimpeachable certificate +authority. It also makes it possible to identify certificate authorities +that have gone rogue and are maliciously issuing certificates. + +WWW: https://www.certificate-transparency.org/ Added: head/security/certificate-transparency/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/certificate-transparency/pkg-plist Sun Jan 10 10:20:51 2016 (r405691) @@ -0,0 +1,4 @@ +bin/ct +bin/ct-clustertool +bin/ct-mirror +bin/ct-server