From 7a27bd34d1e8228950916e7706e7cccd43006a23 Mon Sep 17 00:00:00 2001
From: Frank Brehm <frank@brehm-online.com>
Date: Sat, 22 Apr 2023 00:36:47 +0200
Subject: [PATCH] committing changes in /etc made by "/usr/bin/apt full-upgrade
 -y"

Packages with configuration changes:
-ubuntu-advantage-tools 27.13.6~22.04.1 amd64
+ubuntu-advantage-tools 27.14.4~22.04 amd64

Package changes:
-postfix 3.6.4-1ubuntu1 amd64
-postfix-cdb 3.6.4-1ubuntu1 amd64
-postfix-ldap 3.6.4-1ubuntu1 amd64
-postfix-mysql 3.6.4-1ubuntu1 amd64
-postfix-pcre 3.6.4-1ubuntu1 amd64
-postfix-pgsql 3.6.4-1ubuntu1 amd64
-postfix-sqlite 3.6.4-1ubuntu1 amd64
+postfix 3.6.4-1ubuntu1.1 amd64
+postfix-cdb 3.6.4-1ubuntu1.1 amd64
+postfix-ldap 3.6.4-1ubuntu1.1 amd64
+postfix-mysql 3.6.4-1ubuntu1.1 amd64
+postfix-pcre 3.6.4-1ubuntu1.1 amd64
+postfix-pgsql 3.6.4-1ubuntu1.1 amd64
+postfix-sqlite 3.6.4-1ubuntu1.1 amd64
-ubuntu-advantage-tools 27.13.6~22.04.1 amd64
+ubuntu-advantage-tools 27.14.4~22.04 amd64
---
 .etckeeper                              |  1 -
 apt/apt.conf.d/20apt-esm-hook.conf      |  4 ----
 ubuntu-advantage/uaclient.conf          | 16 ----------------
 update-motd.d/88-esm-announce           |  4 ----
 update-motd.d/91-contract-ua-esm-status |  4 ++--
 5 files changed, 2 insertions(+), 27 deletions(-)
 delete mode 100755 update-motd.d/88-esm-announce

diff --git a/.etckeeper b/.etckeeper
index ece3bb5..d9975eb 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -3362,7 +3362,6 @@ maybe chmod 0755 'update-motd.d/00-header'
 maybe chmod 0755 'update-motd.d/10-help-text'
 maybe chmod 0755 'update-motd.d/50-motd-news'
 maybe chmod 0755 'update-motd.d/85-fwupd'
-maybe chmod 0755 'update-motd.d/88-esm-announce'
 maybe chmod 0755 'update-motd.d/90-updates-available'
 maybe chmod 0755 'update-motd.d/91-contract-ua-esm-status'
 maybe chmod 0755 'update-motd.d/91-release-upgrade'
diff --git a/apt/apt.conf.d/20apt-esm-hook.conf b/apt/apt.conf.d/20apt-esm-hook.conf
index 7bcae44..36a7593 100644
--- a/apt/apt.conf.d/20apt-esm-hook.conf
+++ b/apt/apt.conf.d/20apt-esm-hook.conf
@@ -2,10 +2,6 @@ APT::Update::Pre-Invoke {
 	"[ ! -e /run/systemd/system ] || [ $(id -u) -ne 0 ] || systemctl start --no-block apt-news.service esm-cache.service || true";
 };
 
-APT::Update::Post-Invoke-Stats {
-	"[ ! -f /usr/lib/ubuntu-advantage/apt-esm-hook ] || /usr/lib/ubuntu-advantage/apt-esm-hook || true";
-};
-
 binary::apt::AptCli::Hooks::Upgrade {
 	"[ ! -f /usr/lib/ubuntu-advantage/apt-esm-json-hook ] || /usr/lib/ubuntu-advantage/apt-esm-json-hook || true";
 };
diff --git a/ubuntu-advantage/uaclient.conf b/ubuntu-advantage/uaclient.conf
index 3bf107a..6499bf1 100644
--- a/ubuntu-advantage/uaclient.conf
+++ b/ubuntu-advantage/uaclient.conf
@@ -1,18 +1,2 @@
-# Ubuntu Pro Client config file.
-# If you modify this file, run "pro refresh config" to ensure changes are
-# picked up by Ubuntu Pro Client.
-
 contract_url: https://contracts.canonical.com
-data_dir: /var/lib/ubuntu-advantage
-log_file: /var/log/ubuntu-advantage.log
 log_level: debug
-security_url: https://ubuntu.com/security
-timer_log_file: /var/log/ubuntu-advantage-timer.log
-daemon_log_file: /var/log/ubuntu-advantage-daemon.log
-ua_config:
-  apt_http_proxy: null
-  apt_https_proxy: null
-  http_proxy: null
-  https_proxy: null
-  update_messaging_timer: 21600
-  metering_timer: 14400
diff --git a/update-motd.d/88-esm-announce b/update-motd.d/88-esm-announce
deleted file mode 100755
index 44b521b..0000000
--- a/update-motd.d/88-esm-announce
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-stamp="/var/lib/ubuntu-advantage/messages/motd-esm-announce"
-
-[ ! -r "$stamp" ] || cat "$stamp"
diff --git a/update-motd.d/91-contract-ua-esm-status b/update-motd.d/91-contract-ua-esm-status
index cc82334..cfc6bb2 100755
--- a/update-motd.d/91-contract-ua-esm-status
+++ b/update-motd.d/91-contract-ua-esm-status
@@ -1,7 +1,7 @@
 #!/bin/sh
-esm_stamp="/var/lib/ubuntu-advantage/messages/motd-esm-service-status"
+contract_status_stamp="/var/lib/ubuntu-advantage/messages/motd-contract-status"
 
-[ ! -r "$esm_stamp" ] || cat "$esm_stamp"
+[ ! -r "$contract_status_stamp" ] || cat "$contract_status_stamp"
 
 auto_attach_stamp="/var/lib/ubuntu-advantage/messages/motd-auto-attach-status"
 
-- 
2.39.5