diff -pruN 1.0.20250521-1/debian/changelog 1.0.20250521-1ubuntu1/debian/changelog --- 1.0.20250521-1/debian/changelog 2025-08-26 00:38:13.000000000 +0000 +++ 1.0.20250521-1ubuntu1/debian/changelog 2025-11-20 15:00:11.000000000 +0000 @@ -1,9 +1,59 @@ +wireguard (1.0.20250521-1ubuntu1) resolute; urgency=medium + + * Merge with Debian unstable (LP: #2126019). Remaining changes: + - Drop depends on wireguard-modules (always built-in), wireguard-dkms + (removed from the archive). This makes wireguard package sort of + redundant. LP #2008086 + - Upstream fix to handle resolvconf migration more gracefully (LP #2119260) + + d/p/0005-wg-quick-linux-deal-with-resolvconf-migration-more-g.patch + * Dropped changes [applied in 1.0.20250521-1]: + - d/p/0001-embeddable-wg-library-add-named-wg_endpoint-union.patch + - d/p/0001-reresolve-dns-use-EPOCHSECONDS-instead-of-date-s.patch + - d/p/0001-wg-quick-linux-prevent-traffic-from-momentarily-leak.patch + - d/p/0001-show-apply-const-to-right-part-of-pointer.patch + + -- Lukas Märdian Thu, 20 Nov 2025 16:00:11 +0100 + wireguard (1.0.20250521-1) unstable; urgency=medium * New upstream release. -- Unit 193 Mon, 25 Aug 2025 20:38:13 -0400 +wireguard (1.0.20210914-3ubuntu2) questing; urgency=medium + + * Upstream fix to handle resolvconf migration more gracefully (LP: #2119260): + - d/p/0005-wg-quick-linux-deal-with-resolvconf-migration-more-g.patch + + -- Lukas Märdian Tue, 19 Aug 2025 15:51:59 +0200 + +wireguard (1.0.20210914-3ubuntu1) questing; urgency=medium + + * Merge with Debian unstable (LP: #2110425). Remaining changes: + - Drop depends on wireguard-modules (always built-in), wireguard-dkms + (removed from the archive). This makes wireguard package sort of + redundant. LP #2008086 + - Cherry-pick upstream fixups from master: + + d/p/0001-embeddable-wg-library-add-named-wg_endpoint-union.patch + + d/p/0001-reresolve-dns-use-EPOCHSECONDS-instead-of-date-s.patch + + d/p/0001-wg-quick-linux-prevent-traffic-from-momentarily-leak.patch + + d/p/0001-show-apply-const-to-right-part-of-pointer.patch + * Drop Changes: + - Add better DEP8 tests (LP: 1952102) + + d/t/control, d/t/wireguard-wgquick: test using network namespaces + and wg-quick + + d/t/netns-mini, d/t/control: test using network namespaces + and wg, taken from the wireguard-linux-compat package + [applied in Debian, 1.0.20210914-2] + - d/rules: add simple build-time test, taken from the existing + DEP8 test to generate keys (LP: 1952767) + [applied in Debian, 1.0.20210914-2] + - Drop 0002-Avoid-requiring-glibc-2.25-for-wireguard-tools.patch as + glibc-2.25 has been around since forever. + [applied (dropped) in Debian, 1.0.20210914-2] + + -- Lukas Märdian Wed, 13 Aug 2025 11:42:16 +0200 + wireguard (1.0.20210914-3) unstable; urgency=medium * d/wireguard-tools.lintian-overrides: Refresh overrides. @@ -30,6 +80,34 @@ wireguard (1.0.20210914-2) unstable; urg -- Unit 193 Tue, 01 Apr 2025 03:07:24 -0400 +wireguard (1.0.20210914-1.1ubuntu2) plucky; urgency=medium + + * d/t/control: make wg-quick test depend on iputils-ping + * d/t/control: run wg-quick test in container + * d/t/control: run netns-mini test in container + * d/rules: move build-time-test.sh to separate file + + -- Lukas Märdian Wed, 15 Jan 2025 09:55:16 +0100 + +wireguard (1.0.20210914-1.1ubuntu1) oracular; urgency=medium + + * Merge with Debian unstable (LP: #2064481). Remaining changes: + - Add better DEP8 tests (LP #1952102): + + d/t/control, d/t/wireguard-wgquick: test using network namespaces + and wg-quick + + d/t/netns-mini, d/t/control: test using network namespaces + and wg, taken from the wireguard-linux-compat package + - d/rules: add simple build-time test, taken from the existing + DEP8 test to generate keys (LP #1952767) + - Drop depends on wireguard-modules (always built-in), wireguard-dkms + (removed from the archive). This makes wireguard package sort of + redundant. LP #2008086 + - Drop 0002-Avoid-requiring-glibc-2.25-for-wireguard-tools.patch as + glibc-2.25 has been around since forever. + - Cherry-pick upstream fixups from master. + + -- Andreas Hasenack Tue, 13 Aug 2024 14:32:47 -0300 + wireguard (1.0.20210914-1.1) unstable; urgency=medium * Non-maintainer upload. @@ -38,6 +116,43 @@ wireguard (1.0.20210914-1.1) unstable; u -- Luca Boccassi Thu, 30 May 2024 16:12:29 +0100 +wireguard (1.0.20210914-1ubuntu4) noble; urgency=high + + * No change rebuild for 64-bit time_t and frame pointers. + + -- Julian Andres Klode Mon, 08 Apr 2024 18:22:11 +0200 + +wireguard (1.0.20210914-1ubuntu3) lunar; urgency=medium + + * Drop depends on wireguard-modules (always built-in), wireguard-dkms + (removed from the archive). This makes wireguard package sort of + redundant. LP: #2008086 + * Drop 0002-Avoid-requiring-glibc-2.25-for-wireguard-tools.patch as + glibc-2.25 has been around since forever. + * Cherry-pick upstream fixups from master. + + -- Dimitri John Ledkov Wed, 22 Feb 2023 12:35:51 +0000 + +wireguard (1.0.20210914-1ubuntu2) jammy; urgency=medium + + * Add better DEP8 tests (LP: #1952102): + - d/t/control, d/t/wireguard-wgquick: test using network namespaces + and wg-quick + - d/t/netns-mini, d/t/control: test using network namespaces + and wg, taken from the wireguard-linux-compat package + * d/rules: add simple build-time test, taken from the existing + DEP8 test to generate keys (LP: #1952767) + + -- Andreas Hasenack Tue, 07 Dec 2021 08:33:57 -0300 + +wireguard (1.0.20210914-1ubuntu1) devel; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - Switch alternative dependency order for the wireguard-modules, + wireguard-dkms alternative. + + -- Unit 193 Tue, 23 Nov 2021 11:41:45 -0500 + wireguard (1.0.20210914-1) unstable; urgency=medium * New upstream release. @@ -45,6 +160,14 @@ wireguard (1.0.20210914-1) unstable; urg -- Unit 193 Mon, 27 Sep 2021 21:21:06 -0400 +wireguard (1.0.20210424-1ubuntu1) devel; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - Switch alternative dependency order for the wireguard-modules, + wireguard-dkms alternative. + + -- Unit 193 Mon, 16 Aug 2021 14:20:40 -0400 + wireguard (1.0.20210424-1) unstable; urgency=medium * New upstream release. @@ -52,6 +175,14 @@ wireguard (1.0.20210424-1) unstable; urg -- Unit 193 Fri, 13 Aug 2021 17:36:52 -0400 +wireguard (1.0.20210223-1ubuntu1) devel; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - Switch alternative dependency order for the wireguard-modules, + wireguard-dkms alternative. + + -- Unit 193 Tue, 16 Mar 2021 17:27:19 -0400 + wireguard (1.0.20210223-1) unstable; urgency=medium * New upstream release. @@ -62,18 +193,45 @@ wireguard (1.0.20210223-1) unstable; urg -- Unit 193 Thu, 25 Feb 2021 02:02:36 -0500 +wireguard (1.0.20200827-1ubuntu1) devel; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - Switch alternative dependency order for the wireguard-modules, + wireguard-dkms alternative. + + -- Unit 193 Wed, 30 Sep 2020 18:52:56 -0400 + wireguard (1.0.20200827-1) unstable; urgency=medium * New upstream release. -- Unit 193 Wed, 09 Sep 2020 03:47:59 -0400 +wireguard (1.0.20200820-1ubuntu1) groovy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Switch alternative dependency order for teh wireguard-modules, + wireguard-dkms alternative. + + -- Andy Whitcroft Wed, 26 Aug 2020 10:42:33 +0100 + wireguard (1.0.20200820-1) unstable; urgency=medium * New upstream release. -- Unit 193 Sat, 22 Aug 2020 19:19:51 -0400 +wireguard (1.0.20200513-1ubuntu1) groovy; urgency=medium + + * Switch alternative dependency order for the wireguard-modules, + wireguard-dkms alternative. Whichever is first is deemed the + preferred installation candidate when neither is present. When this is + wireguard-modules this is satisfied by installation of a random kernel + which claims support for wireguard regardless of its applicability. + Repeat after me, do not ever depend on a kernel. (LP: #1890201) + + -- Andy Whitcroft Mon, 03 Aug 2020 22:24:05 +0100 + wireguard (1.0.20200513-1) unstable; urgency=medium * New upstream release. diff -pruN 1.0.20250521-1/debian/control 1.0.20250521-1ubuntu1/debian/control --- 1.0.20250521-1/debian/control 2025-04-01 07:06:55.000000000 +0000 +++ 1.0.20250521-1ubuntu1/debian/control 2025-11-20 15:00:11.000000000 +0000 @@ -1,7 +1,8 @@ Source: wireguard Section: net Priority: optional -Maintainer: Daniel Kahn Gillmor +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Daniel Kahn Gillmor Uploaders: Unit 193 , Build-Depends: @@ -17,7 +18,6 @@ Rules-Requires-Root: no Package: wireguard Architecture: all Depends: - wireguard-modules (>= 0.0.20191219) | wireguard-dkms (>= 0.0.20200121-2), wireguard-tools (>= ${source:Version}), ${misc:Depends}, Description: fast, modern, secure kernel VPN tunnel (metapackage) @@ -39,7 +39,6 @@ Depends: ${shlibs:Depends}, Recommends: nftables | iptables, - wireguard-modules (>= 0.0.20171001) | wireguard-dkms (>= 0.0.20191219), Suggests: openresolv | resolvconf, Description: fast, modern, secure kernel VPN tunnel (userland utilities) WireGuard is a novel VPN that runs inside the Linux Kernel and uses diff -pruN 1.0.20250521-1/debian/patches/0005-wg-quick-linux-deal-with-resolvconf-migration-more-g.patch 1.0.20250521-1ubuntu1/debian/patches/0005-wg-quick-linux-deal-with-resolvconf-migration-more-g.patch --- 1.0.20250521-1/debian/patches/0005-wg-quick-linux-deal-with-resolvconf-migration-more-g.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.0.20250521-1ubuntu1/debian/patches/0005-wg-quick-linux-deal-with-resolvconf-migration-more-g.patch 2025-11-20 15:00:11.000000000 +0000 @@ -0,0 +1,34 @@ +From: "Jason A. Donenfeld" +Date: Fri, 23 May 2025 20:59:38 +0200 +Subject: wg-quick: linux: deal with resolvconf migration more gracefully + +When Ubuntu systems upgrade from Debian's atrocious resolvconf to the +systemd-resolve symlink, they sometimes leave around +/etc/resolvconf/interface-order, which then winds up breaking the +detection and passing the bogus 'tun.' prefix to systemd's resolvconf, +resulting in failure. Work around this by only doing the 'tun.' prefix +hack if resolvconf isn't a symlink. This is ugly but so it goes. + +Reported-by: Andrei Borzenkov +Signed-off-by: Jason A. Donenfeld + +Origin: upstream, https://git.zx2c4.com/wireguard-tools/commit/?id=d3b40aff964789a2a0533cb7a070592a75a996e3 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/wireguard/+bug/2119260 +Forwarded: not-needed +--- + src/wg-quick/linux.bash | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/wg-quick/linux.bash b/src/wg-quick/linux.bash +index 69e5bef..8bc6d9b 100755 +--- a/src/wg-quick/linux.bash ++++ b/src/wg-quick/linux.bash +@@ -142,7 +142,7 @@ set_mtu_up() { + } + + resolvconf_iface_prefix() { +- [[ -f /etc/resolvconf/interface-order ]] || return 0 ++ [[ -f /etc/resolvconf/interface-order && ! -L $(type -P resolvconf) ]] || return 0 + local iface + while read -r iface; do + [[ $iface =~ ^([A-Za-z0-9-]+)\*$ ]] || continue diff -pruN 1.0.20250521-1/debian/patches/series 1.0.20250521-1ubuntu1/debian/patches/series --- 1.0.20250521-1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ 1.0.20250521-1ubuntu1/debian/patches/series 2025-11-20 15:00:11.000000000 +0000 @@ -0,0 +1 @@ +0005-wg-quick-linux-deal-with-resolvconf-migration-more-g.patch