puppet 6.12.0-universal-darwin → 6.13.0-universal-darwin

data/lib/puppet/type/user.rb

@@ -51,7 +51,7 @@ module Puppet
     feature :manages_aix_lam,
       "The provider can manage AIX Loadable Authentication Module (LAM) system."
 
-    feature :libuser,
+    feature :manages_local_users_and_groups,
       "Allows local users to be managed on systems that also use some other
        remote Name Service Switch (NSS) method of managing accounts."
 
@@ -688,7 +688,7 @@ module Puppet
     end
 
     newparam(:forcelocal, :boolean => true,
-            :required_features => :libuser,
+            :required_features => :manages_local_users_and_groups,
             :parent => Puppet::Parameter::Boolean) do
       desc "Forces the management of local accounts when accounts are also
             being managed by some other Name Service Switch (NSS). For AIX, refer to the `ia_load_module` parameter.

data/lib/puppet/util/log/destinations.rb

@@ -47,7 +47,7 @@ Puppet::Util::Log.newdesttype :file do
   require 'fileutils'
 
   def self.match?(obj)
-    Puppet::Util.absolute_path?(obj)
+    obj.is_a?(String) && Puppet::Util.absolute_path?(obj)
   end
 
   def close

data/lib/puppet/util/pidlock.rb

@@ -43,6 +43,19 @@ class Puppet::Util::Pidlock
     @lockfile.file_path
   end
 
+  private
+
+  def ps_argument_for_current_kernel
+    case Facter.value(:kernel)
+      when "Linux"
+        "-eq"
+      when "AIX"
+        "-T"
+      else
+        "-p"
+    end
+  end
+
   def clear_if_stale
     return @lockfile.unlock if lock_pid.nil?
 
@@ -58,11 +71,20 @@ class Puppet::Util::Pidlock
     end
 
     # Ensure the process associated with this pid is our process. If
-    # not, we can unlock the lockfile. For now this is only done on
-    # POSIX and Windows platforms (PUP-9247).
+    # not, we can unlock the lockfile. CLI arguments used for identifying
+    # on POSIX depend on the os and sometimes even version.
     if Puppet.features.posix?
-      procname = Puppet::Util::Execution.execute(["ps", "-p", lock_pid, "-o", "comm="]).strip
-      args     = Puppet::Util::Execution.execute(["ps", "-p", lock_pid, "-o", "args="]).strip
+      ps_argument = ps_argument_for_current_kernel
+
+      # Check, obtain and use the right ps argument
+      begin
+        procname = Puppet::Util::Execution.execute(["ps", ps_argument, lock_pid, "-o", "comm="]).strip
+      rescue Puppet::ExecutionFailure
+        ps_argument = "-p"
+        procname = Puppet::Util::Execution.execute(["ps", ps_argument, lock_pid, "-o", "comm="]).strip
+      end
+
+      args = Puppet::Util::Execution.execute(["ps", ps_argument, lock_pid, "-o", "args="]).strip
       @lockfile.unlock unless procname =~ /ruby/ && args =~ /puppet/ || procname =~ /puppet(-.*)?$/
     elsif Puppet.features.microsoft_windows?
       # On Windows, we're checking if the filesystem path name of the running
@@ -71,6 +93,4 @@ class Puppet::Util::Pidlock
       @lockfile.unlock unless exe_path =~ /\\bin\\ruby.exe$/
     end
   end
-  private :clear_if_stale
-
 end

data/lib/puppet/util/plist.rb

@@ -56,6 +56,12 @@ module Puppet::Util::Plist
     # Read plist text using the CFPropertyList gem.
     def parse_plist(plist_data, file_path = '')
       bad_xml_doctype = /^.*<!DOCTYPE plist PUBLIC -\/\/Apple Computer.*$/
+      # Depending on where parse_plist is called from, plist_data can be either XML or binary.
+      # If we get XML, make sure ruby knows it's UTF-8 so we avoid invalid byte sequence errors.
+      if plist_data.include?('encoding="UTF-8"') && plist_data.encoding != Encoding::UTF_8
+        plist_data.force_encoding(Encoding::UTF_8)
+      end
+
       begin
         if plist_data =~ bad_xml_doctype
           plist_data.gsub!( bad_xml_doctype, plist_xml_doctype )

