switch to libvpx, libfido2, libudev-zero upstream repo + patches

recipes/libfido2/conanfile.py

@@ -1,18 +1,20 @@
 from conans import ConanFile, tools, CMake, python_requires
-import os
+import os, shutil
 
 class LibFIDO2Conan(ConanFile):
     name = 'libfido2'
-    exports = 'VERSION'
     version = open(os.path.join('.', 'VERSION'), 'r').read().rstrip()
     license = 'BSD'
-    url = 'https://github.com/awakecoding/libfido2'
+    url = 'https://github.com/PowerShell/libfido2'
     description = 'libfido2'
     settings = 'os', 'arch', 'distro', 'build_type'
     no_copy_source = True
-    branch = 'devolutions'
     python_requires = "shared/1.0.0@devolutions/stable"
     python_requires_extend = "shared.UtilsBase"
+    exports = ['VERSION',
+        'patches/0001-fix-cmake-dependency-management.patch',
+        'patches/0002-fix-crypto-explicit_bzero-conflict.patch',
+        'patches/0003-use-linux-hid-backend-for-android.patch']
 
     options = {
         'fPIC': [True, False],
@@ -34,10 +36,18 @@ def build_requirements(self):
 
     def source(self):
         folder = self.name
-        self.output.info('Cloning repo: %s dest: %s branch: %s' % (self.url, folder, self.branch))
+        tag = self.version
+        self.output.info('Cloning repo: %s dest: %s tag: %s' % (self.url, folder, tag))
         git = tools.Git(folder=folder)
         git.clone(self.url)
-        git.checkout(self.branch)
+        git.checkout(tag)
+
+        patches_dir = os.path.join(self.recipe_folder, "patches")
+        if os.path.isdir(patches_dir):
+            for patch_file in [f for f in os.listdir(patches_dir) if f.endswith('.patch')]:
+                patch_path = os.path.join(patches_dir, patch_file)
+                self.output.info('Applying patch: %s' % patch_path)
+                tools.patch(base_path=folder, patch_file=patch_path)
 
     def build(self):
         cmake = CMake(self)

recipes/libfido2/patches/0001-fix-cmake-dependency-management.patch

@@ -0,0 +1,187 @@
+From dc429a234d914a5ecf1e4c7b9ea1ca734937966b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= <[email protected]>
+Date: Tue, 21 Nov 2023 16:21:17 -0500
+Subject: [PATCH 1/3] fix cmake dependency management
+
+---
+ CMakeLists.txt | 127 +++++++++++++++++++++++++++++++++++++++++++------
+ 1 file changed, 113 insertions(+), 14 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 11a51ac..149838c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -37,6 +37,7 @@ option(BUILD_MANPAGES    "Build man pages"                         ON)
+ option(BUILD_SHARED_LIBS "Build the shared library"                ON)
+ option(BUILD_STATIC_LIBS "Build the static library"                ON)
+ option(BUILD_TOOLS       "Build tool programs"                     ON)
++option(BUILD_TESTS       "Build test programs"                     OFF)
+ option(FUZZ              "Enable fuzzing instrumentation"          OFF)
+ option(LIBFUZZER         "Build libfuzzer harnesses"               OFF)
+ option(USE_HIDAPI        "Use hidapi as the HID backend"           OFF)
+@@ -69,6 +70,9 @@ if(NOT MSVC)
+ 	elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+ 		set(FIDO_CFLAGS "${FIDO_CFLAGS} -D_GNU_SOURCE")
+ 		set(FIDO_CFLAGS "${FIDO_CFLAGS} -D_DEFAULT_SOURCE")
++	elseif(CMAKE_SYSTEM_NAME STREQUAL "Android")
++		set(FIDO_CFLAGS "${FIDO_CFLAGS} -D_GNU_SOURCE")
++		set(FIDO_CFLAGS "${FIDO_CFLAGS} -D_DEFAULT_SOURCE")
+ 	elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR
+ 	    CMAKE_SYSTEM_NAME STREQUAL "MidnightBSD")
+ 		set(FIDO_CFLAGS "${FIDO_CFLAGS} -D__BSD_VISIBLE=1")
+@@ -108,6 +112,11 @@ check_symbol_exists(sysconf unistd.h HAVE_SYSCONF)
+ check_symbol_exists(timespecsub sys/time.h HAVE_TIMESPECSUB)
+ check_symbol_exists(timingsafe_bcmp string.h HAVE_TIMINGSAFE_BCMP)
+
++if(CMAKE_SYSTEM_NAME STREQUAL "Android")
++    set(HAVE_EXPLICIT_BZERO OFF)
++    add_definitions(-DCRYPTO_EXPLICIT_BZERO)
++endif()
++
+ set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
+ try_compile(HAVE_POSIX_IOCTL
+     "${CMAKE_CURRENT_BINARY_DIR}/posix_ioctl_check.o"
+@@ -194,21 +203,90 @@ if(MSVC)
+ 	endif()
+ 	set(NFC_LINUX OFF)
+ else()
+-	include(FindPkgConfig)
+-	pkg_search_module(CBOR libcbor)
+-	pkg_search_module(CRYPTO libcrypto)
+-	pkg_search_module(ZLIB zlib)
+
+-	if(NOT CBOR_FOUND AND NOT HAVE_CBOR_H)
+-		message(FATAL_ERROR "could not find libcbor")
+-	endif()
+-	if(NOT CRYPTO_FOUND AND NOT HAVE_OPENSSLV_H)
+-		message(FATAL_ERROR "could not find libcrypto")
+-	endif()
+-	if(NOT ZLIB_FOUND)
+-		message(FATAL_ERROR "could not find zlib")
+-	endif()
++    # detect zlib
++
++    if(ZLIB_ROOT_DIR)
++        list(PREPEND CMAKE_FIND_ROOT_PATH ${ZLIB_ROOT_DIR})
++    endif()
++
++    find_path(ZLIB_INCLUDE_DIR
++        NAMES "zlib.h")
++
++    find_library(ZLIB_LIBRARY
++        NAMES zlib z)
++
++    get_filename_component(ZLIB_LIBRARY_DIR ${ZLIB_LIBRARY} DIRECTORY CACHE)
++
++    add_library(zlib STATIC IMPORTED GLOBAL)
++    set_target_properties(zlib PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${ZLIB_INCLUDE_DIR}")
++    set_target_properties(zlib PROPERTIES IMPORTED_LOCATION "${ZLIB_LIBRARY}")
++
++    # detect libcbor
++
++    if(CBOR_ROOT_DIR)
++        list(PREPEND CMAKE_FIND_ROOT_PATH ${CBOR_ROOT_DIR})
++    endif()
++
++    find_path(CBOR_INCLUDE_DIR
++        NAMES "cbor.h")
++
++    find_library(CBOR_LIBRARY
++        NAMES libcbor cbor)
++
++    get_filename_component(CBOR_LIBRARY_DIR ${CBOR_LIBRARY} DIRECTORY CACHE)
++
++    add_library(libcbor STATIC IMPORTED GLOBAL)
++    set_target_properties(libcbor PROPERTIES IMPORTED_LOCATION "${CBOR_LIBRARY}")
+
++    # detect libressl
++
++    if(CRYPTO_ROOT_DIR)
++        list(PREPEND CMAKE_FIND_ROOT_PATH ${CRYPTO_ROOT_DIR})
++    endif()
++
++    find_path(CRYPTO_INCLUDE_DIR
++        NAMES "openssl/opensslv.h")
++
++    find_library(CRYPTO_LIBRARY
++        NAMES libcrypto crypto)
++
++    get_filename_component(CRYPTO_LIBRARY_DIR ${CRYPTO_LIBRARY} DIRECTORY CACHE)
++
++    add_library(libcrypto STATIC IMPORTED GLOBAL)
++    set_target_properties(libcrypto PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${CRYPTO_INCLUDE_DIR}")
++    set_target_properties(libcrypto PROPERTIES IMPORTED_LOCATION "${CRYPTO_LIBRARY}")
++
++    include(FindPkgConfig)
++
++    include_directories("${ZLIB_INCLUDE_DIR}")
++    include_directories("${CBOR_INCLUDE_DIR}")
++    include_directories("${CRYPTO_INCLUDE_DIR}")
++
++    message(STATUS "ZLIB_INCLUDE_DIR: ${ZLIB_INCLUDE_DIR}")
++    message(STATUS "ZLIB_LIBRARY: ${ZLIB_LIBRARY}")
++    message(STATUS "CBOR_INCLUDE_DIR: ${CBOR_INCLUDE_DIR}")
++    message(STATUS "CBOR_LIBRARY: ${CBOR_LIBRARY}")
++    message(STATUS "CRYPTO_INCLUDE_DIR: ${CRYPTO_INCLUDE_DIR}")
++    message(STATUS "CRYPTO_LIBRARY: ${CRYPTO_LIBRARY}")
++
++    if (NOT (ZLIB_LIBRARY AND CBOR_LIBRARY AND CRYPTO_LIBRARY))
++        pkg_search_module(CBOR libcbor)
++        pkg_search_module(CRYPTO libcrypto)
++        pkg_search_module(ZLIB zlib)
++
++        if(NOT CBOR_FOUND AND NOT HAVE_CBOR_H)
++            message(FATAL_ERROR "could not find libcbor")
++        endif()
++        if(NOT CRYPTO_FOUND AND NOT HAVE_OPENSSLV_H)
++            message(FATAL_ERROR "could not find libcrypto")
++        endif()
++        if(NOT ZLIB_FOUND)
++            message(FATAL_ERROR "could not find zlib")
++        endif()
++    endif()
++
++	set(ZLIB_LIBRARIES "zlib")
+ 	set(CBOR_LIBRARIES "cbor")
+ 	set(CRYPTO_LIBRARIES "crypto")
+
+@@ -226,6 +304,27 @@ else()
+ 				set(BASE_LIBRARIES ${BASE_LIBRARIES} rt)
+ 			endif()
+ 		endif()
++    elseif(CMAKE_SYSTEM_NAME STREQUAL "Android")
++        if(UDEV_ROOT_DIR)
++            list(PREPEND CMAKE_FIND_ROOT_PATH ${UDEV_ROOT_DIR})
++        endif()
++
++        find_path(UDEV_INCLUDE_DIR
++            NAMES "libudev.h")
++
++        find_library(UDEV_LIBRARY
++            NAMES libudev-zero.a libudev)
++
++        add_library(udev STATIC IMPORTED GLOBAL)
++        set_target_properties(udev PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${UDEV_INCLUDE_DIR}")
++        set_target_properties(udev PROPERTIES IMPORTED_LOCATION "${UDEV_LIBRARY}")
++
++        include_directories("${UDEV_INCLUDE_DIR}")
++
++        set(UDEV_LIBRARIES "udev")
++
++        message(STATUS "UDEV_INCLUDE_DIR: ${UDEV_INCLUDE_DIR}")
++        message(STATUS "UDEV_LIBRARY: ${UDEV_LIBRARY}")
+ 	else()
+ 		set(NFC_LINUX OFF)
+ 	endif()
+@@ -414,7 +513,7 @@ if(BUILD_MANPAGES)
+ 	subdirs(man)
+ endif()
+
+-if(NOT WIN32)
++if(NOT WIN32 AND BUILD_TESTS)
+ 	if(CMAKE_BUILD_TYPE STREQUAL "Debug" AND NOT FUZZ)
+ 		enable_testing()
+ 		subdirs(regress)
+-- 
+2.25.1
+

recipes/libfido2/patches/0002-fix-crypto-explicit_bzero-conflict.patch

@@ -0,0 +1,39 @@
+From 35bb91baf17ac73cfba58765618c7b9041f588de Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= <[email protected]>
+Date: Tue, 21 Nov 2023 16:22:07 -0500
+Subject: [PATCH 2/3] fix crypto explicit_bzero conflict
+
+---
+ openbsd-compat/explicit_bzero.c | 2 +-
+ openbsd-compat/openbsd-compat.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/openbsd-compat/explicit_bzero.c b/openbsd-compat/explicit_bzero.c
+index ac64e69..e86c5f0 100644
+--- a/openbsd-compat/explicit_bzero.c
++++ b/openbsd-compat/explicit_bzero.c
+@@ -7,7 +7,7 @@
+
+ #include "openbsd-compat.h"
+
+-#if !defined(HAVE_EXPLICIT_BZERO) && !defined(_WIN32)
++#if !defined(HAVE_EXPLICIT_BZERO) && !defined(_WIN32) && !defined(CRYPTO_EXPLICIT_BZERO)
+
+ #include <string.h>
+
+diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h
+index dc9acec..b784197 100644
+--- a/openbsd-compat/openbsd-compat.h
++++ b/openbsd-compat/openbsd-compat.h
+@@ -62,7 +62,7 @@ char *strsep(char **, const char *);
+ void *recallocarray(void *, size_t, size_t, size_t);
+ #endif
+
+-#if !defined(HAVE_EXPLICIT_BZERO)
++#if !defined(HAVE_EXPLICIT_BZERO) || defined(CRYPTO_EXPLICIT_BZERO)
+ void explicit_bzero(void *, size_t);
+ #endif
+
+-- 
+2.25.1
+

recipes/libfido2/patches/0003-use-linux-hid-backend-for-android.patch

@@ -0,0 +1,25 @@
+From 1346ae08134a5444bc21d9fc11fe8b79e784e3b2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= <[email protected]>
+Date: Tue, 21 Nov 2023 16:22:54 -0500
+Subject: [PATCH 3/3] Use Linux HID backend for Android
+
+---
+ src/CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 796ec69..a0295e3 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -63,6 +63,8 @@ elseif(APPLE)
+ 	list(APPEND FIDO_SOURCES hid_osx.c)
+ elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+ 	list(APPEND FIDO_SOURCES hid_linux.c hid_unix.c)
++elseif(CMAKE_SYSTEM_NAME STREQUAL "Android")
++	list(APPEND FIDO_SOURCES hid_linux.c hid_unix.c)
+ elseif(CMAKE_SYSTEM_NAME STREQUAL "NetBSD")
+ 	list(APPEND FIDO_SOURCES hid_netbsd.c hid_unix.c)
+ elseif(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
+-- 
+2.25.1
+

recipes/libudev-zero/conanfile.py

@@ -1,18 +1,19 @@
 from conans import ConanFile, tools, CMake, python_requires
-import os
+import os, shutil
 
 class LibUdevZeroConan(ConanFile):
     name = 'libudev-zero'
-    exports = 'VERSION'
     version = open(os.path.join('.', 'VERSION'), 'r').read().rstrip()
     license = 'ISC'
-    url = 'https://github.com/awakecoding/libudev-zero'
+    url = 'https://github.com/illiliti/libudev-zero'
     description = 'libudev-zero'
     settings = 'os', 'arch', 'distro', 'build_type'
     no_copy_source = True
-    branch = 'devolutions'
     python_requires = "shared/1.0.0@devolutions/stable"
     python_requires_extend = "shared.UtilsBase"
+    exports = ['VERSION',
+        'patches/CMakeLists.txt',
+        'patches/0001-fix-undefined-line-max-on-android.patch']
 
     options = {
         'fPIC': [True, False],
@@ -28,10 +29,20 @@ def build_requirements(self):
 
     def source(self):
         folder = self.name
-        self.output.info('Cloning repo: %s dest: %s branch: %s' % (self.url, folder, self.branch))
+        tag = self.version
+        self.output.info('Cloning repo: %s dest: %s tag: %s' % (self.url, folder, tag))
         git = tools.Git(folder=folder)
         git.clone(self.url)
-        git.checkout(self.branch)
+        git.checkout(tag)
+
+        patches_dir = os.path.join(self.recipe_folder, "patches")
+        shutil.copy(os.path.join(patches_dir, "CMakeLists.txt"), os.path.join(folder, "CMakeLists.txt"))
+
+        if os.path.isdir(patches_dir):
+            for patch_file in [f for f in os.listdir(patches_dir) if f.endswith('.patch')]:
+                patch_path = os.path.join(patches_dir, patch_file)
+                self.output.info('Applying patch: %s' % patch_path)
+                tools.patch(base_path=folder, patch_file=patch_path)
 
     def build(self):
         cmake = CMake(self)

recipes/libudev-zero/patches/0001-fix-undefined-line-max-on-android.patch

@@ -0,0 +1,27 @@
+From 6269064597de4db70b07bd0e454d6ac9fe51a137 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= <[email protected]>
+Date: Fri, 15 Apr 2022 10:09:26 -0400
+Subject: [PATCH 2/3] fix undefined LINE_MAX on Android
+
+---
+ udev_device.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/udev_device.c b/udev_device.c
+index e202150..173cbe4 100644
+--- a/udev_device.c
++++ b/udev_device.c
+@@ -26,6 +26,10 @@
+ #include "udev.h"
+ #include "udev_list.h"
+
++#ifndef LINE_MAX
++#define LINE_MAX 2048
++#endif
++
+ #ifndef LONG_BIT
+ #define LONG_BIT (sizeof(unsigned long) * 8)
+ #endif
+-- 
+2.25.1
+