svn commit: r409754 - in head/security/certificate-transparency: . files
Edward Tomasz Napierala
trasz at FreeBSD.org
Sun Feb 28 18:30:48 UTC 2016
Author: trasz
Date: Sun Feb 28 18:30:44 2016
New Revision: 409754
URL: https://svnweb.freebsd.org/changeset/ports/409754
Log:
Update security/certificate-transparency to 20160102.
Sponsored by: The FreeBSD Foundation
Added:
head/security/certificate-transparency/files/patch-cpp-server-ct-mirror_v2.cc (contents, props changed)
head/security/certificate-transparency/files/patch-cpp-server-ct-server_v2.cc (contents, props changed)
head/security/certificate-transparency/files/patch-cpp-server-log_processes.cc (contents, props changed)
head/security/certificate-transparency/files/patch-cpp-server-server_helper.cc (contents, props changed)
head/security/certificate-transparency/files/patch-cpp-server-xjson-server.cc (contents, props changed)
head/security/certificate-transparency/files/patch-cpp-util-bignum.h (contents, props changed)
head/security/certificate-transparency/files/patch-cpp_util_bench__etcd.cc (contents, props changed)
Deleted:
head/security/certificate-transparency/files/patch-cpp-util-bench_etcd.cc
Modified:
head/security/certificate-transparency/Makefile
head/security/certificate-transparency/distinfo
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-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-plist
Modified: head/security/certificate-transparency/Makefile
==============================================================================
--- head/security/certificate-transparency/Makefile Sun Feb 28 18:15:13 2016 (r409753)
+++ head/security/certificate-transparency/Makefile Sun Feb 28 18:30:44 2016 (r409754)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= certificate-transparency
-PORTVERSION= 20151025
+PORTVERSION= 20160102
CATEGORIES= security
MAINTAINER= trasz at FreeBSD.org
@@ -18,6 +18,7 @@ LIB_DEPENDS?= libevent.so:${PORTSDIR}/de
libgmock.so:${PORTSDIR}/devel/googlemock \
libjson-c.so:${PORTSDIR}/devel/json-c \
libleveldb.so:${PORTSDIR}/databases/leveldb \
+ libobjecthash.so:${PORTSDIR}/devel/objecthash \
libprotobuf.so:${PORTSDIR}/devel/protobuf \
libsqlite3.so:${PORTSDIR}/databases/sqlite3 \
libtcmalloc.so:${PORTSDIR}/devel/google-perftools
@@ -31,7 +32,7 @@ MAKE_FLAGS+= "V=1"
USE_GITHUB= yes
GH_ACCOUNT= google
GH_PROJECT= certificate-transparency
-GH_TAGNAME= 7e1cf3b
+GH_TAGNAME= 1cdd6b5
CPPFLAGS+= "-I${LOCALBASE}/include"
CPPFLAGS+= "-I${LOCALBASE}/include/evhtp"
Modified: head/security/certificate-transparency/distinfo
==============================================================================
--- head/security/certificate-transparency/distinfo Sun Feb 28 18:15:13 2016 (r409753)
+++ head/security/certificate-transparency/distinfo Sun Feb 28 18:30:44 2016 (r409754)
@@ -1,2 +1,2 @@
-SHA256 (google-certificate-transparency-20151025-7e1cf3b_GH0.tar.gz) = d8f4beac5a9d0b8248c9d3c4c318160937b6a26e84401fb262c326c5bc57fd9c
-SIZE (google-certificate-transparency-20151025-7e1cf3b_GH0.tar.gz) = 10404561
+SHA256 (google-certificate-transparency-20160102-1cdd6b5_GH0.tar.gz) = 7d84ffb97bf35729715aef8de5d471f4e83d3a48dbf5cec27a75bc03f0db5bce
+SIZE (google-certificate-transparency-20160102-1cdd6b5_GH0.tar.gz) = 10441387
Modified: head/security/certificate-transparency/files/patch-Makefile.am
==============================================================================
--- head/security/certificate-transparency/files/patch-Makefile.am Sun Feb 28 18:15:13 2016 (r409753)
+++ head/security/certificate-transparency/files/patch-Makefile.am Sun Feb 28 18:30:44 2016 (r409754)
@@ -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 \
Modified: head/security/certificate-transparency/files/patch-configure.ac
==============================================================================
--- head/security/certificate-transparency/files/patch-configure.ac Sun Feb 28 18:15:13 2016 (r409753)
+++ head/security/certificate-transparency/files/patch-configure.ac Sun Feb 28 18:30:44 2016 (r409754)
@@ -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])
Modified: head/security/certificate-transparency/files/patch-cpp-client-ct.cc
==============================================================================
--- head/security/certificate-transparency/files/patch-cpp-client-ct.cc Sun Feb 28 18:15:13 2016 (r409753)
+++ head/security/certificate-transparency/files/patch-cpp-client-ct.cc Sun Feb 28 18:30:44 2016 (r409754)
@@ -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 {
Modified: head/security/certificate-transparency/files/patch-cpp-fetcher-remote_peer_test.cc
==============================================================================
--- head/security/certificate-transparency/files/patch-cpp-fetcher-remote_peer_test.cc Sun Feb 28 18:15:13 2016 (r409753)
+++ head/security/certificate-transparency/files/patch-cpp-fetcher-remote_peer_test.cc Sun Feb 28 18:30:44 2016 (r409754)
@@ -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>
Modified: 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 Sun Feb 28 18:15:13 2016 (r409753)
+++ head/security/certificate-transparency/files/patch-cpp-log-cluster_state_controller_test.cc Sun Feb 28 18:30:44 2016 (r409754)
@@ -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".
Modified: 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 Sun Feb 28 18:15:13 2016 (r409753)
+++ head/security/certificate-transparency/files/patch-cpp-log-etcd_consistent_store_test.cc Sun Feb 28 18:30:44 2016 (r409754)
@@ -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>
Modified: head/security/certificate-transparency/files/patch-cpp-log-frontend_signer_test.cc
==============================================================================
--- head/security/certificate-transparency/files/patch-cpp-log-frontend_signer_test.cc Sun Feb 28 18:15:13 2016 (r409753)
+++ head/security/certificate-transparency/files/patch-cpp-log-frontend_signer_test.cc Sun Feb 28 18:30:44 2016 (r409754)
@@ -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>
Modified: head/security/certificate-transparency/files/patch-cpp-log-frontend_test.cc
==============================================================================
--- head/security/certificate-transparency/files/patch-cpp-log-frontend_test.cc Sun Feb 28 18:15:13 2016 (r409753)
+++ head/security/certificate-transparency/files/patch-cpp-log-frontend_test.cc Sun Feb 28 18:30:44 2016 (r409754)
@@ -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>
Modified: head/security/certificate-transparency/files/patch-cpp-log-log_lookup_test.cc
==============================================================================
--- head/security/certificate-transparency/files/patch-cpp-log-log_lookup_test.cc Sun Feb 28 18:15:13 2016 (r409753)
+++ head/security/certificate-transparency/files/patch-cpp-log-log_lookup_test.cc Sun Feb 28 18:30:44 2016 (r409754)
@@ -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
Modified: head/security/certificate-transparency/files/patch-cpp-log-tree_signer_test.cc
==============================================================================
--- head/security/certificate-transparency/files/patch-cpp-log-tree_signer_test.cc Sun Feb 28 18:15:13 2016 (r409753)
+++ head/security/certificate-transparency/files/patch-cpp-log-tree_signer_test.cc Sun Feb 28 18:30:44 2016 (r409754)
@@ -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>
Modified: head/security/certificate-transparency/files/patch-cpp-net-url_fetcher_test.cc
==============================================================================
--- head/security/certificate-transparency/files/patch-cpp-net-url_fetcher_test.cc Sun Feb 28 18:15:13 2016 (r409753)
+++ head/security/certificate-transparency/files/patch-cpp-net-url_fetcher_test.cc Sun Feb 28 18:30:44 2016 (r409754)
@@ -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>
Modified: head/security/certificate-transparency/files/patch-cpp-server-ct-mirror.cc
==============================================================================
--- head/security/certificate-transparency/files/patch-cpp-server-ct-mirror.cc Sun Feb 28 18:15:13 2016 (r409753)
+++ head/security/certificate-transparency/files/patch-cpp-server-ct-mirror.cc Sun Feb 28 18:30:44 2016 (r409754)
@@ -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;
Added: head/security/certificate-transparency/files/patch-cpp-server-ct-mirror_v2.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/certificate-transparency/files/patch-cpp-server-ct-mirror_v2.cc Sun Feb 28 18:30:44 2016 (r409754)
@@ -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;
Modified: head/security/certificate-transparency/files/patch-cpp-server-ct-server.cc
==============================================================================
--- head/security/certificate-transparency/files/patch-cpp-server-ct-server.cc Sun Feb 28 18:15:13 2016 (r409753)
+++ head/security/certificate-transparency/files/patch-cpp-server-ct-server.cc Sun Feb 28 18:30:44 2016 (r409754)
@@ -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;
Added: head/security/certificate-transparency/files/patch-cpp-server-ct-server_v2.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/certificate-transparency/files/patch-cpp-server-ct-server_v2.cc Sun Feb 28 18:30:44 2016 (r409754)
@@ -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;
Added: head/security/certificate-transparency/files/patch-cpp-server-log_processes.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/certificate-transparency/files/patch-cpp-server-log_processes.cc Sun Feb 28 18:30:44 2016 (r409754)
@@ -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;
Added: head/security/certificate-transparency/files/patch-cpp-server-server_helper.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/certificate-transparency/files/patch-cpp-server-server_helper.cc Sun Feb 28 18:30:44 2016 (r409754)
@@ -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;
+
Added: head/security/certificate-transparency/files/patch-cpp-server-xjson-server.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/certificate-transparency/files/patch-cpp-server-xjson-server.cc Sun Feb 28 18:30:44 2016 (r409754)
@@ -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;
Modified: head/security/certificate-transparency/files/patch-cpp-tools-dump_sth.cc
==============================================================================
--- head/security/certificate-transparency/files/patch-cpp-tools-dump_sth.cc Sun Feb 28 18:15:13 2016 (r409753)
+++ head/security/certificate-transparency/files/patch-cpp-tools-dump_sth.cc Sun Feb 28 18:30:44 2016 (r409754)
@@ -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);
Added: head/security/certificate-transparency/files/patch-cpp-util-bignum.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/certificate-transparency/files/patch-cpp-util-bignum.h Sun Feb 28 18:30:44 2016 (r409754)
@@ -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 {
+
Modified: head/security/certificate-transparency/files/patch-cpp-util-etcd_masterelection.cc
==============================================================================
--- head/security/certificate-transparency/files/patch-cpp-util-etcd_masterelection.cc Sun Feb 28 18:15:13 2016 (r409753)
+++ head/security/certificate-transparency/files/patch-cpp-util-etcd_masterelection.cc Sun Feb 28 18:30:44 2016 (r409754)
@@ -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
Modified: head/security/certificate-transparency/files/patch-cpp-util-etcd_test.cc
==============================================================================
--- head/security/certificate-transparency/files/patch-cpp-util-etcd_test.cc Sun Feb 28 18:15:13 2016 (r409753)
+++ head/security/certificate-transparency/files/patch-cpp-util-etcd_test.cc Sun Feb 28 18:30:44 2016 (r409754)
@@ -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".
Modified: head/security/certificate-transparency/files/patch-cpp-util-fake_etcd_test.cc
==============================================================================
--- head/security/certificate-transparency/files/patch-cpp-util-fake_etcd_test.cc Sun Feb 28 18:15:13 2016 (r409753)
+++ head/security/certificate-transparency/files/patch-cpp-util-fake_etcd_test.cc Sun Feb 28 18:30:44 2016 (r409754)
@@ -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>
Modified: head/security/certificate-transparency/files/patch-cpp-util-init.cc
==============================================================================
--- head/security/certificate-transparency/files/patch-cpp-util-init.cc Sun Feb 28 18:15:13 2016 (r409753)
+++ head/security/certificate-transparency/files/patch-cpp-util-init.cc Sun Feb 28 18:30:44 2016 (r409754)
@@ -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();
Modified: head/security/certificate-transparency/files/patch-cpp-util-libevent_wrapper_test.cc
==============================================================================
--- head/security/certificate-transparency/files/patch-cpp-util-libevent_wrapper_test.cc Sun Feb 28 18:15:13 2016 (r409753)
+++ head/security/certificate-transparency/files/patch-cpp-util-libevent_wrapper_test.cc Sun Feb 28 18:30:44 2016 (r409754)
@@ -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"
Modified: head/security/certificate-transparency/files/patch-cpp-util-masterelection_test.cc
==============================================================================
--- head/security/certificate-transparency/files/patch-cpp-util-masterelection_test.cc Sun Feb 28 18:15:13 2016 (r409753)
+++ head/security/certificate-transparency/files/patch-cpp-util-masterelection_test.cc Sun Feb 28 18:30:44 2016 (r409754)
@@ -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>
Modified: head/security/certificate-transparency/files/patch-cpp-util-testing.cc
==============================================================================
--- head/security/certificate-transparency/files/patch-cpp-util-testing.cc Sun Feb 28 18:15:13 2016 (r409753)
+++ head/security/certificate-transparency/files/patch-cpp-util-testing.cc Sun Feb 28 18:30:44 2016 (r409754)
@@ -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>
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 Feb 28 18:30:44 2016 (r409754)
@@ -0,0 +1,11 @@
+--- 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) {
+
+
+ int main(int argc, char* argv[]) {
+- google::ParseCommandLineFlags(&argc, &argv, true);
++ gflags::ParseCommandLineFlags(&argc, &argv, true);
+ google::InitGoogleLogging(argv[0]);
+ evthread_use_pthreads();
+
Modified: head/security/certificate-transparency/pkg-plist
==============================================================================
--- head/security/certificate-transparency/pkg-plist Sun Feb 28 18:15:13 2016 (r409753)
+++ head/security/certificate-transparency/pkg-plist Sun Feb 28 18:30:44 2016 (r409754)
@@ -2,3 +2,6 @@ bin/ct
bin/ct-clustertool
bin/ct-mirror
bin/ct-server
+bin/ct-mirror-v2
+bin/ct-server-v2
+bin/xjson-server
More information about the svn-ports-all
mailing list