data/lib/puppet/util/storage.rb

@@ -1,5 +1,4 @@
 require 'yaml'
-require 'sync'
 require 'singleton'
 require 'puppet/util/yaml'
 

data/lib/puppet/util/yaml.rb

@@ -65,7 +65,7 @@ module Puppet::Util::Yaml
   end
 
   def self.dump(structure, filename)
-    Puppet::Util.replace_file(filename, 0660) do |fh|
+    Puppet::FileSystem.replace_file(filename, 0660) do |fh|
       YAML.dump(structure, fh)
     end
   end

data/lib/puppet/version.rb

@@ -6,7 +6,7 @@
 # Raketasks and such to set the version based on the output of `git describe`
 
 module Puppet
-  PUPPETVERSION = '6.12.0'
+  PUPPETVERSION = '6.13.0'
 
   ##
   # version is a public API method intended to always provide a fast and

data/locales/puppet.pot

@@ -6,11 +6,11 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Puppet automation framework 6.11.1-197-g539749b170\n"
+"Project-Id-Version: Puppet automation framework 6.12.0-140-gec3639ae66\n"
 "\n"
 "Report-Msgid-Bugs-To: https://tickets.puppetlabs.com\n"
-"POT-Creation-Date: 2020-01-07 15:20+0000\n"
-"PO-Revision-Date: 2020-01-07 15:20+0000\n"
+"POT-Creation-Date: 2020-02-07 12:49+0000\n"
+"PO-Revision-Date: 2020-02-07 12:49+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -523,118 +523,118 @@ msgstr ""
 msgid "Removed %{label} %{path}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:23
+#: ../lib/puppet/configurer.rb:22
 msgid "Puppet configuration client"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:46
+#: ../lib/puppet/configurer.rb:45
 msgid "Removing corrupt state file %{file}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:51
+#: ../lib/puppet/configurer.rb:50
 msgid "Cannot remove %{file}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:74
+#: ../lib/puppet/configurer.rb:73
 msgid "Using cached catalog from environment '%{environment}'"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:80
+#: ../lib/puppet/configurer.rb:79
 msgid "Not using cache on failed catalog"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:89
+#: ../lib/puppet/configurer.rb:88
 msgid "Not using cached catalog because its environment '%{catalog_env}' does not match '%{local_env}'"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:94 ../lib/puppet/configurer.rb:177
+#: ../lib/puppet/configurer.rb:93 ../lib/puppet/configurer.rb:176
 msgid "Using cached catalog from environment '%{catalog_env}'"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:170
+#: ../lib/puppet/configurer.rb:169
 msgid "Could not retrieve catalog; skipping run"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:186
+#: ../lib/puppet/configurer.rb:185
 msgid "Applied catalog in %{seconds} seconds"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:226 ../lib/puppet/http/resolver/server_list.rb:19
+#: ../lib/puppet/configurer.rb:225 ../lib/puppet/http/resolver/server_list.rb:19
 msgid "Could not select a functional puppet master from server_list: '%{server_list}'"
 msgstr ""
 
 #. TRANSLATORS 'server_list' is the name of a setting and should not be translated
-#: ../lib/puppet/configurer.rb:229
+#: ../lib/puppet/configurer.rb:228
 msgid "Selected puppet server from the `server_list` setting: %{server}:%{port}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:261
+#: ../lib/puppet/configurer.rb:260
 msgid "Local environment: '%{local_env}' doesn't match the environment of the cached catalog '%{catalog_env}', switching agent to '%{catalog_env}'."
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:306
+#: ../lib/puppet/configurer.rb:305
 msgid "Local environment: '%{local_env}' doesn't match server specified node environment '%{node_env}', switching agent to '%{node_env}'."
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:311
+#: ../lib/puppet/configurer.rb:310
 msgid "Using configured environment '%{env}'"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:315
+#: ../lib/puppet/configurer.rb:314
 msgid "Unable to fetch my node definition, but the agent run will continue:"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:344
+#: ../lib/puppet/configurer.rb:343
 msgid "Not using catalog because its environment '%{catalog_env}' does not match agent specified environment '%{local_env}' and strict_environment_mode is set"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:355
