Package: release.debian.org Severity: normal Tags: trixie X-Debbugs-Cc: clatd@packages.debian.org, dxld@darkboxed.org Control: affects -1 + src:clatd User: release.debian.org@packages.debian.org Usertags: pu Hi Release team, [ Reason ] clatd is currently completely non-functional in Trixie. A packaging bug I did't get around to in time "systemd units not getting installed" #1101004 made using it a manual affair. Now I've found #1082060 in tayga actually breaks it completely. [ Impact ] clatd has no system itegration. Sufficiently motivated users will make their own systemd unit once a stable-update for #1082060 I'm working on is out, but this may complicate the an upgrade to Forky. Fixing this while clatd has no users (yet) is my intention here. [ Tests ] I've upgrade tested the changes manually in my IPv6-only lab network. [ Risks ] Since clatd is new and currently completely non-functional in Trixie I expect it has no users so there is no risk :-). [ 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 ] - clatd.service is now installed (started and enabled). Note that clatd guards against running unecessarily (v4-conncheck-enable=1) or when the network doesn't advertise the necessary support for IPv6-only (via DNS64 auto-detection). To tidy up the package while we're touching it I also fix two usability issues: - Install NM integration into /usr instead of /etc. - Add a clatd.conf template with only comments as documentation. I validated this will trigger a dpkg prompt only if the user created a config file manually. Thanks, --Daniel
diff -Nru clatd-2.1.0/debian/changelog clatd-2.1.0/debian/changelog
--- clatd-2.1.0/debian/changelog 2025-04-16 19:56:40.000000000 +0200
+++ clatd-2.1.0/debian/changelog 2025-11-17 14:50:30.000000000 +0100
@@ -1,3 +1,11 @@
+clatd (2.1.0-2+deb13u1) trixie; urgency=medium
+
+ * Move NetworkManager dispatcher script to /usr/lib (Closes: #1110678)
+ * Fix systemd units not getting installed (Closes: #1101004)
+ * Install an example /etc/clatd.conf with only comments
+
+ -- Daniel Gröber <dxld@darkboxed.org> Mon, 17 Nov 2025 14:50:30 +0100
+
clatd (2.1.0-2) unstable; urgency=medium
* No change Soure-only upload for testing migration
diff -Nru clatd-2.1.0/debian/clatd.conf clatd-2.1.0/debian/clatd.conf
--- clatd-2.1.0/debian/clatd.conf 1970-01-01 01:00:00.000000000 +0100
+++ clatd-2.1.0/debian/clatd.conf 2025-11-17 14:48:58.000000000 +0100
@@ -0,0 +1,60 @@
+# clatd(8) config - defaults in comments
+
+### Files
+# /etc/clatd.conf: global settings (clatd.service)
+# /etc/clatd/INTERFACE.conf: per-interface settings (clatd@INTERFACE.service)
+
+# Remember to set each interface's `clat-v4-addr` to a unique address
+# taken from 192.0.0.0/29. (.0 to .7).
+
+### Network device control
+# clat-dev=clat # TUN interface name to use
+# plat-dev= # PLAT-facing device. Detected if unset.
+
+### IPv4 connectivity check
+# v4-conncheck-enable=1 # exit if there's already a defroute
+# v4-conncheck-delay=10 # seconds before checking for v4 conn.
+
+### Change kernel IPv6 sysctls
+# forwarding-enable=1 # enable ipv6 forwarding?
+
+### Addressing
+# clat-v4-addr=192.0.0.1 # from RFC 7335
+# tayga-v4-addr=192.0.0.2 # from RFC 7335
+# clat-v6-addr=shared # re-use primary address from host OS
+# route-table=0xc1a7 # add route to clat-v6-addr in this table
+
+### PLAT prefix
+# dns64-servers= # system resolver by default
+## or override
+# plat-prefix= # detected using DNS64 or PREF64 by default
+# plat-fallback-prefix= # fallback prefix if no prefix is found
+
+### IPv4 default route parameters
+# v4-defaultroute-enable=1 # add a v4 defaultroute via the CLAT?
+# v4-defaultroute-replace=0 # replace existing v4 defaultroute?
+# v4-defaultroute-metric=2048 # metric for the IPv4 defaultroute
+# v4-defaultroute-mtu=1260 # MTU for the IPv4 defaultroute
+# v4-defaultroute-advmss=0 # TCP MSS for the IPv4 defaultroute
+
+### Script hooks
+# script-up= # script to run when starting up
+# script-down= # script to run when shutting down
+
+### Logging
+# quiet=0 # suppress normal output
+# debug=0 # debugging output level
+
+### Override implementation details
+# ctmark= # match ctmark for routing pkts to CLAT
+# proxynd-enable= # add proxy-nd entry for clat?
+
+### Override conffile
+# tayga-conffile= # make a temporary one by default
+
+### Override commands
+# cmd-ip=ip # assume in $PATH
+# cmd-networkctl=networkctl # assume in $PATH
+# cmd-nft=nft # assume in $PATH
+# cmd-tayga=tayga # assume in $PATH
+# cmd-ufw=ufw # assume in $PATH
diff -Nru clatd-2.1.0/debian/clatd.conffiles clatd-2.1.0/debian/clatd.conffiles
--- clatd-2.1.0/debian/clatd.conffiles 1970-01-01 01:00:00.000000000 +0100
+++ clatd-2.1.0/debian/clatd.conffiles 2025-11-16 12:47:14.000000000 +0100
@@ -0,0 +1 @@
+remove-on-upgrade /etc/NetworkManager/dispatcher.d/50-clatd
diff -Nru clatd-2.1.0/debian/clatd.install clatd-2.1.0/debian/clatd.install
--- clatd-2.1.0/debian/clatd.install 1970-01-01 01:00:00.000000000 +0100
+++ clatd-2.1.0/debian/clatd.install 2025-11-17 14:48:58.000000000 +0100
@@ -0,0 +1 @@
+debian/clatd.conf /etc/
diff -Nru clatd-2.1.0/debian/patches/0003-Rewrite-Makefile-to-be-more-idiomatic.patch clatd-2.1.0/debian/patches/0003-Rewrite-Makefile-to-be-more-idiomatic.patch
--- clatd-2.1.0/debian/patches/0003-Rewrite-Makefile-to-be-more-idiomatic.patch 2025-04-06 12:32:34.000000000 +0200
+++ clatd-2.1.0/debian/patches/0003-Rewrite-Makefile-to-be-more-idiomatic.patch 2025-11-17 14:48:45.000000000 +0100
@@ -9,18 +9,13 @@
2 files changed, 58 insertions(+), 20 deletions(-)
create mode 100644 .gitignore
-diff --git a/.gitignore b/.gitignore
-new file mode 100644
-index 0000000..21fb2a9
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/clat.8
-diff --git a/Makefile b/Makefile
-index bdca32e..8c33940 100644
--- a/Makefile
+++ b/Makefile
-@@ -1,29 +1,66 @@
+@@ -1,29 +1,68 @@
+# clatd Makefile
+#
+# Copyright (C) 2025 Daniel Gröber <dxld@debian.org>
@@ -31,13 +26,14 @@
PREFIX=/usr
SYSCONFDIR=/etc
+BINDIR = $(PREFIX)/sbin
++LIBDIR = $(PREFIX)/lib
+
+SYSTEMCTL = systemctl
+
+CLATD = $(DESTDIR)$(BINDIR)/clatd
+MANPAGE = $(DESTDIR)$(PREFIX)/share/man/man8/clatd.8
-+SYSTEMD_SYSSERVICEDIR = $(DESTDIR)$(SYSCONFDIR)/systemd/system
-+NM_DISPATCHER = $(DESTDIR)$(SYSCONFDIR)/NetworkManager/dispatcher.d/50-clatd
++SYSTEMD_SYSSERVICEDIR = $(DESTDIR)$(LIBDIR)/systemd/system
++NM_DISPATCHER = $(DESTDIR)$(LIBDIR)/NetworkManager/dispatcher.d/50-clatd
+
+Q = @
+
@@ -83,7 +79,8 @@
- if test -d $(DESTDIR)$(SYSCONFDIR)/NetworkManager/dispatcher.d; then install -m0755 scripts/clatd.networkmanager $(DESTDIR)$(SYSCONFDIR)/NetworkManager/dispatcher.d/50-clatd; fi
+ install -D -m0755 clatd $(CLATD)
+ install -D -m0644 clatd.8 $(MANPAGE)
-+ install -D -m0644 scripts/*.service $(SYSTEMD_SYSSERVICEDIR)/
++ install -D -m0644 scripts/clatd.systemd $(SYSTEMD_SYSSERVICEDIR)/clatd.service
++ #install -D -m0644 scripts/clatd@.systemd $(SYSTEMD_SYSSERVICEDIR)/clatd@.service
+ install -D -m0755 scripts/clatd.networkmanager $(NM_DISPATCHER)
+
+DEB_PACKAGES = \
@@ -107,6 +104,3 @@
+ { PKGS='$(RPM_PACKAGES)'; PKG=yum; prog_exists $$PKG; } || \
+ { PKG=false; echo 'ERROR: Failed to detect system package manager.'>&2;}
+ $(DRY) $$PKG install -y $$PKGS
---
-2.39.5
-
Attachment:
signature.asc
Description: PGP signature