Merge ~cnihelton/ubuntu/+source/wsl-pro-service:jammy-wsl-pro-service into ubuntu/+source/wsl-pro-service:ubuntu/noble-proposed

[Carlos Nihelton]

wsl-pro-service (0.1.18~22.04.1) jammy; urgency=medium

  * Backport version 0.1.18 to jammy (LP: #2107145):

Via this MP I'm requesting sponsorship to upload wsl-pro-service 0.1.18~22.04.1 to Jammy as a new package.

The reasoning for this has been discussed in the SRU bugs https://bugs.launchpad.net/ubuntu/+source/wsl-pro-service/+bug/2107145 and https://bugs.launchpad.net/ubuntu/+source/livecd-rootfs/+bug/2091293. The gist is that we're attempting a one-shot rebuild of Jammy in the new tar-based format for WSL distros and taking advantage of that to enable support for Ubuntu Pro for WSL.

I'm basing this MP on noble-proposed because it makes it easier to review, there are no branches for Jammy at the moment, since this is a new package for that Ubuntu release.

The diff from noble-proposed is totally related to inert files, such as unused testdata or .gitignores that showed up in the vendored tree, recreated inside a Jammy instance to prevent surprises due slightly different toolchain versions. Source contents are otherwise the same, as they derive from the same upstream git tag and intended to build with the same version of Go (1.23).

Proof of builds for this patch can be found at the PPA links below:

- AMD64: https://launchpad.net/~ubuntu-wsl-dev/+archive/ubuntu/ppa/+build/31296118

- ARM64: https://launchpad.net/~ubuntu-wsl-dev/+archive/ubuntu/ppa/+build/31296119

[Vladimir Petko (vpa1977)]

Hi,

Would it be possible to base the backport on 0.18~24.04.3?

review: Needs Resubmitting

[Carlos Nihelton (cnihelton)]

Hi! Just rebased the backport on top of 0.1.18~24.04.3 as suggested.

Proof of builds can be found in one PPA I use for testing builds:
- AMD64: https://launchpad.net/~cnihelton/+archive/ubuntu/pplayground/+build/31486234
- ARM64: https://launchpad.net/~cnihelton/+archive/ubuntu/pplayground/+build/31486235

Autopkgtest logs from that same PPA build can be found at:

- AMD64: https://autopkgtest.ubuntu.com/results/autopkgtest-jammy-cnihelton-pplayground/jammy/amd64/w/wsl-pro-service/20251113_154236_1d064@/log.gz

- ARM64: https://autopkgtest.ubuntu.com/results/autopkgtest-jammy-cnihelton-pplayground/jammy/arm64/w/wsl-pro-service/20251113_161658_9754b@/log.gz

[Vladimir Petko (vpa1977)]

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading wsl-pro-service_0.1.18~22.04.1.dsc: done.
  Uploading wsl-pro-service_0.1.18~22.04.1.tar.xz: done.
  Uploading wsl-pro-service_0.1.18~22.04.1_source.buildinfo: done.
  Uploading wsl-pro-service_0.1.18~22.04.1_source.changes: done.
Successfully uploaded packages.

review: Approve

[Vladimir Petko (vpa1977)]

Note. added LP bug reference on upload

[Nick Rosbrook (enr0n)]

Clearing from sponsors queue.

review: Abstain

Unmerged commits

6f9f3d1... by Carlos Nihelton <email address hidden> on 2025-11-07

Update the changelog

28cb464... by Carlos Nihelton <email address hidden> on 2025-09-18

Update vendor/ tree in Jammy

04ba106... by Carlos Nihelton <email address hidden> on 2025-09-18

Remove unused testdata

    Those files are no longer not even in unit tests
    They were replaced by contents inside the golden/ subfolder
    and should have been removed from Noble as well,
    though their existance causes no harm, as they don't participate
    in the test nor in the compilation of the binary output

diff --git a/debian/changelog b/debian/changelog
index 2fc5b20..3466521 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+wsl-pro-service (0.1.18~22.04.1) jammy; urgency=medium
+
+  * Release wsl-pro-service 0.1.18 to jammy.
+
+ -- Carlos Nihelton <[e-mail]>  Fri, 07 Nov 2025 10:16:58 +0100
+
 wsl-pro-service (0.1.18~24.04.3) noble; urgency=medium
 
   * Make debian/get-depends-go-bin-path.sh executable which is executed during
diff --git a/internal/system/testdata/TestLandscapeEnable/do_not_append_wsl_tag_when_config_tag_is_provided/landscape.conf b/internal/system/testdata/TestLandscapeEnable/do_not_append_wsl_tag_when_config_tag_is_provided/landscape.conf
deleted file mode 100644
index be4dde4..0000000
--- a/internal/system/testdata/TestLandscapeEnable/do_not_append_wsl_tag_when_config_tag_is_provided/landscape.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-[host]
-url = www.example.com
-
-[client]
-hello = world
-tags = servers, oneiric, database, production
diff --git a/internal/system/testdata/TestLandscapeEnable/do_not_append_wsl_tag_when_config_tag_is_provided_but_empty/landscape.conf b/internal/system/testdata/TestLandscapeEnable/do_not_append_wsl_tag_when_config_tag_is_provided_but_empty/landscape.conf
deleted file mode 100644
index 4f0500b..0000000
--- a/internal/system/testdata/TestLandscapeEnable/do_not_append_wsl_tag_when_config_tag_is_provided_but_empty/landscape.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-[host]
-url = www.example.com
-
-[client]
-hello = world
-tags =
diff --git a/internal/system/testdata/TestLandscapeEnable/error_when_failing_to_override_the_ssl_certficate_path/landscape.conf b/internal/system/testdata/TestLandscapeEnable/error_when_failing_to_override_the_ssl_certficate_path/landscape.conf
deleted file mode 100644
index 75c264a..0000000
--- a/internal/system/testdata/TestLandscapeEnable/error_when_failing_to_override_the_ssl_certficate_path/landscape.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-[host]
-url = www.example.com
-
-[client]
-hello = world
-ssl_public_key = D:\Users\TestUser\certificate
\ No newline at end of file
diff --git a/internal/system/testdata/TestLandscapeEnable/error_when_the_config_file_cannot_be_written/landscape.conf b/internal/system/testdata/TestLandscapeEnable/error_when_the_config_file_cannot_be_written/landscape.conf
deleted file mode 100644
index c75b99e..0000000
--- a/internal/system/testdata/TestLandscapeEnable/error_when_the_config_file_cannot_be_written/landscape.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-[host]
-url = www.example.com
-
-[client]
-hello = world
\ No newline at end of file
diff --git a/internal/system/testdata/TestLandscapeEnable/error_when_the_file_cannot_be_parsed/landscape.conf b/internal/system/testdata/TestLandscapeEnable/error_when_the_file_cannot_be_parsed/landscape.conf
deleted file mode 100644
index b600b3a..0000000
--- a/internal/system/testdata/TestLandscapeEnable/error_when_the_file_cannot_be_parsed/landscape.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "message": "Wait a second, this is not an ini file!"
-}
\ No newline at end of file
diff --git a/internal/system/testdata/TestLandscapeEnable/error_when_the_landscape-config_command_fails/landscape.conf b/internal/system/testdata/TestLandscapeEnable/error_when_the_landscape-config_command_fails/landscape.conf
deleted file mode 100644
index c75b99e..0000000
--- a/internal/system/testdata/TestLandscapeEnable/error_when_the_landscape-config_command_fails/landscape.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-[host]
-url = www.example.com
-
-[client]
-hello = world
\ No newline at end of file
diff --git a/internal/system/testdata/TestLandscapeEnable/error_when_the_landscape_user_does_not_exist/landscape.conf b/internal/system/testdata/TestLandscapeEnable/error_when_the_landscape_user_does_not_exist/landscape.conf
deleted file mode 100644
index c75b99e..0000000
--- a/internal/system/testdata/TestLandscapeEnable/error_when_the_landscape_user_does_not_exist/landscape.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-[host]
-url = www.example.com
-
-[client]
-hello = world
\ No newline at end of file
diff --git a/internal/system/testdata/TestLandscapeEnable/success/landscape.conf b/internal/system/testdata/TestLandscapeEnable/success/landscape.conf
deleted file mode 100644
index c75b99e..0000000
--- a/internal/system/testdata/TestLandscapeEnable/success/landscape.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-[host]
-url = www.example.com
-
-[client]
-hello = world
\ No newline at end of file
diff --git a/internal/system/testdata/TestLandscapeEnable/success_overriding_computer_title/landscape.conf b/internal/system/testdata/TestLandscapeEnable/success_overriding_computer_title/landscape.conf
deleted file mode 100644
index 94a5422..0000000
--- a/internal/system/testdata/TestLandscapeEnable/success_overriding_computer_title/landscape.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-[host]
-url = www.example.com
-
-[client]
-computer_title = DEFAULT_COMPUTER_TITLE
-hello = world
diff --git a/internal/system/testdata/TestLandscapeEnable/success_overriding_the_ssl_certficate_path/landscape.conf b/internal/system/testdata/TestLandscapeEnable/success_overriding_the_ssl_certficate_path/landscape.conf
deleted file mode 100644
index 75c264a..0000000
--- a/internal/system/testdata/TestLandscapeEnable/success_overriding_the_ssl_certficate_path/landscape.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-[host]
-url = www.example.com
-
-[client]
-hello = world
-ssl_public_key = D:\Users\TestUser\certificate
\ No newline at end of file
diff --git a/vendor/github.com/fsnotify/fsnotify/.gitignore b/vendor/github.com/fsnotify/fsnotify/.gitignore
new file mode 100644
index 0000000..daea9dd
--- /dev/null
+++ b/vendor/github.com/fsnotify/fsnotify/.gitignore
@@ -0,0 +1,10 @@
+# go test -c output
+*.test
+*.test.exe
+
+# Output of go build ./cmd/fsnotify
+/fsnotify
+/fsnotify.exe
+
+/test/kqueue
+/test/a.out
diff --git a/vendor/github.com/fsnotify/fsnotify/.mailmap b/vendor/github.com/fsnotify/fsnotify/.mailmap
new file mode 100644
index 0000000..a04f290
--- /dev/null
+++ b/vendor/github.com/fsnotify/fsnotify/.mailmap
@@ -0,0 +1,2 @@
+Chris Howey <[e-mail]> <[e-mail]>
+Nathan Youngman <[e-mail]> <[e-mail]>
diff --git a/vendor/github.com/go-viper/mapstructure/v2/.gitignore b/vendor/github.com/go-viper/mapstructure/v2/.gitignore
new file mode 100644
index 0000000..470e7ca
--- /dev/null
+++ b/vendor/github.com/go-viper/mapstructure/v2/.gitignore
@@ -0,0 +1,6 @@
+/.devenv/
+/.direnv/
+/.pre-commit-config.yaml
+/bin/
+/build/
+/var/
diff --git a/vendor/github.com/pelletier/go-toml/v2/.gitattributes b/vendor/github.com/pelletier/go-toml/v2/.gitattributes
new file mode 100644
index 0000000..34a0a21
--- /dev/null
+++ b/vendor/github.com/pelletier/go-toml/v2/.gitattributes
@@ -0,0 +1,4 @@
+* text=auto
+
+benchmark/benchmark.toml text eol=lf
+testdata/** text eol=lf
diff --git a/vendor/github.com/pelletier/go-toml/v2/.gitignore b/vendor/github.com/pelletier/go-toml/v2/.gitignore
new file mode 100644
index 0000000..4b7c4ed
--- /dev/null
+++ b/vendor/github.com/pelletier/go-toml/v2/.gitignore
@@ -0,0 +1,7 @@
+test_program/test_program_bin
+fuzz/
+cmd/tomll/tomll
+cmd/tomljson/tomljson
+cmd/tomltestgen/tomltestgen
+dist
+tests/
diff --git a/vendor/github.com/sagikazarmark/locafero/.gitignore b/vendor/github.com/sagikazarmark/locafero/.gitignore
new file mode 100644
index 0000000..8f07e60
--- /dev/null
+++ b/vendor/github.com/sagikazarmark/locafero/.gitignore
@@ -0,0 +1,8 @@
+/.devenv/
+/.direnv/
+/.task/
+/bin/
+/build/
+/tmp/
+/var/
+/vendor/
diff --git a/vendor/github.com/sirupsen/logrus/.gitignore b/vendor/github.com/sirupsen/logrus/.gitignore
new file mode 100644
index 0000000..1fb13ab
--- /dev/null
+++ b/vendor/github.com/sirupsen/logrus/.gitignore
@@ -0,0 +1,4 @@
+logrus
+vendor
+
+.idea/
diff --git a/vendor/github.com/spf13/afero/.gitignore b/vendor/github.com/spf13/afero/.gitignore
new file mode 100644
index 0000000..9c1d986
--- /dev/null
+++ b/vendor/github.com/spf13/afero/.gitignore
@@ -0,0 +1,2 @@
+sftpfs/file1
+sftpfs/test/
diff --git a/vendor/github.com/spf13/cast/.gitignore b/vendor/github.com/spf13/cast/.gitignore
new file mode 100644
index 0000000..53053a8
--- /dev/null
+++ b/vendor/github.com/spf13/cast/.gitignore
@@ -0,0 +1,25 @@
+# Compiled Object files, Static and Dynamic libs (Shared Objects)
+*.o
+*.a
+*.so
+
+# Folders
+_obj
+_test
+
+# Architecture specific extensions/prefixes
+*.[568vq]
+[568vq].out
+
+*.cgo1.go
+*.cgo2.c
+_cgo_defun.c
+_cgo_gotypes.go
+_cgo_export.*
+
+_testmain.go
+
+*.exe
+*.test
+
+*.bench
diff --git a/vendor/github.com/spf13/cobra/.gitignore b/vendor/github.com/spf13/cobra/.gitignore
new file mode 100644
index 0000000..c7b459e
--- /dev/null
+++ b/vendor/github.com/spf13/cobra/.gitignore
@@ -0,0 +1,39 @@
+# Compiled Object files, Static and Dynamic libs (Shared Objects)
+*.o
+*.a
+*.so
+
+# Folders
+_obj
+_test
+
+# Architecture specific extensions/prefixes
+*.[568vq]
+[568vq].out
+
+*.cgo1.go
+*.cgo2.c
+_cgo_defun.c
+_cgo_gotypes.go
+_cgo_export.*
+
+_testmain.go
+
+# Vim files https://github.com/github/gitignore/blob/master/Global/Vim.gitignore
+# swap
+[._]*.s[a-w][a-z]
+[._]s[a-w][a-z]
+# session
+Session.vim
+# temporary
+.netrwhist
+*~
+# auto-generated tag files
+tags
+
+*.exe
+cobra.test
+bin
+
+.idea/
+*.iml
diff --git a/vendor/github.com/spf13/cobra/.mailmap b/vendor/github.com/spf13/cobra/.mailmap
new file mode 100644
index 0000000..94ec530
--- /dev/null
+++ b/vendor/github.com/spf13/cobra/.mailmap
@@ -0,0 +1,3 @@
+Steve Francia <[e-mail]>
+Bjørn Erik Pedersen <[e-mail]>
+Fabiano Franz <[e-mail]>                   <[e-mail]>
diff --git a/vendor/github.com/spf13/pflag/.gitignore b/vendor/github.com/spf13/pflag/.gitignore
new file mode 100644
index 0000000..c3da290
--- /dev/null
+++ b/vendor/github.com/spf13/pflag/.gitignore
@@ -0,0 +1,2 @@
+.idea/*
+
diff --git a/vendor/github.com/spf13/viper/.gitignore b/vendor/github.com/spf13/viper/.gitignore
new file mode 100644
index 0000000..f1bbd42
--- /dev/null
+++ b/vendor/github.com/spf13/viper/.gitignore
@@ -0,0 +1,8 @@
+/.devenv/
+/.direnv/
+/.idea/
+/.pre-commit-config.yaml
+/bin/
+/build/
+/var/
+/vendor/
diff --git a/vendor/github.com/subosito/gotenv/.gitignore b/vendor/github.com/subosito/gotenv/.gitignore
new file mode 100644
index 0000000..7db37c1
--- /dev/null
+++ b/vendor/github.com/subosito/gotenv/.gitignore
@@ -0,0 +1,4 @@
+*.test
+*.out
+annotate.json
+profile.cov
diff --git a/vendor/go.uber.org/multierr/.gitignore b/vendor/go.uber.org/multierr/.gitignore
new file mode 100644
index 0000000..b9a05e3
--- /dev/null
+++ b/vendor/go.uber.org/multierr/.gitignore
@@ -0,0 +1,4 @@
+/vendor
+cover.html
+cover.out
+/bin
diff --git a/vendor/golang.org/x/net/http2/.gitignore b/vendor/golang.org/x/net/http2/.gitignore
new file mode 100644
index 0000000..190f122
--- /dev/null
+++ b/vendor/golang.org/x/net/http2/.gitignore
@@ -0,0 +1,2 @@
+*~
+h2i/h2i
diff --git a/vendor/golang.org/x/sys/unix/.gitignore b/vendor/golang.org/x/sys/unix/.gitignore
new file mode 100644
index 0000000..e3e0fc6
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/.gitignore
@@ -0,0 +1,2 @@
+_obj/
+unix.test
diff --git a/vendor/gopkg.in/ini.v1/.gitignore b/vendor/gopkg.in/ini.v1/.gitignore
new file mode 100644
index 0000000..588388b
--- /dev/null
+++ b/vendor/gopkg.in/ini.v1/.gitignore
@@ -0,0 +1,7 @@
+testdata/conf_out.ini
+ini.sublime-project
+ini.sublime-workspace
+testdata/conf_reflect.ini
+.idea
+/.vscode
+.DS_Store