Update git version

3 files changed, 31 insertions, 102 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 11eb98f1b043..3d268a4a6a92 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = osquery-git
 	pkgdesc = SQL powered operating system instrumentation, monitoring, and analytics.
-	pkgver = 1.8.0.r4.gc1d004e
+	pkgver = 1.8.2.r12.g85ed298
 	pkgrel = 1
 	url = https://osquery.io
 	arch = any
@@ -8,8 +8,7 @@ pkgbase = osquery-git
 	makedepends = python-jinja
 	makedepends = python-psutil
 	makedepends = python-pexpect
-	makedepends = rocksdb
-	makedepends = rocksdb-static
+	makedepends = rocksdb-lite
 	makedepends = cpp-netlib
 	makedepends = magic
 	makedepends = unzip
@@ -40,7 +39,7 @@ pkgbase = osquery-git
 	source = arch-linux.patch
 	sha256sums = SKIP
 	sha256sums = 1fa367325d4a7ad7dfef3b7b817b3c7588ad02a8d08fc11db24de66b486c6503
-	sha256sums = 745e4561eb065d05826d8f96d1cd06640463a5a85f38d2581ea85d2e33fd8d24
+	sha256sums = 8fb9a37c2704647268e20ca6a8fd77b4866e054801cd2ab86362a2c028f03a8a
 
 pkgname = osquery-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 7c1c2e6dfd2f..551b992d6f21 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,7 @@
-# This is an example PKGBUILD file. Use this as a start to creating your own,
-# and remove these comments. For more information, see 'man PKGBUILD'.
-# NOTE: Please fill out the license field for your package! If it is unknown,
-# then please put 'unknown'.
+# Maintainer: Tony Lambiris <tony@criticalstack.com>
 
-# Maintainer: Matěj Týč <matej.tyc@gmail.com>
 pkgname=osquery-git
-pkgver=1.8.0.r4.gc1d004e
+pkgver=1.8.2.r12.g85ed298
 pkgrel=1
 epoch=
 pkgdesc="SQL powered operating system instrumentation, monitoring, and analytics."
@@ -16,8 +12,8 @@ groups=()
 depends=('asio' 'audit' 'aws-sdk-cpp-git' 'boost' 'boost-libs' 'clang' 'cmake'
          'doxygen' 'gflags' 'git' 'google-glog' 'lsb-release' 'make' 'python'
          'python-jinja' 'python-pip' 'sleuthkit' 'snappy' 'thrift' 'yara')
-makedepends=('python-jinja' 'python-psutil' 'python-pexpect' 'rocksdb'
-             'rocksdb-static' 'cpp-netlib' 'magic' 'unzip' 'wget')
+makedepends=('python-jinja' 'python-psutil' 'python-pexpect' 'rocksdb-lite'
+             'cpp-netlib' 'magic' 'unzip' 'wget')
 checkdepends=()
 optdepends=()
 provides=()
@@ -31,14 +27,14 @@ source=("${pkgname}::git+https://github.com/facebook/osquery"
         "osqueryd.service"
         "arch-linux.patch")
 noextract=()
+validpgpkeys=()
 sha256sums=('SKIP'
             '1fa367325d4a7ad7dfef3b7b817b3c7588ad02a8d08fc11db24de66b486c6503'
-            '745e4561eb065d05826d8f96d1cd06640463a5a85f38d2581ea85d2e33fd8d24')
-validpgpkeys=()
+            '8fb9a37c2704647268e20ca6a8fd77b4866e054801cd2ab86362a2c028f03a8a')
 
 _gitname=${pkgname}
 # last known working commit-ish
