Merge pull request #1155 from puppetlabs/release-prep

CHANGELOG.md

@@ -5,6 +5,23 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [v9.3.0](https://github.com/puppetlabs/puppetlabs-apt/tree/v9.3.0) - 2024-02-15
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apt/compare/v9.2.0...v9.3.0)
+
+### Added
+
+- Backports: add keyring support [#1162](https://github.com/puppetlabs/puppetlabs-apt/pull/1162) ([kenyon](https://github.com/kenyon))
+- Support "hourly" and Integer as value for update frequency (fixes #1157) [#1159](https://github.com/puppetlabs/puppetlabs-apt/pull/1159) ([webcompas](https://github.com/webcompas))
+
+### Fixed
+
+- replace deprecated merge() with native puppet code [#1154](https://github.com/puppetlabs/puppetlabs-apt/pull/1154) ([bastelfreak](https://github.com/bastelfreak))
+
+### Other
+
+- release_prep: Use puppetlabs_spec_helper 7.x [#1164](https://github.com/puppetlabs/puppetlabs-apt/pull/1164) ([bastelfreak](https://github.com/bastelfreak))
+
 ## [v9.2.0](https://github.com/puppetlabs/puppetlabs-apt/tree/v9.2.0) - 2023-12-04
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apt/compare/v9.1.0...v9.2.0)

REFERENCE.md

@@ -171,8 +171,8 @@ Valid options:
   'hourly' (if the value of `apt_update_last_success` is less than current epoch time minus 3600);
   'daily'  (if the value of `apt_update_last_success` is less than current epoch time minus 86400);
   'weekly' (if the value of `apt_update_last_success` is less than current epoch time minus 604800);
-  'reluctantly' (only if the exec resource `apt_update` is notified).
   Integer  (if the value of `apt_update_last_success` is less than current epoch time minus provided Integer value);
+  'reluctantly' (only if the exec resource `apt_update` is notified).
 Default: 'reluctantly'.
 * **:loglevel** `Integer`: Specifies the log level of logs outputted to the console. Default: undef.
 * **:timeout** `Integer`: Specifies how long to wait for the update to complete before canceling it. Valid options: an integer, in seconds. Default: undef.
@@ -406,18 +406,10 @@ Manages backports.
 
 #### Examples
 
-##### Set up a backport source for Linux Mint qiana
+##### Set up a backport source for Ubuntu
 
 ```puppet
-class { 'apt::backports':
-  location => 'http://us.archive.ubuntu.com/ubuntu',
-  release  => 'trusty-backports',
-  repos    => 'main universe multiverse restricted',
-  key      => {
-    id     => '630239CC130E1A7FD81A27B140976EAF437D05B5',
-    server => 'keyserver.ubuntu.com',
-  },
-}
+include apt::backports
 ```
 
 #### Parameters
@@ -428,6 +420,7 @@ The following parameters are available in the `apt::backports` class:
 * [`release`](#-apt--backports--release)
 * [`repos`](#-apt--backports--repos)
 * [`key`](#-apt--backports--key)
+* [`keyring`](#-apt--backports--keyring)
 * [`pin`](#-apt--backports--pin)
 * [`include`](#-apt--backports--include)
 
@@ -476,6 +469,16 @@ hash of parameter => value pairs to be passed to apt::key's id, server, content,
 
 Default value: `undef`
 
+##### <a name="-apt--backports--keyring"></a>`keyring`
+
+Data type: `Stdlib::AbsolutePath`
+
+Absolute path to a file containing the PGP keyring used to sign this
+repository. Value is passed to the apt::source and used to set signed-by on
+the source entry.
+
+Default value: `"/usr/share/keyrings/${facts['os']['name'].downcase}-archive-keyring.gpg"`
+
 ##### <a name="-apt--backports--pin"></a>`pin`
 
 Data type: `Variant[Integer, String, Hash]`

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apt",
-  "version": "9.2.0",
+  "version": "9.3.0",
   "author": "puppetlabs",
   "summary": "Provides an interface for managing Apt source, key, and definitions with Puppet",
   "license": "Apache-2.0",