Attachment #175782 for bug #213502

View | Details | Raw Unified | Return to bug 213502
Collapse All | Expand All

Lines 2-9 Link Here

(-)/home/pi/m/security/certificate-transparency/Makefile (-3 / +2 lines)
2	# $FreeBSD: head/security/certificate-transparency/Makefile 422711 2016-09-24 11:06:57Z tijl $	2	# $FreeBSD: head/security/certificate-transparency/Makefile 422711 2016-09-24 11:06:57Z tijl $
3		3
4	PORTNAME= certificate-transparency	4	PORTNAME= certificate-transparency
5	PORTVERSION= 20160102	5	PORTVERSION= 20161015
6	PORTREVISION= 1
7	CATEGORIES= security	6	CATEGORIES= security
8		7
9	MAINTAINER= ports@FreeBSD.org	8	MAINTAINER= ports@FreeBSD.org
Lines 32-38 Link Here
32	MAKE_FLAGS+= "V=1"	31	MAKE_FLAGS+= "V=1"
33	USE_GITHUB= yes	32	USE_GITHUB= yes
34	GH_ACCOUNT= google	33	GH_ACCOUNT= google
35	GH_TAGNAME= 1cdd6b5	34	GH_TAGNAME= 28478cb
36		35
37	CPPFLAGS+= "-I${LOCALBASE}/include"	36	CPPFLAGS+= "-I${LOCALBASE}/include"
38	CPPFLAGS+= "-I${LOCALBASE}/include/evhtp"	37	CPPFLAGS+= "-I${LOCALBASE}/include/evhtp"

Lines 1-2 Link Here

(-)/home/pi/m/security/certificate-transparency/distinfo (-2 / +3 lines)
1	SHA256 (google-certificate-transparency-20160102-1cdd6b5_GH0.tar.gz) = 7d84ffb97bf35729715aef8de5d471f4e83d3a48dbf5cec27a75bc03f0db5bce	1	TIMESTAMP = 1476535326
2	SIZE (google-certificate-transparency-20160102-1cdd6b5_GH0.tar.gz) = 10441387	2	SHA256 (google-certificate-transparency-20161015-28478cb_GH0.tar.gz) = 5dac966842538c4af8f99c721ad8aa4ef5921f67d91ce02b482f30883e3468bd
		3	SIZE (google-certificate-transparency-20161015-28478cb_GH0.tar.gz) = 10509723




--- Makefile.am.orig	2016-10-14 17:11:57 UTC
+++ Makefile.am
@@ -11,8 +11,6 @@ AM_CXXFLAGS = \
 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 = \

 	cpp/monitoring/prometheus/metrics.pb.cc \
 	cpp/monitoring/prometheus/metrics.pb.h \
 	proto/ct.pb.cc \
@@ -131,9 +129,6 @@ endif
 cpp/gtest-all.cc: $(GTEST_DIR)/src/gtest-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
 
@@ -226,8 +221,6 @@ cpp_libtest_a_CPPFLAGS = \
 	-I$(GTEST_DIR) \
 	$(AM_CPPFLAGS)
 cpp_libtest_a_SOURCES = \

 	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 \




--- configure.ac.orig	2016-10-14 17:11:57 UTC
+++ configure.ac
@@ -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"])

 CPPFLAGS="$saved_CPPFLAGS"
 AS_IF([test -n "$missing_gtest"],
       [AC_MSG_ERROR([could not find a working Google Test])])
@@ -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 <gflags/gflags.h>]], [[google::ParseCommandLineFlags(NULL, NULL, true)]])], [have_gflags=yes], [have_gflags=no])
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <gflags/gflags.h>]], [[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])])
@@ -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])])
 




