Pull changes from falcosecurity/libs

CMakeLists.txt

@@ -27,13 +27,12 @@ if(EXISTS ${CMAKE_CURRENT_BINARY_DIR}/CMakeLists.txt)
 		" 4. Run cmake from the build directory. ex: cmake ..\n"
 		" 5. Run make from the build directory. ex: make\n"
 		"Full paste-able example:\n"
-		"( rm -f CMakeCache.txt; mkdir build; cd build; cmake ..; make )\n"
-		"The following wiki page has more information on manually building sysdig: http://bit.ly/1oJ84UI")
+		"( rm -f CMakeCache.txt; mkdir build; cd build; cmake ..; make )")
 endif()
 
 cmake_minimum_required(VERSION 2.8.2)
 
-project(sysdig)
+project(falcosecurity-libs)
 
 option(MINIMAL_BUILD "Produce a minimal build with only the essential features (no eBPF probe driver, no kubernetes, no mesos, no marathon and no container metadata)" OFF)
 option(MUSL_OPTIMIZED_BUILD "Enable if you want a musl optimized build" OFF)
@@ -42,15 +41,24 @@ option(MUSL_OPTIMIZED_BUILD "Enable if you want a musl optimized build" OFF)
 list(APPEND CMAKE_MODULE_PATH
 	"${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
 
-if(NOT DEFINED SYSDIG_VERSION)
-	set(SYSDIG_VERSION "0.1.1dev")
+if(NOT DEFINED FALCOSECURITY_LIBS_VERSION)
+	set(FALCOSECURITY_LIBS_VERSION "0.1.1dev")
 endif()
 
 if(NOT CMAKE_BUILD_TYPE)
 	SET(CMAKE_BUILD_TYPE Release)
 endif()
 
-set(PACKAGE_NAME "sysdig")
+set(DRIVER_PACKAGE_NAME "scap")
+
+include(CheckSymbolExists)
+check_symbol_exists(strlcpy "string.h" HAVE_STRLCPY)
+if(HAVE_STRLCPY)
+	message(STATUS "Existing strlcpy found, will *not* use local definition by setting -DHAVE_STRLCPY.")
+	add_definitions(-DHAVE_STRLCPY)
+else()
+	message(STATUS "No strlcpy found, will use local definition")
+endif()
 
 include(CompilerFlags)
 
@@ -69,3 +77,4 @@ if(CREATE_TEST_TARGETS AND NOT WIN32)
 			COMMAND ${CMAKE_MAKE_PROGRAM} run-unit-test-libsinsp
 		)
 endif()
+

OWNERS

@@ -4,9 +4,11 @@ approvers:
   - leogr
   - gnosek
   - ldegio
+  - mstemm
 reviewers:
   - fntlnz
   - leodido
   - leogr
   - gnosek
-  - ldegio
+  - ldegio
+  - mstemm

README.md

@@ -1,3 +1,3 @@
 # falcosecurity/libs
 
