diff options
Diffstat (limited to 'databases/hypertable/files')
-rw-r--r-- | databases/hypertable/files/patch-FindRRDtool.cmake | 13 | ||||
-rw-r--r-- | databases/hypertable/files/patch-ht-env.sh | 12 | ||||
-rw-r--r-- | databases/hypertable/files/patch-injail | 10 | ||||
-rw-r--r-- | databases/hypertable/files/patch-src_cc_Hypertable_Lib_HqlInterpreter.cc | 29 |
4 files changed, 0 insertions, 64 deletions
diff --git a/databases/hypertable/files/patch-FindRRDtool.cmake b/databases/hypertable/files/patch-FindRRDtool.cmake deleted file mode 100644 index b6672d4f726d..000000000000 --- a/databases/hypertable/files/patch-FindRRDtool.cmake +++ /dev/null @@ -1,13 +0,0 @@ ---- cmake/FindRRDtool.cmake.orig 2010-08-10 16:56:32.000000000 +0000 -+++ cmake/FindRRDtool.cmake 2010-08-10 16:56:53.000000000 +0000 -@@ -50,8 +50,8 @@ - - message(STATUS "${RRD_LIBRARY} ${RRD_INCLUDE_DIR} ${FREETYPE_LIBRARY} ${PNG12_LIBRARY} ${ART_LGPL_2_LIBRARY}") - --if (RRD_LIBRARY AND RRD_INCLUDE_DIR AND FREETYPE_LIBRARY AND PNG12_LIBRARY AND ART_LGPL_2_LIBRARY) -- set(RRD_LIBRARIES ${RRD_LIBRARY} ${FREETYPE_LIBRARY} ${PNG12_LIBRARY} ${ART_LGPL_2_LIBRARY}) -+if (RRD_LIBRARY AND RRD_INCLUDE_DIR) -+ set(RRD_LIBRARIES ${RRD_LIBRARY}) - set(RRD_FOUND "YES") - message(STATUS "Found RRDtool: ${RRD_LIBRARIES}") - else () diff --git a/databases/hypertable/files/patch-ht-env.sh b/databases/hypertable/files/patch-ht-env.sh deleted file mode 100644 index 836d37362c7c..000000000000 --- a/databases/hypertable/files/patch-ht-env.sh +++ /dev/null @@ -1,12 +0,0 @@ ---- bin/ht-env.sh 2010-05-06 12:24:43.000000000 +0000 -+++ bin/ht-env.sh 2010-05-06 12:25:00.000000000 +0000 -@@ -179,9 +179,6 @@ - - # Sanity check - [ "$HYPERTABLE_HOME" ] || die "ERROR: HYPERTABLE_HOME is not set" --versionre='/([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\.[a-fA-F0-9]+)?|current)$' --[[ $HYPERTABLE_HOME =~ $versionre ]] || -- die "ERROR: Invalid HYPERTABLE_HOME: $HYPERTABLE_HOME" - - # Make sure log and run directories exist - [ -d $HYPERTABLE_HOME/run ] || mkdir $HYPERTABLE_HOME/run diff --git a/databases/hypertable/files/patch-injail b/databases/hypertable/files/patch-injail deleted file mode 100644 index f1206ad4f912..000000000000 --- a/databases/hypertable/files/patch-injail +++ /dev/null @@ -1,10 +0,0 @@ ---- src/cc/AsyncComm/IOHandlerDatagram.h 2010-04-14 17:43:30.000000000 +0000 -+++ src/cc/AsyncComm/IOHandlerDatagram.h 2010-05-04 13:52:53.000000000 +0000 -@@ -45,6 +45,7 @@ - - IOHandlerDatagram(int sd, const InetAddr &addr, DispatchHandlerPtr &dhp) - : IOHandler(sd, addr, dhp), m_send_queue() { -+ m_local_addr.sin_addr.s_addr = addr.sin_addr.s_addr; - m_message = new uint8_t [65536]; - } - diff --git a/databases/hypertable/files/patch-src_cc_Hypertable_Lib_HqlInterpreter.cc b/databases/hypertable/files/patch-src_cc_Hypertable_Lib_HqlInterpreter.cc deleted file mode 100644 index bfa5f41ffb09..000000000000 --- a/databases/hypertable/files/patch-src_cc_Hypertable_Lib_HqlInterpreter.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- src/cc/Hypertable/Lib/HqlInterpreter.cc.orig 2010-12-13 17:56:18.000000000 +0300 -+++ src/cc/Hypertable/Lib/HqlInterpreter.cc 2010-12-13 17:55:27.000000000 +0300 -@@ -272,7 +272,7 @@ - } - else { - out_fd = dup(fileno(outf)); -- fout.push(boost::iostreams::file_descriptor_sink(out_fd)); -+ fout.push(boost::iostreams::file_descriptor_sink(out_fd, boost::iostreams::never_close_handle)); - } - - HT_ON_SCOPE_EXIT(&close_file, out_fd); -@@ -397,7 +397,7 @@ - } - else { - out_fd = dup(fileno(outf)); -- fout.push(boost::iostreams::file_descriptor_sink(out_fd)); -+ fout.push(boost::iostreams::file_descriptor_sink(out_fd, boost::iostreams::never_close_handle)); - } - - HT_ON_SCOPE_EXIT(&close_file, out_fd); -@@ -488,7 +488,7 @@ - else { - if (outf) { - out_fd = dup(fileno(outf)); -- fout.push(boost::iostreams::file_descriptor_sink(out_fd)); -+ fout.push(boost::iostreams::file_descriptor_sink(out_fd, boost::iostreams::never_close_handle)); - } - else - fout.push(boost::iostreams::null_sink()); |