Package: uhub
Version: 0.4.1-3.2
Severity: normal
Tags: patch pending
Dear maintainer,
I've prepared an NMU for uhub (versioned as 0.4.1-3.3) and
uploaded it.
Regards.
diff -Nru uhub-0.4.1/debian/changelog uhub-0.4.1/debian/changelog
--- uhub-0.4.1/debian/changelog 2022-09-12 11:14:29.000000000 +0200
+++ uhub-0.4.1/debian/changelog 2024-11-05 07:38:55.000000000 +0100
@@ -1,3 +1,16 @@
+uhub (0.4.1-3.3) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ [ zhangdandan <zhangdan...@loongson.cn> ]
+ * Add support for LoongArch (Closes: #1074428)
+
+ [ Zixing Liu <zixing....@canonical.com> ]
+ * Fix FTBFS with newer gcc (Closes: #1066247)
+ * Fix FTBFS with riscv64 (Closes: #1020965)
+ - patch contributed by Eric Long <i...@hack3r.moe>
+
+ -- Gianfranco Costamagna <locutusofb...@debian.org> Tue, 05 Nov 2024
07:38:55 +0100
+
uhub (0.4.1-3.2) unstable; urgency=medium
* Non-maintainer upload.
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 1970-01-01
01:00:00.000000000 +0100
+++ uhub-0.4.1/debian/patches/implicit-declarations.patch 2024-11-05
07:38:21.000000000 +0100
@@ -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 1970-01-01
01:00:00.000000000 +0100
+++ uhub-0.4.1/debian/patches/riscv64-fix-ftbfs.patch 2024-11-05
07:38:43.000000000 +0100
@@ -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
+@@ -246,6 +246,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 11:10:42.000000000 +0200
+++ uhub-0.4.1/debian/patches/series 2024-11-05 07:38:11.000000000 +0100
@@ -1,3 +1,6 @@
fix-build-on-hurd-i386
openssl1.1.patch
arm64-fix-ftbfs.patch
+uhub-add-loongarch-support.patch
+implicit-declarations.patch
+riscv64-fix-ftbfs.patch
diff -Nru uhub-0.4.1/debian/patches/uhub-add-loongarch-support.patch
uhub-0.4.1/debian/patches/uhub-add-loongarch-support.patch
--- uhub-0.4.1/debian/patches/uhub-add-loongarch-support.patch 1970-01-01
01:00:00.000000000 +0100
+++ uhub-0.4.1/debian/patches/uhub-add-loongarch-support.patch 2024-11-05
07:36:22.000000000 +0100
@@ -0,0 +1,16 @@
+Description: Add loongarch support
+Last-Update: 2024-06-28
+
+--- uhub-0.4.1.orig/src/system.h
++++ uhub-0.4.1/src/system.h
+@@ -218,6 +218,10 @@
+ #define CPUINFO "PARISC"
+ #endif
+
++#if defined(__loongarch__)
++#define CPUINFO "LoongArch"
++#endif
++
+ #if defined(__m68k__) || defined(M68000)
+ #define CPUINFO "M68K"
+ #endifdiff -Nru uhub-0.4.1/debian/changelog uhub-0.4.1/debian/changelog
--- uhub-0.4.1/debian/changelog 2022-09-12 11:14:29.000000000 +0200
+++ uhub-0.4.1/debian/changelog 2024-11-05 07:38:55.000000000 +0100
@@ -1,3 +1,16 @@
+uhub (0.4.1-3.3) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ [ zhangdandan <zhangdan...@loongson.cn> ]
+ * Add support for LoongArch (Closes: #1074428)
+
+ [ Zixing Liu <zixing....@canonical.com> ]
+ * Fix FTBFS with newer gcc (Closes: #1066247)
+ * Fix FTBFS with riscv64 (Closes: #1020965)
+ - patch contributed by Eric Long <i...@hack3r.moe>
+
+ -- Gianfranco Costamagna <locutusofb...@debian.org> Tue, 05 Nov 2024 07:38:55 +0100
+
uhub (0.4.1-3.2) unstable; urgency=medium
* Non-maintainer upload.
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 1970-01-01 01:00:00.000000000 +0100
+++ uhub-0.4.1/debian/patches/implicit-declarations.patch 2024-11-05 07:38:21.000000000 +0100
@@ -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 1970-01-01 01:00:00.000000000 +0100
+++ uhub-0.4.1/debian/patches/riscv64-fix-ftbfs.patch 2024-11-05 07:38:43.000000000 +0100
@@ -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
+@@ -246,6 +246,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 11:10:42.000000000 +0200
+++ uhub-0.4.1/debian/patches/series 2024-11-05 07:38:11.000000000 +0100
@@ -1,3 +1,6 @@
fix-build-on-hurd-i386
openssl1.1.patch
arm64-fix-ftbfs.patch
+uhub-add-loongarch-support.patch
+implicit-declarations.patch
+riscv64-fix-ftbfs.patch
diff -Nru uhub-0.4.1/debian/patches/uhub-add-loongarch-support.patch uhub-0.4.1/debian/patches/uhub-add-loongarch-support.patch
--- uhub-0.4.1/debian/patches/uhub-add-loongarch-support.patch 1970-01-01 01:00:00.000000000 +0100
+++ uhub-0.4.1/debian/patches/uhub-add-loongarch-support.patch 2024-11-05 07:36:22.000000000 +0100
@@ -0,0 +1,16 @@
+Description: Add loongarch support
+Last-Update: 2024-06-28
+
+--- uhub-0.4.1.orig/src/system.h
++++ uhub-0.4.1/src/system.h
+@@ -218,6 +218,10 @@
+ #define CPUINFO "PARISC"
+ #endif
+
++#if defined(__loongarch__)
++#define CPUINFO "LoongArch"
++#endif
++
+ #if defined(__m68k__) || defined(M68000)
+ #define CPUINFO "M68K"
+ #endif