-As per the [OSS Libraries Contribution Plan](https://github.com/falcosecurity/falco/blob/master/proposals/2021019-libraries-donation.md), this repository has been chosen to be the new home for **libsinsp**, **libscap**, the **kernel module driver** and the **eBPF driver sources**.
+As per the [OSS Libraries Contribution Plan](https://github.com/falcosecurity/falco/blob/master/proposals/20210119-libraries-contribution.md), this repository has been chosen to be the new home for **libsinsp**, **libscap**, the **kernel module driver** and the **eBPF driver sources**.

cmake/modules/CompilerFlags.cmake

@@ -8,31 +8,31 @@ endif()
 
 if(NOT WIN32)
 
-	set(SYSDIG_COMMON_FLAGS "-Wall -ggdb")
-	set(SYSDIG_DEBUG_FLAGS "-D_DEBUG")
-	set(SYSDIG_RELEASE_FLAGS "-O3 -fno-strict-aliasing -DNDEBUG")
+	set(FALCOSECURITY_LIBS_COMMON_FLAGS "-Wall -ggdb")
+	set(FALCOSECURITY_LIBS_DEBUG_FLAGS "-D_DEBUG")
+	set(FALCOSECURITY_LIBS_RELEASE_FLAGS "-O3 -fno-strict-aliasing -DNDEBUG")
 
 	if(MINIMAL_BUILD)
-	  set(SYSDIG_COMMON_FLAGS "${SYSDIG_COMMON_FLAGS} -DMINIMAL_BUILD")
+	  set(FALCOSECURITY_LIBS_COMMON_FLAGS "${FALCOSECURITY_LIBS_COMMON_FLAGS} -DMINIMAL_BUILD")
 	endif()
 
 	if(MUSL_OPTIMIZED_BUILD)
-		set(SYSDIG_COMMON_FLAGS "${SYSDIG_COMMON_FLAGS} -static -Os")
+		set(FALCOSECURITY_LIBS_COMMON_FLAGS "${FALCOSECURITY_LIBS_COMMON_FLAGS} -static -Os")
 	endif()
 
 	if(BUILD_WARNINGS_AS_ERRORS)
 		set(CMAKE_SUPPRESSED_WARNINGS "-Wno-unused-parameter -Wno-missing-field-initializers -Wno-sign-compare -Wno-type-limits -Wno-implicit-fallthrough -Wno-format-truncation")
-		set(SYSDIG_COMMON_FLAGS "${SYSDIG_COMMON_FLAGS} -Wextra -Werror ${CMAKE_SUPPRESSED_WARNINGS}")
+		set(FALCOSECURITY_LIBS_COMMON_FLAGS "${FALCOSECURITY_LIBS_COMMON_FLAGS} -Wextra -Werror ${CMAKE_SUPPRESSED_WARNINGS}")
 	endif()
 
-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SYSDIG_COMMON_FLAGS}")
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SYSDIG_COMMON_FLAGS} -std=c++0x")
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${FALCOSECURITY_LIBS_COMMON_FLAGS}")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FALCOSECURITY_LIBS_COMMON_FLAGS} -std=c++0x")
 
-	set(CMAKE_C_FLAGS_DEBUG "${SYSDIG_DEBUG_FLAGS}")
-	set(CMAKE_CXX_FLAGS_DEBUG "${SYSDIG_DEBUG_FLAGS}")
+	set(CMAKE_C_FLAGS_DEBUG "${FALCOSECURITY_LIBS_DEBUG_FLAGS}")
+	set(CMAKE_CXX_FLAGS_DEBUG "${FALCOSECURITY_LIBS_DEBUG_FLAGS}")
 
-	set(CMAKE_C_FLAGS_RELEASE "${SYSDIG_RELEASE_FLAGS}")
-	set(CMAKE_CXX_FLAGS_RELEASE "${SYSDIG_RELEASE_FLAGS}")
+	set(CMAKE_C_FLAGS_RELEASE "${FALCOSECURITY_LIBS_RELEASE_FLAGS}")
+	set(CMAKE_CXX_FLAGS_RELEASE "${FALCOSECURITY_LIBS_RELEASE_FLAGS}")
 
 	if(CMAKE_SYSTEM_NAME MATCHES "Linux")
 		add_definitions(-DHAS_CAPTURE)
@@ -41,18 +41,18 @@ if(NOT WIN32)
 else()
 	set(MINIMAL_BUILD ON)
 
-	set(SYSDIG_COMMON_FLAGS "-D_CRT_SECURE_NO_WARNINGS -DWIN32 -DMINIMAL_BUILD /EHsc /W3 /Zi")
-	set(SYSDIG_DEBUG_FLAGS "/MTd /Od")
-	set(SYSDIG_RELEASE_FLAGS "/MT")
+	set(FALCOSECURITY_LIBS_COMMON_FLAGS "-D_CRT_SECURE_NO_WARNINGS -DWIN32 -DMINIMAL_BUILD /EHsc /W3 /Zi")
+	set(FALCOSECURITY_LIBS_DEBUG_FLAGS "/MTd /Od")
+	set(FALCOSECURITY_LIBS_RELEASE_FLAGS "/MT")
 
