Package: uhub
Followup-For: Bug #1066247
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu noble ubuntu-patch
Control: tags -1 patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* debian/patches/implicit-declarations.patch: Add missing function
prototypes. (LP: #2061039).
* debian/patches/riscv64-fix-ftbfs.patch: Add RISC-V architecture to
CPU list. Thanks to Eric Long <i...@hack3r.moe>. (LP: #2061039).
Thanks for considering the patch.
-- System Information:
Debian Release: bookworm/sid
APT prefers jammy-updates
APT policy: (500, 'jammy-updates'), (500, 'jammy-security'), (500, 'jammy'),
(100, 'jammy-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 6.5.0-27-generic (SMP w/10 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8),
LANGUAGE=en_CA:en
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru uhub-0.4.1/debian/patches/implicit-declarations.patch
uhub-0.4.1/debian/patches/implicit-declarations.patch
--- uhub-0.4.1/debian/patches/implicit-declarations.patch 1969-12-31
17:00:00.000000000 -0700
+++ uhub-0.4.1/debian/patches/implicit-declarations.patch 2024-04-15
12:08:31.000000000 -0600
@@ -0,0 +1,20 @@
+Description: Add missing function prototypes
+ This fixes FTBFS on armhf
+Author: Zixing Liu <zixing....@canonical.com>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1066247
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/uhub/+bug/2061039
+Forwarded: no
+Last-Update: 2024-04-15
+---
+Index: uhub/src/tools/adcclient.c
+===================================================================
+--- uhub.orig/src/tools/adcclient.c
++++ uhub/src/tools/adcclient.c
+@@ -88,6 +88,7 @@ static void ADC_client_on_login(struct A
+ static int ADC_client_parse_address(struct ADC_client* client, const char*
arg);
+ static int ADC_client_on_recv_line(struct ADC_client* client, const char*
line, size_t length);
+ static int ADC_client_send_queue(struct ADC_client* client);
++int ADC_client_connect_internal(struct ADC_client* client);
+
+ static void ADC_client_debug(struct ADC_client* client, const char* format,
...)
+ {
diff -Nru uhub-0.4.1/debian/patches/riscv64-fix-ftbfs.patch
uhub-0.4.1/debian/patches/riscv64-fix-ftbfs.patch
--- uhub-0.4.1/debian/patches/riscv64-fix-ftbfs.patch 1969-12-31
17:00:00.000000000 -0700
+++ uhub-0.4.1/debian/patches/riscv64-fix-ftbfs.patch 2024-04-15
12:09:00.000000000 -0600
@@ -0,0 +1,22 @@
+Description: Add RISC-V architecture to CPU list
+Author: Eric Long <i...@hack3r.moe>
+Origin:
https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=1020965;filename=riscv64-fix-ftbfs.patch;msg=5
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1020965
+Bug-Ubuntu: https://bugs.launchpad.net/debian/+source/uhub/+bug/2061039
+Forwarded: no
+Reviewed-by: Zixing Liu <zixing....@canonical.com>
+Last-Update: 2022-09-30
+---
+--- a/src/system.h
++++ b/src/system.h
+@@ -242,6 +242,10 @@
+ #define CPUINFO "s390"
+ #endif
+
++#if defined(__riscv)
++#define CPUINFO "RISC-V"
++#endif
++
+ /* Misc */
+ #ifdef MSG_NOSIGNAL
+ #define UHUB_SEND_SIGNAL MSG_NOSIGNAL
diff -Nru uhub-0.4.1/debian/patches/series uhub-0.4.1/debian/patches/series
--- uhub-0.4.1/debian/patches/series 2022-09-12 03:10:42.000000000 -0600
+++ uhub-0.4.1/debian/patches/series 2024-04-15 12:09:00.000000000 -0600
@@ -1,3 +1,5 @@
fix-build-on-hurd-i386
openssl1.1.patch
arm64-fix-ftbfs.patch
+implicit-declarations.patch
+riscv64-fix-ftbfs.patch
