diff --git a/_service b/_service
index e4141f7..81919d1 100644
--- a/_service
+++ b/_service
@@ -5,8 +5,9 @@
@PARENT_TAG@~git@TAG_OFFSET@.%h
sensor-base-0.6.4
git
- v0.6.4-1
- v(.*)-[0-9]
+ v0.6.4-2
+ v([0-9\.]*)-(.*)
+ \1.\2
enable
enable
diff --git a/_servicedata b/_servicedata
index fc747db..3407f05 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,6 +1,6 @@
- https://github.com/SUSE/linux-security-sensor
- 4298eab00c66e1654f31be67a5734746b9e66808
https://github.com/jeffmahoney/linux-security-sensor
- cb7dfd4978750bca1dc24e06c796adf5df5ca0e3
\ No newline at end of file
+ 45393b11957049ed841f559cf9f3b88dc5a588d9
+ https://github.com/SUSE/linux-security-sensor
+ 45393b11957049ed841f559cf9f3b88dc5a588d9
\ No newline at end of file
diff --git a/update-vendoring.sh b/update-vendoring.sh
index f0cd7ab..0d13691 100644
--- a/update-vendoring.sh
+++ b/update-vendoring.sh
@@ -53,7 +53,7 @@ cd "${dir}"
mv vendor-golang-*${version}.tar.xz vendor-nodejs-${version}.tar.xz ${topdir}
for spec in ${topdir}/*.spec; do
- sed -i "s/^%define vendor_version.*/%define vendor_version %{version}/" ${spec}
+ sed -i "s/^%define vendor_version.*/%define vendor_version ${version}/" ${spec}
done
echo "Done"
diff --git a/velociraptor-0.6.4.2~git31.e1b7fc0e.obscpio b/velociraptor-0.6.4.2~git31.e1b7fc0e.obscpio
new file mode 100644
index 0000000..dc0f1c2
--- /dev/null
+++ b/velociraptor-0.6.4.2~git31.e1b7fc0e.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:02c13973d8a025778b51c537e62cc669fc71c35c2ee019435e5e4d3c31b8b9b4
+size 35173389
diff --git a/velociraptor-0.6.4~git31.4298eab0.obscpio b/velociraptor-0.6.4~git31.4298eab0.obscpio
deleted file mode 100644
index b9c32ec..0000000
--- a/velociraptor-0.6.4~git31.4298eab0.obscpio
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0322511eeb5b7a98ac4dc4eca714d0d06aa37b8ae960c0615316877d4a87833b
-size 35031565
diff --git a/velociraptor-client.changes b/velociraptor-client.changes
index 4edb4f7..afed0c3 100644
--- a/velociraptor-client.changes
+++ b/velociraptor-client.changes
@@ -1,3 +1,42 @@
+-------------------------------------------------------------------
+Thu May 12 20:15:26 UTC 2022 - jeffm@suse.com
+
+- Update to upstream 0.6.4-2:
+ * Reset nanny when client connection failed. (#1780)
+ * Fix artifacts that use yara parameters to specify yara type (#1779)
+ * Update release for bugfixes 0.6.4-2
+ * Add update to ADSHunter for better output on complete system hunts (#28) (#1765)
+ * SysmonInstall artifact now skips install if not needed (#1777)
+ * Initial implementation of client side process tracker. (#1768)
+ * Invalidate transformed cache when the base table changes. (#1742)
+ * GUI Table widgets now can apply transformations on the table. (#1740)
+ * Suppress warning message for offline collector (#1776)
+ * Bug fix (#1774)
+ * Avoid bash process lingering around while server is running (#1775)
+ * oidc: Fix typo: Genric -> Generic (#1773)
+ * Make MaxWait for event table settable. (#1772)
+ * Fixed bug in Windows.Detection.Yara.Process (#1771)
+ * fix: upgrade react-scripts from 5.0.0 to 5.0.1 (#1770)
+ * Bugfix: Client did not update list of query columns (#1767)
+ * Merge bugfixes from master branch. (#1769)
+- Revendored dependencies.
+
+-------------------------------------------------------------------
+Thu May 12 19:21:56 UTC 2022 - jeffm@suse.com
+
+- Update to version 0.6.4~git31.4298eab0:
+ * Add artifact for chattrsnoop plugin
+ * bpflib: ensure it's built only on linux and when requesting bpf
+ * Add chattrsnoop plugin
+ * tcpsnoop: Properly close module in case of attach error
+ * Elastic.Events.Client: Update to use new artifactset type
+ * Kafka.Events.Client: Update to use new artifactset type
+ * artifacts: add artifactset parameter type
+ * api: add type and description fields to v1/GetArtifacts endpoint
+ * Add artifacts for dns/tcp snoop plugins
+ * tcpsnoop: Add timestamp to generated events
+ * dnssnoop: Add timestamp to generated events
+
-------------------------------------------------------------------
Thu May 12 17:54:31 UTC 2022 - jeffm@suse.com
diff --git a/velociraptor-client.spec b/velociraptor-client.spec
index 3780a79..cd3673e 100644
--- a/velociraptor-client.spec
+++ b/velociraptor-client.spec
@@ -16,10 +16,10 @@
#
%define projname velociraptor
-%define vendor_version 0.6.4~git17.cb7dfd49
+%define vendor_version 0.6.4.2~git31.e1b7fc0e
Name: velociraptor-client
-Version: 0.6.4~git31.4298eab0
+Version: 0.6.4.2~git31.e1b7fc0e
Release: 0
Summary: Endpoint visibility and collection tool (endpoint only)
diff --git a/velociraptor.changes b/velociraptor.changes
index 6942ce3..9ef9b56 100644
--- a/velociraptor.changes
+++ b/velociraptor.changes
@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Thu May 12 20:15:26 UTC 2022 - jeffm@suse.com
+
+- Update to upstream 0.6.4-2:
+ * Reset nanny when client connection failed. (#1780)
+ * Fix artifacts that use yara parameters to specify yara type (#1779)
+ * Update release for bugfixes 0.6.4-2
+ * Add update to ADSHunter for better output on complete system hunts (#28) (#1765)
+ * SysmonInstall artifact now skips install if not needed (#1777)
+ * Initial implementation of client side process tracker. (#1768)
+ * Invalidate transformed cache when the base table changes. (#1742)
+ * GUI Table widgets now can apply transformations on the table. (#1740)
+ * Suppress warning message for offline collector (#1776)
+ * Bug fix (#1774)
+ * Avoid bash process lingering around while server is running (#1775)
+ * oidc: Fix typo: Genric -> Generic (#1773)
+ * Make MaxWait for event table settable. (#1772)
+ * Fixed bug in Windows.Detection.Yara.Process (#1771)
+ * fix: upgrade react-scripts from 5.0.0 to 5.0.1 (#1770)
+ * Bugfix: Client did not update list of query columns (#1767)
+ * Merge bugfixes from master branch. (#1769)
+- Revendored dependencies.
+
-------------------------------------------------------------------
Thu May 12 17:54:31 UTC 2022 - jeffm@suse.com
diff --git a/velociraptor.obsinfo b/velociraptor.obsinfo
index ee9c9bd..3596f90 100644
--- a/velociraptor.obsinfo
+++ b/velociraptor.obsinfo
@@ -1,4 +1,4 @@
name: velociraptor
-version: 0.6.4~git31.4298eab0
-mtime: 1652378048
-commit: 4298eab00c66e1654f31be67a5734746b9e66808
+version: 0.6.4.2~git31.e1b7fc0e
+mtime: 1652386495
+commit: e1b7fc0e393db0f2f098ee8a181831df333c88e6
diff --git a/velociraptor.spec b/velociraptor.spec
index 82dca04..af71847 100644
--- a/velociraptor.spec
+++ b/velociraptor.spec
@@ -16,10 +16,10 @@
#
%define projname velociraptor
-%define vendor_version 0.6.4~git17.cb7dfd49
+%define vendor_version 0.6.4.2~git31.e1b7fc0e
Name: velociraptor
-Version: 0.6.4~git31.4298eab0
+Version: 0.6.4.2~git31.e1b7fc0e
Release: 0
Summary: Endpoint visibility and collection tool
@@ -66,7 +66,7 @@ For just the endpoint agent, please install the 'velociraptor-client' package.
%package kafka-humio-gateway
Summary: Gateway between Kafka and Humio for Velociraptor Artifacts
-Version: 0.6.4~git31.4298eab0
+Version: 0.6.4.2~git31.e1b7fc0e
%description kafka-humio-gateway
This tool is used to consume events generated by the Kafka Velociraptor plugin
diff --git a/vendor-golang-0.6.4.2~git31.e1b7fc0e.tar.xz b/vendor-golang-0.6.4.2~git31.e1b7fc0e.tar.xz
new file mode 100644
index 0000000..a010242
--- /dev/null
+++ b/vendor-golang-0.6.4.2~git31.e1b7fc0e.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5dad594f42ddcbebd18fe553ef5068081701561a72e229bd39ad99811a2fe39b
+size 7817752
diff --git a/vendor-golang-0.6.4~git17.cb7dfd49.tar.xz b/vendor-golang-0.6.4~git17.cb7dfd49.tar.xz
deleted file mode 100644
index 08e9ea2..0000000
--- a/vendor-golang-0.6.4~git17.cb7dfd49.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1267ce38995013e337ffc4c6665c79cdfc8423926e481b5daffdd76a98075899
-size 7833536
diff --git a/vendor-golang-kafka-humio-gateway-0.6.4.2~git31.e1b7fc0e.tar.xz b/vendor-golang-kafka-humio-gateway-0.6.4.2~git31.e1b7fc0e.tar.xz
new file mode 100644
index 0000000..002951f
--- /dev/null
+++ b/vendor-golang-kafka-humio-gateway-0.6.4.2~git31.e1b7fc0e.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:43bc2686bdf5fb270650c77cbff22e7728188a0e9d7eb010dfb84d8c5f484f14
+size 454376
diff --git a/vendor-golang-kafka-humio-gateway-0.6.4~git17.cb7dfd49.tar.xz b/vendor-golang-kafka-humio-gateway-0.6.4~git17.cb7dfd49.tar.xz
deleted file mode 100644
index cc7e245..0000000
--- a/vendor-golang-kafka-humio-gateway-0.6.4~git17.cb7dfd49.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0e1c01277e2932113ee52e35bee303bf326e485b3d40fc857381a0225823e2a8
-size 454244
diff --git a/vendor-nodejs-0.6.4.2~git31.e1b7fc0e.tar.xz b/vendor-nodejs-0.6.4.2~git31.e1b7fc0e.tar.xz
new file mode 100644
index 0000000..c4fecbb
--- /dev/null
+++ b/vendor-nodejs-0.6.4.2~git31.e1b7fc0e.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:554186cd098a64de8979b4f4c7ecb09ed1a2e2ffb4db09cfd58da5b14b4e9d6b
+size 37044384
diff --git a/vendor-nodejs-0.6.4~git17.cb7dfd49.tar.xz b/vendor-nodejs-0.6.4~git17.cb7dfd49.tar.xz
deleted file mode 100644
index f8a701a..0000000
--- a/vendor-nodejs-0.6.4~git17.cb7dfd49.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:40af0767681c4b68ca31dfa2d0a9eb156c2e6e9995824f5ef93acfa60dc710d2
-size 37095216