--- cpp/client/ct.cc.orig	2016-10-14 17:11:57 UTC
+++ cpp/client/ct.cc
@@ -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() {

 
   string sct;
 
@@ -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() {

 
   string serialized_sct;
   PCHECK(util::ReadBinaryFile(FLAGS_sct_token, &serialized_sct))
@@ -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) {

     return 1;
   }
 
@@ -983,7 +983,7 @@ int main(int argc, char** argv) {
   } else if (cmd == "sth") {
     ret = GetSTH();
   } else {

Lines 1-4 Link Here

(-)/home/pi/m/security/certificate-transparency/files/patch-cpp-fetcher-remote_peer_test.cc (-1 / +1 lines)
1	--- cpp/fetcher/remote_peer_test.cc.orig 2016-02-02 11:35:23 UTC	1	--- cpp/fetcher/remote_peer_test.cc.orig 2016-10-14 17:11:57 UTC
2	+++ cpp/fetcher/remote_peer_test.cc	2	+++ cpp/fetcher/remote_peer_test.cc
3	@@ -1,5 +1,8 @@	3	@@ -1,5 +1,8 @@
4	#include <gflags/gflags.h>	4	#include <gflags/gflags.h>

Lines 1-4 Link Here

(-)/home/pi/m/security/certificate-transparency/files/patch-cpp-log-cluster_state_controller_test.cc (-1 / +1 lines)
1	--- cpp/log/cluster_state_controller_test.cc.orig 2016-02-02 11:35:23 UTC	1	--- cpp/log/cluster_state_controller_test.cc.orig 2016-10-14 17:11:57 UTC
2	+++ cpp/log/cluster_state_controller_test.cc	2	+++ cpp/log/cluster_state_controller_test.cc
3	@@ -1,3 +1,6 @@	3	@@ -1,3 +1,6 @@
4	+// Without this, build will fail due to clash between onigposix.h	4	+// Without this, build will fail due to clash between onigposix.h

Lines 1-4 Link Here

(-)/home/pi/m/security/certificate-transparency/files/patch-cpp-log-etcd_consistent_store_test.cc (-1 / +1 lines)
1	--- cpp/log/etcd_consistent_store_test.cc.orig 2016-02-02 11:35:23 UTC	1	--- cpp/log/etcd_consistent_store_test.cc.orig 2016-10-14 17:11:57 UTC
2	+++ cpp/log/etcd_consistent_store_test.cc	2	+++ cpp/log/etcd_consistent_store_test.cc
3	@@ -1,6 +1,9 @@	3	@@ -1,6 +1,9 @@
4	#include "log/etcd_consistent_store.h"	4	#include "log/etcd_consistent_store.h"

Lines 1-4 Link Here

(-)/home/pi/m/security/certificate-transparency/files/patch-cpp-log-frontend_signer_test.cc (-1 / +1 lines)
1	--- cpp/log/frontend_signer_test.cc.orig 2016-02-02 11:35:23 UTC	1	--- cpp/log/frontend_signer_test.cc.orig 2016-10-14 17:11:57 UTC
2	+++ cpp/log/frontend_signer_test.cc	2	+++ cpp/log/frontend_signer_test.cc
3	@@ -1,5 +1,8 @@	3	@@ -1,5 +1,8 @@
4	/* -- indent-tabs-mode: nil -- */	4	/* -- indent-tabs-mode: nil -- */

Lines 1-4 Link Here

(-)/home/pi/m/security/certificate-transparency/files/patch-cpp-log-frontend_test.cc (-1 / +1 lines)
1	--- cpp/log/frontend_test.cc.orig 2016-02-02 11:35:23 UTC	1	--- cpp/log/frontend_test.cc.orig 2016-10-14 17:11:57 UTC
2	+++ cpp/log/frontend_test.cc	2	+++ cpp/log/frontend_test.cc
3	@@ -1,5 +1,8 @@	3	@@ -1,5 +1,8 @@
4	/* -- indent-tabs-mode: nil -- */	4	/* -- indent-tabs-mode: nil -- */

Lines 1-4 Link Here

(-)/home/pi/m/security/certificate-transparency/files/patch-cpp-log-log_lookup_test.cc (-1 / +1 lines)
1	--- cpp/log/log_lookup_test.cc.orig 2016-02-02 11:35:23 UTC	1	--- cpp/log/log_lookup_test.cc.orig 2016-10-14 17:11:57 UTC
2	+++ cpp/log/log_lookup_test.cc	2	+++ cpp/log/log_lookup_test.cc
3	@@ -1,4 +1,7 @@	3	@@ -1,4 +1,7 @@
4	/* -- indent-tabs-mode: nil -- */	4	/* -- indent-tabs-mode: nil -- */

Lines 1-4 Link Here

(-)/home/pi/m/security/certificate-transparency/files/patch-cpp-log-tree_signer_test.cc (-1 / +1 lines)
1	--- cpp/log/tree_signer_test.cc.orig 2016-02-02 11:35:23 UTC	1	--- cpp/log/tree_signer_test.cc.orig 2016-10-14 17:11:57 UTC
2	+++ cpp/log/tree_signer_test.cc	2	+++ cpp/log/tree_signer_test.cc
3	@@ -1,4 +1,7 @@	3	@@ -1,4 +1,7 @@
4	/* -- indent-tabs-mode: nil -- */	4	/* -- indent-tabs-mode: nil -- */

Lines 1-4 Link Here

(-)/home/pi/m/security/certificate-transparency/files/patch-cpp-net-url_fetcher_test.cc (-1 / +1 lines)
1	--- cpp/net/url_fetcher_test.cc.orig 2016-02-02 11:35:23 UTC	1	--- cpp/net/url_fetcher_test.cc.orig 2016-10-14 17:11:57 UTC
2	+++ cpp/net/url_fetcher_test.cc	2	+++ cpp/net/url_fetcher_test.cc
3	@@ -7,6 +7,9 @@	3	@@ -7,6 +7,9 @@
4	#include <fcntl.h>	4	#include <fcntl.h>

Line 0 Link Here

(-)/home/pi/m/security/certificate-transparency/files/patch-cpp-server-ct-dns-server.cc (+11 lines)
	1	--- cpp/server/ct-dns-server.cc.orig 2016-10-14 17:11:57 UTC
	2	+++ cpp/server/ct-dns-server.cc
	3	@@ -17,7 +17,7 @@ using cert_trans::LogLookup;
	4	using cert_trans::LoggedEntry;
	5	using cert_trans::SQLiteDB;
	6	using ct::SignedTreeHead;
	7	-using google::RegisterFlagValidator;
	8	+using gflags::RegisterFlagValidator;
	9	using std::string;
	10	using std::stringstream;
	11

Lines 1-4 Link Here

(-)/home/pi/m/security/certificate-transparency/files/patch-cpp-server-ct-mirror.cc (-1 / +1 lines)
1	--- cpp/server/ct-mirror.cc.orig 2016-02-02 11:35:23 UTC	1	--- cpp/server/ct-mirror.cc.orig 2016-10-14 17:11:57 UTC
2	+++ cpp/server/ct-mirror.cc	2	+++ cpp/server/ct-mirror.cc
3	@@ -98,7 +98,7 @@ using cert_trans::Update;	3	@@ -98,7 +98,7 @@ using cert_trans::Update;
4	using cert_trans::UrlFetcher;	4	using cert_trans::UrlFetcher;

Lines 1-4 Link Here

(-)/home/pi/m/security/certificate-transparency/files/patch-cpp-server-ct-mirror_v2.cc (-1 / +1 lines)
1	--- cpp/server/ct-mirror_v2.cc.orig 2016-02-02 11:35:23 UTC	1	--- cpp/server/ct-mirror_v2.cc.orig 2016-10-14 17:11:57 UTC
2	+++ cpp/server/ct-mirror_v2.cc	2	+++ cpp/server/ct-mirror_v2.cc
3	@@ -91,7 +91,7 @@ using cert_trans::Update;	3	@@ -91,7 +91,7 @@ using cert_trans::Update;
4	using cert_trans::UrlFetcher;	4	using cert_trans::UrlFetcher;

Lines 1-4 Link Here

(-)/home/pi/m/security/certificate-transparency/files/patch-cpp-server-ct-server.cc (-1 / +1 lines)
1	--- cpp/server/ct-server.cc.orig 2016-02-02 11:35:23 UTC	1	--- cpp/server/ct-server.cc.orig 2016-10-14 17:11:57 UTC
2	+++ cpp/server/ct-server.cc	2	+++ cpp/server/ct-server.cc
3	@@ -64,7 +64,7 @@ using cert_trans::TreeSigner;	3	@@ -64,7 +64,7 @@ using cert_trans::TreeSigner;
4	using cert_trans::UrlFetcher;	4	using cert_trans::UrlFetcher;

Lines 1-4 Link Here

(-)/home/pi/m/security/certificate-transparency/files/patch-cpp-server-ct-server_v2.cc (-1 / +1 lines)
1	--- cpp/server/ct-server_v2.cc.orig 2016-02-02 11:35:23 UTC	1	--- cpp/server/ct-server_v2.cc.orig 2016-10-14 17:11:57 UTC
2	+++ cpp/server/ct-server_v2.cc	2	+++ cpp/server/ct-server_v2.cc
3	@@ -66,7 +66,7 @@ using cert_trans::TreeSigner;	3	@@ -66,7 +66,7 @@ using cert_trans::TreeSigner;
4	using cert_trans::UrlFetcher;	4	using cert_trans::UrlFetcher;

Lines 1-4 Link Here

(-)/home/pi/m/security/certificate-transparency/files/patch-cpp-server-log_processes.cc (-1 / +1 lines)
1	--- cpp/server/log_processes.cc.orig 2016-02-02 11:35:23 UTC	1	--- cpp/server/log_processes.cc.orig 2016-10-14 17:11:57 UTC
2	+++ cpp/server/log_processes.cc	2	+++ cpp/server/log_processes.cc
3	@@ -23,7 +23,7 @@ DEFINE_int32(cleanup_frequency_seconds,	3	@@ -23,7 +23,7 @@ DEFINE_int32(cleanup_frequency_seconds,
4	using cert_trans::Counter;	4	using cert_trans::Counter;

Lines 1-4 Link Here

(-)/home/pi/m/security/certificate-transparency/files/patch-cpp-server-server_helper.cc (-1 / +1 lines)
1	--- cpp/server/server_helper.cc.orig 2016-02-02 11:35:23 UTC	1	--- cpp/server/server_helper.cc.orig 2016-10-14 17:11:57 UTC
2	+++ cpp/server/server_helper.cc	2	+++ cpp/server/server_helper.cc
3	@@ -4,7 +4,7 @@	3	@@ -4,7 +4,7 @@
4	#include "util/fake_etcd.h"	4	#include "util/fake_etcd.h"

Lines 1-4 Link Here

(-)/home/pi/m/security/certificate-transparency/files/patch-cpp-server-xjson-server.cc (-1 / +1 lines)
1	--- cpp/server/xjson-server.cc.orig 2016-02-02 11:35:23 UTC	1	--- cpp/server/xjson-server.cc.orig 2016-10-14 17:11:57 UTC
2	+++ cpp/server/xjson-server.cc	2	+++ cpp/server/xjson-server.cc
3	@@ -63,7 +63,7 @@ using cert_trans::UrlFetcher;	3	@@ -63,7 +63,7 @@ using cert_trans::UrlFetcher;
4	using cert_trans::XJsonHttpHandler;	4	using cert_trans::XJsonHttpHandler;

Lines 1-4 Link Here

(-)/home/pi/m/security/certificate-transparency/files/patch-cpp-tools-dump_sth.cc (-1 / +1 lines)
1	--- cpp/tools/dump_sth.cc.orig 2016-02-02 11:35:23 UTC	1	--- cpp/tools/dump_sth.cc.orig 2016-10-14 17:11:57 UTC
2	+++ cpp/tools/dump_sth.cc	2	+++ cpp/tools/dump_sth.cc
3	@@ -26,11 +26,11 @@ void DumpSth(const char* filename) {	3	@@ -26,11 +26,11 @@ void DumpSth(const char* filename) {
4		4

Lines 1-4 Link Here

(-)/home/pi/m/security/certificate-transparency/files/patch-cpp-util-bignum.h (-1 / +1 lines)
1	--- cpp/util/bignum.h.orig 2016-02-02 11:35:23 UTC	1	--- cpp/util/bignum.h.orig 2016-10-14 17:11:57 UTC
2	+++ cpp/util/bignum.h	2	+++ cpp/util/bignum.h
3	@@ -3,6 +3,7 @@	3	@@ -3,6 +3,7 @@
4		4

Lines 1-4 Link Here

(-)/home/pi/m/security/certificate-transparency/files/patch-cpp-util-etcd_masterelection.cc (-1 / +1 lines)
1	--- cpp/util/etcd_masterelection.cc.orig 2016-02-02 11:35:23 UTC	1	--- cpp/util/etcd_masterelection.cc.orig 2016-10-14 17:11:57 UTC
2	+++ cpp/util/etcd_masterelection.cc	2	+++ cpp/util/etcd_masterelection.cc
3	@@ -24,7 +24,7 @@ DEFINE_string(node_id, "", "unique node	3	@@ -24,7 +24,7 @@ DEFINE_string(node_id, "", "unique node
4		4

Lines 1-4 Link Here

(-)/home/pi/m/security/certificate-transparency/files/patch-cpp-util-etcd_test.cc (-1 / +1 lines)
1	--- cpp/util/etcd_test.cc.orig 2016-02-02 11:35:23 UTC	1	--- cpp/util/etcd_test.cc.orig 2016-10-14 17:11:57 UTC
2	+++ cpp/util/etcd_test.cc	2	+++ cpp/util/etcd_test.cc
3	@@ -1,3 +1,6 @@	3	@@ -1,3 +1,6 @@
4	+// Without this, build will fail due to clash between onigposix.h	4	+// Without this, build will fail due to clash between onigposix.h

Lines 1-4 Link Here

(-)/home/pi/m/security/certificate-transparency/files/patch-cpp-util-fake_etcd_test.cc (-1 / +1 lines)
1	--- cpp/util/fake_etcd_test.cc.orig 2016-02-02 11:35:23 UTC	1	--- cpp/util/fake_etcd_test.cc.orig 2016-10-14 17:11:57 UTC
2	+++ cpp/util/fake_etcd_test.cc	2	+++ cpp/util/fake_etcd_test.cc
3	@@ -2,6 +2,9 @@	3	@@ -2,6 +2,9 @@
4		4

Lines 1-4 Link Here

(-)/home/pi/m/security/certificate-transparency/files/patch-cpp-util-init.cc (-1 / +1 lines)
1	--- cpp/util/init.cc.orig 2016-02-02 11:35:23 UTC	1	--- cpp/util/init.cc.orig 2016-10-14 17:11:57 UTC
2	+++ cpp/util/init.cc	2	+++ cpp/util/init.cc
3	@@ -49,8 +49,8 @@ void LibEventLog(int severity, const cha	3	@@ -49,8 +49,8 @@ void LibEventLog(int severity, const cha
4		4

Lines 1-4 Link Here

(-)/home/pi/m/security/certificate-transparency/files/patch-cpp-util-libevent_wrapper_test.cc (-1 / +1 lines)
1	--- cpp/util/libevent_wrapper_test.cc.orig 2016-02-02 11:35:23 UTC	1	--- cpp/util/libevent_wrapper_test.cc.orig 2016-10-14 17:11:57 UTC
2	+++ cpp/util/libevent_wrapper_test.cc	2	+++ cpp/util/libevent_wrapper_test.cc
3	@@ -1,5 +1,8 @@	3	@@ -1,5 +1,8 @@
4	#include "util/libevent_wrapper.h"	4	#include "util/libevent_wrapper.h"

Lines 1-4 Link Here

(-)/home/pi/m/security/certificate-transparency/files/patch-cpp-util-masterelection_test.cc (-1 / +1 lines)
1	--- cpp/util/masterelection_test.cc.orig 2016-02-02 11:35:23 UTC	1	--- cpp/util/masterelection_test.cc.orig 2016-10-14 17:11:57 UTC
2	+++ cpp/util/masterelection_test.cc	2	+++ cpp/util/masterelection_test.cc
3	@@ -3,6 +3,9 @@	3	@@ -3,6 +3,9 @@
4	#include <event2/thread.h>	4	#include <event2/thread.h>

Lines 1-4 Link Here

(-)/home/pi/m/security/certificate-transparency/files/patch-cpp-util-testing.cc (-1 / +1 lines)
1	--- cpp/util/testing.cc.orig 2016-02-02 11:35:23 UTC	1	--- cpp/util/testing.cc.orig 2016-10-14 17:11:57 UTC
2	+++ cpp/util/testing.cc	2	+++ cpp/util/testing.cc
3	@@ -3,6 +3,9 @@	3	@@ -3,6 +3,9 @@
4	#include <event2/thread.h>	4	#include <event2/thread.h>

Lines 1-4 Link Here

(-)/home/pi/m/security/certificate-transparency/files/patch-cpp_util_bench__etcd.cc (-1 / +1 lines)
1	--- cpp/util/bench_etcd.cc.orig 2016-02-02 11:35:23 UTC	1	--- cpp/util/bench_etcd.cc.orig 2016-10-14 17:11:57 UTC
2	+++ cpp/util/bench_etcd.cc	2	+++ cpp/util/bench_etcd.cc
3	@@ -105,7 +105,7 @@ void test_etcd(int thread_num) {	3	@@ -105,7 +105,7 @@ void test_etcd(int thread_num) {
4		4

Return to bug 213502

Lines 1-14 Link Here

(-)/home/pi/m/security/certificate-transparency/files/patch-Makefile.am (-22 / +4 lines)
1	--- Makefile.am.orig 2016-02-02 11:35:23 UTC	1	--- Makefile.am.orig 2016-10-14 17:11:57 UTC
2	+++ Makefile.am	2	+++ Makefile.am
3	@@ -3,7 +3,6 @@ ACLOCAL_AMFLAGS = -Im4	3	@@ -11,8 +11,6 @@ AM_CXXFLAGS = \
4	AM_CPPFLAGS = \
5	-I$(GMOCK_DIR)/include \
6	-I$(GTEST_DIR)/include \
7	- -Ithird_party/objecthash \
8	$(evhtp_CFLAGS) \
9	$(icu_CFLAGS) \
10	$(json_c_CFLAGS)
11	@@ -12,8 +11,6 @@ AM_CXXFLAGS = \
12	-fno-exceptions	4	-fno-exceptions
13		5
14	BUILT_SOURCES = \	6	BUILT_SOURCES = \
Lines 17-23 Link Here
17	cpp/monitoring/prometheus/metrics.pb.cc \	9	cpp/monitoring/prometheus/metrics.pb.cc \
18	cpp/monitoring/prometheus/metrics.pb.h \	10	cpp/monitoring/prometheus/metrics.pb.h \
19	proto/ct.pb.cc \	11	proto/ct.pb.cc \
20	@@ -124,9 +121,6 @@ endif	12	@@ -131,9 +129,6 @@ endif
21	cpp/gtest-all.cc: $(GTEST_DIR)/src/gtest-all.cc	13	cpp/gtest-all.cc: $(GTEST_DIR)/src/gtest-all.cc
22	$(AM_V_at)cp $^ $@	14	$(AM_V_at)cp $^ $@
23		15
Lines 27-33 Link Here
27	test/testdata/urlfetcher_test_certs/localhost-key.pem: test/create_url_fetcher_test_certs.sh	19	test/testdata/urlfetcher_test_certs/localhost-key.pem: test/create_url_fetcher_test_certs.sh
28	$(AM_V_GEN)test/create_url_fetcher_test_certs.sh	20	$(AM_V_GEN)test/create_url_fetcher_test_certs.sh
29		21
30	@@ -215,8 +209,6 @@ cpp_libtest_a_CPPFLAGS = \	22	@@ -226,8 +221,6 @@ cpp_libtest_a_CPPFLAGS = \
31	-I$(GTEST_DIR) \	23	-I$(GTEST_DIR) \
32	$(AM_CPPFLAGS)	24	$(AM_CPPFLAGS)
33	cpp_libtest_a_SOURCES = \	25	cpp_libtest_a_SOURCES = \
Lines 36-48 Link Here
36	cpp/util/testing.cc	28	cpp/util/testing.cc
37		29
38	cpp_server_ct_mirror_LDADD = \	30	cpp_server_ct_mirror_LDADD = \
39	@@ -297,8 +289,7 @@ cpp_server_xjson_server_SOURCES = \
40	cpp/server/server_helper.cc \
41	cpp/server/xjson-server.cc \
42	cpp/server/x_json_handler.cc \
43	- cpp/util/json_wrapper.cc \
44	- third_party/objecthash/objecthash.cc
45	+ cpp/util/json_wrapper.cc
46
47	cpp_tools_ct_clustertool_LDADD = \
48	cpp/libcore.a \

Lines 1-6 Link Here

(-)/home/pi/m/security/certificate-transparency/files/patch-configure.ac (-6 / +6 lines)
1	--- configure.ac.orig 2016-02-02 11:35:23 UTC	1	--- configure.ac.orig 2016-10-14 17:11:57 UTC
2	+++ configure.ac	2	+++ configure.ac
3	@@ -83,9 +83,7 @@ AC_CHECK_HEADER([gtest/gtest.h],, [missi	3	@@ -84,9 +84,7 @@ AC_CHECK_HEADER([gtest/gtest.h],, [missi
4	AS_VAR_APPEND([CPPFLAGS], [" -I$GMOCK_DIR/include"])	4	AS_VAR_APPEND([CPPFLAGS], [" -I$GMOCK_DIR/include"])
5	AC_CHECK_HEADER([gmock/gmock.h],, [missing_gmock=1])	5	AC_CHECK_HEADER([gmock/gmock.h],, [missing_gmock=1])
6	AS_VAR_APPEND([CPPFLAGS], [" -I$GTEST_DIR"])	6	AS_VAR_APPEND([CPPFLAGS], [" -I$GTEST_DIR"])
Lines 10-25 Link Here
10	CPPFLAGS="$saved_CPPFLAGS"	10	CPPFLAGS="$saved_CPPFLAGS"
11	AS_IF([test -n "$missing_gtest"],	11	AS_IF([test -n "$missing_gtest"],
12	[AC_MSG_ERROR([could not find a working Google Test])])	12	[AC_MSG_ERROR([could not find a working Google Test])])
13	@@ -105,7 +103,7 @@ AC_SEARCH_LIBS([clock_gettime], [rt],,,	13	@@ -106,7 +104,7 @@ AC_SEARCH_LIBS([clock_gettime], [rt],,,
14		14
15	AC_MSG_CHECKING([checking for gflags library])	15	AC_MSG_CHECKING([checking for gflags library])
16	LIBS="-lgflags $LIBS"	16	LIBS="-lgflags $LIBS"
17	-AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <gflags/gflags.h>], [google::ParseCommandLineFlags(NULL, NULL, true)])], [have_gflags=yes], [have_gflags=no])	17	-AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <gflags/gflags.h>]], [[google::ParseCommandLineFlags(NULL, NULL, true)]])], [have_gflags=yes], [have_gflags=no])
18	+AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <gflags/gflags.h>], [gflags::ParseCommandLineFlags(NULL, NULL, true)])], [have_gflags=yes], [have_gflags=no])	18	+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <gflags/gflags.h>]], [[gflags::ParseCommandLineFlags(NULL, NULL, true)]])], [have_gflags=yes], [have_gflags=no])
19	AC_MSG_RESULT([$have_gflags])	19	AC_MSG_RESULT([$have_gflags])
20	AS_IF([test "x$have_gflags" = "xno"],	20	AS_IF([test "x$have_gflags" = "xno"],
21	[AC_MSG_ERROR([gflags library could not be found])])	21	[AC_MSG_ERROR([gflags library could not be found])])
22	@@ -117,6 +115,9 @@ AC_MSG_RESULT([$have_glog])	22	@@ -118,6 +116,9 @@ AC_MSG_RESULT([$have_glog])
23	AS_IF([test "x$have_glog" = "xno"],	23	AS_IF([test "x$have_glog" = "xno"],
24	[AC_MSG_ERROR([glog library could not be found])])	24	[AC_MSG_ERROR([glog library could not be found])])
25		25