+#: ../lib/puppet/configurer.rb:354
 msgid "Catalog environment didn't stabilize after %{tries} fetches, aborting run"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:357
+#: ../lib/puppet/configurer.rb:356
 msgid "Local environment: '%{local_env}' doesn't match server specified environment '%{catalog_env}', restarting agent run with environment '%{catalog_env}'"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:398
+#: ../lib/puppet/configurer.rb:397
 msgid "Failed to apply catalog: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:431 ../lib/puppet/http/resolver/server_list.rb:29
+#: ../lib/puppet/configurer.rb:430 ../lib/puppet/http/resolver/server_list.rb:29
 msgid "Puppet server %{host}:%{port} is unavailable: %{code} %{reason}"
 msgstr ""
 
 #. TRANSLATORS 'server_list' is the name of a setting and should not be translated
 #. TRANSLATORS 'server_list' is the name of a setting and should not be translated
-#: ../lib/puppet/configurer.rb:435 ../lib/puppet/http/resolver/server_list.rb:35
+#: ../lib/puppet/configurer.rb:434 ../lib/puppet/http/resolver/server_list.rb:35
 msgid "Unable to connect to server from server_list setting: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:447 ../lib/puppet/face/report.rb:47
+#: ../lib/puppet/configurer.rb:446 ../lib/puppet/face/report.rb:47
 msgid "Could not send report: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:456
+#: ../lib/puppet/configurer.rb:455
 msgid "Could not save last run local report: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:476
+#: ../lib/puppet/configurer.rb:474
 msgid "Uploading facts for %{node} to %{server}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:487
+#: ../lib/puppet/configurer.rb:482
 msgid "Failed to submit facts: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:502
+#: ../lib/puppet/configurer.rb:497
 msgid "Could not run command from %{setting}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:520
+#: ../lib/puppet/configurer.rb:515
 msgid "Could not retrieve catalog from cache: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:540
+#: ../lib/puppet/configurer.rb:535
 msgid "Could not retrieve catalog from remote server: %{detail}"
 msgstr ""
 
@@ -699,45 +699,45 @@ msgid "a data type can only have one implementation"
 msgstr ""
 
 #: ../lib/puppet/defaults.rb:171
-msgid "Cannot disable unrecognized warning types %{invalid}."
+msgid "Cannot disable unrecognized warning types '%{invalid}'."
 msgstr ""
 
 #: ../lib/puppet/defaults.rb:172
-msgid "Valid values are %{values}."
+msgid "Valid values are '%{values}'."
 msgstr ""
 
 #. TRANSLATORS 'data_binding_terminus' is a setting and should not be translated
-#: ../lib/puppet/defaults.rb:526
+#: ../lib/puppet/defaults.rb:540
 msgid "Setting 'data_binding_terminus' is deprecated."
 msgstr ""
 
 #. TRANSLATORS 'hiera' should not be translated
-#: ../lib/puppet/defaults.rb:528
+#: ../lib/puppet/defaults.rb:542
 msgid "Convert custom terminus to hiera 5 API."
 msgstr ""
 
 #. TRANSLATORS 'environment_data_provider' is a setting and should not be translated
-#: ../lib/puppet/defaults.rb:718
+#: ../lib/puppet/defaults.rb:732
 msgid "Setting 'environment_data_provider' is deprecated."
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:799
+#: ../lib/puppet/defaults.rb:813
 msgid "Certificate names must be lower case"
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:980
+#: ../lib/puppet/defaults.rb:998
 msgid "Setting 'ssl_client_ca_auth' is deprecated."
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:1059 ../lib/puppet/settings/enum_setting.rb:13 ../lib/puppet/settings/symbolic_enum_setting.rb:14
+#: ../lib/puppet/defaults.rb:1077 ../lib/puppet/settings/enum_setting.rb:13 ../lib/puppet/settings/symbolic_enum_setting.rb:14
 msgid "Invalid value '%{value}' for parameter %{name}. Allowed values are '%{allowed_values}'"
 msgstr ""
 
-#: ../lib/puppet/error.rb:69
+#: ../lib/puppet/error.rb:77
 msgid "Could not parse for environment %{environment}: %{message}"
 msgstr ""
 
