Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (b72baed04174d94173a03302b962efc1263176c9)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (b72baed04174d94173a03302b962efc1263176c9)
  • Date: Mon, 18 Jul 2016 16:09:24 +0000

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

utils/sysdig/BUILD | 4 +++-
utils/sysdig/DEPENDS | 1 +
utils/sysdig/DETAILS | 5 ++---
utils/sysdig/HISTORY | 9 +++++++++
utils/sysdig/PRE_BUILD | 3 +++
utils/sysdig/cmake-mkstemp.patch | 15 +++++++++++++++
utils/sysdig/gcc46.patch | 36 +++---------------------------------
utils/sysdig/jq.patch | 38
++++++++++++++++++++++++++++++++++++++
8 files changed, 74 insertions(+), 37 deletions(-)

New commits:
commit b72baed04174d94173a03302b962efc1263176c9
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

sysdig: => 0.11.0

diff --git a/utils/sysdig/BUILD b/utils/sysdig/BUILD
index 8636810..6e93e97 100755
--- a/utils/sysdig/BUILD
+++ b/utils/sysdig/BUILD
@@ -2,4 +2,6 @@ OPTS="-DSYSDIG_VERSION=$VERSION \
-DENABLE_DKMS=NO \
$OPTS" &&

-cmake_build
+make_single &&
+cmake_build &&
+make_normal
diff --git a/utils/sysdig/DEPENDS b/utils/sysdig/DEPENDS
index c532440..216dab9 100755
--- a/utils/sysdig/DEPENDS
+++ b/utils/sysdig/DEPENDS
@@ -7,3 +7,4 @@ depends luajit '-DUSE_BUNDLED_LUAJIT=NO' &&
depends zlib '-DUSE_BUNDLED_ZLIB=NO' &&
depends SSL '-DUSE_BUNDLED_OPENSSL=NO' &&
depends curl '-DUSE_BUNDLED_CURL=NO'
+depends jq '-DUSE_BUNDLED_JQ=NO'
diff --git a/utils/sysdig/DETAILS b/utils/sysdig/DETAILS
index 15af0c5..2953f99 100755
--- a/utils/sysdig/DETAILS
+++ b/utils/sysdig/DETAILS
@@ -1,9 +1,8 @@
SPELL=sysdig
- VERSION=0.10.1
- PATCHLEVEL=1
+ VERSION=0.11.0
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_URL[0]=https://github.com/draios/${SPELL}/archive/${VERSION}.tar.gz
-
SOURCE_HASH=sha512:dcd023c26589fd674e4adcde3231216db4c6e6f75e44c37bf7394afb9df318290dfd3ba6cd276ff200f773c8be8a3aca2f9b192ff77adfc0e700d26f28760ebb
+
SOURCE_HASH=sha512:8fbfbf2ca242dbc23706669680986bcb4e4fe97eca62b4ebd769edcbedfd75c3cea520b2ebbdc81e39366aacb7197eda58e453b2a378995b518e44619b638361
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE=http://www.sysdig.org/
LICENSE[0]=GPL
diff --git a/utils/sysdig/HISTORY b/utils/sysdig/HISTORY
index 84f4d59..8c832b6 100644
--- a/utils/sysdig/HISTORY
+++ b/utils/sysdig/HISTORY
@@ -1,3 +1,12 @@
+2016-07-18 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.11.0
+ * DEPENDS: added new jq dependency
+ * BUILD: fixed multijob build
+ * PRE_BUILD: apply new patches
+ * gcc46.patch: updated
+ * jq.patch: added, to fix build with system-wide jq
+ * cmake-mkstemp.patch: added, to correctly find mkstemp function
+
2016-06-30 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL=1 to activate triggers
* TRIGGERS: added
diff --git a/utils/sysdig/PRE_BUILD b/utils/sysdig/PRE_BUILD
index ce38964..0b6ddfd 100755
--- a/utils/sysdig/PRE_BUILD
+++ b/utils/sysdig/PRE_BUILD
@@ -5,4 +5,7 @@ if spell_ok gcc && is_version_less $(installed_version gcc)
4.8; then
patch -p0 < "${SPELL_DIRECTORY}/gcc46.patch"
fi &&

