Attachment 250910 Details for Bug 277652 – bapt's approach

[patch] bapt's approach

keepassxc.diff (text/plain), 4.78 KB, created by Baptiste Daroussin on 2024-05-23 20:50:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Baptiste Daroussin

Created: 2024-05-23 20:50:39 UTC

Size: 4.78 KB

patch

obsolete

>diff --git a/security/keepassxc/Makefile b/security/keepassxc/Makefile
>index d996522a7b34..c08c327033fb 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
>diff --git a/security/keepassxc/distinfo b/security/keepassxc/distinfo
>index 25f70dd938b3..27142e089a9f 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 = 1716409923
>+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-src_gui_osutils_nixutils_DeviceListenerLibUsb.cpp b/security/keepassxc/files/patch-src_gui_osutils_nixutils_DeviceListenerLibUsb.cpp
>new file mode 100644
>index 000000000000..25c6f666561b
>--- /dev/null
>+++ b/security/keepassxc/files/patch-src_gui_osutils_nixutils_DeviceListenerLibUsb.cpp
>@@ -0,0 +1,35 @@
>+--- src/gui/osutils/nixutils/DeviceListenerLibUsb.cpp.orig	2024-05-23 07:16:45 UTC
>++++ src/gui/osutils/nixutils/DeviceListenerLibUsb.cpp
>+@@ -66,7 +66,7 @@ int DeviceListenerLibUsb::registerHotplugCallback(bool
>+         events |= LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT;
>+     }
>+ 
>+-    int handle = 0;
>++    Handle handle = 0;
>+     const QPointer that = this;
>+     const int ret = libusb_hotplug_register_callback(
>+         static_cast<libusb_context*>(m_ctx),
>+@@ -84,7 +84,7 @@ int DeviceListenerLibUsb::registerHotplugCallback(bool
>+             return 0;
>+         },
>+         that,
>+-        &handle);
>++        reinterpret_cast<libusb_hotplug_callback_handle *>(&handle));
>+     if (ret != LIBUSB_SUCCESS) {
>+         qWarning("Failed to register USB listener callback.");
>+         handle = 0;
>+@@ -102,12 +102,12 @@ int DeviceListenerLibUsb::registerHotplugCallback(bool
>+     return handle;
>+ }
>+ 
>+-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..c2b7dd3842d0
>--- /dev/null
>+++ b/security/keepassxc/files/patch-src_gui_osutils_nixutils_DeviceListenerLibUsb.h
>@@ -0,0 +1,26 @@
>+--- 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);
>++    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