-#: ../lib/puppet/error.rb:70 ../lib/puppet/parser/compiler.rb:40
+#: ../lib/puppet/error.rb:78 ../lib/puppet/parser/compiler.rb:40
 msgid "%{message} on node %{node}"
 msgstr ""
 
@@ -1025,8 +1025,8 @@ msgstr ""
 msgid "Upload local facts to the puppet master."
 msgstr ""
 
-#: ../lib/puppet/face/facts.rb:80
-msgid "Uploading facts for '%{node}' to: '%{server}'"
+#: ../lib/puppet/face/facts.rb:82
+msgid "Uploading facts for '%{node}' to '%{server}'"
 msgstr ""
 
 #: ../lib/puppet/face/generate.rb:9
@@ -1778,7 +1778,7 @@ msgstr ""
 msgid "Timeout waiting for exclusive lock on %{path}"
 msgstr ""
 
-#: ../lib/puppet/file_system/jruby.rb:18 ../lib/puppet/file_system/windows.rb:126 ../lib/puppet/util.rb:658
+#: ../lib/puppet/file_system/jruby.rb:18 ../lib/puppet/file_system/windows.rb:127 ../lib/puppet/util.rb:681
 msgid "Is a directory: %{directory}"
 msgstr ""
 
@@ -1822,11 +1822,11 @@ msgstr ""
 msgid "%{dest} already exists and the :force option was not specified"
 msgstr ""
 
-#: ../lib/puppet/file_system/windows.rb:205
+#: ../lib/puppet/file_system/windows.rb:202
 msgid "This version of Windows does not support symlinks.  Windows Vista / 2008 or higher is required."
 msgstr ""
 
-#: ../lib/puppet/file_system/windows.rb:210
+#: ../lib/puppet/file_system/windows.rb:207
 msgid "The current user does not have the necessary permission to manage symlinks."
 msgstr ""
 
@@ -2242,11 +2242,15 @@ msgstr ""
 msgid "Sleeping for %{interval} seconds before retrying the request"
 msgstr ""
 
-#: ../lib/puppet/http/errors.rb:21
+#: ../lib/puppet/http/client.rb:198 ../lib/puppet/indirector/request.rb:142
+msgid "HTTP REST queries cannot handle values of type '%{klass}'"
+msgstr ""
+
+#: ../lib/puppet/http/errors.rb:23
 msgid "Too many HTTP redirections for %{addr}"
 msgstr ""
 
-#: ../lib/puppet/http/errors.rb:27
+#: ../lib/puppet/http/errors.rb:29
 msgid "Too many HTTP retries for %{addr}"
 msgstr ""
 
@@ -2262,8 +2266,12 @@ msgstr ""
 msgid "Failed to parse Retry-After header '%{retry_after}' as an integer or RFC 2822 date"
 msgstr ""
 
-#. TRANSLATORS "pson", "preffered_serialization_format", and "puppetserver" should not be translated
-#: ../lib/puppet/http/service/report.rb:35
+#: ../lib/puppet/http/service.rb:66 ../lib/puppet/indirector/rest.rb:276
+msgid "No content type in http response; cannot parse"
+msgstr ""
+
+#. TRANSLATORS "pson", "preferred_serialization_format", and "puppetserver" should not be translated
+#: ../lib/puppet/http/service/report.rb:31
 msgid "To submit reports to a server running puppetserver %{server_version}, set preferred_serialization_format to pson"
 msgstr ""
 
@@ -2396,11 +2404,11 @@ msgstr ""
 msgid "Could not find node '%{name}'; cannot compile"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:416
+#: ../lib/puppet/indirector/catalog/compiler.rb:426
 msgid "Could not retrieve fact servername"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:425
+#: ../lib/puppet/indirector/catalog/compiler.rb:435
 msgid "Could not retrieve either serverip or serverip6 fact"
 msgstr ""
 
@@ -2747,10 +2755,6 @@ msgstr ""
 msgid "Could not find indirection '%{indirection}'"
 msgstr ""
 
-#: ../lib/puppet/indirector/request.rb:142
-msgid "HTTP REST queries cannot handle values of type '%{klass}'"
-msgstr ""
-
 #: ../lib/puppet/indirector/request.rb:202
 msgid "Error connecting to %{srv_server}:%{srv_port}: %{message}"
 msgstr ""
