(maint) Merge up b68c194 to main

Generated by CI

* commit 'b68c194bb0cf3e9171fa26b0d5a4e549e2f964f5':
  (packaging) Updating manpage file for 6.x
  (maint) Handle Cygwin 3
  (maint) Drop special case for symlinks on 2003
  Revert "Merge pull request #8920 from joshcooper/win11_6x"
  Revert "Merge pull request #8922 from joshcooper/win11_6x_user"

Conflicts:
	man/man8/puppet-key.8
	man/man8/puppet-man.8
	man/man8/puppet-status.8

Author: puppetlabs-jenkins

acceptance/tests/agent/agent_fails_with_unknown_resource.rb

@@ -10,8 +10,6 @@
   require 'puppet/acceptance/temp_file_utils'
   extend Puppet::Acceptance::TempFileUtils
 
-  pending_test("Windows 11 not sure why this fails") if agents.any? { |host| host['platform'] =~ /windows-11/ }
-
   step "agent should fail when it can't find a resource" do
     vendor_modules_path = master.tmpdir('vendor_modules')
     tmp_environment = mk_tmp_environment_with_teardown(master, 'tmp')

acceptance/tests/modulepath.rb

@@ -1,8 +1,6 @@
 test_name 'Supports vendored modules' do
   tag 'risk:high'
 
-  pending_test("Windows 11 scp seems to crash sshd") if agents.any? { |host| host['platform'] =~ /windows-11/ }
-
   # beacon custom type emits a message so we can tell where the
   # type was loaded from, e.g. vendored, global, and whether the
   # type was loaded locally or pluginsynced from the master.

acceptance/tests/resource/exec/should_run_bad_command.rb

@@ -27,14 +27,14 @@ def stop_sleep_process(targets, accept_no_pid_found = false)
     when /osx/
       command = "ps -e -o pid,comm | grep sleep | sed 's/^[^0-9]*//g' | cut -d\\  -f1"
     when /win/
-      command = "ps -efW | grep PING | sed 's/^[^0-9]*[0-9]*[^0-9]*//g' | cut -d ' ' -f1"
+      command = "cmd.exe /C WMIC path win32_process WHERE Name=\\\"PING.EXE\\\" get ProcessId | egrep -o '[0-9]+\\s*$'"
     else
       command = "ps -ef | grep 'bin/sleep ' | grep -v 'grep' | grep -v 'true' | sed 's/^[^0-9]*//g' | cut -d\\  -f1"
     end
 
     # A failed test may leave an orphaned sleep process, handle multiple matches.
     pids = nil
-    on(target, command) do |output|
+    on(target, command, accept_all_exit_codes: accept_no_pid_found) do |output|
       pids = output.stdout.chomp.split
       if pids.empty? && !accept_no_pid_found
         raise("Did not find a pid for a sleep process on #{target}")

acceptance/tests/resource/file/ticket_6448_file_with_utf8_source.rb

@@ -14,8 +14,6 @@
   agent_tmp_dirs  = {}
 
   agents.each do |agent|
-    pending_test("Windows 11 UTF-8 file paths") if agent['platform'] =~ /windows-11/
-
     agent_tmp_dirs[agent_to_fqdn(agent)] = agent.tmpdir(tmp_environment)
   end
 

acceptance/tests/resource/file/ticket_7680-follow-symlinks.rb

@@ -5,7 +5,6 @@
     'audit:acceptance'
 
 agents.each do |agent|
-  pending_test("Windows 11 backslashes") if agent['platform'] =~ /windows-11/
 
   step "Create file content"
   real_source = agent.tmpfile('follow_links_source')

acceptance/tests/resource/service/windows_mixed_utf8.rb

@@ -38,8 +38,6 @@ def service_manifest(name, params)
     }
   ].each do |mock_service|
     agents.each do |agent|
-      pending_test("Windows 11 UTF-8 file paths") if agent['platform'] =~ /windows-11/
-
       setup_service(agent, mock_service, 'MockService.cs')
 
       step 'Verify that enable = false disables the service' do

acceptance/tests/resource/user/should_modify_when_not_managing_home.rb

@@ -25,8 +25,6 @@ def get_home_dir(host, user_name)
   home_prop = nil
   case agent['platform']
   when /windows/
-    pending_test("Windows 11 backslashes") if agent['platform'] =~ /windows-11/
-
     # Sadly Windows ADSI won't tell us the default home directory
     # for a user. You can get it via WMI Win32_UserProfile, but that
     # doesn't exist in a base 2003 install. So we simply specify an

acceptance/tests/resource/user/should_modify_while_managing_home.rb

@@ -10,8 +10,6 @@
 require 'puppet/acceptance/windows_utils'
 extend Puppet::Acceptance::WindowsUtils
 
-pending_test("Windows 11 backslashes") if agents.any? { |host| host['platform'] =~ /windows-11/ }
-
 name = "pl#{rand(999999).to_i}"
 pw = "Passwrd-#{rand(999999).to_i}"[0..11]
 

acceptance/tests/utf8/utf8-in-catalog.rb

@@ -11,7 +11,6 @@
   on(master, "rm -rf '#{codedir}'")
   env_dir = "#{codedir}/environments"
   agents.each do |agent|
-    pending_test("Windows 11 UTF-8 file paths") if agent['platform'] =~ /windows-11/
 
     step "agent name: #{agent.hostname}, platform: #{agent.platform}"
     agent_vardir = agent.tmpdir("agent_vardir")

acceptance/tests/utf8/utf8-recursive-copy.rb

@@ -15,8 +15,6 @@
   extend Puppet::Acceptance::I18nUtils
 
   agents.each do |host|
-    pending_test("Windows 11 UTF-8 file paths") if host['platform'] =~ /windows-11/
-
     filename = "Fișier"
     content = <<-CONTENT
 閑けさや