sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (dc12c10d847f91219c6793c3047f765ff4a9fcad)

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 (dc12c10d847f91219c6793c3047f765ff4a9fcad)
Date: Fri, 19 Jan 2018 15:06:55 +0000

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

utils/sysdig/DETAILS | 4 ++--
utils/sysdig/HISTORY | 5 +++++
utils/sysdig/PRE_BUILD | 1 +
utils/sysdig/gcc46.patch | 36 ++++++++++++++++++++++++++++++------
utils/sysdig/scope.patch | 11 +++++++++++
5 files changed, 49 insertions(+), 8 deletions(-)

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

sysdig: => 0.20.0

diff --git a/utils/sysdig/DETAILS b/utils/sysdig/DETAILS
index b7b8314..ac1303d 100755
--- a/utils/sysdig/DETAILS
+++ b/utils/sysdig/DETAILS
@@ -1,8 +1,8 @@
SPELL=sysdig
- VERSION=0.19.1
+ VERSION=0.20.0
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_URL[0]=https://github.com/draios/${SPELL}/archive/${VERSION}.tar.gz
-
SOURCE_HASH=sha512:a3947ecd2019af75d787d956b3931dc1aac593279256a92fc02ff0d7e0a85f23786ab821da9bf3ec55430e4da56f70c8583d1b5d24782b426f7deb6f1fca69eb
+
SOURCE_HASH=sha512:2549c8e2d0db0abd95e31272837fe5072c4c26926b2d17348bd8d73177bc024bab0a8503aa427f9134d8ca0a0bbc05fe97495933c3b8236db5fcb74df7c1efb2
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 51dd311..65ec290 100644
--- a/utils/sysdig/HISTORY
+++ b/utils/sysdig/HISTORY
@@ -1,3 +1,8 @@
+2018-01-19 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.20.0
+ * gcc46.patch: updated for new version
+ * scope.patch: added, to fix GCC warning
+
2017-10-05 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.19.1

diff --git a/utils/sysdig/PRE_BUILD b/utils/sysdig/PRE_BUILD
index 65cefc7..227fe7b 100755
--- a/utils/sysdig/PRE_BUILD
+++ b/utils/sysdig/PRE_BUILD
@@ -1,6 +1,7 @@
default_pre_build &&
cd "${SOURCE_DIRECTORY}" &&

+patch -p0 < "${SPELL_DIRECTORY}/scope.patch" &&
patch -p0 < "${SPELL_DIRECTORY}/ssl-link.patch" &&

if spell_ok gcc && is_version_less $(installed_version gcc) 4.8; then
diff --git a/utils/sysdig/gcc46.patch b/utils/sysdig/gcc46.patch
index 1c6a453..0740f20 100644
--- a/utils/sysdig/gcc46.patch
+++ b/utils/sysdig/gcc46.patch
@@ -454,7 +454,7 @@
class sinsp_bearer_token
--- userspace/libsinsp/socket_handler.h.orig 2016-10-25 18:43:37.000000000
-0400
+++ userspace/libsinsp/socket_handler.h 2016-10-26 15:25:11.790901756
-0400
-@@ -64,12 +64,32 @@
+@@ -85,12 +85,32 @@
m_url(url),
m_keep_alive(keep_alive ? std::string("Connection:
keep-alive\r\n") : std::string()),
m_path(path.empty() ? m_url.get_path() : path),
@@ -487,7 +487,7 @@
m_data_limit(data_limit),
m_fetching_state(fetching_state)

-@@ -1514,11 +1534,13 @@
+@@ -1549,11 +1569,13 @@

struct http_parser_data
{
@@ -506,7 +506,18 @@
};

static int http_body_callback(http_parser* parser, const char* data,
size_t len)
-@@ -1645,43 +1667,43 @@
+@@ -1672,8 +1694,8 @@
+ return http_reason::get(status);
+ }
+
+- using gaicb_t = std::unique_ptr<struct gaicb* [], gaicb_free>;
+- using dns_list_t = std::deque<gaicb_t>;
++ typedef std::unique_ptr<struct gaicb* [], gaicb_free> gaicb_t;
++ typedef std::deque<gaicb_t> dns_list_t;
+
+ gaicb_t make_gaicb(const std::string &host)
+ {
+@@ -1689,43 +1711,43 @@
std::string m_keep_alive;
std::string m_path;
std::string m_address;
@@ -526,9 +537,9 @@
+ bool m_blocking;
std::vector<char> m_buf;
- int m_sock_err = 0;
-- struct gaicb** m_dns_reqs = nullptr;
+- gaicb_t m_dns_reqs = nullptr;
+ int m_sock_err;
-+ struct gaicb** m_dns_reqs;
++ gaicb_t m_dns_reqs;
static dns_list_t m_pending_dns_reqs;
ssl_ptr_t m_ssl;
bt_ptr_t m_bt;
@@ -573,7 +584,7 @@

// older versions of kubernetes send pretty-printed JSON by default;
// that creates a problem with JSON-newline-delimit-based detection
logic,
-@@ -1692,7 +1714,7 @@
+@@ -1736,7 +1758,7 @@
// this flag is true by default and it remains true until the first
state http
// request for this handler is completed, at which point all newlines
are purged
// from the string and the purged buffer is posted for further
processing
@@ -902,3 +913,16 @@
}

return it->second->tostring(evt, res);
+--- userspace/libsinsp/json_error_log.cpp.orig 2018-01-18 17:17:32.000000000
-0500
++++ userspace/libsinsp/json_error_log.cpp 2018-01-19 09:50:04.424016332
-0500
+@@ -89,8 +89,8 @@
+ if(it == m_buckets.end() ||
+ it->first != uri)
+ {
+- it = m_buckets.emplace_hint(it,
+- std::make_pair(uri,
token_bucket()));
++ it = m_buckets.insert(it,
++ std::move(std::make_pair(uri,
token_bucket())));
+
+ it->second.init(m_events_rate, m_events_max_burst);
+ }
diff --git a/utils/sysdig/scope.patch b/utils/sysdig/scope.patch
new file mode 100644
index 0000000..bb6d4a9
--- /dev/null
+++ b/utils/sysdig/scope.patch
@@ -0,0 +1,11 @@
+--- userspace/libsinsp/table.cpp.orig 2018-01-18 17:17:32.000000000 -0500
++++ userspace/libsinsp/table.cpp 2018-01-19 09:58:07.294349664 -0500
+@@ -668,7 +668,7 @@
+ Json::Value jd;
+ auto row = sample_data->at(k);
+
+- for(uint32_t j = 0; j < m_n_fields - 1; j++)
++ for(j = 0; j < m_n_fields - 1; j++)
+ {
+ sinsp_filter_check* extractor = m_extractors->at(j +
1);
+ uint64_t td = 0;

[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (dc12c10d847f91219c6793c3047f765ff4a9fcad), Vlad Glagolev, 01/19/2018