@@ -2799,10 +2803,6 @@ msgstr ""
 msgid "Error %{code} on SERVER: %{returned_message}"
 msgstr ""
 
-#: ../lib/puppet/indirector/rest.rb:276
-msgid "No content type in http response; cannot parse"
-msgstr ""
-
 #: ../lib/puppet/indirector/ssl_file.rb:34
 msgid "No file or directory setting provided; terminus %{class_name} cannot function"
 msgstr ""
@@ -4226,7 +4226,7 @@ msgstr ""
 msgid "Node inheritance is removed in Puppet 4.0.0. See http://links.puppet.com/puppet-node-inheritance-deprecation"
 msgstr ""
 
-#: ../lib/puppet/parser/ast/pops_bridge.rb:195
+#: ../lib/puppet/parser/ast/pops_bridge.rb:190
 msgid "Instantiating Resource with type checked parameters - scope is missing, skipping type checking."
 msgstr ""
 
@@ -5724,23 +5724,23 @@ msgstr ""
 msgid "The code loaded from %{source} contains additional logic - can only contain the function %{name}"
 msgstr ""
 
-#: ../lib/puppet/pops/loader/puppet_plan_instantiator.rb:25
+#: ../lib/puppet/pops/loader/puppet_plan_instantiator.rb:34
 msgid "The code loaded from %{source_ref} does not define the plan '%{plan_name}' - it is empty."
 msgstr ""
 
-#: ../lib/puppet/pops/loader/puppet_plan_instantiator.rb:29
+#: ../lib/puppet/pops/loader/puppet_plan_instantiator.rb:38
 msgid "The code loaded from %{source_ref} must contain only the plan '%{plan_name}' - it has additional definitions."
 msgstr ""
 
-#: ../lib/puppet/pops/loader/puppet_plan_instantiator.rb:34
+#: ../lib/puppet/pops/loader/puppet_plan_instantiator.rb:43
 msgid "The code loaded from %{source_ref} does not define the plan '%{plan_name}' - no plan found."
 msgstr ""
 
-#: ../lib/puppet/pops/loader/puppet_plan_instantiator.rb:39
+#: ../lib/puppet/pops/loader/puppet_plan_instantiator.rb:48
 msgid "The code loaded from %{source_ref} produced plan with the wrong name, expected %{expected}, actual %{actual}"
 msgstr ""
 
-#: ../lib/puppet/pops/loader/puppet_plan_instantiator.rb:42
+#: ../lib/puppet/pops/loader/puppet_plan_instantiator.rb:51
 msgid "The code loaded from %{source} contains additional logic - can only contain the plan %{plan_name}"
 msgstr ""
 
@@ -5884,7 +5884,7 @@ msgstr ""
 msgid "%{config_path}: Use of 'hiera.yaml' version 4 is deprecated. It should be converted to version 5"
 msgstr ""
 
-#: ../lib/puppet/pops/lookup/invocation.rb:84
+#: ../lib/puppet/pops/lookup/invocation.rb:91
 msgid "Recursive lookup detected in [%{name_stack}]"
 msgstr ""
 
@@ -6294,7 +6294,7 @@ msgstr ""
 msgid "Options 'include_containers' and 'include_values' cannot both be false"
 msgstr ""
 
-#: ../lib/puppet/pops/types/type_calculator.rb:167
+#: ../lib/puppet/pops/types/type_calculator.rb:187
 msgid "TypeCalculator.enumerable is deprecated. Use iterable"
 msgstr ""
 
@@ -6489,27 +6489,31 @@ msgstr ""
 msgid "Invalid value %{value}: %{property} must be an Integer!"
 msgstr ""
 
-#: ../lib/puppet/provider/aix_object.rb:374
+#: ../lib/puppet/provider/aix_object.rb:333
+msgid "Cannot have both 'forcelocal' and 'ia_load_module' at the same time!"
+msgstr ""
+
+#: ../lib/puppet/provider/aix_object.rb:376
 msgid "Could not set %{property} on %{resource}[%{name}]: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/aix_object.rb:400
+#: ../lib/puppet/provider/aix_object.rb:402
 msgid "attributes is setting the %{properties} properties via. the %{attributes} attributes, respectively! Please specify these property values in the resource declaration instead."
 msgstr ""
 