-_githash=c1d004ed1f12a4113102fafd0c633001b8e4254c
+_githash=85ed298fb9b35b4e2c1d690f7b207dbe368c8735
 
 pkgver() {
     cd $_gitname
@@ -49,6 +45,7 @@ pkgver() {
 prepare() {
     cd $_gitname
 
+    git reset HEAD --hard
     git checkout $_githash
     git submodule update --init
     patch -p1 -i "${srcdir}/arch-linux.patch"
diff --git a/arch-linux.patch b/arch-linux.patch
index 3d900e844b02..4f755ff58c24 100644
--- a/arch-linux.patch
+++ b/arch-linux.patch
@@ -1,97 +1,30 @@
 diff --git a/osquery/CMakeLists.txt b/osquery/CMakeLists.txt
-index b96fb5f..8f3a500 100644
+index 444b018..97c1a14 100644
 --- a/osquery/CMakeLists.txt
 +++ b/osquery/CMakeLists.txt
-@@ -98,6 +98,9 @@ ADD_OSQUERY_LINK_CORE("glog")
- ADD_OSQUERY_LINK_CORE("boost_system")
- ADD_OSQUERY_LINK_CORE("boost_filesystem")
- ADD_OSQUERY_LINK_CORE("boost_regex")
-+ADD_OSQUERY_LINK_CORE("bz2")
-+ADD_OSQUERY_LINK_CORE("cryptsetup")
-+ADD_OSQUERY_LINK_CORE("lz4")
+@@ -55,9 +55,9 @@ ADD_OSQUERY_LINK_CORE("lz4")
+ ADD_OSQUERY_LINK_CORE("thrift")
+ ADD_OSQUERY_LINK_CORE("gflags")
+ ADD_OSQUERY_LINK_CORE("glog")
+-ADD_OSQUERY_LINK_CORE("boost_system-mt")
+-ADD_OSQUERY_LINK_CORE("boost_filesystem-mt")
+-ADD_OSQUERY_LINK_CORE("boost_regex-mt")
++ADD_OSQUERY_LINK_CORE("boost_system")
++ADD_OSQUERY_LINK_CORE("boost_filesystem")
++ADD_OSQUERY_LINK_CORE("boost_regex")
  
  # TODO(#1956): Ignoring on WIN32 for now
  if(NOT WIN32)
-diff --git a/osquery/remote/transports/tls.cpp b/osquery/remote/transports/tls.cpp
-index 4273293..f181af9 100644
---- a/osquery/remote/transports/tls.cpp
-+++ b/osquery/remote/transports/tls.cpp
-@@ -30,12 +30,12 @@ SSL_CTX* TLSv1_2_method(void) { return nullptr; }
- SSL_CTX* TLSv1_2_server_method(void) { return nullptr; }
- #endif
- #if defined(NO_SSL_TXT_SSLV3)
--SSL_METHOD* SSLv3_server_method(void) { return nullptr; }
--SSL_METHOD* SSLv3_client_method(void) { return nullptr; }
--SSL_METHOD* SSLv3_method(void) { return nullptr; }
--SSL_METHOD* SSLv2_server_method(void) { return nullptr; }
--SSL_METHOD* SSLv2_client_method(void) { return nullptr; }
--SSL_METHOD* SSLv2_method(void) { return nullptr; }
-+const SSL_METHOD* SSLv3_server_method(void) { return nullptr; }
-+const SSL_METHOD* SSLv3_client_method(void) { return nullptr; }
-+const SSL_METHOD* SSLv3_method(void) { return nullptr; }
-+const SSL_METHOD* SSLv2_server_method(void) { return nullptr; }
-+const SSL_METHOD* SSLv2_client_method(void) { return nullptr; }
-+const SSL_METHOD* SSLv2_method(void) { return nullptr; }
- #endif
- #endif
- }
-diff --git a/osquery/remote/transports/tls.h b/osquery/remote/transports/tls.h
-index 751c416..55038dc 100644
---- a/osquery/remote/transports/tls.h
-+++ b/osquery/remote/transports/tls.h
-@@ -27,9 +27,9 @@
- /// Newer versions of LibreSSL will lack SSL methods.
- extern "C" {
- #if defined(NO_SSL_TXT_SSLV3)
--SSL_METHOD* SSLv3_server_method(void);
--SSL_METHOD* SSLv3_client_method(void);
--SSL_METHOD* SSLv3_method(void);
-+const SSL_METHOD* SSLv3_server_method(void);
-+const SSL_METHOD* SSLv3_client_method(void);
-+const SSL_METHOD* SSLv3_method(void);
- #endif
- void ERR_remove_state(unsigned long);
- }
 diff --git a/tools/provision.sh b/tools/provision.sh
-index 7ca0498..3dc412c 100755
+index fc465d1..a66a7d4 100755
 --- a/tools/provision.sh
 +++ b/tools/provision.sh
-@@ -93,11 +93,6 @@ function main() {
+@@ -87,6 +87,8 @@ function main() {
+     log "your $OS does not use a provision script"
+   fi
  
-   cd "$SCRIPT_DIR/../"
- 
--  # Pip may have just been installed.
--  PIP=`which pip`
--  sudo $PIP install --upgrade pip
--  sudo $PIP install -r requirements.txt
--
-   initialize $OS
- }
- 
-diff --git a/tools/provision/arch.sh b/tools/provision/arch.sh
-index d6498d4..73759b6 100755
---- a/tools/provision/arch.sh
-+++ b/tools/provision/arch.sh
-@@ -8,8 +8,6 @@
- #  of patent rights can be found in the PATENTS file in the same directory.
- 
- function main_arch() {
--  sudo pacman -Syu
--
-   package wget
-   package asio
-   package audit
-@@ -29,13 +27,4 @@ function main_arch() {
-   package snappy
-   package thrift
-   package yara
--
--  install_aws_sdk
--
--  echo ""
--  echo "The following packages need to be installed from the AUR:"
--  echo "rocksdb or rocksdb-static (if using rocksdb export BUILD_LINK_SHARED=True)"
--  echo "cpp-netlib and magic"
--  echo ""
- }
--
++  exit
++
+   # The dependency directory (DEPS_DIR) will contain our legacy runtime glibc
+   # and various compilers/library dependencies.
+   if [[ ! -d "$DEPS_DIR" ]]; then