remove ccirrelo/supervisor, update

everything seems to work even though sirupsen is upper case?

:cyfap:

vendor/github.com/apache/thrift/lib/c_glib/src/thrift/c_glib/transport/thrift_ssl_socket.c

@@ -383,17 +383,16 @@ gboolean thrift_ssl_load_cert_from_buffer(ThriftSSLSocket *ssl_socket, const cha
   X509_STORE *cert_store = SSL_CTX_get_cert_store(ssl_socket->ctx);
 
   if(cert_store!=NULL){
-      int index = 0;
-      while ((cacert = PEM_read_bio_X509(mem, NULL, 0, NULL))!=NULL) {
-	  if(cacert) {
-	      g_debug("Our certificate name is %s", cacert->name);
-	      X509_STORE_add_cert(cert_store, cacert);
-	      X509_free(cacert);
-	      cacert=NULL;
-	  } /* Free immediately */
-	  index++;
-      }
-      retval=TRUE;
+    int index = 0;
+    while ((cacert = PEM_read_bio_X509(mem, NULL, 0, NULL))!=NULL) {
+      if(cacert) {
+        X509_STORE_add_cert(cert_store, cacert);
+        X509_free(cacert);
+        cacert=NULL;
+      } /* Free immediately */
+      index++;
+    }
+    retval=TRUE;
   }
   BIO_free(mem);
   return retval;

vendor/github.com/apache/thrift/lib/cpp/Makefile.am

@@ -62,7 +62,7 @@ pkgconfig_DATA += thrift-qt5.pc
 endif
 
 AM_CXXFLAGS = -Wall -Wextra -pedantic
-AM_CPPFLAGS = $(BOOST_CPPFLAGS) $(OPENSSL_INCLUDES) -I$(srcdir)/src -D__STDC_LIMIT_MACROS
+AM_CPPFLAGS = $(BOOST_CPPFLAGS) $(OPENSSL_INCLUDES) -I$(srcdir)/src -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
 
 # Define the source files for the module
 

vendor/github.com/apache/thrift/lib/cpp/test/CMakeLists.txt

@@ -19,6 +19,7 @@
 
 include_directories(SYSTEM "${Boost_INCLUDE_DIRS}")
 
+add_definitions("-D__STDC_FORMAT_MACROS")
 add_definitions("-D__STDC_LIMIT_MACROS")
 
 if (WITH_DYN_LINK_TEST)

vendor/github.com/apache/thrift/lib/cpp/test/Makefile.am

@@ -389,7 +389,7 @@ gen-cpp/SecondService.cpp gen-cpp/ThriftTest_constants.cpp gen-cpp/ThriftTest.cp
 gen-cpp/ChildService.cpp gen-cpp/ChildService.h gen-cpp/ParentService.cpp gen-cpp/ParentService.h gen-cpp/proc_types.cpp gen-cpp/proc_types.h: processor/proc.thrift
 	$(THRIFT) --gen cpp:templates,cob_style $<
 
-AM_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(top_srcdir)/lib/cpp/src -D__STDC_LIMIT_MACROS -I.
+AM_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(top_srcdir)/lib/cpp/src -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -I.
 AM_LDFLAGS = $(BOOST_LDFLAGS)
 AM_CXXFLAGS = -Wall -Wextra -pedantic
 

vendor/github.com/apache/thrift/lib/d/Makefile.am

@@ -177,7 +177,7 @@ unittest/.directory:
 	touch $@
 
 unittest/debug/%: src/%.d $(all_targets) unittest/emptymain.d
-	$(DMD) -gc -of$(subst /,$(DMD_OF_DIRSEP),$@) $(d_test_flags) $^
+	$(DMD) -g -of$(subst /,$(DMD_OF_DIRSEP),$@) $(d_test_flags) $^
 
 unittest/release/%: src/%.d $(all_targets) unittest/emptymain.d
 	$(DMD) -O -release -of$(subst /,$(DMD_OF_DIRSEP),$@) $(d_test_flags) $^

vendor/github.com/apache/thrift/lib/d/src/thrift/transport/http.d

@@ -330,7 +330,7 @@ protected:
       "Host: " ~ host_ ~ "\r\n" ~
       "Content-Type: application/x-thrift\r\n" ~
       "Content-Length: " ~ to!string(dataLength) ~ "\r\n" ~
-      "Accept: application/x-thrift\r\n"
+      "Accept: application/x-thrift\r\n" ~
       "User-Agent: Thrift/" ~ VERSION ~ " (D/TClientHttpTransport)\r\n" ~
       "\r\n";
   }

vendor/github.com/apache/thrift/lib/d/src/thrift/transport/socket.d

@@ -79,8 +79,8 @@ abstract class TSocketBase : TBaseTransport {
     version (none) assert(written <= buf.length, text("Implementation wrote " ~
       "more data than requested to?! (", written, " vs. ", buf.length, ")"));
   } body {
-    assert(0, "DMD bug? – Why would contracts work for interfaces, but not "
-      "for abstract methods? "
+    assert(0, "DMD bug? – Why would contracts work for interfaces, but not " ~
+      "for abstract methods? " ~
       "(Error: function […] in and out contracts require function body");
   }
 

vendor/github.com/apache/thrift/lib/nodejs/lib/thrift/multiplexed_protocol.js

@@ -52,17 +52,17 @@ Multiplexer.prototype.createClient = function(serviceName, ServiceClient, connec
   if (ServiceClient.Client) {
     ServiceClient = ServiceClient.Client;
   }
-  var self = this;
-  ServiceClient.prototype.new_seqid = function() {
-    self.seqid += 1;
-    return self.seqid;
-  };
   var writeCb = function(buf, seqid) {
     connection.write(buf,seqid);
   };
   var transport = new connection.transport(undefined, writeCb);
   var protocolWrapper = new Wrapper(serviceName, connection.protocol, connection);
   var client = new ServiceClient(transport, protocolWrapper);
+  var self = this;
+  client.new_seqid = function() {
+    self.seqid += 1;
+    return self.seqid;
+  };
 
   if (typeof connection.client !== 'object') {
     connection.client = {};

vendor/github.com/apache/thrift/lib/php/lib/Thrift/Transport/TSocket.php

@@ -242,8 +242,10 @@ class TSocket extends TTransport
       throw new TException($error);
     }
 
-    $socket = socket_import_stream($this->handle_);
-    socket_set_option($socket, SOL_TCP, TCP_NODELAY, 1);
+    if (function_exists('socket_import_stream') && function_exists('socket_set_option')) {
+      $socket = socket_import_stream($this->handle_);
+      socket_set_option($socket, SOL_TCP, TCP_NODELAY, 1);
+    }
   }
 
   /**

vendor/github.com/apache/thrift/lib/py/src/ext/types.h

@@ -23,6 +23,7 @@
 #include <Python.h>
 
 #ifdef _MSC_VER
+#define __STDC_FORMAT_MACROS
 #define __STDC_LIMIT_MACROS
 #endif
 #include <stdint.h>