-#: ../lib/puppet/provider/aix_object.rb:402 ../lib/puppet/provider/aix_object.rb:411
+#: ../lib/puppet/provider/aix_object.rb:404 ../lib/puppet/provider/aix_object.rb:413
 msgid "Could not set attributes on %{resource}[%{name}]: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/aix_object.rb:423
+#: ../lib/puppet/provider/aix_object.rb:425
 msgid "aix.object_info(): Could not find %{resource}[%{name}]"
 msgstr ""
 
-#: ../lib/puppet/provider/aix_object.rb:469 ../lib/puppet/provider/nameservice.rb:182 ../lib/puppet/provider/nameservice/directoryservice.rb:425
+#: ../lib/puppet/provider/aix_object.rb:471 ../lib/puppet/provider/nameservice.rb:182 ../lib/puppet/provider/nameservice/directoryservice.rb:425
 msgid "Could not create %{resource} %{name}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/aix_object.rb:481 ../lib/puppet/provider/nameservice.rb:196
+#: ../lib/puppet/provider/aix_object.rb:483 ../lib/puppet/provider/nameservice.rb:196
 msgid "Could not delete %{resource} %{name}: %{detail}"
 msgstr ""
 
@@ -6574,15 +6578,15 @@ msgstr ""
 msgid "%{resource_name}: %{mode_part_type} set to SYSTEM. SYSTEM permissions cannot be set below FullControl ('7')"
 msgstr ""
 
-#: ../lib/puppet/provider/group/aix.rb:47
+#: ../lib/puppet/provider/group/aix.rb:48
 msgid "No AIX group exists with a group name or gid of %{group}!"
 msgstr ""
 
-#: ../lib/puppet/provider/group/groupadd.rb:13 ../lib/puppet/provider/group/pw.rb:14
+#: ../lib/puppet/provider/group/groupadd.rb:11 ../lib/puppet/provider/group/pw.rb:14
 msgid "GID must be an integer"
 msgstr ""
 
-#: ../lib/puppet/provider/group/groupadd.rb:60
+#: ../lib/puppet/provider/group/groupadd.rb:42
 msgid "GID %{resource} already exists, use allowdupe to force group creation"
 msgstr ""
 
@@ -6705,15 +6709,15 @@ msgstr ""
 msgid "/etc/apt/sources.list contains a cdrom source; not installing.  Use 'allowcdrom' to override this failure."
 msgstr ""
 
-#: ../lib/puppet/provider/package/apt.rb:88 ../lib/puppet/provider/package/fink.rb:50
+#: ../lib/puppet/provider/package/apt.rb:93 ../lib/puppet/provider/package/fink.rb:55
 msgid "Could not find latest version"
 msgstr ""
 
-#: ../lib/puppet/provider/package/apt.rb:99 ../lib/puppet/provider/package/fink.rb:61
+#: ../lib/puppet/provider/package/apt.rb:104 ../lib/puppet/provider/package/fink.rb:66
 msgid "Preseeding %{response} to debconf-set-selections"
 msgstr ""
 
-#: ../lib/puppet/provider/package/apt.rb:103 ../lib/puppet/provider/package/fink.rb:65
+#: ../lib/puppet/provider/package/apt.rb:108 ../lib/puppet/provider/package/fink.rb:70
 msgid "No responsefile specified or non existent, not preseeding anything"
 msgstr ""
 
@@ -6753,11 +6757,11 @@ msgstr ""
 msgid "You cannot install dpkg packages without a source"
 msgstr ""
 
-#: ../lib/puppet/provider/package/dpkg.rb:115
+#: ../lib/puppet/provider/package/dpkg.rb:118
 msgid "Could not update: You cannot install dpkg packages without a source"
 msgstr ""
 
-#: ../lib/puppet/provider/package/dpkg.rb:119
+#: ../lib/puppet/provider/package/dpkg.rb:122
 msgid "source doesn't contain named package, but %{name}"
 msgstr ""
 
@@ -6843,19 +6847,19 @@ msgid ""
 "'%{line}'"
 msgstr ""
 
-#: ../lib/puppet/provider/package/openbsd.rb:50 ../lib/puppet/provider/package/opkg.rb:26
+#: ../lib/puppet/provider/package/openbsd.rb:51 ../lib/puppet/provider/package/opkg.rb:26
 msgid "Failed to match line %{line}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/openbsd.rb:141