-	set(CMAKE_C_FLAGS "${SYSDIG_COMMON_FLAGS}")
-	set(CMAKE_CXX_FLAGS "${SYSDIG_COMMON_FLAGS}")
+	set(CMAKE_C_FLAGS "${FALCOSECURITY_LIBS_COMMON_FLAGS}")
+	set(CMAKE_CXX_FLAGS "${FALCOSECURITY_LIBS_COMMON_FLAGS}")
 
-	set(CMAKE_C_FLAGS_DEBUG "${SYSDIG_DEBUG_FLAGS}")
-	set(CMAKE_CXX_FLAGS_DEBUG "${SYSDIG_DEBUG_FLAGS}")
+	set(CMAKE_C_FLAGS_DEBUG "${FALCOSECURITY_LIBS_DEBUG_FLAGS}")
+	set(CMAKE_CXX_FLAGS_DEBUG "${FALCOSECURITY_LIBS_DEBUG_FLAGS}")
 
-	set(CMAKE_C_FLAGS_RELEASE "${SYSDIG_RELEASE_FLAGS}")
-	set(CMAKE_CXX_FLAGS_RELEASE "${SYSDIG_RELEASE_FLAGS}")
+	set(CMAKE_C_FLAGS_RELEASE "${FALCOSECURITY_LIBS_RELEASE_FLAGS}")
+	set(CMAKE_CXX_FLAGS_RELEASE "${FALCOSECURITY_LIBS_RELEASE_FLAGS}")
 
 	add_definitions(-DHAS_CAPTURE)
 

cmake/modules/grpc.cmake