+patch -p0 < "${SPELL_DIRECTORY}/jq.patch" &&
+patch -p0 < "${SPELL_DIRECTORY}/cmake-mkstemp.patch" &&
+
sedit "s:DIR_ETC:SYSCONFDIR:" scripts/CMakeLists.txt
diff --git a/utils/sysdig/cmake-mkstemp.patch
b/utils/sysdig/cmake-mkstemp.patch
new file mode 100644
index 0000000..de96bf8
--- /dev/null
+++ b/utils/sysdig/cmake-mkstemp.patch
@@ -0,0 +1,15 @@
+--- CMakeLists.txt.orig 2016-07-14 04:11:40.000000000 -0400
++++ CMakeLists.txt 2016-07-18 11:42:15.787307679 -0400
+@@ -204,9 +204,12 @@
+ #
+ # jq
+ #
++include(CheckFunctionExists)
++
+ if(NOT WIN32 AND NOT APPLE)
+ option(USE_BUNDLED_JQ "Enable building of the bundled jq"
${USE_BUNDLED_DEPS})
+ if(NOT USE_BUNDLED_JQ)
++ check_function_exists(mkstemp HAVE_MKSTEMP)
+ find_path(JQ_INCLUDE jq.h PATH_SUFFIXES jq)
+ find_library(JQ_LIB NAMES jq)
+ if(JQ_INCLUDE AND JQ_LIB)
diff --git a/utils/sysdig/gcc46.patch b/utils/sysdig/gcc46.patch
index b2d216b..51b2f61 100644
--- a/utils/sysdig/gcc46.patch
+++ b/utils/sysdig/gcc46.patch
@@ -79,10 +79,10 @@
};


-@@ -308,8 +310,8 @@
- private:
- int get_replica(const Json::Value& item);
+@@ -318,8 +318,8 @@
+ static int get_count(const Json::Value& item, const std::string&
replica_name = "replicas");

+ protected:
- int m_spec_replicas = UNKNOWN_REPLICAS;
- int m_stat_replicas = UNKNOWN_REPLICAS;
+ int m_spec_replicas;
@@ -135,15 +135,6 @@
{
}

-@@ -557,7 +557,7 @@
- // replication controller
- //
- k8s_rc_t::k8s_rc_t(const std::string& name, const std::string& uid, const
std::string& ns) :
-- k8s_component(COMPONENT_TYPE, name, uid, ns)
-+ k8s_component(COMPONENT_TYPE, name, uid, ns),
m_spec_replicas(UNKNOWN_REPLICAS), m_stat_replicas(UNKNOWN_REPLICAS)
- {
- }
-
--- userspace/libsinsp/uri.h.orig 2016-06-17 11:55:07.000000000 -0400
+++ userspace/libsinsp/uri.h 2016-06-25 20:26:30.103935358 -0400
@@ -53,7 +53,7 @@
@@ -283,27 +274,6 @@
}
auto version_label_it = container->m_labels.find("version");
if(version_label_it != container->m_labels.end())
---- userspace/libsinsp/socket_handler.h.orig 2016-06-17 11:55:07.000000000
-0400
-+++ userspace/libsinsp/socket_handler.h 2016-06-25 20:52:28.893447444
-0400
-@@ -46,7 +46,8 @@
- m_request(make_request(m_url, http_version)),
- m_http_version(http_version),
- m_json_begin("\r\n{"),
-- m_json_end(m_http_version == HTTP_VERSION_10 ? "}\r\n" :
"}\r\n0")
-+ m_json_end(m_http_version == HTTP_VERSION_10 ? "}\r\n" :
"}\r\n0"),
-+ m_content_length(std::string::npos)
- {
- }
-
-@@ -459,7 +460,7 @@
- std::string m_http_version;
- std::string m_json_begin;
- std::string m_json_end;
-- std::string::size_type m_content_length = std::string::npos;
-+ std::string::size_type m_content_length;
- };
-
- template <typename T>
--- userspace/libsinsp/fdinfo.cpp.orig 2016-06-17 11:55:07.000000000 -0400
+++ userspace/libsinsp/fdinfo.cpp 2016-06-25 20:53:35.102556890 -0400
@@ -309,7 +309,7 @@
diff --git a/utils/sysdig/jq.patch b/utils/sysdig/jq.patch
new file mode 100644
index 0000000..6063984
--- /dev/null
+++ b/utils/sysdig/jq.patch
@@ -0,0 +1,38 @@
+--- userspace/libsinsp/json_query.h.orig 2016-07-14 04:11:40.000000000
-0400
++++ userspace/libsinsp/json_query.h 2016-07-18 11:55:48.890138942 -0400
+@@ -24,10 +24,12 @@
+ // jq is not C++-friendly
+ extern "C"
+ {
+- #include "compile.h"
+ #include "jv.h"
+ #include "jq.h"
+ //+++ jq C++ compile fixes
++ #ifdef USE_BUNDLED_JQ
++ #include "compile.h"
++ #include "util.h"
+ #ifndef NDEBUG
+ # define NDEBUG
+ # include "jv_alloc.h"
+@@ -35,6 +37,8 @@
+ #else
+ # include "jv_alloc.h"
+ #endif // NDEBUG
++ #endif //
++ //--- jq C++ compile fixes
+ #ifndef HAVE_MKSTEMP
+ # include <stdlib.h>
+ # include <fcntl.h>
+@@ -58,11 +62,10 @@
+ }
+ # define HAVE_MKSTEMP
+ #endif // HAVE_MKSTEMP
+- //--- jq C++ compile fix
+- #include "util.h"
+ }
+
+ #include <string>
++#include <stdexcept>
+
+ class json_query
+ {



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (b72baed04174d94173a03302b962efc1263176c9), Vlad Glagolev, 07/18/2016

Archive powered by MHonArc 2.6.24.

Top of Page