+#: ../lib/puppet/provider/package/openbsd.rb:142
 msgid "No valid installpath found in /etc/pkg.conf and no source was set"
 msgstr ""
 
-#: ../lib/puppet/provider/package/openbsd.rb:145
+#: ../lib/puppet/provider/package/openbsd.rb:146
 msgid "You must specify a package source or configure an installpath in /etc/pkg.conf"
 msgstr ""
 
-#: ../lib/puppet/provider/package/openbsd.rb:218
+#: ../lib/puppet/provider/package/openbsd.rb:219
 msgid "%{version} is not available for this package"
 msgstr ""
 
@@ -6911,27 +6915,27 @@ msgstr ""
 msgid "Unknown line format %{resource_name}: %{parse_line}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/pkg.rb:123
+#: ../lib/puppet/provider/package/pkg.rb:127
 msgid "Unable to unfreeze %{package}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/pkg.rb:158
+#: ../lib/puppet/provider/package/pkg.rb:162
 msgid "Implicit version %{should} has %{n} possible matches"
 msgstr ""
 
-#: ../lib/puppet/provider/package/pkg.rb:170
+#: ../lib/puppet/provider/package/pkg.rb:174
 msgid "Selecting version '%{version}' for implicit '%{should}'"
 msgstr ""
 
-#: ../lib/puppet/provider/package/pkg.rb:175
+#: ../lib/puppet/provider/package/pkg.rb:179
 msgid "No version of %{name} matching %{should} is installable, even though the package is currently installed"
 msgstr ""
 
-#: ../lib/puppet/provider/package/pkg.rb:194
+#: ../lib/puppet/provider/package/pkg.rb:198
 msgid "pkg warning: %{warnings}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/pkg.rb:235 ../lib/puppet/provider/package/pkg.rb:255
+#: ../lib/puppet/provider/package/pkg.rb:242 ../lib/puppet/provider/package/pkg.rb:268
 msgid "Unable to update %{package}"
 msgstr ""
 
@@ -7163,15 +7167,15 @@ msgid "Unknown service state '%{current_state}' for service '%{resource_name}'"
 msgstr ""
 
 #. TRANSLATORS 'AIX' is the name of an operating system and should not be translated
-#: ../lib/puppet/provider/user/aix.rb:68
+#: ../lib/puppet/provider/user/aix.rb:69
 msgid "Could not convert AIX expires date '%{expires}' on %{class_name}[%{resource_name}]"
 msgstr ""
 
-#: ../lib/puppet/provider/user/aix.rb:82
+#: ../lib/puppet/provider/user/aix.rb:83
 msgid "Invalid value %{groups}: Groups must be comma separated!"
 msgstr ""
 
-#: ../lib/puppet/provider/user/aix.rb:150
+#: ../lib/puppet/provider/user/aix.rb:151
 msgid "Could not reset the groups property back to %{cur_groups} after setting the primary group on %{resource}[%{name}]. This means that the previous primary group of %{old_pgrp} and the new primary group of %{new_pgrp} have been added to %{cur_groups}. You will need to manually reset the groups property if this is undesirable behavior. Detail: %{detail}"
 msgstr ""
 
@@ -8665,6 +8669,14 @@ msgstr ""
 msgid "Name must be a String not %{klass}"
 msgstr ""
 
+#: ../lib/puppet/type/package.rb:649
+msgid "Invalid hold value %{value}. %{doc}"
+msgstr ""
+
+#: ../lib/puppet/type/package.rb:679
+msgid "You cannot use \"mark\" property while \"ensure\" is one of [\"absent\", \"purged\", \"held\"]"
+msgstr ""
+
 #: ../lib/puppet/type/resources.rb:15
 msgid "Could not find resource type '%{name}'"
 msgstr ""
@@ -8905,11 +8917,11 @@ msgstr ""
 msgid "path may not be nil"
 msgstr ""
 
-#: ../lib/puppet/util.rb:573
+#: ../lib/puppet/util.rb:596
 msgid "replace_file requires a block"
 msgstr ""
 
