Your message dated Sat, 31 Aug 2024 12:30:55 +0100
with message-id
<27c418b1a49ffc566f1b9635359e59f6a742be26.ca...@adam-barratt.org.uk>
and subject line Closing bugs for 11.11
has caused the Debian Bug report #1079271,
regarding bullseye-pu: package trinity/1.9+git20200331.4d2343bd18c7b-2+deb11u1
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)
--
1079271: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1079271
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
Tags: bullseye
User: release.debian....@packages.debian.org
Usertags: pu
X-Debbugs-Cc: trin...@packages.debian.org, sanv...@debian.org, g...@zumbi.com.ar
Control: affects -1 + src:trinity
[ Reason ]
This upload fixes FTBFS bug #1028795.
[ Impact ]
Without this change the package would continue to FTBFS in bullseye.
[ Tests ]
I've checked that the package builds again.
[ Risks ]
Low. The patch has been taken verbatim from the upstream git repo,
and it's also included in the version in stable.
[ Checklist ]
[X] *all* changes are documented in the d/changelog
[X] I reviewed all changes and I approve them
[X] attach debdiff against the package in (old)stable
[X] the issue is verified as fixed in unstable
[ Changes ]
Drop decnet support to fix FTBFS bug.
[ Other info ]
I'll wait for approval before upload.
Also: I would prefer this to be a sponsored upload instead of a NMU.
Gustavo: If you put the changes in salsa, I could take them from there
for the final upload.
diff -Nru trinity-1.9+git20200331.4d2343bd18c7b/debian/changelog
trinity-1.9+git20200331.4d2343bd18c7b/debian/changelog
--- trinity-1.9+git20200331.4d2343bd18c7b/debian/changelog 2020-10-29
22:12:17.000000000 +0100
+++ trinity-1.9+git20200331.4d2343bd18c7b/debian/changelog 2024-08-22
03:32:00.000000000 +0200
@@ -1,3 +1,10 @@
+trinity (1.9+git20200331.4d2343bd18c7b-2+deb11u1) bullseye; urgency=medium
+
+ * Non-maintainer upload.
+ * Drop decnet support to fix FTBFS bug. Closes: #1028795.
+
+ -- Santiago Vila <sanv...@debian.org> Thu, 22 Aug 2024 03:32:00 +0200
+
trinity (1.9+git20200331.4d2343bd18c7b-2) unstable; urgency=medium
* [c24aa6] Make the build verbose by default.
diff -Nru
trinity-1.9+git20200331.4d2343bd18c7b/debian/patches/drop-decnet.patch
trinity-1.9+git20200331.4d2343bd18c7b/debian/patches/drop-decnet.patch
--- trinity-1.9+git20200331.4d2343bd18c7b/debian/patches/drop-decnet.patch
1970-01-01 01:00:00.000000000 +0100
+++ trinity-1.9+git20200331.4d2343bd18c7b/debian/patches/drop-decnet.patch
2024-08-20 22:25:47.000000000 +0200
@@ -0,0 +1,111 @@
+commit 99a1822383a676e0bacfe1cd8ff0e2e2dfb8ba76
+Author: Fabrice Fontaine <fontaine.fabr...@gmail.com>
+Date: Sun Jan 8 20:50:18 2023 +0100
+
+ drop decnet
+
+ Drop decnet as it has been removed since kernel 6.1 and
+
https://github.com/torvalds/linux/commit/1202cdd665315c525b5237e96e0bedc76d7e754f
+ resulting in the following build failure:
+
+ net/proto-decnet.c:5:10: fatal error: linux/dn.h: No such file or directory
+ 5 | #include <linux/dn.h>
+ | ^~~~~~~~~~~~
+
+ Fixes:
+ -
http://autobuild.buildroot.org/results/47e0a5e0b6fcf33ab4f9848d5d8c2be9e5283950
+
+ Signed-off-by: Fabrice Fontaine <fontaine.fabr...@gmail.com>
+
+--- a/include/net.h
++++ b/include/net.h
+@@ -80,7 +80,6 @@
+ extern const struct netproto proto_atmsvc;
+ extern const struct netproto proto_x25;
+ extern const struct netproto proto_rose;
+-extern const struct netproto proto_decnet;
+ extern const struct netproto proto_llc;
+ extern const struct netproto proto_netlink;
+ extern const struct netproto proto_packet;
+--- a/net/proto-decnet.c
++++ /dev/null
+@@ -1,59 +0,0 @@
+-#include <sys/types.h>
+-#include <sys/socket.h>
+-#include <sys/un.h>
+-#include <netinet/in.h>
+-#include <linux/dn.h>
+-#include <stdlib.h>
+-#include "net.h"
+-#include "random.h"
+-#include "utils.h" // RAND_ARRAY
+-#include "compat.h"
+-
+-static void decnet_gen_sockaddr(struct sockaddr **addr, socklen_t *addrlen)
+-{
+- struct sockaddr_dn *dn;
+- unsigned int i;
+-
+- dn = zmalloc(sizeof(struct sockaddr_dn));
+-
+- dn->sdn_family = PF_DECnet;
+- dn->sdn_flags = rnd();
+- dn->sdn_objnum = rnd();
+- dn->sdn_objnamel = rnd() % 16;
+- for (i = 0; i < dn->sdn_objnamel; i++)
+- dn->sdn_objname[i] = rnd();
+- dn->sdn_add.a_len = RAND_BOOL();
+- dn->sdn_add.a_addr[0] = rnd();
+- dn->sdn_add.a_addr[1] = rnd();
+- *addr = (struct sockaddr *) dn;
+- *addrlen = sizeof(struct sockaddr_dn);
+-}
+-
+-static const unsigned int decnet_opts[] = {
+- SO_CONDATA, SO_CONACCESS, SO_PROXYUSR, SO_LINKINFO,
+- DSO_CONDATA, DSO_DISDATA, DSO_CONACCESS, DSO_ACCEPTMODE,
+- DSO_CONACCEPT, DSO_CONREJECT, DSO_LINKINFO, DSO_STREAM,
+- DSO_SEQPACKET, DSO_MAXWINDOW, DSO_NODELAY, DSO_CORK,
+- DSO_SERVICES, DSO_INFO
+-};
+-
+-static void decnet_setsockopt(struct sockopt *so, __unused__ struct
socket_triplet *triplet)
+-{
+- so->level = SOL_DECNET;
+- so->optname = RAND_ARRAY(decnet_opts);
+-
+- // TODO: set optlen correctly
+-}
+-
+-static struct socket_triplet decnet_triplets[] = {
+- { .family = PF_DECnet, .protocol = DNPROTO_NSP, .type = SOCK_SEQPACKET
},
+- { .family = PF_DECnet, .protocol = DNPROTO_NSP, .type = SOCK_STREAM },
+-};
+-
+-const struct netproto proto_decnet = {
+- .name = "decnet",
+- .setsockopt = decnet_setsockopt,
+- .gen_sockaddr = decnet_gen_sockaddr,
+- .valid_triplets = decnet_triplets,
+- .nr_triplets = ARRAY_SIZE(decnet_triplets),
+-};
+--- a/net/proto-unix.c
++++ b/net/proto-unix.c
+@@ -2,7 +2,6 @@
+ #include <sys/socket.h>
+ #include <sys/un.h>
+ #include <netinet/in.h>
+-#include <linux/dn.h>
+ #include <stdlib.h>
+ #include "net.h"
+ #include "random.h"
+--- a/net/protocols.c
++++ b/net/protocols.c
+@@ -18,7 +18,6 @@
+ #ifdef USE_IPV6
+ [PF_INET6] = { .proto = &proto_inet6 },
+ #endif
+- [PF_DECnet] = { .proto = &proto_decnet },
+ [PF_PACKET] = { .proto = &proto_packet },
+ #ifdef USE_NETECONET
+ [PF_ECONET] = { .proto = &proto_econet },
diff -Nru trinity-1.9+git20200331.4d2343bd18c7b/debian/patches/series
trinity-1.9+git20200331.4d2343bd18c7b/debian/patches/series
--- trinity-1.9+git20200331.4d2343bd18c7b/debian/patches/series 1970-01-01
01:00:00.000000000 +0100
+++ trinity-1.9+git20200331.4d2343bd18c7b/debian/patches/series 2024-08-20
22:25:47.000000000 +0200
@@ -0,0 +1 @@
+drop-decnet.patch
--- End Message ---
--- Begin Message ---
Package: release.debian.org
Version: 11.11
Hi,
Each of these bugs relates to an update including in today's final
bullseye 11.11 point release.
Regards,
Adam
--- End Message ---