@@ -3,30 +3,55 @@ option(USE_BUNDLED_GRPC "Enable building of the bundled grpc" ${USE_BUNDLED_DEPS
 if(GRPC_INCLUDE)
 	# we already have grpc
 elseif(NOT USE_BUNDLED_GRPC)
-	find_library(GPR_LIB NAMES gpr)
-	if(GPR_LIB)
-		message(STATUS "Found gpr lib: ${GPR_LIB}")
-	else()
-		message(FATAL_ERROR "Couldn't find system gpr")
-	endif()
-	find_path(GRPCXX_INCLUDE NAMES grpc++/grpc++.h)
-	if(GRPCXX_INCLUDE)
-		set(GRPC_INCLUDE ${GRPCXX_INCLUDE})
-	else()
-		find_path(GRPCPP_INCLUDE NAMES grpcpp/grpcpp.h)
-		set(GRPC_INCLUDE ${GRPCPP_INCLUDE})
-		add_definitions(-DGRPC_INCLUDE_IS_GRPCPP=1)
-	endif()
-	find_library(GRPC_LIB NAMES grpc)
-	find_library(GRPCPP_LIB NAMES grpc++)
-	if(GRPC_INCLUDE AND GRPC_LIB AND GRPCPP_LIB)
-		message(STATUS "Found grpc: include: ${GRPC_INCLUDE}, C lib: ${GRPC_LIB}, C++ lib: ${GRPCPP_LIB}")
+	# gRPC
+	find_package(gRPC CONFIG)
+	if(gRPC_FOUND)
+		message(STATUS "Using gRPC ${gRPC_VERSION}")
+		set(GPR_LIB gRPC::gpr)
+		set(GRPC_LIB gRPC::grpc)
+		set(GRPCPP_LIB gRPC::grpc++)
+
+		# gRPC C++ plugin
+		get_target_property(GRPC_CPP_PLUGIN gRPC::grpc_cpp_plugin LOCATION)
+		if(NOT GRPC_CPP_PLUGIN)
+			message(FATAL_ERROR "System grpc_cpp_plugin not found")
+		endif()
+
+		# gRPC include dir + properly handle grpc{++,pp}
+		get_target_property(GRPC_INCLUDE gRPC::grpc++ INTERFACE_INCLUDE_DIRECTORIES)
+		find_path(GRPCXX_INCLUDE NAMES grpc++/grpc++.h PATHS ${GRPC_INCLUDE})
+		if(NOT GRPCXX_INCLUDE)
+			find_path(GRPCPP_INCLUDE NAMES grpcpp/grpcpp.h PATHS ${GRPC_INCLUDE})
+			add_definitions(-DGRPC_INCLUDE_IS_GRPCPP=1)
+		endif()
 	else()
-		message(FATAL_ERROR "Couldn't find system grpc")
-	endif()
-	find_program(GRPC_CPP_PLUGIN grpc_cpp_plugin)
-	if(NOT GRPC_CPP_PLUGIN)
-		message(FATAL_ERROR "System grpc_cpp_plugin not found")
+		# Fallback to manually find libraries;
+		# Some distro, namely Ubuntu focal, do not install gRPC config cmake module
+		find_library(GPR_LIB NAMES gpr)
+		if(GPR_LIB)
+			message(STATUS "Found gpr lib: ${GPR_LIB}")
+		else()
+			message(FATAL_ERROR "Couldn't find system gpr")
+		endif()
+		find_path(GRPCXX_INCLUDE NAMES grpc++/grpc++.h)
+		if(GRPCXX_INCLUDE)
+			set(GRPC_INCLUDE ${GRPCXX_INCLUDE})
+		else()
+			find_path(GRPCPP_INCLUDE NAMES grpcpp/grpcpp.h)
+			set(GRPC_INCLUDE ${GRPCPP_INCLUDE})
+			add_definitions(-DGRPC_INCLUDE_IS_GRPCPP=1)
+		endif()
+		find_library(GRPC_LIB NAMES grpc)
+		find_library(GRPCPP_LIB NAMES grpc++)
+		if(GRPC_INCLUDE AND GRPC_LIB AND GRPCPP_LIB)
+			message(STATUS "Found grpc: include: ${GRPC_INCLUDE}, C lib: ${GRPC_LIB}, C++ lib: ${GRPCPP_LIB}")
+		else()
+			message(FATAL_ERROR "Couldn't find system grpc")
+		endif()
+		find_program(GRPC_CPP_PLUGIN grpc_cpp_plugin)
+		if(NOT GRPC_CPP_PLUGIN)
+			message(FATAL_ERROR "System grpc_cpp_plugin not found")
+		endif()
 	endif()
 else()
 	include(cares)

cmake/modules/gtest.cmake

@@ -12,7 +12,7 @@ elseif(NOT USE_BUNDLED_GTEST)
 		message(FATAL_ERROR "Couldn't find system gtest")
 	endif()
 else()
-	# https://github.com/google/googletest/tree/master/googletest#incorporating-into-an-existing-cmake-project
+	# https://github.com/google/googletest/tree/main/googletest#incorporating-into-an-existing-cmake-project
 	# Download and unpack googletest at configure time
 	configure_file(CMakeListsGtestInclude.cmake ${PROJECT_BINARY_DIR}/googletest-download/CMakeLists.txt)
 	execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" .

cmake/modules/libsinsp.cmake

@@ -9,13 +9,22 @@ option(USE_BUNDLED_DEPS "Enable bundled dependencies instead of using the system
 
 option(WITH_CHISEL "Include chisel implementation" OFF)
 
+if(DEFINED LIBSINSP_USER_AGENT)
+	add_definitions(-DLIBSINSP_USER_AGENT="${LIBSINSP_USER_AGENT}")
+endif()
+
 include(ExternalProject)
 include(libscap)
 if(NOT WIN32)
 	include(tbb)
+endif()
+if(NOT WIN32 AND NOT APPLE)
 	include(b64)
 	include(jq)
 endif()
+if(NOT WIN32 AND NOT APPLE AND NOT MINIMAL_BUILD)
+	include(curl)
+endif()
 include(jsoncpp)
 if(NOT MINIMAL_BUILD)
 	include(cares)
@@ -29,10 +38,6 @@ endif()
 if(NOT WIN32)
 	get_filename_component(TBB_ABSOLUTE_INCLUDE_DIR ${TBB_INCLUDE_DIR} ABSOLUTE)
 	list(APPEND LIBSINSP_INCLUDE_DIRS ${TBB_ABSOLUTE_INCLUDE_DIR})
-	get_filename_component(B64_ABSOLUTE_INCLUDE_DIR ${B64_INCLUDE} ABSOLUTE)
-	list(APPEND LIBSINSP_INCLUDE_DIRS ${B64_ABSOLUTE_INCLUDE_DIR})
-	get_filename_component(JQ_ABSOLUTE_INCLUDE_DIR ${JQ_INCLUDE} ABSOLUTE)
-	list(APPEND LIBSINSP_INCLUDE_DIRS ${JQ_ABSOLUTE_INCLUDE_DIR})
 endif()
 
 get_filename_component(JSONCPP_ABSOLUTE_INCLUDE_DIR ${JSONCPP_INCLUDE} ABSOLUTE)
@@ -42,6 +47,18 @@ if(NOT MINIMAL_BUILD)
 	list(APPEND LIBSINSP_INCLUDE_DIRS ${CARES_ABSOLUTE_INCLUDE_DIR})
 endif()
 
+if(NOT WIN32 AND NOT APPLE)
+	get_filename_component(B64_ABSOLUTE_INCLUDE_DIR ${B64_INCLUDE} ABSOLUTE)
+	list(APPEND LIBSINSP_INCLUDE_DIRS ${B64_ABSOLUTE_INCLUDE_DIR})
+	get_filename_component(JQ_ABSOLUTE_INCLUDE_DIR ${JQ_INCLUDE} ABSOLUTE)
+	list(APPEND LIBSINSP_INCLUDE_DIRS ${JQ_ABSOLUTE_INCLUDE_DIR})
+endif()
+
+if(NOT WIN32 AND NOT APPLE AND NOT MINIMAL_BUILD)
+	get_filename_component(CURL_ABSOLUTE_INCLUDE_DIR ${CURL_INCLUDE_DIR} ABSOLUTE)
+	list(APPEND LIBSINSP_INCLUDE_DIRS ${CURL_ABSOLUTE_INCLUDE_DIR})
+endif()
+
 add_subdirectory(${LIBSINSP_DIR}/userspace/libsinsp ${CMAKE_BINARY_DIR}/libsinsp)
 
 endif()

cmake/modules/luajit.cmake

@@ -38,7 +38,6 @@ else()
 					PREFIX "${PROJECT_BINARY_DIR}/luajit-prefix"
 					GIT_REPOSITORY "https://github.com/moonjit/moonjit"
 					GIT_TAG "2.1.2"
-					PATCH_COMMAND sed -i "s/luaL_reg/luaL_Reg/g" ${PROJECT_SOURCE_DIR}/userspace/libsinsp/chisel.cpp && sed -i "s/luaL_reg/luaL_Reg/g" ${PROJECT_SOURCE_DIR}/userspace/libsinsp/lua_parser.cpp && sed -i "s/luaL_getn/lua_objlen /g" ${PROJECT_SOURCE_DIR}/userspace/libsinsp/lua_parser_api.cpp
 					CONFIGURE_COMMAND ""
 					BUILD_COMMAND ${CMD_MAKE}
 					BUILD_IN_SOURCE 1
@@ -49,17 +48,26 @@ else()
 					PREFIX "${PROJECT_BINARY_DIR}/luajit-prefix"
 					GIT_REPOSITORY "https://github.com/linux-on-ibm-z/LuaJIT.git"
 					GIT_TAG "v2.1"
-					PATCH_COMMAND sed -i "s/luaL_reg/luaL_Reg/g" ${PROJECT_SOURCE_DIR}/userspace/libsinsp/chisel.cpp && sed -i "s/luaL_reg/luaL_Reg/g" ${PROJECT_SOURCE_DIR}/userspace/libsinsp/lua_parser.cpp && sed -i "s/luaL_getn/lua_objlen /g" ${PROJECT_SOURCE_DIR}/userspace/libsinsp/lua_parser_api.cpp
 					CONFIGURE_COMMAND ""
 					BUILD_COMMAND ${CMD_MAKE}
 					BUILD_IN_SOURCE 1
 					BUILD_BYPRODUCTS ${LUAJIT_LIB}
 					INSTALL_COMMAND "")
+			elseif(APPLE)
+				ExternalProject_Add(luajit
+					PREFIX "${PROJECT_BINARY_DIR}/luajit-prefix"
+					URL "https://github.com/LuaJIT/LuaJIT/archive/v2.1.0-beta3.tar.gz"
+					URL_HASH "SHA256=409f7fe570d3c16558e594421c47bdd130238323c9d6fd6c83dedd2aaeb082a8"
+					CONFIGURE_COMMAND ""
+					BUILD_COMMAND make MACOSX_DEPLOYMENT_TARGET=10.14
+					BUILD_IN_SOURCE 1
+					BUILD_BYPRODUCTS ${LUAJIT_LIB}
+					INSTALL_COMMAND "")
 			else()
 				ExternalProject_Add(luajit
 					PREFIX "${PROJECT_BINARY_DIR}/luajit-prefix"
-					URL "https://github.com/LuaJIT/LuaJIT/archive/v2.0.3.tar.gz"
-					URL_HASH "SHA256=8da3d984495a11ba1bce9a833ba60e18b532ca0641e7d90d97fafe85ff014baa"
+					GIT_REPOSITORY "https://github.com/LuaJIT/LuaJIT"
+					GIT_TAG "f3c856915b4ce7ccd24341e8ac73e8a9fd934171"
 					CONFIGURE_COMMAND ""
 					BUILD_COMMAND ${CMD_MAKE}
 					BUILD_IN_SOURCE 1
@@ -69,8 +77,8 @@ else()
 		else()
 			ExternalProject_Add(luajit
 				PREFIX "${PROJECT_BINARY_DIR}/luajit-prefix"
-				URL "https://github.com/LuaJIT/LuaJIT/archive/v2.0.3.tar.gz"
-				URL_HASH "SHA256=8da3d984495a11ba1bce9a833ba60e18b532ca0641e7d90d97fafe85ff014baa"
+				URL "https://github.com/LuaJIT/LuaJIT/archive/v2.1.0-beta3.tar.gz"
+				URL_HASH "SHA256=409f7fe570d3c16558e594421c47bdd130238323c9d6fd6c83dedd2aaeb082a8"
 				CONFIGURE_COMMAND ""
 				BUILD_COMMAND msvcbuild.bat
 				BUILD_BYPRODUCTS ${LUAJIT_LIB}

cmake/modules/openssl.cmake

@@ -14,14 +14,15 @@ else()
 	set(OPENSSL_INCLUDE_DIR "${PROJECT_BINARY_DIR}/openssl-prefix/src/openssl/include")
 	set(OPENSSL_LIBRARY_SSL "${OPENSSL_INSTALL_DIR}/lib/libssl.a")
 	set(OPENSSL_LIBRARY_CRYPTO "${OPENSSL_INSTALL_DIR}/lib/libcrypto.a")
+ 	set(OPENSSL_LIBRARIES ${OPENSSL_LIBRARY_SSL} ${OPENSSL_LIBRARY_CRYPTO})
 
 	if(NOT TARGET openssl)
 		message(STATUS "Using bundled openssl in '${OPENSSL_BUNDLE_DIR}'")
 
 		ExternalProject_Add(openssl
 			PREFIX "${PROJECT_BINARY_DIR}/openssl-prefix"
-			URL "https://github.com/openssl/openssl/archive/OpenSSL_1_1_1k.tar.gz"
-			URL_HASH "SHA256=b92f9d3d12043c02860e5e602e50a73ed21a69947bcc74d391f41148e9f6aa95"
+			URL "https://github.com/openssl/openssl/archive/OpenSSL_1_1_1l.tar.gz"
+			URL_HASH "SHA256=dac036669576e83e8523afdb3971582f8b5d33993a2d6a5af87daa035f529b4f"
 			CONFIGURE_COMMAND ./config no-shared --prefix=${OPENSSL_INSTALL_DIR}
 			BUILD_COMMAND ${CMD_MAKE}
 			BUILD_IN_SOURCE 1

cmake/modules/protobuf.cmake

@@ -24,33 +24,17 @@ else()
 
 	if(NOT TARGET protobuf)
 		message(STATUS "Using bundled protobuf in '${PROTOBUF_SRC}'")
-		if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "s390x")
-			ExternalProject_Add(protobuf
-				PREFIX "${PROJECT_BINARY_DIR}/protobuf-prefix"
-				DEPENDS openssl zlib
-				URL "http://download.sysdig.com/dependencies/protobuf-cpp-3.5.0.tar.gz"
-				URL_MD5 "e4ba8284a407712168593e79e6555eb2"
-				PATCH_COMMAND wget http://download.sysdig.com/dependencies/protobuf-3.5.0-s390x.patch && patch -p1 -i protobuf-3.5.0-s390x.patch
-				# TODO what if using system zlib?
-				CONFIGURE_COMMAND /usr/bin/env CPPFLAGS=-I${ZLIB_INCLUDE} LDFLAGS=-L${ZLIB_SRC} ./configure --with-zlib --disable-shared --enable-static --prefix=${PROTOBUF_INSTALL_DIR}
-				COMMAND aclocal && automake
-				BUILD_COMMAND ${CMD_MAKE}
-				BUILD_IN_SOURCE 1
-				BUILD_BYPRODUCTS ${PROTOC} ${PROTOBUF_INCLUDE} ${PROTOBUF_LIB}
-				INSTALL_COMMAND make install)
-		else()
-			ExternalProject_Add(protobuf
-				PREFIX "${PROJECT_BINARY_DIR}/protobuf-prefix"
-				DEPENDS openssl zlib
-				URL "https://github.com/protocolbuffers/protobuf/releases/download/v3.17.3/protobuf-cpp-3.17.3.tar.gz"
-				URL_HASH "SHA256=51cec99f108b83422b7af1170afd7aeb2dd77d2bcbb7b6bad1f92509e9ccf8cb"
-				# TODO what if using system zlib?
-				CONFIGURE_COMMAND /usr/bin/env CPPFLAGS=-I${ZLIB_INCLUDE} LDFLAGS=-L${ZLIB_SRC} ./configure --with-zlib --disable-shared --enable-static --prefix=${PROTOBUF_INSTALL_DIR}
-				BUILD_COMMAND ${CMD_MAKE}
-				BUILD_IN_SOURCE 1
-				BUILD_BYPRODUCTS ${PROTOC} ${PROTOBUF_INCLUDE} ${PROTOBUF_LIB}
-				INSTALL_COMMAND make install)
-		endif()
+		ExternalProject_Add(protobuf
+			PREFIX "${PROJECT_BINARY_DIR}/protobuf-prefix"
+			DEPENDS openssl zlib
+			URL "https://github.com/protocolbuffers/protobuf/releases/download/v3.17.3/protobuf-cpp-3.17.3.tar.gz"
+			URL_HASH "SHA256=51cec99f108b83422b7af1170afd7aeb2dd77d2bcbb7b6bad1f92509e9ccf8cb"
+			# TODO what if using system zlib?
+			CONFIGURE_COMMAND /usr/bin/env CPPFLAGS=-I${ZLIB_INCLUDE} LDFLAGS=-L${ZLIB_SRC} ./configure --with-zlib --disable-shared --enable-static --prefix=${PROTOBUF_INSTALL_DIR}
+			BUILD_COMMAND ${CMD_MAKE}
+			BUILD_IN_SOURCE 1
+			BUILD_BYPRODUCTS ${PROTOC} ${PROTOBUF_INCLUDE} ${PROTOBUF_LIB}
+			INSTALL_COMMAND make install)
 	endif()
 endif()