Remove expired ports:

2021-04-22 net/samba411: Security Support ends on 03 Dec 2020
2021-04-22 net-im/cordless: Unmaintained and dead upstream, uses the old Discord API which notably has got users banned
2021-04-18 news/plor: listed as "Alpha-release" but last update in 2001; unmaintained
2021-04-20 security/certificate-transparency: Broken for more than 6 months

32 files changed, 0 insertions, 464 deletions

diff --git a/security/certificate-transparency/files/patch-Makefile.am b/security/certificate-transparency/files/patch-Makefile.am
deleted file mode 100644
index aa2136fe60c8..000000000000
--- a/security/certificate-transparency/files/patch-Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
---- Makefile.am.orig	2016-10-14 17:11:57 UTC
-+++ Makefile.am
-@@ -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 \
-@@ -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
- 
-@@ -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 = \
diff --git a/security/certificate-transparency/files/patch-configure.ac b/security/certificate-transparency/files/patch-configure.ac
deleted file mode 100644
index 919648849ca5..000000000000
--- a/security/certificate-transparency/files/patch-configure.ac
+++ /dev/null
@@ -1,31 +0,0 @@
---- 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"])
--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])])
-@@ -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])])
- 
-+# Required for "make check" to build.
-+LIBS="$LIBS -lgtest -lgmock"
-+
- save_LIBS="$LIBS"
- AS_UNSET([LIBS])
- AC_SEARCH_LIBS([snappy_compress], [snappy],,, [$save_LIBS])
diff --git a/security/certificate-transparency/files/patch-cpp-client-ct.cc b/security/certificate-transparency/files/patch-cpp-client-ct.cc
deleted file mode 100644
index cf02f5cc3c18..000000000000
--- a/security/certificate-transparency/files/patch-cpp-client-ct.cc
+++ /dev/null
@@ -1,49 +0,0 @@
---- 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() {
--  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;
- 
-@@ -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))
-@@ -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;
-   }
- 
-@@ -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;
-   }
- 
diff --git a/security/certificate-transparency/files/patch-cpp-fetcher-remote_peer_test.cc b/security/certificate-transparency/files/patch-cpp-fetcher-remote_peer_test.cc
deleted file mode 100644
index 1623ad7f0f4c..000000000000
--- a/security/certificate-transparency/files/patch-cpp-fetcher-remote_peer_test.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 <gflags/gflags.h>
- #include <glog/logging.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 <openssl/err.h>
diff --git a/security/certificate-transparency/files/patch-cpp-log-cluster_state_controller_test.cc b/security/certificate-transparency/files/patch-cpp-log-cluster_state_controller_test.cc
deleted file mode 100644
index bde372e31594..000000000000
--- a/security/certificate-transparency/files/patch-cpp-log-cluster_state_controller_test.cc
+++ /dev/null
@@ -1,9 +0,0 @@
---- 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 <gtest/gtest.h>
- #include <map>
- #include <memory>
diff --git a/security/certificate-transparency/files/patch-cpp-log-etcd_consistent_store_test.cc b/security/certificate-transparency/files/patch-cpp-log-etcd_consistent_store_test.cc
deleted file mode 100644
index 177efefc9bc9..000000000000
--- a/security/certificate-transparency/files/patch-cpp-log-etcd_consistent_store_test.cc
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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 <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 <atomic>
diff --git a/security/certificate-transparency/files/patch-cpp-log-frontend_signer_test.cc b/security/certificate-transparency/files/patch-cpp-log-frontend_signer_test.cc
deleted file mode 100644
index fd8a94cf8528..000000000000
--- a/security/certificate-transparency/files/patch-cpp-log-frontend_signer_test.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 <glog/logging.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 <memory>
diff --git a/security/certificate-transparency/files/patch-cpp-log-frontend_test.cc b/security/certificate-transparency/files/patch-cpp-log-frontend_test.cc
deleted file mode 100644
index 9db8990cee24..000000000000
--- a/security/certificate-transparency/files/patch-cpp-log-frontend_test.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 <glog/logging.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 <openssl/err.h>
diff --git a/security/certificate-transparency/files/patch-cpp-log-log_lookup_test.cc b/security/certificate-transparency/files/patch-cpp-log-log_lookup_test.cc
deleted file mode 100644
index 65107926e52c..000000000000
--- a/security/certificate-transparency/files/patch-cpp-log-log_lookup_test.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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 <gtest/gtest.h>
- #include <memory>
- #include <string>
diff --git a/security/certificate-transparency/files/patch-cpp-log-logged_entry.h b/security/certificate-transparency/files/patch-cpp-log-logged_entry.h
deleted file mode 100644
index 2194fa5ccfaf..000000000000
--- a/security/certificate-transparency/files/patch-cpp-log-logged_entry.h
+++ /dev/null
@@ -1,15 +0,0 @@
-Obtained from:	https://github.com/google/certificate-transparency/commit/6776cc2c4cca665c088019d40f9587189a5d687d
-
---- cpp/log/logged_entry.h.orig
-+++ cpp/log/logged_entry.h
-@@ -25,9 +25,7 @@ class LoggedEntry : private ct::LoggedEntryPB {
-   using LoggedEntryPB::merkle_leaf_hash;
-   using LoggedEntryPB::set_merkle_leaf_hash;
-   using LoggedEntryPB::set_sequence_number;
--  void CopyFrom(const ::google::protobuf::Message& from) {
--    LoggedEntryPB::CopyFrom(from);
--  }
-+  using LoggedEntryPB::CopyFrom;
-   void CopyFrom(const LoggedEntry& from) {
-     LoggedEntryPB::CopyFrom(from);
-   }
diff --git a/security/certificate-transparency/files/patch-cpp-log-tree_signer_test.cc b/security/certificate-transparency/files/patch-cpp-log-tree_signer_test.cc
deleted file mode 100644
index 5f85720c4998..000000000000
--- a/security/certificate-transparency/files/patch-cpp-log-tree_signer_test.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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 <gtest/gtest.h>
- #include <stdint.h>
- #include <memory>
diff --git a/security/certificate-transparency/files/patch-cpp-net-url_fetcher_test.cc b/security/certificate-transparency/files/patch-cpp-net-url_fetcher_test.cc
deleted file mode 100644
index 2a7fa89a4de6..000000000000
--- a/security/certificate-transparency/files/patch-cpp-net-url_fetcher_test.cc
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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 <fcntl.h>
- #include <gflags/gflags.h>
- #include <glog/logging.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 <gtest/gtest.h>
- #include <csignal>
- #ifdef HAVE_NETDB_H
diff --git a/security/certificate-transparency/files/patch-cpp-server-ct-dns-server.cc b/security/certificate-transparency/files/patch-cpp-server-ct-dns-server.cc
deleted file mode 100644
index 6d2c24829812..000000000000
--- a/security/certificate-transparency/files/patch-cpp-server-ct-dns-server.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- cpp/server/ct-dns-server.cc.orig	2016-10-14 17:11:57 UTC
-+++ cpp/server/ct-dns-server.cc
-@@ -17,7 +17,7 @@ using cert_trans::LogLookup;
- using cert_trans::LoggedEntry;
- using cert_trans::SQLiteDB;
- using ct::SignedTreeHead;
--using google::RegisterFlagValidator;
-+using gflags::RegisterFlagValidator;
- using std::string;
- using std::stringstream;
- 
diff --git a/security/certificate-transparency/files/patch-cpp-server-ct-mirror.cc b/security/certificate-transparency/files/patch-cpp-server-ct-mirror.cc
deleted file mode 100644
index 5f3814ddf0a7..000000000000
--- a/security/certificate-transparency/files/patch-cpp-server-ct-mirror.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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;
diff --git a/security/certificate-transparency/files/patch-cpp-server-ct-mirror_v2.cc b/security/certificate-transparency/files/patch-cpp-server-ct-mirror_v2.cc
deleted file mode 100644
index 2e3fae249770..000000000000
--- a/security/certificate-transparency/files/patch-cpp-server-ct-mirror_v2.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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;
diff --git a/security/certificate-transparency/files/patch-cpp-server-ct-server.cc b/security/certificate-transparency/files/patch-cpp-server-ct-server.cc
deleted file mode 100644
index 61de3a4df72c..000000000000
--- a/security/certificate-transparency/files/patch-cpp-server-ct-server.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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;
diff --git a/security/certificate-transparency/files/patch-cpp-server-ct-server_v2.cc b/security/certificate-transparency/files/patch-cpp-server-ct-server_v2.cc
deleted file mode 100644
index fe3a4016cfe6..000000000000
--- a/security/certificate-transparency/files/patch-cpp-server-ct-server_v2.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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;
diff --git a/security/certificate-transparency/files/patch-cpp-server-log_processes.cc b/security/certificate-transparency/files/patch-cpp-server-log_processes.cc
deleted file mode 100644
index 9b5e2b4a5517..000000000000
--- a/security/certificate-transparency/files/patch-cpp-server-log_processes.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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;
diff --git a/security/certificate-transparency/files/patch-cpp-server-server_helper.cc b/security/certificate-transparency/files/patch-cpp-server-server_helper.cc
deleted file mode 100644
index 434fb8d39a67..000000000000
--- a/security/certificate-transparency/files/patch-cpp-server-server_helper.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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;
- 
diff --git a/security/certificate-transparency/files/patch-cpp-server-xjson-server.cc b/security/certificate-transparency/files/patch-cpp-server-xjson-server.cc
deleted file mode 100644
index 6b5a7c171a82..000000000000
--- a/security/certificate-transparency/files/patch-cpp-server-xjson-server.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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;
diff --git a/security/certificate-transparency/files/patch-cpp-tools-dump_sth.cc b/security/certificate-transparency/files/patch-cpp-tools-dump_sth.cc
deleted file mode 100644
index 73845faa7dcd..000000000000
--- a/security/certificate-transparency/files/patch-cpp-tools-dump_sth.cc
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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]);
diff --git a/security/certificate-transparency/files/patch-cpp-util-bignum.h b/security/certificate-transparency/files/patch-cpp-util-bignum.h
deleted file mode 100644
index 72ed93760e60..000000000000
--- a/security/certificate-transparency/files/patch-cpp-util-bignum.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- cpp/util/bignum.h.orig	2016-10-14 17:11:57 UTC
-+++ cpp/util/bignum.h
-@@ -3,6 +3,7 @@
- 
- #include <openssl/bn.h>
- #include <cassert>
-+#include <stdint.h>
- 
- namespace cert_trans {
- 
diff --git a/security/certificate-transparency/files/patch-cpp-util-etcd_masterelection.cc b/security/certificate-transparency/files/patch-cpp-util-etcd_masterelection.cc
deleted file mode 100644
index 0995ceb17c44..000000000000
--- a/security/certificate-transparency/files/patch-cpp-util-etcd_masterelection.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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";
diff --git a/security/certificate-transparency/files/patch-cpp-util-etcd_test.cc b/security/certificate-transparency/files/patch-cpp-util-etcd_test.cc
deleted file mode 100644
index 5b8cdd9eb91a..000000000000
--- a/security/certificate-transparency/files/patch-cpp-util-etcd_test.cc
+++ /dev/null
@@ -1,9 +0,0 @@
---- 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 <gmock/gmock.h>
- #include <gtest/gtest.h>
- #include <list>
diff --git a/security/certificate-transparency/files/patch-cpp-util-fake_etcd_test.cc b/security/certificate-transparency/files/patch-cpp-util-fake_etcd_test.cc
deleted file mode 100644
index 876f2e3c9798..000000000000
--- a/security/certificate-transparency/files/patch-cpp-util-fake_etcd_test.cc
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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 <gflags/gflags.h>
- #include <glog/logging.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 <atomic>
diff --git a/security/certificate-transparency/files/patch-cpp-util-init.cc b/security/certificate-transparency/files/patch-cpp-util-init.cc
deleted file mode 100644
index 59ceecd9dde9..000000000000
--- a/security/certificate-transparency/files/patch-cpp-util-init.cc
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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
diff --git a/security/certificate-transparency/files/patch-cpp-util-libevent_wrapper_test.cc b/security/certificate-transparency/files/patch-cpp-util-libevent_wrapper_test.cc
deleted file mode 100644
index 001748361172..000000000000
--- a/security/certificate-transparency/files/patch-cpp-util-libevent_wrapper_test.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 <gtest/gtest.h>
- 
- #include "util/testing.h"
diff --git a/security/certificate-transparency/files/patch-cpp-util-masterelection_test.cc b/security/certificate-transparency/files/patch-cpp-util-masterelection_test.cc
deleted file mode 100644
index 3255920e57a4..000000000000
--- a/security/certificate-transparency/files/patch-cpp-util-masterelection_test.cc
+++ /dev/null
@@ -1,12 +0,0 @@
---- cpp/util/masterelection_test.cc.orig	2016-10-14 17:11:57 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
-+// 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 <atomic>
diff --git a/security/certificate-transparency/files/patch-cpp-util-testing.cc b/security/certificate-transparency/files/patch-cpp-util-testing.cc
deleted file mode 100644
index 99c1a14d021e..000000000000
--- a/security/certificate-transparency/files/patch-cpp-util-testing.cc
+++ /dev/null
@@ -1,21 +0,0 @@
---- cpp/util/testing.cc.orig	2016-10-14 17:11:57 UTC
-+++ cpp/util/testing.cc
-@@ -3,6 +3,9 @@
- #include <event2/thread.h>
- #include <evhtp.h>
- #include <glog/logging.h>
-+// Without this, build will fail due to clash between onigposix.h
-+// and regex.h.
-+#define GTEST_HAS_POSIX_RE 0
- #include <gtest/gtest.h>
- 
- #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();
diff --git a/security/certificate-transparency/files/patch-cpp_net_connection__pool.cc b/security/certificate-transparency/files/patch-cpp_net_connection__pool.cc
deleted file mode 100644
index 866ea194b9a8..000000000000
--- a/security/certificate-transparency/files/patch-cpp_net_connection__pool.cc
+++ /dev/null
@@ -1,18 +0,0 @@
---- cpp/net/connection_pool.cc.orig	2018-01-04 08:45:06 UTC
-+++ cpp/net/connection_pool.cc
-@@ -454,12 +454,12 @@ unique_ptr<ConnectionPool::Connection> ConnectionPool:
-                                     kZeroMillis};
-     evhtp_connection_set_timeouts(handle->connection(), &read_timeout,
-                                   &write_timeout);
--    evhtp_set_hook(&handle->connection()->hooks, evhtp_hook_on_conn_error,
-+    evhtp_connection_set_hook(handle->connection(), evhtp_hook_on_conn_error,
-                    reinterpret_cast<evhtp_hook>(
-                        EvConnection::ConnectionErrorHook),
-                    reinterpret_cast<void*>(conn.get()));
--    evhtp_set_hook(
--        &handle->connection()->hooks, evhtp_hook_on_connection_fini,
-+    evhtp_connection_set_hook(
-+        handle->connection(), evhtp_hook_on_connection_fini,
-         reinterpret_cast<evhtp_hook>(EvConnection::ConnectionFinishedHook),
-         // We'll hold on to another shared_ptr to the Connection
-         // until evhtp tells us that it's finished with the cnxn.
diff --git a/security/certificate-transparency/files/patch-cpp_net_url__fetcher.cc b/security/certificate-transparency/files/patch-cpp_net_url__fetcher.cc
deleted file mode 100644
index e4457fa51443..000000000000
--- a/security/certificate-transparency/files/patch-cpp_net_url__fetcher.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- cpp/net/url_fetcher.cc.orig	2018-01-04 08:54:28 UTC
-+++ cpp/net/url_fetcher.cc
-@@ -4,7 +4,7 @@
- #include <event2/keyvalq_struct.h>
- #include <evhtp.h>
- #include <glog/logging.h>
--#include <htparse.h>
-+#include <parser.h>
- 
- #include "net/connection_pool.h"
- #include "util/thread_pool.h"
diff --git a/security/certificate-transparency/files/patch-cpp_util_bench__etcd.cc b/security/certificate-transparency/files/patch-cpp_util_bench__etcd.cc
deleted file mode 100644
index dc7871a5cb8c..000000000000
--- a/security/certificate-transparency/files/patch-cpp_util_bench__etcd.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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();
-