Merge pull request osquery#24 in CLOUD/osquery from sync/osquery-5.2.…

…3 to master * commit '35edba4e8627f883dc6394f60a7fff60a5a39353': libs: Update OpenSSL from version 1.1.1l to 1.1.1n (osquery#7506) Drop shortcut_files table (osquery#7547) Drop the ssdeep library and remove its hash support (osquery#7525) libs: Update zlib from v1.2.11 to v1.2.12 (osquery#7548) Remove libelfin and elf parsing tables (osquery#7524) Update librpm to 4.17.0 (osquery#7529) libs: Update expat from version 2.2.10 to 2.4.7 (osquery#7526)
aikuchin · May 12, 2022 · 9b71df7 · 9b71df7
2 parents 0a73427 + 35edba4
commit 9b71df7
Show file tree

Hide file tree

Showing 73 changed files with 1,783 additions and 2,618 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -31,9 +31,6 @@
 [submodule "libraries/cmake/source/sqlite/src"]
 	path = libraries/cmake/source/sqlite/src
 	url = https://github.com/osquery/third-party-sqlite
-[submodule "libraries/cmake/source/ssdeep-cpp/src"]
-	path = libraries/cmake/source/ssdeep-cpp/src
-	url = https://github.com/ssdeep-project/ssdeep
 [submodule "libraries/cmake/source/thrift/src"]
 	path = libraries/cmake/source/thrift/src
 	url = https://github.com/apache/thrift
@@ -70,9 +67,6 @@
 [submodule "libraries/cmake/source/libaudit/src"]
 	path = libraries/cmake/source/libaudit/src
 	url = https://github.com/linux-audit/audit-userspace
-[submodule "libraries/cmake/source/libelfin/src"]
-	path = libraries/cmake/source/libelfin/src
-	url = https://github.com/aclements/libelfin
 [submodule "libraries/cmake/source/libgcrypt/src"]
 	path = libraries/cmake/source/libgcrypt/src
 	url = https://github.com/osquery/third-party-libgcrypt.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -98,7 +98,6 @@ function(importLibraries)
     "Linux:libaudit"
     "Linux:libcryptsetup"
     "Linux:libdevmapper"
-    "Linux:libelfin"
     "Linux:libgcrypt"
     "Linux:libgpg-error"
     "Linux:libiptables"
@@ -114,7 +113,6 @@ function(importLibraries)
     "Linux,Darwin,Windows:rocksdb"
     "Linux,Darwin,Windows:sleuthkit"
     "Linux,Darwin,Windows:sqlite"
-    "Linux,Darwin:ssdeep"
     "Linux,Darwin,Windows:thrift"
     "Linux:util-linux"
     "Linux,Darwin,Windows:yara"

diff --git a/libraries/cmake/formula/openssl/CMakeLists.txt b/libraries/cmake/formula/openssl/CMakeLists.txt
@@ -1,7 +1,7 @@
 project(thirdparty_openssl)
 
-set(OPENSSL_VERSION "1.1.1l")
-set(OPENSSL_ARCHIVE_SHA256 "0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1")
+set(OPENSSL_VERSION "1.1.1n")
+set(OPENSSL_ARCHIVE_SHA256 "40dceb51a4f6a5275bde0e6bf20ef4b91bfc32ed57c0552e2e8e15463372b17a")
 
 include(ExternalProject)
 

diff --git a/libraries/cmake/source/expat/CMakeLists.txt b/libraries/cmake/source/expat/CMakeLists.txt
@@ -12,6 +12,10 @@ function(expatMain)
     "${CMAKE_CURRENT_SOURCE_DIR}/src/expat/lib/xmltok.c"
   )
 
+  target_compile_options(thirdparty_expat PRIVATE
+    -fno-strict-aliasing
+  )
+
   target_include_directories(thirdparty_expat PRIVATE
     "${CMAKE_CURRENT_SOURCE_DIR}/config/linux"
     "${CMAKE_CURRENT_SOURCE_DIR}/src/expat/lib"

diff --git a/libraries/cmake/source/expat/README.md b/libraries/cmake/source/expat/README.md
@@ -0,0 +1,21 @@
+# Linux
+
+Create a build folder inside the root of the cloned project and move inside it.
+
+Generated with the following commands:
+
+```sh
+cmake ../expat -DCMAKE_BUILD_TYPE=Release \
+-DEXPAT_BUILD_TOOLS=OFF \
+-DEXPAT_BUILD_TESTS=OFF \
+-DEXPAT_SHARED_LIBS=OFF \
+-DEXPAT_BUILD_PKGCONFIG=OFF \
+-DEXPAT_BUILD_EXAMPLES=OFF \
+-DEXPAT_DTD=OFF \
+-DEXPAT_NS=OFF \
+-DEXPAT_DEV_URANDOM=OFF
+```
+
+Copy the following files:
+
+build/expat_config.h -> \<osquery libexpat folder\>/config/
diff --git a/libraries/cmake/source/expat/config/linux/expat_config.h b/libraries/cmake/source/expat/config/linux/expat_config.h
@@ -67,7 +67,7 @@
 #define PACKAGE_NAME "expat"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "expat 2.2.10"
+#define PACKAGE_STRING "expat 2.4.7"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "expat"
@@ -76,7 +76,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.2.10"
+#define PACKAGE_VERSION "2.4.7"
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS

diff --git a/libraries/cmake/source/expat/src b/libraries/cmake/source/expat/src
diff --git a/libraries/cmake/source/libelfin/CMakeLists.txt b/libraries/cmake/source/libelfin/CMakeLists.txt
diff --git a/libraries/cmake/source/libelfin/README.md b/libraries/cmake/source/libelfin/README.md