Attachment 250875 Details for Bug 277652 – patch v3

[patch] patch v3

keepassxc.diff (text/plain), 7.86 KB, created by Guido Falsi on 2024-05-22 16:08:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guido Falsi

Created: 2024-05-22 16:08:21 UTC

Size: 7.86 KB

patch

obsolete

>diff --git a/security/keepassxc/Makefile b/security/keepassxc/Makefile
>index d996522a7b34..f8b2b3cc5b06 100644
>--- a/security/keepassxc/Makefile
>+++ b/security/keepassxc/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	keepassxc
>-DISTVERSION=	2.7.6
>+DISTVERSION=	2.7.8
> CATEGORIES=	security
> MASTER_SITES=	https://github.com/keepassxreboot/keepassxc/releases/download/${DISTVERSION}/
> DISTNAME=	${PORTNAME}-${DISTVERSION}-src
>@@ -20,7 +20,7 @@ LIB_DEPENDS=	libargon2.so:security/libargon2 \
> 		libqrencode.so:graphics/libqrencode \
> 		libbotan-2.so:security/botan2
> 
>-USES=		cmake compiler:c++17-lang desktop-file-utils pkgconfig qt:5 \
>+USES=		cmake compiler:c++17-lang desktop-file-utils minizip pkgconfig qt:5 \
> 		readline shared-mime-info tar:xz xorg
> USE_QT=		concurrent core dbus gui network svg widgets buildtools:build \
> 		linguisttools:build qmake:build testlib:build x11extras
>@@ -47,7 +47,6 @@ FDOSECRETS_DESC=	freedesktop.org secrets service support
> 
> KEESHARE_CMAKE_BOOL=	WITH_XC_KEESHARE
> KEESHARE_DESC=		Sharing integration with KeeShare
>-KEESHARE_USES=		minizip
> 
> # Legacy/Deprecated.
> NETWORKING_CMAKE_BOOL=	WITH_XC_NETWORKING
>diff --git a/security/keepassxc/distinfo b/security/keepassxc/distinfo
>index 25f70dd938b3..82d02f0fe5a7 100644
>--- a/security/keepassxc/distinfo
>+++ b/security/keepassxc/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1692163985
>-SHA256 (keepassxc-2.7.6-src.tar.xz) = a58074509fa8e90f152c6247f73e75e126303081f55eedb4ea0cbb6fa980d670
>-SIZE (keepassxc-2.7.6-src.tar.xz) = 8474624
>+TIMESTAMP = 1715029148
>+SHA256 (keepassxc-2.7.8-src.tar.xz) = 87d3101712b3c8656a24b908ad5b7e2529bc01717cb4156f53ba195fb81783a3
>+SIZE (keepassxc-2.7.8-src.tar.xz) = 9764860
>diff --git a/security/keepassxc/files/patch-CMakeLists.txt b/security/keepassxc/files/patch-CMakeLists.txt
>new file mode 100644
>index 000000000000..558305bb91a3
>--- /dev/null
>+++ b/security/keepassxc/files/patch-CMakeLists.txt
>@@ -0,0 +1,11 @@
>+--- CMakeLists.txt.orig	2024-05-05 20:40:29 UTC
>++++ CMakeLists.txt
>+@@ -575,7 +575,7 @@ if(WITH_XC_YUBIKEY)
>+     include_directories(SYSTEM ${PCSC_INCLUDE_DIRS})
>+ 
>+     if(UNIX AND NOT APPLE)
>+-        find_library(LIBUSB_LIBRARIES NAMES usb-1.0 REQUIRED)
>++        find_library(LIBUSB_LIBRARIES NAMES usb-1.0 usb REQUIRED)
>+         find_path(LIBUSB_INCLUDE_DIR NAMES libusb.h PATH_SUFFIXES "libusb-1.0" "libusb" REQUIRED)
>+         include_directories(SYSTEM ${LIBUSB_INCLUDE_DIR})
>+     endif()
>diff --git a/security/keepassxc/files/patch-src_gui_osutils_DeviceListener.cpp b/security/keepassxc/files/patch-src_gui_osutils_DeviceListener.cpp
>new file mode 100644
>index 000000000000..05e05d0f6cfe
>--- /dev/null
>+++ b/security/keepassxc/files/patch-src_gui_osutils_DeviceListener.cpp
>@@ -0,0 +1,11 @@
>+--- src/gui/osutils/DeviceListener.cpp.orig	2024-05-05 20:40:29 UTC
>++++ src/gui/osutils/DeviceListener.cpp
>+@@ -57,7 +57,7 @@ void DeviceListener::deregisterHotplugCallback(Handle 
>+ void DeviceListener::deregisterHotplugCallback(Handle handle)
>+ {
>+ #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
>+-    m_listeners[0]->deregisterHotplugCallback(static_cast<int>(handle));
>++    m_listeners[0]->deregisterHotplugCallback(handle);
>+ #else
>+     if (m_listeners.contains(handle)) {
>+         m_listeners[handle]->deregisterHotplugCallback();
>diff --git a/security/keepassxc/files/patch-src_gui_osutils_nixutils_DeviceListenerLibUsb.cpp b/security/keepassxc/files/patch-src_gui_osutils_nixutils_DeviceListenerLibUsb.cpp
>new file mode 100644
>index 000000000000..c532b3656582
>--- /dev/null
>+++ b/security/keepassxc/files/patch-src_gui_osutils_nixutils_DeviceListenerLibUsb.cpp
>@@ -0,0 +1,51 @@
>+--- src/gui/osutils/nixutils/DeviceListenerLibUsb.cpp.orig	2024-05-05 20:40:29 UTC
>++++ src/gui/osutils/nixutils/DeviceListenerLibUsb.cpp
>+@@ -49,7 +49,7 @@ namespace
>+     }
>+ } // namespace
>+ 
>+-int DeviceListenerLibUsb::registerHotplugCallback(bool arrived, bool left, int vendorId, int productId, const QUuid*)
>++DeviceListenerLibUsb::Handle DeviceListenerLibUsb::registerHotplugCallback(bool arrived, bool left, int vendorId, int productId, const QUuid*)
>+ {
>+     if (!m_ctx) {
>+         if (libusb_init(reinterpret_cast<libusb_context**>(&m_ctx)) != LIBUSB_SUCCESS) {
>+@@ -66,7 +66,7 @@ int DeviceListenerLibUsb::registerHotplugCallback(bool
>+         events |= LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT;
>+     }
>+ 
>+-    int handle = 0;
>++    libusb_hotplug_callback_handle handle = nullptr;
>+     const QPointer that = this;
>+     const int ret = libusb_hotplug_register_callback(
>+         static_cast<libusb_context*>(m_ctx),
>+@@ -87,7 +87,7 @@ int DeviceListenerLibUsb::registerHotplugCallback(bool
>+         &handle);
>+     if (ret != LIBUSB_SUCCESS) {
>+         qWarning("Failed to register USB listener callback.");
>+-        handle = 0;
>++        handle = nullptr;
>+     }
>+ 
>+     if (m_completed && m_usbEvents.isRunning()) {
>+@@ -98,16 +98,17 @@ int DeviceListenerLibUsb::registerHotplugCallback(bool
>+         m_completed = false;
>+         m_usbEvents = QtConcurrent::run(handleUsbEvents, static_cast<libusb_context*>(m_ctx), &m_completed);
>+     }
>+-    m_callbackHandles.insert(handle);
>+-    return handle;
>++    Handle ext = (Handle)handle;
>++    m_callbackHandles.insert(ext);
>++    return ext;
>+ }
>+ 
>+-void DeviceListenerLibUsb::deregisterHotplugCallback(int handle)
>++void DeviceListenerLibUsb::deregisterHotplugCallback(Handle handle)
>+ {
>+     if (!m_ctx || !m_callbackHandles.contains(handle)) {
>+         return;
>+     }
>+-    libusb_hotplug_deregister_callback(static_cast<libusb_context*>(m_ctx), handle);
>++    libusb_hotplug_deregister_callback(static_cast<libusb_context*>(m_ctx), (libusb_hotplug_callback_handle)handle);
>+     m_callbackHandles.remove(handle);
>+ 
>+     if (m_callbackHandles.isEmpty() && m_usbEvents.isRunning()) {
>diff --git a/security/keepassxc/files/patch-src_gui_osutils_nixutils_DeviceListenerLibUsb.h b/security/keepassxc/files/patch-src_gui_osutils_nixutils_DeviceListenerLibUsb.h
>new file mode 100644
>index 000000000000..f4cdf689c488
>--- /dev/null
>+++ b/security/keepassxc/files/patch-src_gui_osutils_nixutils_DeviceListenerLibUsb.h
>@@ -0,0 +1,27 @@
>+--- src/gui/osutils/nixutils/DeviceListenerLibUsb.h.orig	2024-05-05 20:40:29 UTC
>++++ src/gui/osutils/nixutils/DeviceListenerLibUsb.h
>+@@ -32,12 +32,13 @@ class DeviceListenerLibUsb : public QObject (public)
>+     Q_OBJECT
>+ 
>+ public:
>++    typedef qintptr Handle;
>+     explicit DeviceListenerLibUsb(QWidget* parent);
>+     DeviceListenerLibUsb(const DeviceListenerLibUsb&) = delete;
>+     ~DeviceListenerLibUsb() override;
>+ 
>+-    int registerHotplugCallback(bool arrived, bool left, int vendorId = -1, int productId = -1, const QUuid* = nullptr);
>+-    void deregisterHotplugCallback(int handle);
>++    Handle registerHotplugCallback(bool arrived, bool left, int vendorId = -1, int productId = -1, const QUuid* = nullptr);
>++    void deregisterHotplugCallback(Handle handle);
>+     void deregisterAllHotplugCallbacks();
>+ 
>+ signals:
>+@@ -45,7 +46,7 @@ signals: (private)
>+ 
>+ private:
>+     void* m_ctx;
>+-    QSet<int> m_callbackHandles;
>++    QSet<Handle> m_callbackHandles;
>+     QFuture<void> m_usbEvents;
>+     QAtomicInt m_completed;
>+ };
>diff --git a/security/keepassxc/files/patch-src_thirdparty_ykcore_CMakeLists.txt b/security/keepassxc/files/patch-src_thirdparty_ykcore_CMakeLists.txt
>index af4cb68d5d09..10bd71417334 100644
>--- a/security/keepassxc/files/patch-src_thirdparty_ykcore_CMakeLists.txt
>+++ b/security/keepassxc/files/patch-src_thirdparty_ykcore_CMakeLists.txt
>@@ -1,8 +1,8 @@
>---- src/thirdparty/ykcore/CMakeLists.txt.orig	2022-03-21 22:47:20 UTC
>+--- src/thirdparty/ykcore/CMakeLists.txt.orig	2024-05-05 20:40:29 UTC
> +++ src/thirdparty/ykcore/CMakeLists.txt
>-@@ -27,7 +27,7 @@ elseif(UNIX AND NOT APPLE)
>- elseif(UNIX AND NOT APPLE)
>-     target_sources(ykcore PRIVATE ykcore_libusb-1.0.c)
>+@@ -29,7 +29,7 @@ elseif(UNIX AND NOT APPLE)
>+ 
>+     find_package(Threads REQUIRED)
>  
> -    find_library(LIBUSB_LIBRARY NAMES usb-1.0)
> +    find_library(LIBUSB_LIBRARY NAMES usb-1.0 usb)

Actions: View | Diff

Attachments on bug 277652: 249113 | 249119 | 250521 | 250605 | 250875 | 250893 | 250909 | 250910 | 251529