Lines 1-6 Link Here

(-)/home/pi/m/security/certificate-transparency/files/patch-cpp-client-ct.cc (-5 / +6 lines)
1	--- cpp/client/ct.cc.orig 2016-02-02 11:35:23 UTC	1	--- cpp/client/ct.cc.orig 2016-10-14 17:11:57 UTC
2	+++ cpp/client/ct.cc	2	+++ cpp/client/ct.cc
3	@@ -461,8 +461,8 @@ static void MakeCert() {	3	@@ -451,8 +451,8 @@ static void MakeCert() {
4	// (This means the relevant section should be last in the configuration.)	4	// (This means the relevant section should be last in the configuration.)
5	// 1.2.3.1=DER:[raw encoding of proof]	5	// 1.2.3.1=DER:[raw encoding of proof]
6	static void WriteProofToConfig() {	6	static void WriteProofToConfig() {
Lines 11-17 Link Here
11		11
12	string sct;	12	string sct;
13		13
14	@@ -489,8 +489,8 @@ static const char kPEMLabel[] = "SERVERI	14	@@ -479,8 +479,8 @@ static const char kPEMLabel[] = "SERVERI
15	// Wrap the proof in the format expected by the TLS extension,	15	// Wrap the proof in the format expected by the TLS extension,
16	// so that we can feed it to OpenSSL.	16	// so that we can feed it to OpenSSL.
17	static void ProofToExtensionData() {	17	static void ProofToExtensionData() {
Lines 22-34 Link Here
22		22
23	string serialized_sct;	23	string serialized_sct;
24	PCHECK(util::ReadBinaryFile(FLAGS_sct_token, &serialized_sct))	24	PCHECK(util::ReadBinaryFile(FLAGS_sct_token, &serialized_sct))
25	@@ -990,12 +990,12 @@ int Monitor() {	25	@@ -939,13 +939,13 @@ int GetSTH() {
26	// Exit code upon abnormal exit (CHECK failures): != 0	26	// Exit code upon abnormal exit (CHECK failures): != 0
27	// (on UNIX, 134 is expected)	27	// (on UNIX, 134 is expected)
28	int main(int argc, char** argv) {	28	int main(int argc, char** argv) {
29	- google::SetUsageMessage(argv[0] + string(kUsage));	29	- google::SetUsageMessage(argv[0] + string(kUsage));
30	+ gflags::SetUsageMessage(argv[0] + string(kUsage));	30	+ gflags::SetUsageMessage(argv[0] + string(kUsage));
31	util::InitCT(&argc, &argv);	31	util::InitCT(&argc, &argv);
		32	ConfigureSerializerForV1CT();
32		33
33	const string main_command(argv[0]);	34	const string main_command(argv[0]);
34	if (argc < 2) {	35	if (argc < 2) {
Lines 37-43 Link Here
37	return 1;	38	return 1;
38	}	39	}
39		40
40	@@ -1035,7 +1035,7 @@ int main(int argc, char** argv) {	41	@@ -983,7 +983,7 @@ int main(int argc, char** argv) {
41	} else if (cmd == "sth") {	42	} else if (cmd == "sth") {
42	ret = GetSTH();	43	ret = GetSTH();
43	} else {	44	} else {