Package: ucspi-tcp
Followup-For: Bug #1066629
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/0006-implicit-declarations.patch: Add missing
includes and prototypes. Closes LP: #2061188.
* debian/ipv6-support.patch: Refresh deferred patch.
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-26-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 ucspi-tcp-0.88/debian/ipv6-support.patch
ucspi-tcp-0.88/debian/ipv6-support.patch
--- ucspi-tcp-0.88/debian/ipv6-support.patch2024-02-27 02:57:42.0
-0700
+++ ucspi-tcp-0.88/debian/ipv6-support.patch2024-04-12 14:19:46.0
-0600
@@ -741,7 +741,7 @@
index 0948b1a..f06c5a8 100644
--- a/dns.h
+++ b/dns.h
-@@ -34,51 +34,60 @@ struct dns_transmit {
+@@ -34,51 +34,61 @@ struct dns_transmit {
unsigned int curserver;
struct taia deadline;
unsigned int pos;
@@ -812,6 +812,7 @@
-extern int dns_mx_packet(stralloc *,char *,unsigned int);
-extern int dns_mx(stralloc *,stralloc *);
+extern int dns_name4(stralloc *,const char *);
++extern int dns_name6(stralloc *,char *);
+extern int dns_txt_packet(stralloc *,const char *,unsigned int);
+extern int dns_txt(stralloc *,const stralloc *);
+extern int dns_mx_packet(stralloc *,const char *,unsigned int);
@@ -1330,11 +1331,6 @@
index b9892b4..2158ed4 100644
--- a/dns_random.c
+++ b/dns_random.c
-@@ -1,3 +1,4 @@
-+#include
- #include "dns.h"
- #include "taia.h"
- #include "uint32.h"
@@ -29,7 +30,7 @@ static void surf(void)
}
}
@@ -1433,8 +1429,8 @@
index 6f215ac..b0c8e6d 100644
--- a/dns_rcrw.c
+++ b/dns_rcrw.c
-@@ -1,16 +1,17 @@
-+#include
+@@ -1,16 +1,16 @@
+ #include
#include "taia.h"
-#include "env.h"
#include "byte.h"
@@ -1511,17 +1507,7 @@
index df12826..9511511 100644
--- a/dns_transmit.c
+++ b/dns_transmit.c
-@@ -1,12 +1,15 @@
-+#include
-+#include
-+#include
-+#include
- #include "socket.h"
--#include "alloc.h"
--#include "error.h"
-+#include
- #include "byte.h"
--#include "readwrite.h"
+@@ -7,7 +7,8 @@
#include "uint16.h"
#include "dns.h"
+#include "ip6.h"
@@ -1985,7 +1971,7 @@
+#include "byte.h"
+
+extern unsigned int scan_ip6(const char *src,char *ip);
-+extern unsigned int fmt_ip6(char *dest,const char *ip);
++extern unsigned int ip6_fmt(char *dest,char *ip);
+
+extern unsigned int scan_ip6_flat(const char *src,char *);
+extern unsigned int fmt_ip6_flat(char *dest,const char *);
@@ -2357,7 +2343,8 @@
index 000..cf3b7c1
--- /dev/null
+++ b/remoteinfo6.c
-@@ -0,0 +1,98 @@
+@@ -0,0 +1,99 @@
++#include
+#include "fmt.h"
+#include "buffer.h"
+#include "socket.h"
@@ -3065,7 +3052,8 @@
index 000..74099e2
--- /dev/null
+++ b/socket_tcp6.c
-@@ -0,0 +1,44 @@
+@@ -0,0 +1,45 @@
++#include
+#include
+#include
+#include
diff -Nru ucspi-tcp-0.88/debian/patches/0006-implicit-declarations.patch
ucspi-tcp-0.88/debian/patches/0006-implicit-declarations.patch
--- ucspi-tcp-0.88/debian/patches/0006-implicit-declarations.patch
1969-12-31 17:00:00.0 -0700
+++ ucspi-tcp-0.88/debian/patches/0006-implicit-declarations.patch
2024-04-12 14:33:32.0 -0600
@@ -0,0 +1,356 @@
+Description: Add missing includes and prototypes
+Author: Zixing Liu
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1066629
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ucspi-tcp/+bug/2061188
+Forwarded: no
+Last-Update: 2024-04-12
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: ucspi-tcp/dns_random.c
+===
+--- ucspi-tcp.orig/dns_random.c
ucspi-tcp/dns_random.c
+@@ -1,3 +1,4 @@
++#include
+ #include "dns.h"
+ #include "taia.h"
+ #include "uint32.h"
+Index: ucspi-tcp/dns_rcrw.c
+===
+--- ucspi-tcp.orig/dns_rcrw.c
ucspi-tcp/dns_rcrw.c
+@@ -1,3 +1,4 @@
++#include
+ #include "taia.h"
+ #include "env.h"
+ #include "byte.h"
+Index: ucspi-tcp/remoteinfo.c
+===
+--- ucspi-tcp.orig/remoteinfo.c
ucspi-tcp/remoteinfo.c
+@@ -1,3 +1,4 @@
++#include
+ #include "fmt.h"
+ #include "buffer.h"
+ #include "socket.h"
+Index: ucspi-tcp/tcpserver.c
+===
+--- ucspi-tcp.orig/tcpserver.c