-#: ../lib/puppet/util.rb:577
+#: ../lib/puppet/util.rb:600
 msgid "replace_file default_mode: %{default_mode} is invalid"
 msgstr ""
 
@@ -9480,20 +9492,20 @@ msgstr ""
 msgid "Unable to set ownership to %{user}:%{group} for log file: %{path}"
 msgstr ""
 
-#: ../lib/puppet/util/logging.rb:83 ../lib/puppet/util/logging.rb:106
+#: ../lib/puppet/util/logging.rb:81 ../lib/puppet/util/logging.rb:105
 msgid "Wrapped exception:"
 msgstr ""
 
 #. TRANSLATORS the literals ":file", ":line", and ":key" should not be translated
-#: ../lib/puppet/util/logging.rb:150
+#: ../lib/puppet/util/logging.rb:162
 msgid "Need either :file and :line, or :key"
 msgstr ""
 
-#: ../lib/puppet/util/logging.rb:180
+#: ../lib/puppet/util/logging.rb:192
 msgid "(file & line not available)"
 msgstr ""
 
-#: ../lib/puppet/util/logging.rb:282
+#: ../lib/puppet/util/logging.rb:294
 msgid "(location: %{location})"
 msgstr ""
 
@@ -9525,7 +9537,7 @@ msgstr ""
 msgid "Details: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/util/plist.rb:145
+#: ../lib/puppet/util/plist.rb:151
 msgid "Unable to write the file %{file_path}. %{error}"
 msgstr ""
 
@@ -9633,23 +9645,23 @@ msgstr ""
 msgid "Sleeping for %{time} seconds (splay is enabled)"
 msgstr ""
 
-#: ../lib/puppet/util/storage.rb:53
+#: ../lib/puppet/util/storage.rb:52
 msgid "Checksumfile %{filename} is not a file, ignoring"
 msgstr ""
 
-#: ../lib/puppet/util/storage.rb:60
+#: ../lib/puppet/util/storage.rb:59
 msgid "Checksumfile %{filename} is corrupt (%{detail}); replacing"
 msgstr ""
 
-#: ../lib/puppet/util/storage.rb:65
+#: ../lib/puppet/util/storage.rb:64
 msgid "Could not rename corrupt %{filename}; remove manually"
 msgstr ""
 
-#: ../lib/puppet/util/storage.rb:71
+#: ../lib/puppet/util/storage.rb:70
 msgid "State got corrupted"
 msgstr ""
 
-#: ../lib/puppet/util/storage.rb:83
+#: ../lib/puppet/util/storage.rb:82
 msgid "Creating state file %{file}"
 msgstr ""
 
@@ -9729,35 +9741,35 @@ msgstr ""
 msgid "Could not resolve name: %{name}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/adsi.rb:229
+#: ../lib/puppet/util/windows/adsi.rb:230
 msgid "Subclass must implement class-level method 'list_all'!"
 msgstr ""
 
-#: ../lib/puppet/util/windows/adsi.rb:282
+#: ../lib/puppet/util/windows/adsi.rb:283
 msgid "Puppet is not able to create/delete domain %{object_class} objects with the %{object_class} resource."
 msgstr ""
 
-#: ../lib/puppet/util/windows/adsi.rb:286
+#: ../lib/puppet/util/windows/adsi.rb:287
 msgid "%{object_class} update failed: %{error}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/adsi.rb:312
+#: ../lib/puppet/util/windows/adsi.rb:313
 msgid "Cannot create user if group '%{name}' exists."
 msgstr ""
 
-#: ../lib/puppet/util/windows/adsi.rb:452
+#: ../lib/puppet/util/windows/adsi.rb:453
 msgid "Unrecognized ADS UserFlags: %{unrecognized_flags}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/adsi.rb:496
+#: ../lib/puppet/util/windows/adsi.rb:497
 msgid "Failed to get user name"
 msgstr ""
 
-#: ../lib/puppet/util/windows/adsi.rb:533
+#: ../lib/puppet/util/windows/adsi.rb:534
 msgid "Cannot delete user profile for '%{sid}' prior to Vista SP1"
 msgstr ""
 
-#: ../lib/puppet/util/windows/adsi.rb:551
+#: ../lib/puppet/util/windows/adsi.rb:552
 msgid "Cannot create group if user '%{name}' exists